diff --git a/tests/Umbraco.TestData/Configuration/TestDataSettings.cs b/tests/Umbraco.TestData/Configuration/TestDataSettings.cs
index 78084f726a..687a696bcc 100644
--- a/tests/Umbraco.TestData/Configuration/TestDataSettings.cs
+++ b/tests/Umbraco.TestData/Configuration/TestDataSettings.cs
@@ -1,16 +1,15 @@
-namespace Umbraco.TestData.Configuration
-{
-    public class TestDataSettings
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the test data generation is enabled.
-        /// </summary>
-        public bool Enabled { get; set; } = false;
+namespace Umbraco.TestData.Configuration;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether persisted local database cache files for content and media are disabled.
-        /// </summary>
-        /// <value>The URL path.</value>
-        public bool IgnoreLocalDb { get; set; } = false;
-    }
+public class TestDataSettings
+{
+    /// <summary>
+    ///     Gets or sets a value indicating whether the test data generation is enabled.
+    /// </summary>
+    public bool Enabled { get; set; } = false;
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether persisted local database cache files for content and media are disabled.
+    /// </summary>
+    /// <value>The URL path.</value>
+    public bool IgnoreLocalDb { get; set; } = false;
 }
diff --git a/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs b/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs
index 7e3e2a70b1..c695653503 100644
--- a/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs
+++ b/tests/Umbraco.TestData/Extensions/UmbracoBuilderExtensions.cs
@@ -7,48 +7,44 @@ using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Web.Common.ApplicationBuilder;
 using Umbraco.TestData.Configuration;
 
-namespace Umbraco.TestData.Extensions
+namespace Umbraco.TestData.Extensions;
+
+public static class UmbracoBuilderExtensions
 {
-    public static class UmbracoBuilderExtensions
+    public static IUmbracoBuilder AddUmbracoTestData(this IUmbracoBuilder builder)
     {
-        public static IUmbracoBuilder AddUmbracoTestData(this IUmbracoBuilder builder)
+        if (builder.Services.Any(x => x.ServiceType == typeof(LoadTestController)))
         {
-            if (builder.Services.Any(x => x.ServiceType == typeof(LoadTestController)))
-            {
-                // We assume the test data project is composed if any implementations of LoadTestController exist.
-                return builder;
-            }
-
-            IConfigurationSection testDataSection = builder.Config.GetSection("Umbraco:CMS:TestData");
-            TestDataSettings config = testDataSection.Get<TestDataSettings>();
-            if (config == null || config.Enabled == false)
-            {
-                return builder;
-            }
-
-            builder.Services.Configure<TestDataSettings>(testDataSection);
-
-            if (config.IgnoreLocalDb)
-            {
-                builder.Services.AddSingleton(factory => new PublishedSnapshotServiceOptions
-                {
-                    IgnoreLocalDb = true
-                });
-            }
-
-            builder.Services.Configure<UmbracoPipelineOptions>(options =>
-                options.AddFilter(new UmbracoPipelineFilter(nameof(LoadTestController))
-                {
-                    Endpoints = app => app.UseEndpoints(endpoints =>
-                        endpoints.MapControllerRoute(
-                            "LoadTest",
-                            "/LoadTest/{action}",
-                            new { controller = "LoadTest", Action = "Index" }))
-                }));
-
-            builder.Services.AddScoped(typeof(LoadTestController));
-
+            // We assume the test data project is composed if any implementations of LoadTestController exist.
             return builder;
         }
+
+        var testDataSection = builder.Config.GetSection("Umbraco:CMS:TestData");
+        var config = testDataSection.Get<TestDataSettings>();
+        if (config == null || config.Enabled == false)
+        {
+            return builder;
+        }
+
+        builder.Services.Configure<TestDataSettings>(testDataSection);
+
+        if (config.IgnoreLocalDb)
+        {
+            builder.Services.AddSingleton(factory => new PublishedSnapshotServiceOptions { IgnoreLocalDb = true });
+        }
+
+        builder.Services.Configure<UmbracoPipelineOptions>(options =>
+            options.AddFilter(new UmbracoPipelineFilter(nameof(LoadTestController))
+            {
+                Endpoints = app => app.UseEndpoints(endpoints =>
+                    endpoints.MapControllerRoute(
+                        "LoadTest",
+                        "/LoadTest/{action}",
+                        new { controller = "LoadTest", Action = "Index" }))
+            }));
+
+        builder.Services.AddScoped(typeof(LoadTestController));
+
+        return builder;
     }
 }
diff --git a/tests/Umbraco.TestData/LoadTestComposer.cs b/tests/Umbraco.TestData/LoadTestComposer.cs
index 3d3302b881..f44d8edfb2 100644
--- a/tests/Umbraco.TestData/LoadTestComposer.cs
+++ b/tests/Umbraco.TestData/LoadTestComposer.cs
@@ -4,10 +4,9 @@ using Umbraco.TestData.Extensions;
 
 // see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting
 
-namespace Umbraco.TestData
+namespace Umbraco.TestData;
+
+public class LoadTestComposer : IComposer
 {
-    public class LoadTestComposer : IComposer
-    {
-        public void Compose(IUmbracoBuilder builder) => builder.AddUmbracoTestData();
-    }
+    public void Compose(IUmbracoBuilder builder) => builder.AddUmbracoTestData();
 }
diff --git a/tests/Umbraco.TestData/LoadTestController.cs b/tests/Umbraco.TestData/LoadTestController.cs
index c245aae816..741fe4e94b 100644
--- a/tests/Umbraco.TestData/LoadTestController.cs
+++ b/tests/Umbraco.TestData/LoadTestController.cs
@@ -10,24 +10,28 @@ using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
+using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
 
 // see https://github.com/Shazwazza/UmbracoScripts/tree/master/src/LoadTesting
 
-namespace Umbraco.TestData
+namespace Umbraco.TestData;
+
+public class LoadTestController : Controller
 {
-    public class LoadTestController : Controller
-    {
-        private static readonly Random s_random = new Random();
-        private static readonly object s_locko = new object();
+    private const string ContainerAlias = "LoadTestContainer";
+    private const string ContentAlias = "LoadTestContent";
+    private const int TextboxDefinitionId = -88;
+    private const int MaxCreate = 1000;
 
-        private static volatile int s_containerId = -1;
+    private const string FootHtml = @"</body>
+</html>";
 
-        private const string ContainerAlias = "LoadTestContainer";
-        private const string ContentAlias = "LoadTestContent";
-        private const int TextboxDefinitionId = -88;
-        private const int MaxCreate = 1000;
+    private static readonly Random s_random = new();
+    private static readonly object s_locko = new();
 
-        private static readonly string s_headHtml = @"<html>
+    private static volatile int s_containerId = -1;
+
+    private static readonly string s_headHtml = @"<html>
 <head>
   <title>LoadTest</title>
   <style>
@@ -48,10 +52,7 @@ namespace Umbraco.TestData
   </div>
 ";
 
-        private const string FootHtml = @"</body>
-</html>";
-
-        private static readonly string s_containerTemplateText = @"
+    private static readonly string s_containerTemplateText = @"
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
 @inject Umbraco.Cms.Core.Configuration.IUmbracoVersion _umbracoVersion
 @{
@@ -92,42 +93,43 @@ namespace Umbraco.TestData
 </div>
 " + FootHtml;
 
-        private readonly IContentTypeService _contentTypeService;
-        private readonly IContentService _contentService;
-        private readonly IDataTypeService _dataTypeService;
-        private readonly IFileService _fileService;
-        private readonly IShortStringHelper _shortStringHelper;
-        private readonly Cms.Core.Hosting.IHostingEnvironment _hostingEnvironment;
-        private readonly IHostApplicationLifetime _hostApplicationLifetime;
+    private readonly IContentService _contentService;
 
-        public LoadTestController(
-            IContentTypeService contentTypeService,
-            IContentService contentService,
-            IDataTypeService dataTypeService,
-            IFileService fileService,
-            IShortStringHelper shortStringHelper,
-            Cms.Core.Hosting.IHostingEnvironment hostingEnvironment,
-            IHostApplicationLifetime hostApplicationLifetime)
+    private readonly IContentTypeService _contentTypeService;
+    private readonly IDataTypeService _dataTypeService;
+    private readonly IFileService _fileService;
+    private readonly IHostApplicationLifetime _hostApplicationLifetime;
+    private readonly IHostingEnvironment _hostingEnvironment;
+    private readonly IShortStringHelper _shortStringHelper;
+
+    public LoadTestController(
+        IContentTypeService contentTypeService,
+        IContentService contentService,
+        IDataTypeService dataTypeService,
+        IFileService fileService,
+        IShortStringHelper shortStringHelper,
+        IHostingEnvironment hostingEnvironment,
+        IHostApplicationLifetime hostApplicationLifetime)
+    {
+        _contentTypeService = contentTypeService;
+        _contentService = contentService;
+        _dataTypeService = dataTypeService;
+        _fileService = fileService;
+        _shortStringHelper = shortStringHelper;
+        _hostingEnvironment = hostingEnvironment;
+        _hostApplicationLifetime = hostApplicationLifetime;
+    }
+
+
+    public IActionResult Index()
+    {
+        var res = EnsureInitialize();
+        if (res != null)
         {
-            _contentTypeService = contentTypeService;
-            _contentService = contentService;
-            _dataTypeService = dataTypeService;
-            _fileService = fileService;
-            _shortStringHelper = shortStringHelper;
-            _hostingEnvironment = hostingEnvironment;
-            _hostApplicationLifetime = hostApplicationLifetime;
+            return res;
         }
 
-
-        public IActionResult Index()
-        {
-            IActionResult res = EnsureInitialize();
-            if (res != null)
-            {
-                return res;
-            }
-
-            var html = @"Welcome. You can:
+        var html = @"Welcome. You can:
 <ul>
     <li><a href=""/LoadTestContainer"">List existing contents</a> (u:url)</li>
     <li><a href=""/LoadTest/Create?o=browser"">Create a content</a> (o:origin, r:restart, n:number)</li>
@@ -139,249 +141,250 @@ namespace Umbraco.TestData
 </ul>
 ";
 
-            return ContentHtml(html);
+        return ContentHtml(html);
+    }
+
+    private IActionResult EnsureInitialize()
+    {
+        if (s_containerId > 0)
+        {
+            return null;
         }
 
-        private IActionResult EnsureInitialize()
+        lock (s_locko)
         {
             if (s_containerId > 0)
             {
                 return null;
             }
 
-            lock (s_locko)
+            var contentType = _contentTypeService.Get(ContentAlias);
+            if (contentType == null)
             {
-                if (s_containerId > 0)
-                {
-                    return null;
-                }
-
-                IContentType contentType = _contentTypeService.Get(ContentAlias);
-                if (contentType == null)
-                {
-                    return ContentHtml("Not installed, first you must <a href=\"/LoadTest/Install\">install</a>.");
-                }
-
-                IContentType containerType = _contentTypeService.Get(ContainerAlias);
-                if (containerType == null)
-                {
-                    return ContentHtml("Panic! Container type is missing.");
-                }
-
-                IContent container = _contentService.GetPagedOfType(containerType.Id, 0, 100, out _, null).FirstOrDefault();
-                if (container == null)
-                {
-                    return ContentHtml("Panic! Container is missing.");
-                }
-
-                s_containerId = container.Id;
-                return null;
-            }
-        }
-
-        private IActionResult ContentHtml(string s) => Content(s_headHtml + s + FootHtml, "text/html");
-
-        public IActionResult Install()
-        {
-            var contentType = new ContentType(_shortStringHelper, -1)
-            {
-                Alias = ContentAlias,
-                Name = "LoadTest Content",
-                Description = "Content for LoadTest",
-                Icon = "icon-document"
-            };
-            IDataType def = _dataTypeService.GetDataType(TextboxDefinitionId);
-            contentType.AddPropertyType(new PropertyType(_shortStringHelper, def)
-            {
-                Name = "Origin",
-                Alias = "origin",
-                Description = "The origin of the content.",
-            });
-            _contentTypeService.Save(contentType);
-
-            Template containerTemplate = ImportTemplate(
-                 "LoadTestContainer",
-                 "LoadTestContainer",
-                 s_containerTemplateText);
-
-            var containerType = new ContentType(_shortStringHelper, -1)
-            {
-                Alias = ContainerAlias,
-                Name = "LoadTest Container",
-                Description = "Container for LoadTest content",
-                Icon = "icon-document",
-                AllowedAsRoot = true,
-                IsContainer = true
-            };
-            containerType.AllowedContentTypes = containerType.AllowedContentTypes.Union(new[]
-            {
-                new ContentTypeSort(new Lazy<int>(() => contentType.Id), 0, contentType.Alias),
-            });
-            containerType.AllowedTemplates = containerType.AllowedTemplates.Union(new[] { containerTemplate });
-            containerType.SetDefaultTemplate(containerTemplate);
-            _contentTypeService.Save(containerType);
-
-            IContent content = _contentService.Create("LoadTestContainer", -1, ContainerAlias);
-            _contentService.SaveAndPublish(content);
-
-            return ContentHtml("Installed.");
-        }
-
-        private Template ImportTemplate(string name, string alias, string text, ITemplate master = null)
-        {
-            var t = new Template(_shortStringHelper, name, alias) { Content = text };
-            if (master != null)
-            {
-                t.SetMasterTemplate(master);
+                return ContentHtml("Not installed, first you must <a href=\"/LoadTest/Install\">install</a>.");
             }
 
-            _fileService.SaveTemplate(t);
-            return t;
-        }
-
-        public IActionResult Create(int n = 1, int r = 0, string o = null)
-        {
-            IActionResult res = EnsureInitialize();
-            if (res != null)
+            var containerType = _contentTypeService.Get(ContainerAlias);
+            if (containerType == null)
             {
-                return res;
+                return ContentHtml("Panic! Container type is missing.");
             }
 
-            if (r < 0)
+            var container = _contentService.GetPagedOfType(containerType.Id, 0, 100, out _, null).FirstOrDefault();
+            if (container == null)
             {
-                r = 0;
+                return ContentHtml("Panic! Container is missing.");
             }
 
-            if (r > 100)
-            {
-                r = 100;
-            }
-
-            var restart = GetRandom(0, 100) > (100 - r);
-
-            if (n < 1)
-            {
-                n = 1;
-            }
-
-            if (n > MaxCreate)
-            {
-                n = MaxCreate;
-            }
-
-            for (int i = 0; i < n; i++)
-            {
-                var name = Guid.NewGuid().ToString("N").ToUpper() + "-" + (restart ? "R" : "X") + "-" + o;
-                IContent content = _contentService.Create(name, s_containerId, ContentAlias);
-                content.SetValue("origin", o);
-                _contentService.SaveAndPublish(content);
-            }
-
-            if (restart)
-            {
-                DoRestart();
-            }
-
-            return ContentHtml("Created " + n + " content"
-                + (restart ? ", and restarted" : "")
-                + ".");
-        }
-
-        private static int GetRandom(int minValue, int maxValue)
-        {
-            lock (s_locko)
-            {
-                return s_random.Next(minValue, maxValue);
-            }
-        }
-
-        public IActionResult Clear()
-        {
-            IActionResult res = EnsureInitialize();
-            if (res != null)
-            {
-                return res;
-            }
-
-            IContentType contentType = _contentTypeService.Get(ContentAlias);
-            _contentService.DeleteOfType(contentType.Id);
-
-            return ContentHtml("Cleared.");
-        }
-
-        private void DoRestart()
-        {
-            HttpContext.User = null;
-            Thread.CurrentPrincipal = null;
-            _hostApplicationLifetime.StopApplication();
-        }
-
-        public IActionResult ColdBootRestart()
-        {
-            Directory.Delete(_hostingEnvironment.MapPathContentRoot(Path.Combine(Constants.SystemDirectories.TempData,"DistCache")), true);
-
-            DoRestart();
-
-            return Content("Cold Boot Restarted.");
-        }
-
-        public IActionResult Restart()
-        {
-            DoRestart();
-
-            return ContentHtml("Restarted.");
-        }
-
-        public IActionResult Die()
-        {
-            var timer = new Timer(_ => throw new Exception("die!"));
-            _ = timer.Change(100, 0);
-
-            return ContentHtml("Dying.");
-        }
-
-        public IActionResult Domains()
-        {
-            AppDomain currentDomain = AppDomain.CurrentDomain;
-            var currentName = currentDomain.FriendlyName;
-            var pos = currentName.IndexOf('-');
-            if (pos > 0)
-            {
-                currentName = currentName.Substring(0, pos);
-            }
-
-            var text = new StringBuilder();
-            text.Append("<div class=\"block\">Process ID: " + Process.GetCurrentProcess().Id + "</div>");
-            text.Append("<div class=\"block\">");
-
-            // TODO (V9): Commented out as I assume not available?
-            ////text.Append("<div>IIS Site: " + HostingEnvironment.ApplicationHost.GetSiteName() + "</div>");
-
-            text.Append("<div>App ID: " + currentName + "</div>");
-            //text.Append("<div>AppPool: " + Zbu.WebManagement.AppPoolHelper.GetCurrentApplicationPoolName() + "</div>");
-            text.Append("</div>");
-
-            text.Append("<div class=\"block\">Domains:<ul>");
-            text.Append("<li>Not implemented.</li>");
-            /*
-            foreach (var domain in Zbu.WebManagement.AppDomainHelper.GetAppDomains().OrderBy(x => x.Id))
-            {
-                var name = domain.FriendlyName;
-                pos = name.IndexOf('-');
-                if (pos > 0) name = name.Substring(0, pos);
-                text.Append("<li style=\""
-                    + (name != currentName ? "color: #cccccc;" : "")
-                    //+ (domain.Id == currentDomain.Id ? "" : "")
-                    + "\">"
-                    +"[" + domain.Id + "] " + name
-                    + (domain.IsDefaultAppDomain() ? " (default)" : "")
-                    + (domain.Id == currentDomain.Id ? " (current)" : "")
-                    + "</li>");
-            }
-            */
-            text.Append("</ul></div>");
-
-            return ContentHtml(text.ToString());
+            s_containerId = container.Id;
+            return null;
         }
     }
+
+    private IActionResult ContentHtml(string s) => Content(s_headHtml + s + FootHtml, "text/html");
+
+    public IActionResult Install()
+    {
+        var contentType = new ContentType(_shortStringHelper, -1)
+        {
+            Alias = ContentAlias,
+            Name = "LoadTest Content",
+            Description = "Content for LoadTest",
+            Icon = "icon-document"
+        };
+        var def = _dataTypeService.GetDataType(TextboxDefinitionId);
+        contentType.AddPropertyType(new PropertyType(_shortStringHelper, def)
+        {
+            Name = "Origin",
+            Alias = "origin",
+            Description = "The origin of the content."
+        });
+        _contentTypeService.Save(contentType);
+
+        var containerTemplate = ImportTemplate(
+            "LoadTestContainer",
+            "LoadTestContainer",
+            s_containerTemplateText);
+
+        var containerType = new ContentType(_shortStringHelper, -1)
+        {
+            Alias = ContainerAlias,
+            Name = "LoadTest Container",
+            Description = "Container for LoadTest content",
+            Icon = "icon-document",
+            AllowedAsRoot = true,
+            IsContainer = true
+        };
+        containerType.AllowedContentTypes = containerType.AllowedContentTypes.Union(new[]
+        {
+            new ContentTypeSort(new Lazy<int>(() => contentType.Id), 0, contentType.Alias)
+        });
+        containerType.AllowedTemplates = containerType.AllowedTemplates.Union(new[] { containerTemplate });
+        containerType.SetDefaultTemplate(containerTemplate);
+        _contentTypeService.Save(containerType);
+
+        var content = _contentService.Create("LoadTestContainer", -1, ContainerAlias);
+        _contentService.SaveAndPublish(content);
+
+        return ContentHtml("Installed.");
+    }
+
+    private Template ImportTemplate(string name, string alias, string text, ITemplate master = null)
+    {
+        var t = new Template(_shortStringHelper, name, alias) { Content = text };
+        if (master != null)
+        {
+            t.SetMasterTemplate(master);
+        }
+
+        _fileService.SaveTemplate(t);
+        return t;
+    }
+
+    public IActionResult Create(int n = 1, int r = 0, string o = null)
+    {
+        var res = EnsureInitialize();
+        if (res != null)
+        {
+            return res;
+        }
+
+        if (r < 0)
+        {
+            r = 0;
+        }
+
+        if (r > 100)
+        {
+            r = 100;
+        }
+
+        var restart = GetRandom(0, 100) > 100 - r;
+
+        if (n < 1)
+        {
+            n = 1;
+        }
+
+        if (n > MaxCreate)
+        {
+            n = MaxCreate;
+        }
+
+        for (var i = 0; i < n; i++)
+        {
+            var name = Guid.NewGuid().ToString("N").ToUpper() + "-" + (restart ? "R" : "X") + "-" + o;
+            var content = _contentService.Create(name, s_containerId, ContentAlias);
+            content.SetValue("origin", o);
+            _contentService.SaveAndPublish(content);
+        }
+
+        if (restart)
+        {
+            DoRestart();
+        }
+
+        return ContentHtml("Created " + n + " content"
+                           + (restart ? ", and restarted" : string.Empty)
+                           + ".");
+    }
+
+    private static int GetRandom(int minValue, int maxValue)
+    {
+        lock (s_locko)
+        {
+            return s_random.Next(minValue, maxValue);
+        }
+    }
+
+    public IActionResult Clear()
+    {
+        var res = EnsureInitialize();
+        if (res != null)
+        {
+            return res;
+        }
+
+        var contentType = _contentTypeService.Get(ContentAlias);
+        _contentService.DeleteOfType(contentType.Id);
+
+        return ContentHtml("Cleared.");
+    }
+
+    private void DoRestart()
+    {
+        HttpContext.User = null;
+        Thread.CurrentPrincipal = null;
+        _hostApplicationLifetime.StopApplication();
+    }
+
+    public IActionResult ColdBootRestart()
+    {
+        Directory.Delete(
+            _hostingEnvironment.MapPathContentRoot(Path.Combine(Constants.SystemDirectories.TempData, "DistCache")),
+            true);
+
+        DoRestart();
+
+        return Content("Cold Boot Restarted.");
+    }
+
+    public IActionResult Restart()
+    {
+        DoRestart();
+
+        return ContentHtml("Restarted.");
+    }
+
+    public IActionResult Die()
+    {
+        var timer = new Timer(_ => throw new Exception("die!"));
+        _ = timer.Change(100, 0);
+
+        return ContentHtml("Dying.");
+    }
+
+    public IActionResult Domains()
+    {
+        var currentDomain = AppDomain.CurrentDomain;
+        var currentName = currentDomain.FriendlyName;
+        var pos = currentName.IndexOf('-');
+        if (pos > 0)
+        {
+            currentName = currentName.Substring(0, pos);
+        }
+
+        var text = new StringBuilder();
+        text.Append("<div class=\"block\">Process ID: " + Process.GetCurrentProcess().Id + "</div>");
+        text.Append("<div class=\"block\">");
+
+        // TODO (V9): Commented out as I assume not available?
+        ////text.Append("<div>IIS Site: " + HostingEnvironment.ApplicationHost.GetSiteName() + "</div>");
+
+        text.Append("<div>App ID: " + currentName + "</div>");
+        //text.Append("<div>AppPool: " + Zbu.WebManagement.AppPoolHelper.GetCurrentApplicationPoolName() + "</div>");
+        text.Append("</div>");
+
+        text.Append("<div class=\"block\">Domains:<ul>");
+        text.Append("<li>Not implemented.</li>");
+        /*
+        foreach (var domain in Zbu.WebManagement.AppDomainHelper.GetAppDomains().OrderBy(x => x.Id))
+        {
+            var name = domain.FriendlyName;
+            pos = name.IndexOf('-');
+            if (pos > 0) name = name.Substring(0, pos);
+            text.Append("<li style=\""
+                + (name != currentName ? "color: #cccccc;" : "")
+                //+ (domain.Id == currentDomain.Id ? "" : "")
+                + "\">"
+                +"[" + domain.Id + "] " + name
+                + (domain.IsDefaultAppDomain() ? " (default)" : "")
+                + (domain.Id == currentDomain.Id ? " (current)" : "")
+                + "</li>");
+        }
+        */
+        text.Append("</ul></div>");
+
+        return ContentHtml(text.ToString());
+    }
 }
diff --git a/tests/Umbraco.TestData/SegmentTestController.cs b/tests/Umbraco.TestData/SegmentTestController.cs
index d608602711..7a9a4edae0 100644
--- a/tests/Umbraco.TestData/SegmentTestController.cs
+++ b/tests/Umbraco.TestData/SegmentTestController.cs
@@ -13,114 +13,112 @@ using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Extensions;
 using Umbraco.TestData.Configuration;
 
-namespace Umbraco.TestData
+namespace Umbraco.TestData;
+
+public class SegmentTestController : SurfaceController
 {
-    public class SegmentTestController : SurfaceController
+    private readonly IOptions<TestDataSettings> _testDataSettings;
+
+    public SegmentTestController(
+        IUmbracoContextAccessor umbracoContextAccessor,
+        IUmbracoDatabaseFactory databaseFactory,
+        ServiceContext services,
+        AppCaches appCaches,
+        IProfilingLogger profilingLogger,
+        IPublishedUrlProvider publishedUrlProvider,
+        IOptions<TestDataSettings> testDataSettings)
+        : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger, publishedUrlProvider) =>
+        _testDataSettings = testDataSettings;
+
+    public IActionResult EnableDocTypeSegments(string alias, string propertyTypeAlias)
     {
-        private IOptions<TestDataSettings> _testDataSettings;
-
-        public SegmentTestController(
-            IUmbracoContextAccessor umbracoContextAccessor,
-            IUmbracoDatabaseFactory databaseFactory,
-            ServiceContext services,
-            AppCaches appCaches,
-            IProfilingLogger profilingLogger,
-            IPublishedUrlProvider publishedUrlProvider,
-            IOptions<TestDataSettings> testDataSettings)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger, publishedUrlProvider)
+        if (_testDataSettings.Value.Enabled != true)
         {
-            _testDataSettings = testDataSettings;
+            return HttpNotFound();
         }
 
-        public IActionResult EnableDocTypeSegments(string alias, string propertyTypeAlias)
+        var ct = Services.ContentTypeService.Get(alias);
+        if (ct == null)
         {
-            if(_testDataSettings.Value.Enabled != true)
-            {
-                return HttpNotFound();
-            }
-
-            IContentType ct = Services.ContentTypeService.Get(alias);
-            if (ct == null)
-            {
-                return Content($"No document type found by alias {alias}");
-            }
-
-            IPropertyType propType = ct.PropertyTypes.FirstOrDefault(x => x.Alias == propertyTypeAlias);
-            if (propType == null)
-            {
-                return Content($"The document type {alias} does not have a property type {propertyTypeAlias ?? "null"}");
-            }
-
-            if (ct.Variations.VariesBySegment())
-            {
-                return Content($"The document type {alias} already allows segments, nothing has been changed");
-            }
-
-            ct.SetVariesBy(ContentVariation.Segment);
-            propType.SetVariesBy(ContentVariation.Segment);
-
-            Services.ContentTypeService.Save(ct);
-            return Content($"The document type {alias} and property type {propertyTypeAlias} now allows segments");
+            return Content($"No document type found by alias {alias}");
         }
 
-        private IActionResult HttpNotFound() => throw new NotImplementedException();
-
-        public IActionResult DisableDocTypeSegments(string alias)
+        var propType = ct.PropertyTypes.FirstOrDefault(x => x.Alias == propertyTypeAlias);
+        if (propType == null)
         {
-            if (_testDataSettings.Value.Enabled != true)
-            {
-                return HttpNotFound();
-            }
-
-            IContentType ct = Services.ContentTypeService.Get(alias);
-            if (ct == null)
-            {
-                return Content($"No document type found by alias {alias}");
-            }
-
-            if (!ct.VariesBySegment())
-            {
-                return Content($"The document type {alias} does not allow segments, nothing has been changed");
-            }
-
-            ct.SetVariesBy(ContentVariation.Segment, false);
-
-            Services.ContentTypeService.Save(ct);
-            return Content($"The document type {alias} no longer allows segments");
+            return Content($"The document type {alias} does not have a property type {propertyTypeAlias ?? "null"}");
         }
 
-        public ActionResult AddSegmentData(int contentId, string propertyAlias, string value, string segment, string? culture = null)
+        if (ct.Variations.VariesBySegment())
         {
-            IContent content = Services.ContentService.GetById(contentId);
-            if (content == null)
-            {
-                return Content($"No content found by id {contentId}");
-            }
-
-            if (propertyAlias.IsNullOrWhiteSpace() || !content.HasProperty(propertyAlias))
-            {
-                return Content($"The content by id {contentId} does not contain a property with alias {propertyAlias ?? "null"}");
-            }
-
-            if (content.ContentType.VariesByCulture() && culture.IsNullOrWhiteSpace())
-            {
-                return Content($"The content by id {contentId} varies by culture but no culture was specified");
-            }
-
-            if (value.IsNullOrWhiteSpace())
-            {
-                return Content("'value' cannot be null");
-            }
-
-            if (segment.IsNullOrWhiteSpace())
-            {
-                return Content("'segment' cannot be null");
-            }
-
-            content.SetValue(propertyAlias, value, culture, segment);
-            Services.ContentService.Save(content);
-
-            return Content($"Segment value has been set on content {contentId} for property {propertyAlias}");
+            return Content($"The document type {alias} already allows segments, nothing has been changed");
         }
+
+        ct.SetVariesBy(ContentVariation.Segment);
+        propType.SetVariesBy(ContentVariation.Segment);
+
+        Services.ContentTypeService.Save(ct);
+        return Content($"The document type {alias} and property type {propertyTypeAlias} now allows segments");
+    }
+
+    private IActionResult HttpNotFound() => throw new NotImplementedException();
+
+    public IActionResult DisableDocTypeSegments(string alias)
+    {
+        if (_testDataSettings.Value.Enabled != true)
+        {
+            return HttpNotFound();
+        }
+
+        var ct = Services.ContentTypeService.Get(alias);
+        if (ct == null)
+        {
+            return Content($"No document type found by alias {alias}");
+        }
+
+        if (!ct.VariesBySegment())
+        {
+            return Content($"The document type {alias} does not allow segments, nothing has been changed");
+        }
+
+        ct.SetVariesBy(ContentVariation.Segment, false);
+
+        Services.ContentTypeService.Save(ct);
+        return Content($"The document type {alias} no longer allows segments");
+    }
+
+    public ActionResult AddSegmentData(int contentId, string propertyAlias, string value, string segment, string? culture = null)
+    {
+        var content = Services.ContentService.GetById(contentId);
+        if (content == null)
+        {
+            return Content($"No content found by id {contentId}");
+        }
+
+        if (propertyAlias.IsNullOrWhiteSpace() || !content.HasProperty(propertyAlias))
+        {
+            return Content(
+                $"The content by id {contentId} does not contain a property with alias {propertyAlias ?? "null"}");
+        }
+
+        if (content.ContentType.VariesByCulture() && culture.IsNullOrWhiteSpace())
+        {
+            return Content($"The content by id {contentId} varies by culture but no culture was specified");
+        }
+
+        if (value.IsNullOrWhiteSpace())
+        {
+            return Content("'value' cannot be null");
+        }
+
+        if (segment.IsNullOrWhiteSpace())
+        {
+            return Content("'segment' cannot be null");
+        }
+
+        content.SetValue(propertyAlias, value, culture, segment);
+        Services.ContentService.Save(content);
+
+        return Content($"Segment value has been set on content {contentId} for property {propertyAlias}");
     }
 }
diff --git a/tests/Umbraco.TestData/UmbracoTestDataController.cs b/tests/Umbraco.TestData/UmbracoTestDataController.cs
index b3d909c937..2e44764030 100644
--- a/tests/Umbraco.TestData/UmbracoTestDataController.cs
+++ b/tests/Umbraco.TestData/UmbracoTestDataController.cs
@@ -19,306 +19,301 @@ using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Extensions;
 using Umbraco.TestData.Configuration;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.TestData
+namespace Umbraco.TestData;
+
+/// <summary>
+///     Creates test data
+/// </summary>
+public class UmbracoTestDataController : SurfaceController
 {
-    /// <summary>
-    /// Creates test data
-    /// </summary>
-    public class UmbracoTestDataController : SurfaceController
+    private const string RichTextDataTypeName = "UmbracoTestDataContent.RTE";
+    private const string MediaPickerDataTypeName = "UmbracoTestDataContent.MediaPicker";
+    private const string TextDataTypeName = "UmbracoTestDataContent.Text";
+    private const string TestDataContentTypeAlias = "umbTestDataContent";
+    private readonly PropertyEditorCollection _propertyEditors;
+    private readonly ICoreScopeProvider _scopeProvider;
+    private readonly IShortStringHelper _shortStringHelper;
+    private readonly TestDataSettings _testDataSettings;
+
+    public UmbracoTestDataController(
+        IUmbracoContextAccessor umbracoContextAccessor,
+        IUmbracoDatabaseFactory databaseFactory,
+        ServiceContext services,
+        AppCaches appCaches,
+        IProfilingLogger profilingLogger,
+        IPublishedUrlProvider publishedUrlProvider,
+        ICoreScopeProvider scopeProvider,
+        PropertyEditorCollection propertyEditors,
+        IShortStringHelper shortStringHelper,
+        IOptions<TestDataSettings> testDataSettings)
+        : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger, publishedUrlProvider)
     {
-        private const string RichTextDataTypeName = "UmbracoTestDataContent.RTE";
-        private const string MediaPickerDataTypeName = "UmbracoTestDataContent.MediaPicker";
-        private const string TextDataTypeName = "UmbracoTestDataContent.Text";
-        private const string TestDataContentTypeAlias = "umbTestDataContent";
-        private readonly ICoreScopeProvider _scopeProvider;
-        private readonly PropertyEditorCollection _propertyEditors;
-        private readonly IShortStringHelper _shortStringHelper;
-        private readonly TestDataSettings _testDataSettings;
+        _scopeProvider = scopeProvider;
+        _propertyEditors = propertyEditors;
+        _shortStringHelper = shortStringHelper;
+        _testDataSettings = testDataSettings.Value;
+    }
 
-        public UmbracoTestDataController(
-            IUmbracoContextAccessor umbracoContextAccessor,
-            IUmbracoDatabaseFactory databaseFactory,
-            ServiceContext services,
-            AppCaches appCaches,
-            IProfilingLogger profilingLogger,
-            IPublishedUrlProvider publishedUrlProvider,
-            ICoreScopeProvider scopeProvider,
-            PropertyEditorCollection propertyEditors,
-            IShortStringHelper shortStringHelper,
-            IOptions<TestDataSettings> testDataSettings)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger, publishedUrlProvider)
+    /// <summary>
+    ///     Creates a content and associated media tree (hierarchy)
+    /// </summary>
+    /// <param name="count"></param>
+    /// <param name="depth"></param>
+    /// <param name="locale"></param>
+    /// <returns></returns>
+    /// <remarks>
+    ///     Each content item created is associated to a media item via a media picker and therefore a relation is created
+    ///     between the two
+    /// </remarks>
+    public IActionResult CreateTree(int count, int depth, string locale = "en")
+    {
+        if (_testDataSettings.Enabled == false)
         {
-            _scopeProvider = scopeProvider;
-            _propertyEditors = propertyEditors;
-            _shortStringHelper = shortStringHelper;
-            _testDataSettings = testDataSettings.Value;
+            return NotFound();
         }
 
-        /// <summary>
-        /// Creates a content and associated media tree (hierarchy)
-        /// </summary>
-        /// <param name="count"></param>
-        /// <param name="depth"></param>
-        /// <param name="locale"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Each content item created is associated to a media item via a media picker and therefore a relation is created between the two
-        /// </remarks>
-        public IActionResult CreateTree(int count, int depth, string locale = "en")
+        if (!Validate(count, depth, out var message, out var perLevel))
         {
-            if (_testDataSettings.Enabled == false)
-            {
-                return NotFound();
-            }
-
-            if (!Validate(count, depth, out var message, out var perLevel))
-            {
-                throw new InvalidOperationException(message);
-            }
-
-            var faker = new Faker(locale);
-            var company = faker.Company.CompanyName();
-
-            using (ICoreScope scope = _scopeProvider.CreateCoreScope())
-            {
-                var imageIds = CreateMediaTree(company, faker, count, depth).ToList();
-                var contentIds = CreateContentTree(company, faker, count, depth, imageIds, out var root).ToList();
-
-                Services.ContentService.SaveAndPublishBranch(root, true);
-
-                scope.Complete();
-            }
-
-
-            return Content("Done");
+            throw new InvalidOperationException(message);
         }
 
-        private static bool Validate(int count, int depth, out string message, out int perLevel)
+        var faker = new Faker(locale);
+        var company = faker.Company.CompanyName();
+
+        using (var scope = _scopeProvider.CreateCoreScope())
         {
-            perLevel = 0;
-            message = null;
+            var imageIds = CreateMediaTree(company, faker, count, depth).ToList();
+            var contentIds = CreateContentTree(company, faker, count, depth, imageIds, out var root).ToList();
 
-            if (count <= 0)
-            {
-                message = "Count must be more than 0";
-                return false;
-            }
+            Services.ContentService.SaveAndPublishBranch(root, true);
 
-            perLevel = count / depth;
-            if (perLevel < 1)
-            {
-                message = "Count not high enough for specified for number of levels required";
-                return false;
-            }
-
-            return true;
+            scope.Complete();
         }
 
-        /// <summary>
-        /// Utility to create a tree hierarchy
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="parent"></param>
-        /// <param name="count"></param>
-        /// <param name="depth"></param>
-        /// <param name="create">
-        /// A callback that returns a tuple of Content and another callback to produce a Container.
-        /// For media, a container will be another folder, for content the container will be the Content itself.
-        /// </param>
-        /// <returns></returns>
-        private IEnumerable<Udi> CreateHierarchy<T>(
-            T parent, int count, int depth,
-            Func<T, (T content, Func<T> container)> create)
-            where T: class, IContentBase
+
+        return Content("Done");
+    }
+
+    private static bool Validate(int count, int depth, out string message, out int perLevel)
+    {
+        perLevel = 0;
+        message = null;
+
+        if (count <= 0)
         {
-            yield return parent.GetUdi();
+            message = "Count must be more than 0";
+            return false;
+        }
 
-            // This will not calculate a balanced tree but it will ensure that there will be enough nodes deep enough to not fill up the tree.
-            var totalDescendants = count - 1;
-            var perLevel = Math.Ceiling(totalDescendants / (double)depth);
-            var perBranch = Math.Ceiling(perLevel / depth);
+        perLevel = count / depth;
+        if (perLevel < 1)
+        {
+            message = "Count not high enough for specified for number of levels required";
+            return false;
+        }
 
-            var tracked = new Stack<(T parent, int childCount)>();
+        return true;
+    }
 
-            var currChildCount = 0;
+    /// <summary>
+    ///     Utility to create a tree hierarchy
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="parent"></param>
+    /// <param name="count"></param>
+    /// <param name="depth"></param>
+    /// <param name="create">
+    ///     A callback that returns a tuple of Content and another callback to produce a Container.
+    ///     For media, a container will be another folder, for content the container will be the Content itself.
+    /// </param>
+    /// <returns></returns>
+    private IEnumerable<Udi> CreateHierarchy<T>(T parent, int count, int depth, Func<T, (T content, Func<T> container)> create)
+        where T : class, IContentBase
+    {
+        yield return parent.GetUdi();
 
-            for (int i = 0; i < count; i++)
+        // This will not calculate a balanced tree but it will ensure that there will be enough nodes deep enough to not fill up the tree.
+        var totalDescendants = count - 1;
+        var perLevel = Math.Ceiling(totalDescendants / (double)depth);
+        var perBranch = Math.Ceiling(perLevel / depth);
+
+        var tracked = new Stack<(T parent, int childCount)>();
+
+        var currChildCount = 0;
+
+        for (var i = 0; i < count; i++)
+        {
+            var (content, container) = create(parent);
+            var contentItem = content;
+
+            yield return contentItem.GetUdi();
+
+            currChildCount++;
+
+            if (currChildCount == perBranch)
             {
-                (T content, Func<T> container) created = create(parent);
-                T contentItem = created.content;
+                // move back up...
 
-                yield return contentItem.GetUdi();
+                var prev = tracked.Pop();
 
-                currChildCount++;
+                // restore child count
+                currChildCount = prev.childCount;
+                // restore the parent
+                parent = prev.parent;
+            }
+            else if (contentItem.Level < depth)
+            {
+                // track the current parent and it's current child count
+                tracked.Push((parent, currChildCount));
 
-                if (currChildCount == perBranch)
-                {
-                    // move back up...
-
-                    (T parent, int childCount) prev = tracked.Pop();
-
-                    // restore child count
-                    currChildCount = prev.childCount;
-                    // restore the parent
-                    parent = prev.parent;
-
-                }
-                else if (contentItem.Level < depth)
-                {
-                    // track the current parent and it's current child count
-                    tracked.Push((parent, currChildCount));
-
-                    // not at max depth, create below
-                    parent = created.container();
-
-                    currChildCount = 0;
-                }
+                // not at max depth, create below
+                parent = container();
 
+                currChildCount = 0;
             }
         }
+    }
 
-        /// <summary>
-        /// Creates the media tree hiearachy
-        /// </summary>
-        /// <param name="company"></param>
-        /// <param name="faker"></param>
-        /// <param name="count"></param>
-        /// <param name="depth"></param>
-        /// <returns></returns>
-        private IEnumerable<Udi> CreateMediaTree(string company, Faker faker, int count, int depth)
+    /// <summary>
+    ///     Creates the media tree hiearachy
+    /// </summary>
+    /// <param name="company"></param>
+    /// <param name="faker"></param>
+    /// <param name="count"></param>
+    /// <param name="depth"></param>
+    /// <returns></returns>
+    private IEnumerable<Udi> CreateMediaTree(string company, Faker faker, int count, int depth)
+    {
+        var parent =
+            Services.MediaService.CreateMediaWithIdentity(company, -1, Constants.Conventions.MediaTypes.Folder);
+
+        return CreateHierarchy(parent, count, depth, currParent =>
         {
-            IMedia parent = Services.MediaService.CreateMediaWithIdentity(company, -1, Constants.Conventions.MediaTypes.Folder);
+            var imageUrl = faker.Image.PicsumUrl();
 
-            return CreateHierarchy(parent, count, depth, currParent =>
+            // we are appending a &ext=.jpg to the end of this for a reason. The result of this URL will be something like:
+            // https://picsum.photos/640/480/?image=106
+            // and due to the way that we detect images there must be an extension so we'll change it to
+            // https://picsum.photos/640/480/?image=106&ext=.jpg
+            // which will trick our app into parsing this and thinking it's an image ... which it is so that's good.
+            // if we don't do this we don't get thumbnails in the back office.
+            imageUrl += "&ext=.jpg";
+
+            var media = Services.MediaService.CreateMedia(faker.Commerce.ProductName(), currParent, Constants.Conventions.MediaTypes.Image);
+            media.SetValue(Constants.Conventions.Media.File, imageUrl);
+            Services.MediaService.Save(media);
+            return (media, () =>
             {
-                var imageUrl = faker.Image.PicsumUrl();
+                // create a folder to contain child media
+                var container = Services.MediaService.CreateMediaWithIdentity(faker.Commerce.Department(), currParent, Constants.Conventions.MediaTypes.Folder);
+                return container;
+            }
+            );
+        });
+    }
 
-                // we are appending a &ext=.jpg to the end of this for a reason. The result of this URL will be something like:
-                // https://picsum.photos/640/480/?image=106
-                // and due to the way that we detect images there must be an extension so we'll change it to
-                // https://picsum.photos/640/480/?image=106&ext=.jpg
-                // which will trick our app into parsing this and thinking it's an image ... which it is so that's good.
-                // if we don't do this we don't get thumbnails in the back office.
-                imageUrl += "&ext=.jpg";
+    /// <summary>
+    ///     Creates the content tree hiearachy
+    /// </summary>
+    /// <param name="company"></param>
+    /// <param name="faker"></param>
+    /// <param name="count"></param>
+    /// <param name="depth"></param>
+    /// <param name="imageIds"></param>
+    /// <param name="root"></param>
+    /// <returns></returns>
+    private IEnumerable<Udi> CreateContentTree(string company, Faker faker, int count, int depth, List<Udi> imageIds, out IContent root)
+    {
+        var random = new Random(company.GetHashCode());
 
-                IMedia media = Services.MediaService.CreateMedia(faker.Commerce.ProductName(), currParent, Constants.Conventions.MediaTypes.Image);
-                media.SetValue(Constants.Conventions.Media.File, imageUrl);
-                Services.MediaService.Save(media);
-                return (media, () =>
-                {
-                    // create a folder to contain child media
-                    IMedia container = Services.MediaService.CreateMediaWithIdentity(faker.Commerce.Department(), currParent, Constants.Conventions.MediaTypes.Folder);
-                    return container;
-                });
-            });
-        }
+        var docType = GetOrCreateContentType();
 
-        /// <summary>
-        /// Creates the content tree hiearachy
-        /// </summary>
-        /// <param name="company"></param>
-        /// <param name="faker"></param>
-        /// <param name="count"></param>
-        /// <param name="depth"></param>
-        /// <param name="imageIds"></param>
-        /// <returns></returns>
-        private IEnumerable<Udi> CreateContentTree(string company, Faker faker, int count, int depth, List<Udi> imageIds, out IContent root)
+        var parent = Services.ContentService.Create(company, -1, docType.Alias);
+
+        // give it some reasonable data (100 reviews)
+        parent.SetValue("review", string.Join(" ", Enumerable.Range(0, 100).Select(x => faker.Rant.Review())));
+        parent.SetValue("desc", company);
+        parent.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
+        Services.ContentService.Save(parent);
+
+        root = parent;
+
+        return CreateHierarchy(parent, count, depth, currParent =>
         {
-            var random = new Random(company.GetHashCode());
-
-            IContentType docType = GetOrCreateContentType();
-
-            IContent parent = Services.ContentService.Create(company, -1, docType.Alias);
+            var content = Services.ContentService.Create(faker.Commerce.ProductName(), currParent, docType.Alias);
 
             // give it some reasonable data (100 reviews)
-            parent.SetValue("review", string.Join(" ", Enumerable.Range(0, 100).Select(x => faker.Rant.Review())));
-            parent.SetValue("desc", company);
-            parent.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
-            Services.ContentService.Save(parent);
+            content.SetValue("review", string.Join(" ", Enumerable.Range(0, 100).Select(x => faker.Rant.Review())));
+            content.SetValue("desc", string.Join(", ", Enumerable.Range(0, 5).Select(x => faker.Commerce.ProductAdjective())));
+            content.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
 
-            root = parent;
+            Services.ContentService.Save(content);
+            return (content, () => content);
+        });
+    }
 
-            return CreateHierarchy(parent, count, depth, currParent =>
-            {
-                IContent content = Services.ContentService.Create(faker.Commerce.ProductName(), currParent, docType.Alias);
-
-                // give it some reasonable data (100 reviews)
-                content.SetValue("review", string.Join(" ", Enumerable.Range(0, 100).Select(x => faker.Rant.Review())));
-                content.SetValue("desc", string.Join(", ", Enumerable.Range(0, 5).Select(x => faker.Commerce.ProductAdjective())));
-                content.SetValue("media", imageIds[random.Next(0, imageIds.Count - 1)]);
-
-                Services.ContentService.Save(content);
-                return (content, () => content);
-            });
-
-        }
-
-        private IContentType GetOrCreateContentType()
+    private IContentType GetOrCreateContentType()
+    {
+        var docType = Services.ContentTypeService.Get(TestDataContentTypeAlias);
+        if (docType != null)
         {
-            IContentType docType = Services.ContentTypeService.Get(TestDataContentTypeAlias);
-            if (docType != null)
-            {
-                return docType;
-            }
-
-            docType = new ContentType(_shortStringHelper, -1)
-            {
-                Alias = TestDataContentTypeAlias,
-                Name = "Umbraco Test Data Content",
-                Icon = "icon-science color-green"
-            };
-            docType.AddPropertyGroup("content", "Content");
-            docType.AddPropertyType(new PropertyType(_shortStringHelper, GetOrCreateRichText(), "review")
-            {
-                Name = "Review"
-            });
-            docType.AddPropertyType(new PropertyType(_shortStringHelper, GetOrCreateMediaPicker(), "media")
-            {
-                Name = "Media"
-            });
-            docType.AddPropertyType(new PropertyType(_shortStringHelper, GetOrCreateText(), "desc")
-            {
-                Name = "Description"
-            });
-            Services.ContentTypeService.Save(docType);
-            docType.AllowedContentTypes = new[] { new ContentTypeSort(docType.Id, 0) };
-            Services.ContentTypeService.Save(docType);
             return docType;
         }
 
-        private IDataType GetOrCreateRichText() => GetOrCreateDataType(RichTextDataTypeName, Constants.PropertyEditors.Aliases.TinyMce);
-
-        private IDataType GetOrCreateMediaPicker() => GetOrCreateDataType(MediaPickerDataTypeName, Constants.PropertyEditors.Aliases.MediaPicker);
-
-        private IDataType GetOrCreateText() => GetOrCreateDataType(TextDataTypeName, Constants.PropertyEditors.Aliases.TextBox);
-
-        private IDataType GetOrCreateDataType(string name, string editorAlias)
+        docType = new ContentType(_shortStringHelper, -1)
         {
-            IDataType dt = Services.DataTypeService.GetDataType(name);
-            if (dt != null)
-            {
-                return dt;
-            }
+            Alias = TestDataContentTypeAlias,
+            Name = "Umbraco Test Data Content",
+            Icon = "icon-science color-green"
+        };
+        docType.AddPropertyGroup("content", "Content");
+        docType.AddPropertyType(new PropertyType(_shortStringHelper, GetOrCreateRichText(), "review")
+        {
+            Name = "Review"
+        });
+        docType.AddPropertyType(
+            new PropertyType(_shortStringHelper, GetOrCreateMediaPicker(), "media") { Name = "Media" });
+        docType.AddPropertyType(new PropertyType(_shortStringHelper, GetOrCreateText(), "desc") { Name = "Description" });
+        Services.ContentTypeService.Save(docType);
+        docType.AllowedContentTypes = new[] { new ContentTypeSort(docType.Id, 0) };
+        Services.ContentTypeService.Save(docType);
+        return docType;
+    }
 
-            IDataEditor editor = _propertyEditors.FirstOrDefault(x => x.Alias == editorAlias);
-            if (editor == null)
-            {
-                throw new InvalidOperationException($"No {editorAlias} editor found");
-            }
+    private IDataType GetOrCreateRichText() =>
+        GetOrCreateDataType(RichTextDataTypeName, Constants.PropertyEditors.Aliases.TinyMce);
 
-            var serializer = new ConfigurationEditorJsonSerializer();
+    private IDataType GetOrCreateMediaPicker() =>
+        GetOrCreateDataType(MediaPickerDataTypeName, Constants.PropertyEditors.Aliases.MediaPicker);
 
-            dt = new DataType(editor, serializer)
-            {
-                Name = name,
-                Configuration = editor.GetConfigurationEditor().DefaultConfigurationObject,
-                DatabaseType = ValueStorageType.Ntext
-            };
+    private IDataType GetOrCreateText() =>
+        GetOrCreateDataType(TextDataTypeName, Constants.PropertyEditors.Aliases.TextBox);
 
-            Services.DataTypeService.Save(dt);
+    private IDataType GetOrCreateDataType(string name, string editorAlias)
+    {
+        var dt = Services.DataTypeService.GetDataType(name);
+        if (dt != null)
+        {
             return dt;
         }
+
+        var editor = _propertyEditors.FirstOrDefault(x => x.Alias == editorAlias);
+        if (editor == null)
+        {
+            throw new InvalidOperationException($"No {editorAlias} editor found");
+        }
+
+        var serializer = new ConfigurationEditorJsonSerializer();
+
+        dt = new DataType(editor, serializer)
+        {
+            Name = name,
+            Configuration = editor.GetConfigurationEditor().DefaultConfigurationObject,
+            DatabaseType = ValueStorageType.Ntext
+        };
+
+        Services.DataTypeService.Save(dt);
+        return dt;
     }
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs
index 6f7cea07ca..5910f32801 100644
--- a/tests/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/CombineGuidBenchmarks.cs
@@ -3,47 +3,44 @@ using BenchmarkDotNet.Attributes;
 using Umbraco.Cms.Core;
 using Umbraco.Tests.Benchmarks.Config;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[QuickRunWithMemoryDiagnoserConfig]
+public class CombineGuidBenchmarks
 {
+    private static readonly Guid _a = Guid.NewGuid();
+    private static readonly Guid _b = Guid.NewGuid();
 
-    [QuickRunWithMemoryDiagnoserConfig]
-    public class CombineGuidBenchmarks
+    [Benchmark]
+    public byte[] CombineUtils() => GuidUtils.Combine(_a, _b).ToByteArray();
+
+    [Benchmark]
+    public byte[] CombineLoop() => Combine(_a, _b);
+
+    private static byte[] Combine(Guid guid1, Guid guid2)
     {
-        private static readonly Guid _a = Guid.NewGuid();
-        private static readonly Guid _b = Guid.NewGuid();
-
-        [Benchmark]
-        public byte[] CombineUtils() => GuidUtils.Combine(_a, _b).ToByteArray();
-
-        [Benchmark]
-        public byte[] CombineLoop() => Combine(_a, _b);
-
-        private static byte[] Combine(Guid guid1, Guid guid2)
+        var bytes1 = guid1.ToByteArray();
+        var bytes2 = guid2.ToByteArray();
+        var bytes = new byte[bytes1.Length];
+        for (var i = 0; i < bytes1.Length; i++)
         {
-            var bytes1 = guid1.ToByteArray();
-            var bytes2 = guid2.ToByteArray();
-            var bytes = new byte[bytes1.Length];
-            for (var i = 0; i < bytes1.Length; i++)
-            {
-                bytes[i] = (byte)(bytes1[i] ^ bytes2[i]);
-            }
-
-            return bytes;
+            bytes[i] = (byte)(bytes1[i] ^ bytes2[i]);
         }
+
+        return bytes;
     }
-
-    // Nov 8 2018
-    //BenchmarkDotNet=v0.11.2, OS=Windows 10.0.17763.55 (1809/October2018Update/Redstone5)
-    //Intel Core i7-6600U CPU 2.60GHz(Skylake), 1 CPU, 4 logical and 2 physical cores
-    //  [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
-    //  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
-
-    //IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
-    //WarmupCount=3
-
-    //       Method |     Mean |     Error |    StdDev | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
-    //------------- |---------:|----------:|----------:|------------:|------------:|------------:|--------------------:|
-    // CombineUtils | 33.34 ns |  8.086 ns | 0.4432 ns |      0.0133 |           - |           - |                28 B |
-    //  CombineLoop | 55.03 ns | 11.311 ns | 0.6200 ns |      0.0395 |           - |           - |                84 B |
 }
 
+// Nov 8 2018
+//BenchmarkDotNet=v0.11.2, OS=Windows 10.0.17763.55 (1809/October2018Update/Redstone5)
+//Intel Core i7-6600U CPU 2.60GHz(Skylake), 1 CPU, 4 logical and 2 physical cores
+//  [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
+//  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
+
+//IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
+//WarmupCount=3
+
+//       Method |     Mean |     Error |    StdDev | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
+//------------- |---------:|----------:|----------:|------------:|------------:|------------:|--------------------:|
+// CombineUtils | 33.34 ns |  8.086 ns | 0.4432 ns |      0.0133 |           - |           - |                28 B |
+//  CombineLoop | 55.03 ns | 11.311 ns | 0.6200 ns |      0.0395 |           - |           - |                84 B |
diff --git a/tests/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs
index c59cb04500..5036c63b0d 100644
--- a/tests/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/ConcurrentDictionaryBenchmarks.cs
@@ -1,153 +1,96 @@
-using BenchmarkDotNet.Attributes;
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
 using Umbraco.Cms.Core.Collections;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[MemoryDiagnoser]
+public class ConcurrentDictionaryBenchmarks
 {
-    [MemoryDiagnoser]
-    public class ConcurrentDictionaryBenchmarks
+    private static readonly ConcurrentDictionary<CompositeTypeTypeKey, bool> AssignableTypeCache = new();
+
+    private static readonly object input = new Bar();
+
+    private static readonly Type source = typeof(Bar);
+
+    private static readonly Type target = typeof(Foo);
+
+    [Benchmark(Baseline = true)]
+    public bool GetCachedCanAssignFactory() =>
+        AssignableTypeCache.GetOrAdd(new CompositeTypeTypeKey(source, target), k =>
+        {
+            var ksource = k.Type1;
+            var ktarget = k.Type2;
+
+            return ktarget.IsAssignableFrom(ksource) && typeof(IConvertible).IsAssignableFrom(ksource);
+        });
+
+    [Benchmark]
+    public bool GetCachedCanAssignNoFactory()
     {
-        private static readonly ConcurrentDictionary<CompositeTypeTypeKey, bool> AssignableTypeCache = new ConcurrentDictionary<CompositeTypeTypeKey, bool>();
-
-        private static object input = new Bar();
-
-        private static Type source = typeof(Bar);
-
-        private static Type target = typeof(Foo);
-
-        [Benchmark(Baseline = true)]
-        public bool GetCachedCanAssignFactory()
+        // This method is 10% faster
+        var key = new CompositeTypeTypeKey(source, target);
+        if (AssignableTypeCache.TryGetValue(key, out bool canConvert))
         {
-            return AssignableTypeCache.GetOrAdd(new CompositeTypeTypeKey(source, target), k =>
-            {
-                var ksource = k.Type1;
-                var ktarget = k.Type2;
-
-                return ktarget.IsAssignableFrom(ksource) && typeof(IConvertible).IsAssignableFrom(ksource);
-            });
+            return canConvert;
         }
 
-        [Benchmark]
-        public bool GetCachedCanAssignNoFactory()
+        // "is" is faster than "IsAssignableFrom"
+        if (input is IConvertible && target.IsAssignableFrom(source))
         {
-            // This method is 10% faster
-            var key = new CompositeTypeTypeKey(source, target);
-            bool canConvert;
-            if (AssignableTypeCache.TryGetValue(key, out canConvert))
-            {
-                return canConvert;
-            }
-
-            // "is" is faster than "IsAssignableFrom"
-            if (input is IConvertible && target.IsAssignableFrom(source))
-            {
-                return AssignableTypeCache[key] = true;
-            }
-
-            return AssignableTypeCache[key] = false;
+            return AssignableTypeCache[key] = true;
         }
 
-        private class Foo : IConvertible
+        return AssignableTypeCache[key] = false;
+    }
+
+    private class Foo : IConvertible
+    {
+        public TypeCode GetTypeCode() => TypeCode.Object;
+
+        public bool ToBoolean(IFormatProvider provider) => throw new NotImplementedException();
+
+        public byte ToByte(IFormatProvider provider) => throw new NotImplementedException();
+
+        public char ToChar(IFormatProvider provider) => throw new NotImplementedException();
+
+        public DateTime ToDateTime(IFormatProvider provider) => throw new NotImplementedException();
+
+        public decimal ToDecimal(IFormatProvider provider) => throw new NotImplementedException();
+
+        public double ToDouble(IFormatProvider provider) => throw new NotImplementedException();
+
+        public short ToInt16(IFormatProvider provider) => throw new NotImplementedException();
+
+        public int ToInt32(IFormatProvider provider) => throw new NotImplementedException();
+
+        public long ToInt64(IFormatProvider provider) => throw new NotImplementedException();
+
+        public sbyte ToSByte(IFormatProvider provider) => throw new NotImplementedException();
+
+        public float ToSingle(IFormatProvider provider) => throw new NotImplementedException();
+
+        public string ToString(IFormatProvider provider) => throw new NotImplementedException();
+
+        public object ToType(Type conversionType, IFormatProvider provider)
         {
-            public TypeCode GetTypeCode()
+            if (conversionType == typeof(Foo))
             {
-                return TypeCode.Object;
+                return new Foo();
             }
 
-            public bool ToBoolean(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public byte ToByte(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public char ToChar(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public DateTime ToDateTime(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public decimal ToDecimal(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public double ToDouble(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public short ToInt16(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public int ToInt32(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public long ToInt64(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public sbyte ToSByte(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public float ToSingle(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public string ToString(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public object ToType(Type conversionType, IFormatProvider provider)
-            {
-                if (conversionType == typeof(Foo))
-                {
-                    return new Foo();
-                }
-
-                throw new NotImplementedException();
-            }
-
-            public ushort ToUInt16(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public uint ToUInt32(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
-
-            public ulong ToUInt64(IFormatProvider provider)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
         }
 
-        private class Bar : Foo
-        {
+        public ushort ToUInt16(IFormatProvider provider) => throw new NotImplementedException();
 
-        }
+        public uint ToUInt32(IFormatProvider provider) => throw new NotImplementedException();
+
+        public ulong ToUInt64(IFormatProvider provider) => throw new NotImplementedException();
+    }
+
+    private class Bar : Foo
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs b/tests/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs
index 0e87bfb584..ffef887e6a 100644
--- a/tests/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs
+++ b/tests/Umbraco.Tests.Benchmarks/Config/QuickRunConfigAttribute.cs
@@ -1,34 +1,31 @@
-using System;
+using System;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Jobs;
 using Perfolizer.Horology;
 
-namespace Umbraco.Tests.Benchmarks.Config
+namespace Umbraco.Tests.Benchmarks.Config;
+
+/// <summary>
+///     Configures the benchmark to run with less warmup and a shorter iteration time than the standard benchmark.
+/// </summary>
+[AttributeUsage(AttributeTargets.Class)]
+public class QuickRunConfigAttribute : Attribute, IConfigSource
 {
     /// <summary>
-    /// Configures the benchmark to run with less warmup and a shorter iteration time than the standard benchmark.
+    ///     Initializes a new instance of the <see cref="QuickRunConfigAttribute" /> class.
     /// </summary>
-    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-    public class QuickRunConfigAttribute : Attribute, IConfigSource
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QuickRunConfigAttribute"/> class.
-        /// </summary>
-        public QuickRunConfigAttribute()
-        {
-            this.Config = (ManualConfig)ManualConfig.CreateEmpty()
-                .With(Job.Default.WithLaunchCount(1) // benchmark process will be launched only once
+    public QuickRunConfigAttribute() =>
+        Config = (ManualConfig)ManualConfig.CreateEmpty()
+            .With(Job.Default.WithLaunchCount(1) // benchmark process will be launched only once
                 .WithIterationTime(new TimeInterval(100, TimeUnit.Millisecond)) // 100ms per iteration
                 .WithWarmupCount(3) // 3 warmup iteration
                 .WithIterationCount(3)); // 3 target iteration
-        }
 
-        /// <summary>
-        /// Gets the manual configuration.
-        /// </summary>
-        protected ManualConfig Config { get; }
+    /// <summary>
+    ///     Gets the manual configuration.
+    /// </summary>
+    protected ManualConfig Config { get; }
 
-        /// <inheritdoc/>
-        IConfig IConfigSource.Config => this.Config;
-    }
+    /// <inheritdoc />
+    IConfig IConfigSource.Config => Config;
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs b/tests/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs
index 73e4fd6de2..aa5ac5afb2 100644
--- a/tests/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs
+++ b/tests/Umbraco.Tests.Benchmarks/Config/QuickRunWithMemoryDiagnoserConfigAttribute.cs
@@ -1,20 +1,15 @@
-using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Diagnosers;
 
-namespace Umbraco.Tests.Benchmarks.Config
+namespace Umbraco.Tests.Benchmarks.Config;
+
+/// <summary>
+///     Configures the benchmark to run with less warmup and a shorter iteration time than the standard benchmark,
+///     and include memory usage diagnosis.
+/// </summary>
+public class QuickRunWithMemoryDiagnoserConfigAttribute : QuickRunConfigAttribute
 {
     /// <summary>
-    /// Configures the benchmark to run with less warmup and a shorter iteration time than the standard benchmark,
-    /// and include memory usage diagnosis.
+    ///     Initializes a new instance of the <see cref="QuickRunWithMemoryDiagnoserConfigAttribute" /> class.
     /// </summary>
-    public class QuickRunWithMemoryDiagnoserConfigAttribute : QuickRunConfigAttribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="QuickRunWithMemoryDiagnoserConfigAttribute"/> class.
-        /// </summary>
-        public QuickRunWithMemoryDiagnoserConfigAttribute()
-        {
-            Config.Add(MemoryDiagnoser.Default);
-        }
-    }
+    public QuickRunWithMemoryDiagnoserConfigAttribute() => Config.Add(MemoryDiagnoser.Default);
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs
index b3df1c14e8..05db4034dd 100644
--- a/tests/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/EnumeratorBenchmarks.cs
@@ -1,28 +1,33 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[MemoryDiagnoser]
+public class EnumeratorBenchmarks
 {
-    [MemoryDiagnoser]
-    public class EnumeratorBenchmarks
+    [Benchmark(Baseline = true)]
+    public void WithArray()
     {
-        [Benchmark(Baseline = true)]
-        public void WithArray()
+        foreach (var t in EnumerateOneWithArray(1))
         {
-            foreach (var t in EnumerateOneWithArray(1)) ;
-        }
-
-        [Benchmark]
-        public void WithYield()
-        {
-            foreach (var t in EnumerateOneWithYield(1)) ;
-        }
-
-        private IEnumerable<T> EnumerateOneWithArray<T>(T o) => new [] { o };
-
-        private IEnumerable<T> EnumerateOneWithYield<T>(T o)
-        {
-            yield return o;
+            ;
         }
     }
+
+    [Benchmark]
+    public void WithYield()
+    {
+        foreach (var t in EnumerateOneWithYield(1))
+        {
+            ;
+        }
+    }
+
+    private IEnumerable<T> EnumerateOneWithArray<T>(T o) => new[] { o };
+
+    private IEnumerable<T> EnumerateOneWithYield<T>(T o)
+    {
+        yield return o;
+    }
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/HashFromStreams.cs b/tests/Umbraco.Tests.Benchmarks/HashFromStreams.cs
index 9d2d483c69..cc8ad90877 100644
--- a/tests/Umbraco.Tests.Benchmarks/HashFromStreams.cs
+++ b/tests/Umbraco.Tests.Benchmarks/HashFromStreams.cs
@@ -2,131 +2,130 @@ using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 using BenchmarkDotNet.Attributes;
-using Umbraco.Tests.Benchmarks.Config;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[MemoryDiagnoser]
+public class HashFromStreams
 {
-    [MemoryDiagnoser]
-    public class HashFromStreams
+    private readonly Stream _largeFile;
+    private readonly SHA1Managed _managed;
+    private readonly Stream _medFile;
+    private readonly SHA1 _normal;
+
+    private readonly Stream _smallFile;
+    // according to this post: https://stackoverflow.com/a/1051777/694494
+    // the SHA1CryptoServiceProvider is faster, but that is not reflected in these benchmarks.
+
+    /*
+    
+    BenchmarkDotNet=v0.13.0, OS=Windows 10.0.19042.1052 (20H2/October2020Update)
+    Intel Core i7-7700HQ CPU 2.80GHz (Kaby Lake), 1 CPU, 8 logical and 4 physical cores
+    .NET SDK=5.0.300-preview.21258.4
+      [Host]     : .NET 5.0.7 (5.0.721.25508), X64 RyuJIT
+      DefaultJob : .NET 5.0.7 (5.0.721.25508), X64 RyuJIT
+
+
+    ```
+    |                  Method |         Mean |       Error |      StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
+    |------------------------ |-------------:|------------:|------------:|------:|------:|------:|----------:|
+    |    NormalSmall100KBFile |     279.6 μs |     4.97 μs |     4.65 μs |     - |     - |     - |      1 KB |
+    |     NormalMedium5MBFile |  15,051.0 μs |   242.68 μs |   215.13 μs |     - |     - |     - |      1 KB |
+    |    NormalLarge100MBFile | 303,356.2 μs | 2,520.40 μs | 2,234.27 μs |     - |     - |     - |      1 KB |
+    |   ManagedSmall100KBFile |     281.2 μs |     5.54 μs |     5.69 μs |     - |     - |     - |      1 KB |
+    |    ManagedMedium5MBFile |  14,895.4 μs |    95.67 μs |    74.69 μs |     - |     - |     - |      1 KB |
+    |   ManagedLarge100MBFile | 302,513.9 μs | 3,681.02 μs | 3,073.82 μs |     - |     - |     - |      2 KB |
+    | UnmanagedSmall100KBFile |     279.1 μs |     2.91 μs |     2.43 μs |     - |     - |     - |      1 KB |
+    |  UnmanagedMedium5MBFile |  14,969.7 μs |   169.22 μs |   150.01 μs |     - |     - |     - |      1 KB |
+    | UnmanagedLarge100MBFile | 306,127.9 μs | 3,203.10 μs | 2,839.46 μs |     - |     - |     - |      2 KB |
+
+
+    */
+
+    private readonly SHA1CryptoServiceProvider _unmanaged;
+
+    public HashFromStreams()
     {
-        // according to this post: https://stackoverflow.com/a/1051777/694494
-        // the SHA1CryptoServiceProvider is faster, but that is not reflected in these benchmarks.
+        _unmanaged = new SHA1CryptoServiceProvider();
+        _managed = new SHA1Managed();
+        _normal = SHA1.Create();
+        _smallFile = File.OpenRead(@"C:\YOUR_PATH_GOES_HERE\small-file.bin");
+        _medFile = File.OpenRead(@"C:\YOUR_PATH_GOES_HERE\med-file.bin");
+        _largeFile = File.OpenRead(@"C:\YOUR_PATH_GOES_HERE\large-file.bin");
+    }
 
-        /*
-        
-        BenchmarkDotNet=v0.13.0, OS=Windows 10.0.19042.1052 (20H2/October2020Update)
-        Intel Core i7-7700HQ CPU 2.80GHz (Kaby Lake), 1 CPU, 8 logical and 4 physical cores
-        .NET SDK=5.0.300-preview.21258.4
-          [Host]     : .NET 5.0.7 (5.0.721.25508), X64 RyuJIT
-          DefaultJob : .NET 5.0.7 (5.0.721.25508), X64 RyuJIT
-
-
-        ```
-        |                  Method |         Mean |       Error |      StdDev | Gen 0 | Gen 1 | Gen 2 | Allocated |
-        |------------------------ |-------------:|------------:|------------:|------:|------:|------:|----------:|
-        |    NormalSmall100KBFile |     279.6 μs |     4.97 μs |     4.65 μs |     - |     - |     - |      1 KB |
-        |     NormalMedium5MBFile |  15,051.0 μs |   242.68 μs |   215.13 μs |     - |     - |     - |      1 KB |
-        |    NormalLarge100MBFile | 303,356.2 μs | 2,520.40 μs | 2,234.27 μs |     - |     - |     - |      1 KB |
-        |   ManagedSmall100KBFile |     281.2 μs |     5.54 μs |     5.69 μs |     - |     - |     - |      1 KB |
-        |    ManagedMedium5MBFile |  14,895.4 μs |    95.67 μs |    74.69 μs |     - |     - |     - |      1 KB |
-        |   ManagedLarge100MBFile | 302,513.9 μs | 3,681.02 μs | 3,073.82 μs |     - |     - |     - |      2 KB |
-        | UnmanagedSmall100KBFile |     279.1 μs |     2.91 μs |     2.43 μs |     - |     - |     - |      1 KB |
-        |  UnmanagedMedium5MBFile |  14,969.7 μs |   169.22 μs |   150.01 μs |     - |     - |     - |      1 KB |
-        | UnmanagedLarge100MBFile | 306,127.9 μs | 3,203.10 μs | 2,839.46 μs |     - |     - |     - |      2 KB |
-
-
-        */
-
-        private readonly SHA1CryptoServiceProvider _unmanaged;
-        private readonly SHA1Managed _managed;
-        private readonly SHA1 _normal;
-        private readonly Stream _smallFile;
-        private readonly Stream _medFile;
-        private readonly Stream _largeFile;
-
-        public HashFromStreams()
+    private string DoHash(HashAlgorithm alg, Stream stream)
+    {
+        var stringBuilder = new StringBuilder();
+        var hashedByteArray = alg.ComputeHash(stream);
+        foreach (var b in hashedByteArray)
         {
-            _unmanaged = new SHA1CryptoServiceProvider();
-            _managed = new SHA1Managed();
-            _normal = SHA1.Create();
-            _smallFile = File.OpenRead(@"C:\YOUR_PATH_GOES_HERE\small-file.bin");
-            _medFile = File.OpenRead(@"C:\YOUR_PATH_GOES_HERE\med-file.bin");
-            _largeFile = File.OpenRead(@"C:\YOUR_PATH_GOES_HERE\large-file.bin");
+            stringBuilder.Append(b.ToString("x2"));
         }
 
-        private string DoHash(HashAlgorithm alg, Stream stream)
-        {
-            var stringBuilder = new StringBuilder();
-            var hashedByteArray = alg.ComputeHash(stream);
-            foreach (var b in hashedByteArray)
-            {
-                stringBuilder.Append(b.ToString("x2"));
-            }
-            return stringBuilder.ToString();
-        }
+        return stringBuilder.ToString();
+    }
 
-        [Benchmark]
-        public string NormalSmall100KBFile()
-        {
-            _smallFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_normal, _smallFile);
-        }
+    [Benchmark]
+    public string NormalSmall100KBFile()
+    {
+        _smallFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_normal, _smallFile);
+    }
 
-        [Benchmark]
-        public string NormalMedium5MBFile()
-        {
-            _medFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_normal, _medFile);
-        }
+    [Benchmark]
+    public string NormalMedium5MBFile()
+    {
+        _medFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_normal, _medFile);
+    }
 
-        [Benchmark]
-        public string NormalLarge100MBFile()
-        {
-            _largeFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_normal, _largeFile);
-        }
+    [Benchmark]
+    public string NormalLarge100MBFile()
+    {
+        _largeFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_normal, _largeFile);
+    }
 
-        [Benchmark]
-        public string ManagedSmall100KBFile()
-        {
-            _smallFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_managed, _smallFile);
-        }
+    [Benchmark]
+    public string ManagedSmall100KBFile()
+    {
+        _smallFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_managed, _smallFile);
+    }
 
-        [Benchmark]
-        public string ManagedMedium5MBFile()
-        {
-            _medFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_managed, _medFile);
-        }
+    [Benchmark]
+    public string ManagedMedium5MBFile()
+    {
+        _medFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_managed, _medFile);
+    }
 
-        [Benchmark]
-        public string ManagedLarge100MBFile()
-        {
-            _largeFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_managed, _largeFile);
-        }
+    [Benchmark]
+    public string ManagedLarge100MBFile()
+    {
+        _largeFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_managed, _largeFile);
+    }
 
-        [Benchmark]
-        public string UnmanagedSmall100KBFile()
-        {
-            _smallFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_unmanaged, _smallFile);
-        }
+    [Benchmark]
+    public string UnmanagedSmall100KBFile()
+    {
+        _smallFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_unmanaged, _smallFile);
+    }
 
-        [Benchmark]
-        public string UnmanagedMedium5MBFile()
-        {
-            _medFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_unmanaged, _medFile);
-        }
+    [Benchmark]
+    public string UnmanagedMedium5MBFile()
+    {
+        _medFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_unmanaged, _medFile);
+    }
 
-        [Benchmark]
-        public string UnmanagedLarge100MBFile()
-        {
-            _largeFile.Seek(0, SeekOrigin.Begin);
-            return DoHash(_unmanaged, _largeFile);
-        }
+    [Benchmark]
+    public string UnmanagedLarge100MBFile()
+    {
+        _largeFile.Seek(0, SeekOrigin.Begin);
+        return DoHash(_unmanaged, _largeFile);
     }
 }
-
diff --git a/tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs
index 7f6f766aed..009ddc1bc1 100644
--- a/tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/HexStringBenchmarks.cs
@@ -4,66 +4,65 @@ using BenchmarkDotNet.Attributes;
 using Umbraco.Cms.Core;
 using Umbraco.Tests.Benchmarks.Config;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[QuickRunConfig]
+public class HexStringBenchmarks
 {
-    [QuickRunConfig]
-    public class HexStringBenchmarks
+    private byte[] _buffer;
+
+    [Params(8, 16, 32, 64, 128, 256)]
+    public int Count { get; set; }
+
+    [GlobalSetup]
+    public void Setup()
     {
-        private byte[] _buffer;
-
-        [Params(8, 16, 32, 64, 128, 256)]
-        public int Count { get; set; }
-
-        [GlobalSetup]
-        public void Setup()
-        {
-            this._buffer = new byte[this.Count];
-            var random = new Random();
-            random.NextBytes(this._buffer);
-        }
-
-        [Benchmark(Baseline = true)]
-        public string ToHexStringBuilder()
-        {
-            var sb = new StringBuilder(this._buffer.Length * 2);
-            for (var i = 0; i < this._buffer.Length; i++)
-            {
-                sb.Append(this._buffer[i].ToString("X2"));
-            }
-
-            return sb.ToString();
-        }
-
-        [Benchmark]
-        public string ToHexStringEncoder() => HexEncoder.Encode(this._buffer);
+        _buffer = new byte[Count];
+        var random = new Random();
+        random.NextBytes(_buffer);
     }
 
-    // Nov 8 2018
-    //BenchmarkDotNet=v0.11.2, OS=Windows 10.0.17763.55 (1809/October2018Update/Redstone5)
-    //Intel Core i7-6600U CPU 2.60GHz(Skylake), 1 CPU, 4 logical and 2 physical cores
-    // [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
-    //  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
+    [Benchmark(Baseline = true)]
+    public string ToHexStringBuilder()
+    {
+        var sb = new StringBuilder(_buffer.Length * 2);
+        for (var i = 0; i < _buffer.Length; i++)
+        {
+            sb.Append(_buffer[i].ToString("X2"));
+        }
 
-    //IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
-    //WarmupCount=3
+        return sb.ToString();
+    }
 
-    //             Method | Count |         Mean |        Error |     StdDev | Ratio |
-    //------------------- |------ |-------------:|-------------:|-----------:|------:|
-    // ToHexStringBuilder |     8 |    786.49 ns |    319.92 ns |  17.536 ns |  1.00 |
-    // ToHexStringEncoder |     8 |     64.19 ns |     30.21 ns |   1.656 ns |  0.08 |
-    //                    |       |              |              |            |       |
-    // ToHexStringBuilder |    16 |  1,442.43 ns |    503.00 ns |  27.571 ns |  1.00 |
-    // ToHexStringEncoder |    16 |    133.46 ns |    177.55 ns |   9.732 ns |  0.09 |
-    //                    |       |              |              |            |       |
-    // ToHexStringBuilder |    32 |  2,869.23 ns |    924.35 ns |  50.667 ns |  1.00 |
-    // ToHexStringEncoder |    32 |    181.03 ns |     96.64 ns |   5.297 ns |  0.06 |
-    //                    |       |              |              |            |       |
-    // ToHexStringBuilder |    64 |  5,775.33 ns |  2,825.42 ns | 154.871 ns |  1.00 |
-    // ToHexStringEncoder |    64 |    331.16 ns |    125.63 ns |   6.886 ns |  0.06 |
-    //                    |       |              |              |            |       |
-    // ToHexStringBuilder |   128 | 11,662.35 ns |  4,908.03 ns | 269.026 ns |  1.00 |
-    // ToHexStringEncoder |   128 |    633.78 ns |     57.56 ns |   3.155 ns |  0.05 |
-    //                    |       |              |              |            |       |
-    // ToHexStringBuilder |   256 | 22,960.11 ns | 14,111.47 ns | 773.497 ns |  1.00 |
-    // ToHexStringEncoder |   256 |  1,224.76 ns |    547.27 ns |  29.998 ns |  0.05 |
+    [Benchmark]
+    public string ToHexStringEncoder() => HexEncoder.Encode(_buffer);
 }
+
+// Nov 8 2018
+//BenchmarkDotNet=v0.11.2, OS=Windows 10.0.17763.55 (1809/October2018Update/Redstone5)
+//Intel Core i7-6600U CPU 2.60GHz(Skylake), 1 CPU, 4 logical and 2 physical cores
+// [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
+//  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.7.3190.0
+
+//IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
+//WarmupCount=3
+
+//             Method | Count |         Mean |        Error |     StdDev | Ratio |
+//------------------- |------ |-------------:|-------------:|-----------:|------:|
+// ToHexStringBuilder |     8 |    786.49 ns |    319.92 ns |  17.536 ns |  1.00 |
+// ToHexStringEncoder |     8 |     64.19 ns |     30.21 ns |   1.656 ns |  0.08 |
+//                    |       |              |              |            |       |
+// ToHexStringBuilder |    16 |  1,442.43 ns |    503.00 ns |  27.571 ns |  1.00 |
+// ToHexStringEncoder |    16 |    133.46 ns |    177.55 ns |   9.732 ns |  0.09 |
+//                    |       |              |              |            |       |
+// ToHexStringBuilder |    32 |  2,869.23 ns |    924.35 ns |  50.667 ns |  1.00 |
+// ToHexStringEncoder |    32 |    181.03 ns |     96.64 ns |   5.297 ns |  0.06 |
+//                    |       |              |              |            |       |
+// ToHexStringBuilder |    64 |  5,775.33 ns |  2,825.42 ns | 154.871 ns |  1.00 |
+// ToHexStringEncoder |    64 |    331.16 ns |    125.63 ns |   6.886 ns |  0.06 |
+//                    |       |              |              |            |       |
+// ToHexStringBuilder |   128 | 11,662.35 ns |  4,908.03 ns | 269.026 ns |  1.00 |
+// ToHexStringEncoder |   128 |    633.78 ns |     57.56 ns |   3.155 ns |  0.05 |
+//                    |       |              |              |            |       |
+// ToHexStringBuilder |   256 | 22,960.11 ns | 14,111.47 ns | 773.497 ns |  1.00 |
+// ToHexStringEncoder |   256 |  1,224.76 ns |    547.27 ns |  29.998 ns |  0.05 |
diff --git a/tests/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs
index 7f419547bd..390bb31b61 100644
--- a/tests/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/JsonSerializerSettingsBenchmarks.cs
@@ -1,69 +1,60 @@
-using BenchmarkDotNet.Attributes;
+using BenchmarkDotNet.Attributes;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Umbraco.Tests.Benchmarks.Config;
 
-namespace Umbraco.Tests.Benchmarks
-{
-    [QuickRunConfig]
-    [MemoryDiagnoser]
-    public class JsonSerializerSettingsBenchmarks
-    {
-        [Benchmark]
-        public void SerializerSettingsInstantiation()
-        {
-            int instances = 1000;
-            for (int i = 0; i < instances; i++)
-            {
-                new JsonSerializerSettings();
-            }
-        }
+namespace Umbraco.Tests.Benchmarks;
 
-        [Benchmark(Baseline =true)]
-        public void SerializerSettingsSingleInstantiation()
+[QuickRunConfig]
+[MemoryDiagnoser]
+public class JsonSerializerSettingsBenchmarks
+{
+    [Benchmark]
+    public void SerializerSettingsInstantiation()
+    {
+        var instances = 1000;
+        for (var i = 0; i < instances; i++)
         {
             new JsonSerializerSettings();
         }
-
-//        // * Summary *
-
-//        BenchmarkDotNet=v0.11.3, OS=Windows 10.0.18362
-//Intel Core i5-8265U CPU 1.60GHz(Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
-// [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
-//  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
-
-//IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
-//WarmupCount=3
-
-//                                Method |         Mean |        Error |      StdDev |  Ratio | RatioSD | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
-//-------------------------------------- |-------------:|-------------:|------------:|-------:|--------:|------------:|------------:|------------:|--------------------:|
-//       SerializerSettingsInstantiation | 29,120.48 ns | 5,532.424 ns | 303.2508 ns | 997.84 |   23.66 |     73.8122 |           - |           - |            232346 B |
-// SerializerSettingsSingleInstantiation |     29.19 ns |     8.089 ns |   0.4434 ns |   1.00 |    0.00 |      0.0738 |           - |           - |               232 B |
-
-//// * Warnings *
-//MinIterationTime
-//  JsonSerializerSettingsBenchmarks.SerializerSettingsSingleInstantiation: IterationCount= 3, IterationTime= 100.0000 ms, LaunchCount= 1, WarmupCount= 3->MinIterationTime = 96.2493 ms which is very small. It's recommended to increase it.
-
-//// * Legends *
-//  Mean                : Arithmetic mean of all measurements
-//  Error               : Half of 99.9% confidence interval
-//  StdDev              : Standard deviation of all measurements
-//  Ratio               : Mean of the ratio distribution ([Current]/[Baseline])
-//  RatioSD             : Standard deviation of the ratio distribution([Current]/[Baseline])
-//  Gen 0/1k Op         : GC Generation 0 collects per 1k Operations
-//  Gen 1/1k Op         : GC Generation 1 collects per 1k Operations
-//  Gen 2/1k Op         : GC Generation 2 collects per 1k Operations
-//  Allocated Memory/Op : Allocated memory per single operation(managed only, inclusive, 1KB = 1024B)
-//  1 ns                : 1 Nanosecond(0.000000001 sec)
-
-//// * Diagnostic Output - MemoryDiagnoser *
-
-
-//        // ***** BenchmarkRunner: End *****
-//        Run time: 00:00:04 (4.88 sec), executed benchmarks: 2
     }
+
+    [Benchmark(Baseline = true)]
+    public void SerializerSettingsSingleInstantiation() => new JsonSerializerSettings();
+
+    //        // * Summary *
+
+    //        BenchmarkDotNet=v0.11.3, OS=Windows 10.0.18362
+    //Intel Core i5-8265U CPU 1.60GHz(Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+    // [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
+    //  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4250.0
+
+    //IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
+    //WarmupCount=3
+
+    //                                Method |         Mean |        Error |      StdDev |  Ratio | RatioSD | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
+    //-------------------------------------- |-------------:|-------------:|------------:|-------:|--------:|------------:|------------:|------------:|--------------------:|
+    //       SerializerSettingsInstantiation | 29,120.48 ns | 5,532.424 ns | 303.2508 ns | 997.84 |   23.66 |     73.8122 |           - |           - |            232346 B |
+    // SerializerSettingsSingleInstantiation |     29.19 ns |     8.089 ns |   0.4434 ns |   1.00 |    0.00 |      0.0738 |           - |           - |               232 B |
+
+    //// * Warnings *
+    //MinIterationTime
+    //  JsonSerializerSettingsBenchmarks.SerializerSettingsSingleInstantiation: IterationCount= 3, IterationTime= 100.0000 ms, LaunchCount= 1, WarmupCount= 3->MinIterationTime = 96.2493 ms which is very small. It's recommended to increase it.
+
+    //// * Legends *
+    //  Mean                : Arithmetic mean of all measurements
+    //  Error               : Half of 99.9% confidence interval
+    //  StdDev              : Standard deviation of all measurements
+    //  Ratio               : Mean of the ratio distribution ([Current]/[Baseline])
+    //  RatioSD             : Standard deviation of the ratio distribution([Current]/[Baseline])
+    //  Gen 0/1k Op         : GC Generation 0 collects per 1k Operations
+    //  Gen 1/1k Op         : GC Generation 1 collects per 1k Operations
+    //  Gen 2/1k Op         : GC Generation 2 collects per 1k Operations
+    //  Allocated Memory/Op : Allocated memory per single operation(managed only, inclusive, 1KB = 1024B)
+    //  1 ns                : 1 Nanosecond(0.000000001 sec)
+
+    //// * Diagnostic Output - MemoryDiagnoser *
+
+
+    //        // ***** BenchmarkRunner: End *****
+    //        Run time: 00:00:04 (4.88 sec), executed benchmarks: 2
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs
index 824b1beed0..a913fed574 100644
--- a/tests/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/LinqCastBenchmarks.cs
@@ -1,50 +1,47 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Configs;
-using BenchmarkDotNet.Diagnosers;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+/// <summary>
+///     Want to check what is faster OfType or Cast when a enurable all has the same items
+/// </summary>
+[MemoryDiagnoser]
+public class LinqCastBenchmarks
 {
-    /// <summary>
-    /// Want to check what is faster OfType or Cast when a enurable all has the same items
-    /// </summary>
-    [MemoryDiagnoser]
-    public class LinqCastBenchmarks
+    private readonly List<object> _array;
+
+    public LinqCastBenchmarks()
     {
-        public LinqCastBenchmarks()
+        _array = new List<object>();
+        _array.AddRange(Enumerable.Range(0, 10000).Select(x => x.ToString()));
+    }
+
+    [Benchmark(Baseline = true)]
+    public void OfType()
+    {
+        foreach (var i in _array.OfType<string>())
         {
-            _array = new List<object>();
-            _array.AddRange(Enumerable.Range(0, 10000).Select(x => x.ToString()));
+            var a = i;
         }
+    }
 
-        private readonly List<object> _array;
-
-        [Benchmark(Baseline = true)]
-        public void OfType()
+    [Benchmark]
+    public void Cast()
+    {
+        foreach (var i in _array.Cast<string>())
         {
-            foreach (var i in _array.OfType<string>())
-            {
-                var a = i;
-            }
+            var a = i;
         }
+    }
 
-        [Benchmark()]
-        public void Cast()
+    [Benchmark]
+    public void ExplicitCast()
+    {
+        foreach (var i in _array)
         {
-            foreach (var i in _array.Cast<string>())
-            {
-                var a = i;
-            }
-        }
-
-        [Benchmark()]
-        public void ExplicitCast()
-        {
-            foreach (var i in _array)
-            {
-                var a = (string)i;
-            }
+            var a = (string)i;
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs b/tests/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs
index 97c23dc2f6..7a69af3385 100644
--- a/tests/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs
+++ b/tests/Umbraco.Tests.Benchmarks/LoggerAllocationBenchmark.cs
@@ -1,57 +1,53 @@
-using BenchmarkDotNet.Attributes;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
 using Umbraco.Tests.Benchmarks.Config;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[QuickRunWithMemoryDiagnoserConfig]
+public class LoggerAllocationBenchmark
 {
-    [QuickRunWithMemoryDiagnoserConfig]
-    public class LoggerAllocationBenchmark
+    private readonly string rawQuery = "";
+    private readonly int totalItemCount;
+
+    [Benchmark(Baseline = true)]
+    public void Baseline()
     {
-        private string rawQuery = "";
-        private int totalItemCount;
-        [Benchmark(Baseline = true)]
-        public void Baseline()
+        for (var i = 0; i < 1000; i++)
         {
-            for (int i = 0; i < 1000; i++)
-            {
-                OriginalDebugSignature(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, totalItemCount);
-            }
-
+            OriginalDebugSignature(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)",
+                rawQuery, totalItemCount);
         }
-
-        [Benchmark()]
-        public void NewOverload2()
-        {
-            for (int i = 0; i < 1000; i++)
-            {
-                NewDebugSignature(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery, totalItemCount);
-            }
-        }
-        public void OriginalDebugSignature(Type reporting, string messageTemplate, params object[] propertyValues)
-        {
-
-        }
-
-        public void NewDebugSignature<T1,T2>(Type reporting, string messageTemplate, T1 param1, T2 param2)
-        {
-
-        }
-
-        //        BenchmarkDotNet=v0.11.3, OS=Windows 10.0.18362
-        //Intel Core i5-8265U CPU 1.60GHz(Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
-        // [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4180.0
-        //  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4180.0
-
-        //IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
-        //WarmupCount=3
-
-        //       Method |      Mean |     Error |    StdDev | Ratio | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
-        //------------- |----------:|----------:|----------:|------:|------------:|------------:|------------:|--------------------:|
-        //     Baseline | 14.599 us | 1.0882 us | 0.0596 us |  1.00 |     10.0420 |           - |           - |             32048 B |
-        // NewOverload2 |  1.775 us | 0.4056 us | 0.0222 us |  0.12 |           - |           - |           - |                   - |
     }
+
+    [Benchmark]
+    public void NewOverload2()
+    {
+        for (var i = 0; i < 1000; i++)
+        {
+            NewDebugSignature(GetType(), "DeleteFromIndex with query: {Query} (found {TotalItems} results)", rawQuery,
+                totalItemCount);
+        }
+    }
+
+    public void OriginalDebugSignature(Type reporting, string messageTemplate, params object[] propertyValues)
+    {
+    }
+
+    public void NewDebugSignature<T1, T2>(Type reporting, string messageTemplate, T1 param1, T2 param2)
+    {
+    }
+
+    //        BenchmarkDotNet=v0.11.3, OS=Windows 10.0.18362
+    //Intel Core i5-8265U CPU 1.60GHz(Kaby Lake R), 1 CPU, 8 logical and 4 physical cores
+    // [Host]     : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4180.0
+    //  Job-JIATTD : .NET Framework 4.7.2 (CLR 4.0.30319.42000), 32bit LegacyJIT-v4.8.4180.0
+
+    //IterationCount=3  IterationTime=100.0000 ms LaunchCount = 1
+    //WarmupCount=3
+
+    //       Method |      Mean |     Error |    StdDev | Ratio | Gen 0/1k Op | Gen 1/1k Op | Gen 2/1k Op | Allocated Memory/Op |
+    //------------- |----------:|----------:|----------:|------:|------------:|------------:|------------:|--------------------:|
+    //     Baseline | 14.599 us | 1.0882 us | 0.0596 us |  1.00 |     10.0420 |           - |           - |             32048 B |
+    // NewOverload2 |  1.775 us | 0.4056 us | 0.0222 us |  0.12 |           - |           - |           - |                   - |
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs
index 7fd640ebb6..b42033ba5a 100644
--- a/tests/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/ModelToSqlExpressionHelperBenchmarks.cs
@@ -11,67 +11,71 @@ using Umbraco.Cms.Infrastructure.Persistence.Querying;
 using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[MemoryDiagnoser]
+public class ModelToSqlExpressionHelperBenchmarks
 {
-    [MemoryDiagnoser]
-    public class ModelToSqlExpressionHelperBenchmarks
+    private readonly CachedExpression _cachedExpression;
+    private readonly IMapperCollection _mapperCollection;
+
+    private readonly ISqlSyntaxProvider _syntaxProvider =
+        new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
+
+    public ModelToSqlExpressionHelperBenchmarks()
     {
-        protected Lazy<ISqlContext> MockSqlContext()
+        var contentMapper = new ContentMapper(MockSqlContext(), CreateMaps());
+        _cachedExpression = new CachedExpression();
+        var mapperCollection = new Mock<IMapperCollection>();
+        mapperCollection.Setup(x => x[It.IsAny<Type>()]).Returns(contentMapper);
+        _mapperCollection = mapperCollection.Object;
+    }
+
+    protected Lazy<ISqlContext> MockSqlContext()
+    {
+        var sqlContext = Mock.Of<ISqlContext>();
+        var syntax = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
+        Mock.Get(sqlContext).Setup(x => x.SqlSyntax).Returns(syntax);
+        return new Lazy<ISqlContext>(() => sqlContext);
+    }
+
+    protected MapperConfigurationStore CreateMaps() => new();
+
+    [Benchmark(Baseline = true)]
+    public void WithNonCached()
+    {
+        for (var i = 0; i < 100; i++)
         {
-            var sqlContext = Mock.Of<ISqlContext>();
-            var syntax = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
-            Mock.Get(sqlContext).Setup(x => x.SqlSyntax).Returns(syntax);
-            return new Lazy<ISqlContext>(() => sqlContext);
+            var a = i;
+            var b = i * 10;
+            Expression<Func<IContent, bool>> predicate = content =>
+                content.Path.StartsWith("-1") && content.Published &&
+                (content.ContentTypeId == a || content.ContentTypeId == b);
+
+            var modelToSqlExpressionHelper =
+                new ModelToSqlExpressionVisitor<IContent>(_syntaxProvider, _mapperCollection);
+            var result = modelToSqlExpressionHelper.Visit(predicate);
         }
+    }
 
-        protected MapperConfigurationStore CreateMaps()
-            => new MapperConfigurationStore();
-
-        public ModelToSqlExpressionHelperBenchmarks()
+    [Benchmark]
+    public void WithCachedExpression()
+    {
+        for (var i = 0; i < 100; i++)
         {
-            var contentMapper = new ContentMapper(MockSqlContext(), CreateMaps());
-            _cachedExpression = new CachedExpression();
-            var mapperCollection = new Mock<IMapperCollection>();
-            mapperCollection.Setup(x => x[It.IsAny<Type>()]).Returns(contentMapper);
-            _mapperCollection = mapperCollection.Object;
-        }
+            var a = i;
+            var b = i * 10;
+            Expression<Func<IContent, bool>> predicate = content =>
+                content.Path.StartsWith("-1") && content.Published &&
+                (content.ContentTypeId == a || content.ContentTypeId == b);
 
-        private readonly ISqlSyntaxProvider _syntaxProvider = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
-        private readonly CachedExpression _cachedExpression;
-        private readonly IMapperCollection _mapperCollection;
+            var modelToSqlExpressionHelper =
+                new ModelToSqlExpressionVisitor<IContent>(_syntaxProvider, _mapperCollection);
 
-        [Benchmark(Baseline = true)]
-        public void WithNonCached()
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                var a = i;
-                var b = i * 10;
-                Expression<Func<IContent, bool>> predicate = content =>
-                content.Path.StartsWith("-1") && content.Published && (content.ContentTypeId == a || content.ContentTypeId == b);
+            //wrap it!
+            _cachedExpression.Wrap(predicate);
 
-                var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(_syntaxProvider, _mapperCollection);
-                var result = modelToSqlExpressionHelper.Visit(predicate);
-            }
-        }
-
-        [Benchmark]
-        public void WithCachedExpression()
-        {
-            for (int i = 0; i < 100; i++)
-            {
-                var a = i;
-                var b = i * 10;
-                Expression<Func<IContent, bool>> predicate = content =>
-                content.Path.StartsWith("-1") && content.Published && (content.ContentTypeId == a || content.ContentTypeId == b);
-
-                var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(_syntaxProvider, _mapperCollection);
-
-                //wrap it!
-                _cachedExpression.Wrap(predicate);
-
-                var result = modelToSqlExpressionHelper.Visit(_cachedExpression);
-            }
+            var result = modelToSqlExpressionHelper.Visit(_cachedExpression);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/Program.cs b/tests/Umbraco.Tests.Benchmarks/Program.cs
index 62137bd85d..ecc8d373af 100644
--- a/tests/Umbraco.Tests.Benchmarks/Program.cs
+++ b/tests/Umbraco.Tests.Benchmarks/Program.cs
@@ -1,9 +1,8 @@
-using BenchmarkDotNet.Running;
+using BenchmarkDotNet.Running;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+internal static class Program
 {
-    internal static class Program
-    {
-        private static void Main(string[] args) => new BenchmarkSwitcher(typeof(Program).Assembly).Run(args);
-    }
+    private static void Main(string[] args) => new BenchmarkSwitcher(typeof(Program).Assembly).Run(args);
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs b/tests/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs
index 629da3cb25..264f0ed43a 100644
--- a/tests/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs
+++ b/tests/Umbraco.Tests.Benchmarks/SqlTemplatesBenchmark.cs
@@ -5,88 +5,80 @@ using Microsoft.Extensions.Options;
 using NPoco;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Infrastructure.Persistence.Mappers;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Extensions;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+// seeing this kind of results - templates are gooood
+//
+// Method           |       Mean |     Error |    StdDev | Scaled |    Gen 0 | Allocated |
+// ---------------- |-----------:|----------:|----------:|-------:|---------:|----------:|
+// WithoutTemplate  | 2,895.0 us | 64.873 us | 99.068 us |   1.00 | 183.5938 | 762.23 KB |
+// WithTemplate     |   263.2 us |  4.581 us |  4.285 us |   0.09 |  50.2930 | 207.13 KB |
+//
+// though the difference might not be so obvious in case of WhereIn which requires parsing
+
+[Config(typeof(Config))]
+public class SqlTemplatesBenchmark
 {
-    // seeing this kind of results - templates are gooood
-    //
-    // Method           |       Mean |     Error |    StdDev | Scaled |    Gen 0 | Allocated |
-    // ---------------- |-----------:|----------:|----------:|-------:|---------:|----------:|
-    // WithoutTemplate  | 2,895.0 us | 64.873 us | 99.068 us |   1.00 | 183.5938 | 762.23 KB |
-    // WithTemplate     |   263.2 us |  4.581 us |  4.285 us |   0.09 |  50.2930 | 207.13 KB |
-    //
-    // though the difference might not be so obvious in case of WhereIn which requires parsing
-
-    [Config(typeof(Config))]
-    public class SqlTemplatesBenchmark
+    public SqlTemplatesBenchmark()
     {
-        private class Config : ManualConfig
+        var mappers = new MapperCollection();
+        var factory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, mappers).Init(), mappers);
+
+        SqlContext = new SqlContext(new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())), DatabaseType.SQLCe, factory);
+        SqlTemplates = new SqlTemplates(SqlContext);
+    }
+
+    private ISqlContext SqlContext { get; }
+    private SqlTemplates SqlTemplates { get; }
+
+    [Benchmark(Baseline = true)]
+    public void WithoutTemplate()
+    {
+        for (var i = 0; i < 100; i++)
         {
-            public Config()
-            {
-                Add(MemoryDiagnoser.Default);
-            }
-        }
+            var sql = Sql.BuilderFor(SqlContext)
+                .Select<Thing1Dto>()
+                .From<Thing1Dto>()
+                .Where<Thing1Dto>(x => x.Name == "yada");
 
-        public SqlTemplatesBenchmark()
+            var sqlString = sql.SQL; // force-build the SQL
+        }
+    }
+
+    [Benchmark]
+    public void WithTemplate()
+    {
+        SqlTemplates.Clear();
+
+        for (var i = 0; i < 100; i++)
         {
-            var mappers = new NPoco.MapperCollection();
-            var factory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, mappers).Init(), mappers);
+            var template = SqlTemplates.Get("test", s => s
+                .Select<Thing1Dto>()
+                .From<Thing1Dto>()
+                .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("name")));
 
-            SqlContext = new SqlContext(new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())), DatabaseType.SQLCe, factory);
-            SqlTemplates = new SqlTemplates(SqlContext);
+            var sql = template.Sql(new { name = "yada" });
+
+            var sqlString = sql.SQL; // force-build the SQL
         }
+    }
 
-        private ISqlContext SqlContext { get; }
-        private SqlTemplates SqlTemplates { get; }
+    private class Config : ManualConfig
+    {
+        public Config() => Add(MemoryDiagnoser.Default);
+    }
 
-        [Benchmark(Baseline = true)]
-        public void WithoutTemplate()
-        {
-            for (var i = 0; i < 100; i++)
-            {
-                var sql = Sql.BuilderFor(SqlContext)
-                    .Select<Thing1Dto>()
-                    .From<Thing1Dto>()
-                    .Where<Thing1Dto>(x => x.Name == "yada");
-
-                var sqlString = sql.SQL; // force-build the SQL
-            }
-        }
-
-        [Benchmark]
-        public void WithTemplate()
-        {
-            SqlTemplates.Clear();
-
-            for (var i = 0; i < 100; i++)
-            {
-                var template = SqlTemplates.Get("test", s => s
-                    .Select<Thing1Dto>()
-                    .From<Thing1Dto>()
-                    .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("name")));
-
-                var sql = template.Sql(new { name = "yada" });
-
-                var sqlString = sql.SQL; // force-build the SQL
-            }
-        }
-
-        [TableName("zbThing1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing1Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-        }
+    [TableName("zbThing1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing1Dto
+    {
+        [Column("id")]
+        public int Id { get; set; }
 
+        [Column("name")]
+        public string Name { get; set; }
     }
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs
index 796fe4f4b6..096d591463 100644
--- a/tests/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/StringReplaceManyBenchmarks.cs
@@ -1,138 +1,133 @@
-using BenchmarkDotNet.Attributes;
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using BenchmarkDotNet.Attributes;
 using Umbraco.Tests.Benchmarks.Config;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[QuickRunWithMemoryDiagnoserConfig]
+public class StringReplaceManyBenchmarks
 {
-    [QuickRunWithMemoryDiagnoserConfig]
-    public class StringReplaceManyBenchmarks
+    static StringReplaceManyBenchmarks()
     {
-        /*
+        // pick what you want to benchmark
 
-        short text, short replacement:
+        // short
+        Text = "1,2.3:4&5#6";
 
-                                               Method |     Mean |     Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
-        --------------------------------------------- |---------:|----------:|----------:|-------:|---------:|-------:|----------:|
-        'String.ReplaceMany w/chars - Aggregate'      | 236.0 ns |  40.92 ns |  2.312 ns |   1.00 |     0.00 | 0.0461 |     200 B |
-        'String.ReplaceMany w/chars - For Loop'       | 166.7 ns |  70.51 ns |  3.984 ns |   0.71 |     0.01 | 0.0420 |     180 B |
-        'String.ReplaceMany w/dictionary - Aggregate' | 606.5 ns | 342.94 ns | 19.377 ns |   2.57 |     0.07 | 0.0473 |     212 B |
-        'String.ReplaceMany w/dictionary - For Each'  | 571.8 ns | 232.33 ns | 13.127 ns |   2.42 |     0.05 | 0.0458 |     212 B |
+        // long
+        //Text = "Sed ut perspiciatis unde omnis iste natus &error sit voluptatem accusantium doloremque l:audantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et &quasi architecto beatae vitae ::dicta sunt explicabo. Nemo enim ipsam volupta:tem quia voluptas sit aspernatur aut o&dit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciun&t. Neque porro quisquam est, qui dolorem: ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut e:nim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi co&&nsequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse: quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?";
 
-        long text, short replacement:
-
-                                               Method |      Mean |     Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
-        --------------------------------------------- |----------:|----------:|----------:|-------:|---------:|-------:|----------:|
-        'String.ReplaceMany w/chars - Aggregate'      |  5.771 us |  9.963 us | 0.5630 us |   1.00 |     0.00 | 1.6798 |   6.94 KB |
-        'String.ReplaceMany w/chars - For Loop'       |  4.962 us |  2.121 us | 0.1199 us |   0.87 |     0.08 | 1.6840 |   6.92 KB |
-        'String.ReplaceMany w/dictionary - Aggregate' | 14.514 us |  8.189 us | 0.4627 us |   2.53 |     0.22 | 1.6447 |   6.96 KB |
-        'String.ReplaceMany w/dictionary - For Each'  | 15.445 us | 24.745 us | 1.3981 us |   2.69 |     0.30 | 1.5696 |   6.96 KB |
-
-        short text, long replacements dictionary:
-
-                                               Method |       Mean |      Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
-        --------------------------------------------- |-----------:|-----------:|----------:|-------:|---------:|-------:|----------:|
-        'String.ReplaceMany w/chars - Aggregate'      |   257.0 ns |   200.0 ns |  11.30 ns |   1.00 |     0.00 | 0.0452 |     200 B |
-        'String.ReplaceMany w/chars - For Loop'       |   182.4 ns |   221.0 ns |  12.49 ns |   0.71 |     0.05 | 0.0425 |     180 B |
-        'String.ReplaceMany w/dictionary - Aggregate' | 7,273.8 ns | 2,747.1 ns | 155.22 ns |  28.34 |     1.12 | 0.0714 |     464 B |
-        'String.ReplaceMany w/dictionary - For Each'  | 6,981.0 ns | 5,500.7 ns | 310.80 ns |  27.20 |     1.38 | 0.0775 |     464 B |
-
-        long text, long replacements dictionary:
-
-                                               Method |       Mean |      Error |     StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
-        --------------------------------------------- |-----------:|-----------:|-----------:|-------:|---------:|-------:|----------:|
-        'String.ReplaceMany w/chars - Aggregate'      |   4.868 us |   3.420 us |  0.1932 us |   1.00 |     0.00 | 1.6816 |   6.94 KB |
-        'String.ReplaceMany w/chars - For Loop'       |   4.958 us |   2.633 us |  0.1487 us |   1.02 |     0.04 | 1.6791 |   6.92 KB |
-        'String.ReplaceMany w/dictionary - Aggregate' | 181.309 us | 210.177 us | 11.8754 us |  37.29 |     2.32 | 5.3571 |  24.28 KB |
-        'String.ReplaceMany w/dictionary - For Each'  | 174.567 us | 113.733 us |  6.4262 us |  35.90 |     1.57 | 5.8594 |  24.28 KB |
-
-        */
-
-        // don't use constants
-        // ReSharper disable ConvertToConstant.Local
-
-        // input text for ReplaceMany
-        private static readonly string Text;
-
-        // replaced chars for ReplaceMany with chars
-        private static readonly char[] ReplacedChars = { ',', '.', ':', '&', '#' };
-
-        // replacement char for ReplaceMany with chars
-        private static readonly char ReplacementChar = '*';
-
-        // replacements for ReplaceMany with dictionary
-        private static readonly IDictionary<string, string> Replacements;
-
-        // ReSharper restore ConvertToConstant.Local
-
-        static StringReplaceManyBenchmarks()
+        // short
+        Replacements = new Dictionary<string, string>
         {
-            // pick what you want to benchmark
+            {",", "*"},
+            {".", "*"},
+            {":", "*"},
+            {"&", "*"},
+            {"#", "*"}
+        };
 
-            // short
-            Text = "1,2.3:4&5#6";
-
-            // long
-            //Text = "Sed ut perspiciatis unde omnis iste natus &error sit voluptatem accusantium doloremque l:audantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et &quasi architecto beatae vitae ::dicta sunt explicabo. Nemo enim ipsam volupta:tem quia voluptas sit aspernatur aut o&dit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciun&t. Neque porro quisquam est, qui dolorem: ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut e:nim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi co&&nsequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse: quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?";
-
-            // short
-            Replacements = new Dictionary<string, string>
-            {
-                { ",", "*" },
-                { ".", "*" },
-                { ":", "*" },
-                { "&", "*" },
-                { "#", "*" },
-            };
-
-            // long
-            //Replacements = new Dictionary<string, string>();
-            //for (var i = 2; i < 100; i++)
-            //    Replacements[Convert.ToChar(i).ToString()] = "*";
-        }
-
-        // this is what v7 originally did
-        [Benchmark(Description = "String.ReplaceMany w/chars - Aggregate", Baseline = true)]
-        public string ReplaceManyAggregate()
-        {
-            var result = Text;
-            return ReplacedChars.Aggregate(result, (current, c) => current.Replace(c, ReplacementChar));
-        }
-
-        [Benchmark(Description = "String.ReplaceMany w/chars - For Loop")]
-        public string ReplaceManyForLoop()
-        {
-            var result = Text;
-
-            // ReSharper disable once LoopCanBeConvertedToQuery
-            // ReSharper disable once ForCanBeConvertedToForeach
-            for (var i = 0; i < ReplacedChars.Length; i++)
-            {
-                result = result.Replace(ReplacedChars[i], ReplacementChar);
-            }
-
-            return result;
-        }
-
-        // this is what v7 originally did
-        [Benchmark(Description = "String.ReplaceMany w/dictionary - Aggregate")]
-        public string ReplaceManyDictionaryAggregate()
-        {
-            return Replacements.Aggregate(Text, (current, kvp) => current.Replace(kvp.Key, kvp.Value));
-        }
-
-        [Benchmark(Description = "String.ReplaceMany w/dictionary - For Each")]
-        public string ReplaceManyDictionaryForEach()
-        {
-            var result = Text;
-            // ReSharper disable once LoopCanBeConvertedToQuery
-            foreach (var item in Replacements)
-            {
-                result = result.Replace(item.Key, item.Value);
-            }
-
-            return result;
-        }
+        // long
+        //Replacements = new Dictionary<string, string>();
+        //for (var i = 2; i < 100; i++)
+        //    Replacements[Convert.ToChar(i).ToString()] = "*";
     }
-}
\ No newline at end of file
+
+    // this is what v7 originally did
+    [Benchmark(Description = "String.ReplaceMany w/chars - Aggregate", Baseline = true)]
+    public string ReplaceManyAggregate()
+    {
+        var result = Text;
+        return ReplacedChars.Aggregate(result, (current, c) => current.Replace(c, ReplacementChar));
+    }
+
+    [Benchmark(Description = "String.ReplaceMany w/chars - For Loop")]
+    public string ReplaceManyForLoop()
+    {
+        var result = Text;
+
+        // ReSharper disable once LoopCanBeConvertedToQuery
+        // ReSharper disable once ForCanBeConvertedToForeach
+        for (var i = 0; i < ReplacedChars.Length; i++)
+        {
+            result = result.Replace(ReplacedChars[i], ReplacementChar);
+        }
+
+        return result;
+    }
+
+    // this is what v7 originally did
+    [Benchmark(Description = "String.ReplaceMany w/dictionary - Aggregate")]
+    public string ReplaceManyDictionaryAggregate() =>
+        Replacements.Aggregate(Text, (current, kvp) => current.Replace(kvp.Key, kvp.Value));
+
+    [Benchmark(Description = "String.ReplaceMany w/dictionary - For Each")]
+    public string ReplaceManyDictionaryForEach()
+    {
+        var result = Text;
+        // ReSharper disable once LoopCanBeConvertedToQuery
+        foreach (var item in Replacements)
+        {
+            result = result.Replace(item.Key, item.Value);
+        }
+
+        return result;
+    }
+    /*
+
+    short text, short replacement:
+
+                                           Method |     Mean |     Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+    --------------------------------------------- |---------:|----------:|----------:|-------:|---------:|-------:|----------:|
+    'String.ReplaceMany w/chars - Aggregate'      | 236.0 ns |  40.92 ns |  2.312 ns |   1.00 |     0.00 | 0.0461 |     200 B |
+    'String.ReplaceMany w/chars - For Loop'       | 166.7 ns |  70.51 ns |  3.984 ns |   0.71 |     0.01 | 0.0420 |     180 B |
+    'String.ReplaceMany w/dictionary - Aggregate' | 606.5 ns | 342.94 ns | 19.377 ns |   2.57 |     0.07 | 0.0473 |     212 B |
+    'String.ReplaceMany w/dictionary - For Each'  | 571.8 ns | 232.33 ns | 13.127 ns |   2.42 |     0.05 | 0.0458 |     212 B |
+
+    long text, short replacement:
+
+                                           Method |      Mean |     Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+    --------------------------------------------- |----------:|----------:|----------:|-------:|---------:|-------:|----------:|
+    'String.ReplaceMany w/chars - Aggregate'      |  5.771 us |  9.963 us | 0.5630 us |   1.00 |     0.00 | 1.6798 |   6.94 KB |
+    'String.ReplaceMany w/chars - For Loop'       |  4.962 us |  2.121 us | 0.1199 us |   0.87 |     0.08 | 1.6840 |   6.92 KB |
+    'String.ReplaceMany w/dictionary - Aggregate' | 14.514 us |  8.189 us | 0.4627 us |   2.53 |     0.22 | 1.6447 |   6.96 KB |
+    'String.ReplaceMany w/dictionary - For Each'  | 15.445 us | 24.745 us | 1.3981 us |   2.69 |     0.30 | 1.5696 |   6.96 KB |
+
+    short text, long replacements dictionary:
+
+                                           Method |       Mean |      Error |    StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+    --------------------------------------------- |-----------:|-----------:|----------:|-------:|---------:|-------:|----------:|
+    'String.ReplaceMany w/chars - Aggregate'      |   257.0 ns |   200.0 ns |  11.30 ns |   1.00 |     0.00 | 0.0452 |     200 B |
+    'String.ReplaceMany w/chars - For Loop'       |   182.4 ns |   221.0 ns |  12.49 ns |   0.71 |     0.05 | 0.0425 |     180 B |
+    'String.ReplaceMany w/dictionary - Aggregate' | 7,273.8 ns | 2,747.1 ns | 155.22 ns |  28.34 |     1.12 | 0.0714 |     464 B |
+    'String.ReplaceMany w/dictionary - For Each'  | 6,981.0 ns | 5,500.7 ns | 310.80 ns |  27.20 |     1.38 | 0.0775 |     464 B |
+
+    long text, long replacements dictionary:
+
+                                           Method |       Mean |      Error |     StdDev | Scaled | ScaledSD |  Gen 0 | Allocated |
+    --------------------------------------------- |-----------:|-----------:|-----------:|-------:|---------:|-------:|----------:|
+    'String.ReplaceMany w/chars - Aggregate'      |   4.868 us |   3.420 us |  0.1932 us |   1.00 |     0.00 | 1.6816 |   6.94 KB |
+    'String.ReplaceMany w/chars - For Loop'       |   4.958 us |   2.633 us |  0.1487 us |   1.02 |     0.04 | 1.6791 |   6.92 KB |
+    'String.ReplaceMany w/dictionary - Aggregate' | 181.309 us | 210.177 us | 11.8754 us |  37.29 |     2.32 | 5.3571 |  24.28 KB |
+    'String.ReplaceMany w/dictionary - For Each'  | 174.567 us | 113.733 us |  6.4262 us |  35.90 |     1.57 | 5.8594 |  24.28 KB |
+
+    */
+
+    // don't use constants
+    // ReSharper disable ConvertToConstant.Local
+
+    // input text for ReplaceMany
+    private static readonly string Text;
+
+    // replaced chars for ReplaceMany with chars
+    private static readonly char[] ReplacedChars = { ',', '.', ':', '&', '#' };
+
+    // replacement char for ReplaceMany with chars
+    private static readonly char ReplacementChar = '*';
+
+    // replacements for ReplaceMany with dictionary
+    private static readonly IDictionary<string, string> Replacements;
+
+    // ReSharper restore ConvertToConstant.Local
+}
diff --git a/tests/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs
index 579afc761b..55b87acd22 100644
--- a/tests/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/TryConvertToBenchmarks.cs
@@ -1,45 +1,29 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using BenchmarkDotNet.Attributes;
 using Umbraco.Extensions;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[MemoryDiagnoser]
+public class TryConvertToBenchmarks
 {
-    [MemoryDiagnoser]
-    public class TryConvertToBenchmarks
-    {
-        private static readonly List<string> List = new List<string>() { "hello", "world", "awesome" };
-        private static readonly string Date = "Saturday 10, November 2012";
+    private static readonly List<string> List = new() { "hello", "world", "awesome" };
+    private static readonly string Date = "Saturday 10, November 2012";
 
-        [Benchmark(Description = "List<string> to IEnumerable<string>")]
-        public IList<string> TryConvertToEnumerable()
-        {
-            return List.TryConvertTo<IEnumerable<string>>().Result.ToList();
-        }
+    [Benchmark(Description = "List<string> to IEnumerable<string>")]
+    public IList<string> TryConvertToEnumerable() => List.TryConvertTo<IEnumerable<string>>().Result.ToList();
 
-        [Benchmark(Description = "Int to Double")]
-        public double TryConvertToDouble()
-        {
-            return 1.TryConvertTo<double>().Result;
-        }
+    [Benchmark(Description = "Int to Double")]
+    public double TryConvertToDouble() => 1.TryConvertTo<double>().Result;
 
-        [Benchmark(Description = "Float to Decimal")]
-        public decimal TryConvertToDecimal()
-        {
-            return 1F.TryConvertTo<decimal>().Result;
-        }
+    [Benchmark(Description = "Float to Decimal")]
+    public decimal TryConvertToDecimal() => 1F.TryConvertTo<decimal>().Result;
 
-        [Benchmark(Description = "String to Boolean")]
-        public bool TryConvertToBoolean()
-        {
-            return "1".TryConvertTo<bool>().Result;
-        }
+    [Benchmark(Description = "String to Boolean")]
+    public bool TryConvertToBoolean() => "1".TryConvertTo<bool>().Result;
 
-        [Benchmark(Description = "String to DateTime")]
-        public DateTime TryConvertToDateTime()
-        {
-            return Date.TryConvertTo<DateTime>().Result;
-        }
-    }
+    [Benchmark(Description = "String to DateTime")]
+    public DateTime TryConvertToDateTime() => Date.TryConvertTo<DateTime>().Result;
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
index c3ba9ad393..9eb40c0423 100644
--- a/tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/TypeFinderBenchmarks.cs
@@ -4,38 +4,35 @@ using Microsoft.Extensions.Logging.Abstractions;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[MediumRunJob]
+[MemoryDiagnoser]
+public class TypeFinderBenchmarks
 {
+    private readonly TypeFinder _typeFinder1;
+    private readonly TypeFinder _typeFinder2;
 
-    [MediumRunJob]
-    [MemoryDiagnoser]
-    public class TypeFinderBenchmarks
+    public TypeFinderBenchmarks()
     {
-        private readonly TypeFinder _typeFinder1;
-        private readonly TypeFinder _typeFinder2;
-
-        public TypeFinderBenchmarks()
-        {
-            _typeFinder1 = new TypeFinder(new NullLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
-            _typeFinder2 = new TypeFinder(new NullLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance))
+        _typeFinder1 = new TypeFinder(new NullLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
+        _typeFinder2 = new TypeFinder(new NullLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance))
             {
                 QueryWithReferencingAssemblies = false
             };
-        }
+    }
 
-        // TODO: This setting seems to make no difference anymore
+    // TODO: This setting seems to make no difference anymore
 
-        [Benchmark(Baseline = true)]
-        public void WithGetReferencingAssembliesCheck()
-        {
-            var found = _typeFinder1.FindClassesOfType<IDiscoverable>().Count();
-        }
-
-        [Benchmark]
-        public void WithoutGetReferencingAssembliesCheck()
-        {
-            var found = _typeFinder2.FindClassesOfType<IDiscoverable>().Count();            
-        }
+    [Benchmark(Baseline = true)]
+    public void WithGetReferencingAssembliesCheck()
+    {
+        var found = _typeFinder1.FindClassesOfType<IDiscoverable>().Count();
+    }
 
+    [Benchmark]
+    public void WithoutGetReferencingAssembliesCheck()
+    {
+        var found = _typeFinder2.FindClassesOfType<IDiscoverable>().Count();
     }
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs
index 5c3e1ade75..a84943f430 100644
--- a/tests/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/TypeLoaderBenchmarks.cs
@@ -1,76 +1,70 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using BenchmarkDotNet.Attributes;
 using Microsoft.Extensions.Logging.Abstractions;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Logging;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[MediumRunJob]
+[MemoryDiagnoser]
+public class TypeLoaderBenchmarks
 {
-    [MediumRunJob]
-    [MemoryDiagnoser]
-    public class TypeLoaderBenchmarks
-    {
-        private readonly TypeLoader _typeLoader1;
-        private readonly TypeLoader _typeLoader2;
+    private readonly TypeLoader _typeLoader1;
+    private readonly TypeLoader _typeLoader2;
 
-        public TypeLoaderBenchmarks()
+    public TypeLoaderBenchmarks()
+    {
+        var typeFinder1 = new TypeFinder(
+            new NullLogger<TypeFinder>(),
+            new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
+
+        _typeLoader1 = new TypeLoader(typeFinder1, NullLogger<TypeLoader>.Instance);
+        _typeLoader2 = new TypeLoader(typeFinder1, NullLogger<TypeLoader>.Instance);
+    }
+
+    /// <summary>
+    ///     Use a predefined cache of types (names) - this is an example of what is saved to disk and loaded on startup
+    /// </summary>
+    /// <returns></returns>
+    private Dictionary<(string, string), IEnumerable<string>> GetCache()
+        => new()
         {
-            var typeFinder1 = new TypeFinder(
-                new NullLogger<TypeFinder>(),
-                new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
+            [(typeof(ITypeLoaderBenchmarkPlugin).FullName, null)] = new List<string>
+            {
+                typeof(CustomAssemblyProvider1).FullName,
+                typeof(CustomAssemblyProvider2).FullName,
+                typeof(CustomAssemblyProvider3).FullName
+            }
+        };
 
-            _typeLoader1 = new TypeLoader(typeFinder1, NullLogger<TypeLoader>.Instance);
-            _typeLoader2 = new TypeLoader(typeFinder1, NullLogger<TypeLoader>.Instance);
-        }
-
-        /// <summary>
-        /// Use a predefined cache of types (names) - this is an example of what is saved to disk and loaded on startup
-        /// </summary>
-        /// <returns></returns>
-        private Dictionary<(string, string), IEnumerable<string>> GetCache()
-            => new Dictionary<(string, string), IEnumerable<string>>
-                {
-                    [(typeof(ITypeLoaderBenchmarkPlugin).FullName, null)] = new List<string>
-                        {
-                            typeof(CustomAssemblyProvider1).FullName,
-                            typeof(CustomAssemblyProvider2).FullName,
-                            typeof(CustomAssemblyProvider3).FullName
-                        }
-                };
-
-        [Benchmark(Baseline = true)]
-        public void WithTypesCache()
-        {
-            var found = _typeLoader1.GetTypes<ITypeLoaderBenchmarkPlugin>().Count();
-        }
-
-        [Benchmark]
-        public void WithoutTypesCache()
-        {
-            var found = _typeLoader2.GetTypes<ITypeLoaderBenchmarkPlugin>(false).Count();
-        }
-    }
-
-    // These are the types we'll find for the benchmark
-
-    public interface ITypeLoaderBenchmarkPlugin
+    [Benchmark(Baseline = true)]
+    public void WithTypesCache()
     {
+        var found = _typeLoader1.GetTypes<ITypeLoaderBenchmarkPlugin>().Count();
     }
 
-    public class CustomAssemblyProvider1 : ITypeLoaderBenchmarkPlugin
+    [Benchmark]
+    public void WithoutTypesCache()
     {
+        var found = _typeLoader2.GetTypes<ITypeLoaderBenchmarkPlugin>(false).Count();
     }
-
-    public class CustomAssemblyProvider2 : ITypeLoaderBenchmarkPlugin
-    {
-    }
-
-    public class CustomAssemblyProvider3 : ITypeLoaderBenchmarkPlugin
-    {
-    }
-
+}
+
+// These are the types we'll find for the benchmark
+
+public interface ITypeLoaderBenchmarkPlugin
+{
+}
+
+public class CustomAssemblyProvider1 : ITypeLoaderBenchmarkPlugin
+{
+}
+
+public class CustomAssemblyProvider2 : ITypeLoaderBenchmarkPlugin
+{
+}
+
+public class CustomAssemblyProvider3 : ITypeLoaderBenchmarkPlugin
+{
 }
diff --git a/tests/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs b/tests/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs
index 035c32900b..41633addb4 100644
--- a/tests/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs
+++ b/tests/Umbraco.Tests.Benchmarks/XmlBenchmarks.cs
@@ -1,18 +1,22 @@
-using System;
+using System;
 using System.Xml;
 using BenchmarkDotNet.Attributes;
 using Umbraco.Tests.Benchmarks.Config;
 
-namespace Umbraco.Tests.Benchmarks
+namespace Umbraco.Tests.Benchmarks;
+
+[QuickRunWithMemoryDiagnoserConfig]
+public class XmlBenchmarks
 {
-    [QuickRunWithMemoryDiagnoserConfig]
-    public class XmlBenchmarks
+    private const bool UseLegacySchema = false;
+
+    private XmlDocument _xml;
+
+    [GlobalSetup]
+    public void Setup()
     {
-        [GlobalSetup]
-        public void Setup()
-        {
-            var templateId = 0;
-            var xmlText = @"<?xml version=""1.0"" encoding=""utf-8""?>
+        var templateId = 0;
+        var xmlText = @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Home ANY>
 <!ATTLIST Home id ID #REQUIRED>
@@ -20,81 +24,105 @@ namespace Umbraco.Tests.Benchmarks
 <!ATTLIST CustomDocument id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
+    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+                      templateId +
+                      @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
         <content><![CDATA[]]></content>
         <umbracoUrlAlias><![CDATA[this/is/my/alias, anotheralias]]></umbracoUrlAlias>
         <umbracoNaviHide>1</umbracoNaviHide>
-        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""">
+        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+                      templateId +
+                      @""" sortOrder=""2"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias]]></umbracoUrlAlias>
-            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
+            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+                      templateId +
+                      @""" sortOrder=""2"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[only/one/alias]]></umbracoUrlAlias>
                 <creatorName><![CDATA[Custom data with same property name as the member name]]></creatorName>
             </Home>
-            <Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""">
+            <Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+                      templateId +
+                      @""" sortOrder=""3"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Home>
-            <CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""" />
-            <CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""" />
+            <CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+                      templateId +
+                      @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""" />
+            <CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+                      templateId +
+                      @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""" />
         </Home>
-        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
+        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+                      templateId +
+                      @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
         </Home>
     </Home>
-    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
+    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+                      templateId +
+                      @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
 </root>";
-            _xml = new XmlDocument();
-            _xml.LoadXml(xmlText);
-        }
+        _xml = new XmlDocument();
+        _xml.LoadXml(xmlText);
+    }
 
-        [GlobalCleanup]
-        public void Cleanup()
+    [GlobalCleanup]
+    public void Cleanup() => _xml = null;
+
+    [Benchmark]
+    public void XmlWithXPath()
+    {
+        var xpath =
+            "/root/* [@isDoc and @urlName='home']//* [@isDoc and @urlName='sub1']//* [@isDoc and @urlName='sub2']";
+        var elt = _xml.SelectSingleNode(xpath);
+        if (elt == null)
         {
-            _xml = null;
-        }
-
-        private XmlDocument _xml;
-
-        [Benchmark]
-        public void XmlWithXPath()
-        {
-            var xpath = "/root/* [@isDoc and @urlName='home']//* [@isDoc and @urlName='sub1']//* [@isDoc and @urlName='sub2']";
-            var elt = _xml.SelectSingleNode(xpath);
-            if (elt == null) Console.WriteLine("ERR");
-        }
-
-        [Benchmark]
-        public void XmlWithNavigation()
-        {
-            var elt = _xml.DocumentElement;
-            var id = NavigateElementRoute(elt, new[] { "home", "sub1", "sub2" });
-            if (id <= 0) Console.WriteLine("ERR");
-        }
-
-        private const bool UseLegacySchema = false;
-
-        private int NavigateElementRoute(XmlElement elt, string[] urlParts)
-        {
-            var found = true;
-            var i = 0;
-            while (found && i < urlParts.Length)
-            {
-                found = false;
-                foreach (XmlElement child in elt.ChildNodes)
-                {
-                    var noNode = UseLegacySchema
-                        ? child.Name != "node"
-                        : child.GetAttributeNode("isDoc") == null;
-                    if (noNode) continue;
-                    if (child.GetAttribute("urlName") != urlParts[i]) continue;
-
-                    found = true;
-                    elt = child;
-                    break;
-                }
-                i++;
-            }
-            return found ? int.Parse(elt.GetAttribute("id")) : -1;
+            Console.WriteLine("ERR");
         }
     }
+
+    [Benchmark]
+    public void XmlWithNavigation()
+    {
+        var elt = _xml.DocumentElement;
+        var id = NavigateElementRoute(elt, new[] { "home", "sub1", "sub2" });
+        if (id <= 0)
+        {
+            Console.WriteLine("ERR");
+        }
+    }
+
+    private int NavigateElementRoute(XmlElement elt, string[] urlParts)
+    {
+        var found = true;
+        var i = 0;
+        while (found && i < urlParts.Length)
+        {
+            found = false;
+            foreach (XmlElement child in elt.ChildNodes)
+            {
+                var noNode = UseLegacySchema
+                    ? child.Name != "node"
+                    : child.GetAttributeNode("isDoc") == null;
+                if (noNode)
+                {
+                    continue;
+                }
+
+                if (child.GetAttribute("urlName") != urlParts[i])
+                {
+                    continue;
+                }
+
+                found = true;
+                elt = child;
+                break;
+            }
+
+            i++;
+        }
+
+        return found ? int.Parse(elt.GetAttribute("id")) : -1;
+    }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs b/tests/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs
index de8d81904a..15d98ca212 100644
--- a/tests/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/AuditEntryBuilder.cs
@@ -5,153 +5,152 @@ using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class AuditEntryBuilder : AuditEntryBuilder<object>
 {
-    public class AuditEntryBuilder : AuditEntryBuilder<object>
+    public AuditEntryBuilder()
+        : base(null)
     {
-        public AuditEntryBuilder()
-            : base(null)
-        {
-        }
-    }
-
-    public class AuditEntryBuilder<TParent>
-        : ChildBuilderBase<TParent, IAuditEntry>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithDeleteDateBuilder
-    {
-        private DateTime? _createDate;
-        private DateTime? _deleteDate;
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _updateDate;
-        private string _affectedDetails = null;
-        private int? _affectedUserId = null;
-        private string _eventDetails = null;
-        private string _eventType = null;
-        private string _performingDetails = null;
-        private string _performingIp = null;
-        private DateTime? _eventDateUtc = null;
-        private int? _performingUserId = null;
-
-        public AuditEntryBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
-
-        public AuditEntryBuilder<TParent> WithAffectedDetails(string affectedDetails)
-        {
-            _affectedDetails = affectedDetails;
-            return this;
-        }
-
-        public AuditEntryBuilder<TParent> WithAffectedUserId(int affectedUserId)
-        {
-            _affectedUserId = affectedUserId;
-            return this;
-        }
-
-        public AuditEntryBuilder<TParent> WithEventDetails(string eventDetails)
-        {
-            _eventDetails = eventDetails;
-            return this;
-        }
-
-        public AuditEntryBuilder<TParent> WithEventType(string eventType)
-        {
-            _eventType = eventType;
-            return this;
-        }
-
-        public AuditEntryBuilder<TParent> WithPerformingDetails(string performingDetails)
-        {
-            _performingDetails = performingDetails;
-            return this;
-        }
-
-        public AuditEntryBuilder<TParent> WithPerformingIp(string performingIp)
-        {
-            _performingIp = performingIp;
-            return this;
-        }
-
-        public AuditEntryBuilder<TParent> WithEventDate(DateTime eventDateUtc)
-        {
-            _eventDateUtc = eventDateUtc;
-            return this;
-        }
-
-        public AuditEntryBuilder<TParent> WithPerformingUserId(int performingUserId)
-        {
-            _performingUserId = performingUserId;
-            return this;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithDeleteDateBuilder.DeleteDate
-        {
-            get => _deleteDate;
-            set => _deleteDate = value;
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        public override IAuditEntry Build()
-        {
-            var id = _id ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            DateTime? deleteDate = _deleteDate ?? null;
-            var affectedDetails = _affectedDetails ?? Guid.NewGuid().ToString();
-            var affectedUserId = _affectedUserId ?? -1;
-            var eventDetails = _eventDetails ?? Guid.NewGuid().ToString();
-            var eventType = _eventType ?? "umbraco/user";
-            var performingDetails = _performingDetails ?? Guid.NewGuid().ToString();
-            var performingIp = _performingIp ?? "127.0.0.1";
-            DateTime eventDateUtc = _eventDateUtc ?? DateTime.UtcNow;
-            var performingUserId = _performingUserId ?? -1;
-
-            return new AuditEntry
-            {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                DeleteDate = deleteDate,
-                AffectedDetails = affectedDetails,
-                AffectedUserId = affectedUserId,
-                EventDetails = eventDetails,
-                EventType = eventType,
-                PerformingDetails = performingDetails,
-                PerformingIp = performingIp,
-                EventDateUtc = eventDateUtc,
-                PerformingUserId = performingUserId,
-            };
-        }
+    }
+}
+
+public class AuditEntryBuilder<TParent>
+    : ChildBuilderBase<TParent, IAuditEntry>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithDeleteDateBuilder
+{
+    private string _affectedDetails;
+    private int? _affectedUserId;
+    private DateTime? _createDate;
+    private DateTime? _deleteDate;
+    private DateTime? _eventDateUtc;
+    private string _eventDetails;
+    private string _eventType;
+    private int? _id;
+    private Guid? _key;
+    private string _performingDetails;
+    private string _performingIp;
+    private int? _performingUserId;
+    private DateTime? _updateDate;
+
+    public AuditEntryBuilder(TParent parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    DateTime? IWithDeleteDateBuilder.DeleteDate
+    {
+        get => _deleteDate;
+        set => _deleteDate = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public AuditEntryBuilder<TParent> WithAffectedDetails(string affectedDetails)
+    {
+        _affectedDetails = affectedDetails;
+        return this;
+    }
+
+    public AuditEntryBuilder<TParent> WithAffectedUserId(int affectedUserId)
+    {
+        _affectedUserId = affectedUserId;
+        return this;
+    }
+
+    public AuditEntryBuilder<TParent> WithEventDetails(string eventDetails)
+    {
+        _eventDetails = eventDetails;
+        return this;
+    }
+
+    public AuditEntryBuilder<TParent> WithEventType(string eventType)
+    {
+        _eventType = eventType;
+        return this;
+    }
+
+    public AuditEntryBuilder<TParent> WithPerformingDetails(string performingDetails)
+    {
+        _performingDetails = performingDetails;
+        return this;
+    }
+
+    public AuditEntryBuilder<TParent> WithPerformingIp(string performingIp)
+    {
+        _performingIp = performingIp;
+        return this;
+    }
+
+    public AuditEntryBuilder<TParent> WithEventDate(DateTime eventDateUtc)
+    {
+        _eventDateUtc = eventDateUtc;
+        return this;
+    }
+
+    public AuditEntryBuilder<TParent> WithPerformingUserId(int performingUserId)
+    {
+        _performingUserId = performingUserId;
+        return this;
+    }
+
+    public override IAuditEntry Build()
+    {
+        var id = _id ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var deleteDate = _deleteDate;
+        var affectedDetails = _affectedDetails ?? Guid.NewGuid().ToString();
+        var affectedUserId = _affectedUserId ?? -1;
+        var eventDetails = _eventDetails ?? Guid.NewGuid().ToString();
+        var eventType = _eventType ?? "umbraco/user";
+        var performingDetails = _performingDetails ?? Guid.NewGuid().ToString();
+        var performingIp = _performingIp ?? "127.0.0.1";
+        var eventDateUtc = _eventDateUtc ?? DateTime.UtcNow;
+        var performingUserId = _performingUserId ?? -1;
+
+        return new AuditEntry
+        {
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            DeleteDate = deleteDate,
+            AffectedDetails = affectedDetails,
+            AffectedUserId = affectedUserId,
+            EventDetails = eventDetails,
+            EventType = eventType,
+            PerformingDetails = performingDetails,
+            PerformingIp = performingIp,
+            EventDateUtc = eventDateUtc,
+            PerformingUserId = performingUserId
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/BuilderBase.cs b/tests/Umbraco.Tests.Common/Builders/BuilderBase.cs
index 9b48e63b56..65c77213b9 100644
--- a/tests/Umbraco.Tests.Common/Builders/BuilderBase.cs
+++ b/tests/Umbraco.Tests.Common/Builders/BuilderBase.cs
@@ -3,20 +3,19 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public abstract class BuilderBase<T>
 {
-    public abstract class BuilderBase<T>
+    public abstract T Build();
+
+    protected static string RandomAlias(string alias, bool randomizeAliases)
     {
-        public abstract T Build();
-
-        protected static string RandomAlias(string alias, bool randomizeAliases)
+        if (randomizeAliases)
         {
-            if (randomizeAliases)
-            {
-                return string.Concat(alias, Guid.NewGuid().ToString("N"));
-            }
-
-            return alias;
+            return string.Concat(alias, Guid.NewGuid().ToString("N"));
         }
+
+        return alias;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs b/tests/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
index fb5904a21a..78eb53ccef 100644
--- a/tests/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ChildBuilderBase.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public abstract class ChildBuilderBase<TParent, TType> : BuilderBase<TType>
 {
-    public abstract class ChildBuilderBase<TParent, TType> : BuilderBase<TType>
-    {
-        private readonly TParent _parentBuilder;
+    private readonly TParent _parentBuilder;
 
-        protected ChildBuilderBase(TParent parentBuilder) => _parentBuilder = parentBuilder;
+    protected ChildBuilderBase(TParent parentBuilder) => _parentBuilder = parentBuilder;
 
-        public TParent Done() => _parentBuilder;
-    }
+    public TParent Done() => _parentBuilder;
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
index 8e910ee39b..ec6f0d5f3e 100644
--- a/tests/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ConfigurationEditorBuilder.cs
@@ -4,31 +4,28 @@
 using System.Collections.Generic;
 using Umbraco.Cms.Core.PropertyEditors;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ConfigurationEditorBuilder<TParent> : ChildBuilderBase<TParent, IConfigurationEditor>
 {
-    public class ConfigurationEditorBuilder<TParent> : ChildBuilderBase<TParent, IConfigurationEditor>
+    private IDictionary<string, object> _defaultConfiguration;
+
+    public ConfigurationEditorBuilder(TParent parentBuilder)
+        : base(parentBuilder)
     {
-        private IDictionary<string, object> _defaultConfiguration;
+    }
 
-        public ConfigurationEditorBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
+    public ConfigurationEditorBuilder<TParent> WithDefaultConfiguration(
+        IDictionary<string, object> defaultConfiguration)
+    {
+        _defaultConfiguration = defaultConfiguration;
+        return this;
+    }
 
-        public ConfigurationEditorBuilder<TParent> WithDefaultConfiguration(IDictionary<string, object> defaultConfiguration)
-        {
-            _defaultConfiguration = defaultConfiguration;
-            return this;
-        }
+    public override IConfigurationEditor Build()
+    {
+        var defaultConfiguration = _defaultConfiguration ?? new Dictionary<string, object>();
 
-        public override IConfigurationEditor Build()
-        {
-            IDictionary<string, object> defaultConfiguration = _defaultConfiguration ?? new Dictionary<string, object>();
-
-            return new ConfigurationEditor()
-            {
-                DefaultConfiguration = defaultConfiguration,
-            };
-        }
+        return new ConfigurationEditor { DefaultConfiguration = defaultConfiguration };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs
index 7e6cde9e39..109885a2be 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentBuilder.cs
@@ -9,462 +9,456 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Umbraco.Cms.Tests.Common.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentBuilder
+    : BuilderBase<Content>,
+        IBuildContentTypes,
+        IBuildContentCultureInfosCollection,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithParentIdBuilder,
+        IWithCreatorIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithNameBuilder,
+        IWithTrashedBuilder,
+        IWithLevelBuilder,
+        IWithPathBuilder,
+        IWithSortOrderBuilder,
+        IWithCultureInfoBuilder,
+        IWithPropertyValues
 {
-    public class ContentBuilder
-        : BuilderBase<Content>,
-            IBuildContentTypes,
-            IBuildContentCultureInfosCollection,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithParentIdBuilder,
-            IWithCreatorIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithNameBuilder,
-            IWithTrashedBuilder,
-            IWithLevelBuilder,
-            IWithPathBuilder,
-            IWithSortOrderBuilder,
-            IWithCultureInfoBuilder,
-            IWithPropertyValues
+    private readonly IDictionary<string, string> _cultureNames = new Dictionary<string, string>();
+    private ContentCultureInfosCollection _contentCultureInfosCollection;
+    private ContentCultureInfosCollectionBuilder _contentCultureInfosCollectionBuilder;
+    private IContentType _contentType;
+    private ContentTypeBuilder _contentTypeBuilder;
+    private DateTime? _createDate;
+    private int? _creatorId;
+    private CultureInfo _cultureInfo;
+
+    private int? _id;
+    private Guid? _key;
+    private int? _level;
+    private string _name;
+    private IContent _parent;
+    private int? _parentId;
+    private string _path;
+    private GenericDictionaryBuilder<ContentBuilder, string, object> _propertyDataBuilder;
+    private object _propertyValues;
+    private string _propertyValuesCulture;
+    private string _propertyValuesSegment;
+    private int? _sortOrder;
+    private bool? _trashed;
+    private DateTime? _updateDate;
+    private int? _versionId;
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private ContentTypeBuilder _contentTypeBuilder;
-        private ContentCultureInfosCollectionBuilder _contentCultureInfosCollectionBuilder;
-        private GenericDictionaryBuilder<ContentBuilder, string, object> _propertyDataBuilder;
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        private int? _id;
-        private int? _versionId;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private int? _parentId;
-        private IContent _parent;
-        private string _name;
-        private int? _creatorId;
-        private int? _level;
-        private string _path;
-        private int? _sortOrder;
-        private bool? _trashed;
-        private CultureInfo _cultureInfo;
-        private IContentType _contentType;
-        private ContentCultureInfosCollection _contentCultureInfosCollection;
-        private readonly IDictionary<string, string> _cultureNames = new Dictionary<string, string>();
-        private object _propertyValues;
-        private string _propertyValuesCulture;
-        private string _propertyValuesSegment;
+    int? IWithCreatorIdBuilder.CreatorId
+    {
+        get => _creatorId;
+        set => _creatorId = value;
+    }
 
-        public ContentBuilder WithVersionId(int versionId)
+    CultureInfo IWithCultureInfoBuilder.CultureInfo
+    {
+        get => _cultureInfo;
+        set => _cultureInfo = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    int? IWithLevelBuilder.Level
+    {
+        get => _level;
+        set => _level = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    int? IWithParentIdBuilder.ParentId
+    {
+        get => _parentId;
+        set => _parentId = value;
+    }
+
+    string IWithPathBuilder.Path
+    {
+        get => _path;
+        set => _path = value;
+    }
+
+    object IWithPropertyValues.PropertyValues
+    {
+        get => _propertyValues;
+        set => _propertyValues = value;
+    }
+
+    string IWithPropertyValues.PropertyValuesCulture
+    {
+        get => _propertyValuesCulture;
+        set => _propertyValuesCulture = value;
+    }
+
+    string IWithPropertyValues.PropertyValuesSegment
+    {
+        get => _propertyValuesSegment;
+        set => _propertyValuesSegment = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    bool? IWithTrashedBuilder.Trashed
+    {
+        get => _trashed;
+        set => _trashed = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public ContentBuilder WithVersionId(int versionId)
+    {
+        _versionId = versionId;
+        return this;
+    }
+
+    public ContentBuilder WithParent(IContent parent)
+    {
+        _parentId = null;
+        _parent = parent;
+        return this;
+    }
+
+    public ContentBuilder WithContentType(IContentType contentType)
+    {
+        _contentTypeBuilder = null;
+        _contentType = contentType;
+        return this;
+    }
+
+    public ContentBuilder WithContentCultureInfosCollection(
+        ContentCultureInfosCollection contentCultureInfosCollection)
+    {
+        _contentCultureInfosCollectionBuilder = null;
+        _contentCultureInfosCollection = contentCultureInfosCollection;
+        return this;
+    }
+
+    public ContentBuilder WithCultureName(string culture, string name = "")
+    {
+        if (string.IsNullOrWhiteSpace(name))
         {
-            _versionId = versionId;
-            return this;
-        }
-
-        public ContentBuilder WithParent(IContent parent)
-        {
-            _parentId = null;
-            _parent = parent;
-            return this;
-        }
-
-        public ContentBuilder WithContentType(IContentType contentType)
-        {
-            _contentTypeBuilder = null;
-            _contentType = contentType;            
-            return this;
-        }
-
-        public ContentBuilder WithContentCultureInfosCollection(
-            ContentCultureInfosCollection contentCultureInfosCollection)
-        {
-            _contentCultureInfosCollectionBuilder = null;
-            _contentCultureInfosCollection = contentCultureInfosCollection;
-            return this;
-        }
-
-        public ContentBuilder WithCultureName(string culture, string name = "")
-        {
-            if (string.IsNullOrWhiteSpace(name))
+            if (_cultureNames.TryGetValue(culture, out _))
             {
-                if (_cultureNames.TryGetValue(culture, out _))
+                _cultureNames.Remove(culture);
+            }
+        }
+        else
+        {
+            _cultureNames[culture] = name;
+        }
+
+        return this;
+    }
+
+    public ContentTypeBuilder AddContentType()
+    {
+        _contentType = null;
+        var builder = new ContentTypeBuilder(this);
+        _contentTypeBuilder = builder;
+        return builder;
+    }
+
+    public GenericDictionaryBuilder<ContentBuilder, string, object> AddPropertyData()
+    {
+        var builder = new GenericDictionaryBuilder<ContentBuilder, string, object>(this);
+        _propertyDataBuilder = builder;
+        return builder;
+    }
+
+    public ContentCultureInfosCollectionBuilder AddContentCultureInfosCollection()
+    {
+        _contentCultureInfosCollection = null;
+        var builder = new ContentCultureInfosCollectionBuilder(this);
+        _contentCultureInfosCollectionBuilder = builder;
+        return builder;
+    }
+
+    public override Content Build()
+    {
+        var id = _id ?? 0;
+        var versionId = _versionId ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var parentId = _parentId ?? -1;
+        var parent = _parent;
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var creatorId = _creatorId ?? 0;
+        var level = _level ?? 1;
+        var path = _path ?? $"-1,{id}";
+        var sortOrder = _sortOrder ?? 0;
+        var trashed = _trashed ?? false;
+        var culture = _cultureInfo?.Name;
+        var propertyValues = _propertyValues;
+        var propertyValuesCulture = _propertyValuesCulture;
+        var propertyValuesSegment = _propertyValuesSegment;
+
+        if (_contentTypeBuilder is null && _contentType is null)
+        {
+            throw new InvalidOperationException(
+                "A content item cannot be constructed without providing a content type. Use AddContentType() or WithContentType().");
+        }
+
+        var contentType = _contentType ?? _contentTypeBuilder.Build();
+
+        Content content;
+        if (parent != null)
+        {
+            content = new Content(name, parent, contentType, culture);
+        }
+        else
+        {
+            content = new Content(name, parentId, contentType, culture);
+        }
+
+        content.Id = id;
+        content.VersionId = versionId;
+        content.Key = key;
+        content.CreateDate = createDate;
+        content.UpdateDate = updateDate;
+        content.CreatorId = creatorId;
+        content.Level = level;
+        content.Path = path;
+        content.SortOrder = sortOrder;
+        content.Trashed = trashed;
+
+        if (contentType.DefaultTemplate?.Id > 0)
+        {
+            content.TemplateId = contentType.DefaultTemplate.Id;
+        }
+
+        foreach (var cultureName in _cultureNames)
+        {
+            content.SetCultureName(cultureName.Value, cultureName.Key);
+        }
+
+        if (_propertyDataBuilder != null || propertyValues != null)
+        {
+            if (_propertyDataBuilder != null)
+            {
+                var propertyData = _propertyDataBuilder.Build();
+                foreach (var keyValuePair in propertyData)
                 {
-                    _cultureNames.Remove(culture);
+                    content.SetValue(keyValuePair.Key, keyValuePair.Value);
                 }
             }
             else
             {
-                _cultureNames[culture] = name;
+                content.PropertyValues(propertyValues, propertyValuesCulture, propertyValuesSegment);
             }
 
-            return this;
+            content.ResetDirtyProperties(false);
         }
 
-        public ContentTypeBuilder AddContentType()
+        if (_contentCultureInfosCollection is not null || _contentCultureInfosCollectionBuilder is not null)
         {
-            _contentType = null;
-            var builder = new ContentTypeBuilder(this);
-            _contentTypeBuilder = builder;
-            return builder;
+            var contentCultureInfos =
+                _contentCultureInfosCollection ?? _contentCultureInfosCollectionBuilder.Build();
+            content.PublishCultureInfos = contentCultureInfos;
         }
 
-        public GenericDictionaryBuilder<ContentBuilder, string, object> AddPropertyData()
-        {
-            var builder = new GenericDictionaryBuilder<ContentBuilder, string, object>(this);
-            _propertyDataBuilder = builder;
-            return builder;
-        }
+        return content;
+    }
 
-        public ContentCultureInfosCollectionBuilder AddContentCultureInfosCollection()
-        {
-            _contentCultureInfosCollection = null;
-            var builder = new ContentCultureInfosCollectionBuilder(this);
-            _contentCultureInfosCollectionBuilder = builder;
-            return builder;
-        }
+    public static Content CreateBasicContent(IContentType contentType, int id = 0) =>
+        new ContentBuilder()
+            .WithId(id)
+            .WithContentType(contentType)
+            .WithName("Home")
+            .Build();
 
-        public override Content Build()
-        {
-            var id = _id ?? 0;
-            var versionId = _versionId ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            var parentId = _parentId ?? -1;
-            IContent parent = _parent ?? null;
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var creatorId = _creatorId ?? 0;
-            var level = _level ?? 1;
-            var path = _path ?? $"-1,{id}";
-            var sortOrder = _sortOrder ?? 0;
-            var trashed = _trashed ?? false;
-            var culture = _cultureInfo?.Name ?? null;
-            var propertyValues = _propertyValues ?? null;
-            var propertyValuesCulture = _propertyValuesCulture ?? null;
-            var propertyValuesSegment = _propertyValuesSegment ?? null;
-
-            if (_contentTypeBuilder is null && _contentType is null)
+    public static Content CreateSimpleContent(IContentType contentType) =>
+        new ContentBuilder()
+            .WithContentType(contentType)
+            .WithName("Home")
+            .WithPropertyValues(new
             {
-                throw new InvalidOperationException("A content item cannot be constructed without providing a content type. Use AddContentType() or WithContentType().");
-            }
+                title = "Welcome to our Home page",
+                bodyText = "This is the welcome message on the first page",
+                author = "John Doe"
+            })
+            .Build();
 
-            IContentType contentType = _contentType ?? _contentTypeBuilder.Build();
-
-            Content content;
-            if (parent != null)
-            {
-                content = new Content(name, parent, contentType, culture);
-            }
-            else
-            {
-                content = new Content(name, parentId, contentType, culture);
-            }
-
-            content.Id = id;
-            content.VersionId = versionId;
-            content.Key = key;
-            content.CreateDate = createDate;
-            content.UpdateDate = updateDate;
-            content.CreatorId = creatorId;
-            content.Level = level;
-            content.Path = path;
-            content.SortOrder = sortOrder;
-            content.Trashed = trashed;
-
-            if (contentType.DefaultTemplate?.Id > 0)
-            {
-                content.TemplateId = contentType.DefaultTemplate.Id;
-            }
-
-            foreach (KeyValuePair<string, string> cultureName in _cultureNames)
-            {
-                content.SetCultureName(cultureName.Value, cultureName.Key);
-            }
-
-            if (_propertyDataBuilder != null || propertyValues != null)
-            {
-                if (_propertyDataBuilder != null)
-                {
-                    IDictionary<string, object> propertyData = _propertyDataBuilder.Build();
-                    foreach (KeyValuePair<string, object> keyValuePair in propertyData)
-                    {
-                        content.SetValue(keyValuePair.Key, keyValuePair.Value);
-                    }
-                }
-                else
-                {
-                    content.PropertyValues(propertyValues, propertyValuesCulture, propertyValuesSegment);
-                }
-
-                content.ResetDirtyProperties(false);
-            }
-
-            if (_contentCultureInfosCollection is not null || _contentCultureInfosCollectionBuilder is not null)
-            {
-                ContentCultureInfosCollection contentCultureInfos =
-                    _contentCultureInfosCollection ?? _contentCultureInfosCollectionBuilder.Build();
-                content.PublishCultureInfos = contentCultureInfos;
-            }
-
-            return content;
-        }
-
-        public static Content CreateBasicContent(IContentType contentType, int id = 0) =>
-            new ContentBuilder()
-                .WithId(id)
-                .WithContentType(contentType)
-                .WithName("Home")
-                .Build();
-
-        public static Content CreateSimpleContent(IContentType contentType) =>
-            new ContentBuilder()
-                .WithContentType(contentType)
-                .WithName("Home")
-                .WithPropertyValues(new
+    public static Content CreateSimpleContent(IContentType contentType, string name, int parentId = -1, string? culture = null, string? segment = null) =>
+        new ContentBuilder()
+            .WithContentType(contentType)
+            .WithName(name)
+            .WithParentId(parentId)
+            .WithPropertyValues(
+                new
                 {
                     title = "Welcome to our Home page",
                     bodyText = "This is the welcome message on the first page",
                     author = "John Doe"
-                })
-                .Build();
+                },
+                culture,
+                segment)
+            .Build();
 
-        public static Content CreateSimpleContent(IContentType contentType, string name, int parentId = -1, string? culture = null, string? segment = null) =>
-            new ContentBuilder()
-                .WithContentType(contentType)
-                .WithName(name)
-                .WithParentId(parentId)
-                .WithPropertyValues(
-                    new
-                    {
-                        title = "Welcome to our Home page",
-                        bodyText = "This is the welcome message on the first page",
-                        author = "John Doe"
-                    },
-                    culture,
-                    segment)
-                .Build();
+    public static Content CreateSimpleContent(IContentType contentType, string name, IContent parent, string? culture = null, string? segment = null, bool setPropertyValues = true)
+    {
+        var builder = new ContentBuilder()
+            .WithContentType(contentType)
+            .WithName(name)
+            .WithParent(parent);
 
-        public static Content CreateSimpleContent(IContentType contentType, string name, IContent parent, string? culture = null, string? segment = null, bool setPropertyValues = true)
+        if (!(culture is null))
         {
-            ContentBuilder builder = new ContentBuilder()
-                .WithContentType(contentType)
-                .WithName(name)
-                .WithParent(parent);
+            builder = builder.WithCultureName(culture, name);
+        }
 
-            if (!(culture is null))
-            {
-                builder = builder.WithCultureName(culture, name);
-            }
+        if (setPropertyValues)
+        {
+            builder = builder.WithPropertyValues(
+                new { title = name + " Subpage", bodyText = "This is a subpage", author = "John Doe" },
+                culture,
+                segment);
+        }
 
-            if (setPropertyValues)
-            {
-                builder = builder.WithPropertyValues(
-                    new
-                    {
-                        title = name + " Subpage",
-                        bodyText = "This is a subpage",
-                        author = "John Doe"
-                    },
-                    culture,
-                    segment);
-            }
+        var content = builder.Build();
 
-            Content content = builder.Build();
+        content.ResetDirtyProperties(false);
+
+        return content;
+    }
+
+    public static IEnumerable<Content> CreateTextpageContent(IContentType contentType, int parentId, int amount)
+    {
+        var list = new List<Content>();
+
+        for (var i = 0; i < amount; i++)
+        {
+            var name = "Textpage No-" + i;
+            var content = new Content(name, parentId, contentType) { CreatorId = 0, WriterId = 0 };
+            object obj =
+                new
+                {
+                    title = name + " title",
+                    bodyText = string.Format("This is a textpage based on the {0} ContentType", contentType.Alias),
+                    keywords = "text,page,meta",
+                    description = "This is the meta description for a textpage"
+                };
+
+            content.PropertyValues(obj);
 
             content.ResetDirtyProperties(false);
 
-            return content;
+            list.Add(content);
         }
 
-        public static IEnumerable<Content> CreateTextpageContent(IContentType contentType, int parentId, int amount)
+        return list;
+    }
+
+    public static Content CreateTextpageContent(IContentType contentType, string name, int parentId) =>
+        new ContentBuilder()
+            .WithId(0)
+            .WithContentType(contentType)
+            .WithName(name)
+            .WithParentId(parentId)
+            .WithPropertyValues(
+                new
+                {
+                    title = name + " textpage",
+                    bodyText = string.Format("This is a textpage based on the {0} ContentType", contentType.Alias),
+                    keywords = "text,page,meta",
+                    description = "This is the meta description for a textpage"
+                })
+            .Build();
+
+    public static IEnumerable<Content> CreateMultipleTextpageContent(IContentType contentType, int parentId, int amount)
+    {
+        var list = new List<Content>();
+
+        for (var i = 0; i < amount; i++)
         {
-            var list = new List<Content>();
-
-            for (var i = 0; i < amount; i++)
-            {
-                var name = "Textpage No-" + i;
-                var content = new Content(name, parentId, contentType) { CreatorId = 0, WriterId = 0 };
-                object obj =
-                    new
-                    {
-                        title = name + " title",
-                        bodyText = string.Format("This is a textpage based on the {0} ContentType", contentType.Alias),
-                        keywords = "text,page,meta",
-                        description = "This is the meta description for a textpage"
-                    };
-
-                content.PropertyValues(obj);
-
-                content.ResetDirtyProperties(false);
-
-                list.Add(content);
-            }
-
-            return list;
-        }
-
-        public static Content CreateTextpageContent(IContentType contentType, string name, int parentId) =>
-            new ContentBuilder()
-                .WithId(0)
-                .WithContentType(contentType)
-                .WithName(name)
-                .WithParentId(parentId)
-                .WithPropertyValues(
-                    new
-                    {
-                        title = name + " textpage",
-                        bodyText = string.Format("This is a textpage based on the {0} ContentType", contentType.Alias),
-                        keywords = "text,page,meta",
-                        description = "This is the meta description for a textpage"
-                    })
-                .Build();
-
-        public static IEnumerable<Content> CreateMultipleTextpageContent(IContentType contentType, int parentId, int amount)
-        {
-            var list = new List<Content>();
-
-            for (var i = 0; i < amount; i++)
-            {
-                var name = "Textpage No-" + i;
-                Content content = new ContentBuilder()
-                    .WithName(name)
-                    .WithParentId(parentId)
-                    .WithContentType(contentType)
-                    .WithPropertyValues(new
-                        {
-                            title = name + " title",
-                            bodyText = $"This is a textpage based on the {contentType.Alias} ContentType",
-                            keywords = "text,page,meta",
-                            description = "This is the meta description for a textpage"
-                        })
-                    .Build();
-
-                list.Add(content);
-            }
-
-            return list;
-        }
-
-        public static Content CreateAllTypesContent(IContentType contentType, string name, int parentId)
-        {
-            Content content = new ContentBuilder()
+            var name = "Textpage No-" + i;
+            var content = new ContentBuilder()
                 .WithName(name)
                 .WithParentId(parentId)
                 .WithContentType(contentType)
+                .WithPropertyValues(new
+                {
+                    title = name + " title",
+                    bodyText = $"This is a textpage based on the {contentType.Alias} ContentType",
+                    keywords = "text,page,meta",
+                    description = "This is the meta description for a textpage"
+                })
                 .Build();
 
-            content.SetValue("isTrue", true);
-            content.SetValue("number", 42);
-            content.SetValue("bodyText", "Lorem Ipsum Body Text Test");
-            content.SetValue("singleLineText", "Single Line Text Test");
-            content.SetValue("multilineText", "Multiple lines \n in one box");
-            content.SetValue("upload", "/media/1234/koala.jpg");
-            content.SetValue("label", "Non-editable label");
-            content.SetValue("dateTime", DateTime.Now.AddDays(-20));
-            content.SetValue("colorPicker", "black");
-            content.SetValue("ddlMultiple", "1234,1235");
-            content.SetValue("rbList", "random");
-            content.SetValue("date", DateTime.Now.AddDays(-10));
-            content.SetValue("ddl", "1234");
-            content.SetValue("chklist", "randomc");
-            content.SetValue("contentPicker", Udi.Create(Constants.UdiEntityType.Document, new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C")).ToString());
-            content.SetValue("mediaPicker", Udi.Create(Constants.UdiEntityType.Media, new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691")).ToString());
-            content.SetValue("memberPicker", Udi.Create(Constants.UdiEntityType.Member, new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D")).ToString());
-            content.SetValue("multiUrlPicker", "[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]");
-            content.SetValue("tags", "this,is,tags");
-
-            return content;
+            list.Add(content);
         }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
+        return list;
+    }
 
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
+    public static Content CreateAllTypesContent(IContentType contentType, string name, int parentId)
+    {
+        var content = new ContentBuilder()
+            .WithName(name)
+            .WithParentId(parentId)
+            .WithContentType(contentType)
+            .Build();
 
-        int? IWithCreatorIdBuilder.CreatorId
-        {
-            get => _creatorId;
-            set => _creatorId = value;
-        }
+        content.SetValue("isTrue", true);
+        content.SetValue("number", 42);
+        content.SetValue("bodyText", "Lorem Ipsum Body Text Test");
+        content.SetValue("singleLineText", "Single Line Text Test");
+        content.SetValue("multilineText", "Multiple lines \n in one box");
+        content.SetValue("upload", "/media/1234/koala.jpg");
+        content.SetValue("label", "Non-editable label");
+        content.SetValue("dateTime", DateTime.Now.AddDays(-20));
+        content.SetValue("colorPicker", "black");
+        content.SetValue("ddlMultiple", "1234,1235");
+        content.SetValue("rbList", "random");
+        content.SetValue("date", DateTime.Now.AddDays(-10));
+        content.SetValue("ddl", "1234");
+        content.SetValue("chklist", "randomc");
+        content.SetValue("contentPicker", Udi.Create(Constants.UdiEntityType.Document, new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C")).ToString());
+        content.SetValue("mediaPicker", Udi.Create(Constants.UdiEntityType.Media, new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691")).ToString());
+        content.SetValue("memberPicker", Udi.Create(Constants.UdiEntityType.Member, new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D")).ToString());
+        content.SetValue("multiUrlPicker", "[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]");
+        content.SetValue("tags", "this,is,tags");
 
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        bool? IWithTrashedBuilder.Trashed
-        {
-            get => _trashed;
-            set => _trashed = value;
-        }
-
-        int? IWithLevelBuilder.Level
-        {
-            get => _level;
-            set => _level = value;
-        }
-
-        string IWithPathBuilder.Path
-        {
-            get => _path;
-            set => _path = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        int? IWithParentIdBuilder.ParentId
-        {
-            get => _parentId;
-            set => _parentId = value;
-        }
-
-        CultureInfo IWithCultureInfoBuilder.CultureInfo
-        {
-            get => _cultureInfo;
-            set => _cultureInfo = value;
-        }
-
-        object IWithPropertyValues.PropertyValues
-        {
-            get => _propertyValues;
-            set => _propertyValues = value;
-        }
-
-        string IWithPropertyValues.PropertyValuesCulture
-        {
-            get => _propertyValuesCulture;
-            set => _propertyValuesCulture = value;
-        }
-
-        string IWithPropertyValues.PropertyValuesSegment
-        {
-            get => _propertyValuesSegment;
-            set => _propertyValuesSegment = value;
-        }
+        return content;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs
index ba99bcbcbd..6504ce2d1e 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosBuilder.cs
@@ -1,45 +1,35 @@
-using System;
+using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentCultureInfosBuilder : ChildBuilderBase<ContentCultureInfosCollectionBuilder, ContentCultureInfos>,
+    IWithNameBuilder,
+    IWithDateBuilder
 {
-    public class ContentCultureInfosBuilder : ChildBuilderBase<ContentCultureInfosCollectionBuilder, ContentCultureInfos>,
-        IWithNameBuilder,
-        IWithDateBuilder
+    private string _cultureIso;
+
+    public ContentCultureInfosBuilder(ContentCultureInfosCollectionBuilder parentBuilder) : base(parentBuilder)
     {
-        private string _name;
-        private string _cultureIso;
-        private DateTime? _date;
-        public ContentCultureInfosBuilder(ContentCultureInfosCollectionBuilder parentBuilder) : base(parentBuilder)
-        {
-        }
+    }
 
-        public ContentCultureInfosBuilder WithCultureIso(string cultureIso)
-        {
-            _cultureIso = cultureIso;
-            return this;
-        }
+    public DateTime? Date { get; set; }
 
-        public override ContentCultureInfos Build()
-        {
-            var name = _name ?? Guid.NewGuid().ToString();
-            var cultureIso = _cultureIso ?? "en-us";
-            DateTime date = _date ?? DateTime.Now;
+    public string Name { get; set; }
 
-            return new ContentCultureInfos(cultureIso) { Name = name, Date = date };
-        }
+    public ContentCultureInfosBuilder WithCultureIso(string cultureIso)
+    {
+        _cultureIso = cultureIso;
+        return this;
+    }
 
-        public string Name
-        {
-            get => _name;
-            set => _name = value;
-        }
+    public override ContentCultureInfos Build()
+    {
+        var name = Name ?? Guid.NewGuid().ToString();
+        var cultureIso = _cultureIso ?? "en-us";
+        var date = Date ?? DateTime.Now;
 
-        public DateTime? Date
-        {
-            get => _date;
-            set => _date = value;
-        }
+        return new ContentCultureInfos(cultureIso) { Name = name, Date = date };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs
index a090880633..b70437a31d 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs
@@ -1,36 +1,39 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentCultureInfosCollectionBuilder : ChildBuilderBase<ContentBuilder, ContentCultureInfosCollection>,
+    IBuildContentCultureInfosCollection
 {
-    public class ContentCultureInfosCollectionBuilder : ChildBuilderBase<ContentBuilder, ContentCultureInfosCollection>, IBuildContentCultureInfosCollection
+    private readonly List<ContentCultureInfosBuilder> _cultureInfosBuilders;
+
+    public ContentCultureInfosCollectionBuilder(ContentBuilder parentBuilder) : base(parentBuilder) =>
+        _cultureInfosBuilders = new List<ContentCultureInfosBuilder>();
+
+    public ContentCultureInfosBuilder AddCultureInfos()
     {
-        private readonly List<ContentCultureInfosBuilder> _cultureInfosBuilders;
-        public ContentCultureInfosCollectionBuilder(ContentBuilder parentBuilder) : base(parentBuilder) => _cultureInfosBuilders = new List<ContentCultureInfosBuilder>();
+        var builder = new ContentCultureInfosBuilder(this);
+        _cultureInfosBuilders.Add(builder);
+        return builder;
+    }
 
-        public ContentCultureInfosBuilder AddCultureInfos()
+    public override ContentCultureInfosCollection Build()
+    {
+        if (_cultureInfosBuilders.Count < 1)
         {
-            var builder = new ContentCultureInfosBuilder(this);
-            _cultureInfosBuilders.Add(builder);
-            return builder;
+            throw new InvalidOperationException("You must add at least one culture infos to the collection builder");
         }
 
-        public override ContentCultureInfosCollection Build()
+        var cultureInfosCollection = new ContentCultureInfosCollection();
+
+        foreach (var cultureInfosBuilder in _cultureInfosBuilders)
         {
-            if (_cultureInfosBuilders.Count < 1)
-            {
-                throw new InvalidOperationException("You must add at least one culture infos to the collection builder");
-            }
-            var cultureInfosCollection = new ContentCultureInfosCollection();
-
-            foreach (ContentCultureInfosBuilder cultureInfosBuilder in _cultureInfosBuilders)
-            {
-                cultureInfosCollection.Add(cultureInfosBuilder.Build());
-            }
-
-            return cultureInfosCollection;
+            cultureInfosCollection.Add(cultureInfosBuilder.Build());
         }
+
+        return cultureInfosCollection;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentDataBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentDataBuilder.cs
index 596d64dd3c..8d4778111f 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentDataBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentDataBuilder.cs
@@ -1,221 +1,218 @@
 using System;
 using System.Collections.Generic;
-using Umbraco.Extensions;
+using System.Linq;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Core.PropertyEditors;
-using Moq;
-using Umbraco.Cms.Infrastructure.Serialization;
-using System.Linq;
+using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentDataBuilder : BuilderBase<ContentData>, IWithNameBuilder
 {
+    private Dictionary<string, CultureVariation> _cultureInfos;
+    private string _name;
+    private DateTime? _now;
+    private Dictionary<string, PropertyData[]> _properties;
+    private bool? _published;
+    private string _segment;
+    private int? _templateId;
+    private int? _versionId;
+    private int? _writerId;
 
-    public class ContentDataBuilder : BuilderBase<ContentData>, IWithNameBuilder
+    string IWithNameBuilder.Name
     {
-        private string _name;
-        private DateTime? _now;
-        private string _segment;
-        private int? _versionId;
-        private int? _writerId;
-        private int? _templateId;
-        private bool? _published;
-        private Dictionary<string, PropertyData[]> _properties;
-        private Dictionary<string, CultureVariation> _cultureInfos;
+        get => _name;
+        set => _name = value;
+    }
 
-        string IWithNameBuilder.Name
+    public ContentDataBuilder WithVersionDate(DateTime now)
+    {
+        _now = now;
+        return this;
+    }
+
+    public ContentDataBuilder WithUrlSegment(string segment)
+    {
+        _segment = segment;
+        return this;
+    }
+
+    public ContentDataBuilder WithVersionId(int versionId)
+    {
+        _versionId = versionId;
+        return this;
+    }
+
+    public ContentDataBuilder WithWriterId(int writerId)
+    {
+        _writerId = writerId;
+        return this;
+    }
+
+    public ContentDataBuilder WithTemplateId(int templateId)
+    {
+        _templateId = templateId;
+        return this;
+    }
+
+    public ContentDataBuilder WithPublished(bool published)
+    {
+        _published = published;
+        return this;
+    }
+
+    public ContentDataBuilder WithProperties(Dictionary<string, PropertyData[]> properties)
+    {
+        _properties = properties;
+        return this;
+    }
+
+    public ContentDataBuilder WithCultureInfos(Dictionary<string, CultureVariation> cultureInfos)
+    {
+        _cultureInfos = cultureInfos;
+        return this;
+    }
+
+    /// <summary>
+    ///     Build and dynamically update an existing content type
+    /// </summary>
+    /// <typeparam name="TContentType"></typeparam>
+    /// <param name="shortStringHelper"></param>
+    /// <param name="propertyDataTypes"></param>
+    /// <param name="contentType"></param>
+    /// <param name="contentTypeAlias">
+    ///     Will configure the content type with this alias/name if supplied when it's not already set on the content type.
+    /// </param>
+    /// <param name="autoCreateCultureNames"></param>
+    /// <returns></returns>
+    public ContentData Build<TContentType>(
+        IShortStringHelper shortStringHelper,
+        Dictionary<string, IDataType> propertyDataTypes,
+        TContentType contentType,
+        string contentTypeAlias = null,
+        bool autoCreateCultureNames = false) where TContentType : class, IContentTypeComposition
+    {
+        if (_name.IsNullOrWhiteSpace())
         {
-            get => _name;
-            set => _name = value;
+            throw new InvalidOperationException("Cannot build without a name");
         }
 
-        public ContentDataBuilder WithVersionDate(DateTime now)
+        _segment ??= _name.ToLower().ReplaceNonAlphanumericChars('-');
+
+        // create or copy the current culture infos for the content
+        var contentCultureInfos = _cultureInfos == null
+            ? new Dictionary<string, CultureVariation>()
+            : new Dictionary<string, CultureVariation>(_cultureInfos);
+
+        contentType.Alias ??= contentTypeAlias;
+        contentType.Name ??= contentTypeAlias;
+        contentType.Key = contentType.Key == default ? Guid.NewGuid() : contentType.Key;
+        contentType.Id = contentType.Id == default ? Math.Abs(contentTypeAlias.GetHashCode()) : contentType.Id;
+
+        if (_properties == null)
         {
-            _now = now;
-            return this;
+            _properties = new Dictionary<string, PropertyData[]>();
         }
 
-        public ContentDataBuilder WithUrlSegment(string segment)
+        foreach (var prop in _properties)
         {
-            _segment = segment;
-            return this;
-        }
+            //var dataType = new DataType(new VoidEditor("Label", Mock.Of<IDataValueEditorFactory>()), new ConfigurationEditorJsonSerializer())
+            //{
+            //    Id = 4
+            //};
 
-        public ContentDataBuilder WithVersionId(int versionId)
-        {
-            _versionId = versionId;
-            return this;
-        }
-
-        public ContentDataBuilder WithWriterId(int writerId)
-        {
-            _writerId = writerId;
-            return this;
-        }
-
-        public ContentDataBuilder WithTemplateId(int templateId)
-        {
-            _templateId = templateId;
-            return this;
-        }
-
-        public ContentDataBuilder WithPublished(bool published)
-        {
-            _published = published;
-            return this;
-        }
-
-        public ContentDataBuilder WithProperties(Dictionary<string, PropertyData[]> properties)
-        {
-            _properties = properties;
-            return this;
-        }
-
-        public ContentDataBuilder WithCultureInfos(Dictionary<string, CultureVariation> cultureInfos)
-        {
-            _cultureInfos = cultureInfos;            
-            return this;
-        }
-
-        /// <summary>
-        /// Build and dynamically update an existing content type
-        /// </summary>
-        /// <typeparam name="TContentType"></typeparam>
-        /// <param name="shortStringHelper"></param>
-        /// <param name="propertyDataTypes"></param>
-        /// <param name="contentType"></param>
-        /// <param name="contentTypeAlias">
-        /// Will configure the content type with this alias/name if supplied when it's not already set on the content type.
-        /// </param>
-        /// <param name="autoCreateCultureNames"></param>
-        /// <returns></returns>
-        public ContentData Build<TContentType>(
-            IShortStringHelper shortStringHelper,
-            Dictionary<string, IDataType> propertyDataTypes,
-            TContentType contentType,
-            string contentTypeAlias = null,
-            bool autoCreateCultureNames = false) where TContentType : class, IContentTypeComposition
-        {
-            if (_name.IsNullOrWhiteSpace())
+            if (!propertyDataTypes.TryGetValue(prop.Key, out var dataType))
             {
-                throw new InvalidOperationException("Cannot build without a name");
-            }
-            _segment ??= _name.ToLower().ReplaceNonAlphanumericChars('-');
-
-            // create or copy the current culture infos for the content
-            Dictionary<string, CultureVariation> contentCultureInfos = _cultureInfos == null
-                ? new Dictionary<string, CultureVariation>()
-                : new Dictionary<string, CultureVariation>(_cultureInfos);
-
-            contentType.Alias ??= contentTypeAlias;
-            contentType.Name ??= contentTypeAlias;
-            contentType.Key = contentType.Key == default ? Guid.NewGuid() : contentType.Key;
-            contentType.Id = contentType.Id == default ? Math.Abs(contentTypeAlias.GetHashCode()) : contentType.Id;
-
-            if (_properties == null)
-            {
-                _properties = new Dictionary<string, PropertyData[]>();
+                dataType = propertyDataTypes.First().Value;
             }
 
-            foreach (KeyValuePair<string, PropertyData[]> prop in _properties)
+            var propertyType = new PropertyType(shortStringHelper, dataType, prop.Key);
+
+            // check each property for culture and set variations accordingly,
+            // this will also ensure that we have the correct culture name on the content
+            // set for each culture too.
+            foreach (var cultureValue in prop.Value.Where(x => !x.Culture.IsNullOrWhiteSpace()))
             {
-                //var dataType = new DataType(new VoidEditor("Label", Mock.Of<IDataValueEditorFactory>()), new ConfigurationEditorJsonSerializer())
-                //{
-                //    Id = 4
-                //};
+                // set the property type to vary based on the values
+                propertyType.Variations |= ContentVariation.Culture;
 
-                if (!propertyDataTypes.TryGetValue(prop.Key, out IDataType dataType))
+                // if there isn't already a culture, then add one with the default name
+                if (autoCreateCultureNames &&
+                    !contentCultureInfos.TryGetValue(cultureValue.Culture, out var cultureVariation))
                 {
-                    dataType = propertyDataTypes.First().Value;
-                }
-
-                var propertyType = new PropertyType(shortStringHelper, dataType, prop.Key);
-
-                // check each property for culture and set variations accordingly,
-                // this will also ensure that we have the correct culture name on the content
-                // set for each culture too.
-                foreach (PropertyData cultureValue in prop.Value.Where(x => !x.Culture.IsNullOrWhiteSpace()))
-                {
-                    // set the property type to vary based on the values
-                    propertyType.Variations |= ContentVariation.Culture;
-
-                    // if there isn't already a culture, then add one with the default name
-                    if (autoCreateCultureNames && !contentCultureInfos.TryGetValue(cultureValue.Culture, out CultureVariation cultureVariation))
+                    cultureVariation = new CultureVariation
                     {
-                        cultureVariation = new CultureVariation
-                        {
-                            Date = DateTime.Now,
-                            IsDraft = true,
-                            Name = _name,
-                            UrlSegment = _segment
-                        };
-                        contentCultureInfos[cultureValue.Culture] = cultureVariation;
-                    }
-                }
-
-                // set variations for segments if there is any
-                if (prop.Value.Any(x => !x.Segment.IsNullOrWhiteSpace()))
-                {
-                    propertyType.Variations |= ContentVariation.Segment;
-                    contentType.Variations |= ContentVariation.Segment;
-                }
-
-                if (!contentType.PropertyTypeExists(propertyType.Alias))
-                {
-                    contentType.AddPropertyType(propertyType);
+                        Date = DateTime.Now,
+                        IsDraft = true,
+                        Name = _name,
+                        UrlSegment = _segment
+                    };
+                    contentCultureInfos[cultureValue.Culture] = cultureVariation;
                 }
             }
 
-            if (contentCultureInfos.Count > 0)
+            // set variations for segments if there is any
+            if (prop.Value.Any(x => !x.Segment.IsNullOrWhiteSpace()))
             {
-                contentType.Variations |= ContentVariation.Culture;
-                WithCultureInfos(contentCultureInfos);
+                propertyType.Variations |= ContentVariation.Segment;
+                contentType.Variations |= ContentVariation.Segment;
             }
 
-            var result = Build();
-            return result;
+            if (!contentType.PropertyTypeExists(propertyType.Alias))
+            {
+                contentType.AddPropertyType(propertyType);
+            }
         }
 
-        public override ContentData Build()
+        if (contentCultureInfos.Count > 0)
         {
-            var now = _now ?? DateTime.Now;
-            var versionId = _versionId ?? 1;
-            var writerId = _writerId ?? -1;
-            var templateId = _templateId ?? 0;
-            var published = _published ?? true;
-            var properties = _properties ?? new Dictionary<string, PropertyData[]>();
-            var cultureInfos = _cultureInfos ?? new Dictionary<string, CultureVariation>();
-            var segment = _segment ?? _name.ToLower().ReplaceNonAlphanumericChars('-');
-
-            var contentData = new ContentData(
-                _name,
-                segment,
-                versionId,
-                now,
-                writerId,
-                templateId,
-                published,
-                properties,
-                cultureInfos);
-
-            return contentData;
+            contentType.Variations |= ContentVariation.Culture;
+            WithCultureInfos(contentCultureInfos);
         }
 
-        public static ContentData CreateBasic(string name, DateTime? versionDate = null)
-            => new ContentDataBuilder()
+        var result = Build();
+        return result;
+    }
+
+    public override ContentData Build()
+    {
+        var now = _now ?? DateTime.Now;
+        var versionId = _versionId ?? 1;
+        var writerId = _writerId ?? -1;
+        var templateId = _templateId ?? 0;
+        var published = _published ?? true;
+        var properties = _properties ?? new Dictionary<string, PropertyData[]>();
+        var cultureInfos = _cultureInfos ?? new Dictionary<string, CultureVariation>();
+        var segment = _segment ?? _name.ToLower().ReplaceNonAlphanumericChars('-');
+
+        var contentData = new ContentData(
+            _name,
+            segment,
+            versionId,
+            now,
+            writerId,
+            templateId,
+            published,
+            properties,
+            cultureInfos);
+
+        return contentData;
+    }
+
+    public static ContentData CreateBasic(string name, DateTime? versionDate = null)
+        => new ContentDataBuilder()
             .WithName(name)
             .WithVersionDate(versionDate ?? DateTime.Now)
             .Build();
 
-        public static ContentData CreateVariant(string name, Dictionary<string, CultureVariation> cultureInfos, DateTime? versionDate = null, bool published = true)
-            => new ContentDataBuilder()
+    public static ContentData CreateVariant(string name, Dictionary<string, CultureVariation> cultureInfos, DateTime? versionDate = null, bool published = true)
+        => new ContentDataBuilder()
             .WithName(name)
             .WithVersionDate(versionDate ?? DateTime.Now)
             .WithCultureInfos(cultureInfos)
             .WithPublished(published)
             .Build();
-    }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs
index bcd73451f3..b16898e886 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentItemSaveBuilder.cs
@@ -6,70 +6,69 @@ using System.Linq;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentItemSaveBuilder : BuilderBase<ContentItemSave>,
+    IWithIdBuilder,
+    IWithParentIdBuilder
 {
-    public class ContentItemSaveBuilder : BuilderBase<ContentItemSave>,
-        IWithIdBuilder,
-        IWithParentIdBuilder
+    private ContentSaveAction? _action;
+    private string _contentTypeAlias;
+
+    private int? _id;
+    private int? _parentId;
+    private readonly List<ContentVariantSaveBuilder<ContentItemSaveBuilder>> _variantBuilders = new();
+
+    int? IWithIdBuilder.Id
     {
-        private List<ContentVariantSaveBuilder<ContentItemSaveBuilder>> _variantBuilders = new List<ContentVariantSaveBuilder<ContentItemSaveBuilder>>();
-
-        private int? _id;
-        private int? _parentId;
-        private string _contentTypeAlias;
-        private ContentSaveAction? _action;
-
-        public ContentVariantSaveBuilder<ContentItemSaveBuilder> AddVariant()
-        {
-            var builder = new ContentVariantSaveBuilder<ContentItemSaveBuilder>(this);
-            _variantBuilders.Add(builder);
-            return builder;
-        }
-
-        public override ContentItemSave Build()
-        {
-            var id = _id ?? 0;
-            var parentId = _parentId ?? -1;
-            var contentTypeAlias = _contentTypeAlias ?? null;
-            ContentSaveAction action = _action ?? ContentSaveAction.Save;
-            IEnumerable<ContentVariantSave> variants = _variantBuilders.Select(x => x.Build());
-
-            return new TestContentItemSave()
-            {
-                Id = id,
-                ParentId = parentId,
-                ContentTypeAlias = contentTypeAlias,
-                Action = action,
-                Variants = variants,
-            };
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        int? IWithParentIdBuilder.ParentId
-        {
-            get => _parentId;
-            set => _parentId = value;
-        }
-
-        public ContentItemSaveBuilder WithAction(ContentSaveAction action)
-        {
-            _action = action;
-            return this;
-        }
-
-        public ContentItemSaveBuilder WithContentTypeAlias(string contentTypeAlias)
-        {
-            _contentTypeAlias = contentTypeAlias;
-            return this;
-        }
+        get => _id;
+        set => _id = value;
     }
 
-    public class TestContentItemSave : ContentItemSave
+    int? IWithParentIdBuilder.ParentId
     {
+        get => _parentId;
+        set => _parentId = value;
+    }
+
+    public ContentVariantSaveBuilder<ContentItemSaveBuilder> AddVariant()
+    {
+        var builder = new ContentVariantSaveBuilder<ContentItemSaveBuilder>(this);
+        _variantBuilders.Add(builder);
+        return builder;
+    }
+
+    public override ContentItemSave Build()
+    {
+        var id = _id ?? 0;
+        var parentId = _parentId ?? -1;
+        var contentTypeAlias = _contentTypeAlias;
+        var action = _action ?? ContentSaveAction.Save;
+        var variants = _variantBuilders.Select(x => x.Build());
+
+        return new TestContentItemSave
+        {
+            Id = id,
+            ParentId = parentId,
+            ContentTypeAlias = contentTypeAlias,
+            Action = action,
+            Variants = variants
+        };
+    }
+
+    public ContentItemSaveBuilder WithAction(ContentSaveAction action)
+    {
+        _action = action;
+        return this;
+    }
+
+    public ContentItemSaveBuilder WithContentTypeAlias(string contentTypeAlias)
+    {
+        _contentTypeAlias = contentTypeAlias;
+        return this;
     }
 }
+
+public class TestContentItemSave : ContentItemSave
+{
+}
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentNodeKitBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentNodeKitBuilder.cs
index f3314389dd..c58968a655 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentNodeKitBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentNodeKitBuilder.cs
@@ -2,95 +2,94 @@ using System;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentNodeKitBuilder : BuilderBase<ContentNodeKit>
 {
-    public class ContentNodeKitBuilder : BuilderBase<ContentNodeKit>
+    private ContentNode _contentNode;
+    private int _contentTypeId;
+    private ContentData _draftData;
+    private ContentData _publishedData;
+
+    public ContentNodeKitBuilder WithContentNode(ContentNode contentNode)
     {
-        private int _contentTypeId;
-        private ContentNode _contentNode;
-        private ContentData _draftData;
-        private ContentData _publishedData;
+        _contentNode = contentNode;
+        return this;
+    }
 
-        public ContentNodeKitBuilder WithContentNode(ContentNode contentNode)
+    public ContentNodeKitBuilder WithContentNode(int id, Guid uid, int level, string path, int sortOrder, int parentContentId, DateTime createDate, int creatorId)
+    {
+        _contentNode = new ContentNode(id, uid, level, path, sortOrder, parentContentId, createDate, creatorId);
+        return this;
+    }
+
+    public ContentNodeKitBuilder WithContentTypeId(int contentTypeId)
+    {
+        _contentTypeId = contentTypeId;
+        return this;
+    }
+
+    public ContentNodeKitBuilder WithDraftData(ContentData draftData)
+    {
+        _draftData = draftData;
+        return this;
+    }
+
+    public ContentNodeKitBuilder WithPublishedData(ContentData publishedData)
+    {
+        _publishedData = publishedData;
+        return this;
+    }
+
+    public override ContentNodeKit Build()
+    {
+        var data = new ContentNodeKit(_contentNode, _contentTypeId, _draftData, _publishedData);
+        return data;
+    }
+
+    /// <summary>
+    ///     Creates a ContentNodeKit
+    /// </summary>
+    /// <param name="contentTypeId"></param>
+    /// <param name="id"></param>
+    /// <param name="path"></param>
+    /// <param name="sortOrder"></param>
+    /// <param name="level">
+    ///     Optional. Will get calculated based on the path value if not specified.
+    /// </param>
+    /// <param name="parentContentId">
+    ///     Optional. Will get calculated based on the path value if not specified.
+    /// </param>
+    /// <param name="creatorId"></param>
+    /// <param name="uid"></param>
+    /// <param name="createDate"></param>
+    /// <param name="draftData"></param>
+    /// <param name="publishedData"></param>
+    /// <returns></returns>
+    public static ContentNodeKit CreateWithContent(
+        int contentTypeId,
+        int id,
+        string path,
+        int? sortOrder = null,
+        int? level = null,
+        int? parentContentId = null,
+        int creatorId = -1,
+        Guid? uid = null,
+        DateTime? createDate = null,
+        ContentData draftData = null,
+        ContentData publishedData = null)
+    {
+        var pathParts = path.Split(',');
+        if (pathParts.Length >= 2)
         {
-            _contentNode = contentNode;
-            return this;
+            parentContentId ??= int.Parse(pathParts[^2]);
         }
 
-        public ContentNodeKitBuilder WithContentNode(int id, Guid uid, int level, string path, int sortOrder, int parentContentId, DateTime createDate, int creatorId)
-        {
-            _contentNode = new ContentNode(id, uid, level, path, sortOrder, parentContentId, createDate, creatorId);
-            return this;
-        }
-
-        public ContentNodeKitBuilder WithContentTypeId(int contentTypeId)
-        {
-            _contentTypeId = contentTypeId;
-            return this;
-        }
-
-        public ContentNodeKitBuilder WithDraftData(ContentData draftData)
-        {
-            _draftData = draftData;
-            return this;
-        }
-
-        public ContentNodeKitBuilder WithPublishedData(ContentData publishedData)
-        {
-            _publishedData = publishedData;
-            return this;
-        }
-
-        public override ContentNodeKit Build()
-        {
-            var data = new ContentNodeKit(_contentNode, _contentTypeId, _draftData, _publishedData);
-            return data;
-        }
-
-        /// <summary>
-        /// Creates a ContentNodeKit 
-        /// </summary>
-        /// <param name="contentTypeId"></param>
-        /// <param name="id"></param>
-        /// <param name="path"></param>
-        /// <param name="sortOrder"></param>
-        /// <param name="level">
-        /// Optional. Will get calculated based on the path value if not specified.
-        /// </param>
-        /// <param name="parentContentId">
-        /// Optional. Will get calculated based on the path value if not specified.
-        /// </param>
-        /// <param name="creatorId"></param>
-        /// <param name="uid"></param>
-        /// <param name="createDate"></param>
-        /// <param name="draftData"></param>
-        /// <param name="publishedData"></param>
-        /// <returns></returns>
-        public static ContentNodeKit CreateWithContent(
-            int contentTypeId,
-            int id,
-            string path,
-            int? sortOrder = null,
-            int? level = null,
-            int? parentContentId = null,
-            int creatorId = -1,
-            Guid? uid = null,
-            DateTime? createDate = null,
-            ContentData draftData = null,
-            ContentData publishedData = null)
-        {
-            var pathParts = path.Split(',');
-            if (pathParts.Length >= 2)
-            {
-                parentContentId ??= int.Parse(pathParts[^2]);
-            }
-
-            return new ContentNodeKitBuilder()
-                       .WithContentTypeId(contentTypeId)
-                       .WithContentNode(id, uid ?? Guid.NewGuid(), level ?? pathParts.Length - 1, path, sortOrder ?? 0, parentContentId.Value, createDate ?? DateTime.Now, creatorId)
-                       .WithDraftData(draftData)
-                       .WithPublishedData(publishedData)
-                       .Build();
-        }
+        return new ContentNodeKitBuilder()
+            .WithContentTypeId(contentTypeId)
+            .WithContentNode(id, uid ?? Guid.NewGuid(), level ?? pathParts.Length - 1, path, sortOrder ?? 0, parentContentId.Value, createDate ?? DateTime.Now, creatorId)
+            .WithDraftData(draftData)
+            .WithPublishedData(publishedData)
+            .Build();
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs
index 7f4a57f0bf..ce234d38f1 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentPropertyBasicBuilder.cs
@@ -4,50 +4,44 @@
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentPropertyBasicBuilder<TParent> : ChildBuilderBase<TParent, ContentPropertyBasic>,
+    IWithIdBuilder, IWithAliasBuilder
 {
-    public class ContentPropertyBasicBuilder<TParent> : ChildBuilderBase<TParent, ContentPropertyBasic>,
-        IWithIdBuilder, IWithAliasBuilder
+    private string _alias;
+    private int? _id;
+    private object _value;
+
+    public ContentPropertyBasicBuilder(TParent parentBuilder)
+        : base(parentBuilder)
     {
-        private int? _id;
-        private string _alias;
-        private object _value;
+    }
 
-        public ContentPropertyBasicBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
 
-        public override ContentPropertyBasic Build()
-        {
-            var alias = _alias ?? null;
-            var id = _id ?? 0;
-            var value = _value ?? null;
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-            return new ContentPropertyBasic()
-            {
-                Alias = alias,
-                Id = id,
-                Value = value
-            };
-        }
+    public override ContentPropertyBasic Build()
+    {
+        var alias = _alias;
+        var id = _id ?? 0;
+        var value = _value;
 
-        public ContentPropertyBasicBuilder<TParent> WithValue(object value)
-        {
-            _value = value;
-            return this;
-        }
+        return new ContentPropertyBasic { Alias = alias, Id = id, Value = value };
+    }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
+    public ContentPropertyBasicBuilder<TParent> WithValue(object value)
+    {
+        _value = value;
+        return this;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs
index 6c8a14dff2..3193358b36 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentTypeBaseBuilder.cs
@@ -8,234 +8,234 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public abstract class ContentTypeBaseBuilder<TParent, TType>
+    : ChildBuilderBase<TParent, TType>,
+        IBuildPropertyGroups,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder,
+        IWithParentIdBuilder,
+        IWithParentContentTypeBuilder,
+        IWithPathBuilder,
+        IWithLevelBuilder,
+        IWithSortOrderBuilder,
+        IWithCreatorIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithDescriptionBuilder,
+        IWithIconBuilder,
+        IWithThumbnailBuilder,
+        IWithTrashedBuilder,
+        IWithIsContainerBuilder
+    where TParent : IBuildContentTypes
 {
-    public abstract class ContentTypeBaseBuilder<TParent, TType>
-        : ChildBuilderBase<TParent, TType>,
-            IBuildPropertyGroups,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder,
-            IWithParentIdBuilder,
-            IWithParentContentTypeBuilder,
-            IWithPathBuilder,
-            IWithLevelBuilder,
-            IWithSortOrderBuilder,
-            IWithCreatorIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithDescriptionBuilder,
-            IWithIconBuilder,
-            IWithThumbnailBuilder,
-            IWithTrashedBuilder,
-            IWithIsContainerBuilder
-        where TParent : IBuildContentTypes
+    private string _alias;
+    private DateTime? _createDate;
+    private int? _creatorId;
+    private string _description;
+    private string _icon;
+    private int? _id;
+    private bool? _isContainer;
+    private Guid? _key;
+    private int? _level;
+    private string _name;
+    private IContentTypeComposition _parent;
+    private int? _parentId;
+    private string _path;
+    private int? _sortOrder;
+    private string _thumbnail;
+    private bool? _trashed;
+    private DateTime? _updateDate;
+
+    public ContentTypeBaseBuilder(TParent parentBuilder)
+        : base(parentBuilder)
     {
-        private int? _id;
-        private Guid? _key;
-        private string _alias;
-        private string _name;
-        private int? _parentId;
-        private IContentTypeComposition _parent;
-        private int? _level;
-        private string _path;
-        private int? _sortOrder;
-        private int? _creatorId;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _description;
-        private string _icon;
-        private string _thumbnail;
-        private bool? _trashed;
-        private bool? _isContainer;
+    }
 
-        protected IShortStringHelper ShortStringHelper => new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+    protected IShortStringHelper ShortStringHelper =>
+        new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
 
-        public ContentTypeBaseBuilder(TParent parentBuilder)
-            : base(parentBuilder)
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    int? IWithCreatorIdBuilder.CreatorId
+    {
+        get => _creatorId;
+        set => _creatorId = value;
+    }
+
+    string IWithDescriptionBuilder.Description
+    {
+        get => _description;
+        set => _description = value;
+    }
+
+    string IWithIconBuilder.Icon
+    {
+        get => _icon;
+        set => _icon = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    bool? IWithIsContainerBuilder.IsContainer
+    {
+        get => _isContainer;
+        set => _isContainer = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    int? IWithLevelBuilder.Level
+    {
+        get => _level;
+        set => _level = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    IContentTypeComposition IWithParentContentTypeBuilder.Parent
+    {
+        get => _parent;
+        set
         {
+            _parentId = null;
+            _parent = value;
         }
+    }
 
-        protected int GetId() => _id ?? 0;
-
-        protected Guid GetKey() => _key ?? Guid.NewGuid();
-
-        protected DateTime GetCreateDate() => _createDate ?? DateTime.Now;
-
-        protected DateTime GetUpdateDate() => _updateDate ?? DateTime.Now;
-
-        protected string GetName() => _name ?? Guid.NewGuid().ToString();
-
-        protected string GetAlias() => _alias ?? GetName().ToCamelCase();
-
-        protected int GetParentId() => _parentId ?? -1;
-
-        protected IContentTypeComposition GetParent() => _parent ?? null;
-
-        protected int GetLevel() => _level ?? 0;
-
-        protected string GetPath() => _path ?? _path ?? $"-1,{GetId()}";
-
-        protected int GetSortOrder() => _sortOrder ?? 0;
-
-        protected string GetDescription() => _description ?? string.Empty;
-
-        protected string GetIcon() => _icon ?? "icon-document";
-
-        protected string GetThumbnail() => _thumbnail ?? "folder.png";
-
-        protected int GetCreatorId() => _creatorId ?? 0;
-
-        protected bool GetTrashed() => _trashed ?? false;
-
-        protected bool GetIsContainer() => _isContainer ?? false;
-
-        protected void BuildPropertyGroups(ContentTypeCompositionBase contentType, IEnumerable<PropertyGroup> propertyGroups)
+    int? IWithParentIdBuilder.ParentId
+    {
+        get => _parentId;
+        set
         {
-            foreach (PropertyGroup propertyGroup in propertyGroups)
+            _parent = null;
+            _parentId = value;
+        }
+    }
+
+    string IWithPathBuilder.Path
+    {
+        get => _path;
+        set => _path = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    string IWithThumbnailBuilder.Thumbnail
+    {
+        get => _thumbnail;
+        set => _thumbnail = value;
+    }
+
+    bool? IWithTrashedBuilder.Trashed
+    {
+        get => _trashed;
+        set => _trashed = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    protected int GetId() => _id ?? 0;
+
+    protected Guid GetKey() => _key ?? Guid.NewGuid();
+
+    protected DateTime GetCreateDate() => _createDate ?? DateTime.Now;
+
+    protected DateTime GetUpdateDate() => _updateDate ?? DateTime.Now;
+
+    protected string GetName() => _name ?? Guid.NewGuid().ToString();
+
+    protected string GetAlias() => _alias ?? GetName().ToCamelCase();
+
+    protected int GetParentId() => _parentId ?? -1;
+
+    protected IContentTypeComposition GetParent() => _parent;
+
+    protected int GetLevel() => _level ?? 0;
+
+    protected string GetPath() => _path ?? _path ?? $"-1,{GetId()}";
+
+    protected int GetSortOrder() => _sortOrder ?? 0;
+
+    protected string GetDescription() => _description ?? string.Empty;
+
+    protected string GetIcon() => _icon ?? "icon-document";
+
+    protected string GetThumbnail() => _thumbnail ?? "folder.png";
+
+    protected int GetCreatorId() => _creatorId ?? 0;
+
+    protected bool GetTrashed() => _trashed ?? false;
+
+    protected bool GetIsContainer() => _isContainer ?? false;
+
+    protected void BuildPropertyGroups(ContentTypeCompositionBase contentType, IEnumerable<PropertyGroup> propertyGroups)
+    {
+        foreach (var propertyGroup in propertyGroups)
+        {
+            contentType.PropertyGroups.Add(propertyGroup);
+        }
+    }
+
+    protected void BuildPropertyTypeIds(ContentTypeCompositionBase contentType, int? propertyTypeIdsIncrementingFrom)
+    {
+        if (propertyTypeIdsIncrementingFrom.HasValue)
+        {
+            var i = propertyTypeIdsIncrementingFrom.Value;
+            foreach (var propertyType in contentType.PropertyTypes)
             {
-                contentType.PropertyGroups.Add(propertyGroup);
+                propertyType.Id = ++i;
             }
         }
+    }
 
-        protected void BuildPropertyTypeIds(ContentTypeCompositionBase contentType, int? propertyTypeIdsIncrementingFrom)
+    public static void EnsureAllIds(ContentTypeCompositionBase contentType, int seedId)
+    {
+        // Ensure everything has IDs (it will have if builder is used to create the object, but still useful to reset
+        // and ensure there are no clashes).
+        contentType.Id = seedId;
+        var itemid = seedId + 1;
+        foreach (var propertyGroup in contentType.PropertyGroups)
         {
-            if (propertyTypeIdsIncrementingFrom.HasValue)
-            {
-                var i = propertyTypeIdsIncrementingFrom.Value;
-                foreach (IPropertyType propertyType in contentType.PropertyTypes)
-                {
-                    propertyType.Id = ++i;
-                }
-            }
+            propertyGroup.Id = itemid++;
         }
 
-        public static void EnsureAllIds(ContentTypeCompositionBase contentType, int seedId)
+        foreach (var propertyType in contentType.PropertyTypes)
         {
-            // Ensure everything has IDs (it will have if builder is used to create the object, but still useful to reset
-            // and ensure there are no clashes).
-            contentType.Id = seedId;
-            var itemid = seedId + 1;
-            foreach (PropertyGroup propertyGroup in contentType.PropertyGroups)
-            {
-                propertyGroup.Id = itemid++;
-            }
-
-            foreach (IPropertyType propertyType in contentType.PropertyTypes)
-            {
-                propertyType.Id = itemid++;
-            }
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        int? IWithParentIdBuilder.ParentId
-        {
-            get => _parentId;
-            set
-            {
-                _parent = null;
-                _parentId = value;
-            }
-        }
-
-        IContentTypeComposition IWithParentContentTypeBuilder.Parent
-        {
-            get => _parent;
-            set
-            {
-                _parentId = null;
-                _parent = value;
-            }
-        }
-
-        int? IWithLevelBuilder.Level
-        {
-            get => _level;
-            set => _level = value;
-        }
-
-        string IWithPathBuilder.Path
-        {
-            get => _path;
-            set => _path = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        int? IWithCreatorIdBuilder.CreatorId
-        {
-            get => _creatorId;
-            set => _creatorId = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        string IWithDescriptionBuilder.Description
-        {
-            get => _description;
-            set => _description = value;
-        }
-
-        string IWithIconBuilder.Icon
-        {
-            get => _icon;
-            set => _icon = value;
-        }
-
-        string IWithThumbnailBuilder.Thumbnail
-        {
-            get => _thumbnail;
-            set => _thumbnail = value;
-        }
-
-        bool? IWithTrashedBuilder.Trashed
-        {
-            get => _trashed;
-            set => _trashed = value;
-        }
-
-        bool? IWithIsContainerBuilder.IsContainer
-        {
-            get => _isContainer;
-            set => _isContainer = value;
+            propertyType.Id = itemid++;
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs
index d6202f27a4..f86cb7d5cf 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentTypeBuilder.cs
@@ -3,522 +3,536 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentTypeBuilder
+    : ContentTypeBaseBuilder<ContentBuilder, IContentType>,
+        IWithPropertyTypeIdsIncrementingFrom,
+        IBuildPropertyTypes
 {
-    public class ContentTypeBuilder
-        : ContentTypeBaseBuilder<ContentBuilder, IContentType>,
-            IWithPropertyTypeIdsIncrementingFrom,
-            IBuildPropertyTypes
+    private readonly List<ContentTypeSortBuilder> _allowedContentTypeBuilders = new();
+    private readonly List<PropertyTypeBuilder<ContentTypeBuilder>> _noGroupPropertyTypeBuilders = new();
+    private readonly List<PropertyGroupBuilder<ContentTypeBuilder>> _propertyGroupBuilders = new();
+    private readonly List<TemplateBuilder> _templateBuilders = new();
+    private ContentVariation? _contentVariation;
+    private int? _defaultTemplateId;
+    private PropertyTypeCollection _propertyTypeCollection;
+
+    private int? _propertyTypeIdsIncrementingFrom;
+
+    public ContentTypeBuilder()
+        : base(null)
     {
-        private readonly List<PropertyGroupBuilder<ContentTypeBuilder>> _propertyGroupBuilders = new List<PropertyGroupBuilder<ContentTypeBuilder>>();
-        private readonly List<PropertyTypeBuilder<ContentTypeBuilder>> _noGroupPropertyTypeBuilders = new List<PropertyTypeBuilder<ContentTypeBuilder>>();
-        private readonly List<TemplateBuilder> _templateBuilders = new List<TemplateBuilder>();
-        private readonly List<ContentTypeSortBuilder> _allowedContentTypeBuilders = new List<ContentTypeSortBuilder>();
+    }
 
-        private int? _propertyTypeIdsIncrementingFrom;
-        private int? _defaultTemplateId;
-        private ContentVariation? _contentVariation;
-        private PropertyTypeCollection _propertyTypeCollection;
+    public ContentTypeBuilder(ContentBuilder parentBuilder)
+        : base(parentBuilder)
+    {
+    }
 
-        public ContentTypeBuilder()
-            : base(null)
+    int? IWithPropertyTypeIdsIncrementingFrom.PropertyTypeIdsIncrementingFrom
+    {
+        get => _propertyTypeIdsIncrementingFrom;
+        set => _propertyTypeIdsIncrementingFrom = value;
+    }
+
+    public ContentTypeBuilder WithDefaultTemplateId(int templateId)
+    {
+        _defaultTemplateId = templateId;
+        return this;
+    }
+
+    public ContentTypeBuilder WithContentVariation(ContentVariation contentVariation)
+    {
+        _contentVariation = contentVariation;
+        return this;
+    }
+
+    public ContentTypeBuilder WithPropertyTypeCollection(PropertyTypeCollection propertyTypeCollection)
+    {
+        _propertyTypeCollection = propertyTypeCollection;
+        return this;
+    }
+
+    public PropertyGroupBuilder<ContentTypeBuilder> AddPropertyGroup()
+    {
+        var builder = new PropertyGroupBuilder<ContentTypeBuilder>(this);
+        _propertyGroupBuilders.Add(builder);
+        return builder;
+    }
+
+    public PropertyTypeBuilder<ContentTypeBuilder> AddPropertyType()
+    {
+        var builder = new PropertyTypeBuilder<ContentTypeBuilder>(this);
+        _noGroupPropertyTypeBuilders.Add(builder);
+        return builder;
+    }
+
+    public TemplateBuilder AddAllowedTemplate()
+    {
+        var builder = new TemplateBuilder(this);
+        _templateBuilders.Add(builder);
+        return builder;
+    }
+
+    public ContentTypeSortBuilder AddAllowedContentType()
+    {
+        var builder = new ContentTypeSortBuilder(this);
+        _allowedContentTypeBuilders.Add(builder);
+        return builder;
+    }
+
+    public override IContentType Build()
+    {
+        var contentVariation = _contentVariation ?? ContentVariation.Nothing;
+
+        ContentType contentType;
+        var parent = GetParent();
+        if (parent != null)
         {
+            contentType = new ContentType(ShortStringHelper, (IContentType)parent, GetAlias());
+        }
+        else
+        {
+            contentType = new ContentType(ShortStringHelper, GetParentId()) { Alias = GetAlias() };
         }
 
-        public ContentTypeBuilder(ContentBuilder parentBuilder)
-            : base(parentBuilder)
+        contentType.Id = GetId();
+        contentType.Key = GetKey();
+        contentType.CreateDate = GetCreateDate();
+        contentType.UpdateDate = GetUpdateDate();
+        contentType.Name = GetName();
+        contentType.Level = GetLevel();
+        contentType.Path = GetPath();
+        contentType.SortOrder = GetSortOrder();
+        contentType.Description = GetDescription();
+        contentType.Icon = GetIcon();
+        contentType.Thumbnail = GetThumbnail();
+        contentType.CreatorId = GetCreatorId();
+        contentType.Trashed = GetTrashed();
+        contentType.IsContainer = GetIsContainer();
+        contentType.HistoryCleanup = new HistoryCleanup();
+
+        contentType.Variations = contentVariation;
+
+        if (_propertyTypeCollection != null)
         {
-        }
-
-        public ContentTypeBuilder WithDefaultTemplateId(int templateId)
-        {
-            _defaultTemplateId = templateId;
-            return this;
-        }
-
-        public ContentTypeBuilder WithContentVariation(ContentVariation contentVariation)
-        {
-            _contentVariation = contentVariation;
-            return this;
-        }
-
-        public ContentTypeBuilder WithPropertyTypeCollection(PropertyTypeCollection propertyTypeCollection)
-        {
-            _propertyTypeCollection = propertyTypeCollection;
-            return this;
-        }
-
-        public PropertyGroupBuilder<ContentTypeBuilder> AddPropertyGroup()
-        {
-            var builder = new PropertyGroupBuilder<ContentTypeBuilder>(this);
-            _propertyGroupBuilders.Add(builder);
-            return builder;
-        }
-
-        public PropertyTypeBuilder<ContentTypeBuilder> AddPropertyType()
-        {
-            var builder = new PropertyTypeBuilder<ContentTypeBuilder>(this);
-            _noGroupPropertyTypeBuilders.Add(builder);
-            return builder;
-        }
-
-        public TemplateBuilder AddAllowedTemplate()
-        {
-            var builder = new TemplateBuilder(this);
-            _templateBuilders.Add(builder);
-            return builder;
-        }
-
-        public ContentTypeSortBuilder AddAllowedContentType()
-        {
-            var builder = new ContentTypeSortBuilder(this);
-            _allowedContentTypeBuilders.Add(builder);
-            return builder;
-        }
-
-        public override IContentType Build()
-        {
-            ContentVariation contentVariation = _contentVariation ?? ContentVariation.Nothing;
-
-            ContentType contentType;
-            IContentTypeComposition parent = GetParent();
-            if (parent != null)
-            {
-                contentType = new ContentType(ShortStringHelper, (IContentType)parent, GetAlias());
-            }
-            else
-            {
-                contentType = new ContentType(ShortStringHelper, GetParentId())
-                {
-                    Alias = GetAlias(),
-                };
-            }
-
-            contentType.Id = GetId();
-            contentType.Key = GetKey();
-            contentType.CreateDate = GetCreateDate();
-            contentType.UpdateDate = GetUpdateDate();
-            contentType.Name = GetName();
-            contentType.Level = GetLevel();
-            contentType.Path = GetPath();
-            contentType.SortOrder = GetSortOrder();
-            contentType.Description = GetDescription();
-            contentType.Icon = GetIcon();
-            contentType.Thumbnail = GetThumbnail();
-            contentType.CreatorId = GetCreatorId();
-            contentType.Trashed = GetTrashed();
-            contentType.IsContainer = GetIsContainer();
-            contentType.HistoryCleanup = new HistoryCleanup();
-
-            contentType.Variations = contentVariation;
-
-            if (_propertyTypeCollection != null)
-            {
-                PropertyGroup propertyGroup = new PropertyGroupBuilder()
-                    .WithAlias("content")
-                    .WithName("Content")
-                    .WithSortOrder(1)
-                    .WithPropertyTypeCollection(_propertyTypeCollection)
-                    .Build();
-                contentType.PropertyGroups.Add(propertyGroup);
-            }
-            else
-            {
-                contentType.NoGroupPropertyTypes = _noGroupPropertyTypeBuilders.Select(x => x.Build());
-                BuildPropertyGroups(contentType, _propertyGroupBuilders.Select(x => x.Build()));
-                BuildPropertyTypeIds(contentType, _propertyTypeIdsIncrementingFrom);
-            }
-
-            contentType.AllowedContentTypes = _allowedContentTypeBuilders.Select(x => x.Build());
-
-            contentType.AllowedTemplates = _templateBuilders.Select(x => x.Build());
-            if (_defaultTemplateId.HasValue)
-            {
-                contentType.SetDefaultTemplate(contentType.AllowedTemplates
-                    .SingleOrDefault(x => x.Id == _defaultTemplateId.Value));
-            }
-
-            contentType.ResetDirtyProperties(false);
-
-            return contentType;
-        }
-
-        public static ContentType CreateBasicContentType(string alias = "basePage", string name = "Base Page", IContentType parent = null)
-        {
-            var builder = new ContentTypeBuilder();
-            return (ContentType)builder
-                .WithAlias(alias)
-                .WithName(name)
-                .WithParentContentType(parent)
-                .Build();
-        }
-
-        public static ContentType CreateSimpleContentType2(string alias, string name, IContentType parent = null, bool randomizeAliases = false, string propertyGroupAlias = "content", string propertyGroupName = "Content")
-        {
-            ContentTypeBuilder builder = CreateSimpleContentTypeHelper(alias, name, parent, randomizeAliases: randomizeAliases, propertyGroupAlias: propertyGroupAlias, propertyGroupName: propertyGroupName);
-
-            builder.AddPropertyType()
-                .WithAlias(RandomAlias("gen", randomizeAliases))
-                .WithName("Gen")
+            var propertyGroup = new PropertyGroupBuilder()
+                .WithAlias("content")
+                .WithName("Content")
                 .WithSortOrder(1)
-                .WithDataTypeId(-88)
-                .WithMandatory(false)
-                .WithDescription(string.Empty)
-                .WithLabelOnTop(true)
-                .Done();
-
-            return (ContentType)builder.Build();
+                .WithPropertyTypeCollection(_propertyTypeCollection)
+                .Build();
+            contentType.PropertyGroups.Add(propertyGroup);
+        }
+        else
+        {
+            contentType.NoGroupPropertyTypes = _noGroupPropertyTypeBuilders.Select(x => x.Build());
+            BuildPropertyGroups(contentType, _propertyGroupBuilders.Select(x => x.Build()));
+            BuildPropertyTypeIds(contentType, _propertyTypeIdsIncrementingFrom);
         }
 
-        public static ContentType CreateSimpleContentType(string alias = null, string name = null, IContentType parent = null, PropertyTypeCollection propertyTypeCollection = null, bool randomizeAliases = false, string propertyGroupAlias = "content", string propertyGroupName = "Content", bool mandatoryProperties = false, int defaultTemplateId = 0) =>
-            (ContentType)CreateSimpleContentTypeHelper(alias, name, parent, propertyTypeCollection, randomizeAliases, propertyGroupAlias, propertyGroupName, mandatoryProperties, defaultTemplateId).Build();
+        contentType.AllowedContentTypes = _allowedContentTypeBuilders.Select(x => x.Build());
 
-        public static ContentTypeBuilder CreateSimpleContentTypeHelper(string alias = null, string name = null, IContentType parent = null, PropertyTypeCollection propertyTypeCollection = null,  bool randomizeAliases = false, string propertyGroupAlias = "content", string propertyGroupName = "Content", bool mandatoryProperties = false, int defaultTemplateId = 0)
+        contentType.AllowedTemplates = _templateBuilders.Select(x => x.Build());
+        if (_defaultTemplateId.HasValue)
         {
-            ContentTypeBuilder builder = new ContentTypeBuilder()
-                .WithAlias(alias ?? "simple")
-                .WithName(name ?? "Simple Page")
-                .WithParentContentType(parent);
+            contentType.SetDefaultTemplate(contentType.AllowedTemplates
+                .SingleOrDefault(x => x.Id == _defaultTemplateId.Value));
+        }
 
-            if (propertyTypeCollection != null)
-            {
-                builder = builder
-                    .WithPropertyTypeCollection(propertyTypeCollection);
-            }
-            else
-            {
-                builder = builder
-                    .AddPropertyGroup()
-                        .WithAlias(propertyGroupAlias)
-                        .WithName(propertyGroupName)
-                        .WithSortOrder(1)
-                        .WithSupportsPublishing(true)
-                        .AddPropertyType()
-                            .WithAlias(RandomAlias("title", randomizeAliases))
-                            .WithName("Title")
-                            .WithSortOrder(1)
-                            .WithMandatory(mandatoryProperties)
-                            .WithLabelOnTop(true)
-                            .Done()
-                        .AddPropertyType()
-                            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
-                            .WithValueStorageType(ValueStorageType.Ntext)
-                            .WithAlias(RandomAlias("bodyText", randomizeAliases))
-                            .WithName("Body text")
-                            .WithSortOrder(2)
-                            .WithDataTypeId(Constants.DataTypes.RichtextEditor)
-                            .WithMandatory(mandatoryProperties)
-                            .WithLabelOnTop(true)
-                            .Done()
-                        .AddPropertyType()
-                            .WithAlias(RandomAlias("author", randomizeAliases))
-                            .WithName("Author")
-                            .WithSortOrder(3)
-                            .WithMandatory(mandatoryProperties)
-                            .WithLabelOnTop(true)
-                            .Done()
-                        .Done();
-            }
+        contentType.ResetDirtyProperties(false);
 
+        return contentType;
+    }
+
+    public static ContentType CreateBasicContentType(string alias = "basePage", string name = "Base Page", IContentType parent = null)
+    {
+        var builder = new ContentTypeBuilder();
+        return (ContentType)builder
+            .WithAlias(alias)
+            .WithName(name)
+            .WithParentContentType(parent)
+            .Build();
+    }
+
+    public static ContentType CreateSimpleContentType2(string alias, string name, IContentType parent = null, bool randomizeAliases = false, string propertyGroupAlias = "content", string propertyGroupName = "Content")
+    {
+        var builder = CreateSimpleContentTypeHelper(alias, name, parent, randomizeAliases: randomizeAliases, propertyGroupAlias: propertyGroupAlias, propertyGroupName: propertyGroupName);
+
+        builder.AddPropertyType()
+            .WithAlias(RandomAlias("gen", randomizeAliases))
+            .WithName("Gen")
+            .WithSortOrder(1)
+            .WithDataTypeId(-88)
+            .WithMandatory(false)
+            .WithDescription(string.Empty)
+            .WithLabelOnTop(true)
+            .Done();
+
+        return (ContentType)builder.Build();
+    }
+
+    public static ContentType CreateSimpleContentType(
+        string alias = null,
+        string name = null,
+        IContentType parent = null,
+        PropertyTypeCollection propertyTypeCollection = null,
+        bool randomizeAliases = false,
+        string propertyGroupAlias = "content",
+        string propertyGroupName = "Content",
+        bool mandatoryProperties = false,
+        int defaultTemplateId = 0) =>
+        (ContentType)CreateSimpleContentTypeHelper(alias, name, parent, propertyTypeCollection, randomizeAliases, propertyGroupAlias, propertyGroupName, mandatoryProperties, defaultTemplateId).Build();
+
+    public static ContentTypeBuilder CreateSimpleContentTypeHelper(
+        string alias = null,
+        string name = null,
+        IContentType parent = null,
+        PropertyTypeCollection propertyTypeCollection = null,
+        bool randomizeAliases = false,
+        string propertyGroupAlias = "content",
+        string propertyGroupName = "Content",
+        bool mandatoryProperties = false,
+        int defaultTemplateId = 0)
+    {
+        var builder = new ContentTypeBuilder()
+            .WithAlias(alias ?? "simple")
+            .WithName(name ?? "Simple Page")
+            .WithParentContentType(parent);
+
+        if (propertyTypeCollection != null)
+        {
             builder = builder
-                .AddAllowedTemplate()
-                    .WithId(defaultTemplateId)
-                    .WithAlias("textPage")
-                    .WithName("Textpage")
-                    .Done()
-                .WithDefaultTemplateId(defaultTemplateId);
-
-            return builder;
+                .WithPropertyTypeCollection(propertyTypeCollection);
         }
-
-        public static ContentType CreateSimpleTagsContentType(string alias, string name, IContentType parent = null, bool randomizeAliases = false, string propertyGroupName = "Content", int defaultTemplateId = 1)
+        else
         {
-            ContentType contentType = CreateSimpleContentType(alias, name, parent, randomizeAliases: randomizeAliases, propertyGroupName: propertyGroupName, defaultTemplateId: defaultTemplateId);
-
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Tags)
-                .WithValueStorageType(ValueStorageType.Nvarchar)
-                .WithAlias(RandomAlias("tags", randomizeAliases))
-                .WithName("Tags")
-                .WithDataTypeId(Constants.DataTypes.Tags)
-                .WithSortOrder(99)
-                .Build();
-            contentType.AddPropertyType(propertyType);
-
-            return contentType;
-        }
-
-        public static ContentType CreateTextPageContentType(string alias = "textPage", string name = "Text Page", int defaultTemplateId = 1)
-        {
-            var builder = new ContentTypeBuilder();
-            return (ContentType)builder
-                .WithAlias(alias)
-                .WithName(name)
+            builder = builder
                 .AddPropertyGroup()
-                    .WithAlias("content")
-                    .WithName("Content")
-                    .WithSortOrder(1)
-                    .WithSupportsPublishing(true)
-                    .AddPropertyType()
-                        .WithAlias("title")
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithAlias("bodyText")
-                        .WithName("Body text")
-                        .WithSortOrder(2)
-                        .WithDataTypeId(Constants.DataTypes.RichtextEditor)
-                        .Done()
-                    .Done()
-                .AddPropertyGroup()
-                    .WithName("Meta")
-                    .WithAlias("meta")
-                    .WithSortOrder(2)
-                    .WithSupportsPublishing(true)
-                    .AddPropertyType()
-                        .WithAlias("keywords")
-                        .WithName("Keywords")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithAlias("description")
-                        .WithName("Description")
-                        .WithSortOrder(2)
-                        .Done()
-                    .Done()
-                .AddAllowedTemplate()
-                    .WithId(defaultTemplateId)
-                    .WithAlias("textpage")
-                    .WithName("Textpage")
-                    .Done()
-                .WithDefaultTemplateId(defaultTemplateId)
-                .Build();
+                .WithAlias(propertyGroupAlias)
+                .WithName(propertyGroupName)
+                .WithSortOrder(1)
+                .WithSupportsPublishing(true)
+                .AddPropertyType()
+                .WithAlias(RandomAlias("title", randomizeAliases))
+                .WithName("Title")
+                .WithSortOrder(1)
+                .WithMandatory(mandatoryProperties)
+                .WithLabelOnTop(true)
+                .Done()
+                .AddPropertyType()
+                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
+                .WithValueStorageType(ValueStorageType.Ntext)
+                .WithAlias(RandomAlias("bodyText", randomizeAliases))
+                .WithName("Body text")
+                .WithSortOrder(2)
+                .WithDataTypeId(Constants.DataTypes.RichtextEditor)
+                .WithMandatory(mandatoryProperties)
+                .WithLabelOnTop(true)
+                .Done()
+                .AddPropertyType()
+                .WithAlias(RandomAlias("author", randomizeAliases))
+                .WithName("Author")
+                .WithSortOrder(3)
+                .WithMandatory(mandatoryProperties)
+                .WithLabelOnTop(true)
+                .Done()
+                .Done();
         }
 
-        public static ContentType CreateMetaContentType(string alias = "meta", string name = "Meta")
-        {
-            var builder = new ContentTypeBuilder();
-            return (ContentType)builder
-                .WithAlias(alias)
-                .WithName(name)
-                .WithDescription($"ContentType used for {name} tags")
-                .AddPropertyGroup()
-                    .WithAlias(alias)
-                    .WithName(name)
-                    .WithSortOrder(2)
-                    .WithSupportsPublishing(true)
-                    .AddPropertyType()
-                        .WithAlias($"{alias}keywords")
-                        .WithName($"{name} Keywords")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithAlias($"{alias}description")
-                        .WithName($"{name} Description")
-                        .WithSortOrder(2)
-                        .Done()
-                    .Done()
-                .Build();
-        }
+        builder = builder
+            .AddAllowedTemplate()
+            .WithId(defaultTemplateId)
+            .WithAlias("textPage")
+            .WithName("Textpage")
+            .Done()
+            .WithDefaultTemplateId(defaultTemplateId);
 
-        public static ContentType CreateContentMetaContentType()
-        {
-            var builder = new ContentTypeBuilder();
-            return (ContentType)builder
-                .WithAlias("contentMeta")
-                .WithName("Content Meta")
-                .WithDescription($"ContentType used for Content Meta")
-                .AddPropertyGroup()
-                    .WithName("Content")
-                    .WithSortOrder(2)
-                    .WithSupportsPublishing(true)
-                    .AddPropertyType()
-                        .WithAlias("title")
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                        .Done()
-                    .Done()
-                .Build();
-        }
+        return builder;
+    }
 
-        public static ContentType CreateAllTypesContentType(string alias, string name)
-        {
-            var builder = new ContentTypeBuilder();
-            return (ContentType)builder
-                .WithAlias(alias)
-                .WithName(name)
-                .AddPropertyGroup()
-                    .WithName("Content")
-                    .WithSupportsPublishing(true)
-                    .AddPropertyType()
-                        .WithAlias("isTrue")
-                        .WithName("Is True or False")
-                        .WithDataTypeId(Constants.DataTypes.Boolean)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Boolean)
-                        .WithValueStorageType(ValueStorageType.Integer)
-                        .WithSortOrder(1)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("number")
-                        .WithName("Number")
-                        .WithDataTypeId(-51)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Integer)
-                        .WithValueStorageType(ValueStorageType.Integer)
-                        .WithSortOrder(2)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("bodyText")
-                        .WithName("Body Text")
-                        .WithDataTypeId(Constants.DataTypes.RichtextEditor)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithSortOrder(3)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("singleLineText")
-                        .WithName("Text String")
-                        .WithDataTypeId(Constants.DataTypes.Textbox)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(4)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("multilineText")
-                        .WithName("Multiple Text Strings")
-                        .WithDataTypeId(Constants.DataTypes.Textarea)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithSortOrder(5)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("upload")
-                        .WithName("Upload Field")
-                        .WithDataTypeId(Constants.DataTypes.Upload)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.UploadField)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(6)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("label")
-                        .WithName("Label")
-                        .WithDataTypeId(Constants.DataTypes.LabelString)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(7)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("dateTime")
-                        .WithName("Date Time")
-                        .WithDataTypeId(Constants.DataTypes.DateTime)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DateTime)
-                        .WithValueStorageType(ValueStorageType.Date)
-                        .WithSortOrder(8)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("colorPicker")
-                        .WithName("Color Picker")
-                        .WithDataTypeId(-37)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.ColorPicker)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(9)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("ddlMultiple")
-                        .WithName("Dropdown List Multiple")
-                        .WithDataTypeId(Constants.DataTypes.DropDownMultiple)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DropDownListFlexible)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(11)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("rbList")
-                        .WithName("Radio Button List")
-                        .WithDataTypeId(-40)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.RadioButtonList)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(12)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("date")
-                        .WithName("Date")
-                        .WithDataTypeId(-36)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DateTime)
-                        .WithValueStorageType(ValueStorageType.Date)
-                        .WithSortOrder(13)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("ddl")
-                        .WithName("Dropdown List")
-                        .WithDataTypeId(Constants.DataTypes.DropDownSingle)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DropDownListFlexible)
-                        .WithValueStorageType(ValueStorageType.Integer)
-                        .WithSortOrder(14)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("chklist")
-                        .WithName("Checkbox List")
-                        .WithDataTypeId(-43)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.CheckBoxList)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(15)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("contentPicker")
-                        .WithName("Content Picker")
-                        .WithDataTypeId(1046)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.ContentPicker)
-                        .WithValueStorageType(ValueStorageType.Integer)
-                        .WithSortOrder(16)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("mediaPicker")
-                        .WithName("Media Picker")
-                        .WithDataTypeId(1048)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.MediaPicker)
-                        .WithValueStorageType(ValueStorageType.Integer)
-                        .WithSortOrder(17)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("memberPicker")
-                        .WithName("Member Picker")
-                        .WithDataTypeId(1047)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.MemberPicker)
-                        .WithValueStorageType(ValueStorageType.Integer)
-                        .WithSortOrder(18)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("multiUrlPicker")
-                        .WithName("Multi URL Picker")
-                        .WithDataTypeId(1050)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.MultiUrlPicker)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithSortOrder(19)
-                        .Done()
-                   .AddPropertyType()
-                        .WithAlias("tags")
-                        .WithName("Tags")
-                        .WithDataTypeId(Constants.DataTypes.Tags)
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Tags)
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithSortOrder(20)
-                        .Done()
-                    .Done()
-                .Build();
-        }
+    public static ContentType CreateSimpleTagsContentType(string alias, string name, IContentType parent = null, bool randomizeAliases = false, string propertyGroupName = "Content", int defaultTemplateId = 1)
+    {
+        var contentType = CreateSimpleContentType(alias, name, parent, randomizeAliases: randomizeAliases, propertyGroupName: propertyGroupName, defaultTemplateId: defaultTemplateId);
 
-        int? IWithPropertyTypeIdsIncrementingFrom.PropertyTypeIdsIncrementingFrom
-        {
-            get => _propertyTypeIdsIncrementingFrom;
-            set => _propertyTypeIdsIncrementingFrom = value;
-        }
+        var propertyType = new PropertyTypeBuilder()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Tags)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithAlias(RandomAlias("tags", randomizeAliases))
+            .WithName("Tags")
+            .WithDataTypeId(Constants.DataTypes.Tags)
+            .WithSortOrder(99)
+            .Build();
+        contentType.AddPropertyType(propertyType);
+
+        return contentType;
+    }
+
+    public static ContentType CreateTextPageContentType(string alias = "textPage", string name = "Text Page", int defaultTemplateId = 1)
+    {
+        var builder = new ContentTypeBuilder();
+        return (ContentType)builder
+            .WithAlias(alias)
+            .WithName(name)
+            .AddPropertyGroup()
+            .WithAlias("content")
+            .WithName("Content")
+            .WithSortOrder(1)
+            .WithSupportsPublishing(true)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias("bodyText")
+            .WithName("Body text")
+            .WithSortOrder(2)
+            .WithDataTypeId(Constants.DataTypes.RichtextEditor)
+            .Done()
+            .Done()
+            .AddPropertyGroup()
+            .WithName("Meta")
+            .WithAlias("meta")
+            .WithSortOrder(2)
+            .WithSupportsPublishing(true)
+            .AddPropertyType()
+            .WithAlias("keywords")
+            .WithName("Keywords")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("description")
+            .WithName("Description")
+            .WithSortOrder(2)
+            .Done()
+            .Done()
+            .AddAllowedTemplate()
+            .WithId(defaultTemplateId)
+            .WithAlias("textpage")
+            .WithName("Textpage")
+            .Done()
+            .WithDefaultTemplateId(defaultTemplateId)
+            .Build();
+    }
+
+    public static ContentType CreateMetaContentType(string alias = "meta", string name = "Meta")
+    {
+        var builder = new ContentTypeBuilder();
+        return (ContentType)builder
+            .WithAlias(alias)
+            .WithName(name)
+            .WithDescription($"ContentType used for {name} tags")
+            .AddPropertyGroup()
+            .WithAlias(alias)
+            .WithName(name)
+            .WithSortOrder(2)
+            .WithSupportsPublishing(true)
+            .AddPropertyType()
+            .WithAlias($"{alias}keywords")
+            .WithName($"{name} Keywords")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithAlias($"{alias}description")
+            .WithName($"{name} Description")
+            .WithSortOrder(2)
+            .Done()
+            .Done()
+            .Build();
+    }
+
+    public static ContentType CreateContentMetaContentType()
+    {
+        var builder = new ContentTypeBuilder();
+        return (ContentType)builder
+            .WithAlias("contentMeta")
+            .WithName("Content Meta")
+            .WithDescription("ContentType used for Content Meta")
+            .AddPropertyGroup()
+            .WithName("Content")
+            .WithSortOrder(2)
+            .WithSupportsPublishing(true)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .Done()
+            .Build();
+    }
+
+    public static ContentType CreateAllTypesContentType(string alias, string name)
+    {
+        var builder = new ContentTypeBuilder();
+        return (ContentType)builder
+            .WithAlias(alias)
+            .WithName(name)
+            .AddPropertyGroup()
+            .WithName("Content")
+            .WithSupportsPublishing(true)
+            .AddPropertyType()
+            .WithAlias("isTrue")
+            .WithName("Is True or False")
+            .WithDataTypeId(Constants.DataTypes.Boolean)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Boolean)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("number")
+            .WithName("Number")
+            .WithDataTypeId(-51)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Integer)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithSortOrder(2)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("bodyText")
+            .WithName("Body Text")
+            .WithDataTypeId(Constants.DataTypes.RichtextEditor)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithSortOrder(3)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("singleLineText")
+            .WithName("Text String")
+            .WithDataTypeId(Constants.DataTypes.Textbox)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(4)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("multilineText")
+            .WithName("Multiple Text Strings")
+            .WithDataTypeId(Constants.DataTypes.Textarea)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithSortOrder(5)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("upload")
+            .WithName("Upload Field")
+            .WithDataTypeId(Constants.DataTypes.Upload)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.UploadField)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(6)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("label")
+            .WithName("Label")
+            .WithDataTypeId(Constants.DataTypes.LabelString)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(7)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("dateTime")
+            .WithName("Date Time")
+            .WithDataTypeId(Constants.DataTypes.DateTime)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DateTime)
+            .WithValueStorageType(ValueStorageType.Date)
+            .WithSortOrder(8)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("colorPicker")
+            .WithName("Color Picker")
+            .WithDataTypeId(-37)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.ColorPicker)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(9)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("ddlMultiple")
+            .WithName("Dropdown List Multiple")
+            .WithDataTypeId(Constants.DataTypes.DropDownMultiple)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DropDownListFlexible)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(11)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("rbList")
+            .WithName("Radio Button List")
+            .WithDataTypeId(-40)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.RadioButtonList)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(12)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("date")
+            .WithName("Date")
+            .WithDataTypeId(-36)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DateTime)
+            .WithValueStorageType(ValueStorageType.Date)
+            .WithSortOrder(13)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("ddl")
+            .WithName("Dropdown List")
+            .WithDataTypeId(Constants.DataTypes.DropDownSingle)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.DropDownListFlexible)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithSortOrder(14)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("chklist")
+            .WithName("Checkbox List")
+            .WithDataTypeId(-43)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.CheckBoxList)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(15)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("contentPicker")
+            .WithName("Content Picker")
+            .WithDataTypeId(1046)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.ContentPicker)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithSortOrder(16)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("mediaPicker")
+            .WithName("Media Picker")
+            .WithDataTypeId(1048)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.MediaPicker)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithSortOrder(17)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("memberPicker")
+            .WithName("Member Picker")
+            .WithDataTypeId(1047)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.MemberPicker)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithSortOrder(18)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("multiUrlPicker")
+            .WithName("Multi URL Picker")
+            .WithDataTypeId(1050)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.MultiUrlPicker)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithSortOrder(19)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("tags")
+            .WithName("Tags")
+            .WithDataTypeId(Constants.DataTypes.Tags)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Tags)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithSortOrder(20)
+            .Done()
+            .Done()
+            .Build();
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs
index b880c4fee6..560e27defd 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentTypeSortBuilder.cs
@@ -6,53 +6,52 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentTypeSortBuilder
+    : ChildBuilderBase<ContentTypeBuilder, ContentTypeSort>,
+        IWithIdBuilder,
+        IWithAliasBuilder,
+        IWithSortOrderBuilder
 {
-    public class ContentTypeSortBuilder
-        : ChildBuilderBase<ContentTypeBuilder, ContentTypeSort>,
-            IWithIdBuilder,
-            IWithAliasBuilder,
-            IWithSortOrderBuilder
+    private string _alias;
+    private int? _id;
+    private int? _sortOrder;
+
+    public ContentTypeSortBuilder()
+        : base(null)
     {
-        private int? _id;
-        private string _alias;
-        private int? _sortOrder;
+    }
 
-        public ContentTypeSortBuilder()
-            : base(null)
-        {
-        }
+    public ContentTypeSortBuilder(ContentTypeBuilder parentBuilder)
+        : base(parentBuilder)
+    {
+    }
 
-        public ContentTypeSortBuilder(ContentTypeBuilder parentBuilder)
-            : base(parentBuilder)
-        {
-        }
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
 
-        public override ContentTypeSort Build()
-        {
-            var id = _id ?? 1;
-            var alias = _alias ?? Guid.NewGuid().ToString().ToCamelCase();
-            var sortOrder = _sortOrder ?? 0;
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-            return new ContentTypeSort(new Lazy<int>(() => id), sortOrder, alias);
-        }
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
+    public override ContentTypeSort Build()
+    {
+        var id = _id ?? 1;
+        var alias = _alias ?? Guid.NewGuid().ToString().ToCamelCase();
+        var sortOrder = _sortOrder ?? 0;
 
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
+        return new ContentTypeSort(new Lazy<int>(() => id), sortOrder, alias);
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs b/tests/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs
index 89241127ed..556319b28f 100644
--- a/tests/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/ContentVariantSaveBuilder.cs
@@ -7,71 +7,70 @@ using System.Linq;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class ContentVariantSaveBuilder<TParent> : ChildBuilderBase<TParent, ContentVariantSave>,
+    IWithNameBuilder,
+    IWithCultureInfoBuilder
 {
-    public class ContentVariantSaveBuilder<TParent> : ChildBuilderBase<TParent, ContentVariantSave>,
-        IWithNameBuilder,
-        IWithCultureInfoBuilder
+    private readonly List<ContentPropertyBasicBuilder<ContentVariantSaveBuilder<TParent>>> _propertyBuilders = new();
+    private CultureInfo _cultureInfo;
+
+    private string _name;
+    private bool? _publish;
+    private bool? _save;
+
+    public ContentVariantSaveBuilder(TParent parentBuilder)
+        : base(parentBuilder)
     {
-        private readonly List<ContentPropertyBasicBuilder<ContentVariantSaveBuilder<TParent>>> _propertyBuilders = new List<ContentPropertyBasicBuilder<ContentVariantSaveBuilder<TParent>>>();
+    }
 
-        private string _name;
-        private CultureInfo _cultureInfo;
-        private bool? _save = null;
-        private bool? _publish = null;
+    CultureInfo IWithCultureInfoBuilder.CultureInfo
+    {
+        get => _cultureInfo;
+        set => _cultureInfo = value;
+    }
 
-        public ContentVariantSaveBuilder(TParent parentBuilder)
-            : base(parentBuilder)
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    public ContentVariantSaveBuilder<TParent> WithSave(bool save)
+    {
+        _save = save;
+        return this;
+    }
+
+    public ContentVariantSaveBuilder<TParent> WithPublish(bool publish)
+    {
+        _publish = publish;
+        return this;
+    }
+
+    public ContentPropertyBasicBuilder<ContentVariantSaveBuilder<TParent>> AddProperty()
+    {
+        var builder = new ContentPropertyBasicBuilder<ContentVariantSaveBuilder<TParent>>(this);
+        _propertyBuilders.Add(builder);
+        return builder;
+    }
+
+    public override ContentVariantSave Build()
+    {
+        var name = _name;
+        var culture = _cultureInfo?.Name;
+        var save = _save ?? true;
+        var publish = _publish ?? true;
+        var properties = _propertyBuilders.Select(x => x.Build());
+
+        return new ContentVariantSave
         {
-        }
-
-        public ContentVariantSaveBuilder<TParent> WithSave(bool save)
-        {
-            _save = save;
-            return this;
-        }
-
-        public ContentVariantSaveBuilder<TParent> WithPublish(bool publish)
-        {
-            _publish = publish;
-            return this;
-        }
-
-        public ContentPropertyBasicBuilder<ContentVariantSaveBuilder<TParent>> AddProperty()
-        {
-            var builder = new ContentPropertyBasicBuilder<ContentVariantSaveBuilder<TParent>>(this);
-            _propertyBuilders.Add(builder);
-            return builder;
-        }
-
-        public override ContentVariantSave Build()
-        {
-            var name = _name ?? null;
-            var culture = _cultureInfo?.Name ?? null;
-            var save = _save ?? true;
-            var publish = _publish ?? true;
-            IEnumerable<ContentPropertyBasic> properties = _propertyBuilders.Select(x => x.Build());
-
-            return new ContentVariantSave()
-            {
-                Name = name,
-                Culture = culture,
-                Save = save,
-                Publish = publish,
-                Properties = properties
-            };
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        CultureInfo IWithCultureInfoBuilder.CultureInfo
-        {
-            get => _cultureInfo;
-            set => _cultureInfo = value;
-        }
+            Name = name,
+            Culture = culture,
+            Save = save,
+            Publish = publish,
+            Properties = properties
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
index 5e3d2212ea..69e7d8df74 100644
--- a/tests/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/DataEditorBuilder.cs
@@ -4,73 +4,71 @@
 using System;
 using System.Collections.Generic;
 using Moq;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class DataEditorBuilder<TParent>
+    : ChildBuilderBase<TParent, IDataEditor>,
+        IWithAliasBuilder,
+        IWithNameBuilder
 {
-    public class DataEditorBuilder<TParent>
-        : ChildBuilderBase<TParent, IDataEditor>,
-            IWithAliasBuilder,
-            IWithNameBuilder
+    private readonly ConfigurationEditorBuilder<DataEditorBuilder<TParent>> _explicitConfigurationEditorBuilder;
+    private readonly DataValueEditorBuilder<DataEditorBuilder<TParent>> _explicitValueEditorBuilder;
+    private string _alias;
+    private IDictionary<string, object> _defaultConfiguration;
+    private string _name;
+
+    public DataEditorBuilder(TParent parentBuilder)
+        : base(parentBuilder)
     {
-        private string _alias;
-        private string _name;
-        private readonly ConfigurationEditorBuilder<DataEditorBuilder<TParent>> _explicitConfigurationEditorBuilder;
-        private readonly DataValueEditorBuilder<DataEditorBuilder<TParent>> _explicitValueEditorBuilder;
-        private IDictionary<string, object> _defaultConfiguration;
+        _explicitConfigurationEditorBuilder = new ConfigurationEditorBuilder<DataEditorBuilder<TParent>>(this);
+        _explicitValueEditorBuilder = new DataValueEditorBuilder<DataEditorBuilder<TParent>>(this);
+    }
 
-        public DataEditorBuilder(TParent parentBuilder)
-            : base(parentBuilder)
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    public DataEditorBuilder<TParent> WithDefaultConfiguration(IDictionary<string, object> defaultConfiguration)
+    {
+        _defaultConfiguration = defaultConfiguration;
+        return this;
+    }
+
+    public ConfigurationEditorBuilder<DataEditorBuilder<TParent>> AddExplicitConfigurationEditorBuilder() =>
+        _explicitConfigurationEditorBuilder;
+
+    public DataValueEditorBuilder<DataEditorBuilder<TParent>> AddExplicitValueEditorBuilder() =>
+        _explicitValueEditorBuilder;
+
+    public override IDataEditor Build()
+    {
+        var name = _name ?? Guid.NewGuid().ToString();
+        var alias = _alias ?? name.ToCamelCase();
+
+        var defaultConfiguration = _defaultConfiguration ?? new Dictionary<string, object>();
+        var explicitConfigurationEditor = _explicitConfigurationEditorBuilder.Build();
+        var explicitValueEditor = _explicitValueEditorBuilder.Build();
+
+        return new DataEditor(
+            Mock.Of<IDataValueEditorFactory>())
         {
-            _explicitConfigurationEditorBuilder = new ConfigurationEditorBuilder<DataEditorBuilder<TParent>>(this);
-            _explicitValueEditorBuilder = new DataValueEditorBuilder<DataEditorBuilder<TParent>>(this);
-        }
-
-        public DataEditorBuilder<TParent> WithDefaultConfiguration(IDictionary<string, object> defaultConfiguration)
-        {
-            _defaultConfiguration = defaultConfiguration;
-            return this;
-        }
-
-        public ConfigurationEditorBuilder<DataEditorBuilder<TParent>> AddExplicitConfigurationEditorBuilder() =>
-            _explicitConfigurationEditorBuilder;
-
-        public DataValueEditorBuilder<DataEditorBuilder<TParent>> AddExplicitValueEditorBuilder() =>
-            _explicitValueEditorBuilder;
-
-        public override IDataEditor Build()
-        {
-            var name = _name ?? Guid.NewGuid().ToString();
-            var alias = _alias ?? name.ToCamelCase();
-
-            IDictionary<string, object> defaultConfiguration = _defaultConfiguration ?? new Dictionary<string, object>();
-            IConfigurationEditor explicitConfigurationEditor = _explicitConfigurationEditorBuilder.Build();
-            IDataValueEditor explicitValueEditor = _explicitValueEditorBuilder.Build();
-
-            return new DataEditor(
-                Mock.Of<IDataValueEditorFactory>())
-            {
-                Alias = alias,
-                Name = name,
-                DefaultConfiguration = defaultConfiguration,
-                ExplicitConfigurationEditor = explicitConfigurationEditor,
-                ExplicitValueEditor = explicitValueEditor
-            };
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
+            Alias = alias,
+            Name = name,
+            DefaultConfiguration = defaultConfiguration,
+            ExplicitConfigurationEditor = explicitConfigurationEditor,
+            ExplicitValueEditor = explicitValueEditor
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
index e5cab30986..ea3da76b42 100644
--- a/tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/DataTypeBuilder.cs
@@ -3,156 +3,154 @@
 
 using System;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class DataTypeBuilder
+    : BuilderBase<DataType>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreatorIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithDeleteDateBuilder,
+        IWithNameBuilder,
+        IWithParentIdBuilder,
+        IWithTrashedBuilder,
+        IWithLevelBuilder,
+        IWithPathBuilder,
+        IWithSortOrderBuilder
 {
-    public class DataTypeBuilder
-        : BuilderBase<DataType>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreatorIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithDeleteDateBuilder,
-            IWithNameBuilder,
-            IWithParentIdBuilder,
-            IWithTrashedBuilder,
-            IWithLevelBuilder,
-            IWithPathBuilder,
-            IWithSortOrderBuilder
+    private readonly DataEditorBuilder<DataTypeBuilder> _dataEditorBuilder;
+    private DateTime? _createDate;
+    private int? _creatorId;
+    private ValueStorageType? _databaseType;
+    private DateTime? _deleteDate;
+    private int? _id;
+    private Guid? _key;
+    private int? _level;
+    private string _name;
+    private int? _parentId;
+    private string _path;
+    private int? _sortOrder;
+    private bool? _trashed;
+    private DateTime? _updateDate;
+
+    public DataTypeBuilder() => _dataEditorBuilder = new DataEditorBuilder<DataTypeBuilder>(this);
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private readonly DataEditorBuilder<DataTypeBuilder> _dataEditorBuilder;
-        private int? _id;
-        private int? _parentId;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private DateTime? _deleteDate;
-        private string _name;
-        private bool? _trashed;
-        private int? _level;
-        private string _path;
-        private int? _creatorId;
-        private ValueStorageType? _databaseType;
-        private int? _sortOrder;
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        public DataTypeBuilder() => _dataEditorBuilder = new DataEditorBuilder<DataTypeBuilder>(this);
+    int? IWithCreatorIdBuilder.CreatorId
+    {
+        get => _creatorId;
+        set => _creatorId = value;
+    }
 
-        public DataTypeBuilder WithDatabaseType(ValueStorageType databaseType)
+    DateTime? IWithDeleteDateBuilder.DeleteDate
+    {
+        get => _deleteDate;
+        set => _deleteDate = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    int? IWithLevelBuilder.Level
+    {
+        get => _level;
+        set => _level = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    int? IWithParentIdBuilder.ParentId
+    {
+        get => _parentId;
+        set => _parentId = value;
+    }
+
+    string IWithPathBuilder.Path
+    {
+        get => _path;
+        set => _path = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    bool? IWithTrashedBuilder.Trashed
+    {
+        get => _trashed;
+        set => _trashed = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public DataTypeBuilder WithDatabaseType(ValueStorageType databaseType)
+    {
+        _databaseType = databaseType;
+        return this;
+    }
+
+    public DataEditorBuilder<DataTypeBuilder> AddEditor() => _dataEditorBuilder;
+
+    public override DataType Build()
+    {
+        var editor = _dataEditorBuilder.Build();
+        var parentId = _parentId ?? -1;
+        var id = _id ?? 1;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var deleteDate = _deleteDate;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var level = _level ?? 0;
+        var path = _path ?? $"-1,{id}";
+        var creatorId = _creatorId ?? 1;
+        var databaseType = _databaseType ?? ValueStorageType.Ntext;
+        var sortOrder = _sortOrder ?? 0;
+        var serializer = new ConfigurationEditorJsonSerializer();
+
+        return new DataType(editor, serializer, parentId)
         {
-            _databaseType = databaseType;
-            return this;
-        }
-
-        public DataEditorBuilder<DataTypeBuilder> AddEditor() => _dataEditorBuilder;
-
-        public override DataType Build()
-        {
-            IDataEditor editor = _dataEditorBuilder.Build();
-            var parentId = _parentId ?? -1;
-            var id = _id ?? 1;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            DateTime? deleteDate = _deleteDate ?? null;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var level = _level ?? 0;
-            var path = _path ?? $"-1,{id}";
-            var creatorId = _creatorId ?? 1;
-            ValueStorageType databaseType = _databaseType ?? ValueStorageType.Ntext;
-            var sortOrder = _sortOrder ?? 0;
-            var serializer = new ConfigurationEditorJsonSerializer();
-
-            return new DataType(editor, serializer, parentId)
-            {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                DeleteDate = deleteDate,
-                Name = name,
-                Trashed = _trashed ?? false,
-                Level = level,
-                Path = path,
-                CreatorId = creatorId,
-                DatabaseType = databaseType,
-                SortOrder = sortOrder,
-            };
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        int? IWithCreatorIdBuilder.CreatorId
-        {
-            get => _creatorId;
-            set => _creatorId = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        DateTime? IWithDeleteDateBuilder.DeleteDate
-        {
-            get => _deleteDate;
-            set => _deleteDate = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        int? IWithParentIdBuilder.ParentId
-        {
-            get => _parentId;
-            set => _parentId = value;
-        }
-
-        bool? IWithTrashedBuilder.Trashed
-        {
-            get => _trashed;
-            set => _trashed = value;
-        }
-
-        int? IWithLevelBuilder.Level
-        {
-            get => _level;
-            set => _level = value;
-        }
-
-        string IWithPathBuilder.Path
-        {
-            get => _path;
-            set => _path = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            DeleteDate = deleteDate,
+            Name = name,
+            Trashed = _trashed ?? false,
+            Level = level,
+            Path = path,
+            CreatorId = creatorId,
+            DatabaseType = databaseType,
+            SortOrder = sortOrder
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
index 633cbb4ca0..7be75d36f5 100644
--- a/tests/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/DataValueEditorBuilder.cs
@@ -9,61 +9,60 @@ using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class DataValueEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataValueEditor>
 {
-    public class DataValueEditorBuilder<TParent> : ChildBuilderBase<TParent, IDataValueEditor>
+    private string _configuration;
+    private bool? _hideLabel;
+    private string _valueType;
+    private string _view;
+
+    public DataValueEditorBuilder(TParent parentBuilder)
+        : base(parentBuilder)
     {
-        private string _configuration;
-        private string _view;
-        private bool? _hideLabel;
-        private string _valueType;
+    }
 
-        public DataValueEditorBuilder(TParent parentBuilder)
-            : base(parentBuilder)
+    public DataValueEditorBuilder<TParent> WithConfiguration(string configuration)
+    {
+        _configuration = configuration;
+        return this;
+    }
+
+    public DataValueEditorBuilder<TParent> WithView(string view)
+    {
+        _view = view;
+        return this;
+    }
+
+    public DataValueEditorBuilder<TParent> WithHideLabel(bool hideLabel)
+    {
+        _hideLabel = hideLabel;
+        return this;
+    }
+
+    public DataValueEditorBuilder<TParent> WithValueType(string valueType)
+    {
+        _valueType = valueType;
+        return this;
+    }
+
+    public override IDataValueEditor Build()
+    {
+        var configuration = _configuration;
+        var view = _view;
+        var hideLabel = _hideLabel ?? false;
+        var valueType = _valueType ?? Guid.NewGuid().ToString();
+
+        return new DataValueEditor(
+            Mock.Of<ILocalizedTextService>(),
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IJsonSerializer>())
         {
-        }
-
-        public DataValueEditorBuilder<TParent> WithConfiguration(string configuration)
-        {
-            _configuration = configuration;
-            return this;
-        }
-
-        public DataValueEditorBuilder<TParent> WithView(string view)
-        {
-            _view = view;
-            return this;
-        }
-
-        public DataValueEditorBuilder<TParent> WithHideLabel(bool hideLabel)
-        {
-            _hideLabel = hideLabel;
-            return this;
-        }
-
-        public DataValueEditorBuilder<TParent> WithValueType(string valueType)
-        {
-            _valueType = valueType;
-            return this;
-        }
-
-        public override IDataValueEditor Build()
-        {
-            var configuration = _configuration ?? null;
-            var view = _view ?? null;
-            var hideLabel = _hideLabel ?? false;
-            var valueType = _valueType ?? Guid.NewGuid().ToString();
-
-            return new DataValueEditor(
-                Mock.Of<ILocalizedTextService>(),
-                Mock.Of<IShortStringHelper>(),
-                Mock.Of<IJsonSerializer>())
-            {
-                Configuration = configuration,
-                View = view,
-                HideLabel = hideLabel,
-                ValueType = valueType,
-            };
-        }
+            Configuration = configuration,
+            View = view,
+            HideLabel = hideLabel,
+            ValueType = valueType
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
index 7c7e68a9cb..60d37a6453 100644
--- a/tests/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/DictionaryItemBuilder.cs
@@ -7,109 +7,107 @@ using System.Linq;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class DictionaryItemBuilder
+    : BuilderBase<DictionaryItem>,
+        IWithIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithDeleteDateBuilder,
+        IWithKeyBuilder
 {
-    public class DictionaryItemBuilder
-        : BuilderBase<DictionaryItem>,
-            IWithIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithDeleteDateBuilder,
-            IWithKeyBuilder
+    private readonly List<DictionaryTranslationBuilder> _translationBuilders = new();
+
+    private DateTime? _createDate;
+    private DateTime? _deleteDate;
+    private int? _id;
+    private string _itemKey;
+    private Guid? _key;
+    private Guid? _parentId;
+    private DateTime? _updateDate;
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private readonly List<DictionaryTranslationBuilder> _translationBuilders =
-            new List<DictionaryTranslationBuilder>();
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        private DateTime? _createDate;
-        private DateTime? _deleteDate;
-        private int? _id;
-        private string _itemKey;
-        private Guid? _key;
-        private Guid? _parentId;
-        private DateTime? _updateDate;
+    DateTime? IWithDeleteDateBuilder.DeleteDate
+    {
+        get => _deleteDate;
+        set => _deleteDate = value;
+    }
 
-        DateTime? IWithCreateDateBuilder.CreateDate
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public override DictionaryItem Build()
+    {
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var deleteDate = _deleteDate;
+        var id = _id ?? 1;
+        var key = _key ?? Guid.NewGuid();
+        var parentId = _parentId;
+        var itemKey = _itemKey ?? Guid.NewGuid().ToString();
+
+        var result = new DictionaryItem(itemKey)
         {
-            get => _createDate;
-            set => _createDate = value;
+            Translations = _translationBuilders.Select(x => x.Build()),
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            DeleteDate = deleteDate,
+            Id = id,
+            ParentId = parentId,
+            Key = key
+        };
+        return result;
+    }
+
+    public DictionaryItemBuilder WithParentId(Guid parentId)
+    {
+        _parentId = parentId;
+        return this;
+    }
+
+    public DictionaryItemBuilder WithItemKey(string itemKey)
+    {
+        _itemKey = itemKey;
+        return this;
+    }
+
+    public DictionaryTranslationBuilder AddTranslation()
+    {
+        var builder = new DictionaryTranslationBuilder(this);
+
+        _translationBuilders.Add(builder);
+
+        return builder;
+    }
+
+    public DictionaryItemBuilder WithRandomTranslations(int count)
+    {
+        for (var i = 0; i < count; i++)
+        {
+            AddTranslation().Done();
         }
 
-        DateTime? IWithDeleteDateBuilder.DeleteDate
-        {
-            get => _deleteDate;
-            set => _deleteDate = value;
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        public override DictionaryItem Build()
-        {
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            DateTime? deleteDate = _deleteDate ?? null;
-            var id = _id ?? 1;
-            Guid key = _key ?? Guid.NewGuid();
-            Guid? parentId = _parentId ?? null;
-            var itemKey = _itemKey ?? Guid.NewGuid().ToString();
-
-            var result = new DictionaryItem(itemKey)
-            {
-                Translations = _translationBuilders.Select(x => x.Build()),
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                DeleteDate = deleteDate,
-                Id = id,
-                ParentId = parentId,
-                Key = key,
-            };
-            return result;
-        }
-
-        public DictionaryItemBuilder WithParentId(Guid parentId)
-        {
-            _parentId = parentId;
-            return this;
-        }
-
-        public DictionaryItemBuilder WithItemKey(string itemKey)
-        {
-            _itemKey = itemKey;
-            return this;
-        }
-
-        public DictionaryTranslationBuilder AddTranslation()
-        {
-            var builder = new DictionaryTranslationBuilder(this);
-
-            _translationBuilders.Add(builder);
-
-            return builder;
-        }
-
-        public DictionaryItemBuilder WithRandomTranslations(int count)
-        {
-            for (var i = 0; i < count; i++)
-            {
-                AddTranslation().Done();
-            }
-
-            return this;
-        }
+        return this;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
index ea3dbe02c0..da7523120d 100644
--- a/tests/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/DictionaryTranslationBuilder.cs
@@ -5,88 +5,82 @@ using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class DictionaryTranslationBuilder
+    : ChildBuilderBase<DictionaryItemBuilder, IDictionaryTranslation>,
+        IWithIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithDeleteDateBuilder,
+        IWithKeyBuilder
 {
-    public class DictionaryTranslationBuilder
-        : ChildBuilderBase<DictionaryItemBuilder, IDictionaryTranslation>,
-            IWithIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithDeleteDateBuilder,
-            IWithKeyBuilder
+    private readonly LanguageBuilder<DictionaryTranslationBuilder> _languageBuilder;
+    private DateTime? _createDate;
+    private DateTime? _deleteDate;
+    private int? _id;
+    private Guid? _key;
+    private DateTime? _updateDate;
+    private string _value;
+
+    public DictionaryTranslationBuilder()
+        : base(null) => _languageBuilder = new LanguageBuilder<DictionaryTranslationBuilder>(this);
+
+    public DictionaryTranslationBuilder(DictionaryItemBuilder parentBuilder)
+        : base(parentBuilder) => _languageBuilder = new LanguageBuilder<DictionaryTranslationBuilder>(this);
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private readonly LanguageBuilder<DictionaryTranslationBuilder> _languageBuilder;
-        private DateTime? _createDate;
-        private DateTime? _deleteDate;
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _updateDate;
-        private string _value;
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        public DictionaryTranslationBuilder()
-            : base(null) => _languageBuilder = new LanguageBuilder<DictionaryTranslationBuilder>(this);
+    DateTime? IWithDeleteDateBuilder.DeleteDate
+    {
+        get => _deleteDate;
+        set => _deleteDate = value;
+    }
 
-        public DictionaryTranslationBuilder(DictionaryItemBuilder parentBuilder)
-            : base(parentBuilder) => _languageBuilder = new LanguageBuilder<DictionaryTranslationBuilder>(this);
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-        public LanguageBuilder<DictionaryTranslationBuilder> AddLanguage() => _languageBuilder;
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
 
-        public DictionaryTranslationBuilder WithValue(string value)
-        {
-            _value = value;
-            return this;
-        }
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
 
-        public override IDictionaryTranslation Build()
-        {
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            DateTime? deleteDate = _deleteDate ?? null;
-            var id = _id ?? 1;
-            Guid key = _key ?? Guid.NewGuid();
+    public LanguageBuilder<DictionaryTranslationBuilder> AddLanguage() => _languageBuilder;
 
-            var result = new DictionaryTranslation(
-                _languageBuilder.Build(),
-                _value ?? Guid.NewGuid().ToString(),
-                key)
-            {
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                DeleteDate = deleteDate,
-                Id = id
-            };
+    public DictionaryTranslationBuilder WithValue(string value)
+    {
+        _value = value;
+        return this;
+    }
 
-            return result;
-        }
+    public override IDictionaryTranslation Build()
+    {
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var deleteDate = _deleteDate;
+        var id = _id ?? 1;
+        var key = _key ?? Guid.NewGuid();
 
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
+        var result = new DictionaryTranslation(
+            _languageBuilder.Build(),
+            _value ?? Guid.NewGuid().ToString(),
+            key)
+        { CreateDate = createDate, UpdateDate = updateDate, DeleteDate = deleteDate, Id = id };
 
-        DateTime? IWithDeleteDateBuilder.DeleteDate
-        {
-            get => _deleteDate;
-            set => _deleteDate = value;
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
+        return result;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs b/tests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs
index b597600301..b3a35b50ae 100644
--- a/tests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilder.cs
@@ -2,187 +2,185 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class DocumentEntitySlimBuilder
+    : BuilderBase<DocumentEntitySlim>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreatorIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithNameBuilder,
+        IWithLevelBuilder,
+        IWithPathBuilder,
+        IWithSortOrderBuilder,
+        IWithParentIdBuilder
 {
-    public class DocumentEntitySlimBuilder
-        : BuilderBase<DocumentEntitySlim>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreatorIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithNameBuilder,
-            IWithLevelBuilder,
-            IWithPathBuilder,
-            IWithSortOrderBuilder,
-            IWithParentIdBuilder
+    private GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object> _additionalDataBuilder;
+    private string _contentTypeAlias;
+    private string _contentTypeIcon;
+    private string _contentTypeThumbnail;
+    private DateTime? _createDate;
+    private int? _creatorId;
+    private bool? _hasChildren;
+
+    private int? _id;
+    private Guid? _key;
+    private int? _level;
+    private string _name;
+    private int? _parentId;
+    private string _path;
+    private bool? _published;
+    private int? _sortOrder;
+    private DateTime? _updateDate;
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object> _additionalDataBuilder;
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _name;
-        private int? _creatorId;
-        private int? _level;
-        private string _path;
-        private int? _sortOrder;
-        private int? _parentId;
-        private string _contentTypeIcon;
-        private string _contentTypeThumbnail;
-        private string _contentTypeAlias;
-        private bool? _hasChildren;
-        private bool? _published;
+    int? IWithCreatorIdBuilder.CreatorId
+    {
+        get => _creatorId;
+        set => _creatorId = value;
+    }
 
-        public DocumentEntitySlimBuilder WithHasChildren(bool hasChildren)
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    int? IWithLevelBuilder.Level
+    {
+        get => _level;
+        set => _level = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    int? IWithParentIdBuilder.ParentId
+    {
+        get => _parentId;
+        set => _parentId = value;
+    }
+
+    string IWithPathBuilder.Path
+    {
+        get => _path;
+        set => _path = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public DocumentEntitySlimBuilder WithHasChildren(bool hasChildren)
+    {
+        _hasChildren = hasChildren;
+        return this;
+    }
+
+    public DocumentEntitySlimBuilder WithPublished(bool published)
+    {
+        _published = published;
+        return this;
+    }
+
+    public DocumentEntitySlimBuilder WithContentTypeAlias(string contentTypeAlias)
+    {
+        _contentTypeAlias = contentTypeAlias;
+        return this;
+    }
+
+    public DocumentEntitySlimBuilder WithContentTypeIcon(string contentTypeIcon)
+    {
+        _contentTypeIcon = contentTypeIcon;
+        return this;
+    }
+
+    public DocumentEntitySlimBuilder WithContentTypeThumbnail(string contentTypeThumbnail)
+    {
+        _contentTypeThumbnail = contentTypeThumbnail;
+        return this;
+    }
+
+    public GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object> AddAdditionalData()
+    {
+        var builder = new GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object>(this);
+        _additionalDataBuilder = builder;
+        return builder;
+    }
+
+    public override DocumentEntitySlim Build()
+    {
+        var id = _id ?? 1;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var creatorId = _creatorId ?? 1;
+        var level = _level ?? 1;
+        var path = _path ?? $"-1,{id}";
+        var sortOrder = _sortOrder ?? 0;
+        var parentId = _parentId ?? -1;
+        var icon = _contentTypeIcon ?? string.Empty;
+        var thumbnail = _contentTypeThumbnail ?? string.Empty;
+        var contentTypeAlias = _contentTypeAlias ?? string.Empty;
+        var hasChildren = _hasChildren ?? false;
+        var published = _published ?? false;
+
+        var documentEntitySlim = new DocumentEntitySlim
         {
-            _hasChildren = hasChildren;
-            return this;
-        }
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            Name = name,
+            CreatorId = creatorId,
+            Level = level,
+            Path = path,
+            SortOrder = sortOrder,
+            ParentId = parentId,
+            ContentTypeIcon = icon,
+            ContentTypeThumbnail = thumbnail,
+            ContentTypeAlias = contentTypeAlias,
+            HasChildren = hasChildren,
+            Published = published
+        };
 
-        public DocumentEntitySlimBuilder WithPublished(bool published)
+        if (_additionalDataBuilder != null)
         {
-            _published = published;
-            return this;
-        }
-
-        public DocumentEntitySlimBuilder WithContentTypeAlias(string contentTypeAlias)
-        {
-            _contentTypeAlias = contentTypeAlias;
-            return this;
-        }
-
-        public DocumentEntitySlimBuilder WithContentTypeIcon(string contentTypeIcon)
-        {
-            _contentTypeIcon = contentTypeIcon;
-            return this;
-        }
-
-        public DocumentEntitySlimBuilder WithContentTypeThumbnail(string contentTypeThumbnail)
-        {
-            _contentTypeThumbnail = contentTypeThumbnail;
-            return this;
-        }
-
-        public GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object> AddAdditionalData()
-        {
-            var builder = new GenericDictionaryBuilder<DocumentEntitySlimBuilder, string, object>(this);
-            _additionalDataBuilder = builder;
-            return builder;
-        }
-
-        public override DocumentEntitySlim Build()
-        {
-            var id = _id ?? 1;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var creatorId = _creatorId ?? 1;
-            var level = _level ?? 1;
-            var path = _path ?? $"-1,{id}";
-            var sortOrder = _sortOrder ?? 0;
-            var parentId = _parentId ?? -1;
-            var icon = _contentTypeIcon ?? string.Empty;
-            var thumbnail = _contentTypeThumbnail ?? string.Empty;
-            var contentTypeAlias = _contentTypeAlias ?? string.Empty;
-            var hasChildren = _hasChildren ?? false;
-            var published = _published ?? false;
-
-            var documentEntitySlim = new DocumentEntitySlim
+            var additionalData = _additionalDataBuilder.Build();
+            foreach (var kvp in additionalData)
             {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                Name = name,
-                CreatorId = creatorId,
-                Level = level,
-                Path = path,
-                SortOrder = sortOrder,
-                ParentId = parentId,
-                ContentTypeIcon = icon,
-                ContentTypeThumbnail = thumbnail,
-                ContentTypeAlias = contentTypeAlias,
-                HasChildren = hasChildren,
-                Published = published,
-            };
-
-            if (_additionalDataBuilder != null)
-            {
-                IDictionary<string, object> additionalData = _additionalDataBuilder.Build();
-                foreach (KeyValuePair<string, object> kvp in additionalData)
-                {
-                    documentEntitySlim.AdditionalData.Add(kvp.Key, kvp.Value);
-                }
+                documentEntitySlim.AdditionalData.Add(kvp.Key, kvp.Value);
             }
-
-            return documentEntitySlim;
         }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        int? IWithCreatorIdBuilder.CreatorId
-        {
-            get => _creatorId;
-            set => _creatorId = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        int? IWithLevelBuilder.Level
-        {
-            get => _level;
-            set => _level = value;
-        }
-
-        string IWithPathBuilder.Path
-        {
-            get => _path;
-            set => _path = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        int? IWithParentIdBuilder.ParentId
-        {
-            get => _parentId;
-            set => _parentId = value;
-        }
+        return documentEntitySlim;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs b/tests/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs
index e5053db676..b96cb84d20 100644
--- a/tests/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/EntitySlimBuilder.cs
@@ -4,44 +4,39 @@
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class EntitySlimBuilder
+    : BuilderBase<EntitySlim>,
+        IWithIdBuilder,
+        IWithParentIdBuilder
 {
-    public class EntitySlimBuilder
-        : BuilderBase<EntitySlim>,
-            IWithIdBuilder,
-            IWithParentIdBuilder
+    private int? _id;
+    private int? _parentId;
+
+    int? IWithIdBuilder.Id
     {
-        private int? _id;
-        private int? _parentId;
+        get => _id;
+        set => _id = value;
+    }
 
-        public override EntitySlim Build()
-        {
-            var id = _id ?? 1;
-            var parentId = _parentId ?? -1;
+    int? IWithParentIdBuilder.ParentId
+    {
+        get => _parentId;
+        set => _parentId = value;
+    }
 
-            return new EntitySlim
-            {
-                Id = id,
-                ParentId = parentId,
-            };
-        }
+    public override EntitySlim Build()
+    {
+        var id = _id ?? 1;
+        var parentId = _parentId ?? -1;
 
-        public EntitySlimBuilder WithNoParentId()
-        {
-            _parentId = 0;
-            return this;
-        }
+        return new EntitySlim { Id = id, ParentId = parentId };
+    }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        int? IWithParentIdBuilder.ParentId
-        {
-            get => _parentId;
-            set => _parentId = value;
-        }
+    public EntitySlimBuilder WithNoParentId()
+    {
+        _parentId = 0;
+        return this;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
index 13b0f715b0..e531c22963 100644
--- a/tests/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Extensions/BuilderExtensions.cs
@@ -6,239 +6,238 @@ using System.Globalization;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions;
+
+public static class BuilderExtensions
 {
-    public static class BuilderExtensions
+    public static T WithId<T>(this T builder, int id)
+        where T : IWithIdBuilder
     {
-        public static T WithId<T>(this T builder, int id)
-            where T : IWithIdBuilder
+        builder.Id = id;
+        return builder;
+    }
+
+    public static T WithId<T, TId>(this T builder, TId id)
+        where T : IWithIdBuilder<TId>
+    {
+        builder.Id = id;
+        return builder;
+    }
+
+    public static T WithoutIdentity<T>(this T builder)
+        where T : IWithIdBuilder
+    {
+        builder.Id = 0;
+        return builder;
+    }
+
+    public static T WithCreatorId<T>(this T builder, int creatorId)
+        where T : IWithCreatorIdBuilder
+    {
+        builder.CreatorId = creatorId;
+        return builder;
+    }
+
+    public static T WithCreateDate<T>(this T builder, DateTime createDate)
+        where T : IWithCreateDateBuilder
+    {
+        builder.CreateDate = createDate;
+        return builder;
+    }
+
+    public static T WithUpdateDate<T>(this T builder, DateTime updateDate)
+        where T : IWithUpdateDateBuilder
+    {
+        builder.UpdateDate = updateDate;
+        return builder;
+    }
+
+    public static T WithDeleteDate<T>(this T builder, DateTime deleteDate)
+        where T : IWithDeleteDateBuilder
+    {
+        builder.DeleteDate = deleteDate;
+        return builder;
+    }
+
+    public static T WithAlias<T>(this T builder, string alias)
+        where T : IWithAliasBuilder
+    {
+        builder.Alias = alias;
+        return builder;
+    }
+
+    public static T WithName<T>(this T builder, string name)
+        where T : IWithNameBuilder
+    {
+        builder.Name = name;
+        return builder;
+    }
+
+    public static T WithKey<T>(this T builder, Guid key)
+        where T : IWithKeyBuilder
+    {
+        builder.Key = key;
+        return builder;
+    }
+
+    public static T WithParentId<T>(this T builder, int parentId)
+        where T : IWithParentIdBuilder
+    {
+        builder.ParentId = parentId;
+        return builder;
+    }
+
+    public static T WithParentContentType<T>(this T builder, IContentTypeComposition parent)
+        where T : IWithParentContentTypeBuilder
+    {
+        builder.Parent = parent;
+        return builder;
+    }
+
+    public static T WithTrashed<T>(this T builder, bool trashed)
+        where T : IWithTrashedBuilder
+    {
+        builder.Trashed = trashed;
+        return builder;
+    }
+
+    public static T WithLevel<T>(this T builder, int level)
+        where T : IWithLevelBuilder
+    {
+        builder.Level = level;
+        return builder;
+    }
+
+    public static T WithPath<T>(this T builder, string path)
+        where T : IWithPathBuilder
+    {
+        builder.Path = path;
+        return builder;
+    }
+
+    public static T WithSortOrder<T>(this T builder, int sortOrder)
+        where T : IWithSortOrderBuilder
+    {
+        builder.SortOrder = sortOrder;
+        return builder;
+    }
+
+    public static T WithDescription<T>(this T builder, string description)
+        where T : IWithDescriptionBuilder
+    {
+        builder.Description = description;
+        return builder;
+    }
+
+    public static T WithIcon<T>(this T builder, string icon)
+        where T : IWithIconBuilder
+    {
+        builder.Icon = icon;
+        return builder;
+    }
+
+    public static T WithThumbnail<T>(this T builder, string thumbnail)
+        where T : IWithThumbnailBuilder
+    {
+        builder.Thumbnail = thumbnail;
+        return builder;
+    }
+
+    public static T WithLogin<T>(this T builder, string username, string rawPasswordValue)
+        where T : IWithLoginBuilder
+    {
+        builder.Username = username;
+        builder.RawPasswordValue = rawPasswordValue;
+        return builder;
+    }
+
+    public static T WithEmail<T>(this T builder, string email)
+        where T : IWithEmailBuilder
+    {
+        builder.Email = email;
+        return builder;
+    }
+
+    public static T WithFailedPasswordAttempts<T>(this T builder, int failedPasswordAttempts)
+        where T : IWithFailedPasswordAttemptsBuilder
+    {
+        builder.FailedPasswordAttempts = failedPasswordAttempts;
+        return builder;
+    }
+
+    public static T WithIsApproved<T>(this T builder, bool isApproved)
+        where T : IWithIsApprovedBuilder
+    {
+        builder.IsApproved = isApproved;
+        return builder;
+    }
+
+    public static T WithIsLockedOut<T>(this T builder, bool isLockedOut, DateTime? lastLockoutDate = null)
+        where T : IWithIsLockedOutBuilder
+    {
+        builder.IsLockedOut = isLockedOut;
+        if (lastLockoutDate.HasValue)
         {
-            builder.Id = id;
-            return builder;
+            builder.LastLockoutDate = lastLockoutDate.Value;
         }
 
-        public static T WithId<T, TId>(this T builder, TId id)
-            where T : IWithIdBuilder<TId>
-        {
-            builder.Id = id;
-            return builder;
-        }
+        return builder;
+    }
 
-        public static T WithoutIdentity<T>(this T builder)
-            where T : IWithIdBuilder
-        {
-            builder.Id = 0;
-            return builder;
-        }
+    public static T WithLastLoginDate<T>(this T builder, DateTime lastLoginDate)
+        where T : IWithLastLoginDateBuilder
+    {
+        builder.LastLoginDate = lastLoginDate;
+        return builder;
+    }
 
-        public static T WithCreatorId<T>(this T builder, int creatorId)
-            where T : IWithCreatorIdBuilder
-        {
-            builder.CreatorId = creatorId;
-            return builder;
-        }
+    public static T WithLastPasswordChangeDate<T>(this T builder, DateTime lastPasswordChangeDate)
+        where T : IWithLastPasswordChangeDateBuilder
+    {
+        builder.LastPasswordChangeDate = lastPasswordChangeDate;
+        return builder;
+    }
 
-        public static T WithCreateDate<T>(this T builder, DateTime createDate)
-            where T : IWithCreateDateBuilder
-        {
-            builder.CreateDate = createDate;
-            return builder;
-        }
+    public static T WithPropertyTypeIdsIncrementingFrom<T>(this T builder, int propertyTypeIdsIncrementingFrom)
+        where T : IWithPropertyTypeIdsIncrementingFrom
+    {
+        builder.PropertyTypeIdsIncrementingFrom = propertyTypeIdsIncrementingFrom;
+        return builder;
+    }
 
-        public static T WithUpdateDate<T>(this T builder, DateTime updateDate)
-            where T : IWithUpdateDateBuilder
-        {
-            builder.UpdateDate = updateDate;
-            return builder;
-        }
+    public static T WithIsContainer<T>(this T builder, bool isContainer)
+        where T : IWithIsContainerBuilder
+    {
+        builder.IsContainer = isContainer;
+        return builder;
+    }
 
-        public static T WithDeleteDate<T>(this T builder, DateTime deleteDate)
-            where T : IWithDeleteDateBuilder
-        {
-            builder.DeleteDate = deleteDate;
-            return builder;
-        }
+    public static T WithCultureInfo<T>(this T builder, string cultureCode)
+        where T : IWithCultureInfoBuilder
+    {
+        builder.CultureInfo = CultureInfo.GetCultureInfo(cultureCode);
+        return builder;
+    }
 
-        public static T WithAlias<T>(this T builder, string alias)
-            where T : IWithAliasBuilder
-        {
-            builder.Alias = alias;
-            return builder;
-        }
+    public static T WithSupportsPublishing<T>(this T builder, bool supportsPublishing)
+        where T : IWithSupportsPublishing
+    {
+        builder.SupportsPublishing = supportsPublishing;
+        return builder;
+    }
 
-        public static T WithName<T>(this T builder, string name)
-            where T : IWithNameBuilder
-        {
-            builder.Name = name;
-            return builder;
-        }
+    public static T WithPropertyValues<T>(this T builder, object propertyValues, string? culture = null, string? segment = null)
+        where T : IWithPropertyValues
+    {
+        builder.PropertyValues = propertyValues;
+        builder.PropertyValuesCulture = culture;
+        builder.PropertyValuesSegment = segment;
+        return builder;
+    }
 
-        public static T WithKey<T>(this T builder, Guid key)
-            where T : IWithKeyBuilder
-        {
-            builder.Key = key;
-            return builder;
-        }
-
-        public static T WithParentId<T>(this T builder, int parentId)
-            where T : IWithParentIdBuilder
-        {
-            builder.ParentId = parentId;
-            return builder;
-        }
-
-        public static T WithParentContentType<T>(this T builder, IContentTypeComposition parent)
-            where T : IWithParentContentTypeBuilder
-        {
-            builder.Parent = parent;
-            return builder;
-        }
-
-        public static T WithTrashed<T>(this T builder, bool trashed)
-            where T : IWithTrashedBuilder
-        {
-            builder.Trashed = trashed;
-            return builder;
-        }
-
-        public static T WithLevel<T>(this T builder, int level)
-            where T : IWithLevelBuilder
-        {
-            builder.Level = level;
-            return builder;
-        }
-
-        public static T WithPath<T>(this T builder, string path)
-            where T : IWithPathBuilder
-        {
-            builder.Path = path;
-            return builder;
-        }
-
-        public static T WithSortOrder<T>(this T builder, int sortOrder)
-            where T : IWithSortOrderBuilder
-        {
-            builder.SortOrder = sortOrder;
-            return builder;
-        }
-
-        public static T WithDescription<T>(this T builder, string description)
-            where T : IWithDescriptionBuilder
-        {
-            builder.Description = description;
-            return builder;
-        }
-
-        public static T WithIcon<T>(this T builder, string icon)
-            where T : IWithIconBuilder
-        {
-            builder.Icon = icon;
-            return builder;
-        }
-
-        public static T WithThumbnail<T>(this T builder, string thumbnail)
-            where T : IWithThumbnailBuilder
-        {
-            builder.Thumbnail = thumbnail;
-            return builder;
-        }
-
-        public static T WithLogin<T>(this T builder, string username, string rawPasswordValue)
-            where T : IWithLoginBuilder
-        {
-            builder.Username = username;
-            builder.RawPasswordValue = rawPasswordValue;
-            return builder;
-        }
-
-        public static T WithEmail<T>(this T builder, string email)
-            where T : IWithEmailBuilder
-        {
-            builder.Email = email;
-            return builder;
-        }
-
-        public static T WithFailedPasswordAttempts<T>(this T builder, int failedPasswordAttempts)
-            where T : IWithFailedPasswordAttemptsBuilder
-        {
-            builder.FailedPasswordAttempts = failedPasswordAttempts;
-            return builder;
-        }
-
-        public static T WithIsApproved<T>(this T builder, bool isApproved)
-            where T : IWithIsApprovedBuilder
-        {
-            builder.IsApproved = isApproved;
-            return builder;
-        }
-
-        public static T WithIsLockedOut<T>(this T builder, bool isLockedOut, DateTime? lastLockoutDate = null)
-            where T : IWithIsLockedOutBuilder
-        {
-            builder.IsLockedOut = isLockedOut;
-            if (lastLockoutDate.HasValue)
-            {
-                builder.LastLockoutDate = lastLockoutDate.Value;
-            }
-
-            return builder;
-        }
-
-        public static T WithLastLoginDate<T>(this T builder, DateTime lastLoginDate)
-            where T : IWithLastLoginDateBuilder
-        {
-            builder.LastLoginDate = lastLoginDate;
-            return builder;
-        }
-
-        public static T WithLastPasswordChangeDate<T>(this T builder, DateTime lastPasswordChangeDate)
-            where T : IWithLastPasswordChangeDateBuilder
-        {
-            builder.LastPasswordChangeDate = lastPasswordChangeDate;
-            return builder;
-        }
-
-        public static T WithPropertyTypeIdsIncrementingFrom<T>(this T builder, int propertyTypeIdsIncrementingFrom)
-            where T : IWithPropertyTypeIdsIncrementingFrom
-        {
-            builder.PropertyTypeIdsIncrementingFrom = propertyTypeIdsIncrementingFrom;
-            return builder;
-        }
-
-        public static T WithIsContainer<T>(this T builder, bool isContainer)
-            where T : IWithIsContainerBuilder
-        {
-            builder.IsContainer = isContainer;
-            return builder;
-        }
-
-        public static T WithCultureInfo<T>(this T builder, string cultureCode)
-            where T : IWithCultureInfoBuilder
-        {
-            builder.CultureInfo = CultureInfo.GetCultureInfo(cultureCode);
-            return builder;
-        }
-
-        public static T WithSupportsPublishing<T>(this T builder, bool supportsPublishing)
-            where T : IWithSupportsPublishing
-        {
-            builder.SupportsPublishing = supportsPublishing;
-            return builder;
-        }
-
-        public static T WithPropertyValues<T>(this T builder, object propertyValues, string? culture = null, string? segment = null)
-            where T : IWithPropertyValues
-        {
-            builder.PropertyValues = propertyValues;
-            builder.PropertyValuesCulture = culture;
-            builder.PropertyValuesSegment = segment;
-            return builder;
-        }
-
-        public static T WithDate<T>(this T builder, DateTime date) where T : IWithDateBuilder
-        {
-            builder.Date = date;
-            return builder;
-        }
+    public static T WithDate<T>(this T builder, DateTime date) where T : IWithDateBuilder
+    {
+        builder.Date = date;
+        return builder;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs
index 9167d3a77f..0a44c25cc5 100644
--- a/tests/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Extensions/ContentItemSaveBuilderExtensions.cs
@@ -3,50 +3,49 @@
 
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions;
+
+public static class ContentItemSaveBuilderExtensions
 {
-    public static class ContentItemSaveBuilderExtensions
+    public static ContentItemSaveBuilder WithContent(this ContentItemSaveBuilder builder, IContent content)
     {
-        public static ContentItemSaveBuilder WithContent(this ContentItemSaveBuilder builder, IContent content)
+        builder.WithId(content.Id);
+        builder.WithContentTypeAlias(content.ContentType.Alias);
+
+        if (content.CultureInfos.Count == 0)
         {
-            builder.WithId(content.Id);
-            builder.WithContentTypeAlias(content.ContentType.Alias);
+            var variantBuilder = builder.AddVariant();
+            variantBuilder.WithName(content.Name);
 
-            if (content.CultureInfos.Count == 0)
+            foreach (var contentProperty in content.Properties)
             {
-                ContentVariantSaveBuilder<ContentItemSaveBuilder> variantBuilder = builder.AddVariant();
-                variantBuilder.WithName(content.Name);
+                AddInvariantProperty(variantBuilder, contentProperty);
+            }
+        }
+        else
+        {
+            foreach (var contentCultureInfos in content.CultureInfos)
+            {
+                var variantBuilder = builder.AddVariant();
 
-                foreach (IProperty contentProperty in content.Properties)
+                variantBuilder.WithName(contentCultureInfos.Name);
+                variantBuilder.WithCultureInfo(contentCultureInfos.Culture);
+
+                foreach (var contentProperty in content.Properties)
                 {
                     AddInvariantProperty(variantBuilder, contentProperty);
                 }
             }
-            else
-            {
-                foreach (ContentCultureInfos contentCultureInfos in content.CultureInfos)
-                {
-                    ContentVariantSaveBuilder<ContentItemSaveBuilder> variantBuilder = builder.AddVariant();
-
-                    variantBuilder.WithName(contentCultureInfos.Name);
-                    variantBuilder.WithCultureInfo(contentCultureInfos.Culture);
-
-                    foreach (IProperty contentProperty in content.Properties)
-                    {
-                        AddInvariantProperty(variantBuilder, contentProperty);
-                    }
-                }
-            }
-
-            return builder;
         }
 
-        private static void AddInvariantProperty(ContentVariantSaveBuilder<ContentItemSaveBuilder> variantBuilder, IProperty contentProperty) =>
-            variantBuilder
-                .AddProperty()
-                .WithId(contentProperty.Id)
-                .WithAlias(contentProperty.Alias)
-                .WithValue(contentProperty.GetValue())
-                .Done();
+        return builder;
     }
+
+    private static void AddInvariantProperty(ContentVariantSaveBuilder<ContentItemSaveBuilder> variantBuilder, IProperty contentProperty) =>
+        variantBuilder
+            .AddProperty()
+            .WithId(contentProperty.Id)
+            .WithAlias(contentProperty.Alias)
+            .WithValue(contentProperty.GetValue())
+            .Done();
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs
index 92adfd3d67..67ad5e45f6 100644
--- a/tests/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Extensions/ContentTypeBuilderExtensions.cs
@@ -1,107 +1,106 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions;
+
+public static class ContentTypeBuilderExtensions
 {
-    public static class ContentTypeBuilderExtensions
-    {
-        public static ContentType BuildSimpleContentType(this ContentTypeBuilder builder) =>
-            (ContentType)builder
-                .WithId(10)
-                .WithAlias("textPage")
-                .WithName("Text Page")
-                .WithPropertyTypeIdsIncrementingFrom(200)
-                .AddPropertyGroup()
-                    .WithName("Content")
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithAlias("title")
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithAlias("bodyText")
-                        .WithName("Body text")
-                        .WithSortOrder(2)
-                        .WithDataTypeId(-87)
-                        .Done()
-                    .Done()
-                .AddPropertyGroup()
-                    .WithName("Meta")
-                    .WithSortOrder(2)
-                    .AddPropertyType()
-                        .WithAlias("keywords")
-                        .WithName("Keywords")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithAlias("description")
-                        .WithName("description")
-                        .WithSortOrder(1)
-                        .Done()
-                    .Done()
-                .AddAllowedTemplate()
-                    .WithId(200)
-                    .WithAlias("textPage")
-                    .WithName("Text Page")
-                    .Done()
-                .AddAllowedTemplate()
-                    .WithId(201)
-                    .WithAlias("textPage2")
-                    .WithName("Text Page 2")
-                    .Done()
-                .WithDefaultTemplateId(200)
-                .AddAllowedContentType()
-                    .WithId(888)
-                    .WithAlias("sub")
-                    .WithSortOrder(8)
-                    .Done()
-                .AddAllowedContentType()
-                    .WithId(889)
-                    .WithAlias("sub2")
-                    .WithSortOrder(9)
-                    .Done()
-                .Build();
+    public static ContentType BuildSimpleContentType(this ContentTypeBuilder builder) =>
+        (ContentType)builder
+            .WithId(10)
+            .WithAlias("textPage")
+            .WithName("Text Page")
+            .WithPropertyTypeIdsIncrementingFrom(200)
+            .AddPropertyGroup()
+            .WithName("Content")
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias("bodyText")
+            .WithName("Body text")
+            .WithSortOrder(2)
+            .WithDataTypeId(-87)
+            .Done()
+            .Done()
+            .AddPropertyGroup()
+            .WithName("Meta")
+            .WithSortOrder(2)
+            .AddPropertyType()
+            .WithAlias("keywords")
+            .WithName("Keywords")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("description")
+            .WithName("description")
+            .WithSortOrder(1)
+            .Done()
+            .Done()
+            .AddAllowedTemplate()
+            .WithId(200)
+            .WithAlias("textPage")
+            .WithName("Text Page")
+            .Done()
+            .AddAllowedTemplate()
+            .WithId(201)
+            .WithAlias("textPage2")
+            .WithName("Text Page 2")
+            .Done()
+            .WithDefaultTemplateId(200)
+            .AddAllowedContentType()
+            .WithId(888)
+            .WithAlias("sub")
+            .WithSortOrder(8)
+            .Done()
+            .AddAllowedContentType()
+            .WithId(889)
+            .WithAlias("sub2")
+            .WithSortOrder(9)
+            .Done()
+            .Build();
 
-        public static MediaType BuildImageMediaType(this MediaTypeBuilder builder) =>
-            (MediaType)builder
-                .WithId(10)
-                .WithAlias(Constants.Conventions.MediaTypes.Image)
-                .WithName("Image")
-                .WithDescription("test")
-                .WithIcon("icon-picture")
-                .WithPropertyTypeIdsIncrementingFrom(200)
-                .WithMediaPropertyGroup()
-                .Build();
+    public static MediaType BuildImageMediaType(this MediaTypeBuilder builder) =>
+        (MediaType)builder
+            .WithId(10)
+            .WithAlias(Constants.Conventions.MediaTypes.Image)
+            .WithName("Image")
+            .WithDescription("test")
+            .WithIcon("icon-picture")
+            .WithPropertyTypeIdsIncrementingFrom(200)
+            .WithMediaPropertyGroup()
+            .Build();
 
-        public static MemberType BuildSimpleMemberType(this MemberTypeBuilder builder) =>
-            (MemberType)builder
-                .WithId(10)
-                .WithAlias("memberType")
-                .WithName("Member type")
-                .WithIcon("icon-user-female")
-                .WithPropertyTypeIdsIncrementingFrom(200)
-                .AddPropertyGroup()
-                    .WithName("Content")
-                    .AddPropertyType()
-                        .WithAlias("title")
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithAlias("bodyText")
-                        .WithName("Body text")
-                        .WithSortOrder(2)
-                        .WithDataTypeId(-87)
-                        .Done()
-                    .Done()
-                .WithMemberCanEditProperty("title", true)
-                .WithMemberCanViewProperty("bodyText", true)
-                .Build();
-    }
+    public static MemberType BuildSimpleMemberType(this MemberTypeBuilder builder) =>
+        (MemberType)builder
+            .WithId(10)
+            .WithAlias("memberType")
+            .WithName("Member type")
+            .WithIcon("icon-user-female")
+            .WithPropertyTypeIdsIncrementingFrom(200)
+            .AddPropertyGroup()
+            .WithName("Content")
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias("bodyText")
+            .WithName("Body text")
+            .WithSortOrder(2)
+            .WithDataTypeId(-87)
+            .Done()
+            .Done()
+            .WithMemberCanEditProperty("title", true)
+            .WithMemberCanViewProperty("bodyText", true)
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs b/tests/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
index 45d5bdb354..58dc9fdf5a 100644
--- a/tests/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Extensions/StringExtensions.cs
@@ -1,23 +1,22 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Extensions
+namespace Umbraco.Cms.Tests.Common.Builders.Extensions;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
+    public static string ToCamelCase(this string s)
     {
-        public static string ToCamelCase(this string s)
+        if (string.IsNullOrWhiteSpace(s))
         {
-            if (string.IsNullOrWhiteSpace(s))
-            {
-                return string.Empty;
-            }
-
-            if (s.Length == 1)
-            {
-                return s.ToLowerInvariant();
-            }
-
-            return char.ToLowerInvariant(s[0]) + s.Substring(1);
+            return string.Empty;
         }
+
+        if (s.Length == 1)
+        {
+            return s.ToLowerInvariant();
+        }
+
+        return char.ToLowerInvariant(s[0]) + s.Substring(1);
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs b/tests/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
index 69c9f6245f..09ec1fccc2 100644
--- a/tests/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/GenericCollectionBuilder.cs
@@ -4,26 +4,25 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class GenericCollectionBuilder<TBuilder, T>
+    : ChildBuilderBase<TBuilder, IEnumerable<T>>
 {
-    public class GenericCollectionBuilder<TBuilder, T>
-        : ChildBuilderBase<TBuilder, IEnumerable<T>>
+    private readonly IList<T> _collection;
+
+    public GenericCollectionBuilder(TBuilder parentBuilder)
+        : base(parentBuilder) => _collection = new List<T>();
+
+    public override IEnumerable<T> Build()
     {
-        private readonly IList<T> _collection;
+        var collection = _collection?.ToList() ?? Enumerable.Empty<T>();
+        return collection;
+    }
 
-        public GenericCollectionBuilder(TBuilder parentBuilder)
-            : base(parentBuilder) => _collection = new List<T>();
-
-        public override IEnumerable<T> Build()
-        {
-            IEnumerable<T> collection = _collection?.ToList() ?? Enumerable.Empty<T>();
-            return collection;
-        }
-
-        public GenericCollectionBuilder<TBuilder, T> WithValue(T value)
-        {
-            _collection.Add(value);
-            return this;
-        }
+    public GenericCollectionBuilder<TBuilder, T> WithValue(T value)
+    {
+        _collection.Add(value);
+        return this;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs b/tests/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
index 371dd88cf3..24a65ee575 100644
--- a/tests/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/GenericDictionaryBuilder.cs
@@ -3,24 +3,23 @@
 
 using System.Collections.Generic;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class GenericDictionaryBuilder<TBuilder, TKey, TValue>
+    : ChildBuilderBase<TBuilder, IDictionary<TKey, TValue>>
 {
-    public class GenericDictionaryBuilder<TBuilder, TKey, TValue>
-        : ChildBuilderBase<TBuilder, IDictionary<TKey, TValue>>
+    private readonly IDictionary<TKey, TValue> _dictionary;
+
+    public GenericDictionaryBuilder(TBuilder parentBuilder)
+        : base(parentBuilder) => _dictionary = new Dictionary<TKey, TValue>();
+
+    public override IDictionary<TKey, TValue> Build() => _dictionary == null
+        ? new Dictionary<TKey, TValue>()
+        : new Dictionary<TKey, TValue>(_dictionary);
+
+    public GenericDictionaryBuilder<TBuilder, TKey, TValue> WithKeyValue(TKey key, TValue value)
     {
-        private readonly IDictionary<TKey, TValue> _dictionary;
-
-        public GenericDictionaryBuilder(TBuilder parentBuilder)
-            : base(parentBuilder) => _dictionary = new Dictionary<TKey, TValue>();
-
-        public override IDictionary<TKey, TValue> Build() => _dictionary == null
-                ? new Dictionary<TKey, TValue>()
-                : new Dictionary<TKey, TValue>(_dictionary);
-
-        public GenericDictionaryBuilder<TBuilder, TKey, TValue> WithKeyValue(TKey key, TValue value)
-        {
-            _dictionary.Add(key, value);
-            return this;
-        }
+        _dictionary.Add(key, value);
+        return this;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs
index 74786d7e1f..e6ac2438b8 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IAccountBuilder.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IAccountBuilder : IWithLoginBuilder,
+    IWithEmailBuilder,
+    IWithFailedPasswordAttemptsBuilder,
+    IWithIsApprovedBuilder,
+    IWithIsLockedOutBuilder,
+    IWithLastLoginDateBuilder,
+    IWithLastPasswordChangeDateBuilder
 {
-    public interface IAccountBuilder : IWithLoginBuilder,
-                                       IWithEmailBuilder,
-                                       IWithFailedPasswordAttemptsBuilder,
-                                       IWithIsApprovedBuilder,
-                                       IWithIsLockedOutBuilder,
-                                       IWithLastLoginDateBuilder,
-                                       IWithLastPasswordChangeDateBuilder
-    {
-    }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs
index d47b844192..785a360922 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentCultureInfosCollection.cs
@@ -1,7 +1,5 @@
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
-{
-    public interface IBuildContentCultureInfosCollection
-    {
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-    }
+public interface IBuildContentCultureInfosCollection
+{
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs
index d8cfcc70ca..27d284b7d8 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildContentTypes.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IBuildContentTypes
 {
-    public interface IBuildContentTypes
-    {
-    }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
index ea836503bc..692ddc66b4 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyGroups.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IBuildPropertyGroups
 {
-    public interface IBuildPropertyGroups
-    {
-    }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
index c35d100163..d9dbd38345 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IBuildPropertyTypes.cs
@@ -1,9 +1,8 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IBuildPropertyTypes
 {
-    public interface IBuildPropertyTypes
-    {
-    }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
index 7acef7bfb5..b612011cd1 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAliasBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithAliasBuilder
 {
-    public interface IWithAliasBuilder
-    {
-        string Alias { get; set; }
-    }
+    string Alias { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAllowAsRootBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAllowAsRootBuilder.cs
index 09148dc048..004f9681db 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAllowAsRootBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithAllowAsRootBuilder.cs
@@ -1,7 +1,6 @@
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithAllowAsRootBuilder
 {
-    public interface IWithAllowAsRootBuilder
-    {
-        bool? AllowAsRoot { get; set; }
-    }
+    bool? AllowAsRoot { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
index 92b8212b2b..678339530b 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreateDateBuilder.cs
@@ -3,10 +3,9 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithCreateDateBuilder
 {
-    public interface IWithCreateDateBuilder
-    {
-        DateTime? CreateDate { get; set; }
-    }
+    DateTime? CreateDate { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
index 685235860b..1008bcb83f 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCreatorIdBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithCreatorIdBuilder
 {
-    public interface IWithCreatorIdBuilder
-    {
-        int? CreatorId { get; set; }
-    }
+    int? CreatorId { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
index 23bbdd344b..8ae528a8c3 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithCultureInfoBuilder.cs
@@ -3,10 +3,9 @@
 
 using System.Globalization;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithCultureInfoBuilder
 {
-    public interface IWithCultureInfoBuilder
-    {
-        CultureInfo CultureInfo { get; set; }
-    }
+    CultureInfo CultureInfo { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs
index 3d1c9bddb7..967499e71b 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDateBuilder.cs
@@ -1,9 +1,8 @@
-using System;
+using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithDateBuilder
 {
-    public interface IWithDateBuilder
-    {
-        DateTime? Date { get; set; }
-    }
+    DateTime? Date { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
index a50a8294d8..48d5196baa 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDeleteDateBuilder.cs
@@ -3,10 +3,9 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithDeleteDateBuilder
 {
-    public interface IWithDeleteDateBuilder
-    {
-        DateTime? DeleteDate { get; set; }
-    }
+    DateTime? DeleteDate { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
index 2b2bf4f369..5d4234a99c 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithDescriptionBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithDescriptionBuilder
 {
-    public interface IWithDescriptionBuilder
-    {
-        string Description { get; set; }
-    }
+    string Description { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs
index defec80a46..c58e4eff52 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithEmailBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithEmailBuilder
 {
-    public interface IWithEmailBuilder
-    {
-        string Email { get; set; }
-    }
+    string Email { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs
index 0bf1121fa5..b9de7bd8f4 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithFailedPasswordAttemptsBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithFailedPasswordAttemptsBuilder
 {
-    public interface IWithFailedPasswordAttemptsBuilder
-    {
-        int? FailedPasswordAttempts { get; set; }
-    }
+    int? FailedPasswordAttempts { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
index a2b5667701..f91ef8ea84 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIconBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithIconBuilder
 {
-    public interface IWithIconBuilder
-    {
-        string Icon { get; set; }
-    }
+    string Icon { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
index 604f683dd7..7f628c8dc7 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIdBuilder.cs
@@ -1,15 +1,14 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
-{
-    public interface IWithIdBuilder
-    {
-        int? Id { get; set; }
-    }
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-    public interface IWithIdBuilder<TId>
-    {
-        TId Id { get; set; }
-    }
+public interface IWithIdBuilder
+{
+    int? Id { get; set; }
+}
+
+public interface IWithIdBuilder<TId>
+{
+    TId Id { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs
index c9fc310592..aea54588a8 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsApprovedBuilder.cs
@@ -1,10 +1,9 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithIsApprovedBuilder
 {
-    public interface IWithIsApprovedBuilder
-    {
-        bool? IsApproved { get; set; }
-    }
+    bool? IsApproved { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs
index f2b0a64d7b..30fc33cde4 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsContainerBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithIsContainerBuilder
 {
-    public interface IWithIsContainerBuilder
-    {
-        bool? IsContainer { get; set; }
-    }
+    bool? IsContainer { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs
index 3d3562a023..b7fd39aec5 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithIsLockedOutBuilder.cs
@@ -3,12 +3,11 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
-{
-    public interface IWithIsLockedOutBuilder
-    {
-        bool? IsLockedOut { get; set; }
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-        DateTime? LastLockoutDate { get; set; }
-    }
+public interface IWithIsLockedOutBuilder
+{
+    bool? IsLockedOut { get; set; }
+
+    DateTime? LastLockoutDate { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
index a4da641d96..1777901ec2 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithKeyBuilder.cs
@@ -3,10 +3,9 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithKeyBuilder
 {
-    public interface IWithKeyBuilder
-    {
-        Guid? Key { get; set; }
-    }
+    Guid? Key { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs
index e01a1ef19d..9aacc3eb53 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastLoginDateBuilder.cs
@@ -3,10 +3,9 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithLastLoginDateBuilder
 {
-    public interface IWithLastLoginDateBuilder
-    {
-        DateTime? LastLoginDate { get; set; }
-    }
+    DateTime? LastLoginDate { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs
index e7b354217d..d823bc041f 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLastPasswordChangeDateBuilder.cs
@@ -3,10 +3,9 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithLastPasswordChangeDateBuilder
 {
-    public interface IWithLastPasswordChangeDateBuilder
-    {
-        DateTime? LastPasswordChangeDate { get; set; }
-    }
+    DateTime? LastPasswordChangeDate { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
index 0b55ce5766..f15823192f 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLevelBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithLevelBuilder
 {
-    public interface IWithLevelBuilder
-    {
-        int? Level { get; set; }
-    }
+    int? Level { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs
index 905a90cb7e..150f995805 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithLoginBuilder.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithLoginBuilder
 {
-    public interface IWithLoginBuilder
-    {
-        string Username { get; set; }
+    string Username { get; set; }
 
-        string RawPasswordValue { get; set; }
+    string RawPasswordValue { get; set; }
 
-        string PasswordConfig { get; set; }
-    }
+    string PasswordConfig { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
index 494a9e3200..64bbd760ae 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithNameBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithNameBuilder
 {
-    public interface IWithNameBuilder
-    {
-        string Name { get; set; }
-    }
+    string Name { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs
index 3a284e4026..a1b933f7c8 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentContentTypeBuilder.cs
@@ -3,10 +3,9 @@
 
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithParentContentTypeBuilder
 {
-    public interface IWithParentContentTypeBuilder
-    {
-        IContentTypeComposition Parent { get; set; }
-    }
+    IContentTypeComposition Parent { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
index 68bb7afe0c..3369c31074 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithParentIdBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithParentIdBuilder
 {
-    public interface IWithParentIdBuilder
-    {
-        int? ParentId { get; set; }
-    }
+    int? ParentId { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
index 84e56a132d..60432630e2 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPathBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithPathBuilder
 {
-    public interface IWithPathBuilder
-    {
-        string Path { get; set; }
-    }
+    string Path { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs
index 00a1649c51..95eb906b82 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyTypeIdsIncrementingFrom.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithPropertyTypeIdsIncrementingFrom
 {
-    public interface IWithPropertyTypeIdsIncrementingFrom
-    {
-        int? PropertyTypeIdsIncrementingFrom { get; set; }
-    }
+    int? PropertyTypeIdsIncrementingFrom { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs
index f6e99c8bfd..cb175340e5 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithPropertyValues.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithPropertyValues
 {
-    public interface IWithPropertyValues
-    {
-        object PropertyValues { get; set; }
+    object PropertyValues { get; set; }
 
-        string PropertyValuesCulture { get; set; }
+    string PropertyValuesCulture { get; set; }
 
-        string PropertyValuesSegment { get; set; }
-    }
+    string PropertyValuesSegment { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
index 6f60f58d84..7007c1f401 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSortOrderBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithSortOrderBuilder
 {
-    public interface IWithSortOrderBuilder
-    {
-        int? SortOrder { get; set; }
-    }
+    int? SortOrder { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs
index 4a7bfca964..bed44025e1 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithSupportsPublishing.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithSupportsPublishing
 {
-    public interface IWithSupportsPublishing
-    {
-        bool? SupportsPublishing { get; set; }
-    }
+    bool? SupportsPublishing { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
index 92f8edef3b..79b161b4a7 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithThumbnailBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithThumbnailBuilder
 {
-    public interface IWithThumbnailBuilder
-    {
-        string Thumbnail { get; set; }
-    }
+    string Thumbnail { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
index b75bf05286..faad466857 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithTrashedBuilder.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithTrashedBuilder
 {
-    public interface IWithTrashedBuilder
-    {
-        bool? Trashed { get; set; }
-    }
+    bool? Trashed { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
index 8264b91dbc..f88b394581 100644
--- a/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/Interfaces/IWithUpdateDateBuilder.cs
@@ -3,10 +3,9 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Builders.Interfaces
+namespace Umbraco.Cms.Tests.Common.Builders.Interfaces;
+
+public interface IWithUpdateDateBuilder
 {
-    public interface IWithUpdateDateBuilder
-    {
-        DateTime? UpdateDate { get; set; }
-    }
+    DateTime? UpdateDate { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/LanguageBuilder.cs b/tests/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
index 649e642673..0eaf125332 100644
--- a/tests/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/LanguageBuilder.cs
@@ -3,128 +3,126 @@
 
 using System;
 using System.Globalization;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class LanguageBuilder : LanguageBuilder<object>
 {
-    public class LanguageBuilder : LanguageBuilder<object>
+    public LanguageBuilder()
+        : base(null)
     {
-        public LanguageBuilder()
-            : base(null)
-        {
-        }
-    }
-
-    public class LanguageBuilder<TParent>
-        : ChildBuilderBase<TParent, ILanguage>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithDeleteDateBuilder,
-            IWithCultureInfoBuilder
-    {
-        private DateTime? _createDate;
-        private CultureInfo _cultureInfo;
-        private string _cultureName;
-        private DateTime? _deleteDate;
-        private int? _fallbackLanguageId;
-        private int? _id;
-        private bool? _isDefault;
-        private bool? _isMandatory;
-        private Guid? _key;
-        private DateTime? _updateDate;
-
-        public LanguageBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
-
-        public LanguageBuilder<TParent> WithCultureName(string cultureName)
-        {
-            _cultureName = cultureName;
-            return this;
-        }
-
-        public LanguageBuilder<TParent> WithIsDefault(bool isDefault)
-        {
-            _isDefault = isDefault;
-            return this;
-        }
-
-        public LanguageBuilder<TParent> WithIsMandatory(bool isMandatory)
-        {
-            _isMandatory = isMandatory;
-            return this;
-        }
-
-        public LanguageBuilder<TParent> WithFallbackLanguageId(int fallbackLanguageId)
-        {
-            _fallbackLanguageId = fallbackLanguageId;
-            return this;
-        }
-
-        public override ILanguage Build()
-        {
-            CultureInfo cultureInfo = _cultureInfo ?? CultureInfo.GetCultureInfo("en-US");
-            var cultureName = _cultureName ?? cultureInfo.EnglishName;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            DateTime? deleteDate = _deleteDate ?? null;
-            var fallbackLanguageId = _fallbackLanguageId ?? null;
-            var isDefault = _isDefault ?? false;
-            var isMandatory = _isMandatory ?? false;
-
-            return new Language(cultureInfo.Name, cultureName)
-            {
-                Id = _id ?? 0,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                DeleteDate = deleteDate,
-                IsDefault = isDefault,
-                IsMandatory = isMandatory,
-                FallbackLanguageId = fallbackLanguageId
-            };
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        CultureInfo IWithCultureInfoBuilder.CultureInfo
-        {
-            get => _cultureInfo;
-            set => _cultureInfo = value;
-        }
-
-        DateTime? IWithDeleteDateBuilder.DeleteDate
-        {
-            get => _deleteDate;
-            set => _deleteDate = value;
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
+    }
+}
+
+public class LanguageBuilder<TParent>
+    : ChildBuilderBase<TParent, ILanguage>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithDeleteDateBuilder,
+        IWithCultureInfoBuilder
+{
+    private DateTime? _createDate;
+    private CultureInfo _cultureInfo;
+    private string _cultureName;
+    private DateTime? _deleteDate;
+    private int? _fallbackLanguageId;
+    private int? _id;
+    private bool? _isDefault;
+    private bool? _isMandatory;
+    private Guid? _key;
+    private DateTime? _updateDate;
+
+    public LanguageBuilder(TParent parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    CultureInfo IWithCultureInfoBuilder.CultureInfo
+    {
+        get => _cultureInfo;
+        set => _cultureInfo = value;
+    }
+
+    DateTime? IWithDeleteDateBuilder.DeleteDate
+    {
+        get => _deleteDate;
+        set => _deleteDate = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public LanguageBuilder<TParent> WithCultureName(string cultureName)
+    {
+        _cultureName = cultureName;
+        return this;
+    }
+
+    public LanguageBuilder<TParent> WithIsDefault(bool isDefault)
+    {
+        _isDefault = isDefault;
+        return this;
+    }
+
+    public LanguageBuilder<TParent> WithIsMandatory(bool isMandatory)
+    {
+        _isMandatory = isMandatory;
+        return this;
+    }
+
+    public LanguageBuilder<TParent> WithFallbackLanguageId(int fallbackLanguageId)
+    {
+        _fallbackLanguageId = fallbackLanguageId;
+        return this;
+    }
+
+    public override ILanguage Build()
+    {
+        var cultureInfo = _cultureInfo ?? CultureInfo.GetCultureInfo("en-US");
+        var cultureName = _cultureName ?? cultureInfo.EnglishName;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var deleteDate = _deleteDate;
+        var fallbackLanguageId = _fallbackLanguageId;
+        var isDefault = _isDefault ?? false;
+        var isMandatory = _isMandatory ?? false;
+
+        return new Language(cultureInfo.Name, cultureName)
+        {
+            Id = _id ?? 0,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            DeleteDate = deleteDate,
+            IsDefault = isDefault,
+            IsMandatory = isMandatory,
+            FallbackLanguageId = fallbackLanguageId
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/MacroBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MacroBuilder.cs
index 1039be4b75..12e3840690 100644
--- a/tests/Umbraco.Tests.Common/Builders/MacroBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/MacroBuilder.cs
@@ -9,120 +9,119 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class MacroBuilder
+    : BuilderBase<Macro>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder
 {
-    public class MacroBuilder
-        : BuilderBase<Macro>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder
+    private readonly List<MacroPropertyBuilder> _propertyBuilders = new();
+    private string _alias;
+    private bool? _cacheByMember;
+    private bool? _cacheByPage;
+    private int? _cacheDuration;
+    private bool? _dontRender;
+
+    private int? _id;
+    private Guid? _key;
+    private string _macroSource;
+    private string _name;
+    private bool? _useInEditor;
+
+    string IWithAliasBuilder.Alias
     {
-        private readonly List<MacroPropertyBuilder> _propertyBuilders = new List<MacroPropertyBuilder>();
+        get => _alias;
+        set => _alias = value;
+    }
 
-        private int? _id;
-        private Guid? _key;
-        private string _alias;
-        private string _name;
-        private bool? _useInEditor;
-        private int? _cacheDuration;
-        private bool? _cacheByPage;
-        private bool? _cacheByMember;
-        private bool? _dontRender;
-        private string _macroSource;
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-        public MacroBuilder WithUseInEditor(bool useInEditor)
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    public MacroBuilder WithUseInEditor(bool useInEditor)
+    {
+        _useInEditor = useInEditor;
+        return this;
+    }
+
+    public MacroBuilder WithCacheDuration(int cacheDuration)
+    {
+        _cacheDuration = cacheDuration;
+        return this;
+    }
+
+    public MacroBuilder WithCacheByPage(bool cacheByPage)
+    {
+        _cacheByPage = cacheByPage;
+        return this;
+    }
+
+    public MacroBuilder WithCacheByMember(bool cacheByMember)
+    {
+        _cacheByMember = cacheByMember;
+        return this;
+    }
+
+    public MacroBuilder WithDontRender(bool dontRender)
+    {
+        _dontRender = dontRender;
+        return this;
+    }
+
+    public MacroBuilder WithSource(string macroSource)
+    {
+        _macroSource = macroSource;
+        return this;
+    }
+
+    public MacroPropertyBuilder AddProperty()
+    {
+        var builder = new MacroPropertyBuilder(this);
+
+        _propertyBuilders.Add(builder);
+
+        return builder;
+    }
+
+    public override Macro Build()
+    {
+        var id = _id ?? 1;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var alias = _alias ?? name.ToCamelCase();
+        var key = _key ?? Guid.NewGuid();
+        var useInEditor = _useInEditor ?? false;
+        var cacheDuration = _cacheDuration ?? 0;
+        var cacheByPage = _cacheByPage ?? false;
+        var cacheByMember = _cacheByMember ?? false;
+        var dontRender = _dontRender ?? false;
+        var macroSource = _macroSource ?? string.Empty;
+
+        var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+        var macro = new Macro(shortStringHelper, id, key, useInEditor, cacheDuration, alias, name, cacheByPage, cacheByMember, dontRender, macroSource);
+
+        foreach (var property in _propertyBuilders.Select(x => x.Build()))
         {
-            _useInEditor = useInEditor;
-            return this;
+            macro.Properties.Add(property);
         }
 
-        public MacroBuilder WithCacheDuration(int cacheDuration)
-        {
-            _cacheDuration = cacheDuration;
-            return this;
-        }
-
-        public MacroBuilder WithCacheByPage(bool cacheByPage)
-        {
-            _cacheByPage = cacheByPage;
-            return this;
-        }
-
-        public MacroBuilder WithCacheByMember(bool cacheByMember)
-        {
-            _cacheByMember = cacheByMember;
-            return this;
-        }
-
-        public MacroBuilder WithDontRender(bool dontRender)
-        {
-            _dontRender = dontRender;
-            return this;
-        }
-
-        public MacroBuilder WithSource(string macroSource)
-        {
-            _macroSource = macroSource;
-            return this;
-        }
-
-        public MacroPropertyBuilder AddProperty()
-        {
-            var builder = new MacroPropertyBuilder(this);
-
-            _propertyBuilders.Add(builder);
-
-            return builder;
-        }
-
-        public override Macro Build()
-        {
-            var id = _id ?? 1;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var alias = _alias ?? name.ToCamelCase();
-            Guid key = _key ?? Guid.NewGuid();
-            var useInEditor = _useInEditor ?? false;
-            var cacheDuration = _cacheDuration ?? 0;
-            var cacheByPage = _cacheByPage ?? false;
-            var cacheByMember = _cacheByMember ?? false;
-            var dontRender = _dontRender ?? false;
-            var macroSource = _macroSource ?? string.Empty;
-
-            var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
-
-            var macro = new Macro(shortStringHelper, id, key, useInEditor, cacheDuration, alias, name, cacheByPage, cacheByMember, dontRender, macroSource);
-
-            foreach (IMacroProperty property in _propertyBuilders.Select(x => x.Build()))
-            {
-                macro.Properties.Add(property);
-            }
-
-            return macro;
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
+        return macro;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs
index 2e88dcb8e6..ff181cf689 100644
--- a/tests/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/MacroPropertyBuilder.cs
@@ -6,74 +6,73 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class MacroPropertyBuilder
+    : ChildBuilderBase<MacroBuilder, IMacroProperty>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder,
+        IWithSortOrderBuilder
 {
-    public class MacroPropertyBuilder
-        : ChildBuilderBase<MacroBuilder, IMacroProperty>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder,
-            IWithSortOrderBuilder
+    private string _alias;
+    private string _editorAlias;
+    private int? _id;
+    private Guid? _key;
+    private string _name;
+    private int? _sortOrder;
+
+    public MacroPropertyBuilder(MacroBuilder parentBuilder)
+        : base(parentBuilder)
     {
-        private int? _id;
-        private Guid? _key;
-        private string _alias;
-        private string _name;
-        private int? _sortOrder;
-        private string _editorAlias;
+    }
 
-        public MacroPropertyBuilder(MacroBuilder parentBuilder)
-            : base(parentBuilder)
-        {
-        }
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
 
-        public MacroPropertyBuilder WithEditorAlias(string editorAlias)
-        {
-            _editorAlias = editorAlias;
-            return this;
-        }
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-        public override IMacroProperty Build()
-        {
-            var id = _id ?? 1;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var alias = _alias ?? name.ToCamelCase();
-            Guid key = _key ?? Guid.NewGuid();
-            var sortOrder = _sortOrder ?? 0;
-            var editorAlias = _editorAlias ?? string.Empty;
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
 
-            return new MacroProperty(id, key, alias, name, sortOrder, editorAlias);
-        }
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
 
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
+    public MacroPropertyBuilder WithEditorAlias(string editorAlias)
+    {
+        _editorAlias = editorAlias;
+        return this;
+    }
 
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
+    public override IMacroProperty Build()
+    {
+        var id = _id ?? 1;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var alias = _alias ?? name.ToCamelCase();
+        var key = _key ?? Guid.NewGuid();
+        var sortOrder = _sortOrder ?? 0;
+        var editorAlias = _editorAlias ?? string.Empty;
 
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
+        return new MacroProperty(id, key, alias, name, sortOrder, editorAlias);
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/MediaBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MediaBuilder.cs
index 57303651f1..d293a62f31 100644
--- a/tests/Umbraco.Tests.Common/Builders/MediaBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/MediaBuilder.cs
@@ -2,263 +2,257 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Umbraco.Cms.Tests.Common.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class MediaBuilder
+    : BuilderBase<Media>,
+        IBuildContentTypes,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithParentIdBuilder,
+        IWithCreatorIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithNameBuilder,
+        IWithTrashedBuilder,
+        IWithLevelBuilder,
+        IWithPathBuilder,
+        IWithSortOrderBuilder,
+        IWithPropertyValues
 {
-    public class MediaBuilder
-        : BuilderBase<Media>,
-            IBuildContentTypes,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithParentIdBuilder,
-            IWithCreatorIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithNameBuilder,
-            IWithTrashedBuilder,
-            IWithLevelBuilder,
-            IWithPathBuilder,
-            IWithSortOrderBuilder,
-            IWithPropertyValues
+    private DateTime? _createDate;
+    private int? _creatorId;
+
+    private int? _id;
+    private Guid? _key;
+    private int? _level;
+    private IMediaType _mediaType;
+    private MediaTypeBuilder _mediaTypeBuilder;
+    private string _name;
+    private int? _parentId;
+    private string _path;
+    private GenericDictionaryBuilder<MediaBuilder, string, object> _propertyDataBuilder;
+    private object _propertyValues;
+    private string _propertyValuesCulture;
+    private string _propertyValuesSegment;
+    private int? _sortOrder;
+    private bool? _trashed;
+    private DateTime? _updateDate;
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private MediaTypeBuilder _mediaTypeBuilder;
-        private GenericDictionaryBuilder<MediaBuilder, string, object> _propertyDataBuilder;
-
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private int? _parentId;
-        private string _name;
-        private int? _creatorId;
-        private int? _level;
-        private string _path;
-        private int? _sortOrder;
-        private bool? _trashed;
-        private IMediaType _mediaType;
-        private object _propertyValues;
-        private string _propertyValuesCulture;
-        private string _propertyValuesSegment;
-
-        public MediaTypeBuilder AddMediaType()
-        {
-            _mediaType = null;
-            var builder = new MediaTypeBuilder(this);
-            _mediaTypeBuilder = builder;
-            return builder;
-        }
-
-        public MediaBuilder WithMediaType(IMediaType mediaType)
-        {
-            _mediaTypeBuilder = null;
-            _mediaType = mediaType;
-
-            return this;
-        }
-
-        public GenericDictionaryBuilder<MediaBuilder, string, object> AddPropertyData()
-        {
-            var builder = new GenericDictionaryBuilder<MediaBuilder, string, object>(this);
-            _propertyDataBuilder = builder;
-            return builder;
-        }
-
-        public override Media Build()
-        {
-            var id = _id ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            var parentId = _parentId ?? -1;
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var creatorId = _creatorId ?? 0;
-            var level = _level ?? 1;
-            var path = _path ?? $"-1,{id}";
-            var sortOrder = _sortOrder ?? 0;
-            var trashed = _trashed ?? false;
-            var propertyValues = _propertyValues ?? null;
-            var propertyValuesCulture = _propertyValuesCulture ?? null;
-            var propertyValuesSegment = _propertyValuesSegment ?? null;
-
-            if (_mediaTypeBuilder is null && _mediaType is null)
-            {
-                throw new InvalidOperationException("A media item cannot be constructed without providing a media type. Use AddMediaType() or WithMediaType().");
-            }
-
-            IMediaType mediaType = _mediaType ?? _mediaTypeBuilder.Build();
-
-            var media = new Media(name, parentId, mediaType)
-            {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                CreatorId = creatorId,
-                Level = level,
-                Path = path,
-                SortOrder = sortOrder,
-                Trashed = trashed,
-            };
-
-            if (_propertyDataBuilder != null || propertyValues != null)
-            {
-                if (_propertyDataBuilder != null)
-                {
-                    IDictionary<string, object> propertyData = _propertyDataBuilder.Build();
-                    foreach (KeyValuePair<string, object> keyValuePair in propertyData)
-                    {
-                        media.SetValue(keyValuePair.Key, keyValuePair.Value);
-                    }
-                }
-                else
-                {
-                    media.PropertyValues(propertyValues, propertyValuesCulture, propertyValuesSegment);
-                }
-
-                media.ResetDirtyProperties(false);
-            }
-
-            return media;
-        }
-
-        public static Media CreateSimpleMedia(IMediaType mediaType, string name, int parentId, int id = 0) =>
-            new MediaBuilder()
-                .WithId(id)
-                .WithName(name)
-                .WithMediaType(mediaType)
-                .WithParentId(parentId)
-                .WithPropertyValues(new
-                {
-                    title = name + " Subpage",
-                    bodyText = "This is a subpage",
-                    author = "John Doe"
-                })
-                .Build();
-
-        public static Media CreateMediaImage(IMediaType mediaType, int parentId) =>
-            CreateMediaImage(mediaType, parentId, "/media/test-image.png");
-
-        public static Media CreateMediaImageWithCrop(IMediaType mediaType, int parentId) =>
-            CreateMediaImage(mediaType, parentId, "{src: '/media/test-image.png', crops: []}");
-
-        private static Media CreateMediaImage(IMediaType mediaType, int parentId, string fileValue) => new MediaBuilder()
-                .WithMediaType(mediaType)
-                .WithName("Test Image")
-                .WithParentId(parentId)
-                .AddPropertyData()
-                    .WithKeyValue(Constants.Conventions.Media.File, fileValue)
-                    .WithKeyValue(Constants.Conventions.Media.Width, "200")
-                    .WithKeyValue(Constants.Conventions.Media.Height, "200")
-                    .WithKeyValue(Constants.Conventions.Media.Bytes, "100")
-                    .WithKeyValue(Constants.Conventions.Media.Extension, "png")
-                    .Done()
-                .Build();
-
-        public static Media CreateMediaFolder(IMediaType mediaType, int parentId) => new MediaBuilder()
-                .WithMediaType(mediaType)
-                .WithName("Test Folder")
-                .WithParentId(parentId)
-                .Build();
-
-        public static Media CreateMediaFile(IMediaType mediaType, int parentId) => new MediaBuilder()
-                .WithMediaType(mediaType)
-                .WithName("Test File")
-                .WithParentId(parentId)
-                .AddPropertyData()
-                    .WithKeyValue(Constants.Conventions.Media.File, "/media/test-file.txt")
-                    .WithKeyValue(Constants.Conventions.Media.Bytes, "100")
-                    .WithKeyValue(Constants.Conventions.Media.Extension, "png")
-                    .Done()
-                .Build();
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        int? IWithCreatorIdBuilder.CreatorId
-        {
-            get => _creatorId;
-            set => _creatorId = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        bool? IWithTrashedBuilder.Trashed
-        {
-            get => _trashed;
-            set => _trashed = value;
-        }
-
-        int? IWithLevelBuilder.Level
-        {
-            get => _level;
-            set => _level = value;
-        }
-
-        string IWithPathBuilder.Path
-        {
-            get => _path;
-            set => _path = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        int? IWithParentIdBuilder.ParentId
-        {
-            get => _parentId;
-            set => _parentId = value;
-        }
-
-        object IWithPropertyValues.PropertyValues
-        {
-            get => _propertyValues;
-            set => _propertyValues = value;
-        }
-
-        string IWithPropertyValues.PropertyValuesCulture
-        {
-            get => _propertyValuesCulture;
-            set => _propertyValuesCulture = value;
-        }
-
-        string IWithPropertyValues.PropertyValuesSegment
-        {
-            get => _propertyValuesSegment;
-            set => _propertyValuesSegment = value;
-        }
+        get => _createDate;
+        set => _createDate = value;
     }
+
+    int? IWithCreatorIdBuilder.CreatorId
+    {
+        get => _creatorId;
+        set => _creatorId = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    int? IWithLevelBuilder.Level
+    {
+        get => _level;
+        set => _level = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    int? IWithParentIdBuilder.ParentId
+    {
+        get => _parentId;
+        set => _parentId = value;
+    }
+
+    string IWithPathBuilder.Path
+    {
+        get => _path;
+        set => _path = value;
+    }
+
+    object IWithPropertyValues.PropertyValues
+    {
+        get => _propertyValues;
+        set => _propertyValues = value;
+    }
+
+    string IWithPropertyValues.PropertyValuesCulture
+    {
+        get => _propertyValuesCulture;
+        set => _propertyValuesCulture = value;
+    }
+
+    string IWithPropertyValues.PropertyValuesSegment
+    {
+        get => _propertyValuesSegment;
+        set => _propertyValuesSegment = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    bool? IWithTrashedBuilder.Trashed
+    {
+        get => _trashed;
+        set => _trashed = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public MediaTypeBuilder AddMediaType()
+    {
+        _mediaType = null;
+        var builder = new MediaTypeBuilder(this);
+        _mediaTypeBuilder = builder;
+        return builder;
+    }
+
+    public MediaBuilder WithMediaType(IMediaType mediaType)
+    {
+        _mediaTypeBuilder = null;
+        _mediaType = mediaType;
+
+        return this;
+    }
+
+    public GenericDictionaryBuilder<MediaBuilder, string, object> AddPropertyData()
+    {
+        var builder = new GenericDictionaryBuilder<MediaBuilder, string, object>(this);
+        _propertyDataBuilder = builder;
+        return builder;
+    }
+
+    public override Media Build()
+    {
+        var id = _id ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var parentId = _parentId ?? -1;
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var creatorId = _creatorId ?? 0;
+        var level = _level ?? 1;
+        var path = _path ?? $"-1,{id}";
+        var sortOrder = _sortOrder ?? 0;
+        var trashed = _trashed ?? false;
+        var propertyValues = _propertyValues;
+        var propertyValuesCulture = _propertyValuesCulture;
+        var propertyValuesSegment = _propertyValuesSegment;
+
+        if (_mediaTypeBuilder is null && _mediaType is null)
+        {
+            throw new InvalidOperationException(
+                "A media item cannot be constructed without providing a media type. Use AddMediaType() or WithMediaType().");
+        }
+
+        var mediaType = _mediaType ?? _mediaTypeBuilder.Build();
+
+        var media = new Media(name, parentId, mediaType)
+        {
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            CreatorId = creatorId,
+            Level = level,
+            Path = path,
+            SortOrder = sortOrder,
+            Trashed = trashed
+        };
+
+        if (_propertyDataBuilder != null || propertyValues != null)
+        {
+            if (_propertyDataBuilder != null)
+            {
+                var propertyData = _propertyDataBuilder.Build();
+                foreach (var keyValuePair in propertyData)
+                {
+                    media.SetValue(keyValuePair.Key, keyValuePair.Value);
+                }
+            }
+            else
+            {
+                media.PropertyValues(propertyValues, propertyValuesCulture, propertyValuesSegment);
+            }
+
+            media.ResetDirtyProperties(false);
+        }
+
+        return media;
+    }
+
+    public static Media CreateSimpleMedia(IMediaType mediaType, string name, int parentId, int id = 0) =>
+        new MediaBuilder()
+            .WithId(id)
+            .WithName(name)
+            .WithMediaType(mediaType)
+            .WithParentId(parentId)
+            .WithPropertyValues(new { title = name + " Subpage", bodyText = "This is a subpage", author = "John Doe" })
+            .Build();
+
+    public static Media CreateMediaImage(IMediaType mediaType, int parentId) =>
+        CreateMediaImage(mediaType, parentId, "/media/test-image.png");
+
+    public static Media CreateMediaImageWithCrop(IMediaType mediaType, int parentId) =>
+        CreateMediaImage(mediaType, parentId, "{src: '/media/test-image.png', crops: []}");
+
+    private static Media CreateMediaImage(IMediaType mediaType, int parentId, string fileValue) => new MediaBuilder()
+        .WithMediaType(mediaType)
+        .WithName("Test Image")
+        .WithParentId(parentId)
+        .AddPropertyData()
+        .WithKeyValue(Constants.Conventions.Media.File, fileValue)
+        .WithKeyValue(Constants.Conventions.Media.Width, "200")
+        .WithKeyValue(Constants.Conventions.Media.Height, "200")
+        .WithKeyValue(Constants.Conventions.Media.Bytes, "100")
+        .WithKeyValue(Constants.Conventions.Media.Extension, "png")
+        .Done()
+        .Build();
+
+    public static Media CreateMediaFolder(IMediaType mediaType, int parentId) => new MediaBuilder()
+        .WithMediaType(mediaType)
+        .WithName("Test Folder")
+        .WithParentId(parentId)
+        .Build();
+
+    public static Media CreateMediaFile(IMediaType mediaType, int parentId) => new MediaBuilder()
+        .WithMediaType(mediaType)
+        .WithName("Test File")
+        .WithParentId(parentId)
+        .AddPropertyData()
+        .WithKeyValue(Constants.Conventions.Media.File, "/media/test-file.txt")
+        .WithKeyValue(Constants.Conventions.Media.Bytes, "100")
+        .WithKeyValue(Constants.Conventions.Media.Extension, "png")
+        .Done()
+        .Build();
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs
index a9d424ba8c..7b5d4a97dc 100644
--- a/tests/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/MediaTypeBuilder.cs
@@ -8,280 +8,282 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class MediaTypeBuilder
+    : ContentTypeBaseBuilder<MediaBuilder, IMediaType>,
+        IWithPropertyTypeIdsIncrementingFrom
 {
-    public class MediaTypeBuilder
-        : ContentTypeBaseBuilder<MediaBuilder, IMediaType>,
-            IWithPropertyTypeIdsIncrementingFrom
+    private readonly List<PropertyGroupBuilder<MediaTypeBuilder>> _propertyGroupBuilders = new();
+    private int? _propertyTypeIdsIncrementingFrom;
+
+    public MediaTypeBuilder()
+        : base(null)
     {
-        private readonly List<PropertyGroupBuilder<MediaTypeBuilder>> _propertyGroupBuilders = new List<PropertyGroupBuilder<MediaTypeBuilder>>();
-        private int? _propertyTypeIdsIncrementingFrom;
+    }
 
-        public MediaTypeBuilder()
-            : base(null)
+    public MediaTypeBuilder(MediaBuilder parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    int? IWithPropertyTypeIdsIncrementingFrom.PropertyTypeIdsIncrementingFrom
+    {
+        get => _propertyTypeIdsIncrementingFrom;
+        set => _propertyTypeIdsIncrementingFrom = value;
+    }
+
+    public MediaTypeBuilder WithMediaPropertyGroup()
+    {
+        var builder = new PropertyGroupBuilder<MediaTypeBuilder>(this)
+            .WithId(99)
+            .WithName("Media")
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.UploadField)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithAlias(Constants.Conventions.Media.File)
+            .WithName("File")
+            .WithSortOrder(1)
+            .WithDataTypeId(-90)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithAlias(Constants.Conventions.Media.Width)
+            .WithName("Width")
+            .WithSortOrder(2)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithAlias(Constants.Conventions.Media.Height)
+            .WithName("Height")
+            .WithSortOrder(3)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithAlias(Constants.Conventions.Media.Bytes)
+            .WithName("Bytes")
+            .WithSortOrder(4)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithAlias(Constants.Conventions.Media.Extension)
+            .WithName("File Extension")
+            .WithSortOrder(5)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done();
+        _propertyGroupBuilders.Add(builder);
+        return this;
+    }
+
+    public PropertyGroupBuilder<MediaTypeBuilder> AddPropertyGroup()
+    {
+        var builder = new PropertyGroupBuilder<MediaTypeBuilder>(this);
+        _propertyGroupBuilders.Add(builder);
+        return builder;
+    }
+
+    public override IMediaType Build()
+    {
+        MediaType mediaType;
+        var parent = GetParent();
+        if (parent != null)
         {
+            mediaType = new MediaType(ShortStringHelper, (IMediaType)parent, GetAlias());
+        }
+        else
+        {
+            mediaType = new MediaType(ShortStringHelper, GetParentId()) { Alias = GetAlias() };
         }
 
-        public MediaTypeBuilder(MediaBuilder parentBuilder)
-            : base(parentBuilder)
-        {
-        }
+        mediaType.Id = GetId();
+        mediaType.Key = GetKey();
+        mediaType.CreateDate = GetCreateDate();
+        mediaType.UpdateDate = GetUpdateDate();
+        mediaType.Alias = GetAlias();
+        mediaType.Name = GetName();
+        mediaType.Level = GetLevel();
+        mediaType.Path = GetPath();
+        mediaType.SortOrder = GetSortOrder();
+        mediaType.Description = GetDescription();
+        mediaType.Icon = GetIcon();
+        mediaType.Thumbnail = GetThumbnail();
+        mediaType.CreatorId = GetCreatorId();
+        mediaType.Trashed = GetTrashed();
+        mediaType.IsContainer = GetIsContainer();
 
-        public MediaTypeBuilder WithMediaPropertyGroup()
-        {
-            PropertyGroupBuilder<MediaTypeBuilder> builder = new PropertyGroupBuilder<MediaTypeBuilder>(this)
-                .WithId(99)
-                .WithName("Media")
-                .WithSortOrder(1)
-                .AddPropertyType()
-                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.UploadField)
-                    .WithValueStorageType(ValueStorageType.Nvarchar)
-                    .WithAlias(Constants.Conventions.Media.File)
-                    .WithName("File")
-                    .WithSortOrder(1)
-                    .WithDataTypeId(-90)
-                    .Done()
-                .AddPropertyType()
-                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                    .WithValueStorageType(ValueStorageType.Integer)
-                    .WithAlias(Constants.Conventions.Media.Width)
-                    .WithName("Width")
-                    .WithSortOrder(2)
-                    .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                    .Done()
-                .AddPropertyType()
-                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                    .WithValueStorageType(ValueStorageType.Integer)
-                    .WithAlias(Constants.Conventions.Media.Height)
-                    .WithName("Height")
-                    .WithSortOrder(3)
-                    .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                    .Done()
-                .AddPropertyType()
-                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                    .WithValueStorageType(ValueStorageType.Integer)
-                    .WithAlias(Constants.Conventions.Media.Bytes)
-                    .WithName("Bytes")
-                    .WithSortOrder(4)
-                    .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                    .Done()
-                .AddPropertyType()
-                    .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                    .WithValueStorageType(ValueStorageType.Nvarchar)
-                    .WithAlias(Constants.Conventions.Media.Extension)
-                    .WithName("File Extension")
-                    .WithSortOrder(5)
-                    .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                    .Done();
-            _propertyGroupBuilders.Add(builder);
-            return this;
-        }
+        BuildPropertyGroups(mediaType, _propertyGroupBuilders.Select(x => x.Build()));
+        BuildPropertyTypeIds(mediaType, _propertyTypeIdsIncrementingFrom);
 
-        public PropertyGroupBuilder<MediaTypeBuilder> AddPropertyGroup()
-        {
-            var builder = new PropertyGroupBuilder<MediaTypeBuilder>(this);
-            _propertyGroupBuilders.Add(builder);
-            return builder;
-        }
+        mediaType.ResetDirtyProperties(false);
 
-        public override IMediaType Build()
-        {
-            MediaType mediaType;
-            IContentTypeComposition parent = GetParent();
-            if (parent != null)
-            {
-                mediaType = new MediaType(ShortStringHelper, (IMediaType)parent, GetAlias());
-            }
-            else
-            {
-                mediaType = new MediaType(ShortStringHelper, GetParentId())
-                {
-                    Alias = GetAlias(),
-                };
-            }
+        return mediaType;
+    }
 
-            mediaType.Id = GetId();
-            mediaType.Key = GetKey();
-            mediaType.CreateDate = GetCreateDate();
-            mediaType.UpdateDate = GetUpdateDate();
-            mediaType.Alias = GetAlias();
-            mediaType.Name = GetName();
-            mediaType.Level = GetLevel();
-            mediaType.Path = GetPath();
-            mediaType.SortOrder = GetSortOrder();
-            mediaType.Description = GetDescription();
-            mediaType.Icon = GetIcon();
-            mediaType.Thumbnail = GetThumbnail();
-            mediaType.CreatorId = GetCreatorId();
-            mediaType.Trashed = GetTrashed();
-            mediaType.IsContainer = GetIsContainer();
+    public static MediaType CreateSimpleMediaType(
+        string alias,
+        string name,
+        IMediaType parent = null,
+        bool randomizeAliases = false,
+        string propertyGroupAlias = "content",
+        string propertyGroupName = "Content")
+    {
+        var builder = new MediaTypeBuilder();
+        var mediaType = builder
+            .WithAlias(alias)
+            .WithName(name)
+            .WithParentContentType(parent)
+            .AddPropertyGroup()
+            .WithAlias(propertyGroupAlias)
+            .WithName(propertyGroupName)
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias(RandomAlias("title", randomizeAliases))
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias(RandomAlias("bodyText", randomizeAliases))
+            .WithName("Body text")
+            .WithSortOrder(2)
+            .WithDataTypeId(-87)
+            .Done()
+            .AddPropertyType()
+            .WithAlias(RandomAlias("author", randomizeAliases))
+            .WithName("Author")
+            .WithSortOrder(3)
+            .Done()
+            .Done()
+            .Build();
 
-            BuildPropertyGroups(mediaType, _propertyGroupBuilders.Select(x => x.Build()));
-            BuildPropertyTypeIds(mediaType, _propertyTypeIdsIncrementingFrom);
+        // Ensure that nothing is marked as dirty
+        mediaType.ResetDirtyProperties(false);
 
-            mediaType.ResetDirtyProperties(false);
+        return (MediaType)mediaType;
+    }
 
-            return mediaType;
-        }
+    public static MediaType CreateImageMediaType(string alias = Constants.Conventions.MediaTypes.Image) =>
+        CreateImageMediaType(alias ?? "Image", Constants.PropertyEditors.Aliases.UploadField, -90);
 
-        public static MediaType CreateSimpleMediaType(string alias, string name, IMediaType parent = null, bool randomizeAliases = false, string propertyGroupAlias = "content", string propertyGroupName = "Content")
-        {
-            var builder = new MediaTypeBuilder();
-            IMediaType mediaType = builder
-                .WithAlias(alias)
-                .WithName(name)
-                .WithParentContentType(parent)
-                .AddPropertyGroup()
-                    .WithAlias(propertyGroupAlias)
-                    .WithName(propertyGroupName)
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithAlias(RandomAlias("title", randomizeAliases))
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TinyMce)
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithAlias(RandomAlias("bodyText", randomizeAliases))
-                        .WithName("Body text")
-                        .WithSortOrder(2)
-                        .WithDataTypeId(-87)
-                        .Done()
-                    .AddPropertyType()
-                        .WithAlias(RandomAlias("author", randomizeAliases))
-                        .WithName("Author")
-                        .WithSortOrder(3)
-                        .Done()
-                    .Done()
-                .Build();
+    public static MediaType CreateImageMediaTypeWithCrop(string alias = Constants.Conventions.MediaTypes.Image) =>
+        CreateImageMediaType(alias ?? "Image", Constants.PropertyEditors.Aliases.ImageCropper, 1043);
 
-            // Ensure that nothing is marked as dirty
-            mediaType.ResetDirtyProperties(false);
+    private static MediaType CreateImageMediaType(string alias, string imageFieldPropertyEditorAlias, int imageFieldDataTypeId)
+    {
+        var builder = new MediaTypeBuilder();
+        var mediaType = builder
+            .WithAlias(alias)
+            .WithName("Image")
+            .AddPropertyGroup()
+            .WithName("Media")
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithPropertyEditorAlias(imageFieldPropertyEditorAlias)
+            .WithAlias(Constants.Conventions.Media.File)
+            .WithName("File")
+            .WithSortOrder(1)
+            .WithDataTypeId(imageFieldDataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithAlias(Constants.Conventions.Media.Width)
+            .WithName("Width")
+            .WithSortOrder(2)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithAlias(Constants.Conventions.Media.Height)
+            .WithName("Height")
+            .WithSortOrder(3)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithAlias(Constants.Conventions.Media.Bytes)
+            .WithName("Bytes")
+            .WithSortOrder(4)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithAlias(Constants.Conventions.Media.Extension)
+            .WithName("File Extension")
+            .WithSortOrder(5)
+            .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
+            .Done()
+            .Done()
+            .Build();
 
-            return (MediaType)mediaType;
-        }
+        // Ensure that nothing is marked as dirty
+        mediaType.ResetDirtyProperties(false);
 
-        public static MediaType CreateImageMediaType(string alias = Constants.Conventions.MediaTypes.Image) =>
-            CreateImageMediaType(alias ?? "Image", Constants.PropertyEditors.Aliases.UploadField, -90);
+        return (MediaType)mediaType;
+    }
 
-        public static MediaType CreateImageMediaTypeWithCrop(string alias = Constants.Conventions.MediaTypes.Image) =>
-            CreateImageMediaType(alias ?? "Image", Constants.PropertyEditors.Aliases.ImageCropper, 1043);
+    public static MediaType CreateVideoMediaType()
+    {
+        var builder = new MediaTypeBuilder();
+        var mediaType = builder
+            .WithAlias("video")
+            .WithName("Video")
+            .AddPropertyGroup()
+            .WithName("Media")
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("videoFile")
+            .WithName("Video file")
+            .WithSortOrder(1)
+            .Done()
+            .Done()
+            .Build();
 
-        private static MediaType CreateImageMediaType(string alias, string imageFieldPropertyEditorAlias, int imageFieldDataTypeId)
-        {
-            var builder = new MediaTypeBuilder();
-            IMediaType mediaType = builder
-                .WithAlias(alias)
-                .WithName("Image")
-                .AddPropertyGroup()
-                    .WithName("Media")
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(imageFieldPropertyEditorAlias)
-                        .WithAlias(Constants.Conventions.Media.File)
-                        .WithName("File")
-                        .WithSortOrder(1)
-                        .WithDataTypeId(imageFieldDataTypeId)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                        .WithAlias(Constants.Conventions.Media.Width)
-                        .WithName("Width")
-                        .WithSortOrder(2)
-                        .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                        .WithAlias(Constants.Conventions.Media.Height)
-                        .WithName("Height")
-                        .WithSortOrder(3)
-                        .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                        .WithAlias(Constants.Conventions.Media.Bytes)
-                        .WithName("Bytes")
-                        .WithSortOrder(4)
-                        .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
-                        .WithAlias(Constants.Conventions.Media.Extension)
-                        .WithName("File Extension")
-                        .WithSortOrder(5)
-                        .WithDataTypeId(Constants.System.DefaultLabelDataTypeId)
-                        .Done()
-                    .Done()
-                .Build();
+        // Ensure that nothing is marked as dirty
+        mediaType.ResetDirtyProperties(false);
 
-            // Ensure that nothing is marked as dirty
-            mediaType.ResetDirtyProperties(false);
+        return (MediaType)mediaType;
+    }
 
-            return (MediaType)mediaType;
-        }
+    public static MediaType CreateNewMediaType()
+    {
+        var builder = new MediaTypeBuilder();
+        var mediaType = builder
+            .WithAlias("newMediaType")
+            .WithName("New Media Type")
+            .AddPropertyGroup()
+            .WithAlias("media")
+            .WithName("Media")
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("videoFile")
+            .WithName("Video file")
+            .WithSortOrder(1)
+            .Done()
+            .Done()
+            .Build();
 
-        public static MediaType CreateVideoMediaType()
-        {
-            var builder = new MediaTypeBuilder();
-            IMediaType mediaType = builder
-                .WithAlias("video")
-                .WithName("Video")
-                .AddPropertyGroup()
-                    .WithName("Media")
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithAlias("title")
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithAlias("videoFile")
-                        .WithName("Video file")
-                        .WithSortOrder(1)
-                        .Done()
-                    .Done()
-                .Build();
+        // Ensure that nothing is marked as dirty
+        mediaType.ResetDirtyProperties(false);
 
-            // Ensure that nothing is marked as dirty
-            mediaType.ResetDirtyProperties(false);
-
-            return (MediaType)mediaType;
-        }
-
-        int? IWithPropertyTypeIdsIncrementingFrom.PropertyTypeIdsIncrementingFrom
-        {
-            get => _propertyTypeIdsIncrementingFrom;
-            set => _propertyTypeIdsIncrementingFrom = value;
-        }
-
-        public static MediaType CreateNewMediaType()
-        {
-            var builder = new MediaTypeBuilder();
-            IMediaType mediaType = builder
-                .WithAlias("newMediaType")
-                .WithName("New Media Type")
-                .AddPropertyGroup()
-                    .WithAlias("media")
-                    .WithName("Media")
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithAlias("title")
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                    .Done()
-                    .AddPropertyType()
-                        .WithAlias("videoFile")
-                        .WithName("Video file")
-                        .WithSortOrder(1)
-                    .Done()
-                .Done()
-                .Build();
-
-            // Ensure that nothing is marked as dirty
-            mediaType.ResetDirtyProperties(false);
-
-            return (MediaType)mediaType;
-        }
+        return (MediaType)mediaType;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/MemberBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MemberBuilder.cs
index c192b4cc07..11b35ccad4 100644
--- a/tests/Umbraco.Tests.Common/Builders/MemberBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/MemberBuilder.cs
@@ -7,378 +7,378 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class MemberBuilder
+    : BuilderBase<Member>,
+        IBuildContentTypes,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreatorIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithNameBuilder,
+        IWithTrashedBuilder,
+        IWithLevelBuilder,
+        IWithPathBuilder,
+        IWithSortOrderBuilder,
+        IAccountBuilder
 {
-    public class MemberBuilder
-        : BuilderBase<Member>,
-            IBuildContentTypes,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreatorIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithNameBuilder,
-            IWithTrashedBuilder,
-            IWithLevelBuilder,
-            IWithPathBuilder,
-            IWithSortOrderBuilder,
-            IAccountBuilder
+    private GenericDictionaryBuilder<MemberBuilder, string, object> _additionalDataBuilder;
+    private DateTime? _createDate;
+    private int? _creatorId;
+    private string _email;
+    private int? _failedPasswordAttempts;
+
+    private int? _id;
+    private bool? _isApproved;
+    private bool? _isLockedOut;
+    private Guid? _key;
+    private DateTime? _lastLockoutDate;
+    private DateTime? _lastLoginDate;
+    private DateTime? _lastPasswordChangeDate;
+    private int? _level;
+    private GenericCollectionBuilder<MemberBuilder, string> _memberGroupsBuilder;
+    private IMemberType _memberType;
+    private MemberTypeBuilder _memberTypeBuilder;
+    private string _name;
+    private string _passwordConfig;
+    private string _path;
+    private GenericDictionaryBuilder<MemberBuilder, string, object> _propertyDataBuilder;
+    private int? _propertyIdsIncrementingFrom;
+    private string _rawPasswordValue;
+    private int? _sortOrder;
+    private bool? _trashed;
+    private DateTime? _updateDate;
+    private string _username;
+
+    string IWithLoginBuilder.Username
     {
-        private MemberTypeBuilder _memberTypeBuilder;
-        private GenericCollectionBuilder<MemberBuilder, string> _memberGroupsBuilder;
-        private GenericDictionaryBuilder<MemberBuilder, string, object> _additionalDataBuilder;
-        private GenericDictionaryBuilder<MemberBuilder, string, object> _propertyDataBuilder;
+        get => _username;
+        set => _username = value;
+    }
 
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _name;
-        private int? _creatorId;
-        private int? _level;
-        private string _path;
-        private string _username;
-        private string _rawPasswordValue;
-        private string _passwordConfig;
-        private string _email;
-        private int? _failedPasswordAttempts;
-        private bool? _isApproved;
-        private bool? _isLockedOut;
-        private DateTime? _lastLockoutDate;
-        private DateTime? _lastLoginDate;
-        private DateTime? _lastPasswordChangeDate;
-        private int? _sortOrder;
-        private bool? _trashed;
-        private int? _propertyIdsIncrementingFrom;
-        private IMemberType _memberType;
+    string IWithLoginBuilder.RawPasswordValue
+    {
+        get => _rawPasswordValue;
+        set => _rawPasswordValue = value;
+    }
 
-        public MemberBuilder WithPropertyIdsIncrementingFrom(int propertyIdsIncrementingFrom)
+    string IWithLoginBuilder.PasswordConfig
+    {
+        get => _passwordConfig;
+        set => _passwordConfig = value;
+    }
+
+    string IWithEmailBuilder.Email
+    {
+        get => _email;
+        set => _email = value;
+    }
+
+    int? IWithFailedPasswordAttemptsBuilder.FailedPasswordAttempts
+    {
+        get => _failedPasswordAttempts;
+        set => _failedPasswordAttempts = value;
+    }
+
+    bool? IWithIsApprovedBuilder.IsApproved
+    {
+        get => _isApproved;
+        set => _isApproved = value;
+    }
+
+    bool? IWithIsLockedOutBuilder.IsLockedOut
+    {
+        get => _isLockedOut;
+        set => _isLockedOut = value;
+    }
+
+    DateTime? IWithIsLockedOutBuilder.LastLockoutDate
+    {
+        get => _lastLockoutDate;
+        set => _lastLockoutDate = value;
+    }
+
+    DateTime? IWithLastLoginDateBuilder.LastLoginDate
+    {
+        get => _lastLoginDate;
+        set => _lastLoginDate = value;
+    }
+
+    DateTime? IWithLastPasswordChangeDateBuilder.LastPasswordChangeDate
+    {
+        get => _lastPasswordChangeDate;
+        set => _lastPasswordChangeDate = value;
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    int? IWithCreatorIdBuilder.CreatorId
+    {
+        get => _creatorId;
+        set => _creatorId = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    int? IWithLevelBuilder.Level
+    {
+        get => _level;
+        set => _level = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    string IWithPathBuilder.Path
+    {
+        get => _path;
+        set => _path = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    bool? IWithTrashedBuilder.Trashed
+    {
+        get => _trashed;
+        set => _trashed = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public MemberBuilder WithPropertyIdsIncrementingFrom(int propertyIdsIncrementingFrom)
+    {
+        _propertyIdsIncrementingFrom = propertyIdsIncrementingFrom;
+        return this;
+    }
+
+    public MemberTypeBuilder AddMemberType()
+    {
+        _memberType = null;
+        var builder = new MemberTypeBuilder(this);
+        _memberTypeBuilder = builder;
+        return builder;
+    }
+
+    public MemberBuilder WithMemberType(IMemberType memberType)
+    {
+        _memberTypeBuilder = null;
+        _memberType = memberType;
+
+        return this;
+    }
+
+    public GenericCollectionBuilder<MemberBuilder, string> AddMemberGroups()
+    {
+        var builder = new GenericCollectionBuilder<MemberBuilder, string>(this);
+        _memberGroupsBuilder = builder;
+        return builder;
+    }
+
+    public GenericDictionaryBuilder<MemberBuilder, string, object> AddAdditionalData()
+    {
+        var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
+        _additionalDataBuilder = builder;
+        return builder;
+    }
+
+    public GenericDictionaryBuilder<MemberBuilder, string, object> AddPropertyData()
+    {
+        var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
+        _propertyDataBuilder = builder;
+        return builder;
+    }
+
+    public override Member Build()
+    {
+        var id = _id ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var creatorId = _creatorId ?? 0;
+        var level = _level ?? 1;
+        var path = _path ?? $"-1,{id}";
+        var sortOrder = _sortOrder ?? 0;
+        var trashed = _trashed ?? false;
+        var username = _username ?? string.Empty;
+        var email = _email ?? string.Empty;
+        var rawPasswordValue = _rawPasswordValue ?? string.Empty;
+        var failedPasswordAttempts = _failedPasswordAttempts ?? 0;
+        var isApproved = _isApproved ?? false;
+        var isLockedOut = _isLockedOut ?? false;
+        var lastLockoutDate = _lastLockoutDate ?? DateTime.Now;
+        var lastLoginDate = _lastLoginDate ?? DateTime.Now;
+        var lastPasswordChangeDate = _lastPasswordChangeDate ?? DateTime.Now;
+        var passwordConfig = _passwordConfig ?? "{\"hashAlgorithm\":\"PBKDF2.ASPNETCORE.V3\"}";
+
+        if (_memberTypeBuilder is null && _memberType is null)
         {
-            _propertyIdsIncrementingFrom = propertyIdsIncrementingFrom;
-            return this;
+            throw new InvalidOperationException(
+                "A member cannot be constructed without providing a member type. Use AddMemberType() or WithMemberType().");
         }
 
-        public MemberTypeBuilder AddMemberType()
+        var memberType = _memberType ?? _memberTypeBuilder.Build();
+
+        var member = new Member(name, email, username, rawPasswordValue, memberType)
         {
-            _memberType = null;
-            var builder = new MemberTypeBuilder(this);
-            _memberTypeBuilder = builder;
-            return builder;
-        }
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            CreatorId = creatorId,
+            Level = level,
+            Path = path,
+            SortOrder = sortOrder,
+            Trashed = trashed,
+            PasswordConfiguration = passwordConfig
+        };
 
-        public MemberBuilder WithMemberType(IMemberType memberType)
+        if (_propertyIdsIncrementingFrom.HasValue)
         {
-            _memberTypeBuilder = null;
-            _memberType = memberType;
-
-            return this;
-        }
-
-        public GenericCollectionBuilder<MemberBuilder, string> AddMemberGroups()
-        {
-            var builder = new GenericCollectionBuilder<MemberBuilder, string>(this);
-            _memberGroupsBuilder = builder;
-            return builder;
-        }
-
-        public GenericDictionaryBuilder<MemberBuilder, string, object> AddAdditionalData()
-        {
-            var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
-            _additionalDataBuilder = builder;
-            return builder;
-        }
-
-        public GenericDictionaryBuilder<MemberBuilder, string, object> AddPropertyData()
-        {
-            var builder = new GenericDictionaryBuilder<MemberBuilder, string, object>(this);
-            _propertyDataBuilder = builder;
-            return builder;
-        }
-
-        public override Member Build()
-        {
-            var id = _id ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var creatorId = _creatorId ?? 0;
-            var level = _level ?? 1;
-            var path = _path ?? $"-1,{id}";
-            var sortOrder = _sortOrder ?? 0;
-            var trashed = _trashed ?? false;
-            var username = _username ?? string.Empty;
-            var email = _email ?? string.Empty;
-            var rawPasswordValue = _rawPasswordValue ?? string.Empty;
-            var failedPasswordAttempts = _failedPasswordAttempts ?? 0;
-            var isApproved = _isApproved ?? false;
-            var isLockedOut = _isLockedOut ?? false;
-            DateTime lastLockoutDate = _lastLockoutDate ?? DateTime.Now;
-            DateTime lastLoginDate = _lastLoginDate ?? DateTime.Now;
-            DateTime lastPasswordChangeDate = _lastPasswordChangeDate ?? DateTime.Now;
-            var passwordConfig = _passwordConfig ?? "{\"hashAlgorithm\":\"PBKDF2.ASPNETCORE.V3\"}";
-
-            if (_memberTypeBuilder is null && _memberType is null)
+            var i = _propertyIdsIncrementingFrom.Value;
+            foreach (var property in member.Properties)
             {
-                throw new InvalidOperationException("A member cannot be constructed without providing a member type. Use AddMemberType() or WithMemberType().");
+                property.Id = ++i;
+            }
+        }
+
+        member.FailedPasswordAttempts = failedPasswordAttempts;
+        member.IsApproved = isApproved;
+        member.IsLockedOut = isLockedOut;
+        member.LastLockoutDate = lastLockoutDate;
+        member.LastLoginDate = lastLoginDate;
+        member.LastPasswordChangeDate = lastPasswordChangeDate;
+
+        if (_memberGroupsBuilder != null)
+        {
+            member.Groups = _memberGroupsBuilder.Build();
+        }
+
+        if (_additionalDataBuilder != null)
+        {
+            var additionalData = _additionalDataBuilder.Build();
+            foreach (var kvp in additionalData)
+            {
+                member.AdditionalData.Add(kvp.Key, kvp.Value);
+            }
+        }
+
+        if (_propertyDataBuilder != null)
+        {
+            var propertyData = _propertyDataBuilder.Build();
+            foreach (var kvp in propertyData)
+            {
+                member.SetValue(kvp.Key, kvp.Value);
             }
 
-            IMemberType memberType = _memberType ?? _memberTypeBuilder.Build();
-
-            var member = new Member(name, email, username, rawPasswordValue, memberType)
-            {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                CreatorId = creatorId,
-                Level = level,
-                Path = path,
-                SortOrder = sortOrder,
-                Trashed = trashed,
-                PasswordConfiguration = passwordConfig
-            };
-
-            if (_propertyIdsIncrementingFrom.HasValue)
-            {
-                var i = _propertyIdsIncrementingFrom.Value;
-                foreach (IProperty property in member.Properties)
-                {
-                    property.Id = ++i;
-                }
-            }
-
-            member.FailedPasswordAttempts = failedPasswordAttempts;
-            member.IsApproved = isApproved;
-            member.IsLockedOut = isLockedOut;
-            member.LastLockoutDate = lastLockoutDate;
-            member.LastLoginDate = lastLoginDate;
-            member.LastPasswordChangeDate = lastPasswordChangeDate;
-
-            if (_memberGroupsBuilder != null)
-            {
-                member.Groups = _memberGroupsBuilder.Build();
-            }
-
-            if (_additionalDataBuilder != null)
-            {
-                IDictionary<string, object> additionalData = _additionalDataBuilder.Build();
-                foreach (KeyValuePair<string, object> kvp in additionalData)
-                {
-                    member.AdditionalData.Add(kvp.Key, kvp.Value);
-                }
-            }
-
-            if (_propertyDataBuilder != null)
-            {
-                IDictionary<string, object> propertyData = _propertyDataBuilder.Build();
-                foreach (KeyValuePair<string, object> kvp in propertyData)
-                {
-                    member.SetValue(kvp.Key, kvp.Value);
-                }
-
-                member.ResetDirtyProperties(false);
-            }
-
-            return member;
+            member.ResetDirtyProperties(false);
         }
 
-        public static IEnumerable<IMember> CreateSimpleMembers(IMemberType memberType, int amount)
+        return member;
+    }
+
+    public static IEnumerable<IMember> CreateSimpleMembers(IMemberType memberType, int amount)
+    {
+        var list = new List<IMember>();
+
+        for (var i = 0; i < amount; i++)
         {
-            var list = new List<IMember>();
+            var name = "Member No-" + i;
 
-            for (int i = 0; i < amount; i++)
-            {
-                var name = "Member No-" + i;
-
-                MemberBuilder builder = new MemberBuilder()
-                    .WithMemberType(memberType)
-                    .WithName(name)
-                    .WithEmail("test" + i + "@test.com")
-                    .WithLogin("test" + i, "test" + i);
-
-                builder = builder
-                    .AddPropertyData()
-                    .WithKeyValue("title", name + " member" + i)
-                    .WithKeyValue("bodyText", "This is a subpage" + i)
-                    .WithKeyValue("author", "John Doe" + i)
-                    .Done();
-
-                list.Add(builder.Build());
-            }
-
-            return list;
-        }
-
-        public static Member CreateSimpleMember(IMemberType memberType, string name, string email, string password, string username, Guid? key = null)
-        {
-            MemberBuilder builder = new MemberBuilder()
+            var builder = new MemberBuilder()
                 .WithMemberType(memberType)
                 .WithName(name)
-                .WithEmail(email)
-                .WithIsApproved(true)
-                .WithLogin(username, password);
-
-            if (key.HasValue)
-            {
-                builder = builder.WithKey(key.Value);
-            }
+                .WithEmail("test" + i + "@test.com")
+                .WithLogin("test" + i, "test" + i);
 
             builder = builder
                 .AddPropertyData()
-                    .WithKeyValue("title", name + " member")
-                    .WithKeyValue("bodyText", "Member profile")
-                    .WithKeyValue("author", "John Doe")
-                    .Done();
+                .WithKeyValue("title", name + " member" + i)
+                .WithKeyValue("bodyText", "This is a subpage" + i)
+                .WithKeyValue("author", "John Doe" + i)
+                .Done();
 
-            return builder.Build();
+            list.Add(builder.Build());
         }
 
-        public static IEnumerable<IMember> CreateMultipleSimpleMembers(IMemberType memberType, int amount, Action<int, IMember> onCreating = null)
+        return list;
+    }
+
+    public static Member CreateSimpleMember(IMemberType memberType, string name, string email, string password, string username, Guid? key = null)
+    {
+        var builder = new MemberBuilder()
+            .WithMemberType(memberType)
+            .WithName(name)
+            .WithEmail(email)
+            .WithIsApproved(true)
+            .WithLogin(username, password);
+
+        if (key.HasValue)
         {
-            var list = new List<IMember>();
-
-            for (var i = 0; i < amount; i++)
-            {
-                var name = "Member No-" + i;
-                Member member = new MemberBuilder()
-                    .WithMemberType(memberType)
-                    .WithName(name)
-                    .WithEmail("test" + i + "@test.com")
-                    .WithLogin("test" + i, "test" + i)
-                    .AddPropertyData()
-                        .WithKeyValue("title", name + " member" + i)
-                        .WithKeyValue("bodyText", "Member profile" + i)
-                        .WithKeyValue("author", "John Doe" + i)
-                        .Done()
-                    .Build();
-
-                onCreating?.Invoke(i, member);
-
-                list.Add(member);
-            }
-
-            return list;
+            builder = builder.WithKey(key.Value);
         }
 
-        int? IWithIdBuilder.Id
+        builder = builder
+            .AddPropertyData()
+            .WithKeyValue("title", name + " member")
+            .WithKeyValue("bodyText", "Member profile")
+            .WithKeyValue("author", "John Doe")
+            .Done();
+
+        return builder.Build();
+    }
+
+    public static IEnumerable<IMember> CreateMultipleSimpleMembers(IMemberType memberType, int amount, Action<int, IMember> onCreating = null)
+    {
+        var list = new List<IMember>();
+
+        for (var i = 0; i < amount; i++)
         {
-            get => _id;
-            set => _id = value;
+            var name = "Member No-" + i;
+            var member = new MemberBuilder()
+                .WithMemberType(memberType)
+                .WithName(name)
+                .WithEmail("test" + i + "@test.com")
+                .WithLogin("test" + i, "test" + i)
+                .AddPropertyData()
+                .WithKeyValue("title", name + " member" + i)
+                .WithKeyValue("bodyText", "Member profile" + i)
+                .WithKeyValue("author", "John Doe" + i)
+                .Done()
+                .Build();
+
+            onCreating?.Invoke(i, member);
+
+            list.Add(member);
         }
 
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        int? IWithCreatorIdBuilder.CreatorId
-        {
-            get => _creatorId;
-            set => _creatorId = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        bool? IWithTrashedBuilder.Trashed
-        {
-            get => _trashed;
-            set => _trashed = value;
-        }
-
-        int? IWithLevelBuilder.Level
-        {
-            get => _level;
-            set => _level = value;
-        }
-
-        string IWithPathBuilder.Path
-        {
-            get => _path;
-            set => _path = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        string IWithLoginBuilder.Username
-        {
-            get => _username;
-            set => _username = value;
-        }
-
-        string IWithLoginBuilder.RawPasswordValue
-        {
-            get => _rawPasswordValue;
-            set => _rawPasswordValue = value;
-        }
-
-        string IWithLoginBuilder.PasswordConfig
-        {
-            get => _passwordConfig;
-            set => _passwordConfig = value;
-        }
-
-        string IWithEmailBuilder.Email
-        {
-            get => _email;
-            set => _email = value;
-        }
-
-        int? IWithFailedPasswordAttemptsBuilder.FailedPasswordAttempts
-        {
-            get => _failedPasswordAttempts;
-            set => _failedPasswordAttempts = value;
-        }
-
-        bool? IWithIsApprovedBuilder.IsApproved
-        {
-            get => _isApproved;
-            set => _isApproved = value;
-        }
-
-        bool? IWithIsLockedOutBuilder.IsLockedOut
-        {
-            get => _isLockedOut;
-            set => _isLockedOut = value;
-        }
-
-        DateTime? IWithIsLockedOutBuilder.LastLockoutDate
-        {
-            get => _lastLockoutDate;
-            set => _lastLockoutDate = value;
-        }
-
-        DateTime? IWithLastLoginDateBuilder.LastLoginDate
-        {
-            get => _lastLoginDate;
-            set => _lastLoginDate = value;
-        }
-
-        DateTime? IWithLastPasswordChangeDateBuilder.LastPasswordChangeDate
-        {
-            get => _lastPasswordChangeDate;
-            set => _lastPasswordChangeDate = value;
-        }
+        return list;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
index 53fdaaad7a..4841acbe6a 100644
--- a/tests/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/MemberGroupBuilder.cs
@@ -2,102 +2,100 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class MemberGroupBuilder
+    : BuilderBase<MemberGroup>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreatorIdBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithNameBuilder
 {
-    public class MemberGroupBuilder
-        : BuilderBase<MemberGroup>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreatorIdBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithNameBuilder
+    private GenericDictionaryBuilder<MemberGroupBuilder, string, object> _additionalDataBuilder;
+    private DateTime? _createDate;
+    private int? _creatorId;
+
+    private int? _id;
+    private Guid? _key;
+    private string _name;
+    private DateTime? _updateDate;
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private GenericDictionaryBuilder<MemberGroupBuilder, string, object> _additionalDataBuilder;
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _name;
-        private int? _creatorId;
+    int? IWithCreatorIdBuilder.CreatorId
+    {
+        get => _creatorId;
+        set => _creatorId = value;
+    }
 
-        public GenericDictionaryBuilder<MemberGroupBuilder, string, object> AddAdditionalData()
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public GenericDictionaryBuilder<MemberGroupBuilder, string, object> AddAdditionalData()
+    {
+        var builder = new GenericDictionaryBuilder<MemberGroupBuilder, string, object>(this);
+        _additionalDataBuilder = builder;
+        return builder;
+    }
+
+    public override MemberGroup Build()
+    {
+        var id = _id ?? 1;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var creatorId = _creatorId ?? 1;
+
+        var memberGroup = new MemberGroup
         {
-            var builder = new GenericDictionaryBuilder<MemberGroupBuilder, string, object>(this);
-            _additionalDataBuilder = builder;
-            return builder;
-        }
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            Name = name,
+            CreatorId = creatorId
+        };
 
-        public override MemberGroup Build()
+        if (_additionalDataBuilder != null)
         {
-            var id = _id ?? 1;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var creatorId = _creatorId ?? 1;
-
-            var memberGroup = new MemberGroup
+            var additionalData = _additionalDataBuilder.Build();
+            foreach (var kvp in additionalData)
             {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                Name = name,
-                CreatorId = creatorId,
-            };
-
-            if (_additionalDataBuilder != null)
-            {
-                IDictionary<string, object> additionalData = _additionalDataBuilder.Build();
-                foreach (KeyValuePair<string, object> kvp in additionalData)
-                {
-                    memberGroup.AdditionalData.Add(kvp.Key, kvp.Value);
-                }
+                memberGroup.AdditionalData.Add(kvp.Key, kvp.Value);
             }
-
-            return memberGroup;
         }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        int? IWithCreatorIdBuilder.CreatorId
-        {
-            get => _creatorId;
-            set => _creatorId = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
+        return memberGroup;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
index 9cf092d6d4..817d0be203 100644
--- a/tests/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/MemberTypeBuilder.cs
@@ -3,143 +3,142 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class MemberTypeBuilder
+    : ContentTypeBaseBuilder<MemberBuilder, IMemberType>,
+        IWithPropertyTypeIdsIncrementingFrom
 {
-    public class MemberTypeBuilder
-        : ContentTypeBaseBuilder<MemberBuilder, IMemberType>,
-            IWithPropertyTypeIdsIncrementingFrom
+    private readonly Dictionary<string, bool> _memberCanEditProperties = new();
+    private readonly Dictionary<string, bool> _memberCanViewProperties = new();
+    private readonly List<PropertyGroupBuilder<MemberTypeBuilder>> _propertyGroupBuilders = new();
+    private int? _propertyTypeIdsIncrementingFrom;
+
+    public MemberTypeBuilder()
+        : base(null)
     {
-        private readonly List<PropertyGroupBuilder<MemberTypeBuilder>> _propertyGroupBuilders = new List<PropertyGroupBuilder<MemberTypeBuilder>>();
-        private readonly Dictionary<string, bool> _memberCanEditProperties = new Dictionary<string, bool>();
-        private readonly Dictionary<string, bool> _memberCanViewProperties = new Dictionary<string, bool>();
-        private int? _propertyTypeIdsIncrementingFrom;
+    }
 
-        public MemberTypeBuilder()
-            : base(null)
+    public MemberTypeBuilder(MemberBuilder parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    int? IWithPropertyTypeIdsIncrementingFrom.PropertyTypeIdsIncrementingFrom
+    {
+        get => _propertyTypeIdsIncrementingFrom;
+        set => _propertyTypeIdsIncrementingFrom = value;
+    }
+
+    public MemberTypeBuilder WithMembershipPropertyGroup()
+    {
+        var builder = new PropertyGroupBuilder<MemberTypeBuilder>(this)
+            .WithId(99)
+            .WithName(Constants.Conventions.Member.StandardPropertiesGroupName)
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias(Constants.Conventions.Member.Comments)
+            .WithName(Constants.Conventions.Member.CommentsLabel)
+            .Done();
+        _propertyGroupBuilders.Add(builder);
+        return this;
+    }
+
+    public MemberTypeBuilder WithMemberCanEditProperty(string alias, bool canEdit)
+    {
+        _memberCanEditProperties.Add(alias, canEdit);
+        return this;
+    }
+
+    public MemberTypeBuilder WithMemberCanViewProperty(string alias, bool canView)
+    {
+        _memberCanViewProperties.Add(alias, canView);
+        return this;
+    }
+
+    public PropertyGroupBuilder<MemberTypeBuilder> AddPropertyGroup()
+    {
+        var builder = new PropertyGroupBuilder<MemberTypeBuilder>(this);
+        _propertyGroupBuilders.Add(builder);
+        return builder;
+    }
+
+    public override IMemberType Build()
+    {
+        var memberType = new MemberType(ShortStringHelper, GetParentId())
         {
+            Id = GetId(),
+            Key = GetKey(),
+            CreateDate = GetCreateDate(),
+            UpdateDate = GetUpdateDate(),
+            Alias = GetAlias(),
+            Name = GetName(),
+            Level = GetLevel(),
+            Path = GetPath(),
+            SortOrder = GetSortOrder(),
+            Description = GetDescription(),
+            Icon = GetIcon(),
+            Thumbnail = GetThumbnail(),
+            CreatorId = GetCreatorId(),
+            Trashed = GetTrashed(),
+            IsContainer = GetIsContainer()
+        };
+
+        BuildPropertyGroups(memberType, _propertyGroupBuilders.Select(x => x.Build()));
+        BuildPropertyTypeIds(memberType, _propertyTypeIdsIncrementingFrom);
+
+        foreach (var kvp in _memberCanEditProperties)
+        {
+            memberType.SetMemberCanEditProperty(kvp.Key, kvp.Value);
         }
 
-        public MemberTypeBuilder(MemberBuilder parentBuilder)
-            : base(parentBuilder)
+        foreach (var kvp in _memberCanViewProperties)
         {
+            memberType.SetMemberCanViewProperty(kvp.Key, kvp.Value);
         }
 
-        public MemberTypeBuilder WithMembershipPropertyGroup()
-        {
-            PropertyGroupBuilder<MemberTypeBuilder> builder = new PropertyGroupBuilder<MemberTypeBuilder>(this)
-                .WithId(99)
-                .WithName(Constants.Conventions.Member.StandardPropertiesGroupName)
-                .AddPropertyType()
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextArea)
-                .WithValueStorageType(ValueStorageType.Ntext)
-                .WithAlias(Constants.Conventions.Member.Comments)
-                .WithName(Constants.Conventions.Member.CommentsLabel)
-                .Done();
-            _propertyGroupBuilders.Add(builder);
-            return this;
-        }
+        memberType.ResetDirtyProperties(false);
 
-        public MemberTypeBuilder WithMemberCanEditProperty(string alias, bool canEdit)
-        {
-            _memberCanEditProperties.Add(alias, canEdit);
-            return this;
-        }
+        return memberType;
+    }
 
-        public MemberTypeBuilder WithMemberCanViewProperty(string alias, bool canView)
-        {
-            _memberCanViewProperties.Add(alias, canView);
-            return this;
-        }
+    public static MemberType CreateSimpleMemberType(string alias = null, string name = null)
+    {
+        var builder = new MemberTypeBuilder();
+        var memberType = builder
+            .WithAlias(alias)
+            .WithName(name)
+            .AddPropertyGroup()
+            .WithName("Content")
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("bodyText")
+            .WithName("Body text")
+            .WithSortOrder(2)
+            .WithDataTypeId(-87)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("author")
+            .WithName("Author")
+            .WithSortOrder(3)
+            .Done()
+            .Done()
+            .Build();
 
-        public PropertyGroupBuilder<MemberTypeBuilder> AddPropertyGroup()
-        {
-            var builder = new PropertyGroupBuilder<MemberTypeBuilder>(this);
-            _propertyGroupBuilders.Add(builder);
-            return builder;
-        }
+        // Ensure that nothing is marked as dirty.
+        memberType.ResetDirtyProperties(false);
 
-        public override IMemberType Build()
-        {
-            var memberType = new MemberType(ShortStringHelper, GetParentId())
-            {
-                Id = GetId(),
-                Key = GetKey(),
-                CreateDate = GetCreateDate(),
-                UpdateDate = GetUpdateDate(),
-                Alias = GetAlias(),
-                Name = GetName(),
-                Level = GetLevel(),
-                Path = GetPath(),
-                SortOrder = GetSortOrder(),
-                Description = GetDescription(),
-                Icon = GetIcon(),
-                Thumbnail = GetThumbnail(),
-                CreatorId = GetCreatorId(),
-                Trashed = GetTrashed(),
-                IsContainer = GetIsContainer(),
-            };
-
-            BuildPropertyGroups(memberType, _propertyGroupBuilders.Select(x => x.Build()));
-            BuildPropertyTypeIds(memberType, _propertyTypeIdsIncrementingFrom);
-
-            foreach (KeyValuePair<string, bool> kvp in _memberCanEditProperties)
-            {
-                memberType.SetMemberCanEditProperty(kvp.Key, kvp.Value);
-            }
-
-            foreach (KeyValuePair<string, bool> kvp in _memberCanViewProperties)
-            {
-                memberType.SetMemberCanViewProperty(kvp.Key, kvp.Value);
-            }
-
-            memberType.ResetDirtyProperties(false);
-
-            return memberType;
-        }
-
-        public static MemberType CreateSimpleMemberType(string alias = null, string name = null)
-        {
-            var builder = new MemberTypeBuilder();
-            IMemberType memberType = builder
-                .WithAlias(alias)
-                .WithName(name)
-                .AddPropertyGroup()
-                    .WithName("Content")
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithAlias("title")
-                        .WithName("Title")
-                        .WithSortOrder(1)
-                        .Done()
-                    .AddPropertyType()
-                        .WithAlias("bodyText")
-                        .WithName("Body text")
-                        .WithSortOrder(2)
-                        .WithDataTypeId(-87)
-                        .Done()
-                    .AddPropertyType()
-                        .WithAlias("author")
-                        .WithName("Author")
-                        .WithSortOrder(3)
-                        .Done()
-                    .Done()
-                .Build();
-
-            // Ensure that nothing is marked as dirty.
-            memberType.ResetDirtyProperties(false);
-
-            return (MemberType)memberType;
-        }
-
-        int? IWithPropertyTypeIdsIncrementingFrom.PropertyTypeIdsIncrementingFrom
-        {
-            get => _propertyTypeIdsIncrementingFrom;
-            set => _propertyTypeIdsIncrementingFrom = value;
-        }
+        return (MemberType)memberType;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/PropertyBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
index de017c1353..477a9fb36f 100644
--- a/tests/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/PropertyBuilder.cs
@@ -5,86 +5,86 @@ using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class PropertyBuilder
+    : BuilderBase<IProperty>,
+        IBuildPropertyTypes,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder
 {
-    public class PropertyBuilder
-        : BuilderBase<IProperty>,
-            IBuildPropertyTypes,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder
+    private DateTime? _createDate;
+
+    private int? _id;
+    private Guid? _key;
+    private IPropertyType _propertyType;
+    private PropertyTypeBuilder<PropertyBuilder> _propertyTypeBuilder;
+    private DateTime? _updateDate;
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private PropertyTypeBuilder<PropertyBuilder> _propertyTypeBuilder;
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private IPropertyType _propertyType;
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-        public PropertyBuilder WithPropertyType(IPropertyType propertyType)
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public PropertyBuilder WithPropertyType(IPropertyType propertyType)
+    {
+        _propertyTypeBuilder = null;
+        _propertyType = propertyType;
+        return this;
+    }
+
+    public PropertyTypeBuilder<PropertyBuilder> AddPropertyType()
+    {
+        _propertyType = null;
+        var builder = new PropertyTypeBuilder<PropertyBuilder>(this);
+        _propertyTypeBuilder = builder;
+        return builder;
+    }
+
+    public override IProperty Build()
+    {
+        var id = _id ?? 1;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+
+        if (_propertyTypeBuilder is null && _propertyType is null)
         {
-            _propertyTypeBuilder = null;
-            _propertyType = propertyType;
-            return this;
+            throw new InvalidOperationException(
+                "A property cannot be constructed without providing a property type. Use AddPropertyType() or WithPropertyType().");
         }
 
-        public PropertyTypeBuilder<PropertyBuilder> AddPropertyType()
+        var propertyType = _propertyType ?? _propertyTypeBuilder.Build();
+
+        // Needs to be within collection to support publishing.
+        var propertyTypeCollection = new PropertyTypeCollection(true, new[] { propertyType });
+
+        return new Property(id, propertyTypeCollection[0])
         {
-            _propertyType = null;
-            var builder = new PropertyTypeBuilder<PropertyBuilder>(this);
-            _propertyTypeBuilder = builder;
-            return builder;
-        }
-
-        public override IProperty Build()
-        {
-            var id = _id ?? 1;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-
-            if (_propertyTypeBuilder is null && _propertyType is null)
-            {
-                throw new InvalidOperationException("A property cannot be constructed without providing a property type. Use AddPropertyType() or WithPropertyType().");
-            }
-
-            IPropertyType propertyType = _propertyType ?? _propertyTypeBuilder.Build();
-
-            // Needs to be within collection to support publishing.
-            var propertyTypeCollection = new PropertyTypeCollection(true, new[] { propertyType });
-
-            return new Property(id, propertyTypeCollection[0])
-            {
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-            };
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/PropertyDataBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PropertyDataBuilder.cs
index b472736cff..6503667df6 100644
--- a/tests/Umbraco.Tests.Common/Builders/PropertyDataBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/PropertyDataBuilder.cs
@@ -1,36 +1,29 @@
-using System.Collections.Generic;
-using Umbraco.Extensions;
-using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
+using System.Collections.Generic;
 using System.Linq;
+using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class PropertyDataBuilder : BuilderBase<Dictionary<string, PropertyData[]>>
 {
-    public class PropertyDataBuilder : BuilderBase<Dictionary<string, PropertyData[]>>
+    private readonly Dictionary<string, List<PropertyData>> _properties = new();
+
+    public PropertyDataBuilder WithPropertyData(string alias, PropertyData propertyData)
     {
-        private readonly Dictionary<string, List<PropertyData>> _properties = new();
-
-        public PropertyDataBuilder WithPropertyData(string alias, PropertyData propertyData)
+        if (!_properties.TryGetValue(alias, out var propertyDataCollection))
         {
-            if (!_properties.TryGetValue(alias, out List<PropertyData> propertyDataCollection))
-            {
-                propertyDataCollection = new List<PropertyData>();
-                _properties[alias] = propertyDataCollection;
-            }
-
-            propertyDataCollection.Add(propertyData);
-
-            return this;
+            propertyDataCollection = new List<PropertyData>();
+            _properties[alias] = propertyDataCollection;
         }
 
-        public PropertyDataBuilder WithPropertyData(string alias, object value, string? culture = null, string? segment = null)
-            => WithPropertyData(alias, new PropertyData
-            {
-                Culture = culture ?? string.Empty,
-                Segment = segment ?? string.Empty,
-                Value = value
-            });
+        propertyDataCollection.Add(propertyData);
 
-        public override Dictionary<string, PropertyData[]> Build()
-            => _properties.ToDictionary(x => x.Key, x => x.Value.ToArray());
+        return this;
     }
+
+    public PropertyDataBuilder WithPropertyData(string alias, object value, string? culture = null, string? segment = null)
+        => WithPropertyData(alias, new PropertyData { Culture = culture ?? string.Empty, Segment = segment ?? string.Empty, Value = value });
+
+    public override Dictionary<string, PropertyData[]> Build()
+        => _properties.ToDictionary(x => x.Key, x => x.Value.ToArray());
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
index 9d0d300460..5a958f1389 100644
--- a/tests/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/PropertyGroupBuilder.cs
@@ -7,146 +7,145 @@ using System.Linq;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class PropertyGroupBuilder : PropertyGroupBuilder<NullPropertyGroupBuilderParent>
 {
-    public class PropertyGroupBuilder : PropertyGroupBuilder<NullPropertyGroupBuilderParent>
+    public PropertyGroupBuilder()
+        : base(null)
     {
-        public PropertyGroupBuilder()
-            : base(null)
-        {
-        }
-    }
-
-    public class NullPropertyGroupBuilderParent : IBuildPropertyGroups
-    {
-    }
-
-    public class PropertyGroupBuilder<TParent>
-        : ChildBuilderBase<TParent, PropertyGroup>,
-            IBuildPropertyTypes,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder,
-            IWithSortOrderBuilder,
-            IWithSupportsPublishing
-        where TParent : IBuildPropertyGroups
-    {
-        private readonly List<PropertyTypeBuilder<PropertyGroupBuilder<TParent>>> _propertyTypeBuilders = new List<PropertyTypeBuilder<PropertyGroupBuilder<TParent>>>();
-
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _alias;
-        private string _name;
-        private int? _sortOrder;
-        private bool? _supportsPublishing;
-        private PropertyTypeCollection _propertyTypeCollection;
-
-        public PropertyGroupBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
-
-        public PropertyGroupBuilder<TParent> WithPropertyTypeCollection(PropertyTypeCollection propertyTypeCollection)
-        {
-            _propertyTypeCollection = propertyTypeCollection;
-            return this;
-        }
-
-        public PropertyTypeBuilder<PropertyGroupBuilder<TParent>> AddPropertyType()
-        {
-            var builder = new PropertyTypeBuilder<PropertyGroupBuilder<TParent>>(this);
-            _propertyTypeBuilders.Add(builder);
-            return builder;
-        }
-
-        public override PropertyGroup Build()
-        {
-            var id = _id ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var alias = _alias ?? Guid.NewGuid().ToString();
-            var name = _name ?? Guid.NewGuid().ToString();
-            var sortOrder = _sortOrder ?? 0;
-            var supportsPublishing = _supportsPublishing ?? false;
-
-            PropertyTypeCollection propertyTypeCollection;
-            if (_propertyTypeCollection != null)
-            {
-                propertyTypeCollection = _propertyTypeCollection;
-            }
-            else
-            {
-                propertyTypeCollection = new PropertyTypeCollection(supportsPublishing);
-                foreach (PropertyType propertyType in _propertyTypeBuilders.Select(x => x.Build()))
-                {
-                    propertyTypeCollection.Add(propertyType);
-                }
-            }
-
-            return new PropertyGroup(propertyTypeCollection)
-            {
-                Id = id,
-                Key = key,
-                Alias = alias,
-                Name = name,
-                SortOrder = sortOrder,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-            };
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        bool? IWithSupportsPublishing.SupportsPublishing
-        {
-            get => _supportsPublishing;
-            set => _supportsPublishing = value;
-        }
+    }
+}
+
+public class NullPropertyGroupBuilderParent : IBuildPropertyGroups
+{
+}
+
+public class PropertyGroupBuilder<TParent>
+    : ChildBuilderBase<TParent, PropertyGroup>,
+        IBuildPropertyTypes,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder,
+        IWithSortOrderBuilder,
+        IWithSupportsPublishing
+    where TParent : IBuildPropertyGroups
+{
+    private readonly List<PropertyTypeBuilder<PropertyGroupBuilder<TParent>>> _propertyTypeBuilders = new();
+    private string _alias;
+    private DateTime? _createDate;
+
+    private int? _id;
+    private Guid? _key;
+    private string _name;
+    private PropertyTypeCollection _propertyTypeCollection;
+    private int? _sortOrder;
+    private bool? _supportsPublishing;
+    private DateTime? _updateDate;
+
+    public PropertyGroupBuilder(TParent parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    bool? IWithSupportsPublishing.SupportsPublishing
+    {
+        get => _supportsPublishing;
+        set => _supportsPublishing = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public PropertyGroupBuilder<TParent> WithPropertyTypeCollection(PropertyTypeCollection propertyTypeCollection)
+    {
+        _propertyTypeCollection = propertyTypeCollection;
+        return this;
+    }
+
+    public PropertyTypeBuilder<PropertyGroupBuilder<TParent>> AddPropertyType()
+    {
+        var builder = new PropertyTypeBuilder<PropertyGroupBuilder<TParent>>(this);
+        _propertyTypeBuilders.Add(builder);
+        return builder;
+    }
+
+    public override PropertyGroup Build()
+    {
+        var id = _id ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var alias = _alias ?? Guid.NewGuid().ToString();
+        var name = _name ?? Guid.NewGuid().ToString();
+        var sortOrder = _sortOrder ?? 0;
+        var supportsPublishing = _supportsPublishing ?? false;
+
+        PropertyTypeCollection propertyTypeCollection;
+        if (_propertyTypeCollection != null)
+        {
+            propertyTypeCollection = _propertyTypeCollection;
+        }
+        else
+        {
+            propertyTypeCollection = new PropertyTypeCollection(supportsPublishing);
+            foreach (var propertyType in _propertyTypeBuilders.Select(x => x.Build()))
+            {
+                propertyTypeCollection.Add(propertyType);
+            }
+        }
+
+        return new PropertyGroup(propertyTypeCollection)
+        {
+            Id = id,
+            Key = key,
+            Alias = alias,
+            Name = name,
+            SortOrder = sortOrder,
+            CreateDate = createDate,
+            UpdateDate = updateDate
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
index e41ab16436..9b7fce3a9d 100644
--- a/tests/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/PropertyTypeBuilder.cs
@@ -2,214 +2,213 @@
 // See LICENSE for more details.
 
 using System;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class PropertyTypeBuilder : PropertyTypeBuilder<NullPropertyTypeBuilderParent>
 {
-    public class PropertyTypeBuilder : PropertyTypeBuilder<NullPropertyTypeBuilderParent>
+    public PropertyTypeBuilder()
+        : base(null)
     {
-        public PropertyTypeBuilder()
-            : base(null)
-        {
-        }
-    }
-
-    public class NullPropertyTypeBuilderParent : IBuildPropertyTypes
-    {
-    }
-
-    public class PropertyTypeBuilder<TParent>
-        : ChildBuilderBase<TParent, PropertyType>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithSortOrderBuilder,
-            IWithDescriptionBuilder,
-            IWithSupportsPublishing
-        where TParent : IBuildPropertyTypes
-    {
-        private int? _id;
-        private Guid? _key;
-        private string _propertyEditorAlias;
-        private ValueStorageType? _valueStorageType;
-        private string _alias;
-        private string _name;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private int? _sortOrder;
-        private string _description;
-        private int? _dataTypeId;
-        private Lazy<int> _propertyGroupId;
-        private bool? _mandatory;
-        private bool? _labelOnTop;
-        private string _mandatoryMessage;
-        private string _validationRegExp;
-        private string _validationRegExpMessage;
-        private bool? _supportsPublishing;
-        private ContentVariation? _variations;
-
-        public PropertyTypeBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
-
-        public PropertyTypeBuilder<TParent> WithPropertyEditorAlias(string propertyEditorAlias)
-        {
-            _propertyEditorAlias = propertyEditorAlias;
-            return this;
-        }
-
-        public PropertyTypeBuilder<TParent> WithValueStorageType(ValueStorageType valueStorageType)
-        {
-            _valueStorageType = valueStorageType;
-            return this;
-        }
-
-        public PropertyTypeBuilder<TParent> WithDataTypeId(int dataTypeId)
-        {
-            _dataTypeId = dataTypeId;
-            return this;
-        }
-
-        public PropertyTypeBuilder<TParent> WithPropertyGroupId(int propertyGroupId)
-        {
-            _propertyGroupId = new Lazy<int>(() => propertyGroupId);
-            return this;
-        }
-
-        public PropertyTypeBuilder<TParent> WithMandatory(bool mandatory, string mandatoryMessage = "")
-        {
-            _mandatory = mandatory;
-            _mandatoryMessage = mandatoryMessage;
-            return this;
-        }
-
-        public PropertyTypeBuilder<TParent> WithLabelOnTop(bool labelOnTop)
-        {
-            _labelOnTop = labelOnTop;
-            return this;
-        }
-
-        public PropertyTypeBuilder<TParent> WithValidationRegExp(string validationRegExp, string validationRegExpMessage = "")
-        {
-            _validationRegExp = validationRegExp;
-            _validationRegExpMessage = validationRegExpMessage;
-            return this;
-        }
-
-        public PropertyTypeBuilder<TParent> WithVariations(ContentVariation variation)
-        {
-            _variations = variation;
-            return this;
-        }
-
-        public override PropertyType Build()
-        {
-            var id = _id ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            var propertyEditorAlias = _propertyEditorAlias ?? Constants.PropertyEditors.Aliases.TextBox;
-            ValueStorageType valueStorageType = _valueStorageType ?? ValueStorageType.Nvarchar;
-            var name = _name ?? Guid.NewGuid().ToString();
-            var alias = _alias ?? name.ToCamelCase();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var sortOrder = _sortOrder ?? 0;
-            var dataTypeId = _dataTypeId ?? -88;
-            var description = _description ?? string.Empty;
-            Lazy<int> propertyGroupId = _propertyGroupId ?? null;
-            var mandatory = _mandatory ?? false;
-            var mandatoryMessage = _mandatoryMessage ?? string.Empty;
-            var validationRegExp = _validationRegExp ?? string.Empty;
-            var validationRegExpMessage = _validationRegExpMessage ?? string.Empty;
-            var supportsPublishing = _supportsPublishing ?? false;
-            var labelOnTop = _labelOnTop ?? false;
-            ContentVariation variations = _variations ?? ContentVariation.Nothing;
-
-            var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
-
-            var propertyType = new PropertyType(shortStringHelper, propertyEditorAlias, valueStorageType)
-            {
-                Id = id,
-                Key = key,
-                Alias = alias,
-                Name = name,
-                SortOrder = sortOrder,
-                DataTypeId = dataTypeId,
-                Description = description,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                PropertyGroupId = propertyGroupId,
-                Mandatory = mandatory,
-                MandatoryMessage = mandatoryMessage,
-                ValidationRegExp = validationRegExp,
-                ValidationRegExpMessage = validationRegExpMessage,
-                SupportsPublishing = supportsPublishing,
-                Variations = variations,
-                LabelOnTop = labelOnTop,
-            };
-
-            return propertyType;
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        string IWithDescriptionBuilder.Description
-        {
-            get => _description;
-            set => _description = value;
-        }
-
-        bool? IWithSupportsPublishing.SupportsPublishing
-        {
-            get => _supportsPublishing;
-            set => _supportsPublishing = value;
-        }
+    }
+}
+
+public class NullPropertyTypeBuilderParent : IBuildPropertyTypes
+{
+}
+
+public class PropertyTypeBuilder<TParent>
+    : ChildBuilderBase<TParent, PropertyType>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithSortOrderBuilder,
+        IWithDescriptionBuilder,
+        IWithSupportsPublishing
+    where TParent : IBuildPropertyTypes
+{
+    private string _alias;
+    private DateTime? _createDate;
+    private int? _dataTypeId;
+    private string _description;
+    private int? _id;
+    private Guid? _key;
+    private bool? _labelOnTop;
+    private bool? _mandatory;
+    private string _mandatoryMessage;
+    private string _name;
+    private string _propertyEditorAlias;
+    private Lazy<int> _propertyGroupId;
+    private int? _sortOrder;
+    private bool? _supportsPublishing;
+    private DateTime? _updateDate;
+    private string _validationRegExp;
+    private string _validationRegExpMessage;
+    private ValueStorageType? _valueStorageType;
+    private ContentVariation? _variations;
+
+    public PropertyTypeBuilder(TParent parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    string IWithDescriptionBuilder.Description
+    {
+        get => _description;
+        set => _description = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
+
+    bool? IWithSupportsPublishing.SupportsPublishing
+    {
+        get => _supportsPublishing;
+        set => _supportsPublishing = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public PropertyTypeBuilder<TParent> WithPropertyEditorAlias(string propertyEditorAlias)
+    {
+        _propertyEditorAlias = propertyEditorAlias;
+        return this;
+    }
+
+    public PropertyTypeBuilder<TParent> WithValueStorageType(ValueStorageType valueStorageType)
+    {
+        _valueStorageType = valueStorageType;
+        return this;
+    }
+
+    public PropertyTypeBuilder<TParent> WithDataTypeId(int dataTypeId)
+    {
+        _dataTypeId = dataTypeId;
+        return this;
+    }
+
+    public PropertyTypeBuilder<TParent> WithPropertyGroupId(int propertyGroupId)
+    {
+        _propertyGroupId = new Lazy<int>(() => propertyGroupId);
+        return this;
+    }
+
+    public PropertyTypeBuilder<TParent> WithMandatory(bool mandatory, string mandatoryMessage = "")
+    {
+        _mandatory = mandatory;
+        _mandatoryMessage = mandatoryMessage;
+        return this;
+    }
+
+    public PropertyTypeBuilder<TParent> WithLabelOnTop(bool labelOnTop)
+    {
+        _labelOnTop = labelOnTop;
+        return this;
+    }
+
+    public PropertyTypeBuilder<TParent> WithValidationRegExp(string validationRegExp, string validationRegExpMessage = "")
+    {
+        _validationRegExp = validationRegExp;
+        _validationRegExpMessage = validationRegExpMessage;
+        return this;
+    }
+
+    public PropertyTypeBuilder<TParent> WithVariations(ContentVariation variation)
+    {
+        _variations = variation;
+        return this;
+    }
+
+    public override PropertyType Build()
+    {
+        var id = _id ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var propertyEditorAlias = _propertyEditorAlias ?? Constants.PropertyEditors.Aliases.TextBox;
+        var valueStorageType = _valueStorageType ?? ValueStorageType.Nvarchar;
+        var name = _name ?? Guid.NewGuid().ToString();
+        var alias = _alias ?? name.ToCamelCase();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var sortOrder = _sortOrder ?? 0;
+        var dataTypeId = _dataTypeId ?? -88;
+        var description = _description ?? string.Empty;
+        var propertyGroupId = _propertyGroupId;
+        var mandatory = _mandatory ?? false;
+        var mandatoryMessage = _mandatoryMessage ?? string.Empty;
+        var validationRegExp = _validationRegExp ?? string.Empty;
+        var validationRegExpMessage = _validationRegExpMessage ?? string.Empty;
+        var supportsPublishing = _supportsPublishing ?? false;
+        var labelOnTop = _labelOnTop ?? false;
+        var variations = _variations ?? ContentVariation.Nothing;
+
+        var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+        var propertyType = new PropertyType(shortStringHelper, propertyEditorAlias, valueStorageType)
+        {
+            Id = id,
+            Key = key,
+            Alias = alias,
+            Name = name,
+            SortOrder = sortOrder,
+            DataTypeId = dataTypeId,
+            Description = description,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            PropertyGroupId = propertyGroupId,
+            Mandatory = mandatory,
+            MandatoryMessage = mandatoryMessage,
+            ValidationRegExp = validationRegExp,
+            ValidationRegExpMessage = validationRegExpMessage,
+            SupportsPublishing = supportsPublishing,
+            Variations = variations,
+            LabelOnTop = labelOnTop
+        };
+
+        return propertyType;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/RelationBuilder.cs b/tests/Umbraco.Tests.Common/Builders/RelationBuilder.cs
index 10585f2410..c21dea4fe6 100644
--- a/tests/Umbraco.Tests.Common/Builders/RelationBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/RelationBuilder.cs
@@ -5,103 +5,103 @@ using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class RelationBuilder
+    : BuilderBase<Relation>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder
 {
-    public class RelationBuilder
-        : BuilderBase<Relation>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder
+    private int? _childId;
+    private string _comment;
+    private DateTime? _createDate;
+
+    private int? _id;
+    private Guid? _key;
+    private int? _parentId;
+    private IRelationType _relationType;
+    private RelationTypeBuilder _relationTypeBuilder;
+    private DateTime? _updateDate;
+
+    DateTime? IWithCreateDateBuilder.CreateDate
     {
-        private RelationTypeBuilder _relationTypeBuilder;
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        private int? _id;
-        private int? _parentId;
-        private int? _childId;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _comment;
-        private IRelationType _relationType;
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-        public RelationBuilder WithComment(string comment)
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public RelationBuilder WithComment(string comment)
+    {
+        _comment = comment;
+        return this;
+    }
+
+    public RelationBuilder BetweenIds(int parentId, int childId)
+    {
+        _parentId = parentId;
+        _childId = childId;
+        return this;
+    }
+
+    public RelationBuilder WithRelationType(IRelationType relationType)
+    {
+        _relationType = relationType;
+        _relationTypeBuilder = null;
+        return this;
+    }
+
+    public RelationTypeBuilder AddRelationType()
+    {
+        _relationType = null;
+        var builder = new RelationTypeBuilder(this);
+        _relationTypeBuilder = builder;
+        return builder;
+    }
+
+    public override Relation Build()
+    {
+        var id = _id ?? 0;
+        var parentId = _parentId ?? 0;
+        var childId = _childId ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var comment = _comment ?? string.Empty;
+
+        if (_relationTypeBuilder == null && _relationType == null)
         {
-            _comment = comment;
-            return this;
+            throw new InvalidOperationException(
+                "Cannot construct a Relation without a RelationType.  Use AddRelationType() or WithRelationType().");
         }
 
-        public RelationBuilder BetweenIds(int parentId, int childId)
+        var relationType = _relationType ?? _relationTypeBuilder.Build();
+
+        return new Relation(parentId, childId, relationType)
         {
-            _parentId = parentId;
-            _childId = childId;
-            return this;
-        }
-
-        public RelationBuilder WithRelationType(IRelationType relationType)
-        {
-            _relationType = relationType;
-            _relationTypeBuilder = null;
-            return this;
-        }
-
-        public RelationTypeBuilder AddRelationType()
-        {
-            _relationType = null;
-            var builder = new RelationTypeBuilder(this);
-            _relationTypeBuilder = builder;
-            return builder;
-        }
-
-        public override Relation Build()
-        {
-            var id = _id ?? 0;
-            var parentId = _parentId ?? 0;
-            var childId = _childId ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var comment = _comment ?? string.Empty;
-
-            if (_relationTypeBuilder == null && _relationType == null)
-            {
-                throw new InvalidOperationException("Cannot construct a Relation without a RelationType.  Use AddRelationType() or WithRelationType().");
-            }
-
-            IRelationType relationType = _relationType ?? _relationTypeBuilder.Build();
-
-            return new Relation(parentId, childId, relationType)
-                {
-                    Comment = comment,
-                    CreateDate = createDate,
-                    Id = id,
-                    Key = key,
-                    UpdateDate = updateDate
-                };
-        }
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
+            Comment = comment,
+            CreateDate = createDate,
+            Id = id,
+            Key = key,
+            UpdateDate = updateDate
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
index bb16cadd78..83cf56e0de 100644
--- a/tests/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/RelationTypeBuilder.cs
@@ -5,128 +5,127 @@ using System;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class RelationTypeBuilder
+    : ChildBuilderBase<RelationBuilder, IRelationTypeWithIsDependency>,
+        IWithIdBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder,
+        IWithKeyBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithDeleteDateBuilder
 {
-    public class RelationTypeBuilder
-        : ChildBuilderBase<RelationBuilder, IRelationTypeWithIsDependency>,
-            IWithIdBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder,
-            IWithKeyBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithDeleteDateBuilder
+    private string _alias;
+    private Guid? _childObjectType;
+    private DateTime? _createDate;
+    private DateTime? _deleteDate;
+    private int? _id;
+    private bool? _isBidirectional;
+    private bool? _isDependency;
+    private Guid? _key;
+    private string _name;
+    private Guid? _parentObjectType;
+    private DateTime? _updateDate;
+
+    public RelationTypeBuilder()
+        : base(null)
     {
-        private string _alias;
-        private Guid? _childObjectType;
-        private DateTime? _createDate;
-        private DateTime? _deleteDate;
-        private int? _id;
-        private bool? _isBidirectional;
-        private bool? _isDependency;
-        private Guid? _key;
-        private string _name;
-        private Guid? _parentObjectType;
-        private DateTime? _updateDate;
+    }
 
-        public RelationTypeBuilder()
-            : base(null)
-        {
-        }
+    public RelationTypeBuilder(RelationBuilder parentBuilder)
+        : base(parentBuilder)
+    {
+    }
 
-        public RelationTypeBuilder(RelationBuilder parentBuilder)
-            : base(parentBuilder)
-        {
-        }
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
 
-        public RelationTypeBuilder WithIsBidirectional(bool isBidirectional)
-        {
-            _isBidirectional = isBidirectional;
-            return this;
-        } 
-        
-        public RelationTypeBuilder WithIsDependency(bool isDependency)
-        {
-            _isDependency = isDependency;
-            return this;
-        }
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
 
-        public RelationTypeBuilder WithChildObjectType(Guid childObjectType)
-        {
-            _childObjectType = childObjectType;
-            return this;
-        }
+    DateTime? IWithDeleteDateBuilder.DeleteDate
+    {
+        get => _deleteDate;
+        set => _deleteDate = value;
+    }
 
-        public RelationTypeBuilder WithParentObjectType(Guid parentObjectType)
-        {
-            _parentObjectType = parentObjectType;
-            return this;
-        }
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
 
-        public override IRelationTypeWithIsDependency Build()
-        {
-            var alias = _alias ?? Guid.NewGuid().ToString();
-            var name = _name ?? Guid.NewGuid().ToString();
-            Guid? parentObjectType = _parentObjectType ?? null;
-            Guid? childObjectType = _childObjectType ?? null;
-            var id = _id ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            var isBidirectional = _isBidirectional ?? false;
-            var isDependency = _isDependency ?? false;
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            DateTime? deleteDate = _deleteDate ?? null;
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
 
-            return new RelationType(name, alias, isBidirectional, parentObjectType, childObjectType, isDependency)
-            {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                DeleteDate = deleteDate
-            };
-        }
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
 
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
 
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
+    public RelationTypeBuilder WithIsBidirectional(bool isBidirectional)
+    {
+        _isBidirectional = isBidirectional;
+        return this;
+    }
 
-        DateTime? IWithDeleteDateBuilder.DeleteDate
-        {
-            get => _deleteDate;
-            set => _deleteDate = value;
-        }
+    public RelationTypeBuilder WithIsDependency(bool isDependency)
+    {
+        _isDependency = isDependency;
+        return this;
+    }
 
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
+    public RelationTypeBuilder WithChildObjectType(Guid childObjectType)
+    {
+        _childObjectType = childObjectType;
+        return this;
+    }
 
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
+    public RelationTypeBuilder WithParentObjectType(Guid parentObjectType)
+    {
+        _parentObjectType = parentObjectType;
+        return this;
+    }
 
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
+    public override IRelationTypeWithIsDependency Build()
+    {
+        var alias = _alias ?? Guid.NewGuid().ToString();
+        var name = _name ?? Guid.NewGuid().ToString();
+        var parentObjectType = _parentObjectType;
+        var childObjectType = _childObjectType;
+        var id = _id ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var isBidirectional = _isBidirectional ?? false;
+        var isDependency = _isDependency ?? false;
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var deleteDate = _deleteDate;
 
-        DateTime? IWithUpdateDateBuilder.UpdateDate
+        return new RelationType(name, alias, isBidirectional, parentObjectType, childObjectType, isDependency)
         {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            DeleteDate = deleteDate
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs b/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
index 7e557d19cc..e7aafa443c 100644
--- a/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/StylesheetBuilder.cs
@@ -3,35 +3,31 @@
 
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class StylesheetBuilder
+    : BuilderBase<Stylesheet>
 {
-    public class StylesheetBuilder
-        : BuilderBase<Stylesheet>
+    private string _content;
+    private string _path;
+
+    public StylesheetBuilder WithPath(string path)
     {
-        private string _path;
-        private string _content;
+        _path = path;
+        return this;
+    }
 
-        public StylesheetBuilder WithPath(string path)
-        {
-            _path = path;
-            return this;
-        }
+    public StylesheetBuilder WithContent(string content)
+    {
+        _content = content;
+        return this;
+    }
 
-        public StylesheetBuilder WithContent(string content)
-        {
-            _content = content;
-            return this;
-        }
+    public override Stylesheet Build()
+    {
+        var path = _path ?? string.Empty;
+        var content = _content ?? string.Empty;
 
-        public override Stylesheet Build()
-        {
-            var path = _path ?? string.Empty;
-            var content = _content ?? string.Empty;
-
-            return new Stylesheet(path)
-            {
-                Content = content,
-            };
-        }
+        return new Stylesheet(path) { Content = content };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs b/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
index f1c05bc969..9ee9c97779 100644
--- a/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/TemplateBuilder.cs
@@ -7,132 +7,131 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class TemplateBuilder
+    : ChildBuilderBase<ContentTypeBuilder, ITemplate>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithPathBuilder
 {
-    public class TemplateBuilder
-        : ChildBuilderBase<ContentTypeBuilder, ITemplate>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithPathBuilder
+    private string _alias;
+    private string _content;
+    private DateTime? _createDate;
+    private int? _id;
+    private bool? _isMasterTemplate;
+    private Guid? _key;
+    private string _masterTemplateAlias;
+    private Lazy<int> _masterTemplateId;
+    private string _name;
+    private string _path;
+    private DateTime? _updateDate;
+
+    public TemplateBuilder()
+        : base(null)
     {
-        private int? _id;
-        private Guid? _key;
-        private string _alias;
-        private string _name;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _path;
-        private string _content;
-        private bool? _isMasterTemplate;
-        private string _masterTemplateAlias;
-        private Lazy<int> _masterTemplateId;
-
-        public TemplateBuilder()
-            : base(null)
-        {
-        }
-
-        public TemplateBuilder(ContentTypeBuilder parentBuilder)
-            : base(parentBuilder)
-        {
-        }
-
-        public TemplateBuilder WithContent(string content)
-        {
-            _content = content;
-            return this;
-        }
-
-        public TemplateBuilder AsMasterTemplate(string masterTemplateAlias, int masterTemplateId)
-        {
-            _isMasterTemplate = true;
-            _masterTemplateAlias = masterTemplateAlias;
-            _masterTemplateId = new Lazy<int>(() => masterTemplateId);
-            return this;
-        }
-
-        public override ITemplate Build()
-        {
-            var id = _id ?? 0;
-            Guid key = _key ?? Guid.NewGuid();
-            var name = _name ?? Guid.NewGuid().ToString();
-            var alias = _alias ?? name.ToCamelCase();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var path = _path ?? $"-1,{id}";
-            var content = _content;
-            var isMasterTemplate = _isMasterTemplate ?? false;
-            var masterTemplateAlias = _masterTemplateAlias ?? string.Empty;
-            Lazy<int> masterTemplateId = _masterTemplateId ?? new Lazy<int>(() => -1);
-
-            var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
-
-            var template = new Template(shortStringHelper, name, alias)
-            {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                Path = path,
-                Content = content,
-                IsMasterTemplate = isMasterTemplate,
-                MasterTemplateAlias = masterTemplateAlias,
-                MasterTemplateId = masterTemplateId,
-            };
-
-            return template;
-        }
-
-        public static Template CreateTextPageTemplate(string alias = "textPage") =>
-            (Template)new TemplateBuilder()
-                .WithAlias(alias)
-                .WithName("Text page")
-                .Build();
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        string IWithPathBuilder.Path
-        {
-            get => _path;
-            set => _path = value;
-        }
     }
+
+    public TemplateBuilder(ContentTypeBuilder parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    string IWithPathBuilder.Path
+    {
+        get => _path;
+        set => _path = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public TemplateBuilder WithContent(string content)
+    {
+        _content = content;
+        return this;
+    }
+
+    public TemplateBuilder AsMasterTemplate(string masterTemplateAlias, int masterTemplateId)
+    {
+        _isMasterTemplate = true;
+        _masterTemplateAlias = masterTemplateAlias;
+        _masterTemplateId = new Lazy<int>(() => masterTemplateId);
+        return this;
+    }
+
+    public override ITemplate Build()
+    {
+        var id = _id ?? 0;
+        var key = _key ?? Guid.NewGuid();
+        var name = _name ?? Guid.NewGuid().ToString();
+        var alias = _alias ?? name.ToCamelCase();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var path = _path ?? $"-1,{id}";
+        var content = _content;
+        var isMasterTemplate = _isMasterTemplate ?? false;
+        var masterTemplateAlias = _masterTemplateAlias ?? string.Empty;
+        var masterTemplateId = _masterTemplateId ?? new Lazy<int>(() => -1);
+
+        var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+        var template = new Template(shortStringHelper, name, alias)
+        {
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            Path = path,
+            Content = content,
+            IsMasterTemplate = isMasterTemplate,
+            MasterTemplateAlias = masterTemplateAlias,
+            MasterTemplateId = masterTemplateId
+        };
+
+        return template;
+    }
+
+    public static Template CreateTextPageTemplate(string alias = "textPage") =>
+        (Template)new TemplateBuilder()
+            .WithAlias(alias)
+            .WithName("Text page")
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/TreeBuilder.cs b/tests/Umbraco.Tests.Common/Builders/TreeBuilder.cs
index 7fc29e1c57..2d1b687aa2 100644
--- a/tests/Umbraco.Tests.Common/Builders/TreeBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/TreeBuilder.cs
@@ -1,82 +1,81 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Trees;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class TreeBuilder
+    : BuilderBase<Tree>,
+        IWithAliasBuilder,
+        IWithSortOrderBuilder
 {
-    public class TreeBuilder
-        : BuilderBase<Tree>,
-            IWithAliasBuilder,
-            IWithSortOrderBuilder
+    private string _alias;
+    private string _group;
+    private bool? _isSingleNode;
+    private string _sectionAlias;
+    private int? _sortOrder;
+    private string _title;
+    private TreeUse? _treeUse;
+
+    string IWithAliasBuilder.Alias
     {
-        private int? _sortOrder;
-        private string _alias;
-        private string _sectionAlias;
-        private string _group;
-        private string _title;
-        private TreeUse? _treeUse;
-        private bool? _isSingleNode;
+        get => _alias;
+        set => _alias = value;
+    }
 
-        public TreeBuilder WithSectionAlias(string sectionAlias)
-        {
-            _sectionAlias = sectionAlias;
-            return this;
-        }
+    int? IWithSortOrderBuilder.SortOrder
+    {
+        get => _sortOrder;
+        set => _sortOrder = value;
+    }
 
-        public TreeBuilder WithGroup(string group)
-        {
-            _group = group;
-            return this;
-        }
+    public TreeBuilder WithSectionAlias(string sectionAlias)
+    {
+        _sectionAlias = sectionAlias;
+        return this;
+    }
 
-        public TreeBuilder WithTitle(string title)
-        {
-            _title = title;
-            return this;
-        }
+    public TreeBuilder WithGroup(string group)
+    {
+        _group = group;
+        return this;
+    }
 
-        public TreeBuilder WithTreeUse(TreeUse treeUse)
-        {
-            _treeUse = treeUse;
-            return this;
-        }
+    public TreeBuilder WithTitle(string title)
+    {
+        _title = title;
+        return this;
+    }
 
-        public TreeBuilder WithTreeUse(bool isSingleNode)
-        {
-            _isSingleNode = isSingleNode;
-            return this;
-        }
+    public TreeBuilder WithTreeUse(TreeUse treeUse)
+    {
+        _treeUse = treeUse;
+        return this;
+    }
 
-        public override Tree Build()
-        {
-            var sortOrder = _sortOrder ?? 1;
-            var alias = _alias ?? "testTree";
-            var sectionAlias = _sectionAlias ?? Constants.Applications.Content;
-            var group = _group ?? string.Empty;
-            var title = _title ?? string.Empty;
-            TreeUse treeUse = _treeUse ?? TreeUse.Main;
-            var isSingleNode = _isSingleNode ?? false;
+    public TreeBuilder WithTreeUse(bool isSingleNode)
+    {
+        _isSingleNode = isSingleNode;
+        return this;
+    }
 
-            return new Tree(sortOrder, sectionAlias, group, alias, title, treeUse, typeof(SampleTreeController), isSingleNode);
-        }
+    public override Tree Build()
+    {
+        var sortOrder = _sortOrder ?? 1;
+        var alias = _alias ?? "testTree";
+        var sectionAlias = _sectionAlias ?? Constants.Applications.Content;
+        var group = _group ?? string.Empty;
+        var title = _title ?? string.Empty;
+        var treeUse = _treeUse ?? TreeUse.Main;
+        var isSingleNode = _isSingleNode ?? false;
 
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
+        return new Tree(sortOrder, sectionAlias, group, alias, title, treeUse, typeof(SampleTreeController), isSingleNode);
+    }
 
-        int? IWithSortOrderBuilder.SortOrder
-        {
-            get => _sortOrder;
-            set => _sortOrder = value;
-        }
-
-        private class SampleTreeController
-        {
-        }
+    private class SampleTreeController
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs b/tests/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs
index f2dfad6e22..f68bb1bd4b 100644
--- a/tests/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/UmbracoIdentityRoleBuilder.cs
@@ -4,44 +4,39 @@
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class UmbracoIdentityRoleBuilder : BuilderBase<UmbracoIdentityRole>,
+    IWithIdBuilder<string>,
+    IWithNameBuilder
 {
-    public class UmbracoIdentityRoleBuilder : BuilderBase<UmbracoIdentityRole>,
-            IWithIdBuilder<string>,
-            IWithNameBuilder
+    private string _id;
+    private string _name;
+
+    string IWithIdBuilder<string>.Id
     {
-        private string _id;
-        private string _name;
+        get => _id;
+        set => _id = value;
+    }
 
-        public UmbracoIdentityRoleBuilder WithTestName(string id)
-        {
-            _name = "testname";
-            _id = id;
-            return this;
-        }
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
 
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
+    public UmbracoIdentityRoleBuilder WithTestName(string id)
+    {
+        _name = "testname";
+        _id = id;
+        return this;
+    }
 
-        string IWithIdBuilder<string>.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
+    public override UmbracoIdentityRole Build()
+    {
+        var id = _id;
+        var name = _name;
 
-        public override UmbracoIdentityRole Build()
-        {
-            var id = _id;
-            var name = _name;
-
-            return new UmbracoIdentityRole
-            {
-                Id = id,
-                Name = name,
-            };
-        }
+        return new UmbracoIdentityRole { Id = id, Name = name };
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Builders/UserBuilder.cs b/tests/Umbraco.Tests.Common/Builders/UserBuilder.cs
index f1149bca56..741beafd59 100644
--- a/tests/Umbraco.Tests.Common/Builders/UserBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/UserBuilder.cs
@@ -10,297 +10,290 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class UserBuilder : UserBuilder<object>
 {
-
-    public class UserBuilder : UserBuilder<object>
+    public UserBuilder()
+        : base(null)
     {
-        public UserBuilder()
-            : base(null)
-        {
-        }
-    }
-
-    public class UserBuilder<TParent>
-        : ChildBuilderBase<TParent, User>,
-            IWithIdBuilder,
-            IWithKeyBuilder,
-            IWithCreateDateBuilder,
-            IWithUpdateDateBuilder,
-            IWithNameBuilder,
-            IAccountBuilder
-    {
-        private int? _id;
-        private Guid? _key;
-        private DateTime? _createDate;
-        private DateTime? _updateDate;
-        private string _language;
-        private string _name;
-        private string _username;
-        private string _rawPasswordValue;
-        private string _passwordConfig;
-        private string _email;
-        private int? _failedPasswordAttempts;
-        private bool? _isApproved;
-        private bool? _isLockedOut;
-        private DateTime? _lastLockoutDate;
-        private DateTime? _lastLoginDate;
-        private DateTime? _lastPasswordChangeDate;
-        private string _suffix = string.Empty;
-        private string _defaultLang;
-        private string _comments;
-        private int? _sessionTimeout;
-        private int[] _startContentIds;
-        private int[] _startMediaIds;
-        private readonly List<UserGroupBuilder<UserBuilder<TParent>>> _userGroupBuilders = new List<UserGroupBuilder<UserBuilder<TParent>>>();
-
-        public UserBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
-
-        Guid? IWithKeyBuilder.Key
-        {
-            get => _key;
-            set => _key = value;
-        }
-
-        DateTime? IWithCreateDateBuilder.CreateDate
-        {
-            get => _createDate;
-            set => _createDate = value;
-        }
-
-        DateTime? IWithUpdateDateBuilder.UpdateDate
-        {
-            get => _updateDate;
-            set => _updateDate = value;
-        }
-
-        public UserBuilder<TParent> WithDefaultUILanguage(string defaultLang)
-        {
-            _defaultLang = defaultLang;
-            return this;
-        }
-
-        public UserBuilder<TParent> WithLanguage(string language)
-        {
-            _language = language;
-            return this;
-        }
-
-        public UserBuilder<TParent> WithUsername(string username)
-        {
-            _username = username;
-            return this;
-        }
-
-        public UserBuilder<TParent> WithComments(string comments)
-        {
-            _comments = comments;
-            return this;
-        }
-
-        public UserBuilder<TParent> WithSessionTimeout(int sessionTimeout)
-        {
-            _sessionTimeout = sessionTimeout;
-            return this;
-        }
-
-        public UserBuilder<TParent> WithStartContentId(int startContentId)
-        {
-            _startContentIds = new[] { startContentId };
-            return this;
-        }
-
-        public UserBuilder<TParent> WithStartContentIds(int[] startContentIds)
-        {
-            _startContentIds = startContentIds;
-            return this;
-        }
-
-        public UserBuilder<TParent> WithStartMediaId(int startMediaId)
-        {
-            _startMediaIds = new[] { startMediaId };
-            return this;
-        }
-
-        public UserBuilder<TParent> WithStartMediaIds(int[] startMediaIds)
-        {
-            _startMediaIds = startMediaIds;
-            return this;
-        }
-
-        public UserBuilder<TParent> WithSuffix(string suffix)
-        {
-            _suffix = suffix;
-            return this;
-        }
-
-        public UserGroupBuilder<UserBuilder<TParent>> AddUserGroup()
-        {
-            var builder = new UserGroupBuilder<UserBuilder<TParent>>(this);
-            _userGroupBuilders.Add(builder);
-            return builder;
-        }
-
-        public override User Build()
-        {
-            var id = _id ?? 0;
-            var defaultLang = _defaultLang ?? "en";
-            var globalSettings = new GlobalSettings { DefaultUILanguage = defaultLang };
-            Guid key = _key ?? Guid.NewGuid();
-            DateTime createDate = _createDate ?? DateTime.Now;
-            DateTime updateDate = _updateDate ?? DateTime.Now;
-            var name = _name ?? "TestUser" + _suffix;
-            var language = _language ?? globalSettings.DefaultUILanguage;
-            var username = _username ?? "TestUser" + _suffix;
-            var email = _email ?? "test" + _suffix + "@test.com";
-            var rawPasswordValue = _rawPasswordValue ?? "abcdefghijklmnopqrstuvwxyz";
-            var failedPasswordAttempts = _failedPasswordAttempts ?? 0;
-            var isApproved = _isApproved ?? false;
-            var isLockedOut = _isLockedOut ?? false;
-            DateTime lastLockoutDate = _lastLockoutDate ?? DateTime.Now;
-            DateTime lastLoginDate = _lastLoginDate ?? DateTime.Now;
-            DateTime lastPasswordChangeDate = _lastPasswordChangeDate ?? DateTime.Now;
-            var comments = _comments ?? string.Empty;
-            var sessionTimeout = _sessionTimeout ?? 0;
-            var startContentIds = _startContentIds ?? new[] { -1 };
-            var startMediaIds = _startMediaIds ?? new[] { -1 };
-            IEnumerable<IUserGroup> groups = _userGroupBuilders.Select(x => x.Build());
-
-            var result = new User(
-                globalSettings,
-                name,
-                email,
-                username,
-                rawPasswordValue)
-            {
-                Id = id,
-                Key = key,
-                CreateDate = createDate,
-                UpdateDate = updateDate,
-                Language = language,
-                FailedPasswordAttempts = failedPasswordAttempts,
-                IsApproved = isApproved,
-                IsLockedOut = isLockedOut,
-                LastLockoutDate = lastLockoutDate,
-                LastLoginDate = lastLoginDate,
-                LastPasswordChangeDate = lastPasswordChangeDate,
-                Comments = comments,
-                SessionTimeout = sessionTimeout,
-                StartContentIds = startContentIds,
-                StartMediaIds = startMediaIds,
-            };
-            foreach (IUserGroup readOnlyUserGroup in groups)
-            {
-                result.AddGroup(readOnlyUserGroup.ToReadOnlyGroup());
-            }
-
-            return result;
-        }
-
-        public static IEnumerable<IUser> CreateMulipleUsers(int amount, Action<int, IUser> onCreating = null)
-        {
-            var list = new List<IUser>();
-
-            for (var i = 0; i < amount; i++)
-            {
-                var name = "User No-" + i;
-                User user = new UserBuilder()
-                    .WithName(name)
-                    .WithEmail("test" + i + "@test.com")
-                    .WithLogin("test" + i, "test" + i)
-                    .Build();
-
-                onCreating?.Invoke(i, user);
-
-                user.ResetDirtyProperties(false);
-
-                list.Add(user);
-            }
-
-            return list;
-        }
-
-        public static User CreateUser(string suffix = "") =>
-            new UserBuilder()
-                .WithIsApproved(true)
-                .WithName("TestUser" + suffix)
-                .WithLogin("TestUser" + suffix, "testing")
-                .WithEmail("test" + suffix + "@test.com")
-                .Build();
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
-
-        string IWithLoginBuilder.Username
-        {
-            get => _username;
-            set => _username = value;
-        }
-
-        string IWithLoginBuilder.RawPasswordValue
-        {
-            get => _rawPasswordValue;
-            set => _rawPasswordValue = value;
-        }
-
-        string IWithLoginBuilder.PasswordConfig
-        {
-            get => _passwordConfig;
-            set => _passwordConfig = value;
-        }
-
-        string IWithEmailBuilder.Email
-        {
-            get => _email;
-            set => _email = value;
-        }
-
-        int? IWithFailedPasswordAttemptsBuilder.FailedPasswordAttempts
-        {
-            get => _failedPasswordAttempts;
-            set => _failedPasswordAttempts = value;
-        }
-
-        bool? IWithIsApprovedBuilder.IsApproved
-        {
-            get => _isApproved;
-            set => _isApproved = value;
-        }
-
-        bool? IWithIsLockedOutBuilder.IsLockedOut
-        {
-            get => _isLockedOut;
-            set => _isLockedOut = value;
-        }
-
-        DateTime? IWithIsLockedOutBuilder.LastLockoutDate
-        {
-            get => _lastLockoutDate;
-            set => _lastLockoutDate = value;
-        }
-
-        DateTime? IWithLastLoginDateBuilder.LastLoginDate
-        {
-            get => _lastLoginDate;
-            set => _lastLoginDate = value;
-        }
-
-        DateTime? IWithLastPasswordChangeDateBuilder.LastPasswordChangeDate
-        {
-            get => _lastPasswordChangeDate;
-            set => _lastPasswordChangeDate = value;
-        }
     }
 }
+
+public class UserBuilder<TParent>
+    : ChildBuilderBase<TParent, User>,
+        IWithIdBuilder,
+        IWithKeyBuilder,
+        IWithCreateDateBuilder,
+        IWithUpdateDateBuilder,
+        IWithNameBuilder,
+        IAccountBuilder
+{
+    private readonly List<UserGroupBuilder<UserBuilder<TParent>>> _userGroupBuilders = new();
+    private string _comments;
+    private DateTime? _createDate;
+    private string _defaultLang;
+    private string _email;
+    private int? _failedPasswordAttempts;
+    private int? _id;
+    private bool? _isApproved;
+    private bool? _isLockedOut;
+    private Guid? _key;
+    private string _language;
+    private DateTime? _lastLockoutDate;
+    private DateTime? _lastLoginDate;
+    private DateTime? _lastPasswordChangeDate;
+    private string _name;
+    private string _rawPasswordValue;
+    private int? _sessionTimeout;
+    private int[] _startContentIds;
+    private int[] _startMediaIds;
+    private string _suffix = string.Empty;
+    private DateTime? _updateDate;
+    private string _username;
+
+    public UserBuilder(TParent parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    string IWithLoginBuilder.Username
+    {
+        get => _username;
+        set => _username = value;
+    }
+
+    string IWithLoginBuilder.RawPasswordValue
+    {
+        get => _rawPasswordValue;
+        set => _rawPasswordValue = value;
+    }
+
+    string IWithLoginBuilder.PasswordConfig { get; set; }
+
+    string IWithEmailBuilder.Email
+    {
+        get => _email;
+        set => _email = value;
+    }
+
+    int? IWithFailedPasswordAttemptsBuilder.FailedPasswordAttempts
+    {
+        get => _failedPasswordAttempts;
+        set => _failedPasswordAttempts = value;
+    }
+
+    bool? IWithIsApprovedBuilder.IsApproved
+    {
+        get => _isApproved;
+        set => _isApproved = value;
+    }
+
+    bool? IWithIsLockedOutBuilder.IsLockedOut
+    {
+        get => _isLockedOut;
+        set => _isLockedOut = value;
+    }
+
+    DateTime? IWithIsLockedOutBuilder.LastLockoutDate
+    {
+        get => _lastLockoutDate;
+        set => _lastLockoutDate = value;
+    }
+
+    DateTime? IWithLastLoginDateBuilder.LastLoginDate
+    {
+        get => _lastLoginDate;
+        set => _lastLoginDate = value;
+    }
+
+    DateTime? IWithLastPasswordChangeDateBuilder.LastPasswordChangeDate
+    {
+        get => _lastPasswordChangeDate;
+        set => _lastPasswordChangeDate = value;
+    }
+
+    DateTime? IWithCreateDateBuilder.CreateDate
+    {
+        get => _createDate;
+        set => _createDate = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    Guid? IWithKeyBuilder.Key
+    {
+        get => _key;
+        set => _key = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    DateTime? IWithUpdateDateBuilder.UpdateDate
+    {
+        get => _updateDate;
+        set => _updateDate = value;
+    }
+
+    public UserBuilder<TParent> WithDefaultUILanguage(string defaultLang)
+    {
+        _defaultLang = defaultLang;
+        return this;
+    }
+
+    public UserBuilder<TParent> WithLanguage(string language)
+    {
+        _language = language;
+        return this;
+    }
+
+    public UserBuilder<TParent> WithUsername(string username)
+    {
+        _username = username;
+        return this;
+    }
+
+    public UserBuilder<TParent> WithComments(string comments)
+    {
+        _comments = comments;
+        return this;
+    }
+
+    public UserBuilder<TParent> WithSessionTimeout(int sessionTimeout)
+    {
+        _sessionTimeout = sessionTimeout;
+        return this;
+    }
+
+    public UserBuilder<TParent> WithStartContentId(int startContentId)
+    {
+        _startContentIds = new[] { startContentId };
+        return this;
+    }
+
+    public UserBuilder<TParent> WithStartContentIds(int[] startContentIds)
+    {
+        _startContentIds = startContentIds;
+        return this;
+    }
+
+    public UserBuilder<TParent> WithStartMediaId(int startMediaId)
+    {
+        _startMediaIds = new[] { startMediaId };
+        return this;
+    }
+
+    public UserBuilder<TParent> WithStartMediaIds(int[] startMediaIds)
+    {
+        _startMediaIds = startMediaIds;
+        return this;
+    }
+
+    public UserBuilder<TParent> WithSuffix(string suffix)
+    {
+        _suffix = suffix;
+        return this;
+    }
+
+    public UserGroupBuilder<UserBuilder<TParent>> AddUserGroup()
+    {
+        var builder = new UserGroupBuilder<UserBuilder<TParent>>(this);
+        _userGroupBuilders.Add(builder);
+        return builder;
+    }
+
+    public override User Build()
+    {
+        var id = _id ?? 0;
+        var defaultLang = _defaultLang ?? "en";
+        var globalSettings = new GlobalSettings { DefaultUILanguage = defaultLang };
+        var key = _key ?? Guid.NewGuid();
+        var createDate = _createDate ?? DateTime.Now;
+        var updateDate = _updateDate ?? DateTime.Now;
+        var name = _name ?? "TestUser" + _suffix;
+        var language = _language ?? globalSettings.DefaultUILanguage;
+        var username = _username ?? "TestUser" + _suffix;
+        var email = _email ?? "test" + _suffix + "@test.com";
+        var rawPasswordValue = _rawPasswordValue ?? "abcdefghijklmnopqrstuvwxyz";
+        var failedPasswordAttempts = _failedPasswordAttempts ?? 0;
+        var isApproved = _isApproved ?? false;
+        var isLockedOut = _isLockedOut ?? false;
+        var lastLockoutDate = _lastLockoutDate ?? DateTime.Now;
+        var lastLoginDate = _lastLoginDate ?? DateTime.Now;
+        var lastPasswordChangeDate = _lastPasswordChangeDate ?? DateTime.Now;
+        var comments = _comments ?? string.Empty;
+        var sessionTimeout = _sessionTimeout ?? 0;
+        var startContentIds = _startContentIds ?? new[] { -1 };
+        var startMediaIds = _startMediaIds ?? new[] { -1 };
+        var groups = _userGroupBuilders.Select(x => x.Build());
+
+        var result = new User(
+            globalSettings,
+            name,
+            email,
+            username,
+            rawPasswordValue)
+        {
+            Id = id,
+            Key = key,
+            CreateDate = createDate,
+            UpdateDate = updateDate,
+            Language = language,
+            FailedPasswordAttempts = failedPasswordAttempts,
+            IsApproved = isApproved,
+            IsLockedOut = isLockedOut,
+            LastLockoutDate = lastLockoutDate,
+            LastLoginDate = lastLoginDate,
+            LastPasswordChangeDate = lastPasswordChangeDate,
+            Comments = comments,
+            SessionTimeout = sessionTimeout,
+            StartContentIds = startContentIds,
+            StartMediaIds = startMediaIds
+        };
+        foreach (var readOnlyUserGroup in groups)
+        {
+            result.AddGroup(readOnlyUserGroup.ToReadOnlyGroup());
+        }
+
+        return result;
+    }
+
+    public static IEnumerable<IUser> CreateMulipleUsers(int amount, Action<int, IUser> onCreating = null)
+    {
+        var list = new List<IUser>();
+
+        for (var i = 0; i < amount; i++)
+        {
+            var name = "User No-" + i;
+            var user = new UserBuilder()
+                .WithName(name)
+                .WithEmail("test" + i + "@test.com")
+                .WithLogin("test" + i, "test" + i)
+                .Build();
+
+            onCreating?.Invoke(i, user);
+
+            user.ResetDirtyProperties(false);
+
+            list.Add(user);
+        }
+
+        return list;
+    }
+
+    public static User CreateUser(string suffix = "") =>
+        new UserBuilder()
+            .WithIsApproved(true)
+            .WithName("TestUser" + suffix)
+            .WithLogin("TestUser" + suffix, "testing")
+            .WithEmail("test" + suffix + "@test.com")
+            .Build();
+}
diff --git a/tests/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs b/tests/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
index bec92bcd8e..c5216f2cc8 100644
--- a/tests/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/UserGroupBuilder.cs
@@ -6,157 +6,161 @@ using System.Linq;
 using Moq;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Cms.Tests.Common.Builders.Interfaces;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class UserGroupBuilder : UserGroupBuilder<object>
 {
-    public class UserGroupBuilder : UserGroupBuilder<object>
+    public UserGroupBuilder()
+        : base(null)
     {
-        public UserGroupBuilder()
-            : base(null)
-        {
-        }
-    }
-
-    public class UserGroupBuilder<TParent>
-        : ChildBuilderBase<TParent, IUserGroup>,
-            IWithIdBuilder,
-            IWithIconBuilder,
-            IWithAliasBuilder,
-            IWithNameBuilder
-    {
-        private int? _id;
-        private string _alias;
-        private string _icon;
-        private string _name;
-        private IEnumerable<string> _permissions = Enumerable.Empty<string>();
-        private IEnumerable<string> _allowedSections = Enumerable.Empty<string>();
-        private string _suffix;
-        private int? _startContentId;
-        private int? _startMediaId;
-        private int? _userCount;
-
-        public UserGroupBuilder(TParent parentBuilder)
-            : base(parentBuilder)
-        {
-        }
-
-        /// <summary>
-        /// Will suffix the name, email and username for testing.
-        /// </summary>
-        /// <param name="suffix">Suffix to add to user group properties.</param>
-        /// <returns>Current builder instance.</returns>
-        public UserGroupBuilder<TParent> WithSuffix(string suffix)
-        {
-            _suffix = suffix;
-            return this;
-        }
-
-        public UserGroupBuilder<TParent> WithUserCount(int userCount)
-        {
-            _userCount = userCount;
-            return this;
-        }
-
-        public UserGroupBuilder<TParent> WithPermissions(string permissions)
-        {
-            _permissions = permissions.ToCharArray().Select(x => x.ToString());
-            return this;
-        }
-
-        public UserGroupBuilder<TParent> WithPermissions(IList<string> permissions)
-        {
-            _permissions = permissions;
-            return this;
-        }
-
-        public UserGroupBuilder<TParent> WithAllowedSections(IList<string> allowedSections)
-        {
-            _allowedSections = allowedSections;
-            return this;
-        }
-
-        public UserGroupBuilder<TParent> WithStartContentId(int startContentId)
-        {
-            _startContentId = startContentId;
-            return this;
-        }
-
-        public UserGroupBuilder<TParent> WithStartMediaId(int startMediaId)
-        {
-            _startMediaId = startMediaId;
-            return this;
-        }
-
-        public IReadOnlyUserGroup BuildReadOnly(IUserGroup userGroup) =>
-            Mock.Of<IReadOnlyUserGroup>(x =>
-                x.Permissions == userGroup.Permissions &&
-                x.Alias == userGroup.Alias &&
-                x.Icon == userGroup.Icon &&
-                x.Name == userGroup.Name &&
-                x.StartContentId == userGroup.StartContentId &&
-                x.StartMediaId == userGroup.StartMediaId &&
-                x.AllowedSections == userGroup.AllowedSections &&
-                x.Id == userGroup.Id);
-
-        public override IUserGroup Build()
-        {
-            var id = _id ?? 0;
-            var name = _name ?? ("TestUserGroup" + _suffix);
-            var alias = _alias ?? ("testUserGroup" + _suffix);
-            var userCount = _userCount ?? 0;
-            var startContentId = _startContentId ?? -1;
-            var startMediaId = _startMediaId ?? -1;
-            var icon = _icon ?? "icon-group";
-
-            var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
-
-            var userGroup = new UserGroup(shortStringHelper, userCount, alias, name, _permissions, icon)
-            {
-                Id = id,
-                StartContentId = startContentId,
-                StartMediaId = startMediaId
-            };
-
-            foreach (var section in _allowedSections)
-            {
-                userGroup.AddAllowedSection(section);
-            }
-
-            return userGroup;
-        }
-
-        public static UserGroup CreateUserGroup(string alias = "testGroup", string name = "Test Group", string suffix = "", string[] permissions = null, string[] allowedSections = null) =>
-            (UserGroup)new UserGroupBuilder()
-                .WithAlias(alias + suffix)
-                .WithName(name + suffix)
-                .WithPermissions(permissions ?? new[] { "A", "B", "C" })
-                .WithAllowedSections(allowedSections ?? new[] { "content", "media" })
-                .Build();
-
-        int? IWithIdBuilder.Id
-        {
-            get => _id;
-            set => _id = value;
-        }
-
-        string IWithIconBuilder.Icon
-        {
-            get => _icon;
-            set => _icon = value;
-        }
-
-        string IWithAliasBuilder.Alias
-        {
-            get => _alias;
-            set => _alias = value;
-        }
-
-        string IWithNameBuilder.Name
-        {
-            get => _name;
-            set => _name = value;
-        }
     }
 }
+
+public class UserGroupBuilder<TParent>
+    : ChildBuilderBase<TParent, IUserGroup>,
+        IWithIdBuilder,
+        IWithIconBuilder,
+        IWithAliasBuilder,
+        IWithNameBuilder
+{
+    private string _alias;
+    private IEnumerable<string> _allowedSections = Enumerable.Empty<string>();
+    private string _icon;
+    private int? _id;
+    private string _name;
+    private IEnumerable<string> _permissions = Enumerable.Empty<string>();
+    private int? _startContentId;
+    private int? _startMediaId;
+    private string _suffix;
+    private int? _userCount;
+
+    public UserGroupBuilder(TParent parentBuilder)
+        : base(parentBuilder)
+    {
+    }
+
+    string IWithAliasBuilder.Alias
+    {
+        get => _alias;
+        set => _alias = value;
+    }
+
+    string IWithIconBuilder.Icon
+    {
+        get => _icon;
+        set => _icon = value;
+    }
+
+    int? IWithIdBuilder.Id
+    {
+        get => _id;
+        set => _id = value;
+    }
+
+    string IWithNameBuilder.Name
+    {
+        get => _name;
+        set => _name = value;
+    }
+
+    /// <summary>
+    ///     Will suffix the name, email and username for testing.
+    /// </summary>
+    /// <param name="suffix">Suffix to add to user group properties.</param>
+    /// <returns>Current builder instance.</returns>
+    public UserGroupBuilder<TParent> WithSuffix(string suffix)
+    {
+        _suffix = suffix;
+        return this;
+    }
+
+    public UserGroupBuilder<TParent> WithUserCount(int userCount)
+    {
+        _userCount = userCount;
+        return this;
+    }
+
+    public UserGroupBuilder<TParent> WithPermissions(string permissions)
+    {
+        _permissions = permissions.ToCharArray().Select(x => x.ToString());
+        return this;
+    }
+
+    public UserGroupBuilder<TParent> WithPermissions(IList<string> permissions)
+    {
+        _permissions = permissions;
+        return this;
+    }
+
+    public UserGroupBuilder<TParent> WithAllowedSections(IList<string> allowedSections)
+    {
+        _allowedSections = allowedSections;
+        return this;
+    }
+
+    public UserGroupBuilder<TParent> WithStartContentId(int startContentId)
+    {
+        _startContentId = startContentId;
+        return this;
+    }
+
+    public UserGroupBuilder<TParent> WithStartMediaId(int startMediaId)
+    {
+        _startMediaId = startMediaId;
+        return this;
+    }
+
+    public IReadOnlyUserGroup BuildReadOnly(IUserGroup userGroup) =>
+        Mock.Of<IReadOnlyUserGroup>(x =>
+            x.Permissions == userGroup.Permissions &&
+            x.Alias == userGroup.Alias &&
+            x.Icon == userGroup.Icon &&
+            x.Name == userGroup.Name &&
+            x.StartContentId == userGroup.StartContentId &&
+            x.StartMediaId == userGroup.StartMediaId &&
+            x.AllowedSections == userGroup.AllowedSections &&
+            x.Id == userGroup.Id);
+
+    public override IUserGroup Build()
+    {
+        var id = _id ?? 0;
+        var name = _name ?? "TestUserGroup" + _suffix;
+        var alias = _alias ?? "testUserGroup" + _suffix;
+        var userCount = _userCount ?? 0;
+        var startContentId = _startContentId ?? -1;
+        var startMediaId = _startMediaId ?? -1;
+        var icon = _icon ?? "icon-group";
+
+        var shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+        var userGroup = new UserGroup(shortStringHelper, userCount, alias, name, _permissions, icon)
+        {
+            Id = id,
+            StartContentId = startContentId,
+            StartMediaId = startMediaId
+        };
+
+        foreach (var section in _allowedSections)
+        {
+            userGroup.AddAllowedSection(section);
+        }
+
+        return userGroup;
+    }
+
+    public static UserGroup CreateUserGroup(
+        string alias = "testGroup",
+        string name = "Test Group",
+        string suffix = "",
+        string[] permissions = null,
+        string[] allowedSections = null) =>
+        (UserGroup)new UserGroupBuilder()
+            .WithAlias(alias + suffix)
+            .WithName(name + suffix)
+            .WithPermissions(permissions ?? new[] { "A", "B", "C" })
+            .WithAllowedSections(allowedSections ?? new[] { "content", "media" })
+            .Build();
+}
diff --git a/tests/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs b/tests/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs
index 17a07bf9b2..2bdb721255 100644
--- a/tests/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs
+++ b/tests/Umbraco.Tests.Common/Builders/XmlDocumentBuilder.cs
@@ -3,27 +3,12 @@
 
 using System.Xml;
 
-namespace Umbraco.Cms.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.Common.Builders;
+
+public class XmlDocumentBuilder : BuilderBase<XmlDocument>
 {
-    public class XmlDocumentBuilder : BuilderBase<XmlDocument>
-    {
-        private string _content;
-
-        public XmlDocumentBuilder WithContent(string content)
-        {
-            _content = content;
-            return this;
-        }
-
-        public override XmlDocument Build()
-        {
-            var xml = new XmlDocument();
-            xml.LoadXml(_content ?? DefaultContent);
-            return xml;
-        }
-
-        private const string DefaultContent =
-            @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private const string DefaultContent =
+        @"<?xml version=""1.0"" encoding=""utf-8""?>
             <!DOCTYPE root[
             <!ELEMENT Home ANY>
             <!ATTLIST Home id ID #REQUIRED>
@@ -124,5 +109,19 @@ namespace Umbraco.Cms.Tests.Common.Builders
                 </Home>
                 <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""1   "" sortOrder=""1"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
             </root>";
+
+    private string _content;
+
+    public XmlDocumentBuilder WithContent(string content)
+    {
+        _content = content;
+        return this;
+    }
+
+    public override XmlDocument Build()
+    {
+        var xml = new XmlDocument();
+        xml.LoadXml(_content ?? DefaultContent);
+        return xml;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs b/tests/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs
index b4b95f777e..61425a4292 100644
--- a/tests/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs
+++ b/tests/Umbraco.Tests.Common/Extensions/ContentBaseExtensions.cs
@@ -2,37 +2,36 @@
 // See LICENSE for more details.
 
 using System;
-using System.Reflection;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.Common.Extensions
+namespace Umbraco.Cms.Tests.Common.Extensions;
+
+public static class ContentBaseExtensions
 {
-    public static class ContentBaseExtensions
+    /// <summary>
+    ///     Set property values by alias with an anonymous object.
+    /// </summary>
+    /// <remarks>Does not support variants.</remarks>
+    public static void PropertyValues(this IContentBase content, object value, string? culture = null, string? segment = null)
     {
-        /// <summary>
-        /// Set property values by alias with an anonymous object.
-        /// </summary>
-        /// <remarks>Does not support variants.</remarks>
-        public static void PropertyValues(this IContentBase content, object value, string? culture = null, string? segment = null)
+        if (value == null)
         {
-            if (value == null)
+            throw new Exception("No properties has been passed in");
+        }
+
+        var propertyInfos = value.GetType().GetProperties();
+        foreach (var propertyInfo in propertyInfos)
+        {
+            if (!content.Properties.TryGetValue(propertyInfo.Name, out var property))
             {
-                throw new Exception("No properties has been passed in");
+                throw new Exception(
+                    $"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
             }
 
-            PropertyInfo[] propertyInfos = value.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in propertyInfos)
-            {
-                if (!content.Properties.TryGetValue(propertyInfo.Name, out var property))
-                {
-                    throw new Exception($"The property alias {propertyInfo.Name} is not valid, because no PropertyType with this alias exists");
-                }
+            property.SetValue(propertyInfo.GetValue(value, null), culture, segment);
 
-                property.SetValue(propertyInfo.GetValue(value, null), culture, segment);
-
-                // Update item with newly added value
-                content.Properties.Add(property);
-            }
+            // Update item with newly added value
+            content.Properties.Add(property);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Extensions/StringExtensions.cs b/tests/Umbraco.Tests.Common/Extensions/StringExtensions.cs
index b5ce0b6a88..bf3235a440 100644
--- a/tests/Umbraco.Tests.Common/Extensions/StringExtensions.cs
+++ b/tests/Umbraco.Tests.Common/Extensions/StringExtensions.cs
@@ -4,7 +4,7 @@ public static class StringExtensions
 {
     public static string StripNewLines(this string input) =>
         input.Replace("\r\n", string.Empty)
-             .Replace("\n", string.Empty);
+            .Replace("\n", string.Empty);
 
     public static string NormalizeNewLines(this string input) =>
         input.Replace("\r\n", "\n");
diff --git a/tests/Umbraco.Tests.Common/Published/PublishedContentXml.cs b/tests/Umbraco.Tests.Common/Published/PublishedContentXml.cs
index f59445291e..3019b9ecd7 100644
--- a/tests/Umbraco.Tests.Common/Published/PublishedContentXml.cs
+++ b/tests/Umbraco.Tests.Common/Published/PublishedContentXml.cs
@@ -3,13 +3,13 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.Common.Published
+namespace Umbraco.Cms.Tests.Common.Published;
+
+public static class PublishedContentXml
 {
-    public static class PublishedContentXml
-    {
-        // The content XML that was used for the old PublishContentCacheTests
-        public static string PublishContentCacheTestsXml()
-            => @"<?xml version=""1.0"" encoding=""utf-8""?><!DOCTYPE root[
+    // The content XML that was used for the old PublishContentCacheTests
+    public static string PublishContentCacheTestsXml()
+        => @"<?xml version=""1.0"" encoding=""utf-8""?><!DOCTYPE root[
 <!ELEMENT Home ANY>
 <!ATTLIST Home id ID #REQUIRED>
 
@@ -30,9 +30,9 @@ namespace Umbraco.Cms.Tests.Common.Published
     <Home id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1045"" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
 </root>";
 
-        // The content XML that was used in the old BaseWebTest class
-        public static string BaseWebTestXml(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    // The content XML that was used in the old BaseWebTest class
+    public static string BaseWebTestXml(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Home ANY>
 <!ATTLIST Home id ID #REQUIRED>
@@ -40,35 +40,55 @@ namespace Umbraco.Cms.Tests.Common.Published
 <!ATTLIST CustomDocument id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
+    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
         <content><![CDATA[]]></content>
         <umbracoUrlAlias><![CDATA[this/is/my/alias, anotheralias]]></umbracoUrlAlias>
         <umbracoNaviHide>1</umbracoNaviHide>
-        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""">
+        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias]]></umbracoUrlAlias>
-            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
+            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[only/one/alias]]></umbracoUrlAlias>
                 <creatorName><![CDATA[Custom data with same property name as the member name]]></creatorName>
             </Home>
-            <Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""">
+            <Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Home>
-            <CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""" />
-            <CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""" />
-            <CustomDocument id=""1179"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 3 with accént character"" urlName=""custom-sub-3-with-accént-character"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1179"" isDoc="""" />
-            <CustomDocument id=""1180"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 4 with æøå"" urlName=""custom-sub-4-with-æøå"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1180"" isDoc="""" />
+            <CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""" />
+            <CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""" />
+            <CustomDocument id=""1179"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 3 with accént character"" urlName=""custom-sub-3-with-accént-character"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1179"" isDoc="""" />
+            <CustomDocument id=""1180"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 4 with æøå"" urlName=""custom-sub-4-with-æøå"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1180"" isDoc="""" />
         </Home>
-        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
+        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
         </Home>
     </Home>
-    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
+    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
 </root>";
 
-        // The content XML that was used in the old TestWithDatabase class
-        public static string TestWithDatabaseXml(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    // The content XML that was used in the old TestWithDatabase class
+    public static string TestWithDatabaseXml(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Home ANY>
 <!ATTLIST Home id ID #REQUIRED>
@@ -76,33 +96,49 @@ namespace Umbraco.Cms.Tests.Common.Published
 <!ATTLIST CustomDocument id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
+    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
         <content><![CDATA[]]></content>
         <umbracoUrlAlias><![CDATA[this/is/my/alias, anotheralias]]></umbracoUrlAlias>
         <umbracoNaviHide>1</umbracoNaviHide>
-        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""">
+        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias]]></umbracoUrlAlias>
-            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
+            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[only/one/alias]]></umbracoUrlAlias>
                 <creatorName><![CDATA[Custom data with same property name as the member name]]></creatorName>
             </Home>
-            <Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""">
+            <Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Home>
-            <CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""" />
-            <CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""" />
+            <CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""" />
+            <CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""" />
         </Home>
-        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
+        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
         </Home>
     </Home>
-    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
+    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
 </root>";
 
-        // The content XML that was used in the old PublishedContentTest class
-        public static string PublishedContentTestXml(int templateId, Guid node1173Guid)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    // The content XML that was used in the old PublishedContentTest class
+    public static string PublishedContentTestXml(int templateId, Guid node1173Guid)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Home ANY>
 <!ATTLIST Home id ID #REQUIRED>
@@ -110,43 +146,65 @@ namespace Umbraco.Cms.Tests.Common.Published
 <!ATTLIST CustomDocument id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
+    <Home id=""1046"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc="""">
         <content><![CDATA[]]></content>
         <umbracoUrlAlias><![CDATA[this/is/my/alias, anotheralias]]></umbracoUrlAlias>
         <umbracoNaviHide>1</umbracoNaviHide>
         <testRecursive><![CDATA[This is the recursive val]]></testRecursive>
-        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""" key=""" + node1173Guid + @""">
+        <Home id=""1173"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""sub1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173"" isDoc="""" key=""" +
+           node1173Guid + @""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias]]></umbracoUrlAlias>
             <testRecursive><![CDATA[]]></testRecursive>
-            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
+            <Home id=""1174"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""sub2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1174"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[only/one/alias]]></umbracoUrlAlias>
                 <creatorName><![CDATA[Custom data with same property name as the member name]]></creatorName>
                 <testRecursive><![CDATA[]]></testRecursive>
             </Home>
-			<CustomDocument id=""117"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2018-07-18T10:06:37"" updateDate=""2018-07-18T10:06:37"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,117"" isDoc="""">
+			<CustomDocument id=""117"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2018-07-18T10:06:37"" updateDate=""2018-07-18T10:06:37"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,117"" isDoc="""">
                 <umbracoNaviHide>0</umbracoNaviHide>
             </CustomDocument>
-			<CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""">
+			<CustomDocument id=""1177"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub 1"" urlName=""custom-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1177"" isDoc="""">
                 <umbracoNaviHide>0</umbracoNaviHide>
             </CustomDocument>
-			<CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""">
+			<CustomDocument id=""1178"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""4"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-16T14:23:35"" nodeName=""custom sub 2"" urlName=""custom-sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178"" isDoc="""">
                 <umbracoNaviHide>0</umbracoNaviHide>
-				<CustomDocument id=""1179"" parentID=""1178"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub sub 1"" urlName=""custom-sub-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178,1179"" isDoc="""" />
+				<CustomDocument id=""1179"" parentID=""1178"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""custom sub sub 1"" urlName=""custom-sub-sub-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1178,1179"" isDoc="""" />
 			</CustomDocument>
-			<Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""5"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""" key=""CDB83BBC-A83B-4BA6-93B8-AADEF67D3C09"">
+			<Home id=""1176"" parentID=""1173"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""5"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""sub-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1173,1176"" isDoc="""" key=""CDB83BBC-A83B-4BA6-93B8-AADEF67D3C09"">
                 <content><![CDATA[]]></content>
                 <umbracoNaviHide>1</umbracoNaviHide>
             </Home>
         </Home>
-        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
+        <Home id=""1175"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""sub-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,1175"" isDoc=""""><content><![CDATA[]]></content>
         </Home>
-        <CustomDocument id=""4444"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,4444"" isDoc="""">
+        <CustomDocument id=""4444"" parentID=""1046"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1046,4444"" isDoc="""">
             <selectedNodes><![CDATA[1172,1176,1173]]></selectedNodes>
         </CustomDocument>
     </Home>
-    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
+    <CustomDocument id=""1172"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""test-page"" writerName=""admin"" creatorName=""admin"" path=""-1,1172"" isDoc="""" />
 </root>";
-    }
 }
diff --git a/tests/Umbraco.Tests.Common/Published/PublishedContentXmlAdapter.cs b/tests/Umbraco.Tests.Common/Published/PublishedContentXmlAdapter.cs
index d24be5ceb7..816a5e4fba 100644
--- a/tests/Umbraco.Tests.Common/Published/PublishedContentXmlAdapter.cs
+++ b/tests/Umbraco.Tests.Common/Published/PublishedContentXmlAdapter.cs
@@ -1,145 +1,146 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Linq;
 using System.Xml.XPath;
-using System.Linq;
-using Umbraco.Extensions;
-using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Tests.Common.Builders;
-using System;
-using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
-using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Strings;
-using Umbraco.Cms.Core.PropertyEditors;
 using Moq;
+using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.Strings;
+using Umbraco.Cms.Infrastructure.PublishedCache;
+using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 using Umbraco.Cms.Infrastructure.Serialization;
+using Umbraco.Cms.Tests.Common.Builders;
+using Umbraco.Cms.Tests.Common.Builders.Extensions;
+using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Common.Published
+namespace Umbraco.Cms.Tests.Common.Published;
+
+/// <summary>
+///     Converts legacy Umbraco XML structures to NuCache <see cref="ContentNodeKit" /> collections
+///     to populate a test implementation of <see cref="INuCacheContentService" />
+/// </summary>
+/// <remarks>
+///     This does not support variant data because the XML structure doesn't support variant data.
+/// </remarks>
+public static class PublishedContentXmlAdapter
 {
     /// <summary>
-    /// Converts legacy Umbraco XML structures to NuCache <see cref="ContentNodeKit"/> collections
-    /// to populate a test implementation of <see cref="INuCacheContentService"/>
+    ///     Generate a collection of <see cref="ContentNodeKit" /> based on legacy umbraco XML
     /// </summary>
-    /// <remarks>
-    /// This does not support variant data because the XML structure doesn't support variant data.
-    /// </remarks>
-    public static class PublishedContentXmlAdapter
+    /// <param name="xml">The legacy umbraco XML</param>
+    /// <param name="shortStringHelper"></param>
+    /// <param name="contentTypes">Dynamically generates a list of <see cref="ContentType" />s based on the XML data</param>
+    /// <param name="dataTypes">Dynamically generates a list of <see cref="DataType" /> for tests</param>
+    /// <returns></returns>
+    public static IEnumerable<ContentNodeKit> GetContentNodeKits(
+        string xml,
+        IShortStringHelper shortStringHelper,
+        out ContentType[] contentTypes,
+        out DataType[] dataTypes)
     {
-        /// <summary>
-        /// Generate a collection of <see cref="ContentNodeKit"/> based on legacy umbraco XML
-        /// </summary>
-        /// <param name="xml">The legacy umbraco XML</param>
-        /// <param name="shortStringHelper"></param>
-        /// <param name="contentTypes">Dynamically generates a list of <see cref="ContentType"/>s based on the XML data</param>
-        /// <param name="dataTypes">Dynamically generates a list of <see cref="DataType"/> for tests</param>
-        /// <returns></returns>
-        public static IEnumerable<ContentNodeKit> GetContentNodeKits(
-            string xml,
-            IShortStringHelper shortStringHelper,
-            out ContentType[] contentTypes,
-            out DataType[] dataTypes)
+        // use the label data type for all data for these tests except in the case
+        // where a property is named 'content', in which case use the RTE.
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var labelDataType =
+            new DataType(new VoidEditor("Label", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 3 };
+        var rteDataType = new DataType(new VoidEditor("RTE", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 4 };
+        dataTypes = new[] { labelDataType, rteDataType };
+
+        var kitsAndXml = new List<(ContentNodeKit kit, XElement node)>();
+
+        var xDoc = XDocument.Parse(xml);
+        var nodes = xDoc.XPathSelectElements("//*[@isDoc]");
+        foreach (var node in nodes)
         {
-            // use the label data type for all data for these tests except in the case
-            // where a property is named 'content', in which case use the RTE. 
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var labelDataType = new DataType(new VoidEditor("Label", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 3 };
-            var rteDataType = new DataType(new VoidEditor("RTE", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 4 };
-            dataTypes = new[] { labelDataType, rteDataType };
+            var id = node.AttributeValue<int>("id");
+            var key = node.AttributeValue<Guid?>("key") ?? id.ToGuid();
 
-            var kitsAndXml = new List<(ContentNodeKit kit, XElement node)>();
-
-            var xDoc = XDocument.Parse(xml);
-            IEnumerable<XElement> nodes = xDoc.XPathSelectElements("//*[@isDoc]");
-            foreach (XElement node in nodes)
+            var propertyElements = node.Elements().Where(x => x.Attribute("id") == null);
+            var properties = new Dictionary<string, PropertyData[]>();
+            foreach (var propertyElement in propertyElements)
             {
-                var id = node.AttributeValue<int>("id");
-                Guid key = node.AttributeValue<Guid?>("key") ?? id.ToGuid();
-
-                var propertyElements = node.Elements().Where(x => x.Attribute("id") == null);
-                var properties = new Dictionary<string, PropertyData[]>();
-                foreach(XElement propertyElement in propertyElements)
+                properties[propertyElement.Name.LocalName] = new[]
                 {
-                    properties[propertyElement.Name.LocalName] = new[]
-                    {
-                        // TODO: builder? 
-                        new PropertyData
-                        {
-                            Culture = string.Empty,
-                            Segment = string.Empty,
-                            Value = propertyElement.Value
-                        }
-                    };
-                }
-
-                var contentData = new ContentDataBuilder()
-                    .WithName(node.AttributeValue<string>("nodeName"))
-                    .WithProperties(properties)
-                    .WithPublished(true)
-                    .WithTemplateId(node.AttributeValue<int>("template"))
-                    .WithUrlSegment(node.AttributeValue<string>("urlName"))
-                    .WithVersionDate(node.AttributeValue<DateTime>("updateDate"))
-                    .WithWriterId(node.AttributeValue<int>("writerID"))
-                    .Build();
-
-                ContentNodeKit kit = ContentNodeKitBuilder.CreateWithContent(
-                    node.AttributeValue<int>("nodeType"),
-                    id,
-                    node.AttributeValue<string>("path"),
-                    node.AttributeValue<int>("sortOrder"),
-                    node.AttributeValue<int>("level"),
-                    node.AttributeValue<int>("parentID"),
-                    node.AttributeValue<int>("creatorID"),
-                    key,
-                    node.AttributeValue<DateTime>("createDate"),
-                    contentData,
-                    contentData);
-
-                kitsAndXml.Add((kit, node));
+                    // TODO: builder?
+                    new PropertyData {Culture = string.Empty, Segment = string.Empty, Value = propertyElement.Value}
+                };
             }
 
-            // put together the unique content types
-            var contentTypesIdToType = new Dictionary<int, ContentType>();
-            foreach((ContentNodeKit kit, XElement node) in kitsAndXml)
-            {
-                if (!contentTypesIdToType.TryGetValue(kit.ContentTypeId, out ContentType contentType))
-                {
-                    contentType = new ContentType(shortStringHelper, -1)
-                    {
-                        Id = kit.ContentTypeId,
-                        Alias = node.Name.LocalName
-                    };
-                    SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
-                    contentTypesIdToType[kit.ContentTypeId] = contentType;
-                }
-                else
-                {
-                    // we've already created it but might need to add properties
-                    SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
-                } 
-            }
+            var contentData = new ContentDataBuilder()
+                .WithName(node.AttributeValue<string>("nodeName"))
+                .WithProperties(properties)
+                .WithPublished(true)
+                .WithTemplateId(node.AttributeValue<int>("template"))
+                .WithUrlSegment(node.AttributeValue<string>("urlName"))
+                .WithVersionDate(node.AttributeValue<DateTime>("updateDate"))
+                .WithWriterId(node.AttributeValue<int>("writerID"))
+                .Build();
 
-            contentTypes = contentTypesIdToType.Values.ToArray();
+            var kit = ContentNodeKitBuilder.CreateWithContent(
+                node.AttributeValue<int>("nodeType"),
+                id,
+                node.AttributeValue<string>("path"),
+                node.AttributeValue<int>("sortOrder"),
+                node.AttributeValue<int>("level"),
+                node.AttributeValue<int>("parentID"),
+                node.AttributeValue<int>("creatorID"),
+                key,
+                node.AttributeValue<DateTime>("createDate"),
+                contentData,
+                contentData);
 
-            return kitsAndXml.Select(x => x.kit);
+            kitsAndXml.Add((kit, node));
         }
 
-        private static void SetContentTypeProperties(IShortStringHelper shortStringHelper, DataType labelDataType, DataType rteDataType, ContentNodeKit kit, ContentType contentType)
+        // put together the unique content types
+        var contentTypesIdToType = new Dictionary<int, ContentType>();
+        foreach ((var kit, var node) in kitsAndXml)
         {
-            foreach (KeyValuePair<string, PropertyData[]> property in kit.DraftData.Properties)
+            if (!contentTypesIdToType.TryGetValue(kit.ContentTypeId, out var contentType))
             {
-                var propertyType = new PropertyType(shortStringHelper, labelDataType, property.Key);
-
-                if (!contentType.PropertyTypeExists(propertyType.Alias))
+                contentType = new ContentType(shortStringHelper, -1)
                 {
-                    if (propertyType.Alias == "content")
-                    {
-                        propertyType.DataTypeId = rteDataType.Id;
-                    }
-                    contentType.AddPropertyType(propertyType);
+                    Id = kit.ContentTypeId,
+                    Alias = node.Name.LocalName
+                };
+                SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
+                contentTypesIdToType[kit.ContentTypeId] = contentType;
+            }
+            else
+            {
+                // we've already created it but might need to add properties
+                SetContentTypeProperties(shortStringHelper, labelDataType, rteDataType, kit, contentType);
+            }
+        }
+
+        contentTypes = contentTypesIdToType.Values.ToArray();
+
+        return kitsAndXml.Select(x => x.kit);
+    }
+
+    private static void SetContentTypeProperties(
+        IShortStringHelper shortStringHelper,
+        DataType labelDataType,
+        DataType rteDataType,
+        ContentNodeKit kit,
+        ContentType contentType)
+    {
+        foreach (var property in kit.DraftData.Properties)
+        {
+            var propertyType = new PropertyType(shortStringHelper, labelDataType, property.Key);
+
+            if (!contentType.PropertyTypeExists(propertyType.Alias))
+            {
+                if (propertyType.Alias == "content")
+                {
+                    propertyType.DataTypeId = rteDataType.Id;
                 }
+
+                contentType.AddPropertyType(propertyType);
             }
         }
     }
diff --git a/tests/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs b/tests/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs
index 764f646ad8..d3867ce936 100644
--- a/tests/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs
+++ b/tests/Umbraco.Tests.Common/Published/PublishedSnapshotTestObjects.cs
@@ -6,53 +6,53 @@ using Moq;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Common.Published
+namespace Umbraco.Cms.Tests.Common.Published;
+
+public class PublishedSnapshotTestObjects
 {
-
-    public class PublishedSnapshotTestObjects
+    [PublishedModel("element1")]
+    public class TestElementModel1 : PublishedElementModel
     {
-        [PublishedModel("element1")]
-        public class TestElementModel1 : PublishedElementModel
+        public TestElementModel1(IPublishedElement content, IPublishedValueFallback fallback)
+            : base(content, fallback)
         {
-            public TestElementModel1(IPublishedElement content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
-
-            public string Prop1 => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop1");
         }
 
-        [PublishedModel("element2")]
-        public class TestElementModel2 : PublishedElementModel
-        {
-            public TestElementModel2(IPublishedElement content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
+        public string Prop1 => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop1");
+    }
 
-            public IEnumerable<TestContentModel1> Prop2 => this.Value<IEnumerable<TestContentModel1>>(Mock.Of<IPublishedValueFallback>(), "prop2");
+    [PublishedModel("element2")]
+    public class TestElementModel2 : PublishedElementModel
+    {
+        public TestElementModel2(IPublishedElement content, IPublishedValueFallback fallback)
+            : base(content, fallback)
+        {
         }
 
-        [PublishedModel("content1")]
-        public class TestContentModel1 : PublishedContentModel
-        {
-            public TestContentModel1(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
+        public IEnumerable<TestContentModel1> Prop2 =>
+            this.Value<IEnumerable<TestContentModel1>>(Mock.Of<IPublishedValueFallback>(), "prop2");
+    }
 
-            public string Prop1 => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop1");
+    [PublishedModel("content1")]
+    public class TestContentModel1 : PublishedContentModel
+    {
+        public TestContentModel1(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
+        {
         }
 
-        [PublishedModel("content2")]
-        public class TestContentModel2 : PublishedContentModel
-        {
-            public TestContentModel2(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
+        public string Prop1 => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop1");
+    }
 
-            public IEnumerable<TestContentModel1> Prop2 => this.Value<IEnumerable<TestContentModel1>>(Mock.Of<IPublishedValueFallback>(), "prop2");
+    [PublishedModel("content2")]
+    public class TestContentModel2 : PublishedContentModel
+    {
+        public TestContentModel2(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
+        {
         }
+
+        public IEnumerable<TestContentModel1> Prop2 =>
+            this.Value<IEnumerable<TestContentModel1>>(Mock.Of<IPublishedValueFallback>(), "prop2");
     }
 }
diff --git a/tests/Umbraco.Tests.Common/TaskHelper.cs b/tests/Umbraco.Tests.Common/TaskHelper.cs
index 8b22f7b47d..f46aab69ed 100644
--- a/tests/Umbraco.Tests.Common/TaskHelper.cs
+++ b/tests/Umbraco.Tests.Common/TaskHelper.cs
@@ -2,76 +2,74 @@
 // See LICENSE for more details.
 
 using System;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+/// <summary>
+///     Helper class to not repeat common patterns with Task.
+/// </summary>
+public sealed class TaskHelper
 {
+    private readonly ILogger<TaskHelper> _logger;
+
+    public TaskHelper(ILogger<TaskHelper> logger) => _logger = logger;
+
     /// <summary>
-    /// Helper class to not repeat common patterns with Task.
+    ///     Executes a fire and forget task outside of the current execution flow.
     /// </summary>
-    public sealed class TaskHelper
+    public void RunBackgroundTask(Func<Task> fn) => ExecuteBackgroundTask(fn);
+
+    // for tests, returning the Task as a public API indicates it can be awaited that is not what we want to do
+    public Task ExecuteBackgroundTask(Func<Task> fn)
     {
-        private readonly ILogger<TaskHelper> _logger;
+        // it is also possible to use UnsafeQueueUserWorkItem which does not flow the execution context,
+        // however that seems more difficult to use for async operations.
 
-        public TaskHelper(ILogger<TaskHelper> logger) => _logger = logger;
-
-        /// <summary>
-        /// Executes a fire and forget task outside of the current execution flow.
-        /// </summary>
-        public void RunBackgroundTask(Func<Task> fn) => ExecuteBackgroundTask(fn);
-
-        // for tests, returning the Task as a public API indicates it can be awaited that is not what we want to do
-        public Task ExecuteBackgroundTask(Func<Task> fn)
+        // Do not flow AsyncLocal to the child thread
+        using (ExecutionContext.SuppressFlow())
         {
-            // it is also possible to use UnsafeQueueUserWorkItem which does not flow the execution context,
-            // however that seems more difficult to use for async operations.
-
-            // Do not flow AsyncLocal to the child thread
-            using (ExecutionContext.SuppressFlow())
-            {
-                // NOTE: ConfigureAwait(false) is irrelevant here, it is not needed because this is not being
-                // awaited. ConfigureAwait(false) is only relevant when awaiting to prevent the SynchronizationContext
-                // (very different from the ExecutionContext!) from running the continuation on the calling thread.
-                return Task.Run(LoggingWrapper(fn));
-            }
+            // NOTE: ConfigureAwait(false) is irrelevant here, it is not needed because this is not being
+            // awaited. ConfigureAwait(false) is only relevant when awaiting to prevent the SynchronizationContext
+            // (very different from the ExecutionContext!) from running the continuation on the calling thread.
+            return Task.Run(LoggingWrapper(fn));
         }
-
-        /// <summary>
-        /// Executes a fire and forget task outside of the current execution flow on a dedicated (non thread-pool) thread.
-        /// </summary>
-        public void RunLongRunningBackgroundTask(Func<Task> fn) => ExecuteLongRunningBackgroundTask(fn);
-
-        // for tests, returning the Task as a public API indicates it can be awaited that is not what we want to do
-        public Task ExecuteLongRunningBackgroundTask(Func<Task> fn)
-        {
-            // it is also possible to use UnsafeQueueUserWorkItem which does not flow the execution context,
-            // however that seems more difficult to use for async operations.
-
-            // Do not flow AsyncLocal to the child thread
-            using (ExecutionContext.SuppressFlow())
-            {
-                // NOTE: ConfigureAwait(false) is irrelevant here, it is not needed because this is not being
-                // awaited. ConfigureAwait(false) is only relevant when awaiting to prevent the SynchronizationContext
-                // (very different from the ExecutionContext!) from running the continuation on the calling thread.
-                return Task.Factory.StartNew(LoggingWrapper(fn), TaskCreationOptions.LongRunning);
-            }
-        }
-
-        // ensure any exceptions are handled and do not take down the app pool
-        private Func<Task> LoggingWrapper(Func<Task> fn) =>
-            async () =>
-            {
-                try
-                {
-                    await fn();
-                }
-                catch (Exception e)
-                {
-                    _logger.LogError(e, "Exception thrown in a background thread");
-                }
-            };
     }
+
+    /// <summary>
+    ///     Executes a fire and forget task outside of the current execution flow on a dedicated (non thread-pool) thread.
+    /// </summary>
+    public void RunLongRunningBackgroundTask(Func<Task> fn) => ExecuteLongRunningBackgroundTask(fn);
+
+    // for tests, returning the Task as a public API indicates it can be awaited that is not what we want to do
+    public Task ExecuteLongRunningBackgroundTask(Func<Task> fn)
+    {
+        // it is also possible to use UnsafeQueueUserWorkItem which does not flow the execution context,
+        // however that seems more difficult to use for async operations.
+
+        // Do not flow AsyncLocal to the child thread
+        using (ExecutionContext.SuppressFlow())
+        {
+            // NOTE: ConfigureAwait(false) is irrelevant here, it is not needed because this is not being
+            // awaited. ConfigureAwait(false) is only relevant when awaiting to prevent the SynchronizationContext
+            // (very different from the ExecutionContext!) from running the continuation on the calling thread.
+            return Task.Factory.StartNew(LoggingWrapper(fn), TaskCreationOptions.LongRunning);
+        }
+    }
+
+    // ensure any exceptions are handled and do not take down the app pool
+    private Func<Task> LoggingWrapper(Func<Task> fn) =>
+        async () =>
+        {
+            try
+            {
+                await fn();
+            }
+            catch (Exception e)
+            {
+                _logger.LogError(e, "Exception thrown in a background thread");
+            }
+        };
 }
diff --git a/tests/Umbraco.Tests.Common/TestClone.cs b/tests/Umbraco.Tests.Common/TestClone.cs
index f8f06263a3..d3e39fc9ee 100644
--- a/tests/Umbraco.Tests.Common/TestClone.cs
+++ b/tests/Umbraco.Tests.Common/TestClone.cs
@@ -4,83 +4,82 @@
 using System;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+public class TestClone : IDeepCloneable, IEquatable<TestClone>
 {
-    public class TestClone : IDeepCloneable, IEquatable<TestClone>
+    public TestClone(Guid id)
     {
-        public TestClone(Guid id)
-        {
-            Id = id;
-            IsClone = true;
-        }
-
-        public TestClone() => Id = Guid.NewGuid();
-
-        public Guid Id { get; }
-
-        public bool IsClone { get; }
-
-        public object DeepClone() => new TestClone(Id);
-
-        /// <summary>
-        /// Indicates whether the current object is equal to another object of the same type.
-        /// </summary>
-        /// <returns>
-        /// true if the current object is equal to the <paramref name="other"/> parameter; otherwise, false.
-        /// </returns>
-        /// <param name="other">An object to compare with this object.</param>
-        public bool Equals(TestClone other)
-        {
-            if (other is null)
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-
-            return Id.Equals(other.Id);
-        }
-
-        /// <summary>
-        /// Determines whether the specified object is equal to the current object.
-        /// </summary>
-        /// <returns>
-        /// true if the specified object  is equal to the current object; otherwise, false.
-        /// </returns>
-        /// <param name="obj">The object to compare with the current object. </param>
-        public override bool Equals(object obj)
-        {
-            if (obj is null)
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj.GetType() != GetType())
-            {
-                return false;
-            }
-
-            return Equals((TestClone)obj);
-        }
-
-        /// <summary>
-        /// Serves as the default hash function.
-        /// </summary>
-        /// <returns>
-        /// A hash code for the current object.
-        /// </returns>
-        public override int GetHashCode() => Id.GetHashCode();
-
-        public static bool operator ==(TestClone left, TestClone right) => Equals(left, right);
-
-        public static bool operator !=(TestClone left, TestClone right) => Equals(left, right) == false;
+        Id = id;
+        IsClone = true;
     }
+
+    public TestClone() => Id = Guid.NewGuid();
+
+    public Guid Id { get; }
+
+    public bool IsClone { get; }
+
+    public object DeepClone() => new TestClone(Id);
+
+    /// <summary>
+    ///     Indicates whether the current object is equal to another object of the same type.
+    /// </summary>
+    /// <returns>
+    ///     true if the current object is equal to the <paramref name="other" /> parameter; otherwise, false.
+    /// </returns>
+    /// <param name="other">An object to compare with this object.</param>
+    public bool Equals(TestClone other)
+    {
+        if (other is null)
+        {
+            return false;
+        }
+
+        if (ReferenceEquals(this, other))
+        {
+            return true;
+        }
+
+        return Id.Equals(other.Id);
+    }
+
+    /// <summary>
+    ///     Determines whether the specified object is equal to the current object.
+    /// </summary>
+    /// <returns>
+    ///     true if the specified object  is equal to the current object; otherwise, false.
+    /// </returns>
+    /// <param name="obj">The object to compare with the current object. </param>
+    public override bool Equals(object obj)
+    {
+        if (obj is null)
+        {
+            return false;
+        }
+
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
+        }
+
+        if (obj.GetType() != GetType())
+        {
+            return false;
+        }
+
+        return Equals((TestClone)obj);
+    }
+
+    /// <summary>
+    ///     Serves as the default hash function.
+    /// </summary>
+    /// <returns>
+    ///     A hash code for the current object.
+    /// </returns>
+    public override int GetHashCode() => Id.GetHashCode();
+
+    public static bool operator ==(TestClone left, TestClone right) => Equals(left, right);
+
+    public static bool operator !=(TestClone left, TestClone right) => Equals(left, right) == false;
 }
diff --git a/tests/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs b/tests/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
index d193e7aa83..11aad2cd55 100644
--- a/tests/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
+++ b/tests/Umbraco.Tests.Common/TestDefaultCultureAccessor.cs
@@ -3,16 +3,15 @@
 
 using Umbraco.Cms.Core.PublishedCache;
 
-namespace Umbraco.Cms.Tests.Common
-{
-    public class TestDefaultCultureAccessor : IDefaultCultureAccessor
-    {
-        private string _defaultCulture = string.Empty;
+namespace Umbraco.Cms.Tests.Common;
 
-        public string DefaultCulture
-        {
-            get => _defaultCulture;
-            set => _defaultCulture = value ?? string.Empty;
-        }
+public class TestDefaultCultureAccessor : IDefaultCultureAccessor
+{
+    private string _defaultCulture = string.Empty;
+
+    public string DefaultCulture
+    {
+        get => _defaultCulture;
+        set => _defaultCulture = value ?? string.Empty;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelperBase.cs b/tests/Umbraco.Tests.Common/TestHelperBase.cs
index da23edc74f..ba7d29cd69 100644
--- a/tests/Umbraco.Tests.Common/TestHelperBase.cs
+++ b/tests/Umbraco.Tests.Common/TestHelperBase.cs
@@ -27,158 +27,165 @@ using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+/// <summary>
+///     Common helper properties and methods useful to testing
+/// </summary>
+public abstract class TestHelperBase
 {
-    /// <summary>
-    /// Common helper properties and methods useful to testing
-    /// </summary>
-    public abstract class TestHelperBase
+    private readonly ITypeFinder _typeFinder;
+    private IIOHelper _ioHelper;
+    private UriUtility _uriUtility;
+    private string _workingDir;
+
+    protected TestHelperBase(Assembly entryAssembly)
     {
-        private readonly ITypeFinder _typeFinder;
-        private UriUtility _uriUtility;
-        private IIOHelper _ioHelper;
-        private string _workingDir;
+        MainDom = new SimpleMainDom();
+        _typeFinder = new TypeFinder(NullLoggerFactory.Instance.CreateLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(entryAssembly, NullLoggerFactory.Instance));
+    }
 
-        protected TestHelperBase(Assembly entryAssembly)
+    /// <summary>
+    ///     Gets the working directory of the test project.
+    /// </summary>
+    public string WorkingDirectory
+    {
+        get
         {
-            MainDom = new SimpleMainDom();
-            _typeFinder = new TypeFinder(NullLoggerFactory.Instance.CreateLogger<TypeFinder>(), new DefaultUmbracoAssemblyProvider(entryAssembly, NullLoggerFactory.Instance));
-        }
-
-        public ITypeFinder GetTypeFinder() => _typeFinder;
-
-        public TypeLoader GetMockedTypeLoader() =>
-            new TypeLoader(Mock.Of<ITypeFinder>(), new VaryingRuntimeHash(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)), Mock.Of<ILogger<TypeLoader>>(), Mock.Of<IProfiler>());
-
-        /// <summary>
-        /// Gets the working directory of the test project.
-        /// </summary>
-        public string WorkingDirectory
-        {
-            get
+            if (_workingDir != null)
             {
-                if (_workingDir != null)
-                {
-                    return _workingDir;
-                }
-
-                // Azure DevOps can only store a database in certain locations so we will need to detect if we are running
-                // on a build server and if so we'll use the temp path.
-                var dir = string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("System_DefaultWorkingDirectory"))
-                    ? Path.Combine(Assembly.GetExecutingAssembly().GetRootDirectorySafe(), "TEMP")
-                    : Path.Combine(Path.GetTempPath(), "UmbracoTests", "TEMP");
-
-                if (!Directory.Exists(dir))
-                {
-                    _ = Directory.CreateDirectory(dir);
-                }
-
-                _workingDir = dir;
                 return _workingDir;
             }
-        }
 
-        public IShortStringHelper ShortStringHelper { get; } = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+            // Azure DevOps can only store a database in certain locations so we will need to detect if we are running
+            // on a build server and if so we'll use the temp path.
+            var dir = string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("System_DefaultWorkingDirectory"))
+                ? Path.Combine(Assembly.GetExecutingAssembly().GetRootDirectorySafe(), "TEMP")
+                : Path.Combine(Path.GetTempPath(), "UmbracoTests", "TEMP");
 
-        public IJsonSerializer JsonSerializer { get; } = new JsonNetSerializer();
-
-        public IVariationContextAccessor VariationContextAccessor { get; } = new TestVariationContextAccessor();
-
-        public abstract IBulkSqlInsertProvider BulkSqlInsertProvider { get; }
-
-        public abstract IMarchal Marchal { get; }
-
-        public CoreDebugSettings CoreDebugSettings { get; } = new CoreDebugSettings();
-
-        public IIOHelper IOHelper
-        {
-            get
+            if (!Directory.Exists(dir))
             {
-                if (_ioHelper == null)
-                {
-                    IHostingEnvironment hostingEnvironment = GetHostingEnvironment();
-
-                    if (TestEnvironment.IsWindows)
-                    {
-                        _ioHelper = new IOHelperWindows(hostingEnvironment);
-                    }
-                    else if (TestEnvironment.IsLinux)
-                    {
-                        _ioHelper = new IOHelperLinux(hostingEnvironment);
-                    }
-                    else if (TestEnvironment.IsOSX)
-                    {
-                        _ioHelper = new IOHelperOSX(hostingEnvironment);
-                    }
-                    else
-                    {
-                        throw new NotSupportedException("Unexpected OS");
-                    }
-                }
-
-                return _ioHelper;
-            }
-        }
-
-        public IMainDom MainDom { get; }
-
-        public UriUtility UriUtility
-        {
-            get
-            {
-                if (_uriUtility == null)
-                {
-                    _uriUtility = new UriUtility(GetHostingEnvironment());
-                }
-
-                return _uriUtility;
-            }
-        }
-
-        /// <summary>
-        /// Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based on a virtual path name
-        /// </summary>
-        public virtual string MapPathForTestFiles(string relativePath)
-        {
-            if (!relativePath.StartsWith("~/"))
-            {
-                throw new ArgumentException("relativePath must start with '~/'", nameof(relativePath));
+                _ = Directory.CreateDirectory(dir);
             }
 
-            var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
-            var uri = new Uri(codeBase);
-            var path = uri.LocalPath;
-            var bin = Path.GetDirectoryName(path);
-
-            return relativePath.Replace("~/", bin + "/");
-        }
-
-        public IUmbracoVersion GetUmbracoVersion() => new UmbracoVersion();
-
-        public IServiceCollection GetRegister() => new ServiceCollection();
-
-        public abstract IHostingEnvironment GetHostingEnvironment();
-
-        public abstract IApplicationShutdownRegistry GetHostingEnvironmentLifetime();
-
-        public abstract IIpResolver GetIpResolver();
-
-        public IRequestCache GetRequestCache() => new DictionaryAppCache();
-
-        public IPublishedUrlProvider GetPublishedUrlProvider()
-        {
-            var mock = new Mock<IPublishedUrlProvider>();
-
-            return mock.Object;
-        }
-
-        public ILoggingConfiguration GetLoggingConfiguration(IHostingEnvironment hostingEnv = null)
-        {
-            hostingEnv = hostingEnv ?? GetHostingEnvironment();
-            return new LoggingConfiguration(
-                Path.Combine(hostingEnv.ApplicationPhysicalPath, "umbraco", "logs"));
+            _workingDir = dir;
+            return _workingDir;
         }
     }
+
+    public IShortStringHelper ShortStringHelper { get; } =
+        new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+    public IJsonSerializer JsonSerializer { get; } = new JsonNetSerializer();
+
+    public IVariationContextAccessor VariationContextAccessor { get; } = new TestVariationContextAccessor();
+
+    public abstract IBulkSqlInsertProvider BulkSqlInsertProvider { get; }
+
+    public abstract IMarchal Marchal { get; }
+
+    public CoreDebugSettings CoreDebugSettings { get; } = new();
+
+    public IIOHelper IOHelper
+    {
+        get
+        {
+            if (_ioHelper == null)
+            {
+                var hostingEnvironment = GetHostingEnvironment();
+
+                if (TestEnvironment.IsWindows)
+                {
+                    _ioHelper = new IOHelperWindows(hostingEnvironment);
+                }
+                else if (TestEnvironment.IsLinux)
+                {
+                    _ioHelper = new IOHelperLinux(hostingEnvironment);
+                }
+                else if (TestEnvironment.IsOSX)
+                {
+                    _ioHelper = new IOHelperOSX(hostingEnvironment);
+                }
+                else
+                {
+                    throw new NotSupportedException("Unexpected OS");
+                }
+            }
+
+            return _ioHelper;
+        }
+    }
+
+    public IMainDom MainDom { get; }
+
+    public UriUtility UriUtility
+    {
+        get
+        {
+            if (_uriUtility == null)
+            {
+                _uriUtility = new UriUtility(GetHostingEnvironment());
+            }
+
+            return _uriUtility;
+        }
+    }
+
+    public ITypeFinder GetTypeFinder() => _typeFinder;
+
+    public TypeLoader GetMockedTypeLoader() =>
+        new(
+            Mock.Of<ITypeFinder>(),
+            new VaryingRuntimeHash(),
+            Mock.Of<IAppPolicyCache>(),
+            new DirectoryInfo(GetHostingEnvironment()
+                .MapPathContentRoot(Constants.SystemDirectories.TempData)),
+            Mock.Of<ILogger<TypeLoader>>(),
+            Mock.Of<IProfiler>());
+
+    /// <summary>
+    ///     Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based
+    ///     on a virtual path name
+    /// </summary>
+    public virtual string MapPathForTestFiles(string relativePath)
+    {
+        if (!relativePath.StartsWith("~/"))
+        {
+            throw new ArgumentException("relativePath must start with '~/'", nameof(relativePath));
+        }
+
+        var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
+        var uri = new Uri(codeBase);
+        var path = uri.LocalPath;
+        var bin = Path.GetDirectoryName(path);
+
+        return relativePath.Replace("~/", bin + "/");
+    }
+
+    public IUmbracoVersion GetUmbracoVersion() => new UmbracoVersion();
+
+    public IServiceCollection GetRegister() => new ServiceCollection();
+
+    public abstract IHostingEnvironment GetHostingEnvironment();
+
+    public abstract IApplicationShutdownRegistry GetHostingEnvironmentLifetime();
+
+    public abstract IIpResolver GetIpResolver();
+
+    public IRequestCache GetRequestCache() => new DictionaryAppCache();
+
+    public IPublishedUrlProvider GetPublishedUrlProvider()
+    {
+        var mock = new Mock<IPublishedUrlProvider>();
+
+        return mock.Object;
+    }
+
+    public ILoggingConfiguration GetLoggingConfiguration(IHostingEnvironment hostingEnv = null)
+    {
+        hostingEnv ??= GetHostingEnvironment();
+        return new LoggingConfiguration(
+            Path.Combine(hostingEnv.ApplicationPhysicalPath, "umbraco", "logs"));
+    }
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs b/tests/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs
index d9d5de1ebd..b813f70015 100644
--- a/tests/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs
+++ b/tests/Umbraco.Tests.Common/TestHelpers/FileSystemsCreator.cs
@@ -4,34 +4,32 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 
-namespace Umbraco.Cms.Tests.Common.TestHelpers
+namespace Umbraco.Cms.Tests.Common.TestHelpers;
+
+public static class FileSystemsCreator
 {
-    public static class FileSystemsCreator
-    {
-        /// <summary>
-        /// Create an instance FileSystems where you can set the individual filesystems.
-        /// </summary>
-        /// <param name="loggerFactory"></param>
-        /// <param name="ioHelper"></param>
-        /// <param name="globalSettings"></param>
-        /// <param name="hostingEnvironment"></param>
-        /// <param name="macroPartialFileSystem"></param>
-        /// <param name="partialViewsFileSystem"></param>
-        /// <param name="stylesheetFileSystem"></param>
-        /// <param name="scriptsFileSystem"></param>
-        /// <param name="mvcViewFileSystem"></param>
-        /// <returns></returns>
-        public static FileSystems CreateTestFileSystems(
-            ILoggerFactory loggerFactory,
-            IIOHelper ioHelper,
-            IOptions<GlobalSettings> globalSettings,
-            IHostingEnvironment hostingEnvironment,
-            IFileSystem macroPartialFileSystem,
-            IFileSystem partialViewsFileSystem,
-            IFileSystem stylesheetFileSystem,
-            IFileSystem scriptsFileSystem,
-            IFileSystem mvcViewFileSystem) =>
-            new FileSystems(loggerFactory, ioHelper, globalSettings, hostingEnvironment, macroPartialFileSystem,
-                partialViewsFileSystem, stylesheetFileSystem, scriptsFileSystem, mvcViewFileSystem);
-    }
+    /// <summary>
+    ///     Create an instance FileSystems where you can set the individual filesystems.
+    /// </summary>
+    /// <param name="loggerFactory"></param>
+    /// <param name="ioHelper"></param>
+    /// <param name="globalSettings"></param>
+    /// <param name="hostingEnvironment"></param>
+    /// <param name="macroPartialFileSystem"></param>
+    /// <param name="partialViewsFileSystem"></param>
+    /// <param name="stylesheetFileSystem"></param>
+    /// <param name="scriptsFileSystem"></param>
+    /// <param name="mvcViewFileSystem"></param>
+    /// <returns></returns>
+    public static FileSystems CreateTestFileSystems(
+        ILoggerFactory loggerFactory,
+        IIOHelper ioHelper,
+        IOptions<GlobalSettings> globalSettings,
+        IHostingEnvironment hostingEnvironment,
+        IFileSystem macroPartialFileSystem,
+        IFileSystem partialViewsFileSystem,
+        IFileSystem stylesheetFileSystem,
+        IFileSystem scriptsFileSystem,
+        IFileSystem mvcViewFileSystem) =>
+        new(loggerFactory, ioHelper, globalSettings, hostingEnvironment, macroPartialFileSystem, partialViewsFileSystem, stylesheetFileSystem, scriptsFileSystem, mvcViewFileSystem);
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs b/tests/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs
index 236562df2a..a6d714e442 100644
--- a/tests/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs
+++ b/tests/Umbraco.Tests.Common/TestHelpers/LogTestHelper.cs
@@ -1,41 +1,41 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
 using Microsoft.Extensions.Logging;
 using Moq;
 
-namespace Umbraco.Cms.Tests.Common.TestHelpers
+namespace Umbraco.Cms.Tests.Common.TestHelpers;
+
+public static class LogTestHelper
 {
-    public static class LogTestHelper
+    public static Mock<ILogger<T>> VerifyLogError<T>(
+        this Mock<ILogger<T>> logger,
+        Exception exception,
+        string expectedMessage,
+        Times? times = null) => VerifyLogging(logger, exception, expectedMessage, LogLevel.Error, times);
+
+    private static Mock<ILogger<T>> VerifyLogging<T>(
+        this Mock<ILogger<T>> logger,
+        Exception exception,
+        string expectedMessage,
+        LogLevel expectedLogLevel = LogLevel.Debug,
+        Times? times = null)
     {
-        public static Mock<ILogger<T>> VerifyLogError<T>(
-            this Mock<ILogger<T>> logger,
-            Exception exception,
-            string expectedMessage,
-            Times? times = null) => VerifyLogging(logger, exception, expectedMessage, LogLevel.Error, times);
+        times ??= Times.Once();
 
-        private static Mock<ILogger<T>> VerifyLogging<T>(
-            this Mock<ILogger<T>> logger,
-            Exception exception,
-            string expectedMessage,
-            LogLevel expectedLogLevel = LogLevel.Debug,
-            Times? times = null)
-        {
-            times ??= Times.Once();
+        Func<object, Type, bool> state = (v, t) =>
+            string.Compare(v.ToString(), expectedMessage, StringComparison.Ordinal) == 0;
 
-            Func<object, Type, bool> state = (v, t) =>
-                string.Compare(v.ToString(), expectedMessage, StringComparison.Ordinal) == 0;
+        logger.Verify(
+            x => x.Log(
+                It.Is<LogLevel>(l => l == expectedLogLevel),
+                It.IsAny<EventId>(),
+                It.Is<It.IsAnyType>((v, t) => state(v, t)),
+                exception,
+                It.Is<Func<It.IsAnyType, Exception, string>>((v, t) => true)),
+            (Times)times);
 
-            logger.Verify(
-                x => x.Log(
-                    It.Is<LogLevel>(l => l == expectedLogLevel),
-                    It.IsAny<EventId>(),
-                    It.Is<It.IsAnyType>((v, t) => state(v, t)),
-                    exception,
-                    It.Is<Func<It.IsAnyType, Exception, string>>((v, t) => true)), (Times)times);
-
-            return logger;
-        }
+        return logger;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs b/tests/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
index 2468f54671..38cfc5d3de 100644
--- a/tests/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
+++ b/tests/Umbraco.Tests.Common/TestHelpers/MockedValueEditors.cs
@@ -2,30 +2,25 @@
 // See LICENSE for more details.
 
 using Moq;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.Common.TestHelpers
-{
-    public class MockedValueEditors
-    {
-        public static DataValueEditor CreateDataValueEditor(string name)
-        {
-            var valueType = ValueTypes.IsValue(name) ? name : ValueTypes.String;
+namespace Umbraco.Cms.Tests.Common.TestHelpers;
 
-            return new DataValueEditor(
-                Mock.Of<ILocalizedTextService>(),
-                Mock.Of<IShortStringHelper>(),
-                new JsonNetSerializer(),
-                Mock.Of<IIOHelper>(),
-                new DataEditorAttribute(name, name, name)
-                {
-                    ValueType = valueType
-                });
-        }
+public class MockedValueEditors
+{
+    public static DataValueEditor CreateDataValueEditor(string name)
+    {
+        var valueType = ValueTypes.IsValue(name) ? name : ValueTypes.String;
+
+        return new DataValueEditor(
+            Mock.Of<ILocalizedTextService>(),
+            Mock.Of<IShortStringHelper>(),
+            new JsonNetSerializer(),
+            Mock.Of<IIOHelper>(),
+            new DataEditorAttribute(name, name, name) { ValueType = valueType });
     }
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs b/tests/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
index b4efb2d7c5..d76eccc4a7 100644
--- a/tests/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
+++ b/tests/Umbraco.Tests.Common/TestHelpers/StringNewlineExtensions.cs
@@ -1,59 +1,58 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.TestHelpers
+namespace Umbraco.Cms.Tests.Common.TestHelpers;
+
+public static class StringNewLineExtensions
 {
-    public static class StringNewLineExtensions
+    /// <summary>
+    ///     Ensures Lf only everywhere.
+    /// </summary>
+    /// <param name="text">The text to filter.</param>
+    /// <returns>The filtered text.</returns>
+    public static string Lf(this string text)
     {
-        /// <summary>
-        /// Ensures Lf only everywhere.
-        /// </summary>
-        /// <param name="text">The text to filter.</param>
-        /// <returns>The filtered text.</returns>
-        public static string Lf(this string text)
+        if (string.IsNullOrEmpty(text))
         {
-            if (string.IsNullOrEmpty(text))
-            {
-                return text;
-            }
-
-            text = text.Replace("\r", string.Empty); // remove CR
             return text;
         }
 
-        /// <summary>
-        /// Ensures CrLf everywhere.
-        /// </summary>
-        /// <param name="text">The text to filter.</param>
-        /// <returns>The filtered text.</returns>
-        public static string CrLf(this string text)
-        {
-            if (string.IsNullOrEmpty(text))
-            {
-                return text;
-            }
+        text = text.Replace("\r", string.Empty); // remove CR
+        return text;
+    }
 
-            text = text.Replace("\r", string.Empty); // remove CR
-            text = text.Replace("\n", "\r\n"); // add CRLF everywhere
+    /// <summary>
+    ///     Ensures CrLf everywhere.
+    /// </summary>
+    /// <param name="text">The text to filter.</param>
+    /// <returns>The filtered text.</returns>
+    public static string CrLf(this string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
             return text;
         }
 
-        /// <summary>
-        /// Replaces Cr/Lf by a single space.
-        /// </summary>
-        /// <param name="text">The text to filter.</param>
-        /// <returns>The filtered text.</returns>
-        public static string NoCrLf(this string text)
-        {
-            if (string.IsNullOrEmpty(text))
-            {
-                return text;
-            }
+        text = text.Replace("\r", string.Empty); // remove CR
+        text = text.Replace("\n", "\r\n"); // add CRLF everywhere
+        return text;
+    }
 
-            text = text.Replace("\r\n", " "); // remove CRLF
-            text = text.Replace("\r", " "); // remove CR
-            text = text.Replace("\n", " "); // remove LF
+    /// <summary>
+    ///     Replaces Cr/Lf by a single space.
+    /// </summary>
+    /// <param name="text">The text to filter.</param>
+    /// <returns>The filtered text.</returns>
+    public static string NoCrLf(this string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
             return text;
         }
+
+        text = text.Replace("\r\n", " "); // remove CRLF
+        text = text.Replace("\r", " "); // remove CR
+        text = text.Replace("\n", " "); // remove LF
+        return text;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs b/tests/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs
index 52d2e0da62..097201f4fa 100644
--- a/tests/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs
+++ b/tests/Umbraco.Tests.Common/TestHelpers/Stubs/TestProfiler.cs
@@ -6,41 +6,40 @@ using StackExchange.Profiling;
 using StackExchange.Profiling.SqlFormatters;
 using Umbraco.Cms.Core.Logging;
 
-namespace Umbraco.Cms.Tests.Common.TestHelpers.Stubs
+namespace Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
+
+public class TestProfiler : IProfiler
 {
-    public class TestProfiler : IProfiler
+    private static bool _enabled;
+
+    public IDisposable Step(string name) => _enabled ? MiniProfiler.Current.Step(name) : null;
+
+    public void Start()
     {
-        public static void Enable() => s_enabled = true;
-
-        public static void Disable() => s_enabled = false;
-
-        private static bool s_enabled;
-
-        public IDisposable Step(string name) => s_enabled ? MiniProfiler.Current.Step(name) : null;
-
-        public void Start()
+        if (_enabled == false)
         {
-            if (s_enabled == false)
-            {
-                return;
-            }
-
-            // See https://miniprofiler.com/dotnet/AspDotNet
-            MiniProfiler.Configure(new MiniProfilerOptions
-            {
-                SqlFormatter = new SqlServerFormatter(),
-                StackMaxLength = 5000,
-            });
-
-            MiniProfiler.StartNew();
+            return;
         }
 
-        public void Stop(bool discardResults = false)
+        // See https://miniprofiler.com/dotnet/AspDotNet
+        MiniProfiler.Configure(new MiniProfilerOptions
         {
-            if (s_enabled)
-            {
-                MiniProfiler.Current.Stop(discardResults);
-            }
+            SqlFormatter = new SqlServerFormatter(),
+            StackMaxLength = 5000
+        });
+
+        MiniProfiler.StartNew();
+    }
+
+    public void Stop(bool discardResults = false)
+    {
+        if (_enabled)
+        {
+            MiniProfiler.Current.Stop(discardResults);
         }
     }
+
+    public static void Enable() => _enabled = true;
+
+    public static void Disable() => _enabled = false;
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs b/tests/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs
index 72f22e9960..26cc13949c 100644
--- a/tests/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs
+++ b/tests/Umbraco.Tests.Common/TestHelpers/TestDatabase.cs
@@ -19,438 +19,489 @@ using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 
-namespace Umbraco.Cms.Tests.Common.TestHelpers
+namespace Umbraco.Cms.Tests.Common.TestHelpers;
+
+/// <summary>
+///     An implementation of <see cref="IUmbracoDatabase" /> for tests.
+/// </summary>
+/// <remarks>
+///     <para>Supports writing to the database, and logs Sql statements.</para>
+///     <para>Cannot support reading from the database, and throws.</para>
+///     <para>Tries to pretend it supports transactions, connections, etc. as best as possible.</para>
+/// </remarks>
+public class TestDatabase : IUmbracoDatabase
 {
     /// <summary>
-    /// An implementation of <see cref="IUmbracoDatabase"/> for tests.
+    ///     Initializes a new instance of the <see cref="TestDatabase" /> class.
     /// </summary>
     /// <remarks>
-    /// <para>Supports writing to the database, and logs Sql statements.</para>
-    /// <para>Cannot support reading from the database, and throws.</para>
-    /// <para>Tries to pretend it supports transactions, connections, etc. as best as possible.</para>
+    ///     <para>When both parameters are supplied, they should of course be consistent.</para>
     /// </remarks>
-    public class TestDatabase : IUmbracoDatabase
+    public TestDatabase(DatabaseType databaseType = null, ISqlSyntaxProvider syntaxProvider = null)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TestDatabase"/> class.
-        /// </summary>
-        /// <remarks>
-        /// <para>When both parameters are supplied, they should of course be consistent.</para>
-        /// </remarks>
-        public TestDatabase(DatabaseType databaseType = null, ISqlSyntaxProvider syntaxProvider = null)
-        {
-            DatabaseType = databaseType ?? new SqlServerDatabaseType();
-            SqlContext = new SqlContext(syntaxProvider ?? new SqlServerSyntaxProvider(Options.Create((new GlobalSettings()))), DatabaseType, Mock.Of<IPocoDataFactory>());
-        }
+        DatabaseType = databaseType ?? new SqlServerDatabaseType();
+        SqlContext = new SqlContext(syntaxProvider ?? new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())), DatabaseType, Mock.Of<IPocoDataFactory>());
+    }
+
+    /// <summary>
+    ///     Gets the database operations.
+    /// </summary>
+    public List<Operation> Operations { get; } = new();
+
+    public void Dispose()
+    {
+    }
+
+    public IDatabase OpenSharedConnection() => this;
+
+    public void CloseSharedConnection()
+    {
+    }
+
+    (List<T1>, List<T2>, List<T3>, List<T4>) IDatabaseQuery.FetchMultiple<T1, T2, T3, T4>(Sql sql) =>
+        throw new NotImplementedException();
+
+    public int OneTimeCommandTimeout { get; set; }
+
+    public MapperCollection Mappers { get; set; }
+
+    public IPocoDataFactory PocoDataFactory { get; set; }
+
+    public DatabaseType DatabaseType { get; }
+
+    public List<IInterceptor> Interceptors { get; }
+
+    public string ConnectionString { get; }
+
+    public DbConnection Connection { get; }
+
+    public DbTransaction Transaction { get; }
+
+    public IDictionary<string, object> Data { get; }
+
+    public ISqlContext SqlContext { get; }
+
+    public string InstanceId { get; }
+
+    public bool InTransaction { get; }
+
+    public bool EnableSqlCount { get; set; }
+
+    public int SqlCount { get; }
+
+    public int BulkInsertRecords<T>(IEnumerable<T> records) => throw new NotImplementedException();
+    public bool IsUmbracoInstalled() => true;
+
+    public DatabaseSchemaResult ValidateSchema() => throw new NotImplementedException();
+
+    public DbParameter CreateParameter() => throw new NotImplementedException();
+
+    public void AddParameter(DbCommand cmd, object value) => throw new NotImplementedException();
+
+    public DbCommand
+        CreateCommand(DbConnection connection, CommandType commandType, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public ITransaction GetTransaction() => throw new NotImplementedException();
+
+    public ITransaction GetTransaction(IsolationLevel isolationLevel) => throw new NotImplementedException();
+
+    public void SetTransaction(DbTransaction tran) => throw new NotImplementedException();
+
+    public void BeginTransaction() => Operations.Add(new Operation("BEGIN"));
+
+    public void BeginTransaction(IsolationLevel isolationLevel) =>
+        Operations.Add(new Operation("BEGIN " + isolationLevel));
+
+    public void AbortTransaction() => Operations.Add(new Operation("ABORT"));
+
+    public void CompleteTransaction() => Operations.Add(new Operation("COMMIT"));
+
+    public int Execute(string sql, params object[] args)
+    {
+        Operations.Add(new Operation("EXECUTE", sql, args));
+        return default;
+    }
+
+    public int Execute(Sql sql)
+    {
+        Operations.Add(new Operation("EXECUTE", sql.SQL, sql.Arguments));
+        return default;
+    }
+
+    public int Execute(string sql, CommandType commandType, params object[] args)
+    {
+        Operations.Add(new Operation("EXECUTE", sql, args));
+        return default;
+    }
+
+    public T ExecuteScalar<T>(string sql, params object[] args)
+    {
+        Operations.Add(new Operation("EXECUTE SCALAR", sql, args));
+        return default;
+    }
+
+    public T ExecuteScalar<T>(Sql sql)
+    {
+        Operations.Add(new Operation("EXECUTE SCALAR", sql.SQL, sql.Arguments));
+        return default;
+    }
+
+    public T ExecuteScalar<T>(string sql, CommandType commandType, params object[] args)
+    {
+        Operations.Add(new Operation("EXECUTE SCALAR", sql, args));
+        return default;
+    }
+
+    public Task<T> ExecuteScalarAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<T> ExecuteScalarAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    public Task<int> ExecuteAsync(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<int> ExecuteAsync(Sql sql) => throw new NotImplementedException();
+
+    public Task<object> InsertAsync(string tableName, string primaryKeyName, object poco) =>
+        throw new NotImplementedException();
+
+    public object Insert<T>(string tableName, string primaryKeyName, bool autoIncrement, T poco) =>
+        throw new NotImplementedException();
+
+    public object Insert<T>(string tableName, string primaryKeyName, T poco) => throw new NotImplementedException();
+
+    public object Insert<T>(T poco) => throw new NotImplementedException();
+
+    public void InsertBulk<T>(IEnumerable<T> pocos, InsertBulkOptions? options = null) =>
+        throw new NotImplementedException();
+
+    public Task<object> InsertAsync<T>(T poco) => throw new NotImplementedException();
+
+    public Task InsertBulkAsync<T>(IEnumerable<T> pocos, InsertBulkOptions options = null) =>
+        throw new NotImplementedException();
+
+    public Task<int> InsertBatchAsync<T>(IEnumerable<T> pocos, BatchOptions options = null) =>
+        throw new NotImplementedException();
+
+    public Task<int> UpdateAsync(object poco) => throw new NotImplementedException();
+
+    public Task<int> UpdateAsync(object poco, IEnumerable<string> columns) => throw new NotImplementedException();
+
+    public Task<int> UpdateAsync<T>(T poco, Expression<Func<T, object>> fields) => throw new NotImplementedException();
+
+    public Task<int> UpdateBatchAsync<T>(IEnumerable<UpdateBatch<T>> pocos, BatchOptions options = null) =>
+        throw new NotImplementedException();
+
+    public Task<int> DeleteAsync(object poco) => throw new NotImplementedException();
+
+    public IAsyncUpdateQueryProvider<T> UpdateManyAsync<T>() => throw new NotImplementedException();
+
+    public IAsyncDeleteQueryProvider<T> DeleteManyAsync<T>() => throw new NotImplementedException();
+    public Task<bool> IsNewAsync<T>(T poco) => throw new NotImplementedException();
+
+    public Task SaveAsync<T>(T poco) => throw new NotImplementedException();
+
+    int IDatabase.InsertBatch<T>(IEnumerable<T> pocos, BatchOptions options) => throw new NotImplementedException();
+
+    public int Update(string tableName, string primaryKeyName, object poco, object primaryKeyValue) =>
+        throw new NotImplementedException();
+
+    public int Update(string tableName, string primaryKeyName, object poco) => throw new NotImplementedException();
+
+    public int Update(string tableName, string primaryKeyName, object poco, object primaryKeyValue, IEnumerable<string> columns) => throw new NotImplementedException();
+
+    public int Update(string tableName, string primaryKeyName, object poco, IEnumerable<string> columns) =>
+        throw new NotImplementedException();
+
+    public int Update(object poco, IEnumerable<string> columns) => throw new NotImplementedException();
+
+    public int Update(object poco, object primaryKeyValue, IEnumerable<string> columns) =>
+        throw new NotImplementedException();
+
+    public int Update(object poco) => throw new NotImplementedException();
+
+    public int Update<T>(T poco, Expression<Func<T, object>> fields) => throw new NotImplementedException();
+
+    public int Update(object poco, object primaryKeyValue) => throw new NotImplementedException();
+
+    public int Update<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public int Update<T>(Sql sql) => throw new NotImplementedException();
+
+    public int UpdateBatch<T>(IEnumerable<UpdateBatch<T>> pocos, BatchOptions options = null) =>
+        throw new NotImplementedException();
+
+    public IUpdateQueryProvider<T> UpdateMany<T>() => throw new NotImplementedException();
+
+    public int Delete(string tableName, string primaryKeyName, object poco) => throw new NotImplementedException();
+
+    public int Delete(string tableName, string primaryKeyName, object poco, object primaryKeyValue) =>
+        throw new NotImplementedException();
+
+    public int Delete(object poco) => throw new NotImplementedException();
+
+    public int Delete<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public int Delete<T>(Sql sql) => throw new NotImplementedException();
+
+    public int Delete<T>(object pocoOrPrimaryKey) => throw new NotImplementedException();
+
+    public IDeleteQueryProvider<T> DeleteMany<T>() => throw new NotImplementedException();
+
+    public void Save<T>(T poco) => throw new NotImplementedException();
+
+    public bool IsNew<T>(T poco) => throw new NotImplementedException();
+
+    public List<object> Fetch(Type type, string sql, params object[] args) => throw new NotImplementedException();
+
+    public List<object> Fetch(Type type, Sql sql) => throw new NotImplementedException();
+
+    public IEnumerable<object> Query(Type type, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public IEnumerable<object> Query(Type type, Sql sql) => throw new NotImplementedException();
+
+    public List<T> Fetch<T>() => throw new NotImplementedException();
+
+    public List<T> Fetch<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public List<T> Fetch<T>(Sql sql) => throw new NotImplementedException();
+
+    public List<T> Fetch<T>(long page, long itemsPerPage, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public List<T> Fetch<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
+
+    public Page<T> Page<T>(long page, long itemsPerPage, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Page<T> Page<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
+
+    public List<T> SkipTake<T>(long skip, long take, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public List<T> SkipTake<T>(long skip, long take, Sql sql) => throw new NotImplementedException();
+
+    public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, Sql sql) => throw new NotImplementedException();
+
+    public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, Func<T, object> idFunc, string sql, params object[] args) => throw new NotImplementedException();
+
+    public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, Func<T, object> idFunc, Sql sql) =>
+        throw new NotImplementedException();
+
+    public IEnumerable<T> Query<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public IEnumerable<T> Query<T>(Sql sql) => throw new NotImplementedException();
+
+    public IQueryProviderWithIncludes<T> Query<T>() => throw new NotImplementedException();
+
+    public T SingleById<T>(object primaryKey) => throw new NotImplementedException();
+
+    public T Single<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public T SingleInto<T>(T instance, string sql, params object[] args) => throw new NotImplementedException();
+
+    public T SingleOrDefaultById<T>(object primaryKey) => throw new NotImplementedException();
+
+    public T SingleOrDefault<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public T SingleOrDefaultInto<T>(T instance, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public T First<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public T FirstInto<T>(T instance, string sql, params object[] args) => throw new NotImplementedException();
+
+    public T FirstOrDefault<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public T FirstOrDefaultInto<T>(T instance, string sql, params object[] args) => throw new NotImplementedException();
+
+    public T Single<T>(Sql sql) => throw new NotImplementedException();
+
+    public T SingleInto<T>(T instance, Sql sql) => throw new NotImplementedException();
+
+    public T SingleOrDefault<T>(Sql sql) => throw new NotImplementedException();
+
+    public T SingleOrDefaultInto<T>(T instance, Sql sql) => throw new NotImplementedException();
+
+    public T First<T>(Sql sql) => throw new NotImplementedException();
+
+    public T FirstInto<T>(T instance, Sql sql) => throw new NotImplementedException();
+
+    public T FirstOrDefault<T>(Sql sql) => throw new NotImplementedException();
+
+    public T FirstOrDefaultInto<T>(T instance, Sql sql) => throw new NotImplementedException();
+
+    public Dictionary<TKey, TValue> Dictionary<TKey, TValue>(Sql sql) => throw new NotImplementedException();
+
+    public Dictionary<TKey, TValue> Dictionary<TKey, TValue>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public bool Exists<T>(object primaryKey) => throw new NotImplementedException();
+
+    public TRet FetchMultiple<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public TRet FetchMultiple<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
+
+    public TRet FetchMultiple<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
+
+    public TRet FetchMultiple<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, Sql sql) =>
+        throw new NotImplementedException();
+
+    public TRet FetchMultiple<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, Sql sql) =>
+        throw new NotImplementedException();
+
+    public TRet FetchMultiple<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, Sql sql) =>
+        throw new NotImplementedException();
+
+    (List<T1>, List<T2>) IDatabaseQuery.FetchMultiple<T1, T2>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    (List<T1>, List<T2>, List<T3>) IDatabaseQuery.FetchMultiple<T1, T2, T3>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    (List<T1>, List<T2>, List<T3>, List<T4>) IDatabaseQuery.FetchMultiple<T1, T2, T3, T4>(string sql, params object[] args) => throw new NotImplementedException();
+
+    (List<T1>, List<T2>) IDatabaseQuery.FetchMultiple<T1, T2>(Sql sql) => throw new NotImplementedException();
+
+    (List<T1>, List<T2>, List<T3>) IDatabaseQuery.FetchMultiple<T1, T2, T3>(Sql sql) =>
+        throw new NotImplementedException();
+
+    public Task<T> SingleAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<T> SingleAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    public Task<T> SingleOrDefaultAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<T> SingleOrDefaultAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    public Task<T> SingleByIdAsync<T>(object primaryKey) => throw new NotImplementedException();
+
+    public Task<T> SingleOrDefaultByIdAsync<T>(object primaryKey) => throw new NotImplementedException();
+
+    public Task<T> FirstAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<T> FirstAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    public Task<T> FirstOrDefaultAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<T> FirstOrDefaultAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    IAsyncEnumerable<T> IAsyncQueryDatabase.QueryAsync<T>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    IAsyncEnumerable<T> IAsyncQueryDatabase.QueryAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    public IAsyncQueryProviderWithIncludes<T> QueryAsync<T>() => throw new NotImplementedException();
+
+    public Task<List<T>> FetchAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<List<T>> FetchAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    public Task<List<T>> FetchAsync<T>() => throw new NotImplementedException();
+
+    public Task<Page<T>> PageAsync<T>(long page, long itemsPerPage, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Task<Page<T>> PageAsync<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
+
+    public Task<List<T>> FetchAsync<T>(long page, long itemsPerPage, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Task<List<T>> FetchAsync<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
+
+    public Task<List<T>> SkipTakeAsync<T>(long skip, long take, string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Task<List<T>> SkipTakeAsync<T>(long skip, long take, Sql sql) => throw new NotImplementedException();
+
+    public Task<TRet> FetchMultipleAsync<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<TRet> FetchMultipleAsync<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<TRet> FetchMultipleAsync<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<TRet> FetchMultipleAsync<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, Sql sql) =>
+        throw new NotImplementedException();
+
+    public Task<TRet> FetchMultipleAsync<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, Sql sql) =>
+        throw new NotImplementedException();
+
+    public Task<TRet> FetchMultipleAsync<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, Sql sql) => throw new NotImplementedException();
+
+    public Task<(List<T1>, List<T2>)> FetchMultipleAsync<T1, T2>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Task<(List<T1>, List<T2>, List<T3>)> FetchMultipleAsync<T1, T2, T3>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Task<(List<T1>, List<T2>, List<T3>, List<T4>)> FetchMultipleAsync<T1, T2, T3, T4>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<(List<T1>, List<T2>)> FetchMultipleAsync<T1, T2>(Sql sql) => throw new NotImplementedException();
+
+    public Task<(List<T1>, List<T2>, List<T3>)> FetchMultipleAsync<T1, T2, T3>(Sql sql) =>
+        throw new NotImplementedException();
+
+    public Task<(List<T1>, List<T2>, List<T3>, List<T4>)> FetchMultipleAsync<T1, T2, T3, T4>(Sql sql) =>
+        throw new NotImplementedException();
+
+    public void BuildPageQueries<T>(long skip, long take, string sql, ref object[] args, out string sqlCount, out string sqlPage) => throw new NotImplementedException();
+
+    public void InsertBulk<T>(IEnumerable<T> pocos) => throw new NotImplementedException();
+
+    public void InsertBatch<T>(IEnumerable<T> pocos, BatchOptions options = null) =>
+        throw new NotImplementedException();
+
+    public Tuple<List<T1>, List<T2>> FetchMultiple<T1, T2>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Tuple<List<T1>, List<T2>, List<T3>> FetchMultiple<T1, T2, T3>(string sql, params object[] args) =>
+        throw new NotImplementedException();
+
+    public Tuple<List<T1>, List<T2>, List<T3>, List<T4>>
+        FetchMultiple<T1, T2, T3, T4>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Tuple<List<T1>, List<T2>> FetchMultiple<T1, T2>(Sql sql) => throw new NotImplementedException();
+
+    public Tuple<List<T1>, List<T2>, List<T3>> FetchMultiple<T1, T2, T3>(Sql sql) =>
+        throw new NotImplementedException();
+
+    public Tuple<List<T1>, List<T2>, List<T3>, List<T4>> FetchMultiple<T1, T2, T3, T4>(Sql sql) =>
+        throw new NotImplementedException();
+
+    public Task<IEnumerable<T>> QueryAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
+
+    public Task<IEnumerable<T>> QueryAsync<T>(Sql sql) => throw new NotImplementedException();
+
+    /// <summary>
+    ///     Represents a database operation.
+    /// </summary>
+    public class Operation
+    {
+        public Operation(string text) => Text = text;
+
+        public Operation(string text, string sql)
+            : this(text) => Sql = sql;
+
+        public Operation(string text, string sql, params object[] args)
+            : this(text, sql) => Args = args;
 
         /// <summary>
-        /// Represents a database operation.
+        ///     Gets the operation text.
         /// </summary>
-        public class Operation
-        {
-            public Operation(string text) => Text = text;
-
-            public Operation(string text, string sql)
-                : this(text) => Sql = sql;
-
-            public Operation(string text, string sql, params object[] args)
-                : this(text, sql) => Args = args;
-
-            /// <summary>
-            /// Gets the operation text.
-            /// </summary>
-            public string Text { get; }
-
-            /// <summary>
-            /// Gets the operation Sql statement.
-            /// </summary>
-            public string Sql { get; }
-
-            /// <summary>
-            /// Gets the operation Sql arguments.
-            /// </summary>
-            public object[] Args { get; }
-        }
+        public string Text { get; }
 
         /// <summary>
-        /// Gets the database operations.
+        ///     Gets the operation Sql statement.
         /// </summary>
-        public List<Operation> Operations { get; } = new List<Operation>();
+        public string Sql { get; }
 
-        public void Dispose()
-        {
-        }
-
-        public IDatabase OpenSharedConnection() => this;
-
-        public void CloseSharedConnection()
-        {
-        }
-
-        (List<T1>, List<T2>, List<T3>, List<T4>) IDatabaseQuery.FetchMultiple<T1, T2, T3, T4>(Sql sql) => throw new NotImplementedException();
-
-        public int OneTimeCommandTimeout { get; set; }
-
-        public MapperCollection Mappers { get; set; }
-
-        public IPocoDataFactory PocoDataFactory { get; set; }
-
-        public DatabaseType DatabaseType { get; }
-
-        public List<IInterceptor> Interceptors { get; }
-
-        public string ConnectionString { get; }
-
-        public DbConnection Connection { get; }
-
-        public DbTransaction Transaction { get; }
-
-        public IDictionary<string, object> Data { get; }
-
-        public ISqlContext SqlContext { get; }
-
-        public string InstanceId { get; }
-
-        public bool InTransaction { get; }
-
-        public bool EnableSqlCount { get; set; }
-
-        public int SqlCount { get; }
-
-        public int BulkInsertRecords<T>(IEnumerable<T> records) => throw new NotImplementedException();
-        public bool IsUmbracoInstalled() => true;
-
-        public DatabaseSchemaResult ValidateSchema() => throw new NotImplementedException();
-
-        public DbParameter CreateParameter() => throw new NotImplementedException();
-
-        public void AddParameter(DbCommand cmd, object value) => throw new NotImplementedException();
-
-        public DbCommand CreateCommand(DbConnection connection, CommandType commandType, string sql, params object[] args) => throw new NotImplementedException();
-
-        public ITransaction GetTransaction() => throw new NotImplementedException();
-
-        public ITransaction GetTransaction(IsolationLevel isolationLevel) => throw new NotImplementedException();
-
-        public void SetTransaction(DbTransaction tran) => throw new NotImplementedException();
-
-        public void BeginTransaction() => Operations.Add(new Operation("BEGIN"));
-
-        public void BeginTransaction(IsolationLevel isolationLevel) => Operations.Add(new Operation("BEGIN " + isolationLevel));
-
-        public void AbortTransaction() => Operations.Add(new Operation("ABORT"));
-
-        public void CompleteTransaction() => Operations.Add(new Operation("COMMIT"));
-
-        public int Execute(string sql, params object[] args)
-        {
-            Operations.Add(new Operation("EXECUTE", sql, args));
-            return default;
-        }
-
-        public int Execute(Sql sql)
-        {
-            Operations.Add(new Operation("EXECUTE", sql.SQL, sql.Arguments));
-            return default;
-        }
-
-        public int Execute(string sql, CommandType commandType, params object[] args)
-        {
-            Operations.Add(new Operation("EXECUTE", sql, args));
-            return default;
-        }
-
-        public T ExecuteScalar<T>(string sql, params object[] args)
-        {
-            Operations.Add(new Operation("EXECUTE SCALAR", sql, args));
-            return default;
-        }
-
-        public T ExecuteScalar<T>(Sql sql)
-        {
-            Operations.Add(new Operation("EXECUTE SCALAR", sql.SQL, sql.Arguments));
-            return default;
-        }
-
-        public T ExecuteScalar<T>(string sql, CommandType commandType, params object[] args)
-        {
-            Operations.Add(new Operation("EXECUTE SCALAR", sql, args));
-            return default;
-        }
-
-        public Task<T> ExecuteScalarAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<T> ExecuteScalarAsync<T>(Sql sql) => throw new NotImplementedException();
-
-        public Task<int> ExecuteAsync(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<int> ExecuteAsync(Sql sql) => throw new NotImplementedException();
-        public Task<object> InsertAsync(string tableName, string primaryKeyName, object poco) => throw new NotImplementedException();
-
-        public object Insert<T>(string tableName, string primaryKeyName, bool autoIncrement, T poco) => throw new NotImplementedException();
-
-        public object Insert<T>(string tableName, string primaryKeyName, T poco) => throw new NotImplementedException();
-
-        public object Insert<T>(T poco) => throw new NotImplementedException();
-        public void InsertBulk<T>(IEnumerable<T> pocos, InsertBulkOptions? options = null) => throw new NotImplementedException();
-
-        public Task<object> InsertAsync<T>(T poco) => throw new NotImplementedException();
-        public Task InsertBulkAsync<T>(IEnumerable<T> pocos, InsertBulkOptions options = null) => throw new NotImplementedException();
-
-        public Task<int> InsertBatchAsync<T>(IEnumerable<T> pocos, BatchOptions options = null) => throw new NotImplementedException();
-
-        public Task<int> UpdateAsync(object poco) => throw new NotImplementedException();
-
-        public Task<int> UpdateAsync(object poco, IEnumerable<string> columns) => throw new NotImplementedException();
-
-        public Task<int> UpdateAsync<T>(T poco, Expression<Func<T, object>> fields) => throw new NotImplementedException();
-
-        public Task<int> UpdateBatchAsync<T>(IEnumerable<UpdateBatch<T>> pocos, BatchOptions options = null) => throw new NotImplementedException();
-
-        public Task<int> DeleteAsync(object poco) => throw new NotImplementedException();
-
-        public IAsyncUpdateQueryProvider<T> UpdateManyAsync<T>() => throw new NotImplementedException();
-
-        public IAsyncDeleteQueryProvider<T> DeleteManyAsync<T>() => throw new NotImplementedException();
-        public Task<bool> IsNewAsync<T>(T poco) => throw new NotImplementedException();
-
-        public Task SaveAsync<T>(T poco) => throw new NotImplementedException();
-
-        public void InsertBulk<T>(IEnumerable<T> pocos) => throw new NotImplementedException();
-
-        int IDatabase.InsertBatch<T>(IEnumerable<T> pocos, BatchOptions options) => throw new NotImplementedException();
-
-        public void InsertBatch<T>(IEnumerable<T> pocos, BatchOptions options = null) => throw new NotImplementedException();
-
-        public int Update(string tableName, string primaryKeyName, object poco, object primaryKeyValue) => throw new NotImplementedException();
-
-        public int Update(string tableName, string primaryKeyName, object poco) => throw new NotImplementedException();
-
-        public int Update(string tableName, string primaryKeyName, object poco, object primaryKeyValue, IEnumerable<string> columns) => throw new NotImplementedException();
-
-        public int Update(string tableName, string primaryKeyName, object poco, IEnumerable<string> columns) => throw new NotImplementedException();
-
-        public int Update(object poco, IEnumerable<string> columns) => throw new NotImplementedException();
-
-        public int Update(object poco, object primaryKeyValue, IEnumerable<string> columns) => throw new NotImplementedException();
-
-        public int Update(object poco) => throw new NotImplementedException();
-
-        public int Update<T>(T poco, Expression<Func<T, object>> fields) => throw new NotImplementedException();
-
-        public int Update(object poco, object primaryKeyValue) => throw new NotImplementedException();
-
-        public int Update<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public int Update<T>(Sql sql) => throw new NotImplementedException();
-
-        public int UpdateBatch<T>(IEnumerable<UpdateBatch<T>> pocos, BatchOptions options = null) => throw new NotImplementedException();
-
-        public IUpdateQueryProvider<T> UpdateMany<T>() => throw new NotImplementedException();
-
-        public int Delete(string tableName, string primaryKeyName, object poco) => throw new NotImplementedException();
-
-        public int Delete(string tableName, string primaryKeyName, object poco, object primaryKeyValue) => throw new NotImplementedException();
-
-        public int Delete(object poco) => throw new NotImplementedException();
-
-        public int Delete<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public int Delete<T>(Sql sql) => throw new NotImplementedException();
-
-        public int Delete<T>(object pocoOrPrimaryKey) => throw new NotImplementedException();
-
-        public IDeleteQueryProvider<T> DeleteMany<T>() => throw new NotImplementedException();
-
-        public void Save<T>(T poco) => throw new NotImplementedException();
-
-        public bool IsNew<T>(T poco) => throw new NotImplementedException();
-
-        public List<object> Fetch(Type type, string sql, params object[] args) => throw new NotImplementedException();
-
-        public List<object> Fetch(Type type, Sql sql) => throw new NotImplementedException();
-
-        public IEnumerable<object> Query(Type type, string sql, params object[] args) => throw new NotImplementedException();
-
-        public IEnumerable<object> Query(Type type, Sql sql) => throw new NotImplementedException();
-
-        public List<T> Fetch<T>() => throw new NotImplementedException();
-
-        public List<T> Fetch<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public List<T> Fetch<T>(Sql sql) => throw new NotImplementedException();
-
-        public List<T> Fetch<T>(long page, long itemsPerPage, string sql, params object[] args) => throw new NotImplementedException();
-
-        public List<T> Fetch<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
-
-        public Page<T> Page<T>(long page, long itemsPerPage, string sql, params object[] args) => throw new NotImplementedException();
-
-        public Page<T> Page<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
-
-        public List<T> SkipTake<T>(long skip, long take, string sql, params object[] args) => throw new NotImplementedException();
-
-        public List<T> SkipTake<T>(long skip, long take, Sql sql) => throw new NotImplementedException();
-
-        public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, string sql, params object[] args) => throw new NotImplementedException();
-
-        public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, Sql sql) => throw new NotImplementedException();
-
-        public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, Func<T, object> idFunc, string sql, params object[] args) => throw new NotImplementedException();
-
-        public List<T> FetchOneToMany<T>(Expression<Func<T, IList>> many, Func<T, object> idFunc, Sql sql) => throw new NotImplementedException();
-
-        public IEnumerable<T> Query<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public IEnumerable<T> Query<T>(Sql sql) => throw new NotImplementedException();
-
-        public IQueryProviderWithIncludes<T> Query<T>() => throw new NotImplementedException();
-
-        public T SingleById<T>(object primaryKey) => throw new NotImplementedException();
-
-        public T Single<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public T SingleInto<T>(T instance, string sql, params object[] args) => throw new NotImplementedException();
-
-        public T SingleOrDefaultById<T>(object primaryKey) => throw new NotImplementedException();
-
-        public T SingleOrDefault<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public T SingleOrDefaultInto<T>(T instance, string sql, params object[] args) => throw new NotImplementedException();
-
-        public T First<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public T FirstInto<T>(T instance, string sql, params object[] args) => throw new NotImplementedException();
-
-        public T FirstOrDefault<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public T FirstOrDefaultInto<T>(T instance, string sql, params object[] args) => throw new NotImplementedException();
-
-        public T Single<T>(Sql sql) => throw new NotImplementedException();
-
-        public T SingleInto<T>(T instance, Sql sql) => throw new NotImplementedException();
-
-        public T SingleOrDefault<T>(Sql sql) => throw new NotImplementedException();
-
-        public T SingleOrDefaultInto<T>(T instance, Sql sql) => throw new NotImplementedException();
-
-        public T First<T>(Sql sql) => throw new NotImplementedException();
-
-        public T FirstInto<T>(T instance, Sql sql) => throw new NotImplementedException();
-
-        public T FirstOrDefault<T>(Sql sql) => throw new NotImplementedException();
-
-        public T FirstOrDefaultInto<T>(T instance, Sql sql) => throw new NotImplementedException();
-
-        public Dictionary<TKey, TValue> Dictionary<TKey, TValue>(Sql sql) => throw new NotImplementedException();
-
-        public Dictionary<TKey, TValue> Dictionary<TKey, TValue>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public bool Exists<T>(object primaryKey) => throw new NotImplementedException();
-
-        public TRet FetchMultiple<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
-
-        public TRet FetchMultiple<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
-
-        public TRet FetchMultiple<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
-
-        public TRet FetchMultiple<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, Sql sql) => throw new NotImplementedException();
-
-        public TRet FetchMultiple<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, Sql sql) => throw new NotImplementedException();
-
-        public TRet FetchMultiple<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, Sql sql) => throw new NotImplementedException();
-        (List<T1>, List<T2>) IDatabaseQuery.FetchMultiple<T1, T2>(string sql, params object[] args) => throw new NotImplementedException();
-
-        (List<T1>, List<T2>, List<T3>) IDatabaseQuery.FetchMultiple<T1, T2, T3>(string sql, params object[] args) => throw new NotImplementedException();
-
-        (List<T1>, List<T2>, List<T3>, List<T4>) IDatabaseQuery.FetchMultiple<T1, T2, T3, T4>(string sql, params object[] args) => throw new NotImplementedException();
-
-        (List<T1>, List<T2>) IDatabaseQuery.FetchMultiple<T1, T2>(Sql sql) => throw new NotImplementedException();
-
-        (List<T1>, List<T2>, List<T3>) IDatabaseQuery.FetchMultiple<T1, T2, T3>(Sql sql) => throw new NotImplementedException();
-
-        public Tuple<List<T1>, List<T2>> FetchMultiple<T1, T2>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Tuple<List<T1>, List<T2>, List<T3>> FetchMultiple<T1, T2, T3>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Tuple<List<T1>, List<T2>, List<T3>, List<T4>> FetchMultiple<T1, T2, T3, T4>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Tuple<List<T1>, List<T2>> FetchMultiple<T1, T2>(Sql sql) => throw new NotImplementedException();
-
-        public Tuple<List<T1>, List<T2>, List<T3>> FetchMultiple<T1, T2, T3>(Sql sql) => throw new NotImplementedException();
-
-        public Tuple<List<T1>, List<T2>, List<T3>, List<T4>> FetchMultiple<T1, T2, T3, T4>(Sql sql) => throw new NotImplementedException();
-
-        public Task<T> SingleAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<T> SingleAsync<T>(Sql sql) => throw new NotImplementedException();
-
-        public Task<T> SingleOrDefaultAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<T> SingleOrDefaultAsync<T>(Sql sql) => throw new NotImplementedException();
-
-        public Task<T> SingleByIdAsync<T>(object primaryKey) => throw new NotImplementedException();
-
-        public Task<T> SingleOrDefaultByIdAsync<T>(object primaryKey) => throw new NotImplementedException();
-
-        public Task<T> FirstAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<T> FirstAsync<T>(Sql sql) => throw new NotImplementedException();
-
-        public Task<T> FirstOrDefaultAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<T> FirstOrDefaultAsync<T>(Sql sql) => throw new NotImplementedException();
-        IAsyncEnumerable<T> IAsyncQueryDatabase.QueryAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        IAsyncEnumerable<T> IAsyncQueryDatabase.QueryAsync<T>(Sql sql) => throw new NotImplementedException();
-
-        public Task<IEnumerable<T>> QueryAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<IEnumerable<T>> QueryAsync<T>(Sql sql) => throw new NotImplementedException();
-
-        public IAsyncQueryProviderWithIncludes<T> QueryAsync<T>() => throw new NotImplementedException();
-
-        public Task<List<T>> FetchAsync<T>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<List<T>> FetchAsync<T>(Sql sql) => throw new NotImplementedException();
-
-        public Task<List<T>> FetchAsync<T>() => throw new NotImplementedException();
-
-        public Task<Page<T>> PageAsync<T>(long page, long itemsPerPage, string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<Page<T>> PageAsync<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
-
-        public Task<List<T>> FetchAsync<T>(long page, long itemsPerPage, string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<List<T>> FetchAsync<T>(long page, long itemsPerPage, Sql sql) => throw new NotImplementedException();
-
-        public Task<List<T>> SkipTakeAsync<T>(long skip, long take, string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<List<T>> SkipTakeAsync<T>(long skip, long take, Sql sql) => throw new NotImplementedException();
-        public Task<TRet> FetchMultipleAsync<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<TRet> FetchMultipleAsync<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<TRet> FetchMultipleAsync<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<TRet> FetchMultipleAsync<T1, T2, TRet>(Func<List<T1>, List<T2>, TRet> cb, Sql sql) => throw new NotImplementedException();
-
-        public Task<TRet> FetchMultipleAsync<T1, T2, T3, TRet>(Func<List<T1>, List<T2>, List<T3>, TRet> cb, Sql sql) => throw new NotImplementedException();
-
-        public Task<TRet> FetchMultipleAsync<T1, T2, T3, T4, TRet>(Func<List<T1>, List<T2>, List<T3>, List<T4>, TRet> cb, Sql sql) => throw new NotImplementedException();
-
-        public Task<(List<T1>, List<T2>)> FetchMultipleAsync<T1, T2>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<(List<T1>, List<T2>, List<T3>)> FetchMultipleAsync<T1, T2, T3>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<(List<T1>, List<T2>, List<T3>, List<T4>)> FetchMultipleAsync<T1, T2, T3, T4>(string sql, params object[] args) => throw new NotImplementedException();
-
-        public Task<(List<T1>, List<T2>)> FetchMultipleAsync<T1, T2>(Sql sql) => throw new NotImplementedException();
-
-        public Task<(List<T1>, List<T2>, List<T3>)> FetchMultipleAsync<T1, T2, T3>(Sql sql) => throw new NotImplementedException();
-
-        public Task<(List<T1>, List<T2>, List<T3>, List<T4>)> FetchMultipleAsync<T1, T2, T3, T4>(Sql sql) => throw new NotImplementedException();
-
-        public void BuildPageQueries<T>(long skip, long take, string sql, ref object[] args, out string sqlCount, out string sqlPage) => throw new NotImplementedException();
+        /// <summary>
+        ///     Gets the operation Sql arguments.
+        /// </summary>
+        public object[] Args { get; }
     }
 }
diff --git a/tests/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs b/tests/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs
index 38c346a944..df936fe68d 100644
--- a/tests/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs
+++ b/tests/Umbraco.Tests.Common/TestHelpers/TestEnvironment.cs
@@ -3,14 +3,13 @@
 
 using System.Runtime.InteropServices;
 
-namespace Umbraco.Cms.Tests.Common.TestHelpers
+namespace Umbraco.Cms.Tests.Common.TestHelpers;
+
+public static class TestEnvironment
 {
-    public static class TestEnvironment
-    {
-        public static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+    public static bool IsLinux => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
 
-        public static bool IsOSX => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+    public static bool IsOSX => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 
-        public static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-    }
+    public static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 }
diff --git a/tests/Umbraco.Tests.Common/TestLastChanceFinder.cs b/tests/Umbraco.Tests.Common/TestLastChanceFinder.cs
index 6f99b15ac6..3b00e20981 100644
--- a/tests/Umbraco.Tests.Common/TestLastChanceFinder.cs
+++ b/tests/Umbraco.Tests.Common/TestLastChanceFinder.cs
@@ -4,10 +4,9 @@
 using System.Threading.Tasks;
 using Umbraco.Cms.Core.Routing;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+public class TestLastChanceFinder : IContentLastChanceFinder
 {
-    public class TestLastChanceFinder : IContentLastChanceFinder
-    {
-        public async Task<bool> TryFindContent(IPublishedRequestBuilder frequest) => false;
-    }
+    public async Task<bool> TryFindContent(IPublishedRequestBuilder frequest) => false;
 }
diff --git a/tests/Umbraco.Tests.Common/TestOptionsMonitor.cs b/tests/Umbraco.Tests.Common/TestOptionsMonitor.cs
index 95ccc04239..25c9eedfb4 100644
--- a/tests/Umbraco.Tests.Common/TestOptionsMonitor.cs
+++ b/tests/Umbraco.Tests.Common/TestOptionsMonitor.cs
@@ -1,16 +1,15 @@
-using System;
+using System;
 using Microsoft.Extensions.Options;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+public class TestOptionsMonitor<T> : IOptionsMonitor<T> where T : class
 {
-    public class TestOptionsMonitor<T> : IOptionsMonitor<T> where T : class
-    {
-        public TestOptionsMonitor(T currentValue) => CurrentValue = currentValue;
+    public TestOptionsMonitor(T currentValue) => CurrentValue = currentValue;
 
-        public T Get(string name) => CurrentValue;
+    public T Get(string name) => CurrentValue;
 
-        public IDisposable OnChange(Action<T, string> listener) => null;
+    public IDisposable OnChange(Action<T, string> listener) => null;
 
-        public T CurrentValue { get; }
-    }
+    public T CurrentValue { get; }
 }
diff --git a/tests/Umbraco.Tests.Common/TestOptionsSnapshot.cs b/tests/Umbraco.Tests.Common/TestOptionsSnapshot.cs
index 9b3cdb4b2c..80698aba89 100644
--- a/tests/Umbraco.Tests.Common/TestOptionsSnapshot.cs
+++ b/tests/Umbraco.Tests.Common/TestOptionsSnapshot.cs
@@ -1,11 +1,10 @@
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.Options;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+public class TestOptionsSnapshot<T> : IOptionsSnapshot<T> where T : class
 {
-    public class TestOptionsSnapshot<T> :  IOptionsSnapshot<T> where T : class
-    {
-        public TestOptionsSnapshot(T value) => Value = value;
-        public T Value { get; }
-        public T Get(string name) => Value;
-    }
+    public TestOptionsSnapshot(T value) => Value = value;
+    public T Value { get; }
+    public T Get(string name) => Value;
 }
diff --git a/tests/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs b/tests/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
index de6ed7b0b6..54e49d0283 100644
--- a/tests/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
+++ b/tests/Umbraco.Tests.Common/TestPublishedSnapshotAccessor.cs
@@ -3,18 +3,17 @@
 
 using Umbraco.Cms.Core.PublishedCache;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+public class TestPublishedSnapshotAccessor : IPublishedSnapshotAccessor
 {
-    public class TestPublishedSnapshotAccessor : IPublishedSnapshotAccessor
+    private IPublishedSnapshot _snapshot;
+
+    public bool TryGetPublishedSnapshot(out IPublishedSnapshot publishedSnapshot)
     {
-        private IPublishedSnapshot _snapshot = null;
-
-        public bool TryGetPublishedSnapshot(out IPublishedSnapshot publishedSnapshot)
-        {
-            publishedSnapshot = _snapshot;
-            return _snapshot != null;
-        }
-
-        public void SetCurrent(IPublishedSnapshot snapshot) => _snapshot = snapshot;
+        publishedSnapshot = _snapshot;
+        return _snapshot != null;
     }
+
+    public void SetCurrent(IPublishedSnapshot snapshot) => _snapshot = snapshot;
 }
diff --git a/tests/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs b/tests/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
index 7aba813f90..e5d1142c48 100644
--- a/tests/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
+++ b/tests/Umbraco.Tests.Common/TestUmbracoContextAccessor.cs
@@ -3,25 +3,24 @@
 
 using Umbraco.Cms.Core.Web;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+public class TestUmbracoContextAccessor : IUmbracoContextAccessor
 {
-    public class TestUmbracoContextAccessor : IUmbracoContextAccessor
+    private IUmbracoContext _umbracoContext;
+
+    public TestUmbracoContextAccessor()
     {
-        private IUmbracoContext _umbracoContext;
-
-        public TestUmbracoContextAccessor()
-        {
-        }
-
-        public TestUmbracoContextAccessor(IUmbracoContext umbracoContext) => _umbracoContext = umbracoContext;
-
-        public bool TryGetUmbracoContext(out IUmbracoContext umbracoContext)
-        {
-            umbracoContext = _umbracoContext;
-            return umbracoContext is not null;
-        }
-
-        public void Clear() => _umbracoContext = null;
-        public void Set(IUmbracoContext umbracoContext) => _umbracoContext = umbracoContext;
     }
+
+    public TestUmbracoContextAccessor(IUmbracoContext umbracoContext) => _umbracoContext = umbracoContext;
+
+    public bool TryGetUmbracoContext(out IUmbracoContext umbracoContext)
+    {
+        umbracoContext = _umbracoContext;
+        return umbracoContext is not null;
+    }
+
+    public void Clear() => _umbracoContext = null;
+    public void Set(IUmbracoContext umbracoContext) => _umbracoContext = umbracoContext;
 }
diff --git a/tests/Umbraco.Tests.Common/TestVariationContextAccessor.cs b/tests/Umbraco.Tests.Common/TestVariationContextAccessor.cs
index 484d0d0511..a03fcb1423 100644
--- a/tests/Umbraco.Tests.Common/TestVariationContextAccessor.cs
+++ b/tests/Umbraco.Tests.Common/TestVariationContextAccessor.cs
@@ -3,14 +3,13 @@
 
 using Umbraco.Cms.Core.Models.PublishedContent;
 
-namespace Umbraco.Cms.Tests.Common
+namespace Umbraco.Cms.Tests.Common;
+
+/// <summary>
+///     Provides an implementation of <see cref="IVariationContextAccessor" /> for tests.
+/// </summary>
+public class TestVariationContextAccessor : IVariationContextAccessor
 {
-    /// <summary>
-    /// Provides an implementation of <see cref="IVariationContextAccessor"/> for tests.
-    /// </summary>
-    public class TestVariationContextAccessor : IVariationContextAccessor
-    {
-        /// <inheritdoc />
-        public VariationContext VariationContext { get; set; }
-    }
+    /// <inheritdoc />
+    public VariationContext VariationContext { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs b/tests/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs
index bd88d80bc0..f8596aea52 100644
--- a/tests/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs
+++ b/tests/Umbraco.Tests.Common/Testing/TestHostingEnvironment.cs
@@ -7,29 +7,28 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Web.Common.AspNetCore;
 using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
 
-namespace Umbraco.Cms.Tests.Common.Testing
+namespace Umbraco.Cms.Tests.Common.Testing;
+
+public class TestHostingEnvironment : AspNetCoreHostingEnvironment, IHostingEnvironment
 {
-    public class TestHostingEnvironment : AspNetCoreHostingEnvironment, IHostingEnvironment
+    public TestHostingEnvironment(
+        IOptionsMonitor<HostingSettings> hostingSettings,
+        IOptionsMonitor<WebRoutingSettings> webRoutingSettings,
+        IWebHostEnvironment webHostEnvironment)
+        : base(hostingSettings, webRoutingSettings, webHostEnvironment)
     {
-        public TestHostingEnvironment(
-            IOptionsMonitor<HostingSettings> hostingSettings,
-            IOptionsMonitor<WebRoutingSettings> webRoutingSettings,
-            IWebHostEnvironment webHostEnvironment)
-            : base(hostingSettings, webRoutingSettings, webHostEnvironment)
-        {
-        }
-
-        // override
-        string IHostingEnvironment.ApplicationId { get; } = "TestApplication";
-
-
-        /// <summary>
-        /// Gets a value indicating whether we are hosted.
-        /// </summary>
-        /// <remarks>
-        /// This is specifically used by IOHelper and we want this to return false so that the root path is manually
-        /// calculated which is what we want for tests.
-        /// </remarks>
-        bool IHostingEnvironment.IsHosted { get; } = false;
     }
+
+    // override
+    string IHostingEnvironment.ApplicationId { get; } = "TestApplication";
+
+
+    /// <summary>
+    ///     Gets a value indicating whether we are hosted.
+    /// </summary>
+    /// <remarks>
+    ///     This is specifically used by IOHelper and we want this to return false so that the root path is manually
+    ///     calculated which is what we want for tests.
+    /// </remarks>
+    bool IHostingEnvironment.IsHosted { get; } = false;
 }
diff --git a/tests/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs b/tests/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
index a5a4c2ff41..0134365ef9 100644
--- a/tests/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
+++ b/tests/Umbraco.Tests.Common/Testing/TestOptionAttributeBase.cs
@@ -9,68 +9,67 @@ using NUnit.Framework;
 using NUnit.Framework.Internal;
 using Umbraco.Cms.Core.Exceptions;
 
-namespace Umbraco.Cms.Tests.Common.Testing
+namespace Umbraco.Cms.Tests.Common.Testing;
+
+public abstract class TestOptionAttributeBase : Attribute
 {
-    public abstract class TestOptionAttributeBase : Attribute
+    [Obsolete("This is not used anymore - Test classes are found using nunit helpers")]
+    public static readonly List<Assembly> ScanAssemblies = new();
+
+    public static TOptions GetTestOptions<TOptions>(MethodInfo method)
+        where TOptions : TestOptionAttributeBase, new()
     {
-        [Obsolete("This is not used anymore - Test classes are found using nunit helpers")]
-        public static readonly List<Assembly> ScanAssemblies = new List<Assembly>();
-
-        public static TOptions GetTestOptions<TOptions>(MethodInfo method)
-            where TOptions : TestOptionAttributeBase, new()
-        {
-            TOptions attr = ((TOptions[])method.GetCustomAttributes(typeof(TOptions), true)).FirstOrDefault();
-            Type type = method.DeclaringType;
-            return Get(type, attr);
-        }
-
-        public static TOptions GetFixtureOptions<TOptions>(Type type)
-            where TOptions : TestOptionAttributeBase, new() => Get<TOptions>(type, null);
-
-        public static TOptions GetTestOptions<TOptions>()
-            where TOptions : TestOptionAttributeBase, new()
-        {
-            TestContext.TestAdapter test = TestContext.CurrentContext.Test;
-            var methodName = test.MethodName;
-            var type = TestExecutionContext.CurrentContext.TestObject.GetType();
-            MethodInfo methodInfo = type.GetMethod(methodName); // what about overloads?
-            TOptions options = GetTestOptions<TOptions>(methodInfo);
-            return options;
-        }
-
-        private static TOptions Get<TOptions>(Type type, TOptions attr)
-            where TOptions : TestOptionAttributeBase, new()
-        {
-            while (type != null && type != typeof(object))
-            {
-                TOptions attr2 = ((TOptions[])type.GetCustomAttributes(typeof(TOptions), true)).FirstOrDefault();
-                if (attr2 != null)
-                {
-                    attr = attr == null ? attr2 : attr2.Merge(attr);
-                }
-
-                type = type.BaseType;
-            }
-
-            return attr ?? new TOptions();
-        }
-
-        private TOptions Merge<TOptions>(TOptions other)
-            where TOptions : TestOptionAttributeBase
-        {
-            if (other == null)
-            {
-                throw new ArgumentNullException(nameof(other));
-            }
-
-            if (!(Merge((TestOptionAttributeBase)other) is TOptions merged))
-            {
-                throw new PanicException("Could not merge test options");
-            }
-
-            return merged;
-        }
-
-        protected virtual TestOptionAttributeBase Merge(TestOptionAttributeBase other) => this;
+        var attr = ((TOptions[])method.GetCustomAttributes(typeof(TOptions), true)).FirstOrDefault();
+        var type = method.DeclaringType;
+        return Get(type, attr);
     }
+
+    public static TOptions GetFixtureOptions<TOptions>(Type type)
+        where TOptions : TestOptionAttributeBase, new() => Get<TOptions>(type, null);
+
+    public static TOptions GetTestOptions<TOptions>()
+        where TOptions : TestOptionAttributeBase, new()
+    {
+        var test = TestContext.CurrentContext.Test;
+        var methodName = test.MethodName;
+        var type = TestExecutionContext.CurrentContext.TestObject.GetType();
+        var methodInfo = type.GetMethod(methodName); // what about overloads?
+        var options = GetTestOptions<TOptions>(methodInfo);
+        return options;
+    }
+
+    private static TOptions Get<TOptions>(Type type, TOptions attr)
+        where TOptions : TestOptionAttributeBase, new()
+    {
+        while (type != null && type != typeof(object))
+        {
+            var attr2 = ((TOptions[])type.GetCustomAttributes(typeof(TOptions), true)).FirstOrDefault();
+            if (attr2 != null)
+            {
+                attr = attr == null ? attr2 : attr2.Merge(attr);
+            }
+
+            type = type.BaseType;
+        }
+
+        return attr ?? new TOptions();
+    }
+
+    private TOptions Merge<TOptions>(TOptions other)
+        where TOptions : TestOptionAttributeBase
+    {
+        if (other == null)
+        {
+            throw new ArgumentNullException(nameof(other));
+        }
+
+        if (!(Merge((TestOptionAttributeBase)other) is TOptions merged))
+        {
+            throw new PanicException("Could not merge test options");
+        }
+
+        return merged;
+    }
+
+    protected virtual TestOptionAttributeBase Merge(TestOptionAttributeBase other) => this;
 }
diff --git a/tests/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs b/tests/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
index 7537ba1a82..89a02f3705 100644
--- a/tests/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
+++ b/tests/Umbraco.Tests.Common/Testing/UmbracoTestAttribute.cs
@@ -4,82 +4,97 @@
 using System;
 using Umbraco.Cms.Core;
 
-namespace Umbraco.Cms.Tests.Common.Testing
+namespace Umbraco.Cms.Tests.Common.Testing;
+
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, /*AllowMultiple = false,*/ Inherited = false)]
+public class UmbracoTestAttribute : TestOptionAttributeBase
 {
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, /*AllowMultiple = false,*/ Inherited = false)]
-    public class UmbracoTestAttribute : TestOptionAttributeBase
+    private readonly Settable<bool> _boot = new();
+
+    private readonly Settable<UmbracoTestOptions.Database> _database = new();
+
+    private readonly Settable<UmbracoTestOptions.Logger> _logger = new();
+
+    private readonly Settable<bool> _mapper = new();
+
+    private readonly Settable<bool> _publishedRepositoryEvents = new();
+
+    private readonly Settable<UmbracoTestOptions.TypeLoader> _typeLoader = new();
+
+    private readonly Settable<bool> _withApplication = new();
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether tests are "WithApplication".
+    /// </summary>
+    /// <remarks>
+    ///     <para>Default is false.</para>
+    ///     <para>This is for tests that inherited from TestWithApplicationBase.</para>
+    ///     <para>Implies Mapper = true (, ResetPluginManager = false).</para>
+    /// </remarks>
+    public bool WithApplication { get => _withApplication.ValueOrDefault(false); set => _withApplication.Set(value); }
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether to compose and initialize the mapper.
+    /// </summary>
+    /// <remarks>Default is false unless WithApplication is true, in which case default is true.</remarks>
+    public bool Mapper { get => _mapper.ValueOrDefault(WithApplication); set => _mapper.Set(value); }
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether the LEGACY XML Cache used in tests should bind to repository events
+    /// </summary>
+    public bool PublishedRepositoryEvents
     {
-        /// <summary>
-        /// Gets or sets a value indicating whether tests are "WithApplication".
-        /// </summary>
-        /// <remarks>
-        /// <para>Default is false.</para>
-        /// <para>This is for tests that inherited from TestWithApplicationBase.</para>
-        /// <para>Implies Mapper = true (, ResetPluginManager = false).</para>
-        /// </remarks>
-        public bool WithApplication { get => _withApplication.ValueOrDefault(false); set => _withApplication.Set(value); }
+        get => _publishedRepositoryEvents.ValueOrDefault(false);
+        set => _publishedRepositoryEvents.Set(value);
+    }
 
-        private readonly Settable<bool> _withApplication = new Settable<bool>();
+    /// <summary>
+    ///     Gets or sets a value indicating the required logging support.
+    /// </summary>
+    /// <remarks>Default is to mock logging.</remarks>
+    public UmbracoTestOptions.Logger Logger
+    {
+        get => _logger.ValueOrDefault(UmbracoTestOptions.Logger.Mock);
+        set => _logger.Set(value);
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether to compose and initialize the mapper.
-        /// </summary>
-        /// <remarks>Default is false unless WithApplication is true, in which case default is true.</remarks>
-        public bool Mapper { get => _mapper.ValueOrDefault(WithApplication); set => _mapper.Set(value); }
+    /// <summary>
+    ///     Gets or sets a value indicating the required database support.
+    /// </summary>
+    /// <remarks>Default is no database support.</remarks>
+    public UmbracoTestOptions.Database Database
+    {
+        get => _database.ValueOrDefault(UmbracoTestOptions.Database.None);
+        set => _database.Set(value);
+    }
 
-        private readonly Settable<bool> _mapper = new Settable<bool>();
+    /// <summary>
+    ///     Gets or sets a value indicating the required plugin manager support.
+    /// </summary>
+    /// <remarks>Default is to use the global tests plugin manager.</remarks>
+    public UmbracoTestOptions.TypeLoader TypeLoader
+    {
+        get => _typeLoader.ValueOrDefault(UmbracoTestOptions.TypeLoader.Default);
+        set => _typeLoader.Set(value);
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the LEGACY XML Cache used in tests should bind to repository events
-        /// </summary>
-        public bool PublishedRepositoryEvents { get => _publishedRepositoryEvents.ValueOrDefault(false); set => _publishedRepositoryEvents.Set(value); }
+    public bool Boot { get => _boot.ValueOrDefault(false); set => _boot.Set(value); }
 
-        private readonly Settable<bool> _publishedRepositoryEvents = new Settable<bool>();
-
-        /// <summary>
-        /// Gets or sets a value indicating the required logging support.
-        /// </summary>
-        /// <remarks>Default is to mock logging.</remarks>
-        public UmbracoTestOptions.Logger Logger { get => _logger.ValueOrDefault(UmbracoTestOptions.Logger.Mock); set => _logger.Set(value); }
-
-        private readonly Settable<UmbracoTestOptions.Logger> _logger = new Settable<UmbracoTestOptions.Logger>();
-
-        /// <summary>
-        /// Gets or sets a value indicating the required database support.
-        /// </summary>
-        /// <remarks>Default is no database support.</remarks>
-        public UmbracoTestOptions.Database Database { get => _database.ValueOrDefault(UmbracoTestOptions.Database.None); set => _database.Set(value); }
-
-        private readonly Settable<UmbracoTestOptions.Database> _database = new Settable<UmbracoTestOptions.Database>();
-
-        /// <summary>
-        /// Gets or sets a value indicating the required plugin manager support.
-        /// </summary>
-        /// <remarks>Default is to use the global tests plugin manager.</remarks>
-        public UmbracoTestOptions.TypeLoader TypeLoader { get => _typeLoader.ValueOrDefault(UmbracoTestOptions.TypeLoader.Default); set => _typeLoader.Set(value); }
-
-        public bool Boot { get => _boot.ValueOrDefault(false); set => _boot.Set(value); }
-
-        private readonly Settable<bool> _boot = new Settable<bool>();
-
-        private readonly Settable<UmbracoTestOptions.TypeLoader> _typeLoader = new Settable<UmbracoTestOptions.TypeLoader>();
-
-        protected override TestOptionAttributeBase Merge(TestOptionAttributeBase other)
+    protected override TestOptionAttributeBase Merge(TestOptionAttributeBase other)
+    {
+        if (!(other is UmbracoTestAttribute attr))
         {
-            if (!(other is UmbracoTestAttribute attr))
-            {
-                throw new ArgumentException(nameof(other));
-            }
-
-            base.Merge(other);
-            _boot.Set(attr.Boot);
-            _mapper.Set(attr._mapper);
-            _publishedRepositoryEvents.Set(attr._publishedRepositoryEvents);
-            _logger.Set(attr._logger);
-            _database.Set(attr._database);
-            _typeLoader.Set(attr._typeLoader);
-
-            return this;
+            throw new ArgumentException(nameof(other));
         }
+
+        base.Merge(other);
+        _boot.Set(attr.Boot);
+        _mapper.Set(attr._mapper);
+        _publishedRepositoryEvents.Set(attr._publishedRepositoryEvents);
+        _logger.Set(attr._logger);
+        _database.Set(attr._database);
+        _typeLoader.Set(attr._typeLoader);
+
+        return this;
     }
 }
diff --git a/tests/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs b/tests/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
index a0286f1be3..0b91629c6f 100644
--- a/tests/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
+++ b/tests/Umbraco.Tests.Common/Testing/UmbracoTestOptions.cs
@@ -1,72 +1,71 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Common.Testing
+namespace Umbraco.Cms.Tests.Common.Testing;
+
+public static class UmbracoTestOptions
 {
-    public static class UmbracoTestOptions
+    public enum Database
     {
-        public enum Logger
-        {
-            /// <summary>
-            /// pure mocks
-            /// </summary>
-            Mock,
+        /// <summary>
+        ///     no database
+        /// </summary>
+        None,
 
-            /// <summary>
-            /// Serilog for tests
-            /// </summary>
-            Serilog,
+        /// <summary>
+        ///     new empty database file for the entire fixture
+        /// </summary>
+        NewEmptyPerFixture,
 
-            /// <summary>
-            /// console logger
-            /// </summary>
-            Console
-        }
+        /// <summary>
+        ///     new empty database file per test
+        /// </summary>
+        NewEmptyPerTest,
 
-        public enum Database
-        {
-            /// <summary>
-            /// no database
-            /// </summary>
-            None,
+        /// <summary>
+        ///     new database file with schema for the entire fixture
+        /// </summary>
+        NewSchemaPerFixture,
 
-            /// <summary>
-            /// new empty database file for the entire fixture
-            /// </summary>
-            NewEmptyPerFixture,
+        /// <summary>
+        ///     new database file with schema per test
+        /// </summary>
+        NewSchemaPerTest
+    }
 
-            /// <summary>
-            /// new empty database file per test
-            /// </summary>
-            NewEmptyPerTest,
+    public enum Logger
+    {
+        /// <summary>
+        ///     pure mocks
+        /// </summary>
+        Mock,
 
-            /// <summary>
-            /// new database file with schema for the entire fixture
-            /// </summary>
-            NewSchemaPerFixture,
+        /// <summary>
+        ///     Serilog for tests
+        /// </summary>
+        Serilog,
 
-            /// <summary>
-            /// new database file with schema per test
-            /// </summary>
-            NewSchemaPerTest
-        }
+        /// <summary>
+        ///     console logger
+        /// </summary>
+        Console
+    }
 
-        public enum TypeLoader
-        {
-            /// <summary>
-            /// the default, global type loader for tests
-            /// </summary>
-            Default,
+    public enum TypeLoader
+    {
+        /// <summary>
+        ///     the default, global type loader for tests
+        /// </summary>
+        Default,
 
-            /// <summary>
-            /// create one type loader for the feature
-            /// </summary>
-            PerFixture,
+        /// <summary>
+        ///     create one type loader for the feature
+        /// </summary>
+        PerFixture,
 
-            /// <summary>
-            /// create one type loader for each test
-            /// </summary>
-            PerTest
-        }
+        /// <summary>
+        ///     create one type loader for each test
+        /// </summary>
+        PerTest
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/ComponentRuntimeTests.cs b/tests/Umbraco.Tests.Integration/ComponentRuntimeTests.cs
index acefa12796..e1a1ac8ae8 100644
--- a/tests/Umbraco.Tests.Integration/ComponentRuntimeTests.cs
+++ b/tests/Umbraco.Tests.Integration/ComponentRuntimeTests.cs
@@ -10,61 +10,54 @@ using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration
+namespace Umbraco.Cms.Tests.Integration;
+
+[TestFixture]
+[UmbracoTest(Boot = true)]
+public class ComponentRuntimeTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Boot = true)]
-    public class ComponentRuntimeTests : UmbracoIntegrationTest
+    // ensure composers are added
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddComposers();
+
+    /// <summary>
+    ///     This will boot up umbraco with components enabled to show they initialize and shutdown
+    /// </summary>
+    [Test]
+    public async Task Start_And_Stop_Umbraco_With_Components_Enabled()
     {
-        // ensure composers are added
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
-        {
-            builder.AddComposers();
-        }
+        var runtime = Services.GetRequiredService<IRuntime>();
+        var runtimeState = Services.GetRequiredService<IRuntimeState>();
+        var mainDom = Services.GetRequiredService<IMainDom>();
+        var components = Services.GetRequiredService<ComponentCollection>();
 
-        /// <summary>
-        /// This will boot up umbraco with components enabled to show they initialize and shutdown
-        /// </summary>
-        [Test]
-        public async Task Start_And_Stop_Umbraco_With_Components_Enabled()
-        {
-            IRuntime runtime = Services.GetRequiredService<IRuntime>();
-            IRuntimeState runtimeState = Services.GetRequiredService<IRuntimeState>();
-            IMainDom mainDom = Services.GetRequiredService<IMainDom>();
-            ComponentCollection components = Services.GetRequiredService<ComponentCollection>();
+        var myComponent = components.OfType<MyComponent>().First();
 
-            MyComponent myComponent = components.OfType<MyComponent>().First();
+        Assert.IsTrue(mainDom.IsMainDom);
+        Assert.IsNull(runtimeState.BootFailedException);
+        Assert.IsTrue(myComponent.IsInit, "The component was not initialized");
 
-            Assert.IsTrue(mainDom.IsMainDom);
-            Assert.IsNull(runtimeState.BootFailedException);
-            Assert.IsTrue(myComponent.IsInit, "The component was not initialized");
+        // force stop now
+        await runtime.StopAsync(CancellationToken.None);
+        Assert.IsTrue(myComponent.IsTerminated, "The component was not terminated");
+    }
 
-            // force stop now
-            await runtime.StopAsync(CancellationToken.None);
-            Assert.IsTrue(myComponent.IsTerminated, "The component was not terminated");
-        }
+    public class MyComposer : IComposer
+    {
+        public void Compose(IUmbracoBuilder builder) => builder.Components().Append<MyComponent>();
+    }
 
-        public class MyComposer : IComposer
-        {
-            public void Compose(IUmbracoBuilder builder) => builder.Components().Append<MyComponent>();
-        }
+    public class MyComponent : IComponent
+    {
+        private readonly ILogger<MyComponent> _logger;
 
-        public class MyComponent : IComponent
-        {
-            public bool IsInit { get; private set; }
+        public MyComponent(ILogger<MyComponent> logger) => _logger = logger;
+        public bool IsInit { get; private set; }
 
-            public bool IsTerminated { get; private set; }
+        public bool IsTerminated { get; private set; }
 
-            private readonly ILogger<MyComponent> _logger;
+        public void Initialize() => IsInit = true;
 
-            public MyComponent(ILogger<MyComponent> logger) => _logger = logger;
-
-            public void Initialize() => IsInit = true;
-
-            public void Terminate() => IsTerminated = true;
-
-        }
+        public void Terminate() => IsTerminated = true;
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
index 6798883c44..1424b4bf4d 100644
--- a/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
+++ b/tests/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs
@@ -20,7 +20,6 @@ using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.WebAssets;
 using Umbraco.Cms.Infrastructure.Examine;
@@ -30,136 +29,145 @@ using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
 using Umbraco.Cms.Tests.Integration.Implementations;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.DependencyInjection
+namespace Umbraco.Cms.Tests.Integration.DependencyInjection;
+
+/// <summary>
+///     This is used to replace certain services that are normally registered from our Core / Infrastructure that
+///     we do not want active within integration tests
+/// </summary>
+public static class UmbracoBuilderExtensions
 {
     /// <summary>
-    /// This is used to replace certain services that are normally registered from our Core / Infrastructure that
-    /// we do not want active within integration tests
+    ///     Uses/Replaces services with testing services
     /// </summary>
-    public static class UmbracoBuilderExtensions
+    public static IUmbracoBuilder AddTestServices(this IUmbracoBuilder builder, TestHelper testHelper)
     {
-        /// <summary>
-        /// Uses/Replaces services with testing services
-        /// </summary>
-        public static IUmbracoBuilder AddTestServices(this IUmbracoBuilder builder, TestHelper testHelper)
-        {
-            builder.Services.AddUnique(AppCaches.NoCache);
-            builder.Services.AddUnique(Mock.Of<IUmbracoBootPermissionChecker>());
-            builder.Services.AddUnique(testHelper.MainDom);
+        builder.Services.AddUnique(AppCaches.NoCache);
+        builder.Services.AddUnique(Mock.Of<IUmbracoBootPermissionChecker>());
+        builder.Services.AddUnique(testHelper.MainDom);
 
-            builder.Services.AddUnique<ExamineIndexRebuilder, TestBackgroundIndexRebuilder>();
-            builder.Services.AddUnique(factory => Mock.Of<IRuntimeMinifier>());
+        builder.Services.AddUnique<ExamineIndexRebuilder, TestBackgroundIndexRebuilder>();
+        builder.Services.AddUnique(factory => Mock.Of<IRuntimeMinifier>());
 
-            // we don't want persisted nucache files in tests
-            builder.Services.AddTransient(factory => new PublishedSnapshotServiceOptions { IgnoreLocalDb = true });
+        // we don't want persisted nucache files in tests
+        builder.Services.AddTransient(factory => new PublishedSnapshotServiceOptions { IgnoreLocalDb = true });
 
 #if IS_WINDOWS
-            // ensure all lucene indexes are using RAM directory (no file system)
-            builder.Services.AddUnique<IDirectoryFactory, LuceneRAMDirectoryFactory>();
+        // ensure all lucene indexes are using RAM directory (no file system)
+        builder.Services.AddUnique<IDirectoryFactory, LuceneRAMDirectoryFactory>();
 #endif
 
-            // replace this service so that it can lookup the correct file locations
-            builder.Services.AddUnique(GetLocalizedTextService);
+        // replace this service so that it can lookup the correct file locations
+        builder.Services.AddUnique(GetLocalizedTextService);
 
-            builder.Services.AddUnique<IServerMessenger, NoopServerMessenger>();
-            builder.Services.AddUnique<IProfiler, TestProfiler>();
+        builder.Services.AddUnique<IServerMessenger, NoopServerMessenger>();
+        builder.Services.AddUnique<IProfiler, TestProfiler>();
 
-            return builder;
-        }
+        return builder;
+    }
 
-        /// <summary>
-        /// Used to register a replacement for <see cref="ILocalizedTextService"/> where the file sources are the ones within the netcore project so
-        /// we don't need to copy files
-        /// </summary>
-        private static ILocalizedTextService GetLocalizedTextService(IServiceProvider factory)
-        {
-            IOptions<GlobalSettings> globalSettings = factory.GetRequiredService<IOptions<GlobalSettings>>();
-            ILoggerFactory loggerFactory = factory.GetRequiredService<ILoggerFactory>();
-            AppCaches appCaches = factory.GetRequiredService<AppCaches>();
+    /// <summary>
+    ///     Used to register a replacement for <see cref="ILocalizedTextService" /> where the file sources are the ones within
+    ///     the netcore project so
+    ///     we don't need to copy files
+    /// </summary>
+    private static ILocalizedTextService GetLocalizedTextService(IServiceProvider factory)
+    {
+        var globalSettings = factory.GetRequiredService<IOptions<GlobalSettings>>();
+        var loggerFactory = factory.GetRequiredService<ILoggerFactory>();
+        var appCaches = factory.GetRequiredService<AppCaches>();
 
-            var localizedTextService = new LocalizedTextService(
-                new Lazy<LocalizedTextServiceFileSources>(() =>
-                {
-                    // get the src folder
-                    var root = TestContext.CurrentContext.TestDirectory.Split("tests")[0];
-                    var srcFolder = Path.Combine(root, "src");
+        var localizedTextService = new LocalizedTextService(
+            new Lazy<LocalizedTextServiceFileSources>(() =>
+            {
+                // get the src folder
+                var root = TestContext.CurrentContext.TestDirectory.Split("tests")[0];
+                var srcFolder = Path.Combine(root, "src");
 
-                    var currFolder = new DirectoryInfo(srcFolder);
+                var currFolder = new DirectoryInfo(srcFolder);
 
-                    DirectoryInfo uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First();
-                    var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang"));
+                var uiProject = currFolder.GetDirectories("Umbraco.Web.UI", SearchOption.TopDirectoryOnly).First();
+                var mainLangFolder = new DirectoryInfo(Path.Combine(uiProject.FullName, globalSettings.Value.UmbracoPath.TrimStart("~/"), "config", "lang"));
 
-                    return new LocalizedTextServiceFileSources(
-                        loggerFactory.CreateLogger<LocalizedTextServiceFileSources>(),
-                        appCaches,
-                        mainLangFolder,
-                        Array.Empty<LocalizedTextServiceSupplementaryFileSource>(),
+                return new LocalizedTextServiceFileSources(
+                    loggerFactory.CreateLogger<LocalizedTextServiceFileSources>(),
+                    appCaches,
+                    mainLangFolder,
+                    Array.Empty<LocalizedTextServiceSupplementaryFileSource>(),
                     new EmbeddedFileProvider(typeof(IAssemblyProvider).Assembly, "Umbraco.Cms.Core.EmbeddedResources.Lang").GetDirectoryContents(string.Empty));
-                }),
-                loggerFactory.CreateLogger<LocalizedTextService>());
+            }),
+            loggerFactory.CreateLogger<LocalizedTextService>());
 
-            return localizedTextService;
+        return localizedTextService;
+    }
+
+    // replace the default so there is no background index rebuilder
+    private class TestBackgroundIndexRebuilder : ExamineIndexRebuilder
+    {
+        public TestBackgroundIndexRebuilder(
+            IMainDom mainDom,
+            IRuntimeState runtimeState,
+            ILogger<ExamineIndexRebuilder> logger,
+            IExamineManager examineManager,
+            IEnumerable<IIndexPopulator> populators,
+            IBackgroundTaskQueue backgroundTaskQueue)
+            : base(
+            mainDom,
+            runtimeState,
+            logger,
+            examineManager,
+            populators,
+            backgroundTaskQueue)
+        {
         }
 
-        // replace the default so there is no background index rebuilder
-        private class TestBackgroundIndexRebuilder : ExamineIndexRebuilder
+        public override void RebuildIndex(string indexName, TimeSpan? delay = null, bool useBackgroundThread = true)
         {
-            public TestBackgroundIndexRebuilder(IMainDom mainDom, IRuntimeState runtimeState, ILogger<ExamineIndexRebuilder> logger, IExamineManager examineManager, IEnumerable<IIndexPopulator> populators, IBackgroundTaskQueue backgroundTaskQueue) : base(mainDom, runtimeState, logger, examineManager, populators, backgroundTaskQueue)
-            {
-            }
-
-            public override void RebuildIndex(string indexName, TimeSpan? delay = null, bool useBackgroundThread = true)
-            {
-                // noop
-            }
-
-            public override void RebuildIndexes(bool onlyEmptyIndexes, TimeSpan? delay = null, bool useBackgroundThread = true)
-            {
-                // noop
-            }
+            // noop
         }
 
-        private class NoopServerMessenger : IServerMessenger
+        public override void RebuildIndexes(bool onlyEmptyIndexes, TimeSpan? delay = null, bool useBackgroundThread = true)
         {
-            public NoopServerMessenger()
-            {
-            }
-
-            public void QueueRefresh<TPayload>(ICacheRefresher refresher, TPayload[] payload)
-            {
-            }
-
-            public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances)
-            {
-            }
-
-            public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, Guid> getGuidId, params T[] instances)
-            {
-            }
-
-            public void QueueRemove<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances)
-            {
-            }
-
-            public void QueueRemove(ICacheRefresher refresher, params int[] numericIds)
-            {
-            }
-
-            public void QueueRefresh(ICacheRefresher refresher, params int[] numericIds)
-            {
-            }
-
-            public void QueueRefresh(ICacheRefresher refresher, params Guid[] guidIds)
-            {
-            }
-
-            public void QueueRefreshAll(ICacheRefresher refresher)
-            {
-            }
-
-            public void Sync() { }
-
-            public void SendMessages() { }
+            // noop
         }
     }
+
+    private class NoopServerMessenger : IServerMessenger
+    {
+        public void QueueRefresh<TPayload>(ICacheRefresher refresher, TPayload[] payload)
+        {
+        }
+
+        public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances)
+        {
+        }
+
+        public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, Guid> getGuidId, params T[] instances)
+        {
+        }
+
+        public void QueueRemove<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances)
+        {
+        }
+
+        public void QueueRemove(ICacheRefresher refresher, params int[] numericIds)
+        {
+        }
+
+        public void QueueRefresh(ICacheRefresher refresher, params int[] numericIds)
+        {
+        }
+
+        public void QueueRefresh(ICacheRefresher refresher, params Guid[] guidIds)
+        {
+        }
+
+        public void QueueRefreshAll(ICacheRefresher refresher)
+        {
+        }
+
+        public void Sync() { }
+
+        public void SendMessages() { }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs b/tests/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
index 5b6a1db805..e2549de2a1 100644
--- a/tests/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
+++ b/tests/Umbraco.Tests.Integration/Extensions/ServiceCollectionExtensions.cs
@@ -2,27 +2,25 @@
 // See LICENSE for more details.
 
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Umbraco.Cms.Tests.Integration.Implementations;
 
-namespace Umbraco.Cms.Tests.Integration.Extensions
+namespace Umbraco.Cms.Tests.Integration.Extensions;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    ///     These services need to be manually added because they do not get added by the generic host
+    /// </summary>
+    public static void AddRequiredNetCoreServices(this IServiceCollection services, TestHelper testHelper, IWebHostEnvironment webHostEnvironment)
     {
-        /// <summary>
-        /// These services need to be manually added because they do not get added by the generic host
-        /// </summary>
-        public static void AddRequiredNetCoreServices(this IServiceCollection services, TestHelper testHelper, IWebHostEnvironment webHostEnvironment)
-        {
-            services.AddSingleton<IHttpContextAccessor>(x => testHelper.GetHttpContextAccessor());
+        services.AddSingleton(x => testHelper.GetHttpContextAccessor());
 
-            // The generic host does add IHostEnvironment but not this one because we are not actually in a web context
-            services.AddSingleton<IWebHostEnvironment>(x => webHostEnvironment);
+        // The generic host does add IHostEnvironment but not this one because we are not actually in a web context
+        services.AddSingleton(x => webHostEnvironment);
 
-            // Replace the IHostEnvironment that generic host created too
-            services.AddSingleton<IHostEnvironment>(x => webHostEnvironment);
-        }
+        // Replace the IHostEnvironment that generic host created too
+        services.AddSingleton<IHostEnvironment>(x => webHostEnvironment);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/GlobalSetupTeardown.cs b/tests/Umbraco.Tests.Integration/GlobalSetupTeardown.cs
index 3c5929877b..e811b18e08 100644
--- a/tests/Umbraco.Tests.Integration/GlobalSetupTeardown.cs
+++ b/tests/Umbraco.Tests.Integration/GlobalSetupTeardown.cs
@@ -8,41 +8,44 @@ using Microsoft.Extensions.Configuration;
 using NUnit.Framework;
 using Umbraco.Cms.Tests.Integration.Implementations;
 using Umbraco.Cms.Tests.Integration.Testing;
+
 // ReSharper disable once CheckNamespace
 
 /// <summary>
-/// Global setup and teardown.
+///     Global setup and teardown.
 /// </summary>
 /// <remarks>
-/// This class has NO NAMESPACE so it applies to the whole assembly.
+///     This class has NO NAMESPACE so it applies to the whole assembly.
 /// </remarks>
 [SetUpFixture]
 public class GlobalSetupTeardown
 {
-    public static IConfiguration TestConfiguration { get; private set; }
-
     private Stopwatch _stopwatch;
+    public static IConfiguration TestConfiguration { get; private set; }
 
     [OneTimeSetUp]
     public void SetUp()
     {
         var builder = new ConfigurationBuilder();
         builder.AddJsonFile("appsettings.Tests.json");
-        builder.AddJsonFile("appsettings.Tests.Local.json", optional: true);
+        builder.AddJsonFile("appsettings.Tests.Local.json", true);
         builder.AddEnvironmentVariables();
         TestConfiguration = builder.Build();
 
         var testHelper = new TestHelper();
-        var databaseType = TestConfiguration.GetValue<TestDatabaseSettings.TestDatabaseType>("Tests:Database:DatabaseType");
+        var databaseType =
+            TestConfiguration.GetValue<TestDatabaseSettings.TestDatabaseType>("Tests:Database:DatabaseType");
         var version = testHelper.GetUmbracoVersion().SemanticVersion;
 
-        TestContext.Progress.WriteLine($"******************************************************************************");
-        TestContext.Progress.WriteLine($"* Umbraco.Tests.Integration");
-        TestContext.Progress.WriteLine($"*");
+        TestContext.Progress.WriteLine(
+            "******************************************************************************");
+        TestContext.Progress.WriteLine("* Umbraco.Tests.Integration");
+        TestContext.Progress.WriteLine("*");
         TestContext.Progress.WriteLine($"* DatabaseType     : {databaseType}");
         TestContext.Progress.WriteLine($"* UmbracoVersion   : {version.ToString().Split('+').First()}");
         TestContext.Progress.WriteLine($"* WorkingDirectory : {testHelper.WorkingDirectory}");
-        TestContext.Progress.WriteLine($"******************************************************************************");
+        TestContext.Progress.WriteLine(
+            "******************************************************************************");
 
         _stopwatch = Stopwatch.StartNew();
     }
diff --git a/tests/Umbraco.Tests.Integration/Implementations/TestHelper.cs b/tests/Umbraco.Tests.Integration/Implementations/TestHelper.cs
index 4abace502b..b203ce7aea 100644
--- a/tests/Umbraco.Tests.Integration/Implementations/TestHelper.cs
+++ b/tests/Umbraco.Tests.Integration/Implementations/TestHelper.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
-using System.Data.Common;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -12,10 +11,8 @@ using System.Reflection;
 using System.Threading;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Hosting.Internal;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -40,305 +37,332 @@ using Umbraco.Extensions;
 using File = System.IO.File;
 using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
 
-namespace Umbraco.Cms.Tests.Integration.Implementations
+namespace Umbraco.Cms.Tests.Integration.Implementations;
+
+public class TestHelper : TestHelperBase
 {
-    public class TestHelper : TestHelperBase
+    private readonly IWebHostEnvironment _hostEnvironment;
+    private readonly IApplicationShutdownRegistry _hostingLifetime;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IIpResolver _ipResolver;
+    private readonly IBackOfficeInfo _backOfficeInfo;
+    private IHostingEnvironment _hostingEnvironment;
+    private readonly string _tempWorkingDir;
+
+    public TestHelper()
+        : base(typeof(TestHelper).Assembly)
     {
-        private IBackOfficeInfo _backOfficeInfo;
-        private IHostingEnvironment _hostingEnvironment;
-        private readonly IApplicationShutdownRegistry _hostingLifetime;
-        private readonly IIpResolver _ipResolver;
-        private readonly IWebHostEnvironment _hostEnvironment;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private string _tempWorkingDir;
+        var httpContext = new DefaultHttpContext();
+        httpContext.Connection.RemoteIpAddress = IPAddress.Parse("127.0.0.1");
+        _httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
+        _ipResolver = new AspNetCoreIpResolver(_httpContextAccessor);
 
-        public TestHelper()
-            : base(typeof(TestHelper).Assembly)
+        var contentRoot = Assembly.GetExecutingAssembly().GetRootDirectorySafe();
+
+        // The mock for IWebHostEnvironment has caused a good few issues.
+        // We can UseContentRoot, UseWebRoot etc on the host builder instead.
+        // possibly going down rabbit holes though as would need to cleanup all usages of
+        // GetHostingEnvironment & GetWebHostEnvironment.
+        var hostEnvironment = new Mock<IWebHostEnvironment>();
+
+        // This must be the assembly name for the WebApplicationFactory to work.
+        hostEnvironment.Setup(x => x.ApplicationName).Returns(GetType().Assembly.GetName().Name);
+        hostEnvironment.Setup(x => x.ContentRootPath).Returns(() => contentRoot);
+        hostEnvironment.Setup(x => x.ContentRootFileProvider).Returns(() => new PhysicalFileProvider(contentRoot));
+        hostEnvironment.Setup(x => x.WebRootPath).Returns(() => WorkingDirectory);
+        hostEnvironment.Setup(x => x.WebRootFileProvider).Returns(() => new PhysicalFileProvider(WorkingDirectory));
+        hostEnvironment.Setup(x => x.EnvironmentName).Returns("Tests");
+
+        // We also need to expose it as the obsolete interface since netcore's WebApplicationFactory casts it.
+        hostEnvironment.As<Microsoft.AspNetCore.Hosting.IHostingEnvironment>();
+
+        _hostEnvironment = hostEnvironment.Object;
+
+        _hostingLifetime = new AspNetCoreApplicationShutdownRegistry(Mock.Of<IHostApplicationLifetime>());
+        ConsoleLoggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
+        ProfilingLogger = new ProfilingLogger(ConsoleLoggerFactory.CreateLogger<ProfilingLogger>(), Profiler);
+    }
+
+    public IUmbracoBootPermissionChecker UmbracoBootPermissionChecker { get; } =
+        new TestUmbracoBootPermissionChecker();
+
+    public AppCaches AppCaches { get; } = new(
+        NoAppCache.Instance,
+        NoAppCache.Instance,
+        new IsolatedCaches(type => NoAppCache.Instance));
+
+    public ILoggerFactory ConsoleLoggerFactory { get; }
+
+    public IProfilingLogger ProfilingLogger { get; }
+
+    public IProfiler Profiler { get; } = new NoopProfiler();
+
+    public override IBulkSqlInsertProvider BulkSqlInsertProvider => new SqlServerBulkSqlInsertProvider();
+
+    public override IMarchal Marchal { get; } = new AspNetCoreMarchal();
+
+    public IHttpContextAccessor GetHttpContextAccessor() => _httpContextAccessor;
+
+    public IWebHostEnvironment GetWebHostEnvironment() => _hostEnvironment;
+
+    public override IHostingEnvironment GetHostingEnvironment()
+        => _hostingEnvironment ??= new TestHostingEnvironment(
+            GetIOptionsMonitorOfHostingSettings(),
+            GetIOptionsMonitorOfWebRoutingSettings(),
+            _hostEnvironment);
+
+    private IOptionsMonitor<HostingSettings> GetIOptionsMonitorOfHostingSettings()
+    {
+        var hostingSettings = new HostingSettings();
+        return Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == hostingSettings);
+    }
+
+    private IOptionsMonitor<WebRoutingSettings> GetIOptionsMonitorOfWebRoutingSettings()
+    {
+        var webRoutingSettings = new WebRoutingSettings();
+        return Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings);
+    }
+
+    public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => _hostingLifetime;
+
+    public override IIpResolver GetIpResolver() => _ipResolver;
+
+    /// <summary>
+    ///     Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based
+    ///     on a virtual path name
+    /// </summary>
+    public override string MapPathForTestFiles(string relativePath)
+    {
+        if (!relativePath.StartsWith("~/"))
         {
-            var httpContext = new DefaultHttpContext();
-            httpContext.Connection.RemoteIpAddress = IPAddress.Parse("127.0.0.1");
-            _httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
-            _ipResolver = new AspNetCoreIpResolver(_httpContextAccessor);
-
-            string contentRoot = Assembly.GetExecutingAssembly().GetRootDirectorySafe();
-
-            // The mock for IWebHostEnvironment has caused a good few issues.
-            // We can UseContentRoot, UseWebRoot etc on the host builder instead.
-            // possibly going down rabbit holes though as would need to cleanup all usages of
-            // GetHostingEnvironment & GetWebHostEnvironment.
-            var hostEnvironment = new Mock<IWebHostEnvironment>();
-
-            // This must be the assembly name for the WebApplicationFactory to work.
-            hostEnvironment.Setup(x => x.ApplicationName).Returns(GetType().Assembly.GetName().Name);
-            hostEnvironment.Setup(x => x.ContentRootPath).Returns(() => contentRoot);
-            hostEnvironment.Setup(x => x.ContentRootFileProvider).Returns(() => new PhysicalFileProvider(contentRoot));
-            hostEnvironment.Setup(x => x.WebRootPath).Returns(() => WorkingDirectory);
-            hostEnvironment.Setup(x => x.WebRootFileProvider).Returns(() => new PhysicalFileProvider(WorkingDirectory));
-            hostEnvironment.Setup(x => x.EnvironmentName).Returns("Tests");
-
-            // We also need to expose it as the obsolete interface since netcore's WebApplicationFactory casts it.
-            hostEnvironment.As<Microsoft.AspNetCore.Hosting.IHostingEnvironment>();
-
-            _hostEnvironment = hostEnvironment.Object;
-
-            _hostingLifetime = new AspNetCoreApplicationShutdownRegistry(Mock.Of<IHostApplicationLifetime>());
-            ConsoleLoggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
-            ProfilingLogger = new ProfilingLogger(ConsoleLoggerFactory.CreateLogger<ProfilingLogger>(), Profiler);
+            throw new ArgumentException("relativePath must start with '~/'", nameof(relativePath));
         }
 
-        public IUmbracoBootPermissionChecker UmbracoBootPermissionChecker { get; } =
-            new TestUmbracoBootPermissionChecker();
+        var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
+        var uri = new Uri(codeBase);
+        var path = uri.LocalPath;
+        var bin = Path.GetDirectoryName(path);
 
-        public AppCaches AppCaches { get; } = new AppCaches(
-            NoAppCache.Instance,
-            NoAppCache.Instance,
-            new IsolatedCaches(type => NoAppCache.Instance));
+        return relativePath.Replace("~/", bin + "/");
+    }
 
-        public ILoggerFactory ConsoleLoggerFactory { get; private set; }
+    public void AssertPropertyValuesAreEqual(object actual, object expected, Func<IEnumerable, IEnumerable> sorter = null, string[] ignoreProperties = null)
+    {
+        const int dateDeltaMilliseconds = 1000; // 1s
 
-        public IProfilingLogger ProfilingLogger { get; private set; }
-
-        public IProfiler Profiler { get; } = new NoopProfiler();
-
-        public IHttpContextAccessor GetHttpContextAccessor() => _httpContextAccessor;
-
-        public IWebHostEnvironment GetWebHostEnvironment() => _hostEnvironment;
-
-        public override IBulkSqlInsertProvider BulkSqlInsertProvider => new SqlServerBulkSqlInsertProvider();
-
-        public override IMarchal Marchal { get; } = new AspNetCoreMarchal();
-
-        public override IHostingEnvironment GetHostingEnvironment()
-            => _hostingEnvironment ??= new TestHostingEnvironment(
-                GetIOptionsMonitorOfHostingSettings(),
-                GetIOptionsMonitorOfWebRoutingSettings(),
-                _hostEnvironment);
-
-        private IOptionsMonitor<HostingSettings> GetIOptionsMonitorOfHostingSettings()
+        var properties = expected.GetType().GetProperties();
+        foreach (var property in properties)
         {
-            var hostingSettings = new HostingSettings();
-            return Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == hostingSettings);
+            // Ignore properties that are attributed with EditorBrowsableState.Never.
+            var att = property.GetCustomAttribute<EditorBrowsableAttribute>(false);
+            if (att != null && att.State == EditorBrowsableState.Never)
+            {
+                continue;
+            }
+
+            // Ignore explicitly ignored properties.
+            if (ignoreProperties != null && ignoreProperties.Contains(property.Name))
+            {
+                continue;
+            }
+
+            var actualValue = property.GetValue(actual, null);
+            var expectedValue = property.GetValue(expected, null);
+
+            AssertAreEqual(property, expectedValue, actualValue, sorter, dateDeltaMilliseconds);
+        }
+    }
+
+    private static void AssertListsAreEqual(PropertyInfo property, IEnumerable expected, IEnumerable actual, Func<IEnumerable, IEnumerable> sorter = null, int dateDeltaMilliseconds = 0)
+    {
+        if (sorter == null)
+        {
+            // this is pretty hackerific but saves us some code to write
+            sorter = enumerable =>
+            {
+                // semi-generic way of ensuring any collection of IEntity are sorted by Ids for comparison
+                var entities = enumerable.OfType<IEntity>().ToList();
+                return entities.Count > 0 ? entities.OrderBy(x => x.Id) : entities;
+            };
         }
 
-        private IOptionsMonitor<WebRoutingSettings> GetIOptionsMonitorOfWebRoutingSettings()
+        var expectedListEx = sorter(expected).Cast<object>().ToList();
+        var actualListEx = sorter(actual).Cast<object>().ToList();
+
+        if (actualListEx.Count != expectedListEx.Count)
         {
-            var webRoutingSettings = new WebRoutingSettings();
-            return Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings);
+            Assert.Fail(
+                "Collection {0}.{1} does not match. Expected IEnumerable containing {2} elements but was IEnumerable containing {3} elements",
+                property.PropertyType.Name,
+                property.Name,
+                expectedListEx.Count,
+                actualListEx.Count);
         }
 
-        public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => _hostingLifetime;
-
-        public override IIpResolver GetIpResolver() => _ipResolver;
-
-        /// <summary>
-        /// Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based on a virtual path name
-        /// </summary>
-        public override string MapPathForTestFiles(string relativePath)
+        for (var i = 0; i < actualListEx.Count; i++)
         {
-            if (!relativePath.StartsWith("~/"))
+            AssertAreEqual(property, expectedListEx[i], actualListEx[i], sorter, dateDeltaMilliseconds);
+        }
+    }
+
+    private static void AssertAreEqual(PropertyInfo property, object expected, object actual, Func<IEnumerable, IEnumerable> sorter = null, int dateDeltaMilliseconds = 0)
+    {
+        if (!(expected is string) && expected is IEnumerable enumerable)
+        {
+            // sort property collection by alias, not by property ids
+            // on members, built-in properties don't have ids (always zero)
+            if (expected is PropertyCollection)
             {
-                throw new ArgumentException("relativePath must start with '~/'", nameof(relativePath));
+                sorter = e => ((PropertyCollection)e).OrderBy(x => x.Alias);
             }
 
-            string codeBase = typeof(TestHelperBase).Assembly.CodeBase;
-            var uri = new Uri(codeBase);
-            string path = uri.LocalPath;
-            string bin = Path.GetDirectoryName(path);
-
-            return relativePath.Replace("~/", bin + "/");
+            // compare lists
+            AssertListsAreEqual(property, (IEnumerable)actual, enumerable, sorter, dateDeltaMilliseconds);
         }
-
-        public void AssertPropertyValuesAreEqual(object actual, object expected, Func<IEnumerable, IEnumerable> sorter = null, string[] ignoreProperties = null)
+        else if (expected is DateTime expectedDateTime)
         {
-            const int dateDeltaMilliseconds = 1000; // 1s
-
-            PropertyInfo[] properties = expected.GetType().GetProperties();
-            foreach (PropertyInfo property in properties)
+            // compare date & time with delta
+            var actualDateTime = (DateTime)actual;
+            var delta = (actualDateTime - expectedDateTime).TotalMilliseconds;
+            Assert.IsTrue(
+                Math.Abs(delta) <= dateDeltaMilliseconds,
+                "Property {0}.{1} does not match. Expected: {2} but was: {3}",
+                property.DeclaringType.Name,
+                property.Name,
+                expected,
+                actual);
+        }
+        else if (expected is Property expectedProperty)
+        {
+            // compare values
+            var actualProperty = (Property)actual;
+            var expectedPropertyValues =
+                expectedProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
+            var actualPropertyValues = actualProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
+            if (expectedPropertyValues.Length != actualPropertyValues.Length)
             {
-                // Ignore properties that are attributed with EditorBrowsableState.Never.
-                EditorBrowsableAttribute att = property.GetCustomAttribute<EditorBrowsableAttribute>(false);
-                if (att != null && att.State == EditorBrowsableState.Never)
+                Assert.Fail(
+                    $"{property.DeclaringType.Name}.{property.Name}: Expected {expectedPropertyValues.Length} but got {actualPropertyValues.Length}.");
+            }
+
+            for (var i = 0; i < expectedPropertyValues.Length; i++)
+            {
+                // This is not pretty, but since a property value can be a datetime we can't just always compare them as is.
+                // This is made worse by the fact that PublishedValue is not always set, meaning we can't lump it all into the same if block
+                if (expectedPropertyValues[i].EditedValue is DateTime expectedEditDateTime)
                 {
-                    continue;
+                    var actualEditDateTime = (DateTime)actualPropertyValues[i].EditedValue;
+                    AssertDateTime(
+                        expectedEditDateTime,
+                        actualEditDateTime,
+                        $"{property.DeclaringType.Name}.{property.Name}: Expected draft value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".",
+                        dateDeltaMilliseconds);
+                }
+                else
+                {
+                    Assert.AreEqual(
+                        expectedPropertyValues[i].EditedValue,
+                        actualPropertyValues[i].EditedValue,
+                        $"{property.DeclaringType.Name}.{property.Name}: Expected draft value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".");
                 }
 
-                // Ignore explicitly ignored properties.
-                if (ignoreProperties != null && ignoreProperties.Contains(property.Name))
+                if (expectedPropertyValues[i].PublishedValue is DateTime expectedPublishDateTime)
                 {
-                    continue;
+                    var actualPublishedDateTime = (DateTime)actualPropertyValues[i].PublishedValue;
+                    AssertDateTime(
+                        expectedPublishDateTime,
+                        actualPublishedDateTime,
+                        $"{property.DeclaringType.Name}.{property.Name}: Expected published value \"{expectedPropertyValues[i].PublishedValue}\" but got \"{actualPropertyValues[i].PublishedValue}\".",
+                        dateDeltaMilliseconds);
+                }
+                else
+                {
+                    Assert.AreEqual(
+                        expectedPropertyValues[i].PublishedValue,
+                        actualPropertyValues[i].PublishedValue,
+                        $"{property.DeclaringType.Name}.{property.Name}: Expected published value \"{expectedPropertyValues[i].PublishedValue}\" but got \"{actualPropertyValues[i].PublishedValue}\".");
                 }
-
-                object actualValue = property.GetValue(actual, null);
-                object expectedValue = property.GetValue(expected, null);
-
-                AssertAreEqual(property, expectedValue, actualValue, sorter, dateDeltaMilliseconds);
             }
         }
-
-        private static void AssertListsAreEqual(PropertyInfo property, IEnumerable expected, IEnumerable actual, Func<IEnumerable, IEnumerable> sorter = null, int dateDeltaMilliseconds = 0)
+        else if (expected is IDataEditor expectedEditor)
         {
-            if (sorter == null)
-            {
-                // this is pretty hackerific but saves us some code to write
-                sorter = enumerable =>
-                {
-                    // semi-generic way of ensuring any collection of IEntity are sorted by Ids for comparison
-                    var entities = enumerable.OfType<IEntity>().ToList();
-                    return entities.Count > 0 ? (IEnumerable)entities.OrderBy(x => x.Id) : entities;
-                };
-            }
+            Assert.IsInstanceOf<IDataEditor>(actual);
+            var actualEditor = (IDataEditor)actual;
+            Assert.AreEqual(expectedEditor.Alias, actualEditor.Alias);
 
-            var expectedListEx = sorter(expected).Cast<object>().ToList();
-            var actualListEx = sorter(actual).Cast<object>().ToList();
-
-            if (actualListEx.Count != expectedListEx.Count)
-            {
-                Assert.Fail("Collection {0}.{1} does not match. Expected IEnumerable containing {2} elements but was IEnumerable containing {3} elements", property.PropertyType.Name, property.Name, expectedListEx.Count, actualListEx.Count);
-            }
-
-            for (int i = 0; i < actualListEx.Count; i++)
-            {
-                AssertAreEqual(property, expectedListEx[i], actualListEx[i], sorter, dateDeltaMilliseconds);
-            }
+            // what else shall we test?
         }
-
-        private static void AssertAreEqual(PropertyInfo property, object expected, object actual, Func<IEnumerable, IEnumerable> sorter = null, int dateDeltaMilliseconds = 0)
+        else
         {
-            if (!(expected is string) && expected is IEnumerable enumerable)
-            {
-                // sort property collection by alias, not by property ids
-                // on members, built-in properties don't have ids (always zero)
-                if (expected is PropertyCollection)
-                {
-                    sorter = e => ((PropertyCollection)e).OrderBy(x => x.Alias);
-                }
-
-                // compare lists
-                AssertListsAreEqual(property, (IEnumerable)actual, enumerable, sorter, dateDeltaMilliseconds);
-            }
-            else if (expected is DateTime expectedDateTime)
-            {
-                // compare date & time with delta
-                var actualDateTime = (DateTime)actual;
-                double delta = (actualDateTime - expectedDateTime).TotalMilliseconds;
-                Assert.IsTrue(Math.Abs(delta) <= dateDeltaMilliseconds, "Property {0}.{1} does not match. Expected: {2} but was: {3}", property.DeclaringType.Name, property.Name, expected, actual);
-            }
-            else if (expected is Property expectedProperty)
-            {
-                // compare values
-                var actualProperty = (Property)actual;
-                IPropertyValue[] expectedPropertyValues = expectedProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
-                IPropertyValue[] actualPropertyValues = actualProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
-                if (expectedPropertyValues.Length != actualPropertyValues.Length)
-                {
-                    Assert.Fail($"{property.DeclaringType.Name}.{property.Name}: Expected {expectedPropertyValues.Length} but got {actualPropertyValues.Length}.");
-                }
-
-                for (int i = 0; i < expectedPropertyValues.Length; i++)
-                {
-                    // This is not pretty, but since a property value can be a datetime we can't just always compare them as is.
-                    // This is made worse by the fact that PublishedValue is not always set, meaning we can't lump it all into the same if block
-                    if (expectedPropertyValues[i].EditedValue is DateTime expectedEditDateTime)
-                    {
-                        var actualEditDateTime = (DateTime)actualPropertyValues[i].EditedValue;
-                        AssertDateTime(expectedEditDateTime, actualEditDateTime, $"{property.DeclaringType.Name}.{property.Name}: Expected draft value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".", dateDeltaMilliseconds);
-                    }
-                    else
-                    {
-                        Assert.AreEqual(expectedPropertyValues[i].EditedValue, actualPropertyValues[i].EditedValue, $"{property.DeclaringType.Name}.{property.Name}: Expected draft value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".");
-                    }
-
-                    if (expectedPropertyValues[i].PublishedValue is DateTime expectedPublishDateTime)
-                    {
-                        var actualPublishedDateTime = (DateTime)actualPropertyValues[i].PublishedValue;
-                        AssertDateTime(expectedPublishDateTime, actualPublishedDateTime, $"{property.DeclaringType.Name}.{property.Name}: Expected published value \"{expectedPropertyValues[i].PublishedValue}\" but got \"{actualPropertyValues[i].PublishedValue}\".", dateDeltaMilliseconds);
-                    }
-                    else
-                    {
-                        Assert.AreEqual(expectedPropertyValues[i].PublishedValue, actualPropertyValues[i].PublishedValue, $"{property.DeclaringType.Name}.{property.Name}: Expected published value \"{expectedPropertyValues[i].PublishedValue}\" but got \"{actualPropertyValues[i].PublishedValue}\".");
-                    }
-                }
-            }
-            else if (expected is IDataEditor expectedEditor)
-            {
-                Assert.IsInstanceOf<IDataEditor>(actual);
-                var actualEditor = (IDataEditor)actual;
-                Assert.AreEqual(expectedEditor.Alias,  actualEditor.Alias);
-
-                // what else shall we test?
-            }
-            else
-            {
-                // directly compare values
-                Assert.AreEqual(
-                    expected,
-                    actual,
-                    "Property {0}.{1} does not match. Expected: {2} but was: {3}",
-                    property.DeclaringType.Name,
-                    property.Name,
-                    expected?.ToString() ?? "<null>",
-                    actual?.ToString() ?? "<null>");
-            }
+            // directly compare values
+            Assert.AreEqual(
+                expected,
+                actual,
+                "Property {0}.{1} does not match. Expected: {2} but was: {3}",
+                property.DeclaringType.Name,
+                property.Name,
+                expected?.ToString() ?? "<null>",
+                actual?.ToString() ?? "<null>");
         }
+    }
 
-        private static void AssertDateTime(DateTime expected, DateTime actual, string failureMessage, int dateDeltaMiliseconds = 0)
+    private static void AssertDateTime(DateTime expected, DateTime actual, string failureMessage, int dateDeltaMiliseconds = 0)
+    {
+        var delta = (actual - expected).TotalMilliseconds;
+        Assert.IsTrue(Math.Abs(delta) <= dateDeltaMiliseconds, failureMessage);
+    }
+
+    public void DeleteDirectory(string path)
+    {
+        Try(() =>
         {
-            double delta = (actual - expected).TotalMilliseconds;
-            Assert.IsTrue(Math.Abs(delta) <= dateDeltaMiliseconds, failureMessage);
-        }
+            if (Directory.Exists(path) == false)
+            {
+                return;
+            }
 
-        public void DeleteDirectory(string path)
+            foreach (var file in Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories))
+            {
+                File.Delete(file);
+            }
+        });
+
+        Try(() =>
         {
-            Try(() =>
+            if (Directory.Exists(path) == false)
             {
-                if (Directory.Exists(path) == false)
-                {
-                    return;
-                }
+                return;
+            }
 
-                foreach (string file in Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories))
-                {
-                    File.Delete(file);
-                }
-            });
+            Directory.Delete(path, true);
+        });
+    }
 
-            Try(() =>
-            {
-                if (Directory.Exists(path) == false)
-                {
-                    return;
-                }
+    public static void TryAssert(Action action, int maxTries = 5, int waitMilliseconds = 200) =>
+        Try<AssertionException>(action, maxTries, waitMilliseconds);
 
-                Directory.Delete(path, true);
-            });
-        }
+    public static void Try(Action action, int maxTries = 5, int waitMilliseconds = 200) =>
+        Try<Exception>(action, maxTries, waitMilliseconds);
 
-        public static void TryAssert(Action action, int maxTries = 5, int waitMilliseconds = 200) =>
-            Try<AssertionException>(action, maxTries, waitMilliseconds);
-
-        public static void Try(Action action, int maxTries = 5, int waitMilliseconds = 200) =>
-            Try<Exception>(action, maxTries, waitMilliseconds);
-
-        public static void Try<T>(Action action, int maxTries = 5, int waitMilliseconds = 200)
-            where T : Exception
+    public static void Try<T>(Action action, int maxTries = 5, int waitMilliseconds = 200)
+        where T : Exception
+    {
+        var tries = 0;
+        while (true)
         {
-            int tries = 0;
-            while (true)
+            try
             {
-                try
+                action();
+                break;
+            }
+            catch (T)
+            {
+                if (tries++ > maxTries)
                 {
-                    action();
-                    break;
+                    throw;
                 }
-                catch (T)
-                {
-                    if (tries++ > maxTries)
-                    {
-                        throw;
-                    }
 
-                    Thread.Sleep(waitMilliseconds);
-                }
+                Thread.Sleep(waitMilliseconds);
             }
         }
     }
diff --git a/tests/Umbraco.Tests.Integration/Implementations/TestLifetime.cs b/tests/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
index 0b444234af..993cc86878 100644
--- a/tests/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
+++ b/tests/Umbraco.Tests.Integration/Implementations/TestLifetime.cs
@@ -5,15 +5,14 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 
-namespace Umbraco.Cms.Tests.Integration.Implementations
-{
-    /// <summary>
-    /// Ensures the host lifetime ends as soon as code execution is done
-    /// </summary>
-    public class TestLifetime : IHostLifetime
-    {
-        public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+namespace Umbraco.Cms.Tests.Integration.Implementations;
 
-        public Task WaitForStartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
-    }
+/// <summary>
+///     Ensures the host lifetime ends as soon as code execution is done
+/// </summary>
+public class TestLifetime : IHostLifetime
+{
+    public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
+
+    public Task WaitForStartAsync(CancellationToken cancellationToken) => Task.CompletedTask;
 }
diff --git a/tests/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs b/tests/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs
index ff0bfa599a..cb0a486fa7 100644
--- a/tests/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs
+++ b/tests/Umbraco.Tests.Integration/Implementations/TestUmbracoBootPermissionChecker.cs
@@ -1,14 +1,13 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Umbraco.Cms.Core.Runtime;
 
-namespace Umbraco.Cms.Tests.Integration.Implementations
+namespace Umbraco.Cms.Tests.Integration.Implementations;
+
+public class TestUmbracoBootPermissionChecker : IUmbracoBootPermissionChecker
 {
-    public class TestUmbracoBootPermissionChecker : IUmbracoBootPermissionChecker
+    public void ThrowIfNotPermissions()
     {
-        public void ThrowIfNotPermissions()
-        {
-        }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs b/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs
index c094ea3d9a..21b1445e36 100644
--- a/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/TestServerTest/Controllers/EnsureNotAmbiguousActionNameControllerTests.cs
@@ -6,98 +6,119 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Web.BackOffice.Controllers;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.TestServerTest.Controllers
+namespace Umbraco.Cms.Tests.Integration.TestServerTest.Controllers;
+
+[TestFixture]
+public class EnsureNotAmbiguousActionNameControllerTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class EnsureNotAmbiguousActionNameControllerTests : UmbracoTestServerTestBase
+    [Test]
+    public void EnsureNotAmbiguousActionName()
     {
-        [Test]
-        public void EnsureNotAmbiguousActionName()
+        var intId = 0;
+        var guidId = Guid.Empty;
+        var udiId = Udi.Create(Constants.UdiEntityType.Script, "test");
+
+        Assert.Multiple(() =>
         {
-            var intId = 0;
-            Guid guidId = Guid.Empty;
-            var udiId = Udi.Create(Constants.UdiEntityType.Script, "test");
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetEmpty("test", 0)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x =>
+                x.GetChildren(intId, string.Empty, 0, 0, "SortOrder", Direction.Ascending, true, string.Empty, string.Empty)));
 
-            Assert.Multiple(() =>
-            {
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetById(udiId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetNiceUrl(udiId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetEmpty("test", 0)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentController>(x => x.GetChildren(intId, string.Empty, 0, 0, "SortOrder", Direction.Ascending, true, string.Empty, string.Empty)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<ContentTypeController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DataTypeController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<DictionaryController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetPath(intId, UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetPath(guidId, UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetPath(udiId, UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetUrl(intId, UmbracoEntityTypes.Document, null)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetUrl(udiId, null)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetUrlAndAnchors(intId, null)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetUrlAndAnchors(udiId, null)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetById(intId, UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetById(guidId, UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetById(udiId, UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new Guid[0], UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new Udi[0], UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new int[0], UmbracoEntityTypes.Document)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x =>
+                x.GetPagedChildren(intId, UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x =>
+                x.GetPagedChildren(guidId.ToString(), UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x =>
+                x.GetPagedChildren(udiId.ToString(), UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetPath(intId, UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetPath(guidId, UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetPath(udiId, UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetUrl(intId, UmbracoEntityTypes.Document, null)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetUrl(udiId, null)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetUrlAndAnchors(intId, null)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetUrlAndAnchors(udiId, null)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetById(intId, UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetById(guidId, UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetById(udiId, UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new Guid[0], UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new Udi[0], UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetByIds(new int[0], UmbracoEntityTypes.Document)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetPagedChildren(intId, UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetPagedChildren(guidId.ToString(), UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<EntityController>(x => x.GetPagedChildren(udiId.ToString(), UmbracoEntityTypes.Document, 0, 1, "SortOrder", Direction.Ascending, string.Empty, null)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<IconController>(x => x.GetIcon(string.Empty)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<IconController>(x => x.GetIcon(string.Empty)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MacrosController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MacrosController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MacrosController>(x => x.GetById(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MacrosController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MacrosController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MacrosController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x =>
+                x.GetChildren(intId, 0, 1, "SortOrder", Direction.Ascending, true, string.Empty)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x =>
+                x.GetChildren(guidId, 0, 1, "SortOrder", Direction.Ascending, true, string.Empty)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x =>
+                x.GetChildren(udiId, 0, 1, "SortOrder", Direction.Ascending, true, string.Empty)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetById(udiId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetChildren(intId, 0, 1, "SortOrder", Direction.Ascending, true, string.Empty)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetChildren(guidId, 0, 1, "SortOrder", Direction.Ascending, true, string.Empty)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaController>(x => x.GetChildren(udiId, 0, 1, "SortOrder", Direction.Ascending, true, string.Empty)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(intId)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(guidId)));
+            EnsureNotAmbiguousActionName(
+                PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetById(udiId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MediaTypeController>(x => x.GetAllowedChildren(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberGroupController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<MemberTypeController>(x => x.GetById(udiId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(udiId)));
 
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<RelationTypeController>(x => x.GetById(udiId)));
-
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(intId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(guidId)));
-                EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(udiId)));
-            });
-        }
-
-        private void EnsureNotAmbiguousActionName(string url) => Assert.DoesNotThrowAsync(async () => await Client.GetAsync(url));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(intId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(guidId)));
+            EnsureNotAmbiguousActionName(PrepareApiControllerUrl<TemplateController>(x => x.GetById(udiId)));
+        });
     }
+
+    private void EnsureNotAmbiguousActionName(string url) =>
+        Assert.DoesNotThrowAsync(async () => await Client.GetAsync(url));
 }
diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs b/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
index 788d5856c2..5592d7eded 100644
--- a/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
+++ b/tests/Umbraco.Tests.Integration/TestServerTest/TestAuthHandler.cs
@@ -1,52 +1,50 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Security.Claims;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.BackOffice.Security;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.TestServerTest
+namespace Umbraco.Cms.Tests.Integration.TestServerTest;
+
+public class TestAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
 {
-    public class TestAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>
+    public const string TestAuthenticationScheme = "Test";
+
+    private readonly IBackOfficeSignInManager _backOfficeSignInManager;
+
+    private readonly BackOfficeIdentityUser _fakeUser;
+
+    public TestAuthHandler(
+        IOptionsMonitor<AuthenticationSchemeOptions> options,
+        ILoggerFactory logger,
+        UrlEncoder encoder,
+        ISystemClock clock,
+        IBackOfficeSignInManager backOfficeSignInManager,
+        IUserService userService,
+        IUmbracoMapper umbracoMapper)
+        : base(options, logger, encoder, clock)
     {
-        public const string TestAuthenticationScheme = "Test";
+        _backOfficeSignInManager = backOfficeSignInManager;
 
-        private readonly IBackOfficeSignInManager _backOfficeSignInManager;
+        var user = userService.GetUserById(Constants.Security.SuperUserId);
+        _fakeUser = umbracoMapper.Map<IUser, BackOfficeIdentityUser>(user);
+        _fakeUser.SecurityStamp = "Needed";
+    }
 
-        private readonly BackOfficeIdentityUser _fakeUser;
+    protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
+    {
+        var principal = await _backOfficeSignInManager.CreateUserPrincipalAsync(_fakeUser);
+        var ticket = new AuthenticationTicket(principal, TestAuthenticationScheme);
 
-        public TestAuthHandler(
-            IOptionsMonitor<AuthenticationSchemeOptions> options,
-            ILoggerFactory logger,
-            UrlEncoder encoder,
-            ISystemClock clock,
-            IBackOfficeSignInManager backOfficeSignInManager,
-            IUserService userService,
-            IUmbracoMapper umbracoMapper)
-            : base(options, logger, encoder, clock)
-        {
-            _backOfficeSignInManager = backOfficeSignInManager;
-
-            IUser user = userService.GetUserById(Constants.Security.SuperUserId);
-            _fakeUser = umbracoMapper.Map<IUser, BackOfficeIdentityUser>(user);
-            _fakeUser.SecurityStamp = "Needed";
-        }
-
-        protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
-        {
-            ClaimsPrincipal principal = await _backOfficeSignInManager.CreateUserPrincipalAsync(_fakeUser);
-            var ticket = new AuthenticationTicket(principal, TestAuthenticationScheme);
-
-            return AuthenticateResult.Success(ticket);
-        }
+        return AuthenticateResult.Success(ticket);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
index f1f8b124e8..8cb9262ba2 100644
--- a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
+++ b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
@@ -15,7 +15,6 @@ using Microsoft.Extensions.Hosting;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
@@ -30,235 +29,231 @@ using Umbraco.Cms.Web.Common.Hosting;
 using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.TestServerTest
+namespace Umbraco.Cms.Tests.Integration.TestServerTest;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console, Boot = true)]
+public abstract class UmbracoTestServerTestBase : UmbracoIntegrationTestBase
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console, Boot = true)]
-    public abstract class UmbracoTestServerTestBase : UmbracoIntegrationTestBase
+    [SetUp]
+    public void Setup()
     {
-        protected HttpClient Client { get; private set; }
+        /*
+         * It's worth noting that our usage of WebApplicationFactory is non-standard,
+         * the intent is that your Startup.ConfigureServices is called just like
+         * when the app starts up, then replacements are registered in this class with
+         * builder.ConfigureServices (builder.ConfigureTestServices has hung around from before the
+         * generic host switchover).
+         *
+         * This is currently a pain to refactor towards due to UmbracoBuilder+TypeFinder+TypeLoader setup but
+         * we should get there one day.
+         *
+         * However we need to separate the testing framework we provide for downstream projects from our own tests.
+         * We cannot use the Umbraco.Web.UI startup yet as that is not available downstream.
+         *
+         * See https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests
+         */
+        var factory = new UmbracoWebApplicationFactory<UmbracoTestServerTestBase>(CreateHostBuilder);
 
-        protected LinkGenerator LinkGenerator { get; private set; }
-
-        protected WebApplicationFactory<UmbracoTestServerTestBase> Factory { get; private set; }
-
-        [SetUp]
-        public void Setup()
+        // additional host configuration for web server integration tests
+        Factory = factory.WithWebHostBuilder(builder =>
         {
-            /*
-             * It's worth noting that our usage of WebApplicationFactory is non-standard,
-             * the intent is that your Startup.ConfigureServices is called just like
-             * when the app starts up, then replacements are registered in this class with
-             * builder.ConfigureServices (builder.ConfigureTestServices has hung around from before the
-             * generic host switchover).
-             *
-             * This is currently a pain to refactor towards due to UmbracoBuilder+TypeFinder+TypeLoader setup but
-             * we should get there one day.
-             *
-             * However we need to separate the testing framework we provide for downstream projects from our own tests.
-             * We cannot use the Umbraco.Web.UI startup yet as that is not available downstream.
-             *
-             * See https://docs.microsoft.com/en-us/aspnet/core/test/integration-tests
-             */
-            var factory = new UmbracoWebApplicationFactory<UmbracoTestServerTestBase>(CreateHostBuilder);
+            // Otherwise inferred as $(SolutionDir)/Umbraco.Tests.Integration (note lack of src/tests)
+            builder.UseContentRoot(Assembly.GetExecutingAssembly().GetRootDirectorySafe());
 
-            // additional host configuration for web server integration tests
-            Factory = factory.WithWebHostBuilder(builder =>
+            // Executes after the standard ConfigureServices method
+            builder.ConfigureTestServices(services =>
+
+                // Add a test auth scheme with a test auth handler to authn and assign the user
+                services.AddAuthentication(TestAuthHandler.TestAuthenticationScheme)
+                    .AddScheme<AuthenticationSchemeOptions, TestAuthHandler>(TestAuthHandler.TestAuthenticationScheme, options => { }));
+        });
+
+        Client = Factory.CreateClient(new WebApplicationFactoryClientOptions { AllowAutoRedirect = false });
+
+        LinkGenerator = Factory.Services.GetRequiredService<LinkGenerator>();
+    }
+
+    protected HttpClient Client { get; private set; }
+
+    protected LinkGenerator LinkGenerator { get; private set; }
+
+    protected WebApplicationFactory<UmbracoTestServerTestBase> Factory { get; private set; }
+
+    /// <summary>
+    ///     Prepare a url before using <see cref="Client" />.
+    ///     This returns the url but also sets the HttpContext.request into to use this url.
+    /// </summary>
+    /// <returns>The string URL of the controller action.</returns>
+    protected string PrepareApiControllerUrl<T>(Expression<Func<T, object>> methodSelector)
+        where T : UmbracoApiController
+    {
+        var url = LinkGenerator.GetUmbracoApiService(methodSelector);
+        return PrepareUrl(url);
+    }
+
+    /// <summary>
+    ///     Prepare a url before using <see cref="Client" />.
+    ///     This returns the url but also sets the HttpContext.request into to use this url.
+    /// </summary>
+    /// <returns>The string URL of the controller action.</returns>
+    protected string PrepareSurfaceControllerUrl<T>(Expression<Func<T, object>> methodSelector)
+        where T : SurfaceController
+    {
+        var url = LinkGenerator.GetUmbracoSurfaceUrl(methodSelector);
+        return PrepareUrl(url);
+    }
+
+    /// <summary>
+    ///     Prepare a url before using <see cref="Client" />.
+    ///     This returns the url but also sets the HttpContext.request into to use this url.
+    /// </summary>
+    /// <returns>The string URL of the controller action.</returns>
+    protected string PrepareUrl(string url)
+    {
+        var umbracoContextFactory = GetRequiredService<IUmbracoContextFactory>();
+        var httpContextAccessor = GetRequiredService<IHttpContextAccessor>();
+
+        httpContextAccessor.HttpContext = new DefaultHttpContext
+        {
+            Request =
             {
-                // Otherwise inferred as $(SolutionDir)/Umbraco.Tests.Integration (note lack of src/tests)
-                builder.UseContentRoot(Assembly.GetExecutingAssembly().GetRootDirectorySafe());
+                Scheme = "https",
+                Host = new HostString("localhost", 80),
+                Path = url,
+                QueryString = new QueryString(string.Empty)
+            }
+        };
 
-                // Executes after the standard ConfigureServices method
-                builder.ConfigureTestServices(services =>
+        umbracoContextFactory.EnsureUmbracoContext();
 
-                    // Add a test auth scheme with a test auth handler to authn and assign the user
-                    services.AddAuthentication(TestAuthHandler.TestAuthenticationScheme)
-                        .AddScheme<AuthenticationSchemeOptions, TestAuthHandler>(TestAuthHandler.TestAuthenticationScheme, options => { }));
-            });
+        return url;
+    }
 
-            Client = Factory.CreateClient(new WebApplicationFactoryClientOptions
+    private IHostBuilder CreateHostBuilder()
+    {
+        var hostBuilder = Host.CreateDefaultBuilder()
+            .ConfigureUmbracoDefaults()
+            .ConfigureAppConfiguration((context, configBuilder) =>
             {
-                AllowAutoRedirect = false
-            });
+                context.HostingEnvironment = TestHelper.GetWebHostEnvironment();
+                configBuilder.Sources.Clear();
+                configBuilder.AddInMemoryCollection(InMemoryConfiguration);
+                configBuilder.AddConfiguration(GlobalSetupTeardown.TestConfiguration);
 
-            LinkGenerator = Factory.Services.GetRequiredService<LinkGenerator>();
-        }
-
-        /// <summary>
-        /// Prepare a url before using <see cref="Client"/>.
-        /// This returns the url but also sets the HttpContext.request into to use this url.
-        /// </summary>
-        /// <returns>The string URL of the controller action.</returns>
-        protected string PrepareApiControllerUrl<T>(Expression<Func<T, object>> methodSelector)
-            where T : UmbracoApiController
-        {
-            var url = LinkGenerator.GetUmbracoApiService(methodSelector);
-            return PrepareUrl(url);
-        }
-
-        /// <summary>
-        /// Prepare a url before using <see cref="Client"/>.
-        /// This returns the url but also sets the HttpContext.request into to use this url.
-        /// </summary>
-        /// <returns>The string URL of the controller action.</returns>
-        protected string PrepareSurfaceControllerUrl<T>(Expression<Func<T, object>> methodSelector)
-            where T : SurfaceController
-        {
-            var url = LinkGenerator.GetUmbracoSurfaceUrl(methodSelector);
-            return PrepareUrl(url);
-        }
-
-        /// <summary>
-        /// Prepare a url before using <see cref="Client"/>.
-        /// This returns the url but also sets the HttpContext.request into to use this url.
-        /// </summary>
-        /// <returns>The string URL of the controller action.</returns>
-        protected string PrepareUrl(string url)
-        {
-            IUmbracoContextFactory umbracoContextFactory = GetRequiredService<IUmbracoContextFactory>();
-            IHttpContextAccessor httpContextAccessor = GetRequiredService<IHttpContextAccessor>();
-
-            httpContextAccessor.HttpContext = new DefaultHttpContext
+                Configuration = configBuilder.Build();
+            })
+            .ConfigureWebHost(builder =>
             {
-                Request =
-                {
-                    Scheme = "https",
-                    Host = new HostString("localhost", 80),
-                    Path = url,
-                    QueryString = new QueryString(string.Empty)
-                }
-            };
-
-            umbracoContextFactory.EnsureUmbracoContext();
-
-            return url;
-        }
-
-        private IHostBuilder CreateHostBuilder()
-        {
-            IHostBuilder hostBuilder = Host.CreateDefaultBuilder()
-                .ConfigureUmbracoDefaults()
-                .ConfigureAppConfiguration((context, configBuilder) =>
+                builder.ConfigureServices((context, services) =>
                 {
                     context.HostingEnvironment = TestHelper.GetWebHostEnvironment();
-                    configBuilder.Sources.Clear();
-                    configBuilder.AddInMemoryCollection(InMemoryConfiguration);
-                    configBuilder.AddConfiguration(GlobalSetupTeardown.TestConfiguration);
 
-                    Configuration = configBuilder.Build();
-                })
-                .ConfigureWebHost(builder =>
-                {
-                    builder.ConfigureServices((context, services) =>
+                    ConfigureServices(services);
+                    ConfigureTestServices(services);
+                    services.AddUnique(CreateLoggerFactory());
+
+                    if (!TestOptions.Boot)
                     {
-                        context.HostingEnvironment = TestHelper.GetWebHostEnvironment();
-
-                        ConfigureServices(services);
-                        ConfigureTestServices(services);
-                        services.AddUnique(CreateLoggerFactory());
-
-                        if (!TestOptions.Boot)
-                        {
-                            // If boot is false, we don't want the CoreRuntime hosted service to start
-                            // So we replace it with a Mock
-                            services.AddUnique(Mock.Of<IRuntime>());
-                        }
-                    });
-
-                    // call startup
-                    builder.Configure(Configure);
-                })
-                .UseDefaultServiceProvider(cfg =>
-                {
-                    // These default to true *if* WebHostEnvironment.EnvironmentName == Development
-                    // When running tests, EnvironmentName used to be null on the mock that we register into services.
-                    // Enable opt in for tests so that validation occurs regardless of environment name.
-                    // Would be nice to have this on for UmbracoIntegrationTest also but requires a lot more effort to resolve issues.
-                    cfg.ValidateOnBuild = true;
-                    cfg.ValidateScopes = true;
+                        // If boot is false, we don't want the CoreRuntime hosted service to start
+                        // So we replace it with a Mock
+                        services.AddUnique(Mock.Of<IRuntime>());
+                    }
                 });
 
-            return hostBuilder;
-        }
+                // call startup
+                builder.Configure(Configure);
+            })
+            .UseDefaultServiceProvider(cfg =>
+            {
+                // These default to true *if* WebHostEnvironment.EnvironmentName == Development
+                // When running tests, EnvironmentName used to be null on the mock that we register into services.
+                // Enable opt in for tests so that validation occurs regardless of environment name.
+                // Would be nice to have this on for UmbracoIntegrationTest also but requires a lot more effort to resolve issues.
+                cfg.ValidateOnBuild = true;
+                cfg.ValidateScopes = true;
+            });
 
-        protected virtual IServiceProvider Services => Factory.Services;
+        return hostBuilder;
+    }
 
-        protected virtual T GetRequiredService<T>() => Factory.Services.GetRequiredService<T>();
+    protected virtual IServiceProvider Services => Factory.Services;
 
-        protected void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<TestUmbracoDatabaseFactoryProvider>();
+    protected virtual T GetRequiredService<T>() => Factory.Services.GetRequiredService<T>();
 
-            Core.Hosting.IHostingEnvironment hostingEnvironment = TestHelper.GetHostingEnvironment();
+    protected void ConfigureServices(IServiceCollection services)
+    {
+        services.AddTransient<TestUmbracoDatabaseFactoryProvider>();
 
-            TypeLoader typeLoader = services.AddTypeLoader(
-                GetType().Assembly,
-                hostingEnvironment,
-                TestHelper.ConsoleLoggerFactory,
-                AppCaches.NoCache,
-                Configuration,
-                TestHelper.Profiler);
+        var hostingEnvironment = TestHelper.GetHostingEnvironment();
 
-            services.AddLogger(TestHelper.GetWebHostEnvironment(), Configuration);
+        var typeLoader = services.AddTypeLoader(
+            GetType().Assembly,
+            hostingEnvironment,
+            TestHelper.ConsoleLoggerFactory,
+            AppCaches.NoCache,
+            Configuration,
+            TestHelper.Profiler);
 
-            var builder = new UmbracoBuilder(services, Configuration, typeLoader, TestHelper.ConsoleLoggerFactory, TestHelper.Profiler, AppCaches.NoCache, hostingEnvironment);
+        services.AddLogger(TestHelper.GetWebHostEnvironment(), Configuration);
 
-            builder
-                .AddConfiguration()
-                .AddUmbracoCore()
-                .AddWebComponents()
-                .AddNuCache()
-                .AddRuntimeMinifier()
-                .AddBackOfficeCore()
-                .AddBackOfficeAuthentication()
-                .AddBackOfficeIdentity()
-                .AddMembersIdentity()
-                .AddBackOfficeAuthorizationPolicies(TestAuthHandler.TestAuthenticationScheme)
-                .AddPreviewSupport()
-                .AddMvcAndRazor(mvcBuilding: mvcBuilder =>
-                {
-                    // Adds Umbraco.Web.BackOffice
-                    mvcBuilder.AddApplicationPart(typeof(ContentController).Assembly);
+        var builder = new UmbracoBuilder(services, Configuration, typeLoader, TestHelper.ConsoleLoggerFactory, TestHelper.Profiler, AppCaches.NoCache, hostingEnvironment);
 
-                    // Adds Umbraco.Web.Common
-                    mvcBuilder.AddApplicationPart(typeof(RenderController).Assembly);
+        builder
+            .AddConfiguration()
+            .AddUmbracoCore()
+            .AddWebComponents()
+            .AddNuCache()
+            .AddRuntimeMinifier()
+            .AddBackOfficeCore()
+            .AddBackOfficeAuthentication()
+            .AddBackOfficeIdentity()
+            .AddMembersIdentity()
+            .AddBackOfficeAuthorizationPolicies(TestAuthHandler.TestAuthenticationScheme)
+            .AddPreviewSupport()
+            .AddMvcAndRazor(mvcBuilder =>
+            {
+                // Adds Umbraco.Web.BackOffice
+                mvcBuilder.AddApplicationPart(typeof(ContentController).Assembly);
 
-                    // Adds Umbraco.Web.Website
-                    mvcBuilder.AddApplicationPart(typeof(SurfaceController).Assembly);
+                // Adds Umbraco.Web.Common
+                mvcBuilder.AddApplicationPart(typeof(RenderController).Assembly);
 
-                    // Adds Umbraco.Tests.Integration
-                    mvcBuilder.AddApplicationPart(typeof(UmbracoTestServerTestBase).Assembly);
-                })
-                .AddWebServer()
-                .AddWebsite()
-                .AddUmbracoSqlServerSupport()
-                .AddUmbracoSqliteSupport()
-                .AddTestServices(TestHelper) // This is the important one!
-                .Build();
-        }
+                // Adds Umbraco.Web.Website
+                mvcBuilder.AddApplicationPart(typeof(SurfaceController).Assembly);
 
-        /// <summary>
-        ///  Hook for registering test doubles.
-        /// </summary>
-        protected virtual void ConfigureTestServices(IServiceCollection services)
-        {
-        }
+                // Adds Umbraco.Tests.Integration
+                mvcBuilder.AddApplicationPart(typeof(UmbracoTestServerTestBase).Assembly);
+            })
+            .AddWebServer()
+            .AddWebsite()
+            .AddUmbracoSqlServerSupport()
+            .AddUmbracoSqliteSupport()
+            .AddTestServices(TestHelper) // This is the important one!
+            .Build();
+    }
 
-        protected void Configure(IApplicationBuilder app)
-        {
-            UseTestDatabase(app);
+    /// <summary>
+    ///     Hook for registering test doubles.
+    /// </summary>
+    protected virtual void ConfigureTestServices(IServiceCollection services)
+    {
+    }
 
-            app.UseUmbraco()
-                .WithMiddleware(u =>
-                {
-                    u.UseBackOffice();
-                    u.UseWebsite();
-                })
-                .WithEndpoints(u =>
-                {
-                    u.UseBackOfficeEndpoints();
-                    u.UseWebsiteEndpoints();
-                });
-        }
+    protected void Configure(IApplicationBuilder app)
+    {
+        UseTestDatabase(app);
+
+        app.UseUmbraco()
+            .WithMiddleware(u =>
+            {
+                u.UseBackOffice();
+                u.UseWebsite();
+            })
+            .WithEndpoints(u =>
+            {
+                u.UseBackOfficeEndpoints();
+                u.UseWebsiteEndpoints();
+            });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs
index 62d84a19a1..98ad406694 100644
--- a/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs
+++ b/tests/Umbraco.Tests.Integration/TestServerTest/UmbracoWebApplicationFactory.cs
@@ -5,32 +5,31 @@ using System;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.Hosting;
 
-namespace Umbraco.Cms.Tests.Integration.TestServerTest
+namespace Umbraco.Cms.Tests.Integration.TestServerTest;
+
+public class UmbracoWebApplicationFactory<TStartup> : WebApplicationFactory<TStartup>
+    where TStartup : class
 {
-    public class UmbracoWebApplicationFactory<TStartup> : WebApplicationFactory<TStartup>
-        where TStartup : class
+    private readonly Action<IHost> _beforeStart;
+    private readonly Func<IHostBuilder> _createHostBuilder;
+
+    /// <summary>
+    ///     Constructor to create a new WebApplicationFactory
+    /// </summary>
+    /// <param name="createHostBuilder">Method to create the IHostBuilder</param>
+    /// <param name="beforeStart">Method to perform an action before IHost starts</param>
+    public UmbracoWebApplicationFactory(Func<IHostBuilder> createHostBuilder) => _createHostBuilder = createHostBuilder;
+
+    protected override IHostBuilder CreateHostBuilder() => _createHostBuilder();
+
+    protected override IHost CreateHost(IHostBuilder builder)
     {
-        private readonly Func<IHostBuilder> _createHostBuilder;
-        private readonly Action<IHost> _beforeStart;
+        var host = builder.Build();
 
-        /// <summary>
-        /// Constructor to create a new WebApplicationFactory
-        /// </summary>
-        /// <param name="createHostBuilder">Method to create the IHostBuilder</param>
-        /// <param name="beforeStart">Method to perform an action before IHost starts</param>
-        public UmbracoWebApplicationFactory(Func<IHostBuilder> createHostBuilder) => _createHostBuilder = createHostBuilder;
+        _beforeStart?.Invoke(host);
 
-        protected override IHostBuilder CreateHostBuilder() => _createHostBuilder();
+        host.Start();
 
-        protected override IHost CreateHost(IHostBuilder builder)
-        {
-            IHost host = builder.Build();
-
-            _beforeStart?.Invoke(host);
-
-            host.Start();
-
-            return host;
-        }
+        return host;
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs
index 72bfae83b5..7aa632987b 100644
--- a/tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/BaseTestDatabase.cs
@@ -9,139 +9,130 @@ using System.Data.Common;
 using System.Diagnostics;
 using System.Threading;
 using Microsoft.Extensions.Logging;
-using Moq;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Persistence;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+public abstract class BaseTestDatabase
 {
-    public abstract class BaseTestDatabase
+    protected IUmbracoDatabaseFactory _databaseFactory;
+
+    protected ILoggerFactory _loggerFactory;
+
+    protected BlockingCollection<TestDbMeta> _prepareQueue;
+    protected BlockingCollection<TestDbMeta> _readyEmptyQueue;
+    protected BlockingCollection<TestDbMeta> _readySchemaQueue;
+    protected IList<TestDbMeta> _testDatabases;
+
+    public BaseTestDatabase() => Instance = this;
+    public static BaseTestDatabase Instance { get; private set; }
+    public static bool IsSqlite() => Instance is SqliteTestDatabase;
+    public static bool IsSqlServer() => Instance is SqlServerBaseTestDatabase;
+
+    protected abstract void Initialize();
+
+    public virtual TestDbMeta AttachEmpty()
     {
-        public static bool IsSqlite() => BaseTestDatabase.Instance is SqliteTestDatabase;
-        public static bool IsSqlServer() => BaseTestDatabase.Instance is SqlServerBaseTestDatabase;
-
-        protected ILoggerFactory _loggerFactory;
-        protected IUmbracoDatabaseFactory _databaseFactory;
-        protected IList<TestDbMeta> _testDatabases;
-
-        protected BlockingCollection<TestDbMeta> _prepareQueue;
-        protected BlockingCollection<TestDbMeta> _readySchemaQueue;
-        protected BlockingCollection<TestDbMeta> _readyEmptyQueue;
-        public static BaseTestDatabase Instance { get; private set; }
-
-        public BaseTestDatabase() => Instance = this;
-
-        protected abstract void Initialize();
-
-        public virtual TestDbMeta AttachEmpty()
+        if (_prepareQueue == null)
         {
-            if (_prepareQueue == null)
-            {
-                Initialize();
-            }
-
-            return _readyEmptyQueue.Take();
+            Initialize();
         }
 
-        public virtual TestDbMeta AttachSchema()
-        {
-            if (_prepareQueue == null)
-            {
-                Initialize();
-            }
+        return _readyEmptyQueue.Take();
+    }
 
-            return _readySchemaQueue.Take();
+    public virtual TestDbMeta AttachSchema()
+    {
+        if (_prepareQueue == null)
+        {
+            Initialize();
         }
 
-        public virtual void Detach(TestDbMeta meta)
-        {
-            _prepareQueue.TryAdd(meta);
-        }
+        return _readySchemaQueue.Take();
+    }
 
-        protected virtual void PrepareDatabase() =>
-            Retry(10, () =>
-            {
-                while (_prepareQueue.IsCompleted == false)
-                {
-                    TestDbMeta meta;
-                    try
-                    {
-                        meta = _prepareQueue.Take();
-                    }
-                    catch (InvalidOperationException)
-                    {
-                        continue;
-                    }
-
-                    ResetTestDatabase(meta);
-
-                    if (!meta.IsEmpty)
-                    {
-                        using (var conn = GetConnection(meta))
-                        {
-                            conn.Open();
-                            using (var cmd = conn.CreateCommand())
-                            {
-                                RebuildSchema(cmd, meta);
-                            }
-                        }
-
-                        _readySchemaQueue.TryAdd(meta);
-                    }
-                    else
-                    {
-                        _readyEmptyQueue.TryAdd(meta);
-                    }
-                }
-            });
-
-        protected static void AddParameter(IDbCommand cmd, UmbracoDatabase.ParameterInfo parameterInfo)
-        {
-            IDbDataParameter p = cmd.CreateParameter();
-            p.ParameterName = parameterInfo.Name;
-            p.Value = parameterInfo.Value;
-            p.DbType = parameterInfo.DbType;
-            p.Size = parameterInfo.Size;
-            cmd.Parameters.Add(p);
-        }
-
-        protected abstract DbConnection GetConnection(TestDbMeta meta);
-
-        protected abstract void RebuildSchema(IDbCommand command, TestDbMeta meta);
-
-        protected abstract void ResetTestDatabase(TestDbMeta meta);
-
-        protected static void Retry(int maxIterations, Action action)
-        {
-            for (int i = 0; i < maxIterations; i++)
+    public virtual void Detach(TestDbMeta meta) => _prepareQueue.TryAdd(meta);
+
+    protected virtual void PrepareDatabase() =>
+        Retry(10, () =>
+        {
+            while (_prepareQueue.IsCompleted == false)
             {
+                TestDbMeta meta;
                 try
                 {
-                    action();
-                    return;
-                }
-                catch (DbException ex)
-                {
-                    // Console.Error.WriteLine($"SqlException occured, but we try again {i+1}/{maxIterations}.\n{e}");
-                    // This can occur when there's a transaction deadlock which means (i think) that the database is still in use and hasn't been closed properly yet
-                    // so we need to just wait a little bit
-                    Thread.Sleep(100 * i);
-                    if (i == maxIterations - 1)
-                    {
-                        Debugger.Launch();
-                        throw;
-                    }
+                    meta = _prepareQueue.Take();
                 }
                 catch (InvalidOperationException)
                 {
-                    // Ignore
+                    continue;
+                }
+
+                ResetTestDatabase(meta);
+
+                if (!meta.IsEmpty)
+                {
+                    using (var conn = GetConnection(meta))
+                    {
+                        conn.Open();
+                        using (var cmd = conn.CreateCommand())
+                        {
+                            RebuildSchema(cmd, meta);
+                        }
+                    }
+
+                    _readySchemaQueue.TryAdd(meta);
+                }
+                else
+                {
+                    _readyEmptyQueue.TryAdd(meta);
                 }
             }
-        }
+        });
 
-        public abstract void TearDown();
+    protected static void AddParameter(IDbCommand cmd, UmbracoDatabase.ParameterInfo parameterInfo)
+    {
+        var p = cmd.CreateParameter();
+        p.ParameterName = parameterInfo.Name;
+        p.Value = parameterInfo.Value;
+        p.DbType = parameterInfo.DbType;
+        p.Size = parameterInfo.Size;
+        cmd.Parameters.Add(p);
     }
+
+    protected abstract DbConnection GetConnection(TestDbMeta meta);
+
+    protected abstract void RebuildSchema(IDbCommand command, TestDbMeta meta);
+
+    protected abstract void ResetTestDatabase(TestDbMeta meta);
+
+    protected static void Retry(int maxIterations, Action action)
+    {
+        for (var i = 0; i < maxIterations; i++)
+        {
+            try
+            {
+                action();
+                return;
+            }
+            catch (DbException ex)
+            {
+                // Console.Error.WriteLine($"SqlException occured, but we try again {i+1}/{maxIterations}.\n{e}");
+                // This can occur when there's a transaction deadlock which means (i think) that the database is still in use and hasn't been closed properly yet
+                // so we need to just wait a little bit
+                Thread.Sleep(100 * i);
+                if (i == maxIterations - 1)
+                {
+                    Debugger.Launch();
+                    throw;
+                }
+            }
+            catch (InvalidOperationException)
+            {
+                // Ignore
+            }
+        }
+    }
+
+    public abstract void TearDown();
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/ITestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/ITestDatabase.cs
index fc400fe3ab..3f48689b52 100644
--- a/tests/Umbraco.Tests.Integration/Testing/ITestDatabase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/ITestDatabase.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+public interface ITestDatabase
 {
-    public interface ITestDatabase
-    {
-        TestDbMeta AttachEmpty();
+    TestDbMeta AttachEmpty();
 
-        TestDbMeta AttachSchema();
+    TestDbMeta AttachSchema();
 
-        void Detach(TestDbMeta id);
-    }
+    void Detach(TestDbMeta id);
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs b/tests/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs
index c0b490e0e5..6fbfd5e300 100644
--- a/tests/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/IntegrationTestComponent.cs
@@ -5,34 +5,33 @@ using Examine;
 using Examine.Lucene.Providers;
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+/// <summary>
+///     A component to customize some services to work nicely with integration tests
+/// </summary>
+public class IntegrationTestComponent : IComponent
 {
-    /// <summary>
-    /// A component to customize some services to work nicely with integration tests
-    /// </summary>
-    public class IntegrationTestComponent : IComponent
+    private readonly IExamineManager _examineManager;
+
+    public IntegrationTestComponent(IExamineManager examineManager) => _examineManager = examineManager;
+
+    public void Initialize() => ConfigureExamineIndexes();
+
+    public void Terminate()
     {
-        private readonly IExamineManager _examineManager;
+    }
 
-        public IntegrationTestComponent(IExamineManager examineManager) => _examineManager = examineManager;
-
-        public void Initialize() => ConfigureExamineIndexes();
-
-        public void Terminate()
+    /// <summary>
+    ///     Configure all indexes to run sync (non-backbround threads) and to use RAMDirectory
+    /// </summary>
+    private void ConfigureExamineIndexes()
+    {
+        foreach (var index in _examineManager.Indexes)
         {
-        }
-
-        /// <summary>
-        /// Configure all indexes to run sync (non-backbround threads) and to use RAMDirectory
-        /// </summary>
-        private void ConfigureExamineIndexes()
-        {
-            foreach (IIndex index in _examineManager.Indexes)
+            if (index is LuceneIndex luceneIndex)
             {
-                if (index is LuceneIndex luceneIndex)
-                {
-                    luceneIndex.WithThreadingMode(IndexThreadingMode.Synchronous);
-                }
+                luceneIndex.WithThreadingMode(IndexThreadingMode.Synchronous);
             }
         }
     }
diff --git a/tests/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
index 30c306bbee..28a7370b5d 100644
--- a/tests/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/LocalDbTestDatabase.cs
@@ -10,136 +10,135 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Infrastructure.Persistence;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+/// <summary>
+///     Manages a pool of LocalDb databases for integration testing
+/// </summary>
+public class LocalDbTestDatabase : SqlServerBaseTestDatabase, ITestDatabase
 {
-    /// <summary>
-    /// Manages a pool of LocalDb databases for integration testing
-    /// </summary>
-    public class LocalDbTestDatabase : SqlServerBaseTestDatabase, ITestDatabase
+    public const string InstanceName = "UmbracoTests";
+    public const string DatabaseName = "UmbracoTests";
+    private static LocalDb.Instance s_localDbInstance;
+    private static string s_filesPath;
+    private readonly LocalDb _localDb;
+
+    private readonly TestDatabaseSettings _settings;
+
+    // It's internal because `Umbraco.Core.Persistence.LocalDb` is internal
+    internal LocalDbTestDatabase(TestDatabaseSettings settings, ILoggerFactory loggerFactory, LocalDb localDb, IUmbracoDatabaseFactory dbFactory)
     {
-        public const string InstanceName = "UmbracoTests";
-        public const string DatabaseName = "UmbracoTests";
+        _loggerFactory = loggerFactory;
+        _databaseFactory = dbFactory;
 
-        private readonly TestDatabaseSettings _settings;
-        private readonly LocalDb _localDb;
-        private static LocalDb.Instance s_localDbInstance;
-        private static string s_filesPath;
+        _settings = settings;
+        _localDb = localDb;
+        s_filesPath = settings.FilesPath;
 
-        // It's internal because `Umbraco.Core.Persistence.LocalDb` is internal
-        internal LocalDbTestDatabase(TestDatabaseSettings settings, ILoggerFactory loggerFactory, LocalDb localDb, IUmbracoDatabaseFactory dbFactory)
+        var counter = 0;
+
+        var schema = Enumerable.Range(0, _settings.SchemaDatabaseCount)
+            .Select(x => TestDbMeta.CreateWithoutConnectionString($"{DatabaseName}-{++counter}", false));
+
+        var empty = Enumerable.Range(0, _settings.EmptyDatabasesCount)
+            .Select(x => TestDbMeta.CreateWithoutConnectionString($"{DatabaseName}-{++counter}", true));
+
+        _testDatabases = schema.Concat(empty).ToList();
+
+        s_localDbInstance = _localDb.GetInstance(InstanceName);
+        if (s_localDbInstance != null)
         {
-            _loggerFactory = loggerFactory;
-            _databaseFactory = dbFactory;
-
-            _settings = settings;
-            _localDb = localDb;
-            s_filesPath = settings.FilesPath;
-
-            var counter = 0;
-
-            var schema = Enumerable.Range(0, _settings.SchemaDatabaseCount)
-                .Select(x => TestDbMeta.CreateWithoutConnectionString($"{DatabaseName}-{++counter}", false));
-
-            var empty = Enumerable.Range(0, _settings.EmptyDatabasesCount)
-                .Select(x => TestDbMeta.CreateWithoutConnectionString($"{DatabaseName}-{++counter}", true));
-
-            _testDatabases = schema.Concat(empty).ToList();
-
-            s_localDbInstance = _localDb.GetInstance(InstanceName);
-            if (s_localDbInstance != null)
-            {
-                return;
-            }
-
-            if (_localDb.CreateInstance(InstanceName) == false)
-            {
-                throw new Exception("Failed to create a LocalDb instance.");
-            }
-
-            s_localDbInstance = _localDb.GetInstance(InstanceName);
+            return;
         }
 
-        protected override void Initialize()
+        if (_localDb.CreateInstance(InstanceName) == false)
         {
-            string tempName = Guid.NewGuid().ToString("N");
-            s_localDbInstance.CreateDatabase(tempName, s_filesPath);
-            s_localDbInstance.DetachDatabase(tempName);
-
-            _prepareQueue = new BlockingCollection<TestDbMeta>();
-            _readySchemaQueue = new BlockingCollection<TestDbMeta>();
-            _readyEmptyQueue = new BlockingCollection<TestDbMeta>();
-
-            for (int i = 0; i < _testDatabases.Count; i++)
-            {
-                TestDbMeta meta = _testDatabases[i];
-                bool isLast = i == _testDatabases.Count - 1;
-
-                _localDb.CopyDatabaseFiles(tempName, s_filesPath, targetDatabaseName: meta.Name, overwrite: true, delete: isLast);
-                meta.ConnectionString = s_localDbInstance.GetAttachedConnectionString(meta.Name, s_filesPath);
-                _prepareQueue.Add(meta);
-            }
-
-            for (int i = 0; i < _settings.PrepareThreadCount; i++)
-            {
-                var thread = new Thread(PrepareDatabase);
-                thread.Start();
-            }
+            throw new Exception("Failed to create a LocalDb instance.");
         }
 
-        public override void TearDown()
+        s_localDbInstance = _localDb.GetInstance(InstanceName);
+    }
+
+    protected override void Initialize()
+    {
+        var tempName = Guid.NewGuid().ToString("N");
+        s_localDbInstance.CreateDatabase(tempName, s_filesPath);
+        s_localDbInstance.DetachDatabase(tempName);
+
+        _prepareQueue = new BlockingCollection<TestDbMeta>();
+        _readySchemaQueue = new BlockingCollection<TestDbMeta>();
+        _readyEmptyQueue = new BlockingCollection<TestDbMeta>();
+
+        for (var i = 0; i < _testDatabases.Count; i++)
         {
-            if (_prepareQueue == null)
+            var meta = _testDatabases[i];
+            var isLast = i == _testDatabases.Count - 1;
+
+            _localDb.CopyDatabaseFiles(tempName, s_filesPath, meta.Name, overwrite: true, delete: isLast);
+            meta.ConnectionString = s_localDbInstance.GetAttachedConnectionString(meta.Name, s_filesPath);
+            _prepareQueue.Add(meta);
+        }
+
+        for (var i = 0; i < _settings.PrepareThreadCount; i++)
+        {
+            var thread = new Thread(PrepareDatabase);
+            thread.Start();
+        }
+    }
+
+    public override void TearDown()
+    {
+        if (_prepareQueue == null)
+        {
+            return;
+        }
+
+        _prepareQueue.CompleteAdding();
+        while (_prepareQueue.TryTake(out _))
+        {
+        }
+
+        _readyEmptyQueue.CompleteAdding();
+        while (_readyEmptyQueue.TryTake(out _))
+        {
+        }
+
+        _readySchemaQueue.CompleteAdding();
+        while (_readySchemaQueue.TryTake(out _))
+        {
+        }
+
+        if (s_filesPath == null)
+        {
+            return;
+        }
+
+        var filename = Path.Combine(s_filesPath, DatabaseName).ToUpper();
+
+        Parallel.ForEach(s_localDbInstance.GetDatabases(), instance =>
+        {
+            if (instance.StartsWith(filename))
             {
-                return;
+                s_localDbInstance.DropDatabase(instance);
+            }
+        });
+
+        _localDb.StopInstance(InstanceName);
+
+        foreach (var file in Directory.EnumerateFiles(s_filesPath))
+        {
+            if (file.EndsWith(".mdf") == false && file.EndsWith(".ldf") == false)
+            {
+                continue;
             }
 
-            _prepareQueue.CompleteAdding();
-            while (_prepareQueue.TryTake(out _))
+            try
             {
+                File.Delete(file);
             }
-
-            _readyEmptyQueue.CompleteAdding();
-            while (_readyEmptyQueue.TryTake(out _))
+            catch (IOException)
             {
-            }
-
-            _readySchemaQueue.CompleteAdding();
-            while (_readySchemaQueue.TryTake(out _))
-            {
-            }
-
-            if (s_filesPath == null)
-            {
-                return;
-            }
-
-            string filename = Path.Combine(s_filesPath, DatabaseName).ToUpper();
-
-            Parallel.ForEach(s_localDbInstance.GetDatabases(), instance =>
-            {
-                if (instance.StartsWith(filename))
-                {
-                    s_localDbInstance.DropDatabase(instance);
-                }
-            });
-
-            _localDb.StopInstance(InstanceName);
-
-            foreach (string file in Directory.EnumerateFiles(s_filesPath))
-            {
-                if (file.EndsWith(".mdf") == false && file.EndsWith(".ldf") == false)
-                {
-                    continue;
-                }
-
-                try
-                {
-                    File.Delete(file);
-                }
-                catch (IOException)
-                {
-                    // ignore, must still be in use but nothing we can do
-                }
+                // ignore, must still be in use but nothing we can do
             }
         }
     }
diff --git a/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs
index 391eace430..8a19c07ac9 100644
--- a/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/SqlServerBaseTestDatabase.cs
@@ -16,7 +16,6 @@ namespace Umbraco.Cms.Tests.Integration.Testing;
 
 public abstract class SqlServerBaseTestDatabase : BaseTestDatabase
 {
-
     protected UmbracoDatabase.CommandInfo[] _cachedDatabaseInitCommands = new UmbracoDatabase.CommandInfo[0];
 
     protected override void ResetTestDatabase(TestDbMeta meta)
@@ -58,14 +57,13 @@ public abstract class SqlServerBaseTestDatabase : BaseTestDatabase
         command.CommandText = sql;
         command.Parameters.Clear();
 
-        for (int i = 0; i < args.Length; i++)
+        for (var i = 0; i < args.Length; i++)
         {
             command.Parameters.AddWithValue("@" + i, args[i]);
         }
     }
 
 
-
     protected override DbConnection GetConnection(TestDbMeta meta) => new SqlConnection(meta.ConnectionString);
 
     protected override void RebuildSchema(IDbCommand command, TestDbMeta meta)
@@ -79,12 +77,12 @@ public abstract class SqlServerBaseTestDatabase : BaseTestDatabase
             }
         }
 
-        foreach (UmbracoDatabase.CommandInfo dbCommand in _cachedDatabaseInitCommands)
+        foreach (var dbCommand in _cachedDatabaseInitCommands)
         {
             command.CommandText = dbCommand.Text;
             command.Parameters.Clear();
 
-            foreach (UmbracoDatabase.ParameterInfo parameterInfo in dbCommand.Parameters)
+            foreach (var parameterInfo in dbCommand.Parameters)
             {
                 AddParameter(command, parameterInfo);
             }
@@ -101,13 +99,16 @@ public abstract class SqlServerBaseTestDatabase : BaseTestDatabase
         {
             database.LogCommands = true;
 
-            using (NPoco.ITransaction transaction = database.GetTransaction())
+            using (var transaction = database.GetTransaction())
             {
-                var options = new TestOptionsMonitor<InstallDefaultDataSettings>(new InstallDefaultDataSettings { InstallData = InstallDefaultDataOption.All });
+                var options =
+                    new TestOptionsMonitor<InstallDefaultDataSettings>(
+                        new InstallDefaultDataSettings { InstallData = InstallDefaultDataOption.All });
 
                 var schemaCreator = new DatabaseSchemaCreator(
                     database,
-                    _loggerFactory.CreateLogger<DatabaseSchemaCreator>(), _loggerFactory,
+                    _loggerFactory.CreateLogger<DatabaseSchemaCreator>(),
+                    _loggerFactory,
                     new UmbracoVersion(),
                     Mock.Of<IEventAggregator>(),
                     options);
diff --git a/tests/Umbraco.Tests.Integration/Testing/SqlServerTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/SqlServerTestDatabase.cs
index 378ee28c53..ff000c75b7 100644
--- a/tests/Umbraco.Tests.Integration/Testing/SqlServerTestDatabase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/SqlServerTestDatabase.cs
@@ -11,121 +11,117 @@ using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Infrastructure.Persistence;
 
 // ReSharper disable ConvertToUsingDeclaration
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+/// <remarks>
+///     It's not meant to be pretty, rushed port of LocalDb.cs + LocalDbTestDatabase.cs
+/// </remarks>
+public class SqlServerTestDatabase : SqlServerBaseTestDatabase, ITestDatabase
 {
-    /// <remarks>
-    /// It's not meant to be pretty, rushed port of LocalDb.cs + LocalDbTestDatabase.cs
-    /// </remarks>
-    public class SqlServerTestDatabase : SqlServerBaseTestDatabase, ITestDatabase
+    public const string DatabaseName = "UmbracoTests";
+    private readonly TestDatabaseSettings _settings;
+
+    public SqlServerTestDatabase(TestDatabaseSettings settings, ILoggerFactory loggerFactory, IUmbracoDatabaseFactory databaseFactory)
     {
-        private readonly TestDatabaseSettings _settings;
-        public const string DatabaseName = "UmbracoTests";
+        _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
+        _databaseFactory = databaseFactory ?? throw new ArgumentNullException(nameof(databaseFactory));
 
-        public SqlServerTestDatabase(TestDatabaseSettings settings, ILoggerFactory loggerFactory,
-            IUmbracoDatabaseFactory databaseFactory)
+        _settings = settings;
+
+        var counter = 0;
+
+        var schema = Enumerable.Range(0, _settings.SchemaDatabaseCount)
+            .Select(x => TestDbMeta.CreateWithMasterConnectionString($"{DatabaseName}-{++counter}", false, _settings.SQLServerMasterConnectionString));
+
+        var empty = Enumerable.Range(0, _settings.EmptyDatabasesCount)
+            .Select(x => TestDbMeta.CreateWithMasterConnectionString($"{DatabaseName}-{++counter}", true, _settings.SQLServerMasterConnectionString));
+
+        _testDatabases = schema.Concat(empty).ToList();
+    }
+
+    protected override void Initialize()
+    {
+        _prepareQueue = new BlockingCollection<TestDbMeta>();
+        _readySchemaQueue = new BlockingCollection<TestDbMeta>();
+        _readyEmptyQueue = new BlockingCollection<TestDbMeta>();
+
+        foreach (var meta in _testDatabases)
         {
-            _loggerFactory = loggerFactory ?? throw new ArgumentNullException(nameof(loggerFactory));
-            _databaseFactory = databaseFactory ?? throw new ArgumentNullException(nameof(databaseFactory));
-
-            _settings = settings;
-
-            var counter = 0;
-
-            var schema = Enumerable.Range(0, _settings.SchemaDatabaseCount)
-                .Select(x => TestDbMeta.CreateWithMasterConnectionString($"{DatabaseName}-{++counter}", false,
-                    _settings.SQLServerMasterConnectionString));
-
-            var empty = Enumerable.Range(0, _settings.EmptyDatabasesCount)
-                .Select(x => TestDbMeta.CreateWithMasterConnectionString($"{DatabaseName}-{++counter}", true,
-                    _settings.SQLServerMasterConnectionString));
-
-            _testDatabases = schema.Concat(empty).ToList();
+            CreateDatabase(meta);
+            _prepareQueue.Add(meta);
         }
 
-        protected override void Initialize()
+        for (var i = 0; i < _settings.PrepareThreadCount; i++)
         {
-            _prepareQueue = new BlockingCollection<TestDbMeta>();
-            _readySchemaQueue = new BlockingCollection<TestDbMeta>();
-            _readyEmptyQueue = new BlockingCollection<TestDbMeta>();
+            var thread = new Thread(PrepareDatabase);
+            thread.Start();
+        }
+    }
 
-            foreach (TestDbMeta meta in _testDatabases)
-            {
-                CreateDatabase(meta);
-                _prepareQueue.Add(meta);
-            }
+    private void CreateDatabase(TestDbMeta meta)
+    {
+        Drop(meta);
 
-            for (int i = 0; i < _settings.PrepareThreadCount; i++)
+        using (var connection = new SqlConnection(_settings.SQLServerMasterConnectionString))
+        {
+            connection.Open();
+            using (var command = connection.CreateCommand())
             {
-                var thread = new Thread(PrepareDatabase);
-                thread.Start();
+                SetCommand(command, $@"CREATE DATABASE {LocalDb.QuotedName(meta.Name)}");
+                command.ExecuteNonQuery();
             }
         }
+    }
 
-        private void CreateDatabase(TestDbMeta meta)
+    private void Drop(TestDbMeta meta)
+    {
+        using (var connection = new SqlConnection(_settings.SQLServerMasterConnectionString))
         {
-            Drop(meta);
-
-            using (var connection = new SqlConnection(_settings.SQLServerMasterConnectionString))
+            connection.Open();
+            using (var command = connection.CreateCommand())
             {
-                connection.Open();
-                using (SqlCommand command = connection.CreateCommand())
+                SetCommand(command, "select count(1) from sys.databases where name = @0", meta.Name);
+                var records = (int)command.ExecuteScalar();
+                if (records == 0)
                 {
-                    SetCommand(command, $@"CREATE DATABASE {LocalDb.QuotedName(meta.Name)}");
-                    command.ExecuteNonQuery();
+                    return;
                 }
-            }
-        }
 
-        private void Drop(TestDbMeta meta)
-        {
-            using (var connection = new SqlConnection(_settings.SQLServerMasterConnectionString))
-            {
-                connection.Open();
-                using (SqlCommand command = connection.CreateCommand())
-                {
-                    SetCommand(command, "select count(1) from sys.databases where name = @0", meta.Name);
-                    var records = (int)command.ExecuteScalar();
-                    if (records == 0)
-                    {
-                        return;
-                    }
-
-                    string sql = $@"
+                var sql = $@"
                         ALTER DATABASE {LocalDb.QuotedName(meta.Name)}
                         SET SINGLE_USER 
                         WITH ROLLBACK IMMEDIATE";
-                    SetCommand(command, sql);
-                    command.ExecuteNonQuery();
+                SetCommand(command, sql);
+                command.ExecuteNonQuery();
 
-                    SetCommand(command, $@"DROP DATABASE {LocalDb.QuotedName(meta.Name)}");
-                    command.ExecuteNonQuery();
-                }
+                SetCommand(command, $@"DROP DATABASE {LocalDb.QuotedName(meta.Name)}");
+                command.ExecuteNonQuery();
             }
         }
-
-        public override void TearDown()
-        {
-            if (_prepareQueue == null)
-            {
-                return;
-            }
-
-            _prepareQueue.CompleteAdding();
-            while (_prepareQueue.TryTake(out _))
-            {
-            }
-
-            _readyEmptyQueue.CompleteAdding();
-            while (_readyEmptyQueue.TryTake(out _))
-            {
-            }
-
-            _readySchemaQueue.CompleteAdding();
-            while (_readySchemaQueue.TryTake(out _))
-            {
-            }
-
-            Parallel.ForEach(_testDatabases, Drop);
-        }
+    }
+
+    public override void TearDown()
+    {
+        if (_prepareQueue == null)
+        {
+            return;
+        }
+
+        _prepareQueue.CompleteAdding();
+        while (_prepareQueue.TryTake(out _))
+        {
+        }
+
+        _readyEmptyQueue.CompleteAdding();
+        while (_readyEmptyQueue.TryTake(out _))
+        {
+        }
+
+        _readySchemaQueue.CompleteAdding();
+        while (_readySchemaQueue.TryTake(out _))
+        {
+        }
+
+        Parallel.ForEach(_testDatabases, Drop);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs b/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs
index f4dda7891e..2c39e6cc6c 100644
--- a/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/SqliteTestDatabase.cs
@@ -2,10 +2,8 @@ using System;
 using System.Collections.Concurrent;
 using System.Data;
 using System.Data.Common;
-using System.IO;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Data.Sqlite;
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -16,22 +14,21 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
+using Umbraco.Cms.Persistence.Sqlite;
 using Umbraco.Cms.Persistence.Sqlite.Mappers;
-using Umbraco.Cms.Persistence.Sqlite.Services;
 using Umbraco.Cms.Tests.Common;
 
 namespace Umbraco.Cms.Tests.Integration.Testing;
 
 public class SqliteTestDatabase : BaseTestDatabase, ITestDatabase
 {
-    private readonly TestDatabaseSettings _settings;
-    private readonly TestUmbracoDatabaseFactoryProvider _dbFactoryProvider;
     public const string DatabaseName = "UmbracoTests";
+    private readonly TestUmbracoDatabaseFactoryProvider _dbFactoryProvider;
+    private readonly TestDatabaseSettings _settings;
 
     protected UmbracoDatabase.CommandInfo[] _cachedDatabaseInitCommands = new UmbracoDatabase.CommandInfo[0];
 
-    public SqliteTestDatabase(TestDatabaseSettings settings, TestUmbracoDatabaseFactoryProvider dbFactoryProvider,
-        ILoggerFactory loggerFactory)
+    public SqliteTestDatabase(TestDatabaseSettings settings, TestUmbracoDatabaseFactoryProvider dbFactoryProvider, ILoggerFactory loggerFactory)
     {
         _settings = settings ?? throw new ArgumentNullException(nameof(settings));
         _dbFactoryProvider = dbFactoryProvider;
@@ -47,13 +44,19 @@ public class SqliteTestDatabase : BaseTestDatabase, ITestDatabase
         _testDatabases = schema.Concat(empty).ToList();
     }
 
+    public override void Detach(TestDbMeta meta)
+    {
+        meta.Connection.Close();
+        _prepareQueue.TryAdd(CreateSqLiteMeta(meta.IsEmpty));
+    }
+
     protected override void Initialize()
     {
         _prepareQueue = new BlockingCollection<TestDbMeta>();
         _readySchemaQueue = new BlockingCollection<TestDbMeta>();
         _readyEmptyQueue = new BlockingCollection<TestDbMeta>();
 
-        foreach (TestDbMeta meta in _testDatabases)
+        foreach (var meta in _testDatabases)
         {
             _prepareQueue.Add(meta);
         }
@@ -72,12 +75,6 @@ public class SqliteTestDatabase : BaseTestDatabase, ITestDatabase
         meta.Connection.Open();
     }
 
-    public override void Detach(TestDbMeta meta)
-    {
-        meta.Connection.Close();
-        _prepareQueue.TryAdd(CreateSqLiteMeta(meta.IsEmpty));
-    }
-
     protected override DbConnection GetConnection(TestDbMeta meta) => new SqliteConnection(meta.ConnectionString);
 
     protected override void RebuildSchema(IDbCommand command, TestDbMeta meta)
@@ -101,7 +98,7 @@ public class SqliteTestDatabase : BaseTestDatabase, ITestDatabase
         database.Mappers.Add(new NullableDateMapper());
         database.Mappers.Add(new SqlitePocoGuidMapper());
 
-        foreach (UmbracoDatabase.CommandInfo dbCommand in _cachedDatabaseInitCommands)
+        foreach (var dbCommand in _cachedDatabaseInitCommands)
         {
             database.Execute(dbCommand.Text, dbCommand.Parameters.Select(x => x.Value).ToArray());
         }
@@ -117,9 +114,11 @@ public class SqliteTestDatabase : BaseTestDatabase, ITestDatabase
         using var database = (UmbracoDatabase)dbFactory.CreateDatabase();
         database.LogCommands = true;
 
-        using NPoco.ITransaction transaction = database.GetTransaction();
+        using var transaction = database.GetTransaction();
 
-        var options = new TestOptionsMonitor<InstallDefaultDataSettings>(new InstallDefaultDataSettings { InstallData = InstallDefaultDataOption.All });
+        var options =
+            new TestOptionsMonitor<InstallDefaultDataSettings>(
+                new InstallDefaultDataSettings { InstallData = InstallDefaultDataOption.All });
 
         var schemaCreator = new DatabaseSchemaCreator(
             database,
@@ -145,26 +144,29 @@ public class SqliteTestDatabase : BaseTestDatabase, ITestDatabase
         }
 
         _prepareQueue.CompleteAdding();
-        while (_prepareQueue.TryTake(out _)) { }
+        while (_prepareQueue.TryTake(out _))
+        { }
 
         _readyEmptyQueue.CompleteAdding();
-        while (_readyEmptyQueue.TryTake(out _)) { }
+        while (_readyEmptyQueue.TryTake(out _))
+        { }
 
         _readySchemaQueue.CompleteAdding();
-        while (_readySchemaQueue.TryTake(out _)) { }
+        while (_readySchemaQueue.TryTake(out _))
+        { }
     }
 
     private TestDbMeta CreateSqLiteMeta(bool empty)
     {
-        var builder = new SqliteConnectionStringBuilder()
+        var builder = new SqliteConnectionStringBuilder
         {
             DataSource = $"{Guid.NewGuid()}",
             Mode = SqliteOpenMode.Memory,
             ForeignKeys = true,
             Pooling = false, // When pooling true, files kept open after connections closed, bad for cleanup.
-            Cache = SqliteCacheMode.Shared,
+            Cache = SqliteCacheMode.Shared
         };
 
-        return new TestDbMeta(builder.DataSource, empty, builder.ConnectionString, Persistence.Sqlite.Constants.ProviderName, "InMemory");
+        return new TestDbMeta(builder.DataSource, empty, builder.ConnectionString, Constants.ProviderName, "InMemory");
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/TestConflictingRouteService.cs b/tests/Umbraco.Tests.Integration/Testing/TestConflictingRouteService.cs
index c61cbb8a1d..a7eea189e1 100644
--- a/tests/Umbraco.Tests.Integration/Testing/TestConflictingRouteService.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/TestConflictingRouteService.cs
@@ -1,14 +1,12 @@
-using System;
 using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+public class TestConflictingRouteService : IConflictingRouteService
 {
-    public class TestConflictingRouteService : IConflictingRouteService
+    public bool HasConflictingRoutes(out string controllername)
     {
-        public bool HasConflictingRoutes(out string controllername)
-        {
-            controllername = string.Empty;
-            return false;
-        }
+        controllername = string.Empty;
+        return false;
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs b/tests/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs
index c746e52e6c..78ed442db5 100644
--- a/tests/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/TestDatabaseFactory.cs
@@ -2,57 +2,53 @@
 // See LICENSE for more details.
 
 using System;
-using System.IO;
 using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Infrastructure.Persistence;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+public static class TestDatabaseFactory
 {
-    public static class TestDatabaseFactory
+    /// <summary>
+    ///     Creates a TestDatabase instance
+    /// </summary>
+    /// <remarks>
+    ///     SQL Server setup requires configured master connection string &amp; privileges to create database.
+    /// </remarks>
+    /// <example>
+    ///     <code>
+    /// # SQL Server Environment variable setup
+    /// $ export Tests__Database__DatabaseType="SqlServer"
+    /// $ export Tests__Database__SQLServerMasterConnectionString="Server=localhost,1433; User Id=sa; Password=MySuperSecretPassword123!;"
+    /// </code>
+    /// </example>
+    /// <example>
+    ///     <code>
+    /// # Docker cheat sheet
+    /// $ docker run -e 'ACCEPT_EULA=Y' -e "SA_PASSWORD=MySuperSecretPassword123!" -e 'MSSQL_PID=Developer' -p 1433:1433 -d mcr.microsoft.com/mssql/server:2017-latest-ubuntu
+    /// </code>
+    /// </example>
+    public static ITestDatabase Create(TestDatabaseSettings settings, TestUmbracoDatabaseFactoryProvider dbFactory, ILoggerFactory loggerFactory) =>
+        settings.DatabaseType switch
+        {
+            TestDatabaseSettings.TestDatabaseType.Sqlite => new SqliteTestDatabase(settings, dbFactory, loggerFactory),
+            TestDatabaseSettings.TestDatabaseType.SqlServer => CreateSqlServer(settings, loggerFactory, dbFactory),
+            TestDatabaseSettings.TestDatabaseType.LocalDb => CreateLocalDb(settings, loggerFactory, dbFactory),
+            _ => throw new ApplicationException("Unsupported test database provider")
+        };
+
+    private static ITestDatabase CreateLocalDb(TestDatabaseSettings settings, ILoggerFactory loggerFactory, TestUmbracoDatabaseFactoryProvider dbFactory)
     {
-        /// <summary>
-        /// Creates a TestDatabase instance
-        /// </summary>
-        /// <remarks>
-        /// SQL Server setup requires configured master connection string &amp; privileges to create database.
-        /// </remarks>
-        /// <example>
-        /// <code>
-        /// # SQL Server Environment variable setup
-        /// $ export Tests__Database__DatabaseType="SqlServer"
-        /// $ export Tests__Database__SQLServerMasterConnectionString="Server=localhost,1433; User Id=sa; Password=MySuperSecretPassword123!;"
-        /// </code>
-        /// </example>
-        /// <example>
-        /// <code>
-        /// # Docker cheat sheet
-        /// $ docker run -e 'ACCEPT_EULA=Y' -e "SA_PASSWORD=MySuperSecretPassword123!" -e 'MSSQL_PID=Developer' -p 1433:1433 -d mcr.microsoft.com/mssql/server:2017-latest-ubuntu
-        /// </code>
-        /// </example>
-        public static ITestDatabase Create(TestDatabaseSettings settings, TestUmbracoDatabaseFactoryProvider dbFactory, ILoggerFactory loggerFactory) =>
-            settings.DatabaseType switch
-            {
-                TestDatabaseSettings.TestDatabaseType.Sqlite=> new SqliteTestDatabase(settings, dbFactory, loggerFactory),
-                TestDatabaseSettings.TestDatabaseType.SqlServer => CreateSqlServer(settings, loggerFactory, dbFactory),
-                TestDatabaseSettings.TestDatabaseType.LocalDb => CreateLocalDb(settings, loggerFactory, dbFactory),
-                _ => throw new ApplicationException("Unsupported test database provider")
-            };
+        var localDb = new LocalDb();
 
-        private static ITestDatabase CreateLocalDb(TestDatabaseSettings settings, ILoggerFactory loggerFactory, TestUmbracoDatabaseFactoryProvider dbFactory)
+        if (!localDb.IsAvailable)
         {
-            var localDb = new LocalDb();
-
-            if (!localDb.IsAvailable)
-            {
-                throw new InvalidOperationException("LocalDB is not available.");
-            }
-
-            return new LocalDbTestDatabase(settings, loggerFactory, localDb,  dbFactory.Create());
+            throw new InvalidOperationException("LocalDB is not available.");
         }
 
-        private static ITestDatabase CreateSqlServer(TestDatabaseSettings settings, ILoggerFactory loggerFactory, TestUmbracoDatabaseFactoryProvider dbFactory)
-        {
-            return new SqlServerTestDatabase(settings, loggerFactory, dbFactory.Create());
-        }
+        return new LocalDbTestDatabase(settings, loggerFactory, localDb, dbFactory.Create());
     }
+
+    private static ITestDatabase CreateSqlServer(TestDatabaseSettings settings, ILoggerFactory loggerFactory, TestUmbracoDatabaseFactoryProvider dbFactory) =>
+        new SqlServerTestDatabase(settings, loggerFactory, dbFactory.Create());
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs b/tests/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs
index 3387c9d3e7..8c7b841529 100644
--- a/tests/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/TestDatabaseSettings.cs
@@ -1,29 +1,27 @@
+namespace Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+public class TestDatabaseSettings
 {
-    public class TestDatabaseSettings
+    public enum TestDatabaseType
     {
-        public TestDatabaseType DatabaseType { get; set; }
-
-        public int PrepareThreadCount { get; set; }
-
-        public int SchemaDatabaseCount { get; set; }
-
-        public int EmptyDatabasesCount { get; set; }
-
-        public string FilesPath { get; set; }
-
-        /// <remarks>
-        /// Only used for SQL Server e.g. on Linux/MacOS (not required for localdb).
-        /// </remarks>
-        public string SQLServerMasterConnectionString { get; set; }
-
-        public enum TestDatabaseType
-        {
-            Unknown,
-            Sqlite,
-            SqlServer,
-            LocalDb
-        }
+        Unknown,
+        Sqlite,
+        SqlServer,
+        LocalDb
     }
+
+    public TestDatabaseType DatabaseType { get; set; }
+
+    public int PrepareThreadCount { get; set; }
+
+    public int SchemaDatabaseCount { get; set; }
+
+    public int EmptyDatabasesCount { get; set; }
+
+    public string FilesPath { get; set; }
+
+    /// <remarks>
+    ///     Only used for SQL Server e.g. on Linux/MacOS (not required for localdb).
+    /// </remarks>
+    public string SQLServerMasterConnectionString { get; set; }
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs b/tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs
index d4395b4461..68222ccb4f 100644
--- a/tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/TestDbMeta.cs
@@ -4,47 +4,42 @@
 using System.Data.Common;
 using System.Text.RegularExpressions;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Persistence.SqlServer;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+public class TestDbMeta
 {
-    public class TestDbMeta
+    public TestDbMeta(string name, bool isEmpty, string connectionString, string providerName, string path)
     {
-        public string Name { get; }
-        public bool IsEmpty { get; }
-        public string ConnectionString { get; set; }
-        public string Provider { get; set; }
-        public string Path { get; set; } // Null if not embedded.
-        public DbConnection Connection { get; set; } // for SQLite in memory, can move to subclass later.
+        IsEmpty = isEmpty;
+        Name = name;
+        ConnectionString = connectionString;
+        Provider = providerName;
+        Path = path;
+    }
 
-        public TestDbMeta(string name, bool isEmpty, string connectionString, string providerName, string path)
-        {
-            IsEmpty = isEmpty;
-            Name = name;
-            ConnectionString = connectionString;
-            Provider = providerName;
-            Path = path;
-        }
+    public string Name { get; }
+    public bool IsEmpty { get; }
+    public string ConnectionString { get; set; }
+    public string Provider { get; set; }
+    public string Path { get; set; } // Null if not embedded.
+    public DbConnection Connection { get; set; } // for SQLite in memory, can move to subclass later.
 
-        private static string ConstructConnectionString(string masterConnectionString, string databaseName)
-        {
-            string prefix = Regex.Replace(masterConnectionString, "Database=.+?;", string.Empty);
-            string connectionString = $"{prefix};Database={databaseName};";
-            return connectionString.Replace(";;", ";");
-        }
+    private static string ConstructConnectionString(string masterConnectionString, string databaseName)
+    {
+        var prefix = Regex.Replace(masterConnectionString, "Database=.+?;", string.Empty);
+        var connectionString = $"{prefix};Database={databaseName};";
+        return connectionString.Replace(";;", ";");
+    }
 
         public static TestDbMeta CreateWithMasterConnectionString(string name, bool isEmpty, string masterConnectionString) =>
             new TestDbMeta(name, isEmpty, ConstructConnectionString(masterConnectionString, name), Persistence.SqlServer.Constants.ProviderName, null);
 
-        // LocalDb mdf funtimes
-        public static TestDbMeta CreateWithoutConnectionString(string name, bool isEmpty) =>
-            new TestDbMeta(name, isEmpty, null, Persistence.SqlServer.Constants.ProviderName, null);
+    // LocalDb mdf funtimes
+    public static TestDbMeta CreateWithoutConnectionString(string name, bool isEmpty) =>
+        new(name, isEmpty, null, Constants.ProviderName, null);
 
-        public ConnectionStrings ToStronglyTypedConnectionString() =>
-            new ConnectionStrings
-            {
-                Name = Name,
-                ConnectionString = ConnectionString,
-                ProviderName = Provider
-            };
-    }
+    public ConnectionStrings ToStronglyTypedConnectionString() =>
+        new() { Name = Name, ConnectionString = ConnectionString, ProviderName = Provider };
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs b/tests/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs
index a844e83610..f2f1fe7c70 100644
--- a/tests/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/TestUmbracoDatabaseFactoryProvider.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -9,49 +8,48 @@ using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+/// <summary>
+///     I want to be able to create a database for integration testsing without setting the connection string on the
+///     singleton database factory forever.
+/// </summary>
+public class TestUmbracoDatabaseFactoryProvider
 {
-    /// <summary>
-    /// I want to be able to create a database for integration testsing without setting the connection string on the
-    /// singleton database factory forever.
-    /// </summary>
-    public class TestUmbracoDatabaseFactoryProvider
+    private readonly IOptionsMonitor<ConnectionStrings> _connectionStrings;
+    private readonly DatabaseSchemaCreatorFactory _databaseSchemaCreatorFactory;
+    private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
+    private readonly IOptions<GlobalSettings> _globalSettings;
+    private readonly ILoggerFactory _loggerFactory;
+    private readonly IMapperCollection _mappers;
+    private readonly NPocoMapperCollection _npocoMappers;
+
+    public TestUmbracoDatabaseFactoryProvider(
+        ILoggerFactory loggerFactory,
+        IOptions<GlobalSettings> globalSettings,
+        IOptionsMonitor<ConnectionStrings> connectionStrings,
+        IMapperCollection mappers,
+        IDbProviderFactoryCreator dbProviderFactoryCreator,
+        DatabaseSchemaCreatorFactory databaseSchemaCreatorFactory,
+        NPocoMapperCollection npocoMappers)
     {
-        private readonly ILoggerFactory _loggerFactory;
-        private readonly IOptions<GlobalSettings> _globalSettings;
-        private readonly IOptionsMonitor<ConnectionStrings> _connectionStrings;
-        private readonly IMapperCollection _mappers;
-        private readonly IDbProviderFactoryCreator _dbProviderFactoryCreator;
-        private readonly DatabaseSchemaCreatorFactory _databaseSchemaCreatorFactory;
-        private readonly NPocoMapperCollection _npocoMappers;
-
-        public TestUmbracoDatabaseFactoryProvider(
-            ILoggerFactory loggerFactory,
-            IOptions<GlobalSettings> globalSettings,
-            IOptionsMonitor<ConnectionStrings> connectionStrings,
-            IMapperCollection mappers,
-            IDbProviderFactoryCreator dbProviderFactoryCreator,
-            DatabaseSchemaCreatorFactory databaseSchemaCreatorFactory,
-            NPocoMapperCollection npocoMappers)
-        {
-            _loggerFactory = loggerFactory;
-            _globalSettings = globalSettings;
-            _connectionStrings = connectionStrings;
-            _mappers = mappers;
-            _dbProviderFactoryCreator = dbProviderFactoryCreator;
-            _databaseSchemaCreatorFactory = databaseSchemaCreatorFactory;
-            _npocoMappers = npocoMappers;
-        }
-
-        public IUmbracoDatabaseFactory Create()
-            => new UmbracoDatabaseFactory(
-                _loggerFactory.CreateLogger<UmbracoDatabaseFactory>(),
-                _loggerFactory,
-                _globalSettings,
-                _connectionStrings,
-                _mappers,
-                _dbProviderFactoryCreator,
-                _databaseSchemaCreatorFactory,
-                _npocoMappers);
+        _loggerFactory = loggerFactory;
+        _globalSettings = globalSettings;
+        _connectionStrings = connectionStrings;
+        _mappers = mappers;
+        _dbProviderFactoryCreator = dbProviderFactoryCreator;
+        _databaseSchemaCreatorFactory = databaseSchemaCreatorFactory;
+        _npocoMappers = npocoMappers;
     }
+
+    public IUmbracoDatabaseFactory Create()
+        => new UmbracoDatabaseFactory(
+            _loggerFactory.CreateLogger<UmbracoDatabaseFactory>(),
+            _loggerFactory,
+            _globalSettings,
+            _connectionStrings,
+            _mappers,
+            _dbProviderFactoryCreator,
+            _databaseSchemaCreatorFactory,
+            _npocoMappers);
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
index ee371873c0..2dc76704c1 100644
--- a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTest.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -7,13 +6,10 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Web;
@@ -27,175 +23,174 @@ using Umbraco.Cms.Tests.Integration.DependencyInjection;
 using Umbraco.Cms.Tests.Integration.Extensions;
 using Umbraco.Cms.Web.Common.Hosting;
 using Umbraco.Extensions;
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
+using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+/// <summary>
+///     Abstract class for integration tests
+/// </summary>
+/// <remarks>
+///     This will use a Host Builder to boot and install Umbraco ready for use
+/// </remarks>
+public abstract class UmbracoIntegrationTest : UmbracoIntegrationTestBase
 {
+    private IHost _host;
+
+    protected IServiceProvider Services => _host.Services;
+
     /// <summary>
-    /// Abstract class for integration tests
+    ///     Gets the <see cref="IScopeProvider" />
+    /// </summary>
+    protected IScopeProvider ScopeProvider => Services.GetRequiredService<IScopeProvider>();
+
+    /// <summary>
+    ///     Gets the <see cref="IScopeAccessor" />
+    /// </summary>
+    protected IScopeAccessor ScopeAccessor => Services.GetRequiredService<IScopeAccessor>();
+
+    /// <summary>
+    ///     Gets the <see cref="ILoggerFactory" />
+    /// </summary>
+    protected ILoggerFactory LoggerFactory => Services.GetRequiredService<ILoggerFactory>();
+
+    protected AppCaches AppCaches => Services.GetRequiredService<AppCaches>();
+
+    protected IIOHelper IOHelper => Services.GetRequiredService<IIOHelper>();
+
+    protected IShortStringHelper ShortStringHelper => Services.GetRequiredService<IShortStringHelper>();
+
+    protected GlobalSettings GlobalSettings => Services.GetRequiredService<IOptions<GlobalSettings>>().Value;
+
+    protected IMapperCollection Mappers => Services.GetRequiredService<IMapperCollection>();
+
+    protected UserBuilder UserBuilderInstance { get; } = new();
+
+    protected UserGroupBuilder UserGroupBuilderInstance { get; } = new();
+
+    [SetUp]
+    public void Setup()
+    {
+        InMemoryConfiguration[Constants.Configuration.ConfigUnattended + ":" + nameof(UnattendedSettings.InstallUnattended)] = "true";
+        var hostBuilder = CreateHostBuilder();
+
+        _host = hostBuilder.Build();
+        UseTestDatabase(_host.Services);
+        _host.Start();
+
+        if (TestOptions.Boot)
+        {
+            Services.GetRequiredService<IUmbracoContextFactory>().EnsureUmbracoContext();
+        }
+    }
+
+    [TearDown]
+    public void TearDownAsync() => _host.StopAsync();
+
+    /// <summary>
+    ///     Create the Generic Host and execute startup ConfigureServices/Configure calls
+    /// </summary>
+    private IHostBuilder CreateHostBuilder()
+    {
+        var hostBuilder = Host.CreateDefaultBuilder()
+            .ConfigureUmbracoDefaults()
+
+            // IMPORTANT: We Cannot use UseStartup, there's all sorts of threads about this with testing. Although this can work
+            // if you want to setup your tests this way, it is a bit annoying to do that as the WebApplicationFactory will
+            // create separate Host instances. So instead of UseStartup, we just call ConfigureServices/Configure ourselves,
+            // and in the case of the UmbracoTestServerTestBase it will use the ConfigureWebHost to Configure the IApplicationBuilder directly.
+            .ConfigureAppConfiguration((context, configBuilder) =>
+            {
+                context.HostingEnvironment = TestHelper.GetWebHostEnvironment();
+                configBuilder.Sources.Clear();
+                configBuilder.AddInMemoryCollection(InMemoryConfiguration);
+                configBuilder.AddConfiguration(GlobalSetupTeardown.TestConfiguration);
+
+                Configuration = configBuilder.Build();
+            })
+            .ConfigureServices((_, services) =>
+            {
+                ConfigureServices(services);
+                ConfigureTestServices(services);
+                services.AddUnique(CreateLoggerFactory());
+
+                if (!TestOptions.Boot)
+                {
+                    // If boot is false, we don't want the CoreRuntime hosted service to start
+                    // So we replace it with a Mock
+                    services.AddUnique(Mock.Of<IRuntime>());
+                }
+            });
+
+        return hostBuilder;
+    }
+
+    protected void ConfigureServices(IServiceCollection services)
+    {
+        services.AddTransient<TestUmbracoDatabaseFactoryProvider>();
+        var webHostEnvironment = TestHelper.GetWebHostEnvironment();
+        services.AddRequiredNetCoreServices(TestHelper, webHostEnvironment);
+
+        // We register this service because we need it for IRuntimeState, if we don't this breaks 900 tests
+        services.AddSingleton<IConflictingRouteService, TestConflictingRouteService>();
+
+        services.AddLogger(webHostEnvironment, Configuration);
+
+        // Add it!
+        var hostingEnvironment = TestHelper.GetHostingEnvironment();
+        var typeLoader = services.AddTypeLoader(
+            GetType().Assembly,
+            hostingEnvironment,
+            TestHelper.ConsoleLoggerFactory,
+            AppCaches.NoCache,
+            Configuration,
+            TestHelper.Profiler);
+        var builder = new UmbracoBuilder(services, Configuration, typeLoader, TestHelper.ConsoleLoggerFactory, TestHelper.Profiler, AppCaches.NoCache, hostingEnvironment);
+
+        builder.AddConfiguration()
+            .AddUmbracoCore()
+            .AddWebComponents()
+            .AddRuntimeMinifier()
+            .AddBackOfficeAuthentication()
+            .AddBackOfficeIdentity()
+            .AddMembersIdentity()
+            .AddExamine()
+            .AddUmbracoSqlServerSupport()
+            .AddUmbracoSqliteSupport()
+            .AddTestServices(TestHelper);
+
+        if (TestOptions.Mapper)
+        {
+            // TODO: Should these just be called from within AddUmbracoCore/AddWebComponents?
+            builder
+                .AddCoreMappingProfiles()
+                .AddWebMappingProfiles();
+        }
+
+        services.AddSignalR();
+        services.AddMvc();
+
+        CustomTestSetup(builder);
+
+        builder.Build();
+    }
+
+    /// <summary>
+    ///     Hook for altering UmbracoBuilder setup
     /// </summary>
     /// <remarks>
-    /// This will use a Host Builder to boot and install Umbraco ready for use
+    ///     Can also be used for registering test doubles.
     /// </remarks>
-    public abstract class UmbracoIntegrationTest : UmbracoIntegrationTestBase
+    protected virtual void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private IHost _host;
-
-        protected IServiceProvider Services => _host.Services;
-
-        [SetUp]
-        public void Setup()
-        {
-            InMemoryConfiguration[Core.Constants.Configuration.ConfigUnattended + ":" + nameof(UnattendedSettings.InstallUnattended)] = "true";
-            IHostBuilder hostBuilder = CreateHostBuilder();
-
-            _host = hostBuilder.Build();
-            UseTestDatabase(_host.Services);
-            _host.Start();
-
-            if (TestOptions.Boot)
-            {
-                Services.GetRequiredService<IUmbracoContextFactory>().EnsureUmbracoContext();
-            }
-        }
-
-        [TearDown]
-        public void TearDownAsync() => _host.StopAsync();
-
-        /// <summary>
-        /// Create the Generic Host and execute startup ConfigureServices/Configure calls
-        /// </summary>
-        private IHostBuilder CreateHostBuilder()
-        {
-            IHostBuilder hostBuilder = Host.CreateDefaultBuilder()
-                .ConfigureUmbracoDefaults()
-
-                // IMPORTANT: We Cannot use UseStartup, there's all sorts of threads about this with testing. Although this can work
-                // if you want to setup your tests this way, it is a bit annoying to do that as the WebApplicationFactory will
-                // create separate Host instances. So instead of UseStartup, we just call ConfigureServices/Configure ourselves,
-                // and in the case of the UmbracoTestServerTestBase it will use the ConfigureWebHost to Configure the IApplicationBuilder directly.
-                .ConfigureAppConfiguration((context, configBuilder) =>
-                {
-                    context.HostingEnvironment = TestHelper.GetWebHostEnvironment();
-                    configBuilder.Sources.Clear();
-                    configBuilder.AddInMemoryCollection(InMemoryConfiguration);
-                    configBuilder.AddConfiguration(GlobalSetupTeardown.TestConfiguration);
-
-                    Configuration = configBuilder.Build();
-                })
-                .ConfigureServices((_, services) =>
-                {
-                    ConfigureServices(services);
-                    ConfigureTestServices(services);
-                    services.AddUnique(CreateLoggerFactory());
-
-                    if (!TestOptions.Boot)
-                    {
-                        // If boot is false, we don't want the CoreRuntime hosted service to start
-                        // So we replace it with a Mock
-                        services.AddUnique(Mock.Of<IRuntime>());
-                    }
-                });
-
-            return hostBuilder;
-        }
-
-        protected void ConfigureServices(IServiceCollection services)
-        {
-            services.AddTransient<TestUmbracoDatabaseFactoryProvider>();
-            IWebHostEnvironment webHostEnvironment = TestHelper.GetWebHostEnvironment();
-            services.AddRequiredNetCoreServices(TestHelper, webHostEnvironment);
-
-            // We register this service because we need it for IRuntimeState, if we don't this breaks 900 tests
-            services.AddSingleton<IConflictingRouteService, TestConflictingRouteService>();
-
-            services.AddLogger(webHostEnvironment, Configuration);
-
-            // Add it!
-            Core.Hosting.IHostingEnvironment hostingEnvironment = TestHelper.GetHostingEnvironment();
-            TypeLoader typeLoader = services.AddTypeLoader(
-                GetType().Assembly,
-                hostingEnvironment,
-                TestHelper.ConsoleLoggerFactory,
-                AppCaches.NoCache,
-                Configuration,
-                TestHelper.Profiler);
-            var builder = new UmbracoBuilder(services, Configuration, typeLoader, TestHelper.ConsoleLoggerFactory, TestHelper.Profiler, AppCaches.NoCache, hostingEnvironment);
-
-            builder.AddConfiguration()
-                .AddUmbracoCore()
-                .AddWebComponents()
-                .AddRuntimeMinifier()
-                .AddBackOfficeAuthentication()
-                .AddBackOfficeIdentity()
-                .AddMembersIdentity()
-                .AddExamine()
-                .AddUmbracoSqlServerSupport()
-                .AddUmbracoSqliteSupport()
-                .AddTestServices(TestHelper);
-
-            if (TestOptions.Mapper)
-            {
-                // TODO: Should these just be called from within AddUmbracoCore/AddWebComponents?
-                builder
-                    .AddCoreMappingProfiles()
-                    .AddWebMappingProfiles();
-            }
-
-            services.AddSignalR();
-            services.AddMvc();
-
-            CustomTestSetup(builder);
-
-            builder.Build();
-        }
-
-        /// <summary>
-        ///  Hook for altering UmbracoBuilder setup
-        /// </summary>
-        /// <remarks>
-        /// Can also be used for registering test doubles.
-        /// </remarks>
-        protected virtual void CustomTestSetup(IUmbracoBuilder builder)
-        {
-        }
-
-        /// <summary>
-        ///  Hook for registering test doubles.
-        /// </summary>
-        protected virtual void ConfigureTestServices(IServiceCollection services)
-        {
-        }
-
-        protected virtual T GetRequiredService<T>() => Services.GetRequiredService<T>();
-
-        /// <summary>
-        /// Gets the <see cref="IScopeProvider"/>
-        /// </summary>
-        protected IScopeProvider ScopeProvider => Services.GetRequiredService<IScopeProvider>();
-
-        /// <summary>
-        /// Gets the <see cref="IScopeAccessor"/>
-        /// </summary>
-        protected IScopeAccessor ScopeAccessor => Services.GetRequiredService<IScopeAccessor>();
-
-        /// <summary>
-        /// Gets the <see cref="ILoggerFactory"/>
-        /// </summary>
-        protected ILoggerFactory LoggerFactory => Services.GetRequiredService<ILoggerFactory>();
-
-        protected AppCaches AppCaches => Services.GetRequiredService<AppCaches>();
-
-        protected IIOHelper IOHelper => Services.GetRequiredService<IIOHelper>();
-
-        protected IShortStringHelper ShortStringHelper => Services.GetRequiredService<IShortStringHelper>();
-
-        protected GlobalSettings GlobalSettings => Services.GetRequiredService<IOptions<GlobalSettings>>().Value;
-
-        protected IMapperCollection Mappers => Services.GetRequiredService<IMapperCollection>();
-
-        protected UserBuilder UserBuilderInstance { get; } = new ();
-
-        protected UserGroupBuilder UserGroupBuilderInstance { get; } = new ();
     }
+
+    /// <summary>
+    ///     Hook for registering test doubles.
+    /// </summary>
+    protected virtual void ConfigureTestServices(IServiceCollection services)
+    {
+    }
+
+    protected virtual T GetRequiredService<T>() => Services.GetRequiredService<T>();
 }
diff --git a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestBase.cs b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestBase.cs
index 0b4082e425..4f5623b7b0 100644
--- a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestBase.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestBase.cs
@@ -1,14 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
 using System.IO;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Logging.Console;
 using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Serilog;
@@ -22,29 +19,29 @@ using Umbraco.Cms.Tests.Integration.Implementations;
 namespace Umbraco.Cms.Tests.Integration.Testing;
 
 /// <summary>
-/// Base class for all UmbracoIntegrationTests
+///     Base class for all UmbracoIntegrationTests
 /// </summary>
 [SingleThreaded]
 [NonParallelizable]
 public abstract class UmbracoIntegrationTestBase
 {
-    private static readonly object s_dbLocker = new ();
+    private static readonly object s_dbLocker = new();
     private static ITestDatabase s_dbInstance;
     private static TestDbMeta s_fixtureDbMeta;
     private static int s_testCount = 1;
+    private readonly List<Action> _fixtureTeardown = new();
+    private readonly Queue<Action> _testTeardown = new();
 
     private bool _firstTestInFixture = true;
-    private readonly Queue<Action> _testTeardown = new ();
-    private readonly List<Action> _fixtureTeardown = new ();
 
-    protected Dictionary<string, string> InMemoryConfiguration { get; } = new ();
+    protected Dictionary<string, string> InMemoryConfiguration { get; } = new();
 
     protected IConfiguration Configuration { get; set; }
 
     protected UmbracoTestAttribute TestOptions =>
         TestOptionAttributeBase.GetTestOptions<UmbracoTestAttribute>();
 
-    protected TestHelper TestHelper { get; } = new ();
+    protected TestHelper TestHelper { get; } = new();
 
     private void AddOnTestTearDown(Action tearDown) => _testTeardown.Enqueue(tearDown);
 
@@ -61,7 +58,7 @@ public abstract class UmbracoIntegrationTestBase
     [OneTimeTearDown]
     public void FixtureTearDown()
     {
-        foreach (Action a in _fixtureTeardown)
+        foreach (var a in _fixtureTeardown)
         {
             a();
         }
@@ -72,7 +69,7 @@ public abstract class UmbracoIntegrationTestBase
     {
         _firstTestInFixture = false;
 
-        while (_testTeardown.TryDequeue(out Action a))
+        while (_testTeardown.TryDequeue(out var a))
         {
             a();
         }
@@ -120,11 +117,11 @@ public abstract class UmbracoIntegrationTestBase
 
     protected void UseTestDatabase(IServiceProvider serviceProvider)
     {
-        IRuntimeState state = serviceProvider.GetRequiredService<IRuntimeState>();
-        TestUmbracoDatabaseFactoryProvider testDatabaseFactoryProvider = serviceProvider.GetRequiredService<TestUmbracoDatabaseFactoryProvider>();
-        IUmbracoDatabaseFactory databaseFactory = serviceProvider.GetRequiredService<IUmbracoDatabaseFactory>();
-        ILoggerFactory loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
-        IOptionsMonitor<ConnectionStrings> connectionStrings = serviceProvider.GetRequiredService<IOptionsMonitor<ConnectionStrings>>();
+        var state = serviceProvider.GetRequiredService<IRuntimeState>();
+        var testDatabaseFactoryProvider = serviceProvider.GetRequiredService<TestUmbracoDatabaseFactoryProvider>();
+        var databaseFactory = serviceProvider.GetRequiredService<IUmbracoDatabaseFactory>();
+        var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+        var connectionStrings = serviceProvider.GetRequiredService<IOptionsMonitor<ConnectionStrings>>();
 
         // This will create a db, install the schema and ensure the app is configured to run
         SetupTestDatabase(testDatabaseFactoryProvider, connectionStrings, databaseFactory, loggerFactory, state);
@@ -146,87 +143,86 @@ public abstract class UmbracoIntegrationTestBase
     }
 
     private void SetupTestDatabase(
-            TestUmbracoDatabaseFactoryProvider testUmbracoDatabaseFactoryProvider,
-            IOptionsMonitor<ConnectionStrings> connectionStrings,
-            IUmbracoDatabaseFactory databaseFactory,
-            ILoggerFactory loggerFactory,
-            IRuntimeState runtimeState)
+        TestUmbracoDatabaseFactoryProvider testUmbracoDatabaseFactoryProvider,
+        IOptionsMonitor<ConnectionStrings> connectionStrings,
+        IUmbracoDatabaseFactory databaseFactory,
+        ILoggerFactory loggerFactory,
+        IRuntimeState runtimeState)
+    {
+        if (TestOptions.Database == UmbracoTestOptions.Database.None)
         {
-            if (TestOptions.Database == UmbracoTestOptions.Database.None)
-            {
-                return;
-            }
-
-            ITestDatabase db = GetOrCreateDatabase(loggerFactory, testUmbracoDatabaseFactoryProvider);
-
-            switch (TestOptions.Database)
-            {
-                case UmbracoTestOptions.Database.NewSchemaPerTest:
-
-                    // New DB + Schema
-                    TestDbMeta newSchemaDbMeta = db.AttachSchema();
-
-                    // Add teardown callback
-                    AddOnTestTearDown(() => db.Detach(newSchemaDbMeta));
-
-                    ConfigureTestDatabaseFactory(newSchemaDbMeta, databaseFactory, runtimeState, connectionStrings);
-
-                    Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
-
-                    break;
-                case UmbracoTestOptions.Database.NewEmptyPerTest:
-                    TestDbMeta newEmptyDbMeta = db.AttachEmpty();
-
-                    // Add teardown callback
-                    AddOnTestTearDown(() => db.Detach(newEmptyDbMeta));
-
-                    ConfigureTestDatabaseFactory(newEmptyDbMeta, databaseFactory, runtimeState, connectionStrings);
-
-                    Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
-
-                    break;
-                case UmbracoTestOptions.Database.NewSchemaPerFixture:
-                    // Only attach schema once per fixture
-                    // Doing it more than once will block the process since the old db hasn't been detached
-                    // and it would be the same as NewSchemaPerTest even if it didn't block
-                    if (_firstTestInFixture)
-                    {
-                        // New DB + Schema
-                        TestDbMeta newSchemaFixtureDbMeta = db.AttachSchema();
-                        s_fixtureDbMeta = newSchemaFixtureDbMeta;
-
-                        // Add teardown callback
-                        AddOnFixtureTearDown(() => db.Detach(newSchemaFixtureDbMeta));
-                    }
-
-                    ConfigureTestDatabaseFactory(s_fixtureDbMeta, databaseFactory, runtimeState, connectionStrings);
-
-                    break;
-                case UmbracoTestOptions.Database.NewEmptyPerFixture:
-                    // Only attach schema once per fixture
-                    // Doing it more than once will block the process since the old db hasn't been detached
-                    // and it would be the same as NewSchemaPerTest even if it didn't block
-                    if (_firstTestInFixture)
-                    {
-                        // New DB + Schema
-                        TestDbMeta newEmptyFixtureDbMeta = db.AttachEmpty();
-                        s_fixtureDbMeta = newEmptyFixtureDbMeta;
-
-                        // Add teardown callback
-                        AddOnFixtureTearDown(() => db.Detach(newEmptyFixtureDbMeta));
-                    }
-
-                    ConfigureTestDatabaseFactory(s_fixtureDbMeta, databaseFactory, runtimeState, connectionStrings);
-
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(TestOptions), TestOptions, null);
-            }
+            return;
         }
 
+        var db = GetOrCreateDatabase(loggerFactory, testUmbracoDatabaseFactoryProvider);
 
-    private ITestDatabase GetOrCreateDatabase(ILoggerFactory loggerFactory,
-        TestUmbracoDatabaseFactoryProvider dbFactory)
+        switch (TestOptions.Database)
+        {
+            case UmbracoTestOptions.Database.NewSchemaPerTest:
+
+                // New DB + Schema
+                var newSchemaDbMeta = db.AttachSchema();
+
+                // Add teardown callback
+                AddOnTestTearDown(() => db.Detach(newSchemaDbMeta));
+
+                ConfigureTestDatabaseFactory(newSchemaDbMeta, databaseFactory, runtimeState, connectionStrings);
+
+                Assert.AreEqual(RuntimeLevel.Run, runtimeState.Level);
+
+                break;
+            case UmbracoTestOptions.Database.NewEmptyPerTest:
+                var newEmptyDbMeta = db.AttachEmpty();
+
+                // Add teardown callback
+                AddOnTestTearDown(() => db.Detach(newEmptyDbMeta));
+
+                ConfigureTestDatabaseFactory(newEmptyDbMeta, databaseFactory, runtimeState, connectionStrings);
+
+                Assert.AreEqual(RuntimeLevel.Install, runtimeState.Level);
+
+                break;
+            case UmbracoTestOptions.Database.NewSchemaPerFixture:
+                // Only attach schema once per fixture
+                // Doing it more than once will block the process since the old db hasn't been detached
+                // and it would be the same as NewSchemaPerTest even if it didn't block
+                if (_firstTestInFixture)
+                {
+                    // New DB + Schema
+                    var newSchemaFixtureDbMeta = db.AttachSchema();
+                    s_fixtureDbMeta = newSchemaFixtureDbMeta;
+
+                    // Add teardown callback
+                    AddOnFixtureTearDown(() => db.Detach(newSchemaFixtureDbMeta));
+                }
+
+                ConfigureTestDatabaseFactory(s_fixtureDbMeta, databaseFactory, runtimeState, connectionStrings);
+
+                break;
+            case UmbracoTestOptions.Database.NewEmptyPerFixture:
+                // Only attach schema once per fixture
+                // Doing it more than once will block the process since the old db hasn't been detached
+                // and it would be the same as NewSchemaPerTest even if it didn't block
+                if (_firstTestInFixture)
+                {
+                    // New DB + Schema
+                    var newEmptyFixtureDbMeta = db.AttachEmpty();
+                    s_fixtureDbMeta = newEmptyFixtureDbMeta;
+
+                    // Add teardown callback
+                    AddOnFixtureTearDown(() => db.Detach(newEmptyFixtureDbMeta));
+                }
+
+                ConfigureTestDatabaseFactory(s_fixtureDbMeta, databaseFactory, runtimeState, connectionStrings);
+
+                break;
+            default:
+                throw new ArgumentOutOfRangeException(nameof(TestOptions), TestOptions, null);
+        }
+    }
+
+
+    private ITestDatabase GetOrCreateDatabase(ILoggerFactory loggerFactory, TestUmbracoDatabaseFactoryProvider dbFactory)
     {
         lock (s_dbLocker)
         {
@@ -238,11 +234,13 @@ public abstract class UmbracoIntegrationTestBase
             var settings = new TestDatabaseSettings
             {
                 FilesPath = Path.Combine(TestHelper.WorkingDirectory, "databases"),
-                DatabaseType = Configuration.GetValue<TestDatabaseSettings.TestDatabaseType>("Tests:Database:DatabaseType"),
+                DatabaseType =
+                    Configuration.GetValue<TestDatabaseSettings.TestDatabaseType>("Tests:Database:DatabaseType"),
                 PrepareThreadCount = Configuration.GetValue<int>("Tests:Database:PrepareThreadCount"),
                 EmptyDatabasesCount = Configuration.GetValue<int>("Tests:Database:EmptyDatabasesCount"),
                 SchemaDatabaseCount = Configuration.GetValue<int>("Tests:Database:SchemaDatabaseCount"),
-                SQLServerMasterConnectionString = Configuration.GetValue<string>("Tests:Database:SQLServerMasterConnectionString"),
+                SQLServerMasterConnectionString =
+                    Configuration.GetValue<string>("Tests:Database:SQLServerMasterConnectionString")
             };
 
             Directory.CreateDirectory(settings.FilesPath);
diff --git a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs
index d04d3a7298..274f93125c 100644
--- a/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs
+++ b/tests/Umbraco.Tests.Integration/Testing/UmbracoIntegrationTestWithContent.cs
@@ -5,66 +5,65 @@ using System;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
 
-namespace Umbraco.Cms.Tests.Integration.Testing
+namespace Umbraco.Cms.Tests.Integration.Testing;
+
+public abstract class UmbracoIntegrationTestWithContent : UmbracoIntegrationTest
 {
-    public abstract class UmbracoIntegrationTestWithContent : UmbracoIntegrationTest
+    protected IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    protected IFileService FileService => GetRequiredService<IFileService>();
+
+    protected ContentService ContentService => (ContentService)GetRequiredService<IContentService>();
+
+    protected Content Trashed { get; private set; }
+
+    protected Content Subpage2 { get; private set; }
+    protected Content Subpage3 { get; private set; }
+
+    protected Content Subpage { get; private set; }
+
+    protected Content Textpage { get; private set; }
+
+    protected ContentType ContentType { get; private set; }
+
+    [SetUp]
+    public void Setup() => CreateTestData();
+
+    public virtual void CreateTestData()
     {
-        protected IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        // NOTE Maybe not the best way to create/save test data as we are using the services, which are being tested.
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        protected IFileService FileService => GetRequiredService<IFileService>();
+        // Create and Save ContentType "umbTextpage" -> 1051 (template), 1052 (content type)
+        ContentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        ContentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
+        ContentTypeService.Save(ContentType);
 
-        protected ContentService ContentService => (ContentService)GetRequiredService<IContentService>();
+        // Create and Save Content "Homepage" based on "umbTextpage" -> 1053
+        Textpage = ContentBuilder.CreateSimpleContent(ContentType);
+        Textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0");
+        ContentService.Save(Textpage, 0);
 
-        [SetUp]
-        public void Setup() => CreateTestData();
+        // Create and Save Content "Text Page 1" based on "umbTextpage" -> 1054
+        Subpage = ContentBuilder.CreateSimpleContent(ContentType, "Text Page 1", Textpage.Id);
+        var contentSchedule = ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddMinutes(-5), null);
+        ContentService.Save(Subpage, 0, contentSchedule);
 
-        public virtual void CreateTestData()
-        {
-            // NOTE Maybe not the best way to create/save test data as we are using the services, which are being tested.
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            // Create and Save ContentType "umbTextpage" -> 1051 (template), 1052 (content type)
-            ContentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            ContentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
-            ContentTypeService.Save(ContentType);
-
-            // Create and Save Content "Homepage" based on "umbTextpage" -> 1053
-            Textpage = ContentBuilder.CreateSimpleContent(ContentType);
-            Textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0");
-            ContentService.Save(Textpage, 0);
-
-            // Create and Save Content "Text Page 1" based on "umbTextpage" -> 1054
-            Subpage = ContentBuilder.CreateSimpleContent(ContentType, "Text Page 1", Textpage.Id);
-            var contentSchedule = ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddMinutes(-5), null);
-            ContentService.Save(Subpage, 0, contentSchedule);
-
-            // Create and Save Content "Text Page 1" based on "umbTextpage" -> 1055
-            Subpage2 = ContentBuilder.CreateSimpleContent(ContentType, "Text Page 2", Textpage.Id);
-            ContentService.Save(Subpage2, 0);
+        // Create and Save Content "Text Page 1" based on "umbTextpage" -> 1055
+        Subpage2 = ContentBuilder.CreateSimpleContent(ContentType, "Text Page 2", Textpage.Id);
+        ContentService.Save(Subpage2, 0);
 
 
-            Subpage3 = ContentBuilder.CreateSimpleContent(ContentType, "Text Page 3", Textpage.Id);
-            ContentService.Save(Subpage3, 0);
+        Subpage3 = ContentBuilder.CreateSimpleContent(ContentType, "Text Page 3", Textpage.Id);
+        ContentService.Save(Subpage3, 0);
 
-            // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1056
-            Trashed = ContentBuilder.CreateSimpleContent(ContentType, "Text Page Deleted", -20);
-            Trashed.Trashed = true;
-            ContentService.Save(Trashed, 0);
-        }
-
-        protected Content Trashed { get; private set; }
-
-        protected Content Subpage2 { get; private set; }
-        protected Content Subpage3 { get; private set; }
-
-        protected Content Subpage { get; private set; }
-
-        protected Content Textpage { get; private set; }
-
-        protected ContentType ContentType { get; private set; }
+        // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1056
+        Trashed = ContentBuilder.CreateSimpleContent(ContentType, "Text Page Deleted", -20);
+        Trashed.Trashed = true;
+        ContentService.Save(Trashed, 0);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs
index 4f7db59791..70951d98c2 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Events/EventAggregatorTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
@@ -9,62 +8,62 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Tests.Integration.TestServerTest;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Events
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Events;
+
+[TestFixture]
+public class EventAggregatorTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class EventAggregatorTests : UmbracoTestServerTestBase
+    protected override void ConfigureTestServices(IServiceCollection services)
     {
-        protected override void ConfigureTestServices(IServiceCollection services)
-        {
-            services.AddScoped<EventAggregatorTestScopedService>();
-            services.AddTransient<INotificationHandler<EventAggregatorTestNotification>, EventAggregatorTestNotificationHandler>();
-        }
-
-        [Test]
-        public async Task Publish_HandlerWithScopedDependency_DoesNotThrow()
-        {
-            HttpResponseMessage result = await Client.GetAsync("/test-handler-with-scoped-services");
-            Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
-        }
+        services.AddScoped<EventAggregatorTestScopedService>();
+        services.AddTransient<INotificationHandler<EventAggregatorTestNotification>, EventAggregatorTestNotificationHandler>();
     }
 
-    public class EventAggregatorTestsController : Controller
+    [Test]
+    public async Task Publish_HandlerWithScopedDependency_DoesNotThrow()
     {
-        private readonly IEventAggregator _eventAggregator;
-
-        public EventAggregatorTestsController(IEventAggregator eventAggregator) => _eventAggregator = eventAggregator;
-
-        [HttpGet("test-handler-with-scoped-services")]
-        public async Task<IActionResult> Test()
-        {
-            var notification = new EventAggregatorTestNotification();
-            await _eventAggregator.PublishAsync(notification);
-
-            if (!notification.Mutated)
-            {
-                throw new ApplicationException("Doesn't work");
-            }
-
-            return Ok();
-        }
-    }
-
-    public class EventAggregatorTestScopedService
-    {
-    }
-
-    public class EventAggregatorTestNotification : INotification
-    {
-        public bool Mutated { get; set; }
-    }
-
-    public class EventAggregatorTestNotificationHandler : INotificationHandler<EventAggregatorTestNotification>
-    {
-        private readonly EventAggregatorTestScopedService _scopedService;
-
-        public EventAggregatorTestNotificationHandler(EventAggregatorTestScopedService scopedService) => _scopedService = scopedService;
-
-        // Mutation proves that the handler runs despite depending on scoped service.
-        public void Handle(EventAggregatorTestNotification notification) => notification.Mutated = true;
+        var result = await Client.GetAsync("/test-handler-with-scoped-services");
+        Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
     }
 }
+
+public class EventAggregatorTestsController : Controller
+{
+    private readonly IEventAggregator _eventAggregator;
+
+    public EventAggregatorTestsController(IEventAggregator eventAggregator) => _eventAggregator = eventAggregator;
+
+    [HttpGet("test-handler-with-scoped-services")]
+    public async Task<IActionResult> Test()
+    {
+        var notification = new EventAggregatorTestNotification();
+        await _eventAggregator.PublishAsync(notification);
+
+        if (!notification.Mutated)
+        {
+            throw new ApplicationException("Doesn't work");
+        }
+
+        return Ok();
+    }
+}
+
+public class EventAggregatorTestScopedService
+{
+}
+
+public class EventAggregatorTestNotification : INotification
+{
+    public bool Mutated { get; set; }
+}
+
+public class EventAggregatorTestNotificationHandler : INotificationHandler<EventAggregatorTestNotification>
+{
+    private readonly EventAggregatorTestScopedService _scopedService;
+
+    public EventAggregatorTestNotificationHandler(EventAggregatorTestScopedService scopedService) =>
+        _scopedService = scopedService;
+
+    // Mutation proves that the handler runs despite depending on scoped service.
+    public void Handle(EventAggregatorTestNotification notification) => notification.Mutated = true;
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
index ce361e59b6..8fa8f0e252 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/FileSystemsTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
@@ -10,100 +10,98 @@ using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.IO.MediaPathSchemes;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.IO
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.IO;
+
+[TestFixture]
+[UmbracoTest]
+public class FileSystemsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest]
-    public class FileSystemsTests : UmbracoIntegrationTest
+    [Test]
+    public void Can_Get_MediaFileManager()
     {
-        [Test]
-        public void Can_Get_MediaFileManager()
+        var fileSystem = GetRequiredService<MediaFileManager>();
+        Assert.NotNull(fileSystem);
+    }
+
+    [Test]
+    public void MediaFileManager_Is_Singleton()
+    {
+        var fileManager1 = GetRequiredService<MediaFileManager>();
+        var fileManager2 = GetRequiredService<MediaFileManager>();
+        Assert.AreSame(fileManager1, fileManager2);
+    }
+
+    [Test]
+    public void Can_Delete_MediaFiles()
+    {
+        var mediaFileManager = GetRequiredService<MediaFileManager>();
+        var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes("test"));
+        var virtualPath = mediaFileManager.GetMediaPath("file.txt", Guid.NewGuid(), Guid.NewGuid());
+        mediaFileManager.FileSystem.AddFile(virtualPath, memoryStream);
+
+        // ~/media/1234/file.txt exists
+        var hostingEnvironment = GetRequiredService<IHostingEnvironment>();
+        var physPath = hostingEnvironment.MapPathWebRoot(Path.Combine("media", virtualPath));
+        Assert.IsTrue(File.Exists(physPath));
+
+        // ~/media/1234/file.txt is gone
+        mediaFileManager.DeleteMediaFiles(new[] { virtualPath });
+        Assert.IsFalse(File.Exists(physPath));
+
+        var scheme = GetRequiredService<IMediaPathScheme>();
+        if (scheme is UniqueMediaPathScheme)
         {
-            MediaFileManager fileSystem = GetRequiredService<MediaFileManager>();
-            Assert.NotNull(fileSystem);
-        }
-
-        [Test]
-        public void MediaFileManager_Is_Singleton()
-        {
-            MediaFileManager fileManager1 = GetRequiredService<MediaFileManager>();
-            MediaFileManager fileManager2 = GetRequiredService<MediaFileManager>();
-            Assert.AreSame(fileManager1, fileManager2);
-        }
-
-        [Test]
-        public void Can_Delete_MediaFiles()
-        {
-            MediaFileManager mediaFileManager = GetRequiredService<MediaFileManager>();
-            var memoryStream = new MemoryStream(Encoding.UTF8.GetBytes("test"));
-            string virtualPath = mediaFileManager.GetMediaPath("file.txt", Guid.NewGuid(), Guid.NewGuid());
-            mediaFileManager.FileSystem.AddFile(virtualPath, memoryStream);
-
-            // ~/media/1234/file.txt exists
-            IHostingEnvironment hostingEnvironment = GetRequiredService<IHostingEnvironment>();
-            string physPath = hostingEnvironment.MapPathWebRoot(Path.Combine("media", virtualPath));
-            Assert.IsTrue(File.Exists(physPath));
-
-            // ~/media/1234/file.txt is gone
-            mediaFileManager.DeleteMediaFiles(new[] { virtualPath });
-            Assert.IsFalse(File.Exists(physPath));
-
-            IMediaPathScheme scheme = GetRequiredService<IMediaPathScheme>();
-            if (scheme is UniqueMediaPathScheme)
-            {
-                // ~/media/1234 is *not* gone
-                physPath = Path.GetDirectoryName(physPath);
-                Assert.IsTrue(Directory.Exists(physPath));
-            }
-            else
-            {
-                // ~/media/1234 is gone
-                physPath = Path.GetDirectoryName(physPath);
-                Assert.IsFalse(Directory.Exists(physPath));
-            }
-
-            // ~/media exists
+            // ~/media/1234 is *not* gone
             physPath = Path.GetDirectoryName(physPath);
             Assert.IsTrue(Directory.Exists(physPath));
         }
-
-        // FIXME: don't make sense anymore
-        /*
-        [Test]
-        public void Cannot_Get_InvalidFileSystem()
+        else
         {
-            // throws because InvalidTypedFileSystem does not have the proper attribute with an alias
-            Assert.Throws<InvalidOperationException>(() => FileSystems.GetFileSystem<InvalidFileSystem>());
+            // ~/media/1234 is gone
+            physPath = Path.GetDirectoryName(physPath);
+            Assert.IsFalse(Directory.Exists(physPath));
         }
 
-        [Test]
-        public void Cannot_Get_NonConfiguredFileSystem()
-        {
-            // note: we need to reset the manager between tests else the Accept_Fallback test would corrupt that one
-            // throws because NonConfiguredFileSystem has the proper attribute with an alias,
-            // but then the container cannot find an IFileSystem implementation for that alias
-            Assert.Throws<InvalidOperationException>(() => FileSystems.GetFileSystem<NonConfiguredFileSystem>());
-
-            // all we'd need to pass is to register something like:
-            //_container.Register<IFileSystem>("noconfig", factory => new PhysicalFileSystem("~/foo"));
-        }
-
-        internal class InvalidFileSystem : FileSystemWrapper
-        {
-            public InvalidFileSystem(IFileSystem innerFileSystem)
-                : base(innerFileSystem)
-            { }
-        }
-
-        [InnerFileSystem("noconfig")]
-        internal class NonConfiguredFileSystem : FileSystemWrapper
-        {
-            public NonConfiguredFileSystem(IFileSystem innerFileSystem)
-                : base(innerFileSystem)
-            { }
-        }
-        */
+        // ~/media exists
+        physPath = Path.GetDirectoryName(physPath);
+        Assert.IsTrue(Directory.Exists(physPath));
     }
+
+    // FIXME: don't make sense anymore
+    /*
+    [Test]
+    public void Cannot_Get_InvalidFileSystem()
+    {
+        // throws because InvalidTypedFileSystem does not have the proper attribute with an alias
+        Assert.Throws<InvalidOperationException>(() => FileSystems.GetFileSystem<InvalidFileSystem>());
+    }
+
+    [Test]
+    public void Cannot_Get_NonConfiguredFileSystem()
+    {
+        // note: we need to reset the manager between tests else the Accept_Fallback test would corrupt that one
+        // throws because NonConfiguredFileSystem has the proper attribute with an alias,
+        // but then the container cannot find an IFileSystem implementation for that alias
+        Assert.Throws<InvalidOperationException>(() => FileSystems.GetFileSystem<NonConfiguredFileSystem>());
+
+        // all we'd need to pass is to register something like:
+        //_container.Register<IFileSystem>("noconfig", factory => new PhysicalFileSystem("~/foo"));
+    }
+
+    internal class InvalidFileSystem : FileSystemWrapper
+    {
+        public InvalidFileSystem(IFileSystem innerFileSystem)
+            : base(innerFileSystem)
+        { }
+    }
+
+    [InnerFileSystem("noconfig")]
+    internal class NonConfiguredFileSystem : FileSystemWrapper
+    {
+        public NonConfiguredFileSystem(IFileSystem innerFileSystem)
+            : base(innerFileSystem)
+        { }
+    }
+    */
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs
index 751430a824..9285fcc729 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/IO/ShadowFileSystemTests.cs
@@ -5,7 +5,6 @@ using System.Text;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
-using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -15,904 +14,994 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Implementations;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.IO
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.IO;
+
+[TestFixture]
+[UmbracoTest]
+public class ShadowFileSystemTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest]
-    public class ShadowFileSystemTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => ClearFiles(HostingEnvironment);
+
+    [TearDown]
+    public void TearDown() => ClearFiles(HostingEnvironment);
+    // tested:
+    // only 1 instance of this class is created
+    // SetUp and TearDown run before/after each test
+    // SetUp does not start before the previous TearDown returns
+
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+    private ILogger<PhysicalFileSystem> Logger => GetRequiredService<ILogger<PhysicalFileSystem>>();
+
+    private void ClearFiles(IHostingEnvironment hostingEnvironment)
     {
-        // tested:
-        // only 1 instance of this class is created
-        // SetUp and TearDown run before/after each test
-        // SetUp does not start before the previous TearDown returns
+        TestHelper.DeleteDirectory(hostingEnvironment.MapPathContentRoot("FileSysTests"));
+        TestHelper.DeleteDirectory(
+            hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') +
+                                                  "ShadowFs"));
+    }
 
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
-        private ILogger<PhysicalFileSystem> Logger => GetRequiredService<ILogger<PhysicalFileSystem>>();
+    private static string NormPath(string path) => path.Replace('\\', Path.AltDirectorySeparatorChar);
 
-        [SetUp]
-        public void SetUp()
+    [Test]
+    public void ShadowDeleteDirectory()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        Directory.CreateDirectory(path + "/ShadowTests/d1");
+        Directory.CreateDirectory(path + "/ShadowTests/d2");
+
+        var files = fs.GetFiles(string.Empty);
+        Assert.AreEqual(0, files.Count());
+
+        var dirs = fs.GetDirectories(string.Empty);
+        Assert.AreEqual(2, dirs.Count());
+        Assert.IsTrue(dirs.Contains("d1"));
+        Assert.IsTrue(dirs.Contains("d2"));
+
+        ss.DeleteDirectory("d1");
+
+        Assert.IsTrue(Directory.Exists(path + "/ShadowTests/d1"));
+        Assert.IsTrue(fs.DirectoryExists("d1"));
+        Assert.IsFalse(ss.DirectoryExists("d1"));
+
+        dirs = ss.GetDirectories(string.Empty);
+        Assert.AreEqual(1, dirs.Count());
+        Assert.IsTrue(dirs.Contains("d2"));
+    }
+
+    [Test]
+    public void ShadowDeleteDirectoryInDir()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        Directory.CreateDirectory(path + "/ShadowTests/sub");
+        Directory.CreateDirectory(path + "/ShadowTests/sub/d1");
+        Directory.CreateDirectory(path + "/ShadowTests/sub/d2");
+
+        var files = fs.GetFiles(string.Empty);
+        Assert.AreEqual(0, files.Count());
+
+        var dirs = ss.GetDirectories(string.Empty);
+        Assert.AreEqual(1, dirs.Count());
+        Assert.IsTrue(dirs.Contains("sub"));
+
+        dirs = fs.GetDirectories("sub");
+        Assert.AreEqual(2, dirs.Count());
+        Assert.IsTrue(dirs.Contains("sub/d1"));
+        Assert.IsTrue(dirs.Contains("sub/d2"));
+
+        dirs = ss.GetDirectories("sub");
+        Assert.AreEqual(2, dirs.Count());
+        Assert.IsTrue(dirs.Contains("sub/d1"));
+        Assert.IsTrue(dirs.Contains("sub/d2"));
+
+        ss.DeleteDirectory("sub/d1");
+
+        Assert.IsTrue(Directory.Exists(path + "/ShadowTests/sub/d1"));
+        Assert.IsTrue(fs.DirectoryExists("sub/d1"));
+        Assert.IsFalse(ss.DirectoryExists("sub/d1"));
+
+        dirs = fs.GetDirectories("sub");
+        Assert.AreEqual(2, dirs.Count());
+        Assert.IsTrue(dirs.Contains("sub/d1"));
+        Assert.IsTrue(dirs.Contains("sub/d2"));
+
+        dirs = ss.GetDirectories("sub");
+        Assert.AreEqual(1, dirs.Count());
+        Assert.IsTrue(dirs.Contains("sub/d2"));
+    }
+
+    [Test]
+    public void ShadowDeleteFile()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
+        File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
+
+        var files = fs.GetFiles(string.Empty);
+        Assert.AreEqual(2, files.Count());
+        Assert.IsTrue(files.Contains("f1.txt"));
+        Assert.IsTrue(files.Contains("f2.txt"));
+
+        files = ss.GetFiles(string.Empty);
+        Assert.AreEqual(2, files.Count());
+        Assert.IsTrue(files.Contains("f1.txt"));
+        Assert.IsTrue(files.Contains("f2.txt"));
+
+        var dirs = ss.GetDirectories(string.Empty);
+        Assert.AreEqual(0, dirs.Count());
+
+        ss.DeleteFile("f1.txt");
+
+        Assert.IsTrue(File.Exists(path + "/ShadowTests/f1.txt"));
+        Assert.IsTrue(fs.FileExists("f1.txt"));
+        Assert.IsFalse(ss.FileExists("f1.txt"));
+
+        files = ss.GetFiles(string.Empty);
+        Assert.AreEqual(1, files.Count());
+        Assert.IsTrue(files.Contains("f2.txt"));
+    }
+
+    [Test]
+    public void ShadowDeleteFileInDir()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        Directory.CreateDirectory(path + "/ShadowTests/sub");
+        File.WriteAllText(path + "/ShadowTests/sub/f1.txt", "foo");
+        File.WriteAllText(path + "/ShadowTests/sub/f2.txt", "foo");
+
+        var files = fs.GetFiles("");
+        Assert.AreEqual(0, files.Count());
+
+        files = fs.GetFiles("sub");
+        Assert.AreEqual(2, files.Count());
+        Assert.IsTrue(files.Contains("sub/f1.txt"));
+        Assert.IsTrue(files.Contains("sub/f2.txt"));
+
+        files = ss.GetFiles(string.Empty);
+        Assert.AreEqual(0, files.Count());
+
+        var dirs = ss.GetDirectories(string.Empty);
+        Assert.AreEqual(1, dirs.Count());
+        Assert.IsTrue(dirs.Contains("sub"));
+
+        files = ss.GetFiles("sub");
+        Assert.AreEqual(2, files.Count());
+        Assert.IsTrue(files.Contains("sub/f1.txt"));
+        Assert.IsTrue(files.Contains("sub/f2.txt"));
+
+        dirs = ss.GetDirectories("sub");
+        Assert.AreEqual(0, dirs.Count());
+
+        ss.DeleteFile("sub/f1.txt");
+
+        Assert.IsTrue(File.Exists(path + "/ShadowTests/sub/f1.txt"));
+        Assert.IsTrue(fs.FileExists("sub/f1.txt"));
+        Assert.IsFalse(ss.FileExists("sub/f1.txt"));
+
+        files = fs.GetFiles("sub");
+        Assert.AreEqual(2, files.Count());
+        Assert.IsTrue(files.Contains("sub/f1.txt"));
+        Assert.IsTrue(files.Contains("sub/f2.txt"));
+
+        files = ss.GetFiles("sub");
+        Assert.AreEqual(1, files.Count());
+        Assert.IsTrue(files.Contains("sub/f2.txt"));
+    }
+
+    [Test]
+    public void ShadowCantCreateFile()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        Assert.Throws<UnauthorizedAccessException>(() =>
         {
-            ClearFiles(HostingEnvironment);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            ClearFiles(HostingEnvironment);
-        }
-
-        private void ClearFiles(IHostingEnvironment hostingEnvironment)
-        {
-            TestHelper.DeleteDirectory(hostingEnvironment.MapPathContentRoot("FileSysTests"));
-            TestHelper.DeleteDirectory(hostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ShadowFs"));
-        }
-
-        private static string NormPath(string path)
-        {
-            return path.Replace('\\', Path.AltDirectorySeparatorChar);
-        }
-
-        [Test]
-        public void ShadowDeleteDirectory()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            Directory.CreateDirectory(path + "/ShadowTests/d1");
-            Directory.CreateDirectory(path + "/ShadowTests/d2");
-
-            var files = fs.GetFiles("");
-            Assert.AreEqual(0, files.Count());
-
-            var dirs = fs.GetDirectories("");
-            Assert.AreEqual(2, dirs.Count());
-            Assert.IsTrue(dirs.Contains("d1"));
-            Assert.IsTrue(dirs.Contains("d2"));
-
-            ss.DeleteDirectory("d1");
-
-            Assert.IsTrue(Directory.Exists(path + "/ShadowTests/d1"));
-            Assert.IsTrue(fs.DirectoryExists("d1"));
-            Assert.IsFalse(ss.DirectoryExists("d1"));
-
-            dirs = ss.GetDirectories("");
-            Assert.AreEqual(1, dirs.Count());
-            Assert.IsTrue(dirs.Contains("d2"));
-        }
-
-        [Test]
-        public void ShadowDeleteDirectoryInDir()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            Directory.CreateDirectory(path + "/ShadowTests/sub");
-            Directory.CreateDirectory(path + "/ShadowTests/sub/d1");
-            Directory.CreateDirectory(path + "/ShadowTests/sub/d2");
-
-            var files = fs.GetFiles("");
-            Assert.AreEqual(0, files.Count());
-
-            var dirs = ss.GetDirectories("");
-            Assert.AreEqual(1, dirs.Count());
-            Assert.IsTrue(dirs.Contains("sub"));
-
-            dirs = fs.GetDirectories("sub");
-            Assert.AreEqual(2, dirs.Count());
-            Assert.IsTrue(dirs.Contains("sub/d1"));
-            Assert.IsTrue(dirs.Contains("sub/d2"));
-
-            dirs = ss.GetDirectories("sub");
-            Assert.AreEqual(2, dirs.Count());
-            Assert.IsTrue(dirs.Contains("sub/d1"));
-            Assert.IsTrue(dirs.Contains("sub/d2"));
-
-            ss.DeleteDirectory("sub/d1");
-
-            Assert.IsTrue(Directory.Exists(path + "/ShadowTests/sub/d1"));
-            Assert.IsTrue(fs.DirectoryExists("sub/d1"));
-            Assert.IsFalse(ss.DirectoryExists("sub/d1"));
-
-            dirs = fs.GetDirectories("sub");
-            Assert.AreEqual(2, dirs.Count());
-            Assert.IsTrue(dirs.Contains("sub/d1"));
-            Assert.IsTrue(dirs.Contains("sub/d2"));
-
-            dirs = ss.GetDirectories("sub");
-            Assert.AreEqual(1, dirs.Count());
-            Assert.IsTrue(dirs.Contains("sub/d2"));
-        }
-
-        [Test]
-        public void ShadowDeleteFile()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
-            File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
-
-            var files = fs.GetFiles("");
-            Assert.AreEqual(2, files.Count());
-            Assert.IsTrue(files.Contains("f1.txt"));
-            Assert.IsTrue(files.Contains("f2.txt"));
-
-            files = ss.GetFiles("");
-            Assert.AreEqual(2, files.Count());
-            Assert.IsTrue(files.Contains("f1.txt"));
-            Assert.IsTrue(files.Contains("f2.txt"));
-
-            var dirs = ss.GetDirectories("");
-            Assert.AreEqual(0, dirs.Count());
-
-            ss.DeleteFile("f1.txt");
-
-            Assert.IsTrue(File.Exists(path + "/ShadowTests/f1.txt"));
-            Assert.IsTrue(fs.FileExists("f1.txt"));
-            Assert.IsFalse(ss.FileExists("f1.txt"));
-
-            files = ss.GetFiles("");
-            Assert.AreEqual(1, files.Count());
-            Assert.IsTrue(files.Contains("f2.txt"));
-        }
-
-        [Test]
-        public void ShadowDeleteFileInDir()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            Directory.CreateDirectory(path + "/ShadowTests/sub");
-            File.WriteAllText(path + "/ShadowTests/sub/f1.txt", "foo");
-            File.WriteAllText(path + "/ShadowTests/sub/f2.txt", "foo");
-
-            var files = fs.GetFiles("");
-            Assert.AreEqual(0, files.Count());
-
-            files = fs.GetFiles("sub");
-            Assert.AreEqual(2, files.Count());
-            Assert.IsTrue(files.Contains("sub/f1.txt"));
-            Assert.IsTrue(files.Contains("sub/f2.txt"));
-
-            files = ss.GetFiles("");
-            Assert.AreEqual(0, files.Count());
-
-            var dirs = ss.GetDirectories("");
-            Assert.AreEqual(1, dirs.Count());
-            Assert.IsTrue(dirs.Contains("sub"));
-
-            files = ss.GetFiles("sub");
-            Assert.AreEqual(2, files.Count());
-            Assert.IsTrue(files.Contains("sub/f1.txt"));
-            Assert.IsTrue(files.Contains("sub/f2.txt"));
-
-            dirs = ss.GetDirectories("sub");
-            Assert.AreEqual(0, dirs.Count());
-
-            ss.DeleteFile("sub/f1.txt");
-
-            Assert.IsTrue(File.Exists(path + "/ShadowTests/sub/f1.txt"));
-            Assert.IsTrue(fs.FileExists("sub/f1.txt"));
-            Assert.IsFalse(ss.FileExists("sub/f1.txt"));
-
-            files = fs.GetFiles("sub");
-            Assert.AreEqual(2, files.Count());
-            Assert.IsTrue(files.Contains("sub/f1.txt"));
-            Assert.IsTrue(files.Contains("sub/f2.txt"));
-
-            files = ss.GetFiles("sub");
-            Assert.AreEqual(1, files.Count());
-            Assert.IsTrue(files.Contains("sub/f2.txt"));
-        }
-
-        [Test]
-        public void ShadowCantCreateFile()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            Assert.Throws<UnauthorizedAccessException>(() =>
+            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
             {
-                using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                    ss.AddFile("../../f1.txt", ms);
-            });
-        }
-
-        [Test]
-        public void ShadowCreateFile()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper,HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.txt", ms);
-
-            Assert.IsTrue(File.Exists(path + "/ShadowTests/f2.txt"));
-            Assert.IsFalse(File.Exists(path + "/ShadowSystem/f2.txt"));
-            Assert.IsTrue(fs.FileExists("f2.txt"));
-            Assert.IsTrue(ss.FileExists("f2.txt"));
-
-            Assert.IsFalse(File.Exists(path + "/ShadowTests/f1.txt"));
-            Assert.IsTrue(File.Exists(path + "/ShadowSystem/f1.txt"));
-            Assert.IsFalse(fs.FileExists("f1.txt"));
-            Assert.IsTrue(ss.FileExists("f1.txt"));
-
-            var files = ss.GetFiles("");
-            Assert.AreEqual(2, files.Count());
-            Assert.IsTrue(files.Contains("f1.txt"));
-            Assert.IsTrue(files.Contains("f2.txt"));
-
-            string content;
-            using (var stream = ss.OpenFile("f1.txt"))
-                content = new StreamReader(stream).ReadToEnd();
-
-            Assert.AreEqual("foo", content);
-        }
-
-        [Test]
-        public void ShadowCreateFileInDir()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("sub/f1.txt", ms);
-
-            Assert.IsFalse(File.Exists(path + "/ShadowTests/sub/f1.txt"));
-            Assert.IsTrue(File.Exists(path + "/ShadowSystem/sub/f1.txt"));
-            Assert.IsFalse(fs.FileExists("sub/f1.txt"));
-            Assert.IsTrue(ss.FileExists("sub/f1.txt"));
-
-            Assert.IsFalse(fs.DirectoryExists("sub"));
-            Assert.IsTrue(ss.DirectoryExists("sub"));
-
-            var dirs = fs.GetDirectories("");
-            Assert.AreEqual(0, dirs.Count());
-
-            dirs = ss.GetDirectories("");
-            Assert.AreEqual(1, dirs.Count());
-            Assert.IsTrue(dirs.Contains("sub"));
-
-            var files = ss.GetFiles("sub");
-            Assert.AreEqual(1, files.Count());
-
-            string content;
-            using (var stream = ss.OpenFile("sub/f1.txt"))
-                content = new StreamReader(stream).ReadToEnd();
-
-            Assert.AreEqual("foo", content);
-        }
-
-        [Test]
-        public void ShadowAbort()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("path/to/some/dir/f1.txt", ms);
-
-            // file is only written to the shadow fs
-            Assert.IsTrue(File.Exists(path + "/ShadowSystem/path/to/some/dir/f1.txt"));
-            Assert.IsFalse(File.Exists(path + "/ShadowTests/path/to/some/dir/f1.txt"));
-
-            // let the shadow fs die
-        }
-
-        [Test]
-        public void ShadowComplete()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            Directory.CreateDirectory(path + "/ShadowTests/sub/sub");
-            File.WriteAllText(path + "/ShadowTests/sub/sub/f2.txt", "foo");
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("path/to/some/dir/f1.txt", ms);
-            ss.DeleteFile("sub/sub/f2.txt");
-
-            Assert.IsTrue(File.Exists(path + "/ShadowSystem/path/to/some/dir/f1.txt"));
-
-            ss.Complete();
-
-            // yes we are cleaning now
-            //Assert.IsTrue(File.Exists(path + "/ShadowSystem/path/to/some/dir/f1.txt")); // *not* cleaning
-            Assert.IsTrue(File.Exists(path + "/ShadowTests/path/to/some/dir/f1.txt"));
-            Assert.IsFalse(File.Exists(path + "/ShadowTests/sub/sub/f2.txt"));
-        }
-
-        [Test]
-        public void ShadowScopeComplete()
-        {
-            var loggerFactory = NullLoggerFactory.Instance;
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            var shadowfs = HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ShadowFs");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(shadowfs);
-
-            var scopedFileSystems = false;
-
-            var phy = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path, "ignore");
-
-            var globalSettings = Options.Create(new GlobalSettings());
-            var fileSystems = new FileSystems(loggerFactory, IOHelper, globalSettings, HostingEnvironment) { IsScoped = () => scopedFileSystems };
-            var shadowPath = $"x/{Guid.NewGuid().ToString("N").Substring(0, 6)}";
-            var sw = (ShadowWrapper)fileSystems.CreateShadowWrapper(phy, shadowPath);
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f1.txt", ms);
-            Assert.IsTrue(phy.FileExists("sub/f1.txt"));
-
-            string id;
-
-            // explicit shadow without scope does not work
-            sw.Shadow(id = ShadowWrapper.CreateShadowId(HostingEnvironment));
-            Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f2.txt", ms);
-            Assert.IsTrue(phy.FileExists("sub/f2.txt"));
-            sw.UnShadow(true);
-            Assert.IsTrue(phy.FileExists("sub/f2.txt"));
-            Assert.IsFalse(Directory.Exists(shadowfs + "/" + id));
-
-            // shadow with scope but no complete does not complete
-            scopedFileSystems = true; // pretend we have a scope
-            var scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
-            Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f3.txt", ms);
-            Assert.IsFalse(phy.FileExists("sub/f3.txt"));
-            var dirs = Directory.GetDirectories(shadowfs);
-            Assert.AreEqual(1, dirs.Length);
-            Assert.AreEqual((shadowfs + "/" + id).Replace('\\', '/'), dirs[0].Replace('\\', '/'));
-            dirs = Directory.GetDirectories(dirs[0]);
-            var typedDir = dirs.FirstOrDefault(x => x.Replace('\\', '/').EndsWith("/x"));
-            Assert.IsNotNull(typedDir);
-            dirs = Directory.GetDirectories(typedDir);
-            var scopedDir = dirs.FirstOrDefault(x => x.Replace('\\', '/').EndsWith("/" + shadowPath)); // this is where files go
-            Assert.IsNotNull(scopedDir);
-            scope.Dispose();
-            scopedFileSystems = false;
-            Assert.IsFalse(phy.FileExists("sub/f3.txt"));
-            TestHelper.TryAssert(() => Assert.IsFalse(Directory.Exists(shadowfs + "/" + id)));
-
-            // shadow with scope and complete does complete
-            scopedFileSystems = true; // pretend we have a scope
-            scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
-            Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f4.txt", ms);
-            Assert.IsFalse(phy.FileExists("sub/f4.txt"));
-            Assert.AreEqual(1, Directory.GetDirectories(shadowfs).Length);
-            scope.Complete();
-            scope.Dispose();
-            scopedFileSystems = false;
-            TestHelper.TryAssert(() => Assert.AreEqual(0, Directory.GetDirectories(shadowfs).Length));
-            Assert.IsTrue(phy.FileExists("sub/f4.txt"));
-            Assert.IsFalse(Directory.Exists(shadowfs + "/" + id));
-
-            // test scope for "another thread"
-
-            scopedFileSystems = true; // pretend we have a scope
-            scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
-            Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f5.txt", ms);
-            Assert.IsFalse(phy.FileExists("sub/f5.txt"));
-
-            // pretend we're another thread w/out scope
-            scopedFileSystems = false;
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f6.txt", ms);
-            scopedFileSystems = true; // pretend we have a scope
-
-            Assert.IsTrue(phy.FileExists("sub/f6.txt")); // other thread has written out to fs
-            scope.Complete();
-            scope.Dispose();
-            scopedFileSystems = false;
-            Assert.IsTrue(phy.FileExists("sub/f5.txt"));
-            TestHelper.TryAssert(() => Assert.IsFalse(Directory.Exists(shadowfs + "/" + id)));
-        }
-
-        [Test]
-        public void ShadowScopeCompleteWithFileConflict()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            var shadowfs = HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ShadowFs");
-            Directory.CreateDirectory(path);
-
-            var scopedFileSystems = false;
-
-            var phy = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path, "ignore");
-
-            var globalSettings = Options.Create(new GlobalSettings());
-            var fileSystems = new FileSystems(NullLoggerFactory.Instance, IOHelper, globalSettings, HostingEnvironment) { IsScoped = () => scopedFileSystems };
-            var shadowPath = $"x/{Guid.NewGuid().ToString("N").Substring(0, 6)}";
-            var sw = fileSystems.CreateShadowWrapper(phy, shadowPath);
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f1.txt", ms);
-            Assert.IsTrue(phy.FileExists("sub/f1.txt"));
-
-            string id;
-
-            scopedFileSystems = true; // pretend we have a scope
-            var scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
-            Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f2.txt", ms);
-            Assert.IsFalse(phy.FileExists("sub/f2.txt"));
-
-            // pretend we're another thread w/out scope
-            scopedFileSystems = false;
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("bar")))
-                sw.AddFile("sub/f2.txt", ms);
-            scopedFileSystems = true; // pretend we have a scope
-
-            Assert.IsTrue(phy.FileExists("sub/f2.txt")); // other thread has written out to fs
-            scope.Complete();
-            scope.Dispose();
-            scopedFileSystems = false;
-            Assert.IsTrue(phy.FileExists("sub/f2.txt"));
-            TestHelper.TryAssert(() => Assert.IsFalse(Directory.Exists(shadowfs + "/" + id)));
-
-            string text;
-            using (var s = phy.OpenFile("sub/f2.txt"))
-            using (var r = new StreamReader(s))
-                text = r.ReadToEnd();
-
-            // the shadow filesystem will happily overwrite anything it can
-            Assert.AreEqual("foo", text);
-        }
-
-        [Test]
-        public void ShadowScopeCompleteWithDirectoryConflict()
-        {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            var shadowfs = HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ShadowFs");
-            Directory.CreateDirectory(path);
-
-            var scopedFileSystems = false;
-
-            var phy = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path, "ignore");
-
-            var globalSettings = Options.Create(new GlobalSettings());
-            var fileSystems = new FileSystems(NullLoggerFactory.Instance, IOHelper, globalSettings, HostingEnvironment) { IsScoped = () => scopedFileSystems };
-            var shadowPath = $"x/{Guid.NewGuid().ToString("N").Substring(0, 6)}";
-            var sw = fileSystems.CreateShadowWrapper(phy, shadowPath);
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f1.txt", ms);
-            Assert.IsTrue(phy.FileExists("sub/f1.txt"));
-
-            string id;
-
-            scopedFileSystems = true; // pretend we have a scope
-            var scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
-            Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f2.txt", ms);
-            Assert.IsFalse(phy.FileExists("sub/f2.txt"));
-
-            // pretend we're another thread w/out scope
-            scopedFileSystems = false;
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("bar")))
-                sw.AddFile("sub/f2.txt/f2.txt", ms);
-            scopedFileSystems = true; // pretend we have a scope
-
-            Assert.IsTrue(phy.FileExists("sub/f2.txt/f2.txt")); // other thread has written out to fs
-
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                sw.AddFile("sub/f3.txt", ms);
-            Assert.IsFalse(phy.FileExists("sub/f3.txt"));
-
-            scope.Complete();
-
-            try
-            {
-                // no way this can work since we're trying to write a file
-                // but there's now a directory with the same name on the real fs
-                scope.Dispose();
-                Assert.Fail("Expected AggregateException.");
+                ss.AddFile("../../f1.txt", ms);
             }
-            catch (AggregateException ae)
+        });
+    }
+
+    [Test]
+    public void ShadowCreateFile()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.txt", ms);
+        }
+
+        Assert.IsTrue(File.Exists(path + "/ShadowTests/f2.txt"));
+        Assert.IsFalse(File.Exists(path + "/ShadowSystem/f2.txt"));
+        Assert.IsTrue(fs.FileExists("f2.txt"));
+        Assert.IsTrue(ss.FileExists("f2.txt"));
+
+        Assert.IsFalse(File.Exists(path + "/ShadowTests/f1.txt"));
+        Assert.IsTrue(File.Exists(path + "/ShadowSystem/f1.txt"));
+        Assert.IsFalse(fs.FileExists("f1.txt"));
+        Assert.IsTrue(ss.FileExists("f1.txt"));
+
+        var files = ss.GetFiles(string.Empty);
+        Assert.AreEqual(2, files.Count());
+        Assert.IsTrue(files.Contains("f1.txt"));
+        Assert.IsTrue(files.Contains("f2.txt"));
+
+        string content;
+        using (var stream = ss.OpenFile("f1.txt"))
+        {
+            content = new StreamReader(stream).ReadToEnd();
+        }
+
+        Assert.AreEqual("foo", content);
+    }
+
+    [Test]
+    public void ShadowCreateFileInDir()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("sub/f1.txt", ms);
+        }
+
+        Assert.IsFalse(File.Exists(path + "/ShadowTests/sub/f1.txt"));
+        Assert.IsTrue(File.Exists(path + "/ShadowSystem/sub/f1.txt"));
+        Assert.IsFalse(fs.FileExists("sub/f1.txt"));
+        Assert.IsTrue(ss.FileExists("sub/f1.txt"));
+
+        Assert.IsFalse(fs.DirectoryExists("sub"));
+        Assert.IsTrue(ss.DirectoryExists("sub"));
+
+        var dirs = fs.GetDirectories(string.Empty);
+        Assert.AreEqual(0, dirs.Count());
+
+        dirs = ss.GetDirectories(string.Empty);
+        Assert.AreEqual(1, dirs.Count());
+        Assert.IsTrue(dirs.Contains("sub"));
+
+        var files = ss.GetFiles("sub");
+        Assert.AreEqual(1, files.Count());
+
+        string content;
+        using (var stream = ss.OpenFile("sub/f1.txt"))
+        {
+            content = new StreamReader(stream).ReadToEnd();
+        }
+
+        Assert.AreEqual("foo", content);
+    }
+
+    [Test]
+    public void ShadowAbort()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("path/to/some/dir/f1.txt", ms);
+        }
+
+        // file is only written to the shadow fs
+        Assert.IsTrue(File.Exists(path + "/ShadowSystem/path/to/some/dir/f1.txt"));
+        Assert.IsFalse(File.Exists(path + "/ShadowTests/path/to/some/dir/f1.txt"));
+
+        // let the shadow fs die
+    }
+
+    [Test]
+    public void ShadowComplete()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        Directory.CreateDirectory(path + "/ShadowTests/sub/sub");
+        File.WriteAllText(path + "/ShadowTests/sub/sub/f2.txt", "foo");
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("path/to/some/dir/f1.txt", ms);
+        }
+
+        ss.DeleteFile("sub/sub/f2.txt");
+
+        Assert.IsTrue(File.Exists(path + "/ShadowSystem/path/to/some/dir/f1.txt"));
+
+        ss.Complete();
+
+        // yes we are cleaning now
+        //Assert.IsTrue(File.Exists(path + "/ShadowSystem/path/to/some/dir/f1.txt")); // *not* cleaning
+        Assert.IsTrue(File.Exists(path + "/ShadowTests/path/to/some/dir/f1.txt"));
+        Assert.IsFalse(File.Exists(path + "/ShadowTests/sub/sub/f2.txt"));
+    }
+
+    [Test]
+    public void ShadowScopeComplete()
+    {
+        var loggerFactory = NullLoggerFactory.Instance;
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        var shadowfs =
+            HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') +
+                                                  "ShadowFs");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(shadowfs);
+
+        var scopedFileSystems = false;
+
+        var phy = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path, "ignore");
+
+        var globalSettings = Options.Create(new GlobalSettings());
+        var fileSystems =
+            new FileSystems(loggerFactory, IOHelper, globalSettings, HostingEnvironment)
             {
-                Assert.AreEqual(1, ae.InnerExceptions.Count);
-                var e = ae.InnerExceptions[0];
-                Assert.IsNotNull(e.InnerException);
-                Assert.IsInstanceOf<AggregateException>(e);
-                ae = (AggregateException) e;
+                IsScoped = () => scopedFileSystems
+            };
+        var shadowPath = $"x/{Guid.NewGuid().ToString("N").Substring(0, 6)}";
+        var sw = (ShadowWrapper)fileSystems.CreateShadowWrapper(phy, shadowPath);
 
-                Assert.AreEqual(1, ae.InnerExceptions.Count);
-                e = ae.InnerExceptions[0];
-                Assert.IsNotNull(e.InnerException);
-                Assert.IsInstanceOf<Exception>(e.InnerException);
-            }
-
-            // still, the rest of the changes has been applied ok
-            Assert.IsTrue(phy.FileExists("sub/f3.txt"));
-        }
-
-        [Test]
-        public void GetFilesReturnsChildrenOnly()
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            File.WriteAllText(path + "/f1.txt", "foo");
-            Directory.CreateDirectory(path + "/test");
-            File.WriteAllText(path + "/test/f2.txt", "foo");
-            Directory.CreateDirectory(path + "/test/inner");
-            File.WriteAllText(path + "/test/inner/f3.txt", "foo");
-
-            path = NormPath(path);
-            var files = Directory.GetFiles(path);
-            Assert.AreEqual(1, files.Length);
-            files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
-            Assert.AreEqual(3, files.Length);
-            var efiles = Directory.EnumerateFiles(path);
-            Assert.AreEqual(1, efiles.Count());
-            efiles = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories);
-            Assert.AreEqual(3, efiles.Count());
+            sw.AddFile("sub/f1.txt", ms);
         }
 
-        [Test]
-        public void DeleteDirectoryAndFiles()
+        Assert.IsTrue(phy.FileExists("sub/f1.txt"));
+
+        string id;
+
+        // explicit shadow without scope does not work
+        sw.Shadow(id = ShadowWrapper.CreateShadowId(HostingEnvironment));
+        Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            File.WriteAllText(path + "/f1.txt", "foo");
-            Directory.CreateDirectory(path + "/test");
-            File.WriteAllText(path + "/test/f2.txt", "foo");
-            Directory.CreateDirectory(path + "/test/inner");
-            File.WriteAllText(path + "/test/inner/f3.txt", "foo");
-
-            path = NormPath(path);
-            TestHelper.Try(() => Directory.Delete(path, true));
-            TestHelper.TryAssert(() => Assert.IsFalse(File.Exists(path + "/test/inner/f3.txt")));
+            sw.AddFile("sub/f2.txt", ms);
         }
 
-        /// <summary>
-        /// Check that GetFiles will return all files on the shadow, while returning
-        /// just one on each of the filesystems used by the shadow.
-        /// </summary>
-        [Test]
-        public void ShadowGetFiles()
+        Assert.IsTrue(phy.FileExists("sub/f2.txt"));
+        sw.UnShadow(true);
+        Assert.IsTrue(phy.FileExists("sub/f2.txt"));
+        Assert.IsFalse(Directory.Exists(shadowfs + "/" + id));
+
+        // shadow with scope but no complete does not complete
+        scopedFileSystems = true; // pretend we have a scope
+        var scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
+        Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.txt", ms);
-
-            // Assert
-            // ensure we get 2 files from the shadow
-            var getFiles = ss.GetFiles(string.Empty);
-            Assert.AreEqual(2, getFiles.Count());
-
-            var fsFiles = fs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(1, fsFiles.Length);
-            var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(1, sfsFiles.Length);
+            sw.AddFile("sub/f3.txt", ms);
         }
 
-        /// <summary>
-        /// Check that GetFiles using the filter function with empty string will return expected results
-        /// </summary>
-        [Test]
-        public void ShadowGetFilesUsingEmptyFilter()
+        Assert.IsFalse(phy.FileExists("sub/f3.txt"));
+        var dirs = Directory.GetDirectories(shadowfs);
+        Assert.AreEqual(1, dirs.Length);
+        Assert.AreEqual((shadowfs + "/" + id).Replace('\\', '/'), dirs[0].Replace('\\', '/'));
+        dirs = Directory.GetDirectories(dirs[0]);
+        var typedDir = dirs.FirstOrDefault(x => x.Replace('\\', '/').EndsWith("/x"));
+        Assert.IsNotNull(typedDir);
+        dirs = Directory.GetDirectories(typedDir);
+        var scopedDir =
+            dirs.FirstOrDefault(x => x.Replace('\\', '/').EndsWith("/" + shadowPath)); // this is where files go
+        Assert.IsNotNull(scopedDir);
+        scope.Dispose();
+        scopedFileSystems = false;
+        Assert.IsFalse(phy.FileExists("sub/f3.txt"));
+        TestHelper.TryAssert(() => Assert.IsFalse(Directory.Exists(shadowfs + "/" + id)));
+
+        // shadow with scope and complete does complete
+        scopedFileSystems = true; // pretend we have a scope
+        scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
+        Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.txt", ms);
-
-            // Assert
-            // ensure we get 2 files from the shadow
-            var getFiles = ss.GetFiles(string.Empty);
-            Assert.AreEqual(2, getFiles.Count());
-
-            var fsFiles = fs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(1, fsFiles.Length);
-            var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(1, sfsFiles.Length);
+            sw.AddFile("sub/f4.txt", ms);
         }
 
-        /// <summary>
-        /// Check that GetFiles using the filter function with null will return expected results
-        /// </summary>
-        [Test]
-        public void ShadowGetFilesUsingNullFilter()
+        Assert.IsFalse(phy.FileExists("sub/f4.txt"));
+        Assert.AreEqual(1, Directory.GetDirectories(shadowfs).Length);
+        scope.Complete();
+        scope.Dispose();
+        scopedFileSystems = false;
+        TestHelper.TryAssert(() => Assert.AreEqual(0, Directory.GetDirectories(shadowfs).Length));
+        Assert.IsTrue(phy.FileExists("sub/f4.txt"));
+        Assert.IsFalse(Directory.Exists(shadowfs + "/" + id));
+
+        // test scope for "another thread"
+
+        scopedFileSystems = true; // pretend we have a scope
+        scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
+        Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.txt", ms);
-
-            // Assert
-            // ensure we get 2 files from the shadow
-            var getFiles = ss.GetFiles(string.Empty);
-            Assert.AreEqual(2, getFiles.Count());
-            // ensure we get 2 files when using null in filter parameter
-            var getFilesWithNullFilter = ss.GetFiles(string.Empty, null);
-            Assert.AreEqual(2, getFilesWithNullFilter.Count());
-
-            var fsFiles = fs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(1, fsFiles.Length);
-            var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(1, sfsFiles.Length);
+            sw.AddFile("sub/f5.txt", ms);
         }
 
-        [Test]
-        public void ShadowGetFilesUsingWildcardFilter()
+        Assert.IsFalse(phy.FileExists("sub/f5.txt"));
+
+        // pretend we're another thread w/out scope
+        scopedFileSystems = false;
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
-            File.WriteAllText(path + "/ShadowTests/f2.doc", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.txt", ms);
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.doc", ms);
-
-            // Assert
-            // ensure we get 4 files from the shadow
-            var getFiles = ss.GetFiles(string.Empty);
-            Assert.AreEqual(4, getFiles.Count());
-            // ensure we get only 2 of 4 files from the shadow when using filter
-            var getFilesWithWildcardFilter = ss.GetFiles(string.Empty, "*.doc");
-            Assert.AreEqual(2, getFilesWithWildcardFilter.Count());
-
-            var fsFiles = fs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(2, fsFiles.Length);
-            var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(2, sfsFiles.Length);
+            sw.AddFile("sub/f6.txt", ms);
         }
 
-        [Test]
-        public void ShadowGetFilesUsingSingleCharacterFilter()
+        scopedFileSystems = true; // pretend we have a scope
+
+        Assert.IsTrue(phy.FileExists("sub/f6.txt")); // other thread has written out to fs
+        scope.Complete();
+        scope.Dispose();
+        scopedFileSystems = false;
+        Assert.IsTrue(phy.FileExists("sub/f5.txt"));
+        TestHelper.TryAssert(() => Assert.IsFalse(Directory.Exists(shadowfs + "/" + id)));
+    }
+
+    [Test]
+    public void ShadowScopeCompleteWithFileConflict()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        var shadowfs =
+            HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') +
+                                                  "ShadowFs");
+        Directory.CreateDirectory(path);
+
+        var scopedFileSystems = false;
+
+        var phy = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path, "ignore");
+
+        var globalSettings = Options.Create(new GlobalSettings());
+        var fileSystems =
+            new FileSystems(NullLoggerFactory.Instance, IOHelper, globalSettings, HostingEnvironment)
+            {
+                IsScoped = () => scopedFileSystems
+            };
+        var shadowPath = $"x/{Guid.NewGuid().ToString("N").Substring(0, 6)}";
+        var sw = fileSystems.CreateShadowWrapper(phy, shadowPath);
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
-            File.WriteAllText(path + "/ShadowTests/f2.doc", "foo");
-            File.WriteAllText(path + "/ShadowTests/f2.docx", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.txt", ms);
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.doc", ms);
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f1.docx", ms);
-
-            // Assert
-            // ensure we get 6 files from the shadow
-            var getFiles = ss.GetFiles(string.Empty);
-            Assert.AreEqual(6, getFiles.Count());
-            // ensure we get only 2 of 6 files from the shadow when using filter on shadow
-            var getFilesWithWildcardSinglecharFilter = ss.GetFiles(string.Empty, "f1.d?c");
-            Assert.AreEqual(1, getFilesWithWildcardSinglecharFilter.Count());
-            // ensure we get only 2 of 6 files from the shadow when using filter on disk
-            var getFilesWithWildcardSinglecharFilter2 = ss.GetFiles(string.Empty, "f2.d?c");
-            Assert.AreEqual(1, getFilesWithWildcardSinglecharFilter2.Count());
-
-            var fsFiles = fs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(3, fsFiles.Length);
-            var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
-            Assert.AreEqual(3, sfsFiles.Length);
+            sw.AddFile("sub/f1.txt", ms);
         }
 
-        /// <summary>
-        /// Returns the full paths of the files on the disk.
-        /// Note that this will be the *actual* path of the file, meaning a file existing on the initialized FS
-        /// will be in one location, while a file written after initializing the shadow, will exist at the
-        /// shadow location directory.
-        /// </summary>
-        [Test]
-        public void ShadowGetFullPath()
+        Assert.IsTrue(phy.FileExists("sub/f1.txt"));
+
+        string id;
+
+        scopedFileSystems = true; // pretend we have a scope
+        var scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
+        Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f2.txt", ms);
-
-            // Assert
-            var f1FullPath = ss.GetFullPath("f1.txt");
-            var f2FullPath = ss.GetFullPath("f2.txt");
-            Assert.AreEqual(Path.Combine(path, "ShadowTests", "f1.txt"), f1FullPath);
-            Assert.AreEqual(Path.Combine(path, "ShadowSystem", "f2.txt"), f2FullPath);
+            sw.AddFile("sub/f2.txt", ms);
         }
 
-        /// <summary>
-        /// Returns the path relative to the filesystem root
-        /// </summary>
-        /// <remarks>
-        /// This file stuff in this test is kinda irrelevant with the current implementation.
-        /// We do tests that the files are written to the correct places and the relative path is returned correct,
-        /// but GetRelativePath is currently really just string manipulation so files are not actually hit by the code.
-        /// Leaving the file stuff in here for now in case the method becomes more clever at some point.
-        /// </remarks>
-        [Test]
-        public void ShadowGetRelativePath()
+        Assert.IsFalse(phy.FileExists("sub/f2.txt"));
+
+        // pretend we're another thread w/out scope
+        scopedFileSystems = false;
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("bar")))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f2.txt", ms);
-
-            // Assert
-            var f1RelativePath = ss.GetRelativePath("f1.txt");
-            var f2RelativePath = ss.GetRelativePath("f2.txt");
-            Assert.AreEqual("f1.txt", f1RelativePath);
-            Assert.AreEqual("f2.txt", f2RelativePath);
-            Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowTests", "f1.txt")));
-            Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowTests", "f2.txt")));
-            Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowSystem", "f2.txt")));
-            Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowSystem", "f1.txt")));
+            sw.AddFile("sub/f2.txt", ms);
         }
 
-        /// <summary>
-        /// Ensure the URL returned contains the path relative to the FS root,
-        /// but including the rootUrl the FS was initialized with.
-        /// </summary>
-        /// <remarks>
-        /// This file stuff in this test is kinda irrelevant with the current implementation.
-        /// We do tests that the files are written to the correct places and the URL is returned correct,
-        /// but GetUrl is currently really just string manipulation so files are not actually hit by the code.
-        /// Leaving the file stuff in here for now in case the method becomes more clever at some point.
-        /// </remarks>
-        [Test]
-        public void ShadowGetUrl()
+        scopedFileSystems = true; // pretend we have a scope
+
+        Assert.IsTrue(phy.FileExists("sub/f2.txt")); // other thread has written out to fs
+        scope.Complete();
+        scope.Dispose();
+        scopedFileSystems = false;
+        Assert.IsTrue(phy.FileExists("sub/f2.txt"));
+        TestHelper.TryAssert(() => Assert.IsFalse(Directory.Exists(shadowfs + "/" + id)));
+
+        string text;
+        using (var s = phy.OpenFile("sub/f2.txt"))
+        using (var r = new StreamReader(s))
         {
-            // Arrange
-            var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(path + "/ShadowTests");
-            Directory.CreateDirectory(path + "/ShadowSystem");
-
-            var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "rootUrl");
-            var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "rootUrl");
-            var ss = new ShadowFileSystem(fs, sfs);
-
-            // Act
-            File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                ss.AddFile("f2.txt", ms);
-
-            // Assert
-            var f1Url = ss.GetUrl("f1.txt");
-            var f2Url = ss.GetUrl("f2.txt");
-            Assert.AreEqual("rootUrl/f1.txt", f1Url);
-            Assert.AreEqual("rootUrl/f2.txt", f2Url);
-            Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowTests", "f1.txt")));
-            Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowTests", "f2.txt")));
-            Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowSystem", "f2.txt")));
-            Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowSystem", "f1.txt")));
+            text = r.ReadToEnd();
         }
+
+        // the shadow filesystem will happily overwrite anything it can
+        Assert.AreEqual("foo", text);
+    }
+
+    [Test]
+    public void ShadowScopeCompleteWithDirectoryConflict()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        var shadowfs =
+            HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.TempData.EnsureEndsWith('/') +
+                                                  "ShadowFs");
+        Directory.CreateDirectory(path);
+
+        var scopedFileSystems = false;
+
+        var phy = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path, "ignore");
+
+        var globalSettings = Options.Create(new GlobalSettings());
+        var fileSystems =
+            new FileSystems(NullLoggerFactory.Instance, IOHelper, globalSettings, HostingEnvironment)
+            {
+                IsScoped = () => scopedFileSystems
+            };
+        var shadowPath = $"x/{Guid.NewGuid().ToString("N").Substring(0, 6)}";
+        var sw = fileSystems.CreateShadowWrapper(phy, shadowPath);
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            sw.AddFile("sub/f1.txt", ms);
+        }
+
+        Assert.IsTrue(phy.FileExists("sub/f1.txt"));
+
+        string id;
+
+        scopedFileSystems = true; // pretend we have a scope
+        var scope = new ShadowFileSystems(fileSystems, id = ShadowWrapper.CreateShadowId(HostingEnvironment));
+        Assert.IsTrue(Directory.Exists(shadowfs + "/" + id));
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            sw.AddFile("sub/f2.txt", ms);
+        }
+
+        Assert.IsFalse(phy.FileExists("sub/f2.txt"));
+
+        // pretend we're another thread w/out scope
+        scopedFileSystems = false;
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("bar")))
+        {
+            sw.AddFile("sub/f2.txt/f2.txt", ms);
+        }
+
+        scopedFileSystems = true; // pretend we have a scope
+
+        Assert.IsTrue(phy.FileExists("sub/f2.txt/f2.txt")); // other thread has written out to fs
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            sw.AddFile("sub/f3.txt", ms);
+        }
+
+        Assert.IsFalse(phy.FileExists("sub/f3.txt"));
+
+        scope.Complete();
+
+        try
+        {
+            // no way this can work since we're trying to write a file
+            // but there's now a directory with the same name on the real fs
+            scope.Dispose();
+            Assert.Fail("Expected AggregateException.");
+        }
+        catch (AggregateException ae)
+        {
+            Assert.AreEqual(1, ae.InnerExceptions.Count);
+            var e = ae.InnerExceptions[0];
+            Assert.IsNotNull(e.InnerException);
+            Assert.IsInstanceOf<AggregateException>(e);
+            ae = (AggregateException)e;
+
+            Assert.AreEqual(1, ae.InnerExceptions.Count);
+            e = ae.InnerExceptions[0];
+            Assert.IsNotNull(e.InnerException);
+            Assert.IsInstanceOf<Exception>(e.InnerException);
+        }
+
+        // still, the rest of the changes has been applied ok
+        Assert.IsTrue(phy.FileExists("sub/f3.txt"));
+    }
+
+    [Test]
+    public void GetFilesReturnsChildrenOnly()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        File.WriteAllText(path + "/f1.txt", "foo");
+        Directory.CreateDirectory(path + "/test");
+        File.WriteAllText(path + "/test/f2.txt", "foo");
+        Directory.CreateDirectory(path + "/test/inner");
+        File.WriteAllText(path + "/test/inner/f3.txt", "foo");
+
+        path = NormPath(path);
+        var files = Directory.GetFiles(path);
+        Assert.AreEqual(1, files.Length);
+        files = Directory.GetFiles(path, "*", SearchOption.AllDirectories);
+        Assert.AreEqual(3, files.Length);
+        var efiles = Directory.EnumerateFiles(path);
+        Assert.AreEqual(1, efiles.Count());
+        efiles = Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories);
+        Assert.AreEqual(3, efiles.Count());
+    }
+
+    [Test]
+    public void DeleteDirectoryAndFiles()
+    {
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        File.WriteAllText(path + "/f1.txt", "foo");
+        Directory.CreateDirectory(path + "/test");
+        File.WriteAllText(path + "/test/f2.txt", "foo");
+        Directory.CreateDirectory(path + "/test/inner");
+        File.WriteAllText(path + "/test/inner/f3.txt", "foo");
+
+        path = NormPath(path);
+        TestHelper.Try(() => Directory.Delete(path, true));
+        TestHelper.TryAssert(() => Assert.IsFalse(File.Exists(path + "/test/inner/f3.txt")));
+    }
+
+    /// <summary>
+    ///     Check that GetFiles will return all files on the shadow, while returning
+    ///     just one on each of the filesystems used by the shadow.
+    /// </summary>
+    [Test]
+    public void ShadowGetFiles()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.txt", ms);
+        }
+
+        // Assert
+        // ensure we get 2 files from the shadow
+        var getFiles = ss.GetFiles(string.Empty);
+        Assert.AreEqual(2, getFiles.Count());
+
+        var fsFiles = fs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(1, fsFiles.Length);
+        var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(1, sfsFiles.Length);
+    }
+
+    /// <summary>
+    ///     Check that GetFiles using the filter function with empty string will return expected results
+    /// </summary>
+    [Test]
+    public void ShadowGetFilesUsingEmptyFilter()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.txt", ms);
+        }
+
+        // Assert
+        // ensure we get 2 files from the shadow
+        var getFiles = ss.GetFiles(string.Empty);
+        Assert.AreEqual(2, getFiles.Count());
+
+        var fsFiles = fs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(1, fsFiles.Length);
+        var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(1, sfsFiles.Length);
+    }
+
+    /// <summary>
+    ///     Check that GetFiles using the filter function with null will return expected results
+    /// </summary>
+    [Test]
+    public void ShadowGetFilesUsingNullFilter()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.txt", ms);
+        }
+
+        // Assert
+        // ensure we get 2 files from the shadow
+        var getFiles = ss.GetFiles(string.Empty);
+        Assert.AreEqual(2, getFiles.Count());
+        // ensure we get 2 files when using null in filter parameter
+        var getFilesWithNullFilter = ss.GetFiles(string.Empty, null);
+        Assert.AreEqual(2, getFilesWithNullFilter.Count());
+
+        var fsFiles = fs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(1, fsFiles.Length);
+        var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(1, sfsFiles.Length);
+    }
+
+    [Test]
+    public void ShadowGetFilesUsingWildcardFilter()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
+        File.WriteAllText(path + "/ShadowTests/f2.doc", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.txt", ms);
+        }
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.doc", ms);
+        }
+
+        // Assert
+        // ensure we get 4 files from the shadow
+        var getFiles = ss.GetFiles(string.Empty);
+        Assert.AreEqual(4, getFiles.Count());
+        // ensure we get only 2 of 4 files from the shadow when using filter
+        var getFilesWithWildcardFilter = ss.GetFiles(string.Empty, "*.doc");
+        Assert.AreEqual(2, getFilesWithWildcardFilter.Count());
+
+        var fsFiles = fs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(2, fsFiles.Length);
+        var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(2, sfsFiles.Length);
+    }
+
+    [Test]
+    public void ShadowGetFilesUsingSingleCharacterFilter()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f2.txt", "foo");
+        File.WriteAllText(path + "/ShadowTests/f2.doc", "foo");
+        File.WriteAllText(path + "/ShadowTests/f2.docx", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.txt", ms);
+        }
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.doc", ms);
+        }
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f1.docx", ms);
+        }
+
+        // Assert
+        // ensure we get 6 files from the shadow
+        var getFiles = ss.GetFiles(string.Empty);
+        Assert.AreEqual(6, getFiles.Count());
+        // ensure we get only 2 of 6 files from the shadow when using filter on shadow
+        var getFilesWithWildcardSinglecharFilter = ss.GetFiles(string.Empty, "f1.d?c");
+        Assert.AreEqual(1, getFilesWithWildcardSinglecharFilter.Count());
+        // ensure we get only 2 of 6 files from the shadow when using filter on disk
+        var getFilesWithWildcardSinglecharFilter2 = ss.GetFiles(string.Empty, "f2.d?c");
+        Assert.AreEqual(1, getFilesWithWildcardSinglecharFilter2.Count());
+
+        var fsFiles = fs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(3, fsFiles.Length);
+        var sfsFiles = sfs.GetFiles(string.Empty).ToArray();
+        Assert.AreEqual(3, sfsFiles.Length);
+    }
+
+    /// <summary>
+    ///     Returns the full paths of the files on the disk.
+    ///     Note that this will be the *actual* path of the file, meaning a file existing on the initialized FS
+    ///     will be in one location, while a file written after initializing the shadow, will exist at the
+    ///     shadow location directory.
+    /// </summary>
+    [Test]
+    public void ShadowGetFullPath()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f2.txt", ms);
+        }
+
+        // Assert
+        var f1FullPath = ss.GetFullPath("f1.txt");
+        var f2FullPath = ss.GetFullPath("f2.txt");
+        Assert.AreEqual(Path.Combine(path, "ShadowTests", "f1.txt"), f1FullPath);
+        Assert.AreEqual(Path.Combine(path, "ShadowSystem", "f2.txt"), f2FullPath);
+    }
+
+    /// <summary>
+    ///     Returns the path relative to the filesystem root
+    /// </summary>
+    /// <remarks>
+    ///     This file stuff in this test is kinda irrelevant with the current implementation.
+    ///     We do tests that the files are written to the correct places and the relative path is returned correct,
+    ///     but GetRelativePath is currently really just string manipulation so files are not actually hit by the code.
+    ///     Leaving the file stuff in here for now in case the method becomes more clever at some point.
+    /// </remarks>
+    [Test]
+    public void ShadowGetRelativePath()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "ignore");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "ignore");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f2.txt", ms);
+        }
+
+        // Assert
+        var f1RelativePath = ss.GetRelativePath("f1.txt");
+        var f2RelativePath = ss.GetRelativePath("f2.txt");
+        Assert.AreEqual("f1.txt", f1RelativePath);
+        Assert.AreEqual("f2.txt", f2RelativePath);
+        Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowTests", "f1.txt")));
+        Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowTests", "f2.txt")));
+        Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowSystem", "f2.txt")));
+        Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowSystem", "f1.txt")));
+    }
+
+    /// <summary>
+    ///     Ensure the URL returned contains the path relative to the FS root,
+    ///     but including the rootUrl the FS was initialized with.
+    /// </summary>
+    /// <remarks>
+    ///     This file stuff in this test is kinda irrelevant with the current implementation.
+    ///     We do tests that the files are written to the correct places and the URL is returned correct,
+    ///     but GetUrl is currently really just string manipulation so files are not actually hit by the code.
+    ///     Leaving the file stuff in here for now in case the method becomes more clever at some point.
+    /// </remarks>
+    [Test]
+    public void ShadowGetUrl()
+    {
+        // Arrange
+        var path = HostingEnvironment.MapPathContentRoot("FileSysTests");
+        Directory.CreateDirectory(path);
+        Directory.CreateDirectory(path + "/ShadowTests");
+        Directory.CreateDirectory(path + "/ShadowSystem");
+
+        var fs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowTests/", "rootUrl");
+        var sfs = new PhysicalFileSystem(IOHelper, HostingEnvironment, Logger, path + "/ShadowSystem/", "rootUrl");
+        var ss = new ShadowFileSystem(fs, sfs);
+
+        // Act
+        File.WriteAllText(path + "/ShadowTests/f1.txt", "foo");
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+        {
+            ss.AddFile("f2.txt", ms);
+        }
+
+        // Assert
+        var f1Url = ss.GetUrl("f1.txt");
+        var f2Url = ss.GetUrl("f2.txt");
+        Assert.AreEqual("rootUrl/f1.txt", f1Url);
+        Assert.AreEqual("rootUrl/f2.txt", f2Url);
+        Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowTests", "f1.txt")));
+        Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowTests", "f2.txt")));
+        Assert.IsTrue(File.Exists(Path.Combine(path, "ShadowSystem", "f2.txt")));
+        Assert.IsFalse(File.Exists(Path.Combine(path, "ShadowSystem", "f1.txt")));
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
index 3c5275429c..5a3c7723b3 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/ContentTypeModelMappingTests.cs
@@ -2,10 +2,10 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
@@ -17,642 +17,596 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping;
+
+[TestFixture]
+[UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ContentTypeModelMappingTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class ContentTypeModelMappingTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetupTest()
     {
-        private IDataTypeService _dataTypeService;
-        private IUmbracoMapper _sut;
-        private IFileService _fileService;
-        private IConfigurationEditorJsonSerializer _serializer;
+        _sut = Services.GetRequiredService<IUmbracoMapper>();
+        _dataTypeService = Services.GetRequiredService<IDataTypeService>();
+        _fileService = Services.GetRequiredService<IFileService>();
+        _serializer = Services.GetRequiredService<IConfigurationEditorJsonSerializer>();
+    }
 
-        [SetUp]
-        public void SetupTest()
+    private IDataTypeService _dataTypeService;
+    private IUmbracoMapper _sut;
+    private IFileService _fileService;
+    private IConfigurationEditorJsonSerializer _serializer;
+
+    [Test]
+    public void MemberTypeSave_To_IMemberType()
+    {
+        // Arrange
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
+
+        var display = CreateMemberTypeSave(dataType.Id);
+
+        // Act
+        var result = _sut.Map<IMemberType>(display);
+
+        // Assert
+        Assert.AreEqual(display.Alias, result.Alias);
+        Assert.AreEqual(display.Description, result.Description);
+        Assert.AreEqual(display.Icon, result.Icon);
+        Assert.AreEqual(display.Id, result.Id);
+        Assert.AreEqual(display.Name, result.Name);
+        Assert.AreEqual(display.ParentId, result.ParentId);
+        Assert.AreEqual(display.Path, result.Path);
+        Assert.AreEqual(display.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(display.IsContainer, result.IsContainer);
+        Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
+        Assert.AreEqual(display.CreateDate, result.CreateDate);
+        Assert.AreEqual(display.UpdateDate, result.UpdateDate);
+
+        // TODO: Now we need to assert all of the more complicated parts
+        Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
+        for (var i = 0; i < display.Groups.Count(); i++)
         {
-            _sut = Services.GetRequiredService<IUmbracoMapper>();
-            _dataTypeService = Services.GetRequiredService<IDataTypeService>();
-            _fileService = Services.GetRequiredService<IFileService>();
-            _serializer = Services.GetRequiredService<IConfigurationEditorJsonSerializer>();
+            Assert.AreEqual(display.Groups.ElementAt(i).Id, result.PropertyGroups.ElementAt(i).Id);
+            Assert.AreEqual(display.Groups.ElementAt(i).Name, result.PropertyGroups.ElementAt(i).Name);
+            var propTypes = display.Groups.ElementAt(i).Properties;
+            Assert.AreEqual(propTypes.Count(), result.PropertyTypes.Count());
+            for (var j = 0; j < propTypes.Count(); j++)
+            {
+                Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
+                Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
+                Assert.AreEqual(propTypes.ElementAt(j).MemberCanViewProperty, result.MemberCanViewProperty(result.PropertyTypes.ElementAt(j).Alias));
+                Assert.AreEqual(propTypes.ElementAt(j).MemberCanEditProperty, result.MemberCanEditProperty(result.PropertyTypes.ElementAt(j).Alias));
+                Assert.AreEqual(propTypes.ElementAt(j).IsSensitiveData, result.IsSensitiveProperty(result.PropertyTypes.ElementAt(j).Alias));
+            }
         }
 
-        [Test]
-        public void MemberTypeSave_To_IMemberType()
+        Assert.AreEqual(display.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < display.AllowedContentTypes.Count(); i++)
         {
-            // Arrange
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
+            Assert.AreEqual(display.AllowedContentTypes.ElementAt(i), result.AllowedContentTypes.ElementAt(i).Id.Value);
+        }
+    }
+
+    [Test]
+    public void MediaTypeSave_To_IMediaType()
+    {
+        // Arrange
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
+
+        var display = CreateMediaTypeSave(dataType.Id);
+
+        // Act
+        var result = _sut.Map<IMediaType>(display);
+
+        // Assert
+        Assert.AreEqual(display.Alias, result.Alias);
+        Assert.AreEqual(display.Description, result.Description);
+        Assert.AreEqual(display.Icon, result.Icon);
+        Assert.AreEqual(display.Id, result.Id);
+        Assert.AreEqual(display.Name, result.Name);
+        Assert.AreEqual(display.ParentId, result.ParentId);
+        Assert.AreEqual(display.Path, result.Path);
+        Assert.AreEqual(display.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(display.IsContainer, result.IsContainer);
+        Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
+        Assert.AreEqual(display.CreateDate, result.CreateDate);
+        Assert.AreEqual(display.UpdateDate, result.UpdateDate);
+
+        // TODO: Now we need to assert all of the more complicated parts
+        Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
+        for (var i = 0; i < display.Groups.Count(); i++)
+        {
+            Assert.AreEqual(display.Groups.ElementAt(i).Id, result.PropertyGroups.ElementAt(i).Id);
+            Assert.AreEqual(display.Groups.ElementAt(i).Name, result.PropertyGroups.ElementAt(i).Name);
+            var propTypes = display.Groups.ElementAt(i).Properties;
+            Assert.AreEqual(propTypes.Count(), result.PropertyTypes.Count());
+            for (var j = 0; j < propTypes.Count(); j++)
             {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
+                Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
+                Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
+            }
+        }
 
-            MemberTypeSave display = CreateMemberTypeSave(dataType.Id);
+        Assert.AreEqual(display.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < display.AllowedContentTypes.Count(); i++)
+        {
+            Assert.AreEqual(display.AllowedContentTypes.ElementAt(i), result.AllowedContentTypes.ElementAt(i).Id.Value);
+        }
+    }
 
-            // Act
-            IMemberType result = _sut.Map<IMemberType>(display);
+    [Test]
+    public void ContentTypeSave_To_IContentType()
+    {
+        // Arrange
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
 
-            // Assert
-            Assert.AreEqual(display.Alias, result.Alias);
-            Assert.AreEqual(display.Description, result.Description);
-            Assert.AreEqual(display.Icon, result.Icon);
-            Assert.AreEqual(display.Id, result.Id);
-            Assert.AreEqual(display.Name, result.Name);
-            Assert.AreEqual(display.ParentId, result.ParentId);
-            Assert.AreEqual(display.Path, result.Path);
-            Assert.AreEqual(display.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(display.IsContainer, result.IsContainer);
-            Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
-            Assert.AreEqual(display.CreateDate, result.CreateDate);
-            Assert.AreEqual(display.UpdateDate, result.UpdateDate);
+        var templates = new ITemplate[]
+        {
+            // Note the aliases is important - TODO use builder
+            new Template(Services.GetRequiredService<IShortStringHelper>(), "Name 1", "test"),
+            new Template(Services.GetRequiredService<IShortStringHelper>(), "Name 2", "template1"),
+            new Template(Services.GetRequiredService<IShortStringHelper>(), "Name 3", "template2")
+        };
 
-            // TODO: Now we need to assert all of the more complicated parts
-            Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
-            for (int i = 0; i < display.Groups.Count(); i++)
+        foreach (var template in templates)
+        {
+            _fileService.SaveTemplate(template);
+        }
+
+        var display = CreateContentTypeSave(dataType.Id);
+
+        // Act
+        var result = _sut.Map<IContentType>(display);
+
+        // Assert
+        Assert.AreEqual(display.Alias, result.Alias);
+        Assert.AreEqual(display.Description, result.Description);
+        Assert.AreEqual(display.Icon, result.Icon);
+        Assert.AreEqual(display.Id, result.Id);
+        Assert.AreEqual(display.Name, result.Name);
+        Assert.AreEqual(display.ParentId, result.ParentId);
+        Assert.AreEqual(display.Path, result.Path);
+        Assert.AreEqual(display.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(display.IsContainer, result.IsContainer);
+        Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
+        Assert.AreEqual(display.CreateDate, result.CreateDate);
+        Assert.AreEqual(display.UpdateDate, result.UpdateDate);
+
+        // TODO: Now we need to assert all of the more complicated parts
+        Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
+        for (var i = 0; i < display.Groups.Count(); i++)
+        {
+            Assert.AreEqual(display.Groups.ElementAt(i).Id, result.PropertyGroups.ElementAt(i).Id);
+            Assert.AreEqual(display.Groups.ElementAt(i).Name, result.PropertyGroups.ElementAt(i).Name);
+            var propTypes = display.Groups.ElementAt(i).Properties;
+            Assert.AreEqual(propTypes.Count(), result.PropertyTypes.Count());
+            for (var j = 0; j < propTypes.Count(); j++)
             {
-                Assert.AreEqual(display.Groups.ElementAt(i).Id, result.PropertyGroups.ElementAt(i).Id);
-                Assert.AreEqual(display.Groups.ElementAt(i).Name, result.PropertyGroups.ElementAt(i).Name);
-                IEnumerable<MemberPropertyTypeBasic> propTypes = display.Groups.ElementAt(i).Properties;
-                Assert.AreEqual(propTypes.Count(), result.PropertyTypes.Count());
-                for (int j = 0; j < propTypes.Count(); j++)
+                Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
+                Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
+                Assert.AreEqual(propTypes.ElementAt(j).LabelOnTop, result.PropertyTypes.ElementAt(j).LabelOnTop);
+            }
+        }
+
+        var allowedTemplateAliases = display.AllowedTemplates
+            .Concat(new[] { display.DefaultTemplate })
+            .Distinct();
+
+        Assert.AreEqual(allowedTemplateAliases.Count(), result.AllowedTemplates.Count());
+        for (var i = 0; i < display.AllowedTemplates.Count(); i++)
+        {
+            Assert.AreEqual(display.AllowedTemplates.ElementAt(i), result.AllowedTemplates.ElementAt(i).Alias);
+        }
+
+        Assert.AreEqual(display.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < display.AllowedContentTypes.Count(); i++)
+        {
+            Assert.AreEqual(display.AllowedContentTypes.ElementAt(i), result.AllowedContentTypes.ElementAt(i).Id.Value);
+        }
+    }
+
+    [Test]
+    public void MediaTypeSave_With_Composition_To_IMediaType()
+    {
+        // Arrange
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
+
+        var display = CreateCompositionMediaTypeSave(dataType.Id);
+
+        // Act
+        var result = _sut.Map<IMediaType>(display);
+
+        // Assert
+        Assert.AreEqual(display.Groups.Count(x => x.Inherited == false), result.PropertyGroups.Count);
+
+        // TODO: Now we need to assert all of the more complicated parts
+    }
+
+    [Test]
+    public void ContentTypeSave_With_Composition_To_IContentType()
+    {
+        // Arrange
+
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
+
+        var display = CreateCompositionContentTypeSave(dataType.Id);
+
+        // Act
+        var result = _sut.Map<IContentType>(display);
+
+        // Assert
+        // TODO: Now we need to assert all of the more complicated parts
+        Assert.AreEqual(display.Groups.Count(x => x.Inherited == false), result.PropertyGroups.Count);
+    }
+
+    [Test]
+    public void IMemberType_To_MemberTypeDisplay()
+    {
+        // Arrange
+        var memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        var alias = memberType.PropertyTypes.Last().Alias;
+        memberType.SetIsSensitiveProperty(alias, true);
+        memberType.SetMemberCanEditProperty(alias, true);
+        memberType.SetMemberCanViewProperty(alias, true);
+        MemberTypeBuilder.EnsureAllIds(memberType, 8888);
+
+        // Act
+        var result = _sut.Map<MemberTypeDisplay>(memberType);
+
+        // Assert
+        Assert.AreEqual(memberType.Alias, result.Alias);
+        Assert.AreEqual(memberType.Description, result.Description);
+        Assert.AreEqual(memberType.Icon, result.Icon);
+        Assert.AreEqual(memberType.Id, result.Id);
+        Assert.AreEqual(memberType.Name, result.Name);
+        Assert.AreEqual(memberType.ParentId, result.ParentId);
+        Assert.AreEqual(memberType.Path, result.Path);
+        Assert.AreEqual(memberType.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(memberType.IsContainer, result.IsContainer);
+        Assert.AreEqual(memberType.CreateDate, result.CreateDate);
+        Assert.AreEqual(memberType.UpdateDate, result.UpdateDate);
+
+        Assert.AreEqual(memberType.PropertyGroups.Count(), result.Groups.Count());
+        for (var i = 0; i < memberType.PropertyGroups.Count(); i++)
+        {
+            Assert.AreEqual(memberType.PropertyGroups.ElementAt(i).Id, result.Groups.ElementAt(i).Id);
+            Assert.AreEqual(memberType.PropertyGroups.ElementAt(i).Name, result.Groups.ElementAt(i).Name);
+            var propTypes = memberType.PropertyGroups.ElementAt(i).PropertyTypes;
+
+            Assert.AreEqual(propTypes.Count(), result.Groups.ElementAt(i).Properties.Count());
+            for (var j = 0; j < propTypes.Count(); j++)
+            {
+                Assert.AreEqual(propTypes.ElementAt(j).Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
+                Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
+
+                Assert.AreEqual(memberType.MemberCanViewProperty(propTypes.ElementAt(j).Alias), result.Groups.ElementAt(i).Properties.ElementAt(j).MemberCanViewProperty);
+                Assert.AreEqual(memberType.MemberCanEditProperty(propTypes.ElementAt(j).Alias), result.Groups.ElementAt(i).Properties.ElementAt(j).MemberCanEditProperty);
+            }
+        }
+
+        Assert.AreEqual(memberType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < memberType.AllowedContentTypes.Count(); i++)
+        {
+            Assert.AreEqual(memberType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void IMediaType_To_MediaTypeDisplay()
+    {
+        // Arrange
+        var mediaType = MediaTypeBuilder.CreateImageMediaType();
+        MediaTypeBuilder.EnsureAllIds(mediaType, 8888);
+
+        // Act
+        var result = _sut.Map<MediaTypeDisplay>(mediaType);
+
+        // Assert
+        Assert.AreEqual(mediaType.Alias, result.Alias);
+        Assert.AreEqual(mediaType.Description, result.Description);
+        Assert.AreEqual(mediaType.Icon, result.Icon);
+        Assert.AreEqual(mediaType.Id, result.Id);
+        Assert.AreEqual(mediaType.Name, result.Name);
+        Assert.AreEqual(mediaType.ParentId, result.ParentId);
+        Assert.AreEqual(mediaType.Path, result.Path);
+        Assert.AreEqual(mediaType.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(mediaType.IsContainer, result.IsContainer);
+        Assert.AreEqual(mediaType.CreateDate, result.CreateDate);
+        Assert.AreEqual(mediaType.UpdateDate, result.UpdateDate);
+
+        Assert.AreEqual(mediaType.PropertyGroups.Count(), result.Groups.Count());
+        for (var i = 0; i < mediaType.PropertyGroups.Count(); i++)
+        {
+            Assert.AreEqual(mediaType.PropertyGroups.ElementAt(i).Id, result.Groups.ElementAt(i).Id);
+            Assert.AreEqual(mediaType.PropertyGroups.ElementAt(i).Name, result.Groups.ElementAt(i).Name);
+            var propTypes = mediaType.PropertyGroups.ElementAt(i).PropertyTypes;
+
+            Assert.AreEqual(propTypes.Count(), result.Groups.ElementAt(i).Properties.Count());
+            for (var j = 0; j < propTypes.Count(); j++)
+            {
+                Assert.AreEqual(propTypes.ElementAt(j).Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
+                Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
+            }
+        }
+
+        Assert.AreEqual(mediaType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < mediaType.AllowedContentTypes.Count(); i++)
+        {
+            Assert.AreEqual(mediaType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void IContentType_To_ContentTypeDisplay()
+    {
+        // Arrange
+        //// _dataTypeService.Setup(x => x.GetDataType(It.IsAny<int>()))
+        ////     .Returns(new DataType(new VoidEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(),Mock.Of<ILocalizedTextService>(), Mock.Of<IShortStringHelper>())));
+        //
+        // setup the mocks to return the data we want to test against...
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        ContentTypeBuilder.EnsureAllIds(contentType, 8888);
+
+        // Act
+        var result = _sut.Map<DocumentTypeDisplay>(contentType);
+
+        // Assert
+        Assert.AreEqual(contentType.Alias, result.Alias);
+        Assert.AreEqual(contentType.Description, result.Description);
+        Assert.AreEqual(contentType.Icon, result.Icon);
+        Assert.AreEqual(contentType.Id, result.Id);
+        Assert.AreEqual(contentType.Name, result.Name);
+        Assert.AreEqual(contentType.ParentId, result.ParentId);
+        Assert.AreEqual(contentType.Path, result.Path);
+        Assert.AreEqual(contentType.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(contentType.IsContainer, result.IsContainer);
+        Assert.AreEqual(contentType.CreateDate, result.CreateDate);
+        Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
+        Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias);
+
+        Assert.AreEqual(contentType.PropertyGroups.Count, result.Groups.Count());
+        for (var i = 0; i < contentType.PropertyGroups.Count; i++)
+        {
+            Assert.AreEqual(contentType.PropertyGroups[i].Id, result.Groups.ElementAt(i).Id);
+            Assert.AreEqual(contentType.PropertyGroups[i].Name, result.Groups.ElementAt(i).Name);
+            var propTypes = contentType.PropertyGroups[i].PropertyTypes;
+
+            Assert.AreEqual(propTypes.Count, result.Groups.ElementAt(i).Properties.Count());
+            for (var j = 0; j < propTypes.Count; j++)
+            {
+                Assert.AreEqual(propTypes[j].Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
+                Assert.AreEqual(propTypes[j].DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
+                Assert.AreEqual(propTypes[j].LabelOnTop, result.Groups.ElementAt(i).Properties.ElementAt(j).LabelOnTop);
+            }
+        }
+
+        Assert.AreEqual(contentType.AllowedTemplates.Count(), result.AllowedTemplates.Count());
+        for (var i = 0; i < contentType.AllowedTemplates.Count(); i++)
+        {
+            Assert.AreEqual(contentType.AllowedTemplates.ElementAt(i).Id, result.AllowedTemplates.ElementAt(i).Id);
+        }
+
+        Assert.AreEqual(contentType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < contentType.AllowedContentTypes.Count(); i++)
+        {
+            Assert.AreEqual(contentType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void MemberPropertyGroupBasic_To_MemberPropertyGroup()
+    {
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
+
+        var basic = new PropertyGroupBasic<MemberPropertyTypeBasic>
+        {
+            Id = 222,
+            Alias = "group1",
+            Name = "Group 1",
+            SortOrder = 1,
+            Properties = new[]
+            {
+                new MemberPropertyTypeBasic
                 {
-                    Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
-                    Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
-                    Assert.AreEqual(propTypes.ElementAt(j).MemberCanViewProperty, result.MemberCanViewProperty(result.PropertyTypes.ElementAt(j).Alias));
-                    Assert.AreEqual(propTypes.ElementAt(j).MemberCanEditProperty, result.MemberCanEditProperty(result.PropertyTypes.ElementAt(j).Alias));
-                    Assert.AreEqual(propTypes.ElementAt(j).IsSensitiveData, result.IsSensitiveProperty(result.PropertyTypes.ElementAt(j).Alias));
+                    MemberCanEditProperty = true,
+                    MemberCanViewProperty = true,
+                    IsSensitiveData = true,
+                    Id = 33,
+                    SortOrder = 1,
+                    Alias = "prop1",
+                    Description = "property 1",
+                    DataTypeId = dataType.Id,
+                    GroupId = 222,
+                    Label = "Prop 1",
+                    Validation = new PropertyTypeValidation {Mandatory = true, Pattern = null}
+                },
+                new MemberPropertyTypeBasic
+                {
+                    MemberCanViewProperty = false,
+                    MemberCanEditProperty = false,
+                    IsSensitiveData = false,
+                    Id = 34,
+                    SortOrder = 2,
+                    Alias = "prop2",
+                    Description = "property 2",
+                    DataTypeId = dataType.Id,
+                    GroupId = 222,
+                    Label = "Prop 2",
+                    Validation = new PropertyTypeValidation {Mandatory = false, Pattern = null}
                 }
             }
+        };
 
-            Assert.AreEqual(display.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < display.AllowedContentTypes.Count(); i++)
-            {
-                Assert.AreEqual(display.AllowedContentTypes.ElementAt(i), result.AllowedContentTypes.ElementAt(i).Id.Value);
-            }
-        }
+        var contentType = new MemberTypeSave { Id = 0, ParentId = -1, Alias = "alias", Groups = new[] { basic } };
 
-        [Test]
-        public void MediaTypeSave_To_IMediaType()
+        // proper group properties mapping takes place when mapping the content type,
+        // not when mapping the group - because of inherited properties and such
+        // var result = Mapper.Map<PropertyGroup>(basic);
+        var result = _sut.Map<IMemberType>(contentType).PropertyGroups[0];
+
+        Assert.AreEqual(basic.Name, result.Name);
+        Assert.AreEqual(basic.Id, result.Id);
+        Assert.AreEqual(basic.SortOrder, result.SortOrder);
+        Assert.AreEqual(basic.Properties.Count(), result.PropertyTypes.Count());
+    }
+
+    [Test]
+    public void PropertyGroupBasic_To_PropertyGroup()
+    {
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
+
+        var basic = new PropertyGroupBasic<PropertyTypeBasic>
         {
-            // Arrange
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
+            Id = 222,
+            Alias = "group1",
+            Name = "Group 1",
+            SortOrder = 1,
+            Properties = new[]
             {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
-
-            MediaTypeSave display = CreateMediaTypeSave(dataType.Id);
-
-            // Act
-            IMediaType result = _sut.Map<IMediaType>(display);
-
-            // Assert
-            Assert.AreEqual(display.Alias, result.Alias);
-            Assert.AreEqual(display.Description, result.Description);
-            Assert.AreEqual(display.Icon, result.Icon);
-            Assert.AreEqual(display.Id, result.Id);
-            Assert.AreEqual(display.Name, result.Name);
-            Assert.AreEqual(display.ParentId, result.ParentId);
-            Assert.AreEqual(display.Path, result.Path);
-            Assert.AreEqual(display.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(display.IsContainer, result.IsContainer);
-            Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
-            Assert.AreEqual(display.CreateDate, result.CreateDate);
-            Assert.AreEqual(display.UpdateDate, result.UpdateDate);
-
-            // TODO: Now we need to assert all of the more complicated parts
-            Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
-            for (int i = 0; i < display.Groups.Count(); i++)
-            {
-                Assert.AreEqual(display.Groups.ElementAt(i).Id, result.PropertyGroups.ElementAt(i).Id);
-                Assert.AreEqual(display.Groups.ElementAt(i).Name, result.PropertyGroups.ElementAt(i).Name);
-                IEnumerable<PropertyTypeBasic> propTypes = display.Groups.ElementAt(i).Properties;
-                Assert.AreEqual(propTypes.Count(), result.PropertyTypes.Count());
-                for (int j = 0; j < propTypes.Count(); j++)
+                new PropertyTypeBasic
                 {
-                    Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
-                    Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
+                    Id = 33,
+                    SortOrder = 1,
+                    Alias = "prop1",
+                    Description = "property 1",
+                    DataTypeId = dataType.Id,
+                    GroupId = 222,
+                    Label = "Prop 1",
+                    Validation = new PropertyTypeValidation {Mandatory = true, Pattern = null}
+                },
+                new PropertyTypeBasic
+                {
+                    Id = 34,
+                    SortOrder = 2,
+                    Alias = "prop2",
+                    Description = "property 2",
+                    DataTypeId = dataType.Id,
+                    GroupId = 222,
+                    Label = "Prop 2",
+                    Validation = new PropertyTypeValidation {Mandatory = false, Pattern = null}
                 }
             }
+        };
 
-            Assert.AreEqual(display.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < display.AllowedContentTypes.Count(); i++)
-            {
-                Assert.AreEqual(display.AllowedContentTypes.ElementAt(i), result.AllowedContentTypes.ElementAt(i).Id.Value);
-            }
-        }
-
-        [Test]
-        public void ContentTypeSave_To_IContentType()
+        var contentType = new DocumentTypeSave
         {
-            // Arrange
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
-            {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
+            Id = 0,
+            ParentId = -1,
+            Alias = "alias",
+            AllowedTemplates = Enumerable.Empty<string>(),
+            Groups = new[] { basic }
+        };
 
-            var templates = new ITemplate[]
-            {
-                // Note the aliases is important - TODO use builder
-                new Template(Services.GetRequiredService<IShortStringHelper>(), "Name 1", "test"),
-                new Template(Services.GetRequiredService<IShortStringHelper>(), "Name 2", "template1"),
-                new Template(Services.GetRequiredService<IShortStringHelper>(), "Name 3", "template2"),
-            };
+        // proper group properties mapping takes place when mapping the content type,
+        // not when mapping the group - because of inherited properties and such
+        // var result = Mapper.Map<PropertyGroup>(basic);
+        var result = _sut.Map<IContentType>(contentType).PropertyGroups[0];
 
-            foreach (ITemplate template in templates)
-            {
-                _fileService.SaveTemplate(template);
-            }
+        Assert.AreEqual(basic.Name, result.Name);
+        Assert.AreEqual(basic.Id, result.Id);
+        Assert.AreEqual(basic.SortOrder, result.SortOrder);
+        Assert.AreEqual(basic.Properties.Count(), result.PropertyTypes.Count());
+    }
 
-            DocumentTypeSave display = CreateContentTypeSave(dataType.Id);
-
-            // Act
-            IContentType result = _sut.Map<IContentType>(display);
-
-            // Assert
-            Assert.AreEqual(display.Alias, result.Alias);
-            Assert.AreEqual(display.Description, result.Description);
-            Assert.AreEqual(display.Icon, result.Icon);
-            Assert.AreEqual(display.Id, result.Id);
-            Assert.AreEqual(display.Name, result.Name);
-            Assert.AreEqual(display.ParentId, result.ParentId);
-            Assert.AreEqual(display.Path, result.Path);
-            Assert.AreEqual(display.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(display.IsContainer, result.IsContainer);
-            Assert.AreEqual(display.AllowAsRoot, result.AllowedAsRoot);
-            Assert.AreEqual(display.CreateDate, result.CreateDate);
-            Assert.AreEqual(display.UpdateDate, result.UpdateDate);
-
-            // TODO: Now we need to assert all of the more complicated parts
-            Assert.AreEqual(display.Groups.Count(), result.PropertyGroups.Count);
-            for (int i = 0; i < display.Groups.Count(); i++)
-            {
-                Assert.AreEqual(display.Groups.ElementAt(i).Id, result.PropertyGroups.ElementAt(i).Id);
-                Assert.AreEqual(display.Groups.ElementAt(i).Name, result.PropertyGroups.ElementAt(i).Name);
-                IEnumerable<PropertyTypeBasic> propTypes = display.Groups.ElementAt(i).Properties;
-                Assert.AreEqual(propTypes.Count(), result.PropertyTypes.Count());
-                for (int j = 0; j < propTypes.Count(); j++)
-                {
-                    Assert.AreEqual(propTypes.ElementAt(j).Id, result.PropertyTypes.ElementAt(j).Id);
-                    Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.PropertyTypes.ElementAt(j).DataTypeId);
-                    Assert.AreEqual(propTypes.ElementAt(j).LabelOnTop, result.PropertyTypes.ElementAt(j).LabelOnTop);
-                }
-            }
-
-            IEnumerable<string> allowedTemplateAliases = display.AllowedTemplates
-                .Concat(new[] { display.DefaultTemplate })
-                .Distinct();
-
-            Assert.AreEqual(allowedTemplateAliases.Count(), result.AllowedTemplates.Count());
-            for (int i = 0; i < display.AllowedTemplates.Count(); i++)
-            {
-                Assert.AreEqual(display.AllowedTemplates.ElementAt(i), result.AllowedTemplates.ElementAt(i).Alias);
-            }
-
-            Assert.AreEqual(display.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < display.AllowedContentTypes.Count(); i++)
-            {
-                Assert.AreEqual(display.AllowedContentTypes.ElementAt(i), result.AllowedContentTypes.ElementAt(i).Id.Value);
-            }
-        }
-
-        [Test]
-        public void MediaTypeSave_With_Composition_To_IMediaType()
+    [Test]
+    public void MemberPropertyTypeBasic_To_PropertyType()
+    {
+        var basic = new MemberPropertyTypeBasic
         {
-            // Arrange
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
+            Id = 33,
+            SortOrder = 1,
+            Alias = "prop1",
+            Description = "property 1",
+            DataTypeId = -88,
+            GroupId = 222,
+            Label = "Prop 1",
+            Validation = new PropertyTypeValidation
             {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
-
-            MediaTypeSave display = CreateCompositionMediaTypeSave(dataType.Id);
-
-            // Act
-            IMediaType result = _sut.Map<IMediaType>(display);
-
-            // Assert
-            Assert.AreEqual(display.Groups.Count(x => x.Inherited == false), result.PropertyGroups.Count);
-
-            // TODO: Now we need to assert all of the more complicated parts
-        }
-
-        [Test]
-        public void ContentTypeSave_With_Composition_To_IContentType()
-        {
-            // Arrange
-
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
-            {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
-
-            DocumentTypeSave display = CreateCompositionContentTypeSave(dataType.Id);
-
-            // Act
-            IContentType result = _sut.Map<IContentType>(display);
-
-            // Assert
-            // TODO: Now we need to assert all of the more complicated parts
-            Assert.AreEqual(display.Groups.Count(x => x.Inherited == false), result.PropertyGroups.Count);
-        }
-
-        [Test]
-        public void IMemberType_To_MemberTypeDisplay()
-        {
-            // Arrange
-            MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            string alias = memberType.PropertyTypes.Last().Alias;
-            memberType.SetIsSensitiveProperty(alias, true);
-            memberType.SetMemberCanEditProperty(alias, true);
-            memberType.SetMemberCanViewProperty(alias, true);
-            MemberTypeBuilder.EnsureAllIds(memberType, 8888);
-
-            // Act
-            MemberTypeDisplay result = _sut.Map<MemberTypeDisplay>(memberType);
-
-            // Assert
-            Assert.AreEqual(memberType.Alias, result.Alias);
-            Assert.AreEqual(memberType.Description, result.Description);
-            Assert.AreEqual(memberType.Icon, result.Icon);
-            Assert.AreEqual(memberType.Id, result.Id);
-            Assert.AreEqual(memberType.Name, result.Name);
-            Assert.AreEqual(memberType.ParentId, result.ParentId);
-            Assert.AreEqual(memberType.Path, result.Path);
-            Assert.AreEqual(memberType.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(memberType.IsContainer, result.IsContainer);
-            Assert.AreEqual(memberType.CreateDate, result.CreateDate);
-            Assert.AreEqual(memberType.UpdateDate, result.UpdateDate);
-
-            Assert.AreEqual(memberType.PropertyGroups.Count(), result.Groups.Count());
-            for (int i = 0; i < memberType.PropertyGroups.Count(); i++)
-            {
-                Assert.AreEqual(memberType.PropertyGroups.ElementAt(i).Id, result.Groups.ElementAt(i).Id);
-                Assert.AreEqual(memberType.PropertyGroups.ElementAt(i).Name, result.Groups.ElementAt(i).Name);
-                PropertyTypeCollection propTypes = memberType.PropertyGroups.ElementAt(i).PropertyTypes;
-
-                Assert.AreEqual(propTypes.Count(), result.Groups.ElementAt(i).Properties.Count());
-                for (int j = 0; j < propTypes.Count(); j++)
-                {
-                    Assert.AreEqual(propTypes.ElementAt(j).Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
-                    Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
-
-                    Assert.AreEqual(memberType.MemberCanViewProperty(propTypes.ElementAt(j).Alias), result.Groups.ElementAt(i).Properties.ElementAt(j).MemberCanViewProperty);
-                    Assert.AreEqual(memberType.MemberCanEditProperty(propTypes.ElementAt(j).Alias), result.Groups.ElementAt(i).Properties.ElementAt(j).MemberCanEditProperty);
-                }
+                Mandatory = true,
+                MandatoryMessage = "Please enter a value",
+                Pattern = "xyz",
+                PatternMessage = "Please match the pattern"
             }
+        };
 
-            Assert.AreEqual(memberType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < memberType.AllowedContentTypes.Count(); i++)
+        var result = _sut.Map<IPropertyType>(basic);
+
+        Assert.AreEqual(basic.Id, result.Id);
+        Assert.AreEqual(basic.SortOrder, result.SortOrder);
+        Assert.AreEqual(basic.Alias, result.Alias);
+        Assert.AreEqual(basic.Description, result.Description);
+        Assert.AreEqual(basic.DataTypeId, result.DataTypeId);
+        Assert.AreEqual(basic.Label, result.Name);
+        Assert.AreEqual(basic.Validation.Mandatory, result.Mandatory);
+        Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
+        Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
+        Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
+        Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
+    }
+
+    [Test]
+    public void PropertyTypeBasic_To_PropertyType()
+    {
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+        _dataTypeService.Save(dataType);
+
+        var basic = new PropertyTypeBasic
+        {
+            Id = 33,
+            SortOrder = 1,
+            Alias = "prop1",
+            Description = "property 1",
+            DataTypeId = dataType.Id,
+            GroupId = 222,
+            Label = "Prop 1",
+            Validation = new PropertyTypeValidation
             {
-                Assert.AreEqual(memberType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
+                Mandatory = true,
+                MandatoryMessage = "Please enter a value",
+                Pattern = "xyz",
+                PatternMessage = "Please match the pattern"
             }
-        }
+        };
 
-        [Test]
-        public void IMediaType_To_MediaTypeDisplay()
-        {
-            // Arrange
-            MediaType mediaType = MediaTypeBuilder.CreateImageMediaType();
-            MediaTypeBuilder.EnsureAllIds(mediaType, 8888);
+        var result = _sut.Map<IPropertyType>(basic);
 
-            // Act
-            MediaTypeDisplay result = _sut.Map<MediaTypeDisplay>(mediaType);
+        Assert.AreEqual(basic.Id, result.Id);
+        Assert.AreEqual(basic.SortOrder, result.SortOrder);
+        Assert.AreEqual(basic.Alias, result.Alias);
+        Assert.AreEqual(basic.Description, result.Description);
+        Assert.AreEqual(basic.DataTypeId, result.DataTypeId);
+        Assert.AreEqual(basic.Label, result.Name);
+        Assert.AreEqual(basic.Validation.Mandatory, result.Mandatory);
+        Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
+        Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
+        Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
+        Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
+    }
 
-            // Assert
-            Assert.AreEqual(mediaType.Alias, result.Alias);
-            Assert.AreEqual(mediaType.Description, result.Description);
-            Assert.AreEqual(mediaType.Icon, result.Icon);
-            Assert.AreEqual(mediaType.Id, result.Id);
-            Assert.AreEqual(mediaType.Name, result.Name);
-            Assert.AreEqual(mediaType.ParentId, result.ParentId);
-            Assert.AreEqual(mediaType.Path, result.Path);
-            Assert.AreEqual(mediaType.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(mediaType.IsContainer, result.IsContainer);
-            Assert.AreEqual(mediaType.CreateDate, result.CreateDate);
-            Assert.AreEqual(mediaType.UpdateDate, result.UpdateDate);
+    [Test]
+    public void IMediaTypeComposition_To_MediaTypeDisplay()
+    {
+        // Arrange
+        var ctMain = MediaTypeBuilder.CreateSimpleMediaType("parent", "Parent");
 
-            Assert.AreEqual(mediaType.PropertyGroups.Count(), result.Groups.Count());
-            for (int i = 0; i < mediaType.PropertyGroups.Count(); i++)
-            {
-                Assert.AreEqual(mediaType.PropertyGroups.ElementAt(i).Id, result.Groups.ElementAt(i).Id);
-                Assert.AreEqual(mediaType.PropertyGroups.ElementAt(i).Name, result.Groups.ElementAt(i).Name);
-                PropertyTypeCollection propTypes = mediaType.PropertyGroups.ElementAt(i).PropertyTypes;
-
-                Assert.AreEqual(propTypes.Count(), result.Groups.ElementAt(i).Properties.Count());
-                for (int j = 0; j < propTypes.Count(); j++)
-                {
-                    Assert.AreEqual(propTypes.ElementAt(j).Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
-                    Assert.AreEqual(propTypes.ElementAt(j).DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
-                }
-            }
-
-            Assert.AreEqual(mediaType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < mediaType.AllowedContentTypes.Count(); i++)
-            {
-                Assert.AreEqual(mediaType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void IContentType_To_ContentTypeDisplay()
-        {
-            // Arrange
-            //// _dataTypeService.Setup(x => x.GetDataType(It.IsAny<int>()))
-            ////     .Returns(new DataType(new VoidEditor(Mock.Of<ILogger>(), Mock.Of<IDataTypeService>(), Mock.Of<ILocalizationService>(),Mock.Of<ILocalizedTextService>(), Mock.Of<IShortStringHelper>())));
-            //
-            // setup the mocks to return the data we want to test against...
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            ContentTypeBuilder.EnsureAllIds(contentType, 8888);
-
-            // Act
-            DocumentTypeDisplay result = _sut.Map<DocumentTypeDisplay>(contentType);
-
-            // Assert
-            Assert.AreEqual(contentType.Alias, result.Alias);
-            Assert.AreEqual(contentType.Description, result.Description);
-            Assert.AreEqual(contentType.Icon, result.Icon);
-            Assert.AreEqual(contentType.Id, result.Id);
-            Assert.AreEqual(contentType.Name, result.Name);
-            Assert.AreEqual(contentType.ParentId, result.ParentId);
-            Assert.AreEqual(contentType.Path, result.Path);
-            Assert.AreEqual(contentType.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(contentType.IsContainer, result.IsContainer);
-            Assert.AreEqual(contentType.CreateDate, result.CreateDate);
-            Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
-            Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias);
-
-            Assert.AreEqual(contentType.PropertyGroups.Count, result.Groups.Count());
-            for (int i = 0; i < contentType.PropertyGroups.Count; i++)
-            {
-                Assert.AreEqual(contentType.PropertyGroups[i].Id, result.Groups.ElementAt(i).Id);
-                Assert.AreEqual(contentType.PropertyGroups[i].Name, result.Groups.ElementAt(i).Name);
-                PropertyTypeCollection propTypes = contentType.PropertyGroups[i].PropertyTypes;
-
-                Assert.AreEqual(propTypes.Count, result.Groups.ElementAt(i).Properties.Count());
-                for (int j = 0; j < propTypes.Count; j++)
-                {
-                    Assert.AreEqual(propTypes[j].Id, result.Groups.ElementAt(i).Properties.ElementAt(j).Id);
-                    Assert.AreEqual(propTypes[j].DataTypeId, result.Groups.ElementAt(i).Properties.ElementAt(j).DataTypeId);
-                    Assert.AreEqual(propTypes[j].LabelOnTop, result.Groups.ElementAt(i).Properties.ElementAt(j).LabelOnTop);
-                }
-            }
-
-            Assert.AreEqual(contentType.AllowedTemplates.Count(), result.AllowedTemplates.Count());
-            for (int i = 0; i < contentType.AllowedTemplates.Count(); i++)
-            {
-                Assert.AreEqual(contentType.AllowedTemplates.ElementAt(i).Id, result.AllowedTemplates.ElementAt(i).Id);
-            }
-
-            Assert.AreEqual(contentType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < contentType.AllowedContentTypes.Count(); i++)
-            {
-                Assert.AreEqual(contentType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void MemberPropertyGroupBasic_To_MemberPropertyGroup()
-        {
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
-            {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
-
-            var basic = new PropertyGroupBasic<MemberPropertyTypeBasic>
-            {
-                Id = 222,
-                Alias = "group1",
-                Name = "Group 1",
-                SortOrder = 1,
-                Properties = new[]
-                {
-                    new MemberPropertyTypeBasic()
-                    {
-                        MemberCanEditProperty = true,
-                        MemberCanViewProperty = true,
-                        IsSensitiveData = true,
-                        Id = 33,
-                        SortOrder = 1,
-                        Alias = "prop1",
-                        Description = "property 1",
-                        DataTypeId = dataType.Id,
-                        GroupId = 222,
-                        Label = "Prop 1",
-                        Validation = new PropertyTypeValidation()
-                        {
-                            Mandatory = true,
-                            Pattern = null
-                        }
-                    },
-                    new MemberPropertyTypeBasic()
-                    {
-                        MemberCanViewProperty = false,
-                        MemberCanEditProperty = false,
-                        IsSensitiveData = false,
-                        Id = 34,
-                        SortOrder = 2,
-                        Alias = "prop2",
-                        Description = "property 2",
-                        DataTypeId = dataType.Id,
-                        GroupId = 222,
-                        Label = "Prop 2",
-                        Validation = new PropertyTypeValidation()
-                        {
-                            Mandatory = false,
-                            Pattern = null
-                        }
-                    },
-                }
-            };
-
-            var contentType = new MemberTypeSave
-            {
-                Id = 0,
-                ParentId = -1,
-                Alias = "alias",
-                Groups = new[] { basic }
-            };
-
-            // proper group properties mapping takes place when mapping the content type,
-            // not when mapping the group - because of inherited properties and such
-            // var result = Mapper.Map<PropertyGroup>(basic);
-            PropertyGroup result = _sut.Map<IMemberType>(contentType).PropertyGroups[0];
-
-            Assert.AreEqual(basic.Name, result.Name);
-            Assert.AreEqual(basic.Id, result.Id);
-            Assert.AreEqual(basic.SortOrder, result.SortOrder);
-            Assert.AreEqual(basic.Properties.Count(), result.PropertyTypes.Count());
-        }
-
-        [Test]
-        public void PropertyGroupBasic_To_PropertyGroup()
-        {
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
-            {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
-
-            var basic = new PropertyGroupBasic<PropertyTypeBasic>
-            {
-                Id = 222,
-                Alias = "group1",
-                Name = "Group 1",
-                SortOrder = 1,
-                Properties = new[]
-                {
-                    new PropertyTypeBasic()
-                    {
-                        Id = 33,
-                        SortOrder = 1,
-                        Alias = "prop1",
-                        Description = "property 1",
-                        DataTypeId = dataType.Id,
-                        GroupId = 222,
-                        Label = "Prop 1",
-                        Validation = new PropertyTypeValidation()
-                        {
-                            Mandatory = true,
-                            Pattern = null
-                        }
-                    },
-                    new PropertyTypeBasic()
-                    {
-                        Id = 34,
-                        SortOrder = 2,
-                        Alias = "prop2",
-                        Description = "property 2",
-                        DataTypeId = dataType.Id,
-                        GroupId = 222,
-                        Label = "Prop 2",
-                        Validation = new PropertyTypeValidation()
-                        {
-                            Mandatory = false,
-                            Pattern = null
-                        }
-                    },
-                }
-            };
-
-            var contentType = new DocumentTypeSave
-            {
-                Id = 0,
-                ParentId = -1,
-                Alias = "alias",
-                AllowedTemplates = Enumerable.Empty<string>(),
-                Groups = new[] { basic }
-            };
-
-            // proper group properties mapping takes place when mapping the content type,
-            // not when mapping the group - because of inherited properties and such
-            // var result = Mapper.Map<PropertyGroup>(basic);
-            PropertyGroup result = _sut.Map<IContentType>(contentType).PropertyGroups[0];
-
-            Assert.AreEqual(basic.Name, result.Name);
-            Assert.AreEqual(basic.Id, result.Id);
-            Assert.AreEqual(basic.SortOrder, result.SortOrder);
-            Assert.AreEqual(basic.Properties.Count(), result.PropertyTypes.Count());
-        }
-
-        [Test]
-        public void MemberPropertyTypeBasic_To_PropertyType()
-        {
-            var basic = new MemberPropertyTypeBasic()
-            {
-                Id = 33,
-                SortOrder = 1,
-                Alias = "prop1",
-                Description = "property 1",
-                DataTypeId = -88,
-                GroupId = 222,
-                Label = "Prop 1",
-                Validation = new PropertyTypeValidation()
-                {
-                    Mandatory = true,
-                    MandatoryMessage = "Please enter a value",
-                    Pattern = "xyz",
-                    PatternMessage = "Please match the pattern",
-                }
-            };
-
-            IPropertyType result = _sut.Map<IPropertyType>(basic);
-
-            Assert.AreEqual(basic.Id, result.Id);
-            Assert.AreEqual(basic.SortOrder, result.SortOrder);
-            Assert.AreEqual(basic.Alias, result.Alias);
-            Assert.AreEqual(basic.Description, result.Description);
-            Assert.AreEqual(basic.DataTypeId, result.DataTypeId);
-            Assert.AreEqual(basic.Label, result.Name);
-            Assert.AreEqual(basic.Validation.Mandatory, result.Mandatory);
-            Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
-            Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
-            Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
-            Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
-        }
-
-        [Test]
-        public void PropertyTypeBasic_To_PropertyType()
-        {
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
-            {
-                Name = "TODO"
-            };
-            _dataTypeService.Save(dataType);
-
-            var basic = new PropertyTypeBasic()
-            {
-                Id = 33,
-                SortOrder = 1,
-                Alias = "prop1",
-                Description = "property 1",
-                DataTypeId = dataType.Id,
-                GroupId = 222,
-                Label = "Prop 1",
-                Validation = new PropertyTypeValidation()
-                {
-                    Mandatory = true,
-                    MandatoryMessage = "Please enter a value",
-                    Pattern = "xyz",
-                    PatternMessage = "Please match the pattern",
-                }
-            };
-
-            IPropertyType result = _sut.Map<IPropertyType>(basic);
-
-            Assert.AreEqual(basic.Id, result.Id);
-            Assert.AreEqual(basic.SortOrder, result.SortOrder);
-            Assert.AreEqual(basic.Alias, result.Alias);
-            Assert.AreEqual(basic.Description, result.Description);
-            Assert.AreEqual(basic.DataTypeId, result.DataTypeId);
-            Assert.AreEqual(basic.Label, result.Name);
-            Assert.AreEqual(basic.Validation.Mandatory, result.Mandatory);
-            Assert.AreEqual(basic.Validation.MandatoryMessage, result.MandatoryMessage);
-            Assert.AreEqual(basic.Validation.Pattern, result.ValidationRegExp);
-            Assert.AreEqual(basic.Validation.PatternMessage, result.ValidationRegExpMessage);
-            Assert.AreEqual(basic.LabelOnTop, result.LabelOnTop);
-        }
-
-        [Test]
-        public void IMediaTypeComposition_To_MediaTypeDisplay()
-        {
-            // Arrange
-            MediaType ctMain = MediaTypeBuilder.CreateSimpleMediaType("parent", "Parent");
-
-            // not assigned to tab
-            ctMain.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+        // not assigned to tab
+        ctMain.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
             {
                 Alias = "umbracoUrlName",
                 Name = "Slug",
@@ -661,23 +615,27 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping
                 SortOrder = 1,
                 DataTypeId = -88
             });
-            MediaTypeBuilder.EnsureAllIds(ctMain, 8888);
-            MediaType ctChild1 = MediaTypeBuilder.CreateSimpleMediaType("child1", "Child 1", ctMain, true);
-            ctChild1.AddPropertyType(
-                new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
-                {
-                    Alias = "someProperty",
-                    Name = "Some Property",
-                    Description = string.Empty,
-                    Mandatory = false,
-                    SortOrder = 1,
-                    DataTypeId = -88
-                }, "anotherTab", "Another tab");
-            MediaTypeBuilder.EnsureAllIds(ctChild1, 7777);
-            MediaType contentType = MediaTypeBuilder.CreateSimpleMediaType("child2", "Child 2", ctChild1, true, "customGroup", "CustomGroup");
+        MediaTypeBuilder.EnsureAllIds(ctMain, 8888);
+        var ctChild1 = MediaTypeBuilder.CreateSimpleMediaType("child1", "Child 1", ctMain, true);
+        ctChild1.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+            {
+                Alias = "someProperty",
+                Name = "Some Property",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            },
+            "anotherTab",
+            "Another tab");
+        MediaTypeBuilder.EnsureAllIds(ctChild1, 7777);
+        var contentType =
+            MediaTypeBuilder.CreateSimpleMediaType("child2", "Child 2", ctChild1, true, "customGroup", "CustomGroup");
 
-            // not assigned to tab
-            contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+        // not assigned to tab
+        contentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
             {
                 Alias = "umbracoUrlAlias",
                 Name = "AltUrl",
@@ -686,491 +644,471 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping
                 SortOrder = 1,
                 DataTypeId = -88
             });
-            MediaTypeBuilder.EnsureAllIds(contentType, 6666);
+        MediaTypeBuilder.EnsureAllIds(contentType, 6666);
 
-            // Act
-            MediaTypeDisplay result = _sut.Map<MediaTypeDisplay>(contentType);
+        // Act
+        var result = _sut.Map<MediaTypeDisplay>(contentType);
 
-            // Assert
-            Assert.AreEqual(contentType.Alias, result.Alias);
-            Assert.AreEqual(contentType.Description, result.Description);
-            Assert.AreEqual(contentType.Icon, result.Icon);
-            Assert.AreEqual(contentType.Id, result.Id);
-            Assert.AreEqual(contentType.Name, result.Name);
-            Assert.AreEqual(contentType.ParentId, result.ParentId);
-            Assert.AreEqual(contentType.Path, result.Path);
-            Assert.AreEqual(contentType.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(contentType.IsContainer, result.IsContainer);
-            Assert.AreEqual(contentType.CreateDate, result.CreateDate);
-            Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
+        // Assert
+        Assert.AreEqual(contentType.Alias, result.Alias);
+        Assert.AreEqual(contentType.Description, result.Description);
+        Assert.AreEqual(contentType.Icon, result.Icon);
+        Assert.AreEqual(contentType.Id, result.Id);
+        Assert.AreEqual(contentType.Name, result.Name);
+        Assert.AreEqual(contentType.ParentId, result.ParentId);
+        Assert.AreEqual(contentType.Path, result.Path);
+        Assert.AreEqual(contentType.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(contentType.IsContainer, result.IsContainer);
+        Assert.AreEqual(contentType.CreateDate, result.CreateDate);
+        Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
 
-            Assert.AreEqual(contentType.CompositionPropertyGroups.Select(x => x.Name).Distinct().Count(), result.Groups.Count(x => x.IsGenericProperties == false));
-            Assert.AreEqual(1, result.Groups.Count(x => x.IsGenericProperties));
-            Assert.AreEqual(contentType.PropertyGroups.Count(), result.Groups.Count(x => x.Inherited == false && x.IsGenericProperties == false));
+        Assert.AreEqual(contentType.CompositionPropertyGroups.Select(x => x.Name).Distinct().Count(), result.Groups.Count(x => x.IsGenericProperties == false));
+        Assert.AreEqual(1, result.Groups.Count(x => x.IsGenericProperties));
+        Assert.AreEqual(contentType.PropertyGroups.Count(), result.Groups.Count(x => x.Inherited == false && x.IsGenericProperties == false));
 
-            PropertyTypeDisplay[] allPropertiesMapped = result.Groups.SelectMany(x => x.Properties).ToArray();
-            int[] allPropertyIdsMapped = allPropertiesMapped.Select(x => x.Id).ToArray();
-            int[] allSourcePropertyIds = contentType.CompositionPropertyTypes.Select(x => x.Id).ToArray();
+        var allPropertiesMapped = result.Groups.SelectMany(x => x.Properties).ToArray();
+        var allPropertyIdsMapped = allPropertiesMapped.Select(x => x.Id).ToArray();
+        var allSourcePropertyIds = contentType.CompositionPropertyTypes.Select(x => x.Id).ToArray();
 
-            Assert.AreEqual(contentType.PropertyTypes.Count(), allPropertiesMapped.Count(x => x.Inherited == false));
-            Assert.AreEqual(allPropertyIdsMapped.Count(), allSourcePropertyIds.Count());
-            Assert.IsTrue(allPropertyIdsMapped.ContainsAll(allSourcePropertyIds));
+        Assert.AreEqual(contentType.PropertyTypes.Count(), allPropertiesMapped.Count(x => x.Inherited == false));
+        Assert.AreEqual(allPropertyIdsMapped.Count(), allSourcePropertyIds.Count());
+        Assert.IsTrue(allPropertyIdsMapped.ContainsAll(allSourcePropertyIds));
 
-            Assert.AreEqual(2, result.Groups.Count(x => x.ParentTabContentTypes.Any()));
-            Assert.IsTrue(result.Groups.SelectMany(x => x.ParentTabContentTypes).ContainsAll(new[] { ctMain.Id, ctChild1.Id }));
+        Assert.AreEqual(2, result.Groups.Count(x => x.ParentTabContentTypes.Any()));
+        Assert.IsTrue(
+            result.Groups.SelectMany(x => x.ParentTabContentTypes).ContainsAll(new[] { ctMain.Id, ctChild1.Id }));
 
-            Assert.AreEqual(contentType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < contentType.AllowedContentTypes.Count(); i++)
-            {
-                Assert.AreEqual(contentType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void IContentTypeComposition_To_ContentTypeDisplay()
+        Assert.AreEqual(contentType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < contentType.AllowedContentTypes.Count(); i++)
         {
-            // Arrange
-            ContentType ctMain = ContentTypeBuilder.CreateSimpleContentType();
-
-            // not assigned to tab
-            ctMain.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
-            {
-                Alias = "umbracoUrlName", Name = "Slug", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88
-            });
-            ContentTypeBuilder.EnsureAllIds(ctMain, 8888);
-            ContentType ctChild1 = ContentTypeBuilder.CreateSimpleContentType("child1", "Child 1", ctMain, randomizeAliases: true);
-            ctChild1.AddPropertyType(
-                new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
-                {
-                    Alias = "someProperty",
-                    Name = "Some Property",
-                    Description = string.Empty,
-                    Mandatory = false,
-                    SortOrder = 1,
-                    DataTypeId = -88
-                }, "anotherTab", "Another tab");
-            ContentTypeBuilder.EnsureAllIds(ctChild1, 7777);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("child2", "Child 2", ctChild1, randomizeAliases: true, propertyGroupAlias: "customGroup", propertyGroupName: "CustomGroup");
-
-            // not assigned to tab
-            contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
-            {
-                Alias = "umbracoUrlAlias", Name = "AltUrl", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88
-            });
-            ContentTypeBuilder.EnsureAllIds(contentType, 6666);
-
-            // Act
-            DocumentTypeDisplay result = _sut.Map<DocumentTypeDisplay>(contentType);
-
-            // Assert
-            Assert.AreEqual(contentType.Alias, result.Alias);
-            Assert.AreEqual(contentType.Description, result.Description);
-            Assert.AreEqual(contentType.Icon, result.Icon);
-            Assert.AreEqual(contentType.Id, result.Id);
-            Assert.AreEqual(contentType.Name, result.Name);
-            Assert.AreEqual(contentType.ParentId, result.ParentId);
-            Assert.AreEqual(contentType.Path, result.Path);
-            Assert.AreEqual(contentType.Thumbnail, result.Thumbnail);
-            Assert.AreEqual(contentType.IsContainer, result.IsContainer);
-            Assert.AreEqual(contentType.CreateDate, result.CreateDate);
-            Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
-            Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias);
-
-            Assert.AreEqual(contentType.CompositionPropertyGroups.Select(x => x.Name).Distinct().Count(), result.Groups.Count(x => x.IsGenericProperties == false));
-            Assert.AreEqual(1, result.Groups.Count(x => x.IsGenericProperties));
-            Assert.AreEqual(contentType.PropertyGroups.Count(), result.Groups.Count(x => x.Inherited == false && x.IsGenericProperties == false));
-
-            PropertyTypeDisplay[] allPropertiesMapped = result.Groups.SelectMany(x => x.Properties).ToArray();
-            int[] allPropertyIdsMapped = allPropertiesMapped.Select(x => x.Id).ToArray();
-            int[] allSourcePropertyIds = contentType.CompositionPropertyTypes.Select(x => x.Id).ToArray();
-
-            Assert.AreEqual(contentType.PropertyTypes.Count(), allPropertiesMapped.Count(x => x.Inherited == false));
-            Assert.AreEqual(allPropertyIdsMapped.Count(), allSourcePropertyIds.Count());
-            Assert.IsTrue(allPropertyIdsMapped.ContainsAll(allSourcePropertyIds));
-
-            Assert.AreEqual(2, result.Groups.Count(x => x.ParentTabContentTypes.Any()));
-            Assert.IsTrue(result.Groups.SelectMany(x => x.ParentTabContentTypes).ContainsAll(new[] { ctMain.Id, ctChild1.Id }));
-
-            Assert.AreEqual(contentType.AllowedTemplates.Count(), result.AllowedTemplates.Count());
-            for (int i = 0; i < contentType.AllowedTemplates.Count(); i++)
-            {
-                Assert.AreEqual(contentType.AllowedTemplates.ElementAt(i).Id, result.AllowedTemplates.ElementAt(i).Id);
-            }
-
-            Assert.AreEqual(contentType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
-            for (int i = 0; i < contentType.AllowedContentTypes.Count(); i++)
-            {
-                Assert.AreEqual(contentType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
-            }
+            Assert.AreEqual(contentType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
         }
-
-        [Test]
-        public void MemberPropertyTypeBasic_To_MemberPropertyTypeDisplay()
-        {
-            var basic = new MemberPropertyTypeBasic()
-            {
-                Id = 33,
-                SortOrder = 1,
-                Alias = "prop1",
-                Description = "property 1",
-                DataTypeId = -88,
-                GroupId = 222,
-                Label = "Prop 1",
-                MemberCanViewProperty = true,
-                MemberCanEditProperty = true,
-                IsSensitiveData = true,
-                Validation = new PropertyTypeValidation()
-                {
-                    Mandatory = true,
-                    Pattern = "xyz"
-                }
-            };
-
-            MemberPropertyTypeDisplay result = _sut.Map<MemberPropertyTypeDisplay>(basic);
-
-            Assert.AreEqual(basic.Id, result.Id);
-            Assert.AreEqual(basic.SortOrder, result.SortOrder);
-            Assert.AreEqual(basic.Alias, result.Alias);
-            Assert.AreEqual(basic.Description, result.Description);
-            Assert.AreEqual(basic.GroupId, result.GroupId);
-            Assert.AreEqual(basic.Inherited, result.Inherited);
-            Assert.AreEqual(basic.Label, result.Label);
-            Assert.AreEqual(basic.Validation, result.Validation);
-            Assert.AreEqual(basic.MemberCanViewProperty, result.MemberCanViewProperty);
-            Assert.AreEqual(basic.MemberCanEditProperty, result.MemberCanEditProperty);
-            Assert.AreEqual(basic.IsSensitiveData, result.IsSensitiveData);
-        }
-
-        [Test]
-        public void PropertyTypeBasic_To_PropertyTypeDisplay()
-        {
-            // TODO use builder
-            var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer)
-            {
-                Name = "TODO"
-            };
-
-            var basic = new PropertyTypeBasic()
-            {
-                Id = 33,
-                SortOrder = 1,
-                Alias = "prop1",
-                Description = "property 1",
-                DataTypeId = dataType.Id,
-                GroupId = 222,
-                Label = "Prop 1",
-                Validation = new PropertyTypeValidation()
-                {
-                    Mandatory = true,
-                    Pattern = "xyz"
-                }
-            };
-
-            PropertyTypeDisplay result = _sut.Map<PropertyTypeDisplay>(basic);
-
-            Assert.AreEqual(basic.Id, result.Id);
-            Assert.AreEqual(basic.SortOrder, result.SortOrder);
-            Assert.AreEqual(basic.Alias, result.Alias);
-            Assert.AreEqual(basic.Description, result.Description);
-            Assert.AreEqual(basic.GroupId, result.GroupId);
-            Assert.AreEqual(basic.Inherited, result.Inherited);
-            Assert.AreEqual(basic.Label, result.Label);
-            Assert.AreEqual(basic.Validation, result.Validation);
-        }
-
-        private MemberTypeSave CreateMemberTypeSave(int dataTypeId) =>
-            new MemberTypeSave
-            {
-                Alias = "test",
-                AllowAsRoot = true,
-                AllowedContentTypes = new[] { 666, 667 },
-                Description = "hello world",
-                Icon = "tree-icon",
-                Id = 1234,
-                Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
-                Name = "My content type",
-                Path = "-1,1234",
-                ParentId = -1,
-                Thumbnail = "tree-thumb",
-                IsContainer = true,
-                Groups = new[]
-                    {
-                        new PropertyGroupBasic<MemberPropertyTypeBasic>()
-                        {
-                            Id = 987,
-                            Alias = "tab1",
-                            Name = "Tab 1",
-                            SortOrder = 0,
-                            Inherited = false,
-                            Properties = new[]
-                            {
-                                new MemberPropertyTypeBasic
-                                {
-                                    MemberCanEditProperty = true,
-                                    MemberCanViewProperty = true,
-                                    IsSensitiveData = true,
-                                    Alias = "property1",
-                                    Description = "this is property 1",
-                                    Inherited = false,
-                                    Label = "Property 1",
-                                    Validation = new PropertyTypeValidation
-                                    {
-                                        Mandatory = false,
-                                        Pattern = string.Empty
-                                    },
-                                    SortOrder = 0,
-                                    DataTypeId = dataTypeId
-                                }
-                            }
-                        }
-                    }
-            };
-
-        private MediaTypeSave CreateMediaTypeSave(int dataTypeId) =>
-            new MediaTypeSave
-            {
-                Alias = "test",
-                AllowAsRoot = true,
-                AllowedContentTypes = new[] { 666, 667 },
-                Description = "hello world",
-                Icon = "tree-icon",
-                Id = 1234,
-                Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
-                Name = "My content type",
-                Path = "-1,1234",
-                ParentId = -1,
-                Thumbnail = "tree-thumb",
-                IsContainer = true,
-                Groups = new[]
-                    {
-                        new PropertyGroupBasic<PropertyTypeBasic>()
-                        {
-                            Id = 987,
-                            Alias = "tab1",
-                            Name = "Tab 1",
-                            SortOrder = 0,
-                            Inherited = false,
-                            Properties = new[]
-                            {
-                                new PropertyTypeBasic
-                                {
-                                    Alias = "property1",
-                                    Description = "this is property 1",
-                                    Inherited = false,
-                                    Label = "Property 1",
-                                    Validation = new PropertyTypeValidation
-                                    {
-                                        Mandatory = false,
-                                        Pattern = string.Empty
-                                    },
-                                    SortOrder = 0,
-                                    DataTypeId = dataTypeId
-                                }
-                            }
-                        }
-                    }
-            };
-
-        private DocumentTypeSave CreateContentTypeSave(int dataTypeId) =>
-            new DocumentTypeSave
-            {
-                Alias = "test",
-                AllowAsRoot = true,
-                AllowedTemplates = new[]
-                    {
-                        "template1",
-                        "template2"
-                    },
-                AllowedContentTypes = new[] { 666, 667 },
-                DefaultTemplate = "test",
-                Description = "hello world",
-                Icon = "tree-icon",
-                Id = 1234,
-                Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
-                Name = "My content type",
-                Path = "-1,1234",
-                ParentId = -1,
-                Thumbnail = "tree-thumb",
-                IsContainer = true,
-                Groups = new[]
-                    {
-                        new PropertyGroupBasic<PropertyTypeBasic>()
-                        {
-                            Id = 987,
-                            Alias = "tab1",
-                            Name = "Tab 1",
-                            SortOrder = 0,
-                            Inherited = false,
-                            Properties = new[]
-                            {
-                                new PropertyTypeBasic
-                                {
-                                    Alias = "property1",
-                                    Description = "this is property 1",
-                                    Inherited = false,
-                                    Label = "Property 1",
-                                    Validation = new PropertyTypeValidation
-                                    {
-                                        Mandatory = false,
-                                        Pattern = string.Empty
-                                    },
-                                    SortOrder = 0,
-                                    LabelOnTop = true,
-                                    DataTypeId = dataTypeId
-                                }
-                            }
-                        }
-                    }
-            };
-
-        private MediaTypeSave CreateCompositionMediaTypeSave(int dataTypeId) =>
-            new MediaTypeSave
-            {
-                Alias = "test",
-                AllowAsRoot = true,
-                AllowedContentTypes = new[] { 666, 667 },
-                Description = "hello world",
-                Icon = "tree-icon",
-                Id = 1234,
-                Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
-                Name = "My content type",
-                Path = "-1,1234",
-                ParentId = -1,
-                Thumbnail = "tree-thumb",
-                IsContainer = true,
-                Groups = new[]
-                    {
-                        new PropertyGroupBasic<PropertyTypeBasic>()
-                        {
-                            Id = 987,
-                            Alias = "tab1",
-                            Name = "Tab 1",
-                            SortOrder = 0,
-                            Inherited = false,
-                            Properties = new[]
-                            {
-                                new PropertyTypeBasic
-                                {
-                                    Alias = "property1",
-                                    Description = "this is property 1",
-                                    Inherited = false,
-                                    Label = "Property 1",
-                                    Validation = new PropertyTypeValidation
-                                    {
-                                        Mandatory = false,
-                                        Pattern = string.Empty
-                                    },
-                                    SortOrder = 0,
-                                    LabelOnTop = true,
-                                    DataTypeId = dataTypeId
-                                }
-                            }
-                        },
-                        new PropertyGroupBasic<PropertyTypeBasic>()
-                        {
-                            Id = 894,
-                            Alias = "tab2",
-                            Name = "Tab 2",
-                            SortOrder = 0,
-                            Inherited = true,
-                            Properties = new[]
-                            {
-                                new PropertyTypeBasic
-                                {
-                                    Alias = "parentProperty",
-                                    Description = "this is a property from the parent",
-                                    Inherited = true,
-                                    Label = "Parent property",
-                                    Validation = new PropertyTypeValidation
-                                    {
-                                        Mandatory = false,
-                                        Pattern = string.Empty
-                                    },
-                                    SortOrder = 0,
-                                    LabelOnTop = false,
-                                    DataTypeId = dataTypeId
-                                }
-                            }
-                        }
-                    }
-            };
-
-        private DocumentTypeSave CreateCompositionContentTypeSave(int dataTypeId) =>
-            new DocumentTypeSave
-            {
-                Alias = "test",
-                AllowAsRoot = true,
-                AllowedTemplates = new[]
-                    {
-                        "template1",
-                        "template2"
-                    },
-                AllowedContentTypes = new[] { 666, 667 },
-                DefaultTemplate = "test",
-                Description = "hello world",
-                Icon = "tree-icon",
-                Id = 1234,
-                Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
-                Name = "My content type",
-                Path = "-1,1234",
-                ParentId = -1,
-                Thumbnail = "tree-thumb",
-                IsContainer = true,
-                Groups = new[]
-                    {
-                        new PropertyGroupBasic<PropertyTypeBasic>()
-                        {
-                            Id = 987,
-                            Alias = "tab1",
-                            Name = "Tab 1",
-                            SortOrder = 0,
-                            Inherited = false,
-                            Properties = new[]
-                            {
-                                new PropertyTypeBasic
-                                {
-                                    Alias = "property1",
-                                    Description = "this is property 1",
-                                    Inherited = false,
-                                    Label = "Property 1",
-                                    Validation = new PropertyTypeValidation
-                                    {
-                                        Mandatory = false,
-                                        Pattern = string.Empty
-                                    },
-                                    SortOrder = 0,
-                                    LabelOnTop = true,
-                                    DataTypeId = dataTypeId
-                                }
-                            }
-                        },
-                        new PropertyGroupBasic<PropertyTypeBasic>()
-                        {
-                            Id = 894,
-                            Alias = "tab2",
-                            Name = "Tab 2",
-                            SortOrder = 0,
-                            Inherited = true,
-                            Properties = new[]
-                            {
-                                new PropertyTypeBasic
-                                {
-                                    Alias = "parentProperty",
-                                    Description = "this is a property from the parent",
-                                    Inherited = true,
-                                    Label = "Parent property",
-                                    Validation = new PropertyTypeValidation
-                                    {
-                                        Mandatory = false,
-                                        Pattern = string.Empty
-                                    },
-                                    SortOrder = 0,
-                                    LabelOnTop = false,
-                                    DataTypeId = dataTypeId
-                                }
-                            }
-                        }
-                    }
-            };
     }
+
+    [Test]
+    public void IContentTypeComposition_To_ContentTypeDisplay()
+    {
+        // Arrange
+        var ctMain = ContentTypeBuilder.CreateSimpleContentType();
+
+        // not assigned to tab
+        ctMain.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+            {
+                Alias = "umbracoUrlName",
+                Name = "Slug",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            });
+        ContentTypeBuilder.EnsureAllIds(ctMain, 8888);
+        var ctChild1 = ContentTypeBuilder.CreateSimpleContentType("child1", "Child 1", ctMain, randomizeAliases: true);
+        ctChild1.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+            {
+                Alias = "someProperty",
+                Name = "Some Property",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            },
+            "anotherTab",
+            "Another tab");
+        ContentTypeBuilder.EnsureAllIds(ctChild1, 7777);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("child2", "Child 2", ctChild1, randomizeAliases: true, propertyGroupAlias: "customGroup", propertyGroupName: "CustomGroup");
+
+        // not assigned to tab
+        contentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+            {
+                Alias = "umbracoUrlAlias",
+                Name = "AltUrl",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            });
+        ContentTypeBuilder.EnsureAllIds(contentType, 6666);
+
+        // Act
+        var result = _sut.Map<DocumentTypeDisplay>(contentType);
+
+        // Assert
+        Assert.AreEqual(contentType.Alias, result.Alias);
+        Assert.AreEqual(contentType.Description, result.Description);
+        Assert.AreEqual(contentType.Icon, result.Icon);
+        Assert.AreEqual(contentType.Id, result.Id);
+        Assert.AreEqual(contentType.Name, result.Name);
+        Assert.AreEqual(contentType.ParentId, result.ParentId);
+        Assert.AreEqual(contentType.Path, result.Path);
+        Assert.AreEqual(contentType.Thumbnail, result.Thumbnail);
+        Assert.AreEqual(contentType.IsContainer, result.IsContainer);
+        Assert.AreEqual(contentType.CreateDate, result.CreateDate);
+        Assert.AreEqual(contentType.UpdateDate, result.UpdateDate);
+        Assert.AreEqual(contentType.DefaultTemplate.Alias, result.DefaultTemplate.Alias);
+
+        Assert.AreEqual(contentType.CompositionPropertyGroups.Select(x => x.Name).Distinct().Count(), result.Groups.Count(x => x.IsGenericProperties == false));
+        Assert.AreEqual(1, result.Groups.Count(x => x.IsGenericProperties));
+        Assert.AreEqual(contentType.PropertyGroups.Count(), result.Groups.Count(x => x.Inherited == false && x.IsGenericProperties == false));
+
+        var allPropertiesMapped = result.Groups.SelectMany(x => x.Properties).ToArray();
+        var allPropertyIdsMapped = allPropertiesMapped.Select(x => x.Id).ToArray();
+        var allSourcePropertyIds = contentType.CompositionPropertyTypes.Select(x => x.Id).ToArray();
+
+        Assert.AreEqual(contentType.PropertyTypes.Count(), allPropertiesMapped.Count(x => x.Inherited == false));
+        Assert.AreEqual(allPropertyIdsMapped.Count(), allSourcePropertyIds.Count());
+        Assert.IsTrue(allPropertyIdsMapped.ContainsAll(allSourcePropertyIds));
+
+        Assert.AreEqual(2, result.Groups.Count(x => x.ParentTabContentTypes.Any()));
+        Assert.IsTrue(
+            result.Groups.SelectMany(x => x.ParentTabContentTypes).ContainsAll(new[] { ctMain.Id, ctChild1.Id }));
+
+        Assert.AreEqual(contentType.AllowedTemplates.Count(), result.AllowedTemplates.Count());
+        for (var i = 0; i < contentType.AllowedTemplates.Count(); i++)
+        {
+            Assert.AreEqual(contentType.AllowedTemplates.ElementAt(i).Id, result.AllowedTemplates.ElementAt(i).Id);
+        }
+
+        Assert.AreEqual(contentType.AllowedContentTypes.Count(), result.AllowedContentTypes.Count());
+        for (var i = 0; i < contentType.AllowedContentTypes.Count(); i++)
+        {
+            Assert.AreEqual(contentType.AllowedContentTypes.ElementAt(i).Id.Value, result.AllowedContentTypes.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void MemberPropertyTypeBasic_To_MemberPropertyTypeDisplay()
+    {
+        var basic = new MemberPropertyTypeBasic
+        {
+            Id = 33,
+            SortOrder = 1,
+            Alias = "prop1",
+            Description = "property 1",
+            DataTypeId = -88,
+            GroupId = 222,
+            Label = "Prop 1",
+            MemberCanViewProperty = true,
+            MemberCanEditProperty = true,
+            IsSensitiveData = true,
+            Validation = new PropertyTypeValidation { Mandatory = true, Pattern = "xyz" }
+        };
+
+        var result = _sut.Map<MemberPropertyTypeDisplay>(basic);
+
+        Assert.AreEqual(basic.Id, result.Id);
+        Assert.AreEqual(basic.SortOrder, result.SortOrder);
+        Assert.AreEqual(basic.Alias, result.Alias);
+        Assert.AreEqual(basic.Description, result.Description);
+        Assert.AreEqual(basic.GroupId, result.GroupId);
+        Assert.AreEqual(basic.Inherited, result.Inherited);
+        Assert.AreEqual(basic.Label, result.Label);
+        Assert.AreEqual(basic.Validation, result.Validation);
+        Assert.AreEqual(basic.MemberCanViewProperty, result.MemberCanViewProperty);
+        Assert.AreEqual(basic.MemberCanEditProperty, result.MemberCanEditProperty);
+        Assert.AreEqual(basic.IsSensitiveData, result.IsSensitiveData);
+    }
+
+    [Test]
+    public void PropertyTypeBasic_To_PropertyTypeDisplay()
+    {
+        // TODO use builder
+        var dataType = new DataType(Services.GetRequiredService<LabelPropertyEditor>(), _serializer) { Name = "TODO" };
+
+        var basic = new PropertyTypeBasic
+        {
+            Id = 33,
+            SortOrder = 1,
+            Alias = "prop1",
+            Description = "property 1",
+            DataTypeId = dataType.Id,
+            GroupId = 222,
+            Label = "Prop 1",
+            Validation = new PropertyTypeValidation { Mandatory = true, Pattern = "xyz" }
+        };
+
+        var result = _sut.Map<PropertyTypeDisplay>(basic);
+
+        Assert.AreEqual(basic.Id, result.Id);
+        Assert.AreEqual(basic.SortOrder, result.SortOrder);
+        Assert.AreEqual(basic.Alias, result.Alias);
+        Assert.AreEqual(basic.Description, result.Description);
+        Assert.AreEqual(basic.GroupId, result.GroupId);
+        Assert.AreEqual(basic.Inherited, result.Inherited);
+        Assert.AreEqual(basic.Label, result.Label);
+        Assert.AreEqual(basic.Validation, result.Validation);
+    }
+
+    private MemberTypeSave CreateMemberTypeSave(int dataTypeId) =>
+        new()
+        {
+            Alias = "test",
+            AllowAsRoot = true,
+            AllowedContentTypes = new[] { 666, 667 },
+            Description = "hello world",
+            Icon = "tree-icon",
+            Id = 1234,
+            Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
+            Name = "My content type",
+            Path = "-1,1234",
+            ParentId = -1,
+            Thumbnail = "tree-thumb",
+            IsContainer = true,
+            Groups = new[]
+            {
+                new PropertyGroupBasic<MemberPropertyTypeBasic>
+                {
+                    Id = 987,
+                    Alias = "tab1",
+                    Name = "Tab 1",
+                    SortOrder = 0,
+                    Inherited = false,
+                    Properties = new[]
+                    {
+                        new MemberPropertyTypeBasic
+                        {
+                            MemberCanEditProperty = true,
+                            MemberCanViewProperty = true,
+                            IsSensitiveData = true,
+                            Alias = "property1",
+                            Description = "this is property 1",
+                            Inherited = false,
+                            Label = "Property 1",
+                            Validation = new PropertyTypeValidation
+                            {
+                                Mandatory = false, Pattern = string.Empty
+                            },
+                            SortOrder = 0,
+                            DataTypeId = dataTypeId
+                        }
+                    }
+                }
+            }
+        };
+
+    private MediaTypeSave CreateMediaTypeSave(int dataTypeId) =>
+        new()
+        {
+            Alias = "test",
+            AllowAsRoot = true,
+            AllowedContentTypes = new[] { 666, 667 },
+            Description = "hello world",
+            Icon = "tree-icon",
+            Id = 1234,
+            Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
+            Name = "My content type",
+            Path = "-1,1234",
+            ParentId = -1,
+            Thumbnail = "tree-thumb",
+            IsContainer = true,
+            Groups = new[]
+            {
+                new PropertyGroupBasic<PropertyTypeBasic>
+                {
+                    Id = 987,
+                    Alias = "tab1",
+                    Name = "Tab 1",
+                    SortOrder = 0,
+                    Inherited = false,
+                    Properties = new[]
+                    {
+                        new PropertyTypeBasic
+                        {
+                            Alias = "property1",
+                            Description = "this is property 1",
+                            Inherited = false,
+                            Label = "Property 1",
+                            Validation = new PropertyTypeValidation {Mandatory = false, Pattern = string.Empty},
+                            SortOrder = 0,
+                            DataTypeId = dataTypeId
+                        }
+                    }
+                }
+            }
+        };
+
+    private DocumentTypeSave CreateContentTypeSave(int dataTypeId) =>
+        new()
+        {
+            Alias = "test",
+            AllowAsRoot = true,
+            AllowedTemplates = new[] { "template1", "template2" },
+            AllowedContentTypes = new[] { 666, 667 },
+            DefaultTemplate = "test",
+            Description = "hello world",
+            Icon = "tree-icon",
+            Id = 1234,
+            Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
+            Name = "My content type",
+            Path = "-1,1234",
+            ParentId = -1,
+            Thumbnail = "tree-thumb",
+            IsContainer = true,
+            Groups = new[]
+            {
+                new PropertyGroupBasic<PropertyTypeBasic>
+                {
+                    Id = 987,
+                    Alias = "tab1",
+                    Name = "Tab 1",
+                    SortOrder = 0,
+                    Inherited = false,
+                    Properties = new[]
+                    {
+                        new PropertyTypeBasic
+                        {
+                            Alias = "property1",
+                            Description = "this is property 1",
+                            Inherited = false,
+                            Label = "Property 1",
+                            Validation = new PropertyTypeValidation
+                            {
+                                Mandatory = false, Pattern = string.Empty
+                            },
+                            SortOrder = 0,
+                            LabelOnTop = true,
+                            DataTypeId = dataTypeId
+                        }
+                    }
+                }
+            }
+        };
+
+    private MediaTypeSave CreateCompositionMediaTypeSave(int dataTypeId) =>
+        new()
+        {
+            Alias = "test",
+            AllowAsRoot = true,
+            AllowedContentTypes = new[] { 666, 667 },
+            Description = "hello world",
+            Icon = "tree-icon",
+            Id = 1234,
+            Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
+            Name = "My content type",
+            Path = "-1,1234",
+            ParentId = -1,
+            Thumbnail = "tree-thumb",
+            IsContainer = true,
+            Groups = new[]
+            {
+                new PropertyGroupBasic<PropertyTypeBasic>
+                {
+                    Id = 987,
+                    Alias = "tab1",
+                    Name = "Tab 1",
+                    SortOrder = 0,
+                    Inherited = false,
+                    Properties = new[]
+                    {
+                        new PropertyTypeBasic
+                        {
+                            Alias = "property1",
+                            Description = "this is property 1",
+                            Inherited = false,
+                            Label = "Property 1",
+                            Validation = new PropertyTypeValidation {Mandatory = false, Pattern = string.Empty},
+                            SortOrder = 0,
+                            LabelOnTop = true,
+                            DataTypeId = dataTypeId
+                        }
+                    }
+                },
+                new PropertyGroupBasic<PropertyTypeBasic>
+                {
+                    Id = 894,
+                    Alias = "tab2",
+                    Name = "Tab 2",
+                    SortOrder = 0,
+                    Inherited = true,
+                    Properties = new[]
+                    {
+                        new PropertyTypeBasic
+                        {
+                            Alias = "parentProperty",
+                            Description = "this is a property from the parent",
+                            Inherited = true,
+                            Label = "Parent property",
+                            Validation = new PropertyTypeValidation {Mandatory = false, Pattern = string.Empty},
+                            SortOrder = 0,
+                            LabelOnTop = false,
+                            DataTypeId = dataTypeId
+                        }
+                    }
+                }
+            }
+        };
+
+    private DocumentTypeSave CreateCompositionContentTypeSave(int dataTypeId) =>
+        new()
+        {
+            Alias = "test",
+            AllowAsRoot = true,
+            AllowedTemplates = new[] { "template1", "template2" },
+            AllowedContentTypes = new[] { 666, 667 },
+            DefaultTemplate = "test",
+            Description = "hello world",
+            Icon = "tree-icon",
+            Id = 1234,
+            Key = new Guid("8A60656B-3866-46AB-824A-48AE85083070"),
+            Name = "My content type",
+            Path = "-1,1234",
+            ParentId = -1,
+            Thumbnail = "tree-thumb",
+            IsContainer = true,
+            Groups = new[]
+            {
+                new PropertyGroupBasic<PropertyTypeBasic>
+                {
+                    Id = 987,
+                    Alias = "tab1",
+                    Name = "Tab 1",
+                    SortOrder = 0,
+                    Inherited = false,
+                    Properties = new[]
+                    {
+                        new PropertyTypeBasic
+                        {
+                            Alias = "property1",
+                            Description = "this is property 1",
+                            Inherited = false,
+                            Label = "Property 1",
+                            Validation = new PropertyTypeValidation
+                            {
+                                Mandatory = false, Pattern = string.Empty
+                            },
+                            SortOrder = 0,
+                            LabelOnTop = true,
+                            DataTypeId = dataTypeId
+                        }
+                    }
+                },
+                new PropertyGroupBasic<PropertyTypeBasic>
+                {
+                    Id = 894,
+                    Alias = "tab2",
+                    Name = "Tab 2",
+                    SortOrder = 0,
+                    Inherited = true,
+                    Properties = new[]
+                    {
+                        new PropertyTypeBasic
+                        {
+                            Alias = "parentProperty",
+                            Description = "this is a property from the parent",
+                            Inherited = true,
+                            Label = "Parent property",
+                            Validation = new PropertyTypeValidation
+                            {
+                                Mandatory = false, Pattern = string.Empty
+                            },
+                            SortOrder = 0,
+                            LabelOnTop = false,
+                            DataTypeId = dataTypeId
+                        }
+                    }
+                }
+            }
+        };
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
index 9807640ca9..ee03065592 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UmbracoMapperTests.cs
@@ -1,10 +1,11 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.Globalization;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
@@ -15,352 +16,356 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping;
+
+[TestFixture]
+[UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class UmbracoMapperTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class UmbracoMapperTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp()
     {
-        [SetUp]
-        public void SetUp()
-        {
-            _sut = Services.GetRequiredService<IUmbracoMapper>();
+        _sut = Services.GetRequiredService<IUmbracoMapper>();
 
-            _dataTypeService = Services.GetRequiredService<IDataTypeService>();
-            _propertyEditorCollection = Services.GetRequiredService<PropertyEditorCollection>();
-            _mediaBuilder = new MediaBuilder();
-            _contentBuilder = new ContentBuilder();
-            _contentTypeBuilder = new ContentTypeBuilder();
-            _contentTypeService = Services.GetRequiredService<IContentTypeService>();
-            _localizedTextService = Services.GetRequiredService<ILocalizedTextService>();
-        }
+        _dataTypeService = Services.GetRequiredService<IDataTypeService>();
+        _propertyEditorCollection = Services.GetRequiredService<PropertyEditorCollection>();
+        _mediaBuilder = new MediaBuilder();
+        _contentBuilder = new ContentBuilder();
+        _contentTypeBuilder = new ContentTypeBuilder();
+        _contentTypeService = Services.GetRequiredService<IContentTypeService>();
+        _localizedTextService = Services.GetRequiredService<ILocalizedTextService>();
+    }
 
-        private IUmbracoMapper _sut;
-        private IDataTypeService _dataTypeService;
-        private PropertyEditorCollection _propertyEditorCollection;
-        private MediaBuilder _mediaBuilder;
-        private ContentBuilder _contentBuilder;
-        private ContentTypeBuilder _contentTypeBuilder;
-        private IContentTypeService _contentTypeService;
-        private ILocalizedTextService _localizedTextService;
+    private IUmbracoMapper _sut;
+    private IDataTypeService _dataTypeService;
+    private PropertyEditorCollection _propertyEditorCollection;
+    private MediaBuilder _mediaBuilder;
+    private ContentBuilder _contentBuilder;
+    private ContentTypeBuilder _contentTypeBuilder;
+    private IContentTypeService _contentTypeService;
+    private ILocalizedTextService _localizedTextService;
 
-        [Test]
-        public void To_Media_Item_Simple()
-        {
-            Media content = _mediaBuilder
-                .AddMediaType()
-                    .AddPropertyGroup()
-                        .AddPropertyType()
-                        .Done()
-                    .Done()
-                .Done()
-                .WithCreatorId(Constants.Security.SuperUserId)
-                .Build();
+    [Test]
+    public void To_Media_Item_Simple()
+    {
+        var content = _mediaBuilder
+            .AddMediaType()
+            .AddPropertyGroup()
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .Done()
+            .WithCreatorId(Constants.Security.SuperUserId)
+            .Build();
 
-            ContentItemBasic<ContentPropertyBasic> result = _sut.Map<IMedia, ContentItemBasic<ContentPropertyBasic>>(content);
+        var result = _sut.Map<IMedia, ContentItemBasic<ContentPropertyBasic>>(content);
 
-            AssertBasics(result, content);
+        AssertBasics(result, content);
 
-            foreach (IProperty p in content.Properties)
-            {
-                AssertBasicProperty(result, p);
-            }
-        }
-
-        [Test]
-        public void To_Content_Item_Simple()
-        {
-            Content content = _contentBuilder
-                .AddContentType()
-                    .AddPropertyGroup()
-                        .AddPropertyType()
-                        .Done()
-                    .Done()
-                .Done()
-                .WithCreatorId(Constants.Security.SuperUserId)
-                .Build();
-
-            ContentItemBasic<ContentPropertyBasic> result = _sut.Map<IContent, ContentItemBasic<ContentPropertyBasic>>(content);
-
-            AssertBasics(result, content);
-
-            foreach (IProperty p in content.Properties)
-            {
-                AssertBasicProperty(result, p);
-            }
-        }
-
-        [Test]
-        public void To_Content_Item_Dto()
-        {
-            Content content = _contentBuilder
-                .AddContentType()
-                    .AddPropertyGroup()
-                        .AddPropertyType()
-                        .Done()
-                    .Done()
-                .Done()
-                .WithCreatorId(Constants.Security.SuperUserId)
-                .Build();
-
-            ContentPropertyCollectionDto result = _sut.Map<IContent, ContentPropertyCollectionDto>(content);
-
-            foreach (IProperty p in content.Properties)
-            {
-                AssertProperty(result, p);
-            }
-        }
-
-        [Test]
-        public void To_Media_Item_Dto()
-        {
-            Media content = _mediaBuilder
-                .AddMediaType()
-                    .AddPropertyGroup()
-                        .AddPropertyType()
-                        .Done()
-                    .Done()
-                .Done()
-                .Build();
-
-            ContentPropertyCollectionDto result = _sut.Map<IMedia, ContentPropertyCollectionDto>(content);
-
-            Assert.GreaterOrEqual(result.Properties.Count(), 1);
-            Assert.AreEqual(content.Properties.Count, result.Properties.Count());
-            foreach (IProperty p in content.Properties)
-            {
-                AssertProperty(result, p);
-            }
-        }
-
-        private void AssertDisplayProperty<T>(IContentProperties<T> result, IProperty p)
-            where T : ContentPropertyBasic
-        {
-            T pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
-            Assert.IsNotNull(pDto);
-
-            // pDto.Alias = p.Alias;
-            // pDto.Description = p.PropertyType.Description;
-            // pDto.Label = p.PropertyType.Name;
-            // pDto.Config = applicationContext.Services.DataTypeService.GetPreValuesByDataTypeId(p.PropertyType.DataTypeDefinitionId);
-        }
-
-        [Test]
-        public void To_Display_Model()
-        {
-            IContentType contentType = _contentTypeBuilder
-                .WithId(0)
-                .AddPropertyGroup()
-                    .WithId(1)
-                    .AddPropertyType()
-                    .Done()
-                .Done()
-                .AddPropertyGroup()
-                    .WithId(2)
-                    .AddPropertyType()
-                    .Done()
-                .Done()
-                .AddPropertyGroup()
-                    .WithId(3)
-                    .AddPropertyType()
-                    .Done()
-                .Done()
-                .AddPropertyGroup()
-                    .WithId(4)
-                    .AddPropertyType()
-                    .Done()
-                .Done()
-                .Build();
-            _contentTypeService.Save(contentType);
-
-            Content content = _contentBuilder
-                .WithContentType(contentType)
-                .WithCreatorId(Constants.Security.SuperUserId)
-                .Build();
-
-            ContentItemDisplay result = _sut.Map<IContent, ContentItemDisplay>(content);
-
-            AssertBasics(result, content);
-
-            ContentVariantDisplay invariantContent = result.Variants.First();
-            foreach (IProperty p in content.Properties)
-            {
-                AssertBasicProperty(invariantContent, p);
-                AssertDisplayProperty(invariantContent, p);
-            }
-
-            Assert.AreEqual(4, invariantContent.Tabs.Count());
-            Assert.IsTrue(invariantContent.Tabs.First().IsActive);
-            Assert.IsTrue(invariantContent.Tabs.Except(new[] { invariantContent.Tabs.First() }).All(x => x.IsActive == false));
-        }
-
-        [Test]
-        public void To_Display_Model_No_Tabs()
-        {
-            IContentType contentType = _contentTypeBuilder
-                .WithId(0)
-                .Build();
-            _contentTypeService.Save(contentType);
-
-            Content content = _contentBuilder
-                .WithContentType(contentType)
-                .WithCreatorId(Constants.Security.SuperUserId)
-                .Build();
-
-            ContentItemDisplay result = _sut.Map<IContent, ContentItemDisplay>(content);
-
-            AssertBasics(result, content);
-
-            ContentVariantDisplay invariantContent = result.Variants.First();
-            foreach (IProperty p in content.Properties)
-            {
-                AssertBasicProperty(invariantContent, p);
-                AssertDisplayProperty(invariantContent, p);
-            }
-
-            Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count());
-        }
-
-        [Test]
-        public void To_Display_Model_With_Non_Grouped_Properties()
-        {
-            IContentType contentType = _contentTypeBuilder
-                .WithId(0)
-                .AddPropertyType()
-                    .WithId(1)
-                    .WithValueStorageType(ValueStorageType.Ntext)
-                    .WithPropertyEditorAlias("nonGrouped1")
-                    .WithName("Non Grouped 1")
-                .Done()
-                .AddPropertyType()
-                    .WithId(2)
-                    .WithValueStorageType(ValueStorageType.Ntext)
-                    .WithPropertyEditorAlias("nonGrouped2")
-                    .WithName("Non Grouped 2")
-                .Done()
-                .Build();
-            _contentTypeService.Save(contentType);
-
-            Content content = _contentBuilder
-                .WithContentType(contentType)
-                .WithCreatorId(Constants.Security.SuperUserId)
-                .Build();
-
-            ContentItemDisplay result = _sut.Map<IContent, ContentItemDisplay>(content);
-
-            AssertBasics(result, content);
-
-            ContentVariantDisplay invariantContent = result.Variants.First();
-            foreach (IProperty p in content.Properties)
-            {
-                AssertBasicProperty(invariantContent, p);
-                AssertDisplayProperty(invariantContent, p);
-            }
-
-            Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count() - 1);
-            Assert.IsTrue(invariantContent.Tabs.Any(x => x.Label == _localizedTextService.Localize("general","properties")));
-            Assert.AreEqual(2, invariantContent.Tabs.Where(x => x.Label == _localizedTextService.Localize("general","properties")).SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count());
-        }
-
-        private void AssertBasics(ContentItemDisplay result, IContent content)
-        {
-            Assert.AreEqual(content.Id, result.Id);
-
-            int ownerId = content.CreatorId;
-            if (ownerId != 0)
-            {
-                Assert.IsNotNull(result.Owner);
-                Assert.AreEqual(Constants.Security.SuperUserId, result.Owner.UserId);
-                Assert.AreEqual("Administrator", result.Owner.Name);
-            }
-            else
-            {
-                Assert.IsNull(result.Owner); // because, 0 is no user
-            }
-
-            ContentVariantDisplay invariantContent = result.Variants.First();
-
-            Assert.AreEqual(content.ParentId, result.ParentId);
-            Assert.AreEqual(content.UpdateDate, invariantContent.UpdateDate);
-            Assert.AreEqual(content.CreateDate, invariantContent.CreateDate);
-            Assert.AreEqual(content.Name, invariantContent.Name);
-            Assert.AreEqual(
-                content.Properties.Count(),
-                ((IContentProperties<ContentPropertyDisplay>)invariantContent).Properties.Count(x => x.Alias.StartsWith("_umb_") == false));
-        }
-
-        private void AssertBasics<T, TPersisted>(ContentItemBasic<T> result, TPersisted content)
-            where T : ContentPropertyBasic
-            where TPersisted : IContentBase
-        {
-            Assert.AreEqual(content.Id, result.Id);
-
-            int ownerId = content.CreatorId;
-            if (ownerId != 0)
-            {
-                Assert.IsNotNull(result.Owner);
-                Assert.AreEqual(Constants.Security.SuperUserId, result.Owner.UserId);
-                Assert.AreEqual("Administrator", result.Owner.Name);
-            }
-            else
-            {
-                Assert.IsNull(result.Owner); // because, 0 is no user
-            }
-
-            Assert.AreEqual(content.ParentId, result.ParentId);
-            Assert.AreEqual(content.UpdateDate, result.UpdateDate);
-            Assert.AreEqual(content.CreateDate, result.CreateDate);
-            Assert.AreEqual(content.Name, result.Name);
-            Assert.AreEqual(content.Properties.Count(), result.Properties.Count(x => x.Alias.StartsWith("_umb_") == false));
-        }
-
-        private void AssertBasicProperty<T>(IContentProperties<T> result, IProperty p)
-            where T : ContentPropertyBasic
-        {
-            T pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
-            Assert.IsNotNull(pDto);
-            Assert.AreEqual(p.Alias, pDto.Alias);
-            Assert.AreEqual(p.Id, pDto.Id);
-
-            if (p.GetValue() == null)
-            {
-                Assert.AreEqual(pDto.Value, string.Empty);
-            }
-            else if (p.GetValue() is decimal decimalValue)
-            {
-                Assert.AreEqual(pDto.Value, decimalValue.ToString(NumberFormatInfo.InvariantInfo));
-            }
-            else
-            {
-                Assert.AreEqual(pDto.Value, p.GetValue().ToString());
-            }
-        }
-
-        private void AssertProperty(IContentProperties<ContentPropertyDto> result, IProperty p)
+        foreach (var p in content.Properties)
         {
             AssertBasicProperty(result, p);
+        }
+    }
 
-            ContentPropertyDto pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
-            Assert.IsNotNull(pDto);
-            Assert.AreEqual(p.PropertyType.Mandatory, pDto.IsRequired);
-            Assert.AreEqual(p.PropertyType.ValidationRegExp, pDto.ValidationRegExp);
-            Assert.AreEqual(p.PropertyType.Description, pDto.Description);
-            Assert.AreEqual(p.PropertyType.Name, pDto.Label);
-            Assert.AreEqual(_dataTypeService.GetDataType(p.PropertyType.DataTypeId), pDto.DataType);
-            Assert.AreEqual(_propertyEditorCollection[p.PropertyType.PropertyEditorAlias], pDto.PropertyEditor);
+    [Test]
+    public void To_Content_Item_Simple()
+    {
+        var content = _contentBuilder
+            .AddContentType()
+            .AddPropertyGroup()
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .Done()
+            .WithCreatorId(Constants.Security.SuperUserId)
+            .Build();
+
+        var result = _sut.Map<IContent, ContentItemBasic<ContentPropertyBasic>>(content);
+
+        AssertBasics(result, content);
+
+        foreach (var p in content.Properties)
+        {
+            AssertBasicProperty(result, p);
+        }
+    }
+
+    [Test]
+    public void To_Content_Item_Dto()
+    {
+        var content = _contentBuilder
+            .AddContentType()
+            .AddPropertyGroup()
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .Done()
+            .WithCreatorId(Constants.Security.SuperUserId)
+            .Build();
+
+        var result = _sut.Map<IContent, ContentPropertyCollectionDto>(content);
+
+        foreach (var p in content.Properties)
+        {
+            AssertProperty(result, p);
+        }
+    }
+
+    [Test]
+    public void To_Media_Item_Dto()
+    {
+        var content = _mediaBuilder
+            .AddMediaType()
+            .AddPropertyGroup()
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .Done()
+            .Build();
+
+        var result = _sut.Map<IMedia, ContentPropertyCollectionDto>(content);
+
+        Assert.GreaterOrEqual(result.Properties.Count(), 1);
+        Assert.AreEqual(content.Properties.Count, result.Properties.Count());
+        foreach (var p in content.Properties)
+        {
+            AssertProperty(result, p);
+        }
+    }
+
+    private void AssertDisplayProperty<T>(IContentProperties<T> result, IProperty p)
+        where T : ContentPropertyBasic
+    {
+        var pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
+        Assert.IsNotNull(pDto);
+
+        // pDto.Alias = p.Alias;
+        // pDto.Description = p.PropertyType.Description;
+        // pDto.Label = p.PropertyType.Name;
+        // pDto.Config = applicationContext.Services.DataTypeService.GetPreValuesByDataTypeId(p.PropertyType.DataTypeDefinitionId);
+    }
+
+    [Test]
+    public void To_Display_Model()
+    {
+        var contentType = _contentTypeBuilder
+            .WithId(0)
+            .AddPropertyGroup()
+            .WithId(1)
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .AddPropertyGroup()
+            .WithId(2)
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .AddPropertyGroup()
+            .WithId(3)
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .AddPropertyGroup()
+            .WithId(4)
+            .AddPropertyType()
+            .Done()
+            .Done()
+            .Build();
+        _contentTypeService.Save(contentType);
+
+        var content = _contentBuilder
+            .WithContentType(contentType)
+            .WithCreatorId(Constants.Security.SuperUserId)
+            .Build();
+
+        var result = _sut.Map<IContent, ContentItemDisplay>(content);
+
+        AssertBasics(result, content);
+
+        var invariantContent = result.Variants.First();
+        foreach (var p in content.Properties)
+        {
+            AssertBasicProperty(invariantContent, p);
+            AssertDisplayProperty(invariantContent, p);
         }
 
-        private void AssertContentItem<T>(ContentItemBasic<ContentPropertyDto> result, T content)
-            where T : IContentBase
-        {
-            AssertBasics(result, content);
+        Assert.AreEqual(4, invariantContent.Tabs.Count());
+        Assert.IsTrue(invariantContent.Tabs.First().IsActive);
+        Assert.IsTrue(invariantContent.Tabs.Except(new[] { invariantContent.Tabs.First() })
+            .All(x => x.IsActive == false));
+    }
 
-            foreach (IProperty p in content.Properties)
-            {
-                AssertProperty(result, p);
-            }
+    [Test]
+    public void To_Display_Model_No_Tabs()
+    {
+        var contentType = _contentTypeBuilder
+            .WithId(0)
+            .Build();
+        _contentTypeService.Save(contentType);
+
+        var content = _contentBuilder
+            .WithContentType(contentType)
+            .WithCreatorId(Constants.Security.SuperUserId)
+            .Build();
+
+        var result = _sut.Map<IContent, ContentItemDisplay>(content);
+
+        AssertBasics(result, content);
+
+        var invariantContent = result.Variants.First();
+        foreach (var p in content.Properties)
+        {
+            AssertBasicProperty(invariantContent, p);
+            AssertDisplayProperty(invariantContent, p);
+        }
+
+        Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count());
+    }
+
+    [Test]
+    public void To_Display_Model_With_Non_Grouped_Properties()
+    {
+        var contentType = _contentTypeBuilder
+            .WithId(0)
+            .AddPropertyType()
+            .WithId(1)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithPropertyEditorAlias("nonGrouped1")
+            .WithName("Non Grouped 1")
+            .Done()
+            .AddPropertyType()
+            .WithId(2)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithPropertyEditorAlias("nonGrouped2")
+            .WithName("Non Grouped 2")
+            .Done()
+            .Build();
+        _contentTypeService.Save(contentType);
+
+        var content = _contentBuilder
+            .WithContentType(contentType)
+            .WithCreatorId(Constants.Security.SuperUserId)
+            .Build();
+
+        var result = _sut.Map<IContent, ContentItemDisplay>(content);
+
+        AssertBasics(result, content);
+
+        var invariantContent = result.Variants.First();
+        foreach (var p in content.Properties)
+        {
+            AssertBasicProperty(invariantContent, p);
+            AssertDisplayProperty(invariantContent, p);
+        }
+
+        Assert.AreEqual(contentType.CompositionPropertyGroups.Count(), invariantContent.Tabs.Count() - 1);
+        Assert.IsTrue(
+            invariantContent.Tabs.Any(x => x.Label == _localizedTextService.Localize("general", "properties")));
+        Assert.AreEqual(
+            2,
+            invariantContent.Tabs.Where(x => x.Label == _localizedTextService.Localize("general", "properties"))
+                .SelectMany(x => x.Properties.Where(p => p.Alias.StartsWith("_umb_") == false)).Count());
+    }
+
+    private void AssertBasics(ContentItemDisplay result, IContent content)
+    {
+        Assert.AreEqual(content.Id, result.Id);
+
+        var ownerId = content.CreatorId;
+        if (ownerId != 0)
+        {
+            Assert.IsNotNull(result.Owner);
+            Assert.AreEqual(Constants.Security.SuperUserId, result.Owner.UserId);
+            Assert.AreEqual("Administrator", result.Owner.Name);
+        }
+        else
+        {
+            Assert.IsNull(result.Owner); // because, 0 is no user
+        }
+
+        var invariantContent = result.Variants.First();
+
+        Assert.AreEqual(content.ParentId, result.ParentId);
+        Assert.AreEqual(content.UpdateDate, invariantContent.UpdateDate);
+        Assert.AreEqual(content.CreateDate, invariantContent.CreateDate);
+        Assert.AreEqual(content.Name, invariantContent.Name);
+        Assert.AreEqual(
+            content.Properties.Count(),
+            ((IContentProperties<ContentPropertyDisplay>)invariantContent).Properties.Count(x =>
+                x.Alias.StartsWith("_umb_") == false));
+    }
+
+    private void AssertBasics<T, TPersisted>(ContentItemBasic<T> result, TPersisted content)
+        where T : ContentPropertyBasic
+        where TPersisted : IContentBase
+    {
+        Assert.AreEqual(content.Id, result.Id);
+
+        var ownerId = content.CreatorId;
+        if (ownerId != 0)
+        {
+            Assert.IsNotNull(result.Owner);
+            Assert.AreEqual(Constants.Security.SuperUserId, result.Owner.UserId);
+            Assert.AreEqual("Administrator", result.Owner.Name);
+        }
+        else
+        {
+            Assert.IsNull(result.Owner); // because, 0 is no user
+        }
+
+        Assert.AreEqual(content.ParentId, result.ParentId);
+        Assert.AreEqual(content.UpdateDate, result.UpdateDate);
+        Assert.AreEqual(content.CreateDate, result.CreateDate);
+        Assert.AreEqual(content.Name, result.Name);
+        Assert.AreEqual(content.Properties.Count(), result.Properties.Count(x => x.Alias.StartsWith("_umb_") == false));
+    }
+
+    private void AssertBasicProperty<T>(IContentProperties<T> result, IProperty p)
+        where T : ContentPropertyBasic
+    {
+        var pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
+        Assert.IsNotNull(pDto);
+        Assert.AreEqual(p.Alias, pDto.Alias);
+        Assert.AreEqual(p.Id, pDto.Id);
+
+        if (p.GetValue() == null)
+        {
+            Assert.AreEqual(pDto.Value, string.Empty);
+        }
+        else if (p.GetValue() is decimal decimalValue)
+        {
+            Assert.AreEqual(pDto.Value, decimalValue.ToString(NumberFormatInfo.InvariantInfo));
+        }
+        else
+        {
+            Assert.AreEqual(pDto.Value, p.GetValue().ToString());
+        }
+    }
+
+    private void AssertProperty(IContentProperties<ContentPropertyDto> result, IProperty p)
+    {
+        AssertBasicProperty(result, p);
+
+        var pDto = result.Properties.SingleOrDefault(x => x.Alias == p.Alias);
+        Assert.IsNotNull(pDto);
+        Assert.AreEqual(p.PropertyType.Mandatory, pDto.IsRequired);
+        Assert.AreEqual(p.PropertyType.ValidationRegExp, pDto.ValidationRegExp);
+        Assert.AreEqual(p.PropertyType.Description, pDto.Description);
+        Assert.AreEqual(p.PropertyType.Name, pDto.Label);
+        Assert.AreEqual(_dataTypeService.GetDataType(p.PropertyType.DataTypeId), pDto.DataType);
+        Assert.AreEqual(_propertyEditorCollection[p.PropertyType.PropertyEditorAlias], pDto.PropertyEditor);
+    }
+
+    private void AssertContentItem<T>(ContentItemBasic<ContentPropertyDto> result, T content)
+        where T : IContentBase
+    {
+        AssertBasics(result, content);
+
+        foreach (var p in content.Properties)
+        {
+            AssertProperty(result, p);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs
index 12f2b42b41..8ec6988a06 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Mapping/UserModelMapperTests.cs
@@ -11,35 +11,34 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Mapping;
+
+[TestFixture]
+[UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class UserModelMapperTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class UserModelMapperTests : UmbracoIntegrationTest
+    [SetUp]
+    public void Setup() => _sut = Services.GetRequiredService<IUmbracoMapper>();
+
+    private IUmbracoMapper _sut;
+
+    [Test]
+    public void Map_UserGroupSave_To_IUserGroup()
     {
-        private IUmbracoMapper _sut;
+        IUserGroup userGroup =
+            new UserGroup(ShortStringHelper, 0, "alias", "name", new List<string> { "c" }, "icon") { Id = 42 };
 
-        [SetUp]
-        public void Setup() => _sut = Services.GetRequiredService<IUmbracoMapper>();
+        // userGroup.permissions is List`1[System.String]
 
-        [Test]
-        public void Map_UserGroupSave_To_IUserGroup()
-        {
-            IUserGroup userGroup = new UserGroup(ShortStringHelper, 0, "alias", "name", new List<string> { "c" }, "icon")
-            {
-                Id = 42
-            };
+        // userGroup.permissions is System.Linq.Enumerable+WhereSelectArrayIterator`2[System.Char, System.String]
+        // fixed: now List`1[System.String]
+        const string json =
+            "{\"id\":@@@ID@@@,\"alias\":\"perm1\",\"name\":\"Perm1\",\"icon\":\"icon-users\",\"sections\":[\"content\"],\"users\":[],\"defaultPermissions\":[\"F\",\"C\",\"A\"],\"assignedPermissions\":{},\"startContentId\":-1,\"startMediaId\":-1,\"action\":\"save\",\"parentId\":-1}";
+        var userGroupSave =
+            JsonConvert.DeserializeObject<UserGroupSave>(json.Replace("@@@ID@@@", userGroup.Id.ToString()));
 
-            // userGroup.permissions is List`1[System.String]
-
-            // userGroup.permissions is System.Linq.Enumerable+WhereSelectArrayIterator`2[System.Char, System.String]
-            // fixed: now List`1[System.String]
-            const string json = "{\"id\":@@@ID@@@,\"alias\":\"perm1\",\"name\":\"Perm1\",\"icon\":\"icon-users\",\"sections\":[\"content\"],\"users\":[],\"defaultPermissions\":[\"F\",\"C\",\"A\"],\"assignedPermissions\":{},\"startContentId\":-1,\"startMediaId\":-1,\"action\":\"save\",\"parentId\":-1}";
-            UserGroupSave userGroupSave = JsonConvert.DeserializeObject<UserGroupSave>(json.Replace("@@@ID@@@", userGroup.Id.ToString()));
-
-            // failed, AutoMapper complained, "Unable to cast object of type 'WhereSelectArrayIterator`2[System.Char,System.String]' to type 'System.Collections.IList'".
-            // FIXME: added ToList() in UserGroupFactory
-            _sut.Map(userGroupSave, userGroup);
-        }
+        // failed, AutoMapper complained, "Unable to cast object of type 'WhereSelectArrayIterator`2[System.Char,System.String]' to type 'System.Collections.IList'".
+        // FIXME: added ToList() in UserGroupFactory
+        _sut.Map(userGroupSave, userGroup);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
index 09eedb312b..08dddf715d 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Packaging/CreatedPackagesRepositoryTests.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Xml.Linq;
+using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -21,317 +22,283 @@ using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 using File = System.IO.File;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Packaging;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
+public class CreatedPackagesRepositoryTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
-    public class CreatedPackagesRepositoryTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetupTestData() => _testBaseFolder = Guid.NewGuid();
+
+    [TearDown]
+    public void DeleteTestFolder() =>
+        Directory.Delete(HostingEnvironment.MapPathContentRoot("~/" + _testBaseFolder), true);
+
+    private Guid _testBaseFolder;
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IMacroService MacroService => GetRequiredService<IMacroService>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IEntityXmlSerializer EntityXmlSerializer => GetRequiredService<IEntityXmlSerializer>();
+
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private MediaFileManager MediaFileManager => GetRequiredService<MediaFileManager>();
+
+    private FileSystems FileSystems => GetRequiredService<FileSystems>();
+
+    public ICreatedPackagesRepository PackageBuilder => new PackagesRepository(
+        ContentService,
+        ContentTypeService,
+        DataTypeService,
+        FileService,
+        MacroService,
+        LocalizationService,
+        HostingEnvironment,
+        EntityXmlSerializer,
+        Options.Create(new GlobalSettings()),
+        MediaService,
+        MediaTypeService,
+        MediaFileManager,
+        FileSystems,
+        "createdPackages.config",
+
+        // temp paths
+        "~/" + _testBaseFolder + "/temp",
+        "~/" + _testBaseFolder + "/packages",
+        "~/" + _testBaseFolder + "/media");
+
+    [Test]
+    public void Delete()
     {
-        private Guid _testBaseFolder;
+        var def1 = new PackageDefinition { Name = "test" };
 
-        [SetUp]
-        public void SetupTestData() => _testBaseFolder = Guid.NewGuid();
+        var result = PackageBuilder.SavePackage(def1);
+        Assert.IsTrue(result);
 
-        [TearDown]
-        public void DeleteTestFolder() =>
-            Directory.Delete(HostingEnvironment.MapPathContentRoot("~/" + _testBaseFolder), true);
+        PackageBuilder.Delete(def1.Id);
 
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        def1 = PackageBuilder.GetById(def1.Id);
+        Assert.IsNull(def1);
+    }
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+    [Test]
+    public void Create_New()
+    {
+        var def1 = new PackageDefinition { Name = "test" };
 
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+        var result = PackageBuilder.SavePackage(def1);
 
-        private IFileService FileService => GetRequiredService<IFileService>();
+        Assert.IsTrue(result);
+        Assert.AreEqual(1, def1.Id);
+        Assert.AreNotEqual(default(Guid).ToString(), def1.PackageId);
 
-        private IMacroService MacroService => GetRequiredService<IMacroService>();
+        var def2 = new PackageDefinition { Name = "test2" };
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        result = PackageBuilder.SavePackage(def2);
 
-        private IEntityXmlSerializer EntityXmlSerializer => GetRequiredService<IEntityXmlSerializer>();
+        Assert.IsTrue(result);
+        Assert.AreEqual(2, def2.Id);
+        Assert.AreNotEqual(default(Guid).ToString(), def2.PackageId);
+    }
 
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
-
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
-
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
-
-        private MediaFileManager MediaFileManager => GetRequiredService<MediaFileManager>();
-
-        private FileSystems FileSystems => GetRequiredService<FileSystems>();
-
-        public ICreatedPackagesRepository PackageBuilder => new PackagesRepository(
-            ContentService,
-            ContentTypeService,
-            DataTypeService,
-            FileService,
-            MacroService,
-            LocalizationService,
-            HostingEnvironment,
-            EntityXmlSerializer,
-            Microsoft.Extensions.Options.Options.Create(new GlobalSettings()),
-            MediaService,
-            MediaTypeService,
-            MediaFileManager,
-            FileSystems,
-            "createdPackages.config",
-
-            // temp paths
-            tempFolderPath: "~/" + _testBaseFolder + "/temp",
-            packagesFolderPath: "~/" + _testBaseFolder + "/packages",
-            mediaFolderPath: "~/" + _testBaseFolder + "/media");
-
-        [Test]
-        public void Delete()
+    [Test]
+    public void Update_Not_Found()
+    {
+        var def = new PackageDefinition
         {
-            var def1 = new PackageDefinition
-            {
-                Name = "test",
-            };
+            Id = 3, // doesn't exist
+            Name = "test"
+        };
 
-            bool result = PackageBuilder.SavePackage(def1);
-            Assert.IsTrue(result);
+        var result = PackageBuilder.SavePackage(def);
 
-            PackageBuilder.Delete(def1.Id);
+        Assert.IsFalse(result);
+    }
 
-            def1 = PackageBuilder.GetById(def1.Id);
-            Assert.IsNull(def1);
-        }
-
-        [Test]
-        public void Create_New()
+    [Test]
+    public void Update()
+    {
+        var def = new PackageDefinition { Name = "test" };
+        var result = PackageBuilder.SavePackage(def);
+        //Update values and save
+        def.Name = "updated";
+        def.ContentNodeId = "test";
+        def.Languages.Add("Danish");
+        def.Languages.Add("English");
+        def.Scripts.Add("TestScript1");
+        def.Scripts.Add("TestScript2");
+        result = PackageBuilder.SavePackage(def);
+        Assert.IsTrue(result);
+        // re-get
+        def = PackageBuilder.GetById(def.Id);
+        Assert.AreEqual("updated", def.Name);
+        Assert.Multiple(() =>
         {
-            var def1 = new PackageDefinition
-            {
-                Name = "test",
-            };
-
-            bool result = PackageBuilder.SavePackage(def1);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(1, def1.Id);
-            Assert.AreNotEqual(default(Guid).ToString(), def1.PackageId);
-
-            var def2 = new PackageDefinition
-            {
-                Name = "test2",
-            };
-
-            result = PackageBuilder.SavePackage(def2);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(2, def2.Id);
-            Assert.AreNotEqual(default(Guid).ToString(), def2.PackageId);
-        }
-
-        [Test]
-        public void Update_Not_Found()
-        {
-            var def = new PackageDefinition
-            {
-                Id = 3, // doesn't exist
-                Name = "test",
-            };
-
-            bool result = PackageBuilder.SavePackage(def);
-
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public void Update()
-        {
-            var def = new PackageDefinition
-            {
-                Name = "test",
-            };
-            bool result = PackageBuilder.SavePackage(def);
-            //Update values and save
-            def.Name = "updated";
-            def.ContentNodeId = "test";
-            def.Languages.Add("Danish");
-            def.Languages.Add("English");
-            def.Scripts.Add("TestScript1");
-            def.Scripts.Add("TestScript2");
-            result = PackageBuilder.SavePackage(def);
-            Assert.IsTrue(result);
-            // re-get
-            def = PackageBuilder.GetById(def.Id);
             Assert.AreEqual("updated", def.Name);
+            Assert.AreEqual("test", def.ContentNodeId);
+            Assert.AreEqual(2, def.Languages.Count());
+            Assert.AreEqual(2, def.Scripts.Count());
+            Assert.AreEqual(0, def.DataTypes.Count());
+            Assert.AreEqual(0, def.DictionaryItems.Count());
+            Assert.AreEqual(0, def.DocumentTypes.Count());
+            Assert.AreEqual(0, def.Macros.Count());
+            Assert.AreEqual(0, def.MediaTypes.Count());
+            Assert.AreEqual(0, def.MediaUdis.Count());
+            Assert.AreEqual(0, def.PartialViews.Count());
+            Assert.AreEqual(0, def.Stylesheets.Count());
+            Assert.AreEqual(0, def.Templates.Count());
+        });
+    }
+
+    [Test]
+    public void GivenNestedDictionaryItems_WhenPackageExported_ThenTheXmlIsNested()
+    {
+        var parent = new DictionaryItem("Parent") { Key = Guid.NewGuid() };
+        LocalizationService.Save(parent);
+        var child1 = new DictionaryItem(parent.Key, "Child1") { Key = Guid.NewGuid() };
+        LocalizationService.Save(child1);
+        var child2 = new DictionaryItem(child1.Key, "Child2") { Key = Guid.NewGuid() };
+        LocalizationService.Save(child2);
+        var child3 = new DictionaryItem(child2.Key, "Child3") { Key = Guid.NewGuid() };
+        LocalizationService.Save(child3);
+        var child4 = new DictionaryItem(child3.Key, "Child4") { Key = Guid.NewGuid() };
+        LocalizationService.Save(child4);
+
+        var def = new PackageDefinition
+        {
+            Name = "test",
+
+            // put these out of order to ensure that it doesn't matter.
+            DictionaryItems = new List<string>
+            {
+                child2.Id.ToString(),
+                child1.Id.ToString(),
+                // we are missing 3 here so 4 will be orphaned and end up in the root
+                child4.Id.ToString(),
+                parent.Id.ToString()
+            }
+        };
+
+        PackageBuilder.SavePackage(def);
+
+        var packageXmlPath = PackageBuilder.ExportPackage(def);
+
+        using (var packageXmlStream = File.OpenRead(packageXmlPath))
+        {
+            var packageXml = XDocument.Load(packageXmlStream);
+            var dictionaryItems = packageXml.Root.Element("DictionaryItems");
+            Assert.IsNotNull(dictionaryItems);
+            var rootItems = dictionaryItems.Elements("DictionaryItem").ToList();
+            Assert.AreEqual(2, rootItems.Count);
+            Assert.AreEqual("Child4", rootItems[0].AttributeValue<string>("Name"));
+            Assert.AreEqual("Parent", rootItems[1].AttributeValue<string>("Name"));
+            var children = rootItems[1].Elements("DictionaryItem").ToList();
+            Assert.AreEqual(1, children.Count);
+            Assert.AreEqual("Child1", children[0].AttributeValue<string>("Name"));
+            children = children[0].Elements("DictionaryItem").ToList();
+            Assert.AreEqual(1, children.Count);
+            Assert.AreEqual("Child2", children[0].AttributeValue<string>("Name"));
+        }
+    }
+
+    [Test]
+    public void Export_Zip()
+    {
+        var mt = MediaTypeBuilder.CreateImageMediaType("testImage");
+        MediaTypeService.Save(mt);
+        var m1 = MediaBuilder.CreateMediaFile(mt, -1);
+        MediaService.Save(m1);
+
+        //Ensure a file exist
+        var fullPath =
+            HostingEnvironment.MapPathWebRoot(m1.Properties[Constants.Conventions.Media.File].GetValue().ToString());
+        using (var file1 = File.CreateText(fullPath))
+        {
+            file1.WriteLine("hello");
+        }
+
+        var def = new PackageDefinition { Name = "test", MediaUdis = new List<GuidUdi> { m1.GetUdi() } };
+
+        var result = PackageBuilder.SavePackage(def);
+        Assert.IsTrue(result);
+        Assert.IsTrue(def.PackagePath.IsNullOrWhiteSpace());
+
+        var packageXmlPath = PackageBuilder.ExportPackage(def);
+
+        def = PackageBuilder.GetById(def.Id); // re-get
+        Assert.IsNotNull(def.PackagePath);
+
+        using (var packageZipStream = File.OpenRead(packageXmlPath))
+        using (var zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out var packageXml))
+        {
+            var test = "test-file.txt";
             Assert.Multiple(() =>
             {
-                Assert.AreEqual("updated", def.Name);
-                Assert.AreEqual("test", def.ContentNodeId);
-                Assert.AreEqual(2, def.Languages.Count());
-                Assert.AreEqual(2, def.Scripts.Count());
-                Assert.AreEqual(0, def.DataTypes.Count());
-                Assert.AreEqual(0, def.DictionaryItems.Count());
-                Assert.AreEqual(0, def.DocumentTypes.Count());
-                Assert.AreEqual(0, def.Macros.Count());
-                Assert.AreEqual(0, def.MediaTypes.Count());
-                Assert.AreEqual(0, def.MediaUdis.Count());
-                Assert.AreEqual(0, def.PartialViews.Count());
-                Assert.AreEqual(0, def.Stylesheets.Count());
-                Assert.AreEqual(0, def.Templates.Count());
+                var mediaEntry = zipArchive.GetEntry("media/media/test-file.txt");
+                Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString());
+                Assert.IsNotNull(mediaEntry);
+                Assert.AreEqual(test, mediaEntry.Name);
+                Assert.IsNotNull(zipArchive.GetEntry("package.xml"));
+                Assert.AreEqual(
+                    $"<MediaItems><MediaSet><testImage id=\"{m1.Id}\" key=\"{m1.Key}\" parentID=\"-1\" level=\"1\" creatorID=\"-1\" sortOrder=\"0\" createDate=\"{m1.CreateDate:s}\" updateDate=\"{m1.UpdateDate:s}\" nodeName=\"Test File\" urlName=\"test-file\" path=\"{m1.Path}\" isDoc=\"\" nodeType=\"{mt.Id}\" nodeTypeAlias=\"testImage\" writerName=\"\" writerID=\"0\" udi=\"{m1.GetUdi()}\" mediaFilePath=\"/media/test-file.txt\"><umbracoFile><![CDATA[/media/test-file.txt]]></umbracoFile><umbracoBytes><![CDATA[100]]></umbracoBytes><umbracoExtension><![CDATA[png]]></umbracoExtension></testImage></MediaSet></MediaItems>",
+                    packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting));
+                Assert.AreEqual(2, zipArchive.Entries.Count());
+                Assert.AreEqual(ZipArchiveMode.Read, zipArchive.Mode);
+                Assert.IsNull(packageXml.DocumentType);
+                Assert.IsNull(packageXml.NextNode);
+                Assert.IsNull(packageXml.Parent);
+                Assert.IsNull(packageXml.PreviousNode);
             });
         }
+    }
 
-        [Test]
-        public void GivenNestedDictionaryItems_WhenPackageExported_ThenTheXmlIsNested()
+
+    [Test]
+    public void Export_Xml()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+
+        FileService.SaveTemplate(template);
+
+        var def = new PackageDefinition { Name = "test", Templates = new[] { template.Id.ToString() } };
+        var result = PackageBuilder.SavePackage(def);
+        Assert.IsTrue(result);
+        Assert.IsTrue(def.PackagePath.IsNullOrWhiteSpace());
+
+        var packageXmlPath = PackageBuilder.ExportPackage(def); // Get
+
+        def = PackageBuilder.GetById(def.Id); // re-get
+        Assert.IsNotNull(def.PackagePath);
+
+        using (var packageXmlStream = File.OpenRead(packageXmlPath))
         {
-            var parent = new DictionaryItem("Parent")
+            var xml = XDocument.Load(packageXmlStream);
+            Assert.Multiple(() =>
             {
-                Key = Guid.NewGuid()
-            };
-            LocalizationService.Save(parent);
-            var child1 = new DictionaryItem(parent.Key, "Child1")
-            {
-                Key = Guid.NewGuid()
-            };
-            LocalizationService.Save(child1);
-            var child2 = new DictionaryItem(child1.Key, "Child2")
-            {
-                Key = Guid.NewGuid()
-            };
-            LocalizationService.Save(child2);
-            var child3 = new DictionaryItem(child2.Key, "Child3")
-            {
-                Key = Guid.NewGuid()
-            };
-            LocalizationService.Save(child3);
-            var child4 = new DictionaryItem(child3.Key, "Child4")
-            {
-                Key = Guid.NewGuid()
-            };
-            LocalizationService.Save(child4);
-
-            var def = new PackageDefinition
-            {
-                Name = "test",
-
-                // put these out of order to ensure that it doesn't matter.
-                DictionaryItems = new List<string>
-                {
-                    child2.Id.ToString(),
-                    child1.Id.ToString(),
-                    // we are missing 3 here so 4 will be orphaned and end up in the root
-                    child4.Id.ToString(),
-                    parent.Id.ToString()
-                }
-            };
-
-            PackageBuilder.SavePackage(def);
-
-            string packageXmlPath = PackageBuilder.ExportPackage(def);
-
-            using (var packageXmlStream = File.OpenRead(packageXmlPath))
-            {
-                var packageXml = XDocument.Load(packageXmlStream);
-                var dictionaryItems = packageXml.Root.Element("DictionaryItems");
-                Assert.IsNotNull(dictionaryItems);
-                var rootItems = dictionaryItems.Elements("DictionaryItem").ToList();
-                Assert.AreEqual(2, rootItems.Count);
-                Assert.AreEqual("Child4", rootItems[0].AttributeValue<string>("Name"));
-                Assert.AreEqual("Parent", rootItems[1].AttributeValue<string>("Name"));
-                var children = rootItems[1].Elements("DictionaryItem").ToList();
-                Assert.AreEqual(1, children.Count);
-                Assert.AreEqual("Child1", children[0].AttributeValue<string>("Name"));
-                children = children[0].Elements("DictionaryItem").ToList();
-                Assert.AreEqual(1, children.Count);
-                Assert.AreEqual("Child2", children[0].AttributeValue<string>("Name"));
-            }
-        }
-
-        [Test]
-        public void Export_Zip()
-        {
-            var mt = MediaTypeBuilder.CreateImageMediaType("testImage");
-            MediaTypeService.Save(mt);
-            var m1 = MediaBuilder.CreateMediaFile(mt, -1);
-            MediaService.Save(m1);
-
-            //Ensure a file exist
-            var fullPath = HostingEnvironment.MapPathWebRoot(m1.Properties[Constants.Conventions.Media.File].GetValue().ToString());
-            using (StreamWriter file1 = File.CreateText(fullPath))
-            {
-                file1.WriteLine("hello");
-            }
-
-            var def = new PackageDefinition
-            {
-                Name = "test",
-                MediaUdis = new List<GuidUdi>(){m1.GetUdi()}
-            };
-
-            bool result = PackageBuilder.SavePackage(def);
-            Assert.IsTrue(result);
-            Assert.IsTrue(def.PackagePath.IsNullOrWhiteSpace());
-
-            string packageXmlPath = PackageBuilder.ExportPackage(def);
-
-            def = PackageBuilder.GetById(def.Id); // re-get
-            Assert.IsNotNull(def.PackagePath);
-
-            using (FileStream packageZipStream = File.OpenRead(packageXmlPath))
-            using (ZipArchive zipArchive = PackageMigrationResource.GetPackageDataManifest(packageZipStream, out XDocument packageXml))
-            {
-                string test = "test-file.txt";
-                Assert.Multiple(() =>
-                {
-                    var mediaEntry = zipArchive.GetEntry("media/media/test-file.txt");
-                    Assert.AreEqual("umbPackage", packageXml.Root.Name.ToString());
-                    Assert.IsNotNull(mediaEntry);
-                    Assert.AreEqual(test, mediaEntry.Name);
-                    Assert.IsNotNull(zipArchive.GetEntry("package.xml"));
-                    Assert.AreEqual(
-                        $"<MediaItems><MediaSet><testImage id=\"{m1.Id}\" key=\"{m1.Key}\" parentID=\"-1\" level=\"1\" creatorID=\"-1\" sortOrder=\"0\" createDate=\"{m1.CreateDate.ToString("s")}\" updateDate=\"{m1.UpdateDate.ToString("s")}\" nodeName=\"Test File\" urlName=\"test-file\" path=\"{m1.Path}\" isDoc=\"\" nodeType=\"{mt.Id}\" nodeTypeAlias=\"testImage\" writerName=\"\" writerID=\"0\" udi=\"{m1.GetUdi()}\" mediaFilePath=\"/media/test-file.txt\"><umbracoFile><![CDATA[/media/test-file.txt]]></umbracoFile><umbracoBytes><![CDATA[100]]></umbracoBytes><umbracoExtension><![CDATA[png]]></umbracoExtension></testImage></MediaSet></MediaItems>",
-                        packageXml.Element("umbPackage").Element("MediaItems").ToString(SaveOptions.DisableFormatting));
-                    Assert.AreEqual(2, zipArchive.Entries.Count());
-                    Assert.AreEqual(ZipArchiveMode.Read, zipArchive.Mode);
-                    Assert.IsNull(packageXml.DocumentType);
-                    Assert.IsNull(packageXml.NextNode);
-                    Assert.IsNull(packageXml.Parent);
-                    Assert.IsNull(packageXml.PreviousNode);
-                });
-            }
-        }
-
-
-        [Test]
-        public void Export_Xml()
-        {
-
-            var template = TemplateBuilder.CreateTextPageTemplate();
-
-            FileService.SaveTemplate(template);
-
-            var def = new PackageDefinition
-            {
-                Name = "test",
-                Templates = new []{template.Id.ToString()}
-            };
-            bool result = PackageBuilder.SavePackage(def);
-            Assert.IsTrue(result);
-            Assert.IsTrue(def.PackagePath.IsNullOrWhiteSpace());
-
-            string packageXmlPath = PackageBuilder.ExportPackage(def); // Get
-
-            def = PackageBuilder.GetById(def.Id); // re-get
-            Assert.IsNotNull(def.PackagePath);
-
-            using (var packageXmlStream = File.OpenRead(packageXmlPath))
-            {
-                var xml = XDocument.Load(packageXmlStream);
-                Assert.Multiple(() =>
-                {
-                    Assert.AreEqual("umbPackage", xml.Root.Name.ToString());
-                    Assert.AreEqual($"<Templates><Template><Name>Text page</Name><Key>{template.Key}</Key><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>", xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
-                    Assert.IsNull(xml.DocumentType);
-                    Assert.IsNull(xml.Parent);
-                    Assert.IsNull(xml.NextNode);
-                    Assert.IsNull(xml.PreviousNode);
-                });
-            }
+                Assert.AreEqual("umbPackage", xml.Root.Name.ToString());
+                Assert.AreEqual(
+                    $"<Templates><Template><Name>Text page</Name><Key>{template.Key}</Key><Alias>textPage</Alias><Design><![CDATA[@using Umbraco.Cms.Web.Common.PublishedModels;{Environment.NewLine}@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage{Environment.NewLine}@{{{Environment.NewLine}\tLayout = null;{Environment.NewLine}}}]]></Design></Template></Templates>",
+                    xml.Element("umbPackage").Element("Templates").ToString(SaveOptions.DisableFormatting));
+                Assert.IsNull(xml.DocumentType);
+                Assert.IsNull(xml.Parent);
+                Assert.IsNull(xml.NextNode);
+                Assert.IsNull(xml.PreviousNode);
+            });
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/PublishedContentQueryAccessorTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/PublishedContentQueryAccessorTests.cs
index ec62bb55fa..daa99b89a2 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/PublishedContentQueryAccessorTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/PublishedContentQueryAccessorTests.cs
@@ -1,45 +1,40 @@
 using System;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Tests.Integration.TestServerTest;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core;
+
+[TestFixture]
+public class PublishedContentQueryAccessorTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class PublishedContentQueryAccessorTests : UmbracoTestServerTestBase
+    [Test]
+    public async Task PublishedContentQueryAccessor_WithRequestScope_WillProvideQuery()
     {
-        [Test]
-        public async Task PublishedContentQueryAccessor_WithRequestScope_WillProvideQuery()
-        {
-            HttpResponseMessage result = await Client.GetAsync("/demo-published-content-query-accessor");
-            Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
-        }
-    }
-
-    public class PublishedContentQueryAccessorTestController : Controller
-    {
-        private readonly IPublishedContentQueryAccessor _accessor;
-
-        public PublishedContentQueryAccessorTestController(IPublishedContentQueryAccessor accessor)
-        {
-            _accessor = accessor;
-        }
-
-        [HttpGet("demo-published-content-query-accessor")]
-        public IActionResult Test()
-        {
-            var success = _accessor.TryGetValue(out IPublishedContentQuery query);
-
-            if (!success || query == null)
-            {
-                throw new ApplicationException("It doesn't work");
-            }
-
-            return Ok();
-        }
+        var result = await Client.GetAsync("/demo-published-content-query-accessor");
+        Assert.AreEqual(HttpStatusCode.OK, result.StatusCode);
+    }
+}
+
+public class PublishedContentQueryAccessorTestController : Controller
+{
+    private readonly IPublishedContentQueryAccessor _accessor;
+
+    public PublishedContentQueryAccessorTestController(IPublishedContentQueryAccessor accessor) => _accessor = accessor;
+
+    [HttpGet("demo-published-content-query-accessor")]
+    public IActionResult Test()
+    {
+        var success = _accessor.TryGetValue(out var query);
+
+        if (!success || query == null)
+        {
+            throw new ApplicationException("It doesn't work");
+        }
+
+        return Ok();
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs
index d0d90c5726..c2fd4a1ab4 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/RuntimeStateTests.cs
@@ -1,5 +1,4 @@
 using System;
-using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using NUnit.Framework;
@@ -9,7 +8,6 @@ using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Packaging;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Migrations;
@@ -18,82 +16,84 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class RuntimeStateTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class RuntimeStateTests : UmbracoIntegrationTest
+    private IRuntimeState RuntimeState => Services.GetRequiredService<IRuntimeState>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private IRuntimeState RuntimeState => Services.GetRequiredService<IRuntimeState>();
+        var migrations = builder.PackageMigrationPlans();
+        migrations.Clear();
+        migrations.Add<TestMigrationPlan>();
+    }
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+    [Test]
+    public void GivenPackageMigrationsExist_WhenLatestStateIsRegistered_ThenLevelIsRun()
+    {
+        // Add the final state to the keyvalue storage
+        var keyValueService = Services.GetRequiredService<IKeyValueService>();
+        keyValueService.SetValue(
+            Constants.Conventions.Migrations.KeyValuePrefix + TestMigrationPlan.TestMigrationPlanName,
+            TestMigrationPlan.TestMigrationFinalState.ToString());
+
+        RuntimeState.DetermineRuntimeLevel();
+
+        Assert.AreEqual(RuntimeLevel.Run, RuntimeState.Level);
+        Assert.AreEqual(RuntimeLevelReason.Run, RuntimeState.Reason);
+    }
+
+    [Test]
+    public void GivenPackageMigrationsExist_WhenUnattendedMigrations_ThenLevelIsRun()
+    {
+        RuntimeState.DetermineRuntimeLevel();
+
+        Assert.AreEqual(RuntimeLevel.Run, RuntimeState.Level);
+        Assert.AreEqual(RuntimeLevelReason.UpgradePackageMigrations, RuntimeState.Reason);
+    }
+
+    [Test]
+    public void GivenPackageMigrationsExist_WhenNotUnattendedMigrations_ThenLevelIsRun()
+    {
+        var unattendedOptions = Services.GetRequiredService<IOptions<UnattendedSettings>>();
+        unattendedOptions.Value.PackageMigrationsUnattended = false;
+
+        RuntimeState.DetermineRuntimeLevel();
+
+        Assert.AreEqual(RuntimeLevel.Run, RuntimeState.Level);
+        Assert.AreEqual(RuntimeLevelReason.Run, RuntimeState.Reason);
+    }
+
+    private class TestMigrationPlan : PackageMigrationPlan
+    {
+        public const string TestMigrationPlanName = "Test";
+
+        public TestMigrationPlan() : base(TestMigrationPlanName)
         {
-            PackageMigrationPlanCollectionBuilder migrations = builder.PackageMigrationPlans();
-            migrations.Clear();
-            migrations.Add<TestMigrationPlan>();
         }
 
-        [Test]
-        public void GivenPackageMigrationsExist_WhenLatestStateIsRegistered_ThenLevelIsRun()
+        public static Guid TestMigrationFinalState => new("BB02C392-4007-4A6C-A550-28BA2FF7E43D");
+
+        protected override void DefinePlan() => To<TestMigration>(TestMigrationFinalState);
+    }
+
+    private class TestMigration : PackageMigrationBase
+    {
+        public TestMigration(
+            IPackagingService packagingService,
+            IMediaService mediaService,
+            MediaFileManager mediaFileManager,
+            MediaUrlGeneratorCollection mediaUrlGenerators,
+            IShortStringHelper shortStringHelper,
+            IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
+            IMigrationContext context)
+            : base(packagingService, mediaService, mediaFileManager, mediaUrlGenerators, shortStringHelper, contentTypeBaseServiceProvider, context)
         {
-            // Add the final state to the keyvalue storage
-            IKeyValueService keyValueService = Services.GetRequiredService<IKeyValueService>();
-            keyValueService.SetValue(
-                Constants.Conventions.Migrations.KeyValuePrefix + TestMigrationPlan.TestMigrationPlanName,
-                TestMigrationPlan.TestMigrationFinalState.ToString());
-
-            RuntimeState.DetermineRuntimeLevel();
-
-            Assert.AreEqual(RuntimeLevel.Run, RuntimeState.Level);
-            Assert.AreEqual(RuntimeLevelReason.Run, RuntimeState.Reason);
         }
 
-        [Test]
-        public void GivenPackageMigrationsExist_WhenUnattendedMigrations_ThenLevelIsRun()
-        {
-            RuntimeState.DetermineRuntimeLevel();
-
-            Assert.AreEqual(RuntimeLevel.Run, RuntimeState.Level);
-            Assert.AreEqual(RuntimeLevelReason.UpgradePackageMigrations, RuntimeState.Reason);
-        }
-
-        [Test]
-        public void GivenPackageMigrationsExist_WhenNotUnattendedMigrations_ThenLevelIsRun()
-        {
-            var unattendedOptions = Services.GetRequiredService<IOptions<UnattendedSettings>>();
-            unattendedOptions.Value.PackageMigrationsUnattended = false;
-
-            RuntimeState.DetermineRuntimeLevel();
-
-            Assert.AreEqual(RuntimeLevel.Run, RuntimeState.Level);
-            Assert.AreEqual(RuntimeLevelReason.Run, RuntimeState.Reason);
-        }
-
-        private class TestMigrationPlan : PackageMigrationPlan
-        {
-            public const string TestMigrationPlanName = "Test";
-            public static Guid TestMigrationFinalState => new Guid("BB02C392-4007-4A6C-A550-28BA2FF7E43D");
-
-            public TestMigrationPlan() : base(TestMigrationPlanName)
-            {
-            }
-
-            protected override void DefinePlan()
-            {
-                To<TestMigration>(TestMigrationFinalState);
-            }
-        }
-
-        private class TestMigration : PackageMigrationBase
-        {
-            public TestMigration(IPackagingService packagingService, IMediaService mediaService, MediaFileManager mediaFileManager, MediaUrlGeneratorCollection mediaUrlGenerators, IShortStringHelper shortStringHelper, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider, IMigrationContext context) : base(packagingService, mediaService, mediaFileManager, mediaUrlGenerators, shortStringHelper, contentTypeBaseServiceProvider, context)
-            {
-            }
-
-            protected override void Migrate()
-            {
-                ImportPackage.FromEmbeddedResource<TestMigration>().Do();
-            }
-        }
+        protected override void Migrate() => ImportPackage.FromEmbeddedResource<TestMigration>().Do();
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/MetricsConsentServiceTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/MetricsConsentServiceTest.cs
index 70d0e80a33..a1fdabe686 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/MetricsConsentServiceTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/MetricsConsentServiceTest.cs
@@ -1,40 +1,39 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class MetricsConsentServiceTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MetricsConsentServiceTest : UmbracoIntegrationTest
+    private IMetricsConsentService MetricsConsentService => GetRequiredService<IMetricsConsentService>();
+
+    private IKeyValueService KeyValueService => GetRequiredService<IKeyValueService>();
+
+    [Test]
+    [TestCase(TelemetryLevel.Minimal)]
+    [TestCase(TelemetryLevel.Basic)]
+    [TestCase(TelemetryLevel.Detailed)]
+    public void Can_Store_Consent(TelemetryLevel level)
     {
-        private IMetricsConsentService MetricsConsentService => GetRequiredService<IMetricsConsentService>();
+        MetricsConsentService.SetConsentLevel(level);
 
-        private IKeyValueService KeyValueService => GetRequiredService<IKeyValueService>();
+        var actual = MetricsConsentService.GetConsentLevel();
+        Assert.IsNotNull(actual);
+        Assert.AreEqual(level, actual);
+    }
 
-        [Test]
-        [TestCase(TelemetryLevel.Minimal)]
-        [TestCase(TelemetryLevel.Basic)]
-        [TestCase(TelemetryLevel.Detailed)]
-        public void Can_Store_Consent(TelemetryLevel level)
-        {
-            MetricsConsentService.SetConsentLevel(level);
+    [Test]
+    public void Enum_Stored_as_string()
+    {
+        MetricsConsentService.SetConsentLevel(TelemetryLevel.Detailed);
 
-            var actual = MetricsConsentService.GetConsentLevel();
-            Assert.IsNotNull(actual);
-            Assert.AreEqual(level, actual);
-        }
+        var stringValue = KeyValueService.GetValue(Cms.Core.Services.MetricsConsentService.Key);
 
-        [Test]
-        public void Enum_Stored_as_string()
-        {
-            MetricsConsentService.SetConsentLevel(TelemetryLevel.Detailed);
-
-            var stringValue = KeyValueService.GetValue(Cms.Core.Services.MetricsConsentService.Key);
-
-            Assert.AreEqual("Detailed", stringValue);
-        }
+        Assert.AreEqual("Detailed", stringValue);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs
index 691a6dfdbf..c453394624 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/SectionServiceTests.cs
@@ -1,79 +1,61 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services
+
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
+
+/// <summary>
+///     Tests covering the SectionService
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class SectionServiceTests : UmbracoIntegrationTest
 {
-    /// <summary>
-    /// Tests covering the SectionService
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class SectionServiceTests : UmbracoIntegrationTest
+    private ISectionService SectionService => GetRequiredService<ISectionService>();
+
+    private IUserService UserService => GetRequiredService<IUserService>();
+
+    [Test]
+    public void SectionService_Can_Get_Allowed_Sections_For_User()
     {
-        private ISectionService SectionService => GetRequiredService<ISectionService>();
+        // Arrange
+        var user = CreateTestUser();
 
-        private IUserService UserService => GetRequiredService<IUserService>();
+        // Act
+        var result = SectionService.GetAllowedSections(user.Id).ToList();
 
-        [Test]
-        public void SectionService_Can_Get_Allowed_Sections_For_User()
-        {
-            // Arrange
-            IUser user = CreateTestUser();
+        // Assert
+        Assert.AreEqual(3, result.Count);
+    }
 
-            // Act
-            var result = SectionService.GetAllowedSections(user.Id).ToList();
+    private IUser CreateTestUser()
+    {
+        using var scope = ScopeProvider.CreateScope(autoComplete: true);
+        using var _ = scope.Notifications.Suppress();
 
-            // Assert
-            Assert.AreEqual(3, result.Count);
-        }
+        var globalSettings = new GlobalSettings();
+        var user = new User(globalSettings) { Name = "Test user", Username = "testUser", Email = "testuser@test.com" };
+        UserService.Save(user);
 
-        private IUser CreateTestUser()
-        {
-            using IScope scope = ScopeProvider.CreateScope(autoComplete: true);
-            using IDisposable _ = scope.Notifications.Suppress();
+        var userGroupA = new UserGroup(ShortStringHelper) { Alias = "GroupA", Name = "Group A" };
+        userGroupA.AddAllowedSection("media");
+        userGroupA.AddAllowedSection("settings");
 
-            var globalSettings = new GlobalSettings();
-            var user = new User(globalSettings)
-            {
-                Name = "Test user",
-                Username = "testUser",
-                Email = "testuser@test.com",
-            };
-            UserService.Save(user);
+        // TODO: This is failing the test
+        UserService.Save(userGroupA, new[] { user.Id });
 
-            var userGroupA = new UserGroup(ShortStringHelper)
-            {
-                Alias = "GroupA",
-                Name = "Group A"
-            };
-            userGroupA.AddAllowedSection("media");
-            userGroupA.AddAllowedSection("settings");
+        var userGroupB = new UserGroup(ShortStringHelper) { Alias = "GroupB", Name = "Group B" };
+        userGroupB.AddAllowedSection("settings");
+        userGroupB.AddAllowedSection("member");
+        UserService.Save(userGroupB, new[] { user.Id });
 
-            // TODO: This is failing the test
-            UserService.Save(userGroupA, new[] { user.Id });
-
-            var userGroupB = new UserGroup(ShortStringHelper)
-            {
-                Alias = "GroupB",
-                Name = "Group B"
-            };
-            userGroupB.AddAllowedSection("settings");
-            userGroupB.AddAllowedSection("member");
-            UserService.Save(userGroupB, new[] { user.Id });
-
-            return UserService.GetUserById(user.Id);
-        }
+        return UserService.GetUserById(user.Id);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/TelemetryProviderTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/TelemetryProviderTests.cs
index 48f340b084..c7a032df8f 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/TelemetryProviderTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Services/TelemetryProviderTests.cs
@@ -12,7 +12,6 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -22,334 +21,345 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services
+/// <summary>
+///     Tests covering the SectionService
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class TelemetryProviderTests : UmbracoIntegrationTest
 {
-    /// <summary>
-    /// Tests covering the SectionService
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class TelemetryProviderTests : UmbracoIntegrationTest
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IDomainService DomainService => GetRequiredService<IDomainService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private DomainTelemetryProvider DetailedTelemetryProviders => GetRequiredService<DomainTelemetryProvider>();
+
+    private ContentTelemetryProvider ContentTelemetryProvider => GetRequiredService<ContentTelemetryProvider>();
+
+    private LanguagesTelemetryProvider LanguagesTelemetryProvider => GetRequiredService<LanguagesTelemetryProvider>();
+
+    private UserTelemetryProvider UserTelemetryProvider => GetRequiredService<UserTelemetryProvider>();
+
+    private MacroTelemetryProvider MacroTelemetryProvider => GetRequiredService<MacroTelemetryProvider>();
+
+    private MediaTelemetryProvider MediaTelemetryProvider => GetRequiredService<MediaTelemetryProvider>();
+
+    private PropertyEditorTelemetryProvider PropertyEditorTelemetryProvider =>
+        GetRequiredService<PropertyEditorTelemetryProvider>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IUserService UserService => GetRequiredService<IUserService>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private readonly LanguageBuilder _languageBuilder = new();
+
+    private readonly UserBuilder _userBuilder = new();
+
+    private readonly UserGroupBuilder _userGroupBuilder = new();
+
+    private readonly ContentTypeBuilder _contentTypeBuilder = new();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        builder.Services.AddTransient<DomainTelemetryProvider>();
+        builder.Services.AddTransient<ContentTelemetryProvider>();
+        builder.Services.AddTransient<LanguagesTelemetryProvider>();
+        builder.Services.AddTransient<UserTelemetryProvider>();
+        builder.Services.AddTransient<MacroTelemetryProvider>();
+        builder.Services.AddTransient<MediaTelemetryProvider>();
+        builder.Services.AddTransient<PropertyEditorTelemetryProvider>();
+        base.CustomTestSetup(builder);
+    }
 
-        private IFileService FileService => GetRequiredService<IFileService>();
+    [Test]
+    public void Domain_Telemetry_Provider_Can_Get_Domains()
+    {
+        // Arrange
+        DomainService.Save(new UmbracoDomain("danish", "da-DK"));
 
-        private IDomainService DomainService => GetRequiredService<IDomainService>();
+        IEnumerable<UsageInformation> result = null;
+        // Act
+        result = DetailedTelemetryProviders.GetInformation();
 
-        private IContentService ContentService => GetRequiredService<IContentService>();
 
-        private DomainTelemetryProvider DetailedTelemetryProviders => GetRequiredService<DomainTelemetryProvider>();
+        // Assert
+        Assert.AreEqual(1, result.First().Data);
+    }
 
-        private ContentTelemetryProvider ContentTelemetryProvider => GetRequiredService<ContentTelemetryProvider>();
+    [Test]
+    public void SectionService_Can_Get_Allowed_Sections_For_User()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        private LanguagesTelemetryProvider LanguagesTelemetryProvider => GetRequiredService<LanguagesTelemetryProvider>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
 
-        private UserTelemetryProvider UserTelemetryProvider => GetRequiredService<UserTelemetryProvider>();
+        var blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
+        blueprint.SetValue("title", "blueprint 1");
+        blueprint.SetValue("bodyText", "blueprint 2");
+        blueprint.SetValue("keywords", "blueprint 3");
+        blueprint.SetValue("description", "blueprint 4");
 
-        private MacroTelemetryProvider MacroTelemetryProvider => GetRequiredService<MacroTelemetryProvider>();
+        ContentService.SaveBlueprint(blueprint);
 
-        private MediaTelemetryProvider MediaTelemetryProvider => GetRequiredService<MediaTelemetryProvider>();
-        
-        private PropertyEditorTelemetryProvider PropertyEditorTelemetryProvider => GetRequiredService<PropertyEditorTelemetryProvider>();
+        var fromBlueprint = ContentService.CreateContentFromBlueprint(blueprint, "My test content");
+        ContentService.Save(fromBlueprint);
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        IEnumerable<UsageInformation> result = null;
+        // Act
+        result = ContentTelemetryProvider.GetInformation();
 
-        private IUserService UserService => GetRequiredService<IUserService>();
 
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
+        // Assert
+        // TODO : Test multiple roots, with children + grandchildren
+        Assert.AreEqual(1, result.First().Data);
+    }
 
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+    [Test]
+    public void Language_Telemetry_Can_Get_Languages()
+    {
+        // Arrange
+        var langTwo = _languageBuilder.WithCultureInfo("da-DK").Build();
+        var langThree = _languageBuilder.WithCultureInfo("se-SV").Build();
 
-        private LanguageBuilder _languageBuilder = new();
+        LocalizationService.Save(langTwo);
+        LocalizationService.Save(langThree);
 
-        private UserBuilder _userBuilder = new();
+        IEnumerable<UsageInformation> result = null;
 
-        private UserGroupBuilder _userGroupBuilder = new();
+        // Act
+        result = LanguagesTelemetryProvider.GetInformation();
 
-        private ContentTypeBuilder _contentTypeBuilder = new ();
+        // Assert
+        Assert.AreEqual(3, result.First().Data);
+    }
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+    [Test]
+    public void MacroTelemetry_Can_Get_Macros()
+    {
+        BuildMacros();
+        var result = MacroTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.MacroCount);
+        Assert.AreEqual(3, result.Data);
+    }
+
+    [Test]
+    public void MediaTelemetry_Can_Get_Media_In_Folders()
+    {
+        var folderType = MediaTypeService.Get(1031);
+        var imageMediaType = MediaTypeService.Get(1032);
+
+        var root = MediaBuilder.CreateMediaFolder(folderType, -1);
+        MediaService.Save(root);
+        var createdMediaCount = 10;
+        for (var i = 0; i < createdMediaCount; i++)
         {
-            builder.Services.AddTransient<DomainTelemetryProvider>();
-            builder.Services.AddTransient<ContentTelemetryProvider>();
-            builder.Services.AddTransient<LanguagesTelemetryProvider>();
-            builder.Services.AddTransient<UserTelemetryProvider>();
-            builder.Services.AddTransient<MacroTelemetryProvider>();
-            builder.Services.AddTransient<MediaTelemetryProvider>();
-            builder.Services.AddTransient<PropertyEditorTelemetryProvider>();
-            base.CustomTestSetup(builder);
+            var c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
+            MediaService.Save(c1);
         }
 
-        [Test]
-        public void Domain_Telemetry_Provider_Can_Get_Domains()
+        var result = MediaTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.MediaCount);
+        Assert.AreEqual(createdMediaCount, result.Data);
+    }
+
+    [Test]
+    public void MediaTelemetry_Can_Get_Media_In_Root()
+    {
+        var imageMediaType = MediaTypeService.Get(1032);
+        var createdMediaCount = 10;
+        for (var i = 0; i < createdMediaCount; i++)
         {
-            // Arrange
-            DomainService.Save(new UmbracoDomain("danish", "da-DK"));
-
-            IEnumerable<UsageInformation> result = null;
-            // Act
-            result = DetailedTelemetryProviders.GetInformation();
-
-
-            // Assert
-            Assert.AreEqual(1, result.First().Data);
+            var c1 = MediaBuilder.CreateMediaImage(imageMediaType, -1);
+            MediaService.Save(c1);
         }
 
-        [Test]
-        public void SectionService_Can_Get_Allowed_Sections_For_User()
+        var result = MediaTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.MediaCount);
+        Assert.AreEqual(createdMediaCount, result.Data);
+    }
+
+    [Test]
+    public void PropertyEditorTelemetry_Counts_Same_Editor_As_One()
+    {
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        AddPropType("title", -88, ct2);
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        AddPropType("title", -88, ct3);
+        var ct5 = ContentTypeBuilder.CreateBasicContentType("ct5", "CT5");
+        AddPropType("blah", -88, ct5);
+
+        ContentTypeService.Save(ct2);
+        ContentTypeService.Save(ct3);
+        ContentTypeService.Save(ct5);
+
+        var properties = PropertyEditorTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.Properties);
+        var result = properties.Data as IEnumerable<string>;
+        Assert.AreEqual(1, result?.Count());
+    }
+
+    [Test]
+    public void PropertyEditorTelemetry_Can_Get_All_PropertyTypes()
+    {
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        AddPropType("title", -88, ct2);
+        AddPropType("title", -99, ct2);
+        var ct5 = ContentTypeBuilder.CreateBasicContentType("ct5", "CT5");
+        AddPropType("blah", -88, ct5);
+
+        ContentTypeService.Save(ct2);
+        ContentTypeService.Save(ct5);
+
+        var properties = PropertyEditorTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.Properties);
+        var result = properties.Data as IEnumerable<string>;
+        Assert.AreEqual(2, result?.Count());
+    }
+
+    [Test]
+    public void UserTelemetry_Can_Get_Default_User()
+    {
+        var result = UserTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.UserCount);
+
+        Assert.AreEqual(1, result.Data);
+    }
+
+    [Test]
+    public void UserTelemetry_Can_Get_With_Saved_User()
+    {
+        var user = BuildUser(0);
+
+        UserService.Save(user);
+
+        var result = UserTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.UserCount);
+
+        Assert.AreEqual(2, result.Data);
+    }
+
+    [Test]
+    public void UserTelemetry_Can_Get_More_Users()
+    {
+        var totalUsers = 99;
+        var users = BuildUsers(totalUsers);
+        UserService.Save(users);
+
+        var result = UserTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.UserCount);
+
+        Assert.AreEqual(totalUsers + 1, result.Data);
+    }
+
+    [Test]
+    public void UserTelemetry_Can_Get_Default_UserGroups()
+    {
+        var result = UserTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.UserGroupCount);
+        Assert.AreEqual(5, result.Data);
+    }
+
+    [Test]
+    public void UserTelemetry_Can_Get_With_Saved_UserGroups()
+    {
+        var userGroup = BuildUserGroup("testGroup");
+
+        UserService.Save(userGroup);
+        var result = UserTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.UserGroupCount);
+
+        Assert.AreEqual(6, result.Data);
+    }
+
+    [Test]
+    public void UserTelemetry_Can_Get_More_UserGroups()
+    {
+        var userGroups = BuildUserGroups(100);
+
+
+        foreach (var userGroup in userGroups)
         {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            Content blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
-            blueprint.SetValue("title", "blueprint 1");
-            blueprint.SetValue("bodyText", "blueprint 2");
-            blueprint.SetValue("keywords", "blueprint 3");
-            blueprint.SetValue("description", "blueprint 4");
-
-            ContentService.SaveBlueprint(blueprint);
-
-            IContent fromBlueprint = ContentService.CreateContentFromBlueprint(blueprint, "My test content");
-            ContentService.Save(fromBlueprint);
-
-            IEnumerable<UsageInformation> result = null;
-            // Act
-            result = ContentTelemetryProvider.GetInformation();
-
-
-            // Assert
-            // TODO : Test multiple roots, with children + grandchildren
-            Assert.AreEqual(1, result.First().Data);
-        }
-
-        [Test]
-        public void Language_Telemetry_Can_Get_Languages()
-        {
-            // Arrange
-            var langTwo = _languageBuilder.WithCultureInfo("da-DK").Build();
-            var langThree = _languageBuilder.WithCultureInfo("se-SV").Build();
-
-            LocalizationService.Save(langTwo);
-            LocalizationService.Save(langThree);
-
-            IEnumerable<UsageInformation> result = null;
-
-            // Act
-            result = LanguagesTelemetryProvider.GetInformation();
-
-            // Assert
-            Assert.AreEqual(3, result.First().Data);
-        }
-
-        [Test]
-        public void MacroTelemetry_Can_Get_Macros()
-        {
-            BuildMacros();
-            var result = MacroTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.MacroCount);
-            Assert.AreEqual(3, result.Data);
-        }
-
-        [Test]
-        public void MediaTelemetry_Can_Get_Media_In_Folders()
-        {
-            IMediaType folderType = MediaTypeService.Get(1031);
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-
-            Media root = MediaBuilder.CreateMediaFolder(folderType, -1);
-            MediaService.Save(root);
-            int createdMediaCount = 10;
-            for (int i = 0; i < createdMediaCount; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
-                MediaService.Save(c1);
-            }
-
-            var result = MediaTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.MediaCount);
-            Assert.AreEqual(createdMediaCount, result.Data);
-        }
-
-        [Test]
-        public void MediaTelemetry_Can_Get_Media_In_Root()
-        {
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-            int createdMediaCount = 10;
-            for (int i = 0; i < createdMediaCount; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageMediaType, -1);
-                MediaService.Save(c1);
-            }
-
-            var result = MediaTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.MediaCount);
-            Assert.AreEqual(createdMediaCount, result.Data);
-        }
-
-        [Test]
-        public void PropertyEditorTelemetry_Counts_Same_Editor_As_One()
-        {
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", null);
-            AddPropType("title", -88, ct2);
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3", null);
-            AddPropType("title",-88, ct3);
-            ContentType ct5 = ContentTypeBuilder.CreateBasicContentType("ct5", "CT5", null);
-            AddPropType("blah", -88, ct5);
-
-            ContentTypeService.Save(ct2);
-            ContentTypeService.Save(ct3);
-            ContentTypeService.Save(ct5);
-
-            var properties = PropertyEditorTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.Properties);
-            var result = properties.Data as IEnumerable<string>;
-            Assert.AreEqual(1, result?.Count());
-        }
-        
-        [Test]
-        public void PropertyEditorTelemetry_Can_Get_All_PropertyTypes()
-        {
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", null);
-            AddPropType("title", -88, ct2);
-            AddPropType("title",-99, ct2);
-            ContentType ct5 = ContentTypeBuilder.CreateBasicContentType("ct5", "CT5", null);
-            AddPropType("blah", -88, ct5);
-
-            ContentTypeService.Save(ct2);
-            ContentTypeService.Save(ct5);
-
-            var properties = PropertyEditorTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.Properties);
-            var result = properties.Data as IEnumerable<string>;
-            Assert.AreEqual(2, result?.Count());
-        }
-
-        [Test]
-        public void UserTelemetry_Can_Get_Default_User()
-        {
-            var result = UserTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.UserCount);
-
-            Assert.AreEqual(1, result.Data);
-        }
-
-        [Test]
-        public void UserTelemetry_Can_Get_With_Saved_User()
-        {
-            var user = BuildUser(0);
-
-            UserService.Save(user);
-
-            var result = UserTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.UserCount);
-
-            Assert.AreEqual(2, result.Data);
-        }
-
-        [Test]
-        public void UserTelemetry_Can_Get_More_Users()
-        {
-            int totalUsers = 99;
-            var users = BuildUsers(totalUsers);
-            UserService.Save(users);
-
-            var result = UserTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.UserCount);
-
-            Assert.AreEqual(totalUsers + 1, result.Data);
-        }
-
-        [Test]
-        public void UserTelemetry_Can_Get_Default_UserGroups()
-        {
-            var result = UserTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.UserGroupCount);
-            Assert.AreEqual(5, result.Data);
-        }
-
-        [Test]
-        public void UserTelemetry_Can_Get_With_Saved_UserGroups()
-        {
-            var userGroup = BuildUserGroup("testGroup");
-
             UserService.Save(userGroup);
-            var result = UserTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.UserGroupCount);
-
-            Assert.AreEqual(6, result.Data);
         }
 
-        [Test]
-        public void UserTelemetry_Can_Get_More_UserGroups()
+        var result = UserTelemetryProvider.GetInformation()
+            .FirstOrDefault(x => x.Name == Constants.Telemetry.UserGroupCount);
+
+        Assert.AreEqual(105, result.Data);
+    }
+
+    private User BuildUser(int count) =>
+        _userBuilder
+            .WithLogin($"username{count}", "test pass")
+            .WithName("Test" + count)
+            .WithEmail($"test{count}@test.com")
+            .Build();
+
+    private IEnumerable<User> BuildUsers(int count)
+    {
+        for (var i = 0; i < count; i++)
         {
-            var userGroups = BuildUserGroups(100);
-
-
-            foreach (var userGroup in userGroups)
-            {
-                UserService.Save(userGroup);
-            }
-
-            var result = UserTelemetryProvider.GetInformation().FirstOrDefault(x => x.Name == Constants.Telemetry.UserGroupCount);
-
-            Assert.AreEqual(105, result.Data);
-        }
-
-        private User BuildUser(int count) =>
-            _userBuilder
-                .WithLogin($"username{count}", "test pass")
-                .WithName("Test" + count)
-                .WithEmail($"test{count}@test.com")
-                .Build();
-
-        private IEnumerable<User> BuildUsers(int count)
-        {
-            for (int i = 0; i < count; i++)
-            {
-                yield return BuildUser(count);
-            }
-        }
-
-        private IUserGroup BuildUserGroup(string alias) =>
-            _userGroupBuilder
-                .WithAlias(alias)
-                .WithName(alias)
-                .WithAllowedSections(new List<string>(){"A", "B"})
-                .Build();
-
-        private IEnumerable<IUserGroup> BuildUserGroups(int count)
-        {
-            for (int i = 0; i < count; i++)
-            {
-                yield return BuildUserGroup(i.ToString());
-            }
-        }
-
-        private void BuildMacros()
-        {
-            IScopeProvider scopeProvider = ScopeProvider;
-            using (IScope scope = scopeProvider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)scopeProvider, AppCaches.Disabled, Mock.Of<ILogger<MacroRepository>>(), ShortStringHelper);
-
-                repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
-                repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
-                repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
-                scope.Complete();
-            }
-        }
-        
-        private void AddPropType(string alias, int dataTypeId, IContentType ct)
-        {
-            var contentCollection = new PropertyTypeCollection(true)
-            {
-                new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = alias, Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = dataTypeId },
-            };
-            var pg = new PropertyGroup(contentCollection)
-            {
-                Alias = "test",
-                Name = "test",
-                SortOrder = 1
-            };
-            ct.PropertyGroups.Add(pg);
+            yield return BuildUser(count);
         }
     }
+
+    private IUserGroup BuildUserGroup(string alias) =>
+        _userGroupBuilder
+            .WithAlias(alias)
+            .WithName(alias)
+            .WithAllowedSections(new List<string> { "A", "B" })
+            .Build();
+
+    private IEnumerable<IUserGroup> BuildUserGroups(int count)
+    {
+        for (var i = 0; i < count; i++)
+        {
+            yield return BuildUserGroup(i.ToString());
+        }
+    }
+
+    private void BuildMacros()
+    {
+        var scopeProvider = ScopeProvider;
+        using (var scope = scopeProvider.CreateScope())
+        {
+            var repository = new MacroRepository((IScopeAccessor)scopeProvider, AppCaches.Disabled, Mock.Of<ILogger<MacroRepository>>(), ShortStringHelper);
+
+            repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
+            repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
+            repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
+            scope.Complete();
+        }
+    }
+
+    private void AddPropType(string alias, int dataTypeId, IContentType ct)
+    {
+        var contentCollection = new PropertyTypeCollection(true)
+        {
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+            {
+                Alias = alias,
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = dataTypeId
+            }
+        };
+        var pg = new PropertyGroup(contentCollection) { Alias = "test", Name = "test", SortOrder = 1 };
+        ct.PropertyGroups.Add(pg);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
index e898ba49ce..058b6d83c2 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
@@ -11,67 +11,62 @@ using Umbraco.Cms.Core.Telemetry;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Telemetry
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Telemetry;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class TelemetryServiceTests : UmbracoIntegrationTest
 {
+    protected override void CustomTestSetup(IUmbracoBuilder builder) =>
+        builder.Services.Configure<GlobalSettings>(options => options.Id = Guid.NewGuid().ToString());
 
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class TelemetryServiceTests : UmbracoIntegrationTest
+    private ITelemetryService TelemetryService => GetRequiredService<ITelemetryService>();
+    private IMetricsConsentService MetricsConsentService => GetRequiredService<IMetricsConsentService>();
+
+    [Test]
+    public void Expected_Detailed_Telemetry_Exists()
     {
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+        var expectedData = new[]
         {
-            builder.Services.Configure<GlobalSettings>(options => options.Id = Guid.NewGuid().ToString());
-        }
+            Constants.Telemetry.RootCount,
+            Constants.Telemetry.DomainCount,
+            Constants.Telemetry.ExamineIndexCount,
+            Constants.Telemetry.LanguageCount,
+            Constants.Telemetry.MacroCount,
+            Constants.Telemetry.MediaCount,
+            Constants.Telemetry.MediaCount,
+            Constants.Telemetry.TemplateCount,
+            Constants.Telemetry.ContentCount,
+            Constants.Telemetry.DocumentTypeCount,
+            Constants.Telemetry.Properties,
+            Constants.Telemetry.UserCount,
+            Constants.Telemetry.UserGroupCount,
+            Constants.Telemetry.ServerOs,
+            Constants.Telemetry.ServerFramework,
+            Constants.Telemetry.OsLanguage,
+            Constants.Telemetry.WebServer,
+            Constants.Telemetry.ModelsBuilderMode,
+            Constants.Telemetry.CustomUmbracoPath,
+            Constants.Telemetry.AspEnvironment,
+            Constants.Telemetry.IsDebug,
+            Constants.Telemetry.DatabaseProvider,
+        };
 
-        private ITelemetryService TelemetryService => GetRequiredService<ITelemetryService>();
-        private IMetricsConsentService MetricsConsentService => GetRequiredService<IMetricsConsentService>();
+        MetricsConsentService.SetConsentLevel(TelemetryLevel.Detailed);
+        var success = TelemetryService.TryGetTelemetryReportData(out var telemetryReportData);
+        var detailed = telemetryReportData.Detailed.ToArray();
 
-        [Test]
-        public void Expected_Detailed_Telemetry_Exists()
+        Assert.IsTrue(success);
+        Assert.Multiple(() =>
         {
-            var expectedData = new string[]
+            Assert.IsNotNull(detailed);
+            Assert.AreEqual(expectedData.Length, detailed.Length);
+
+            foreach (var expectedInfo in expectedData)
             {
-                Constants.Telemetry.RootCount,
-                Constants.Telemetry.DomainCount,
-                Constants.Telemetry.ExamineIndexCount,
-                Constants.Telemetry.LanguageCount,
-                Constants.Telemetry.MacroCount,
-                Constants.Telemetry.MediaCount,
-                Constants.Telemetry.MediaCount,
-                Constants.Telemetry.TemplateCount,
-                Constants.Telemetry.ContentCount,
-                Constants.Telemetry.DocumentTypeCount,
-                Constants.Telemetry.Properties,
-                Constants.Telemetry.UserCount,
-                Constants.Telemetry.UserGroupCount,
-                Constants.Telemetry.ServerOs,
-                Constants.Telemetry.ServerFramework,
-                Constants.Telemetry.OsLanguage,
-                Constants.Telemetry.WebServer,
-                Constants.Telemetry.ModelsBuilderMode,
-                Constants.Telemetry.CustomUmbracoPath,
-                Constants.Telemetry.AspEnvironment,
-                Constants.Telemetry.IsDebug,
-                Constants.Telemetry.DatabaseProvider,
-            };
-
-            MetricsConsentService.SetConsentLevel(TelemetryLevel.Detailed);
-            var success = TelemetryService.TryGetTelemetryReportData(out var telemetryReportData);
-            var detailed = telemetryReportData.Detailed.ToArray();
-
-            Assert.IsTrue(success);
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(detailed);
-                Assert.AreEqual(expectedData.Length, detailed.Length);
-
-                foreach (var expectedInfo in expectedData)
-                {
-                    var expected = detailed.FirstOrDefault(x => x.Name == expectedInfo);
-                    Assert.IsNotNull(expected, $"Expected {expectedInfo} to exists in the detailed list");
-                }
-            });
-        }
-
+                var expected = detailed.FirstOrDefault(x => x.Name == expectedInfo);
+                Assert.IsNotNull(expected, $"Expected {expectedInfo} to exists in the detailed list");
+            }
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs
index 99e2d21158..75181d0b33 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineBaseTest.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Data;
 using Examine.Lucene.Providers;
-using Examine.Search;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Events;
@@ -15,118 +13,118 @@ using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+[TestFixture]
+public abstract class ExamineBaseTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    public abstract class ExamineBaseTest : UmbracoIntegrationTest
+    protected IndexInitializer IndexInitializer => Services.GetRequiredService<IndexInitializer>();
+
+    protected IHostingEnvironment HostingEnvironment => Services.GetRequiredService<IHostingEnvironment>();
+
+    protected IRuntimeState RunningRuntimeState { get; } = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
+
+    protected override void ConfigureTestServices(IServiceCollection services)
+        => services.AddSingleton<IndexInitializer>();
+
+    /// <summary>
+    ///     Used to create and manage a testable index
+    /// </summary>
+    /// <param name="publishedValuesOnly"></param>
+    /// <param name="index"></param>
+    /// <param name="contentRebuilder"></param>
+    /// <param name="contentValueSetBuilder"></param>
+    /// <param name="parentId"></param>
+    /// <param name="contentService"></param>
+    /// <returns></returns>
+    protected IDisposable GetSynchronousContentIndex(
+        bool publishedValuesOnly,
+        out UmbracoContentIndex index,
+        out ContentIndexPopulator contentRebuilder,
+        out ContentValueSetBuilder contentValueSetBuilder,
+        int? parentId = null,
+        IContentService contentService = null)
     {
-        protected IndexInitializer IndexInitializer => Services.GetRequiredService<IndexInitializer>();
+        contentValueSetBuilder = IndexInitializer.GetContentValueSetBuilder(publishedValuesOnly);
 
-        protected IHostingEnvironment HostingEnvironment => Services.GetRequiredService<IHostingEnvironment>();
+        var sqlContext = Mock.Of<ISqlContext>(x => x.Query<IContent>() == Mock.Of<IQuery<IContent>>());
+        var dbFactory = Mock.Of<IUmbracoDatabaseFactory>(x => x.SqlContext == sqlContext);
 
-        protected IRuntimeState RunningRuntimeState { get; } = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-
-        protected override void ConfigureTestServices(IServiceCollection services)
-            => services.AddSingleton<IndexInitializer>();
-
-        /// <summary>
-        /// Used to create and manage a testable index
-        /// </summary>
-        /// <param name="publishedValuesOnly"></param>
-        /// <param name="index"></param>
-        /// <param name="contentRebuilder"></param>
-        /// <param name="contentValueSetBuilder"></param>
-        /// <param name="parentId"></param>
-        /// <returns></returns>
-        protected IDisposable GetSynchronousContentIndex(
-            bool publishedValuesOnly,
-            out UmbracoContentIndex index,
-            out ContentIndexPopulator contentRebuilder,
-            out ContentValueSetBuilder contentValueSetBuilder,
-            int? parentId = null,
-            IContentService contentService = null)
+        if (contentService == null)
         {
-            contentValueSetBuilder = IndexInitializer.GetContentValueSetBuilder(publishedValuesOnly);
-
-            ISqlContext sqlContext = Mock.Of<ISqlContext>(x => x.Query<IContent>() == Mock.Of<IQuery<IContent>>());
-            IUmbracoDatabaseFactory dbFactory = Mock.Of<IUmbracoDatabaseFactory>(x => x.SqlContext == sqlContext);
-
-            if (contentService == null)
-            {
-                contentService = IndexInitializer.GetMockContentService();
-            }
-
-            contentRebuilder = IndexInitializer.GetContentIndexRebuilder(contentService, publishedValuesOnly, dbFactory);
-
-            var luceneDir = new RandomIdRAMDirectory();
-
-            ContentValueSetValidator validator;
-
-            // if only published values then we'll change the validator for tests to
-            // ensure we don't support protected nodes and that we
-            // mock the public access service for the special protected node.
-            if (publishedValuesOnly)
-            {
-                var publicAccessServiceMock = new Mock<IPublicAccessService>();
-                publicAccessServiceMock.Setup(x => x.IsProtected(It.IsAny<string>()))
-                    .Returns((string path) =>
-                    {
-                        if (path.EndsWith("," + ExamineDemoDataContentService.ProtectedNode))
-                        {
-                            return Attempt<PublicAccessEntry>.Succeed();
-                        }
-                        return Attempt<PublicAccessEntry>.Fail();
-                    });
-
-                var scopeProviderMock = new Mock<IScopeProvider>();
-                scopeProviderMock.Setup(x => x.CreateScope(
-                        It.IsAny<IsolationLevel>(),
-                        It.IsAny<RepositoryCacheMode>(),
-                        It.IsAny<IEventDispatcher>(),
-                        It.IsAny<IScopedNotificationPublisher>(),
-                        It.IsAny<bool?>(),
-                        It.IsAny<bool>(),
-                        It.IsAny<bool>()))
-                    .Returns(Mock.Of<IScope>);
-
-                validator = new ContentValueSetValidator(
-                    publishedValuesOnly,
-                    false,
-                    publicAccessServiceMock.Object,
-                    scopeProviderMock.Object,
-                    parentId);
-            }
-            else
-            {
-                validator = new ContentValueSetValidator(publishedValuesOnly, parentId);
-            }
-
-            index = IndexInitializer.GetUmbracoIndexer(
-                HostingEnvironment,
-                RunningRuntimeState,
-                luceneDir,
-                validator: validator);
-
-            IDisposable syncMode = index.WithThreadingMode(IndexThreadingMode.Synchronous);
-
-            return new DisposableWrapper(syncMode, index, luceneDir);
+            contentService = IndexInitializer.GetMockContentService();
         }
 
-        private class DisposableWrapper : IDisposable
+        contentRebuilder = IndexInitializer.GetContentIndexRebuilder(contentService, publishedValuesOnly, dbFactory);
+
+        var luceneDir = new RandomIdRAMDirectory();
+
+        ContentValueSetValidator validator;
+
+        // if only published values then we'll change the validator for tests to
+        // ensure we don't support protected nodes and that we
+        // mock the public access service for the special protected node.
+        if (publishedValuesOnly)
         {
-            private readonly IDisposable[] _disposables;
-
-            public DisposableWrapper(params IDisposable[] disposables) => _disposables = disposables;
-
-            public void Dispose()
-            {
-                foreach (IDisposable d in _disposables)
+            var publicAccessServiceMock = new Mock<IPublicAccessService>();
+            publicAccessServiceMock.Setup(x => x.IsProtected(It.IsAny<string>()))
+                .Returns((string path) =>
                 {
-                    d.Dispose();
-                }
+                    if (path.EndsWith("," + ExamineDemoDataContentService.ProtectedNode))
+                    {
+                        return Attempt<PublicAccessEntry>.Succeed();
+                    }
+
+                    return Attempt<PublicAccessEntry>.Fail();
+                });
+
+            var scopeProviderMock = new Mock<IScopeProvider>();
+            scopeProviderMock.Setup(x => x.CreateScope(
+                    It.IsAny<IsolationLevel>(),
+                    It.IsAny<RepositoryCacheMode>(),
+                    It.IsAny<IEventDispatcher>(),
+                    It.IsAny<IScopedNotificationPublisher>(),
+                    It.IsAny<bool?>(),
+                    It.IsAny<bool>(),
+                    It.IsAny<bool>()))
+                .Returns(Mock.Of<IScope>);
+
+            validator = new ContentValueSetValidator(
+                publishedValuesOnly,
+                false,
+                publicAccessServiceMock.Object,
+                scopeProviderMock.Object,
+                parentId);
+        }
+        else
+        {
+            validator = new ContentValueSetValidator(publishedValuesOnly, parentId);
+        }
+
+        index = IndexInitializer.GetUmbracoIndexer(
+            HostingEnvironment,
+            RunningRuntimeState,
+            luceneDir,
+            validator: validator);
+
+        var syncMode = index.WithThreadingMode(IndexThreadingMode.Synchronous);
+
+        return new DisposableWrapper(syncMode, index, luceneDir);
+    }
+
+    private class DisposableWrapper : IDisposable
+    {
+        private readonly IDisposable[] _disposables;
+
+        public DisposableWrapper(params IDisposable[] disposables) => _disposables = disposables;
+
+        public void Dispose()
+        {
+            foreach (var d in _disposables)
+            {
+                d.Dispose();
             }
         }
     }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs
index 8323acf9bf..c0ccad55e6 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataContentService.cs
@@ -1,56 +1,53 @@
 using System.Xml.Linq;
 using System.Xml.XPath;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+// TODO: This is ultra hack and still left over from legacy but still works for testing atm
+public class ExamineDemoDataContentService
 {
-    // TODO: This is ultra hack and still left over from legacy but still works for testing atm
-    public class ExamineDemoDataContentService
+    public const int ProtectedNode = 1142;
+
+    private readonly XDocument _xContent;
+
+    public ExamineDemoDataContentService(string contentXml = null)
     {
-        public const int ProtectedNode = 1142;
-
-        public ExamineDemoDataContentService(string contentXml = null)
+        if (contentXml == null)
         {
-            if (contentXml == null)
-            {
-                contentXml = TestFiles.umbraco;
-            }
-            _xContent = XDocument.Parse(contentXml);
+            contentXml = TestFiles.umbraco;
         }
 
-        /// <summary>
-        /// Return the XDocument containing the xml from the umbraco.config xml file
-        /// </summary>
-        /// <param name="xpath"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// This is no different in the test suite as published content
-        /// </remarks>
-        public XDocument GetLatestContentByXPath(string xpath)
-        {
-            var xdoc = XDocument.Parse("<content></content>");
-            xdoc.Root.Add(_xContent.XPathSelectElements(xpath));
+        _xContent = XDocument.Parse(contentXml);
+    }
 
-            return xdoc;
-        }
+    /// <summary>
+    ///     Return the XDocument containing the xml from the umbraco.config xml file
+    /// </summary>
+    /// <param name="xpath"></param>
+    /// <returns></returns>
+    /// <remarks>
+    ///     This is no different in the test suite as published content
+    /// </remarks>
+    public XDocument GetLatestContentByXPath(string xpath)
+    {
+        var xdoc = XDocument.Parse("<content></content>");
+        xdoc.Root.Add(_xContent.XPathSelectElements(xpath));
 
-        /// <summary>
-        /// Return the XDocument containing the xml from the umbraco.config xml file
-        /// </summary>
-        /// <param name="xpath"></param>
-        /// <returns></returns>
-        public XDocument GetPublishedContentByXPath(string xpath)
-        {
-            return GetContentByXPath(xpath, _xContent);
-        }
+        return xdoc;
+    }
 
-        private XDocument GetContentByXPath(string xpath, XDocument content)
-        {
-            var xdoc = XDocument.Parse("<content></content>");
-            xdoc.Root.Add(content.XPathSelectElements(xpath));
+    /// <summary>
+    ///     Return the XDocument containing the xml from the umbraco.config xml file
+    /// </summary>
+    /// <param name="xpath"></param>
+    /// <returns></returns>
+    public XDocument GetPublishedContentByXPath(string xpath) => GetContentByXPath(xpath, _xContent);
 
-            return xdoc;
-        }
+    private XDocument GetContentByXPath(string xpath, XDocument content)
+    {
+        var xdoc = XDocument.Parse("<content></content>");
+        xdoc.Root.Add(content.XPathSelectElements(xpath));
 
-        private readonly XDocument _xContent;
+        return xdoc;
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs
index a7172248db..0f7f7bea51 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineDemoDataMediaService.cs
@@ -1,31 +1,23 @@
-using System;
-using System.IO;
-using System.Linq;
-using System.Text;
 using System.Xml.Linq;
 using System.Xml.XPath;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+// TODO: This is ultra hack and still left over from legacy but still works for testing atm
+internal class ExamineDemoDataMediaService
 {
-    // TODO: This is ultra hack and still left over from legacy but still works for testing atm
-    internal class ExamineDemoDataMediaService
+    private readonly XDocument _doc;
+
+    public ExamineDemoDataMediaService() => _doc = XDocument.Parse(TestFiles.media);
+
+    #region IMediaService Members
+
+    public XDocument GetLatestMediaByXpath(string xpath)
     {
-        public ExamineDemoDataMediaService()
-        {
-            _doc = XDocument.Parse(TestFiles.media);
-        }
-
-        #region IMediaService Members
-
-        public XDocument GetLatestMediaByXpath(string xpath)
-        {
-            var xdoc = XDocument.Parse("<media></media>");
-            xdoc.Root.Add(_doc.XPathSelectElements(xpath));
-            return xdoc;
-        }
-
-        #endregion
-
-        private readonly XDocument _doc;
+        var xdoc = XDocument.Parse("<media></media>");
+        xdoc.Root.Add(_doc.XPathSelectElements(xpath));
+        return xdoc;
     }
+
+    #endregion
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs
index 3b874771a7..7f601898c6 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/ExamineExtensions.cs
@@ -1,135 +1,169 @@
-using Examine;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Xml.Linq;
+using Examine;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+/// <summary>
+///     LEGACY!! Static methods to help query umbraco xml
+/// </summary>
+/// <remarks>
+///     This should be deleted when we remove the old xml published content with tests which should be replaced with
+///     nucache tests
+/// </remarks>
+internal static class ExamineExtensions
 {
     /// <summary>
-    /// LEGACY!! Static methods to help query umbraco xml
+    ///     Returns true if the XElement is recognized as an umbraco xml NODE (doc type)
     /// </summary>
-    /// <remarks>
-    /// This should be deleted when we remove the old xml published content with tests which should be replaced with nucache tests
-    /// </remarks>
-    internal static class ExamineExtensions
+    /// <param name="x"></param>
+    /// <returns></returns>
+    internal static bool IsExamineElement(this XElement x)
     {
-        /// <summary>
-        /// Returns true if the XElement is recognized as an umbraco xml NODE (doc type) 
-        /// </summary>
-        /// <param name="x"></param>
-        /// <returns></returns>
-        internal static bool IsExamineElement(this XElement x)
+        var id = (string)x.Attribute("id");
+        if (string.IsNullOrEmpty(id))
         {
-            var id = (string)x.Attribute("id");
-            if (string.IsNullOrEmpty(id))
-                return false;
-            int parsedId;
-            if (int.TryParse(id, out parsedId))
-                if (parsedId > 0)
-                    return true;
             return false;
         }
 
-        /// <summary>
-        /// This takes into account both schemas and returns the node type alias.
-        /// If this isn't recognized as an element node, this returns an empty string
-        /// </summary>
-        /// <param name="x"></param>
-        /// <returns></returns>
-        internal static string ExamineNodeTypeAlias(this XElement x)
+        if (int.TryParse(id, out int parsedId))
         {
-            return string.IsNullOrEmpty((string)x.Attribute("nodeTypeAlias"))
-                ? x.Name.LocalName
-                : (string)x.Attribute("nodeTypeAlias");
-        }
-
-        /// <summary>
-        /// Returns umbraco value for a data element with the specified alias.
-        /// </summary>
-        /// <param name="xml"></param>
-        /// <param name="alias"></param>
-        /// <returns></returns>
-        internal static string SelectExamineDataValue(this XElement xml, string alias)
-        {
-            XElement nodeData = null;
-
-            //if there is data children with attributes, we're on the old
-            if (xml.Elements("data").Any(x => x.HasAttributes))
-                nodeData = xml.Elements("data").SingleOrDefault(x => string.Equals((string)x.Attribute("alias"), alias, StringComparison.InvariantCultureIgnoreCase));
-            else
-                nodeData = xml.Elements().FirstOrDefault(x => string.Equals(x.Name.ToString(), alias, StringComparison.InvariantCultureIgnoreCase));
-
-            if (nodeData == null)
-                return string.Empty;
-
-            if (!nodeData.HasElements)
-                return nodeData.Value;
-
-            //it has sub elements so serialize them
-            var reader = nodeData.CreateReader();
-            reader.MoveToContent();
-            return reader.ReadInnerXml();
-        }
-
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public static ValueSet ConvertToValueSet(this XElement xml, string indexCategory)
-        {
-            if (!xml.IsExamineElement())
-                throw new InvalidOperationException("Not a supported Examine XML structure");
-            var allVals = xml.SelectExamineAllValues();
-            var id = (string)xml.Attribute("id");
-            //we will use this as the item type, but we also need to add this as the 'nodeTypeAlias' as part of the properties
-            //since this is what Umbraco expects
-            var nodeTypeAlias = xml.ExamineNodeTypeAlias();
-
-            allVals["nodeTypeAlias"] = nodeTypeAlias;
-            var set = new ValueSet(id, indexCategory, nodeTypeAlias, allVals);
-            return set;
-        }
-
-        internal static Dictionary<string, object> SelectExamineAllValues(this XElement xml)
-        {
-            var attributeValues = xml.Attributes().ToDictionary(x => x.Name.LocalName, x => x.Value);
-            var dataValues = xml.SelectExamineDataValues();
-            foreach (var v in attributeValues)
-                //override the data values with attribute values if they do match, otherwise add
-                dataValues[v.Key] = v.Value;
-            return dataValues;
-        }
-
-        internal static Dictionary<string, object> SelectExamineDataValues(this XElement xml)
-        {
-            //resolve all element data at once since it is much faster to do this than to relookup all of the XML data
-            //using Linq and the node.Elements() methods re-gets all of them.
-            var elementValues = new Dictionary<string, object>();
-            foreach (var x in xml.Elements())
+            if (parsedId > 0)
             {
-                if (x.Attribute("id") != null)
-                    continue;
-
-                string key;
-                if (x.Name.LocalName == "data")
-                    //it's the legacy schema
-                    key = (string)x.Attribute("alias");
-                else
-                    key = x.Name.LocalName;
-
-                if (string.IsNullOrEmpty(key))
-                    continue;
-
-                if (!x.HasElements)
-                    elementValues[key] = x.Value;
-                else
-                    //it has sub elements so serialize them
-                    using (var reader = x.CreateReader())
-                    {
-                        reader.MoveToContent();
-                        elementValues[key] = reader.ReadInnerXml();
-                    }
+                return true;
             }
-            return elementValues;
         }
+
+        return false;
+    }
+
+    /// <summary>
+    ///     This takes into account both schemas and returns the node type alias.
+    ///     If this isn't recognized as an element node, this returns an empty string
+    /// </summary>
+    /// <param name="x"></param>
+    /// <returns></returns>
+    internal static string ExamineNodeTypeAlias(this XElement x) =>
+        string.IsNullOrEmpty((string)x.Attribute("nodeTypeAlias"))
+            ? x.Name.LocalName
+            : (string)x.Attribute("nodeTypeAlias");
+
+    /// <summary>
+    ///     Returns umbraco value for a data element with the specified alias.
+    /// </summary>
+    /// <param name="xml"></param>
+    /// <param name="alias"></param>
+    /// <returns></returns>
+    internal static string SelectExamineDataValue(this XElement xml, string alias)
+    {
+        XElement nodeData = null;
+
+        //if there is data children with attributes, we're on the old
+        if (xml.Elements("data").Any(x => x.HasAttributes))
+        {
+            nodeData = xml.Elements("data").SingleOrDefault(x =>
+                string.Equals((string)x.Attribute("alias"), alias, StringComparison.InvariantCultureIgnoreCase));
+        }
+        else
+        {
+            nodeData = xml.Elements().FirstOrDefault(x =>
+                string.Equals(x.Name.ToString(), alias, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        if (nodeData == null)
+        {
+            return string.Empty;
+        }
+
+        if (!nodeData.HasElements)
+        {
+            return nodeData.Value;
+        }
+
+        //it has sub elements so serialize them
+        var reader = nodeData.CreateReader();
+        reader.MoveToContent();
+        return reader.ReadInnerXml();
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static ValueSet ConvertToValueSet(this XElement xml, string indexCategory)
+    {
+        if (!xml.IsExamineElement())
+        {
+            throw new InvalidOperationException("Not a supported Examine XML structure");
+        }
+
+        var allVals = xml.SelectExamineAllValues();
+        var id = (string)xml.Attribute("id");
+        //we will use this as the item type, but we also need to add this as the 'nodeTypeAlias' as part of the properties
+        //since this is what Umbraco expects
+        var nodeTypeAlias = xml.ExamineNodeTypeAlias();
+
+        allVals["nodeTypeAlias"] = nodeTypeAlias;
+        var set = new ValueSet(id, indexCategory, nodeTypeAlias, allVals);
+        return set;
+    }
+
+    internal static Dictionary<string, object> SelectExamineAllValues(this XElement xml)
+    {
+        var attributeValues = xml.Attributes().ToDictionary(x => x.Name.LocalName, x => x.Value);
+        var dataValues = xml.SelectExamineDataValues();
+        foreach (var v in attributeValues)
+        //override the data values with attribute values if they do match, otherwise add
+        {
+            dataValues[v.Key] = v.Value;
+        }
+
+        return dataValues;
+    }
+
+    internal static Dictionary<string, object> SelectExamineDataValues(this XElement xml)
+    {
+        //resolve all element data at once since it is much faster to do this than to relookup all of the XML data
+        //using Linq and the node.Elements() methods re-gets all of them.
+        var elementValues = new Dictionary<string, object>();
+        foreach (var x in xml.Elements())
+        {
+            if (x.Attribute("id") != null)
+            {
+                continue;
+            }
+
+            string key;
+            if (x.Name.LocalName == "data")
+            //it's the legacy schema
+            {
+                key = (string)x.Attribute("alias");
+            }
+            else
+            {
+                key = x.Name.LocalName;
+            }
+
+            if (string.IsNullOrEmpty(key))
+            {
+                continue;
+            }
+
+            if (!x.HasElements)
+            {
+                elementValues[key] = x.Value;
+            }
+            else
+            //it has sub elements so serialize them
+            {
+                using (var reader = x.CreateReader())
+                {
+                    reader.MoveToContent();
+                    elementValues[key] = reader.ReadInnerXml();
+                }
+            }
+        }
+
+        return elementValues;
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
index 25e4c262ef..ae99c7e009 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexInitializer.cs
@@ -22,230 +22,247 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Infrastructure.Persistence;
-using IContentService = Umbraco.Cms.Core.Services.IContentService;
-using IMediaService = Umbraco.Cms.Core.Services.IMediaService;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+/// <summary>
+///     Used internally by test classes to initialize a new index from the template
+/// </summary>
+public class IndexInitializer
 {
-    /// <summary>
-    /// Used internally by test classes to initialize a new index from the template
-    /// </summary>
-    public class IndexInitializer
+    private readonly IOptions<ContentSettings> _contentSettings;
+    private readonly ILoggerFactory _loggerFactory;
+    private readonly MediaUrlGeneratorCollection _mediaUrlGenerators;
+    private readonly PropertyEditorCollection _propertyEditors;
+    private readonly IScopeProvider _scopeProvider;
+    private readonly IShortStringHelper _shortStringHelper;
+
+    public IndexInitializer(
+        IShortStringHelper shortStringHelper,
+        PropertyEditorCollection propertyEditors,
+        MediaUrlGeneratorCollection mediaUrlGenerators,
+        IScopeProvider scopeProvider,
+        ILoggerFactory loggerFactory,
+        IOptions<ContentSettings> contentSettings)
     {
-        private readonly IShortStringHelper _shortStringHelper;
-        private readonly PropertyEditorCollection _propertyEditors;
-        private readonly MediaUrlGeneratorCollection _mediaUrlGenerators;
-        private readonly IScopeProvider _scopeProvider;
-        private readonly ILoggerFactory _loggerFactory;
-        private readonly IOptions<ContentSettings> _contentSettings;
-
-        public IndexInitializer(
-            IShortStringHelper shortStringHelper,
-            PropertyEditorCollection propertyEditors,
-            MediaUrlGeneratorCollection mediaUrlGenerators,
-            IScopeProvider scopeProvider,
-            ILoggerFactory loggerFactory,
-            IOptions<ContentSettings> contentSettings)
-        {
-            _shortStringHelper = shortStringHelper;
-            _propertyEditors = propertyEditors;
-            _mediaUrlGenerators = mediaUrlGenerators;
-            _scopeProvider = scopeProvider;
-            _loggerFactory = loggerFactory;
-            _contentSettings = contentSettings;
-        }
-
-        public ContentValueSetBuilder GetContentValueSetBuilder(bool publishedValuesOnly)
-        {
-            var contentValueSetBuilder = new ContentValueSetBuilder(
-                _propertyEditors,
-                new UrlSegmentProviderCollection(() => new[] { new DefaultUrlSegmentProvider(_shortStringHelper) }),
-                GetMockUserService(),
-                _shortStringHelper,
-                _scopeProvider,
-                publishedValuesOnly);
-
-            return contentValueSetBuilder;
-        }
-
-        public ContentIndexPopulator GetContentIndexRebuilder(IContentService contentService, bool publishedValuesOnly, IUmbracoDatabaseFactory umbracoDatabaseFactory)
-        {
-            var contentValueSetBuilder = GetContentValueSetBuilder(publishedValuesOnly);
-            var contentIndexDataSource = new ContentIndexPopulator(
-                _loggerFactory.CreateLogger<ContentIndexPopulator>(),
-                publishedValuesOnly,
-                null,
-                contentService,
-                umbracoDatabaseFactory,
-                contentValueSetBuilder);
-            return contentIndexDataSource;
-        }
-
-        public MediaIndexPopulator GetMediaIndexRebuilder(IMediaService mediaService)
-        {
-            var mediaValueSetBuilder = new MediaValueSetBuilder(
-                _propertyEditors,
-                new UrlSegmentProviderCollection(() => new[] { new DefaultUrlSegmentProvider(_shortStringHelper) }),
-                _mediaUrlGenerators,
-                GetMockUserService(),
-                _shortStringHelper,
-                _contentSettings);
-            var mediaIndexDataSource = new MediaIndexPopulator(null, mediaService, mediaValueSetBuilder);
-            return mediaIndexDataSource;
-        }
-
-        public static IContentService GetMockContentService()
-        {
-            long longTotalRecs;
-            var demoData = new ExamineDemoDataContentService();
-
-            var allRecs = demoData.GetLatestContentByXPath("//*[@isDoc]")
-                .Root
-                .Elements()
-                .Select((xmlElement, index) => Mock.Of<IContent>(
-                    m =>
-                        m.Id == (int)xmlElement.Attribute("id") &&
-                        // have every second one published and include the special one
-                        m.Published == ((ExamineDemoDataContentService.ProtectedNode == (int)xmlElement.Attribute("id")) || (index % 2 == 0 ? true : false)) &&
-                        m.ParentId == (int)xmlElement.Attribute("parentID") &&
-                        m.Level == (int)xmlElement.Attribute("level") &&
-                        m.CreatorId == 0 &&
-                        m.SortOrder == (int)xmlElement.Attribute("sortOrder") &&
-                        m.CreateDate == (DateTime)xmlElement.Attribute("createDate") &&
-                        m.UpdateDate == (DateTime)xmlElement.Attribute("updateDate") &&
-                        m.Name == (string)xmlElement.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
-                        m.GetCultureName(It.IsAny<string>()) == (string)xmlElement.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
-                        m.Path == (string)xmlElement.Attribute("path") &&
-                        m.Properties == new PropertyCollection() &&
-                        m.ContentType == Mock.Of<ISimpleContentType>(mt =>
-                            mt.Icon == "test" &&
-                            mt.Alias == xmlElement.Name.LocalName &&
-                            mt.Id == (int)xmlElement.Attribute("nodeType"))))
-                .ToArray();
-
-
-            return Mock.Of<IContentService>(
-                x => x.GetPagedDescendants(
-                         It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs, It.IsAny<IQuery<IContent>>(), It.IsAny<Ordering>())
-                     == allRecs);
-        }
-
-        public IUserService GetMockUserService() => Mock.Of<IUserService>(x => x.GetProfileById(It.IsAny<int>()) == Mock.Of<IProfile>(p => p.Id == 0 && p.Name == "admin"));
-
-        public static IMediaService GetMockMediaService()
-        {
-            long totalRecs;
-
-            var demoData = new ExamineDemoDataMediaService();
-
-            var allRecs = demoData.GetLatestMediaByXpath("//node")
-                .Root
-                .Elements()
-                .Select(x => Mock.Of<IMedia>(
-                    m =>
-                        m.Id == (int)x.Attribute("id") &&
-                        m.ParentId == (int)x.Attribute("parentID") &&
-                        m.Level == (int)x.Attribute("level") &&
-                        m.CreatorId == 0 &&
-                        m.SortOrder == (int)x.Attribute("sortOrder") &&
-                        m.CreateDate == (DateTime)x.Attribute("createDate") &&
-                        m.UpdateDate == (DateTime)x.Attribute("updateDate") &&
-                        m.Name == (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
-                        m.GetCultureName(It.IsAny<string>()) == (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
-                        m.Path == (string)x.Attribute("path") &&
-                        m.Properties == new PropertyCollection() &&
-                        m.ContentType == Mock.Of<ISimpleContentType>(mt =>
-                            mt.Alias == (string)x.Attribute("nodeTypeAlias") &&
-                            mt.Id == (int)x.Attribute("nodeType"))))
-                .ToArray();
-
-            // MOCK!
-            var mediaServiceMock = new Mock<IMediaService>();
-
-            mediaServiceMock
-                .Setup(x => x.GetPagedDescendants(
-                        It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out totalRecs, It.IsAny<IQuery<IMedia>>(), It.IsAny<Ordering>())
-                ).Returns(() => allRecs);
-
-            //mediaServiceMock.Setup(service => service.GetPagedXmlEntries(It.IsAny<string>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs))
-            //    .Returns(() => allRecs.Select(x => x.ToXml()));
-
-            return mediaServiceMock.Object;
-        }
-
-        public ILocalizationService GetMockLocalizationService() => Mock.Of<ILocalizationService>(x => x.GetAllLanguages() == Array.Empty<ILanguage>());
-
-        public static IMediaTypeService GetMockMediaTypeService(IShortStringHelper shortStringHelper)
-        {
-            var mediaTypeServiceMock = new Mock<IMediaTypeService>();
-            mediaTypeServiceMock.Setup(x => x.GetAll())
-                .Returns(new List<IMediaType>
-                {
-                    new MediaType(shortStringHelper, -1) {Alias = "Folder", Name = "Folder", Id = 1031, Icon = "icon-folder"},
-                    new MediaType(shortStringHelper, -1) {Alias = "Image", Name = "Image", Id = 1032, Icon = "icon-picture"}
-                });
-            return mediaTypeServiceMock.Object;
-        }
-
-        public IProfilingLogger GetMockProfilingLogger() => new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
-
-        public UmbracoContentIndex GetUmbracoIndexer(
-            IHostingEnvironment hostingEnvironment,
-            IRuntimeState runtimeState,
-            Directory luceneDir,
-            Analyzer analyzer = null,
-            ILocalizationService languageService = null,
-            IContentValueSetValidator validator = null)
-        {
-            if (languageService == null)
-                languageService = GetMockLocalizationService();
-
-            if (analyzer == null)
-                analyzer = new StandardAnalyzer(LuceneInfo.CurrentVersion);
-
-            if (validator == null)
-                validator = new ContentValueSetValidator(true);
-
-            var options = GetOptions(
-                "testIndexer",
-                new LuceneDirectoryIndexOptions
-                {
-                    Analyzer = analyzer,
-                    Validator = validator,
-                    DirectoryFactory = new GenericDirectoryFactory(s => luceneDir),
-                    FieldDefinitions = new UmbracoFieldDefinitionCollection()
-                });
-
-            var i = new UmbracoContentIndex(
-                _loggerFactory,
-                "testIndexer",
-                options,
-                hostingEnvironment,
-                runtimeState,
-                languageService);
-
-            i.IndexingError += IndexingError;
-            i.IndexOperationComplete += I_IndexOperationComplete;
-
-            return i;
-        }
-
-        private void I_IndexOperationComplete(object sender, IndexOperationEventArgs e)
-        {
-            
-        }
-
-        //public static MultiIndexSearcher GetMultiSearcher(Directory pdfDir, Directory simpleDir, Directory conventionDir, Directory cwsDir)
-        //{
-        //    var i = new MultiIndexSearcher("testSearcher", new[] { pdfDir, simpleDir, conventionDir, cwsDir }, new StandardAnalyzer(Version.LUCENE_29));
-        //    return i;
-        //}
-
-        public static IOptionsMonitor<LuceneDirectoryIndexOptions> GetOptions(string indexName, LuceneDirectoryIndexOptions options)
-            => Mock.Of<IOptionsMonitor<LuceneDirectoryIndexOptions>>(x => x.Get(indexName) == options);
-
-        internal void IndexingError(object sender, IndexingErrorEventArgs e) => throw new ApplicationException(e.Message, e.Exception);
-
-
+        _shortStringHelper = shortStringHelper;
+        _propertyEditors = propertyEditors;
+        _mediaUrlGenerators = mediaUrlGenerators;
+        _scopeProvider = scopeProvider;
+        _loggerFactory = loggerFactory;
+        _contentSettings = contentSettings;
     }
+
+    public ContentValueSetBuilder GetContentValueSetBuilder(bool publishedValuesOnly)
+    {
+        var contentValueSetBuilder = new ContentValueSetBuilder(
+            _propertyEditors,
+            new UrlSegmentProviderCollection(() => new[] { new DefaultUrlSegmentProvider(_shortStringHelper) }),
+            GetMockUserService(),
+            _shortStringHelper,
+            _scopeProvider,
+            publishedValuesOnly);
+
+        return contentValueSetBuilder;
+    }
+
+    public ContentIndexPopulator GetContentIndexRebuilder(IContentService contentService, bool publishedValuesOnly, IUmbracoDatabaseFactory umbracoDatabaseFactory)
+    {
+        var contentValueSetBuilder = GetContentValueSetBuilder(publishedValuesOnly);
+        var contentIndexDataSource = new ContentIndexPopulator(
+            _loggerFactory.CreateLogger<ContentIndexPopulator>(),
+            publishedValuesOnly,
+            null,
+            contentService,
+            umbracoDatabaseFactory,
+            contentValueSetBuilder);
+        return contentIndexDataSource;
+    }
+
+    public MediaIndexPopulator GetMediaIndexRebuilder(IMediaService mediaService)
+    {
+        var mediaValueSetBuilder = new MediaValueSetBuilder(
+            _propertyEditors,
+            new UrlSegmentProviderCollection(() => new[] { new DefaultUrlSegmentProvider(_shortStringHelper) }),
+            _mediaUrlGenerators,
+            GetMockUserService(),
+            _shortStringHelper,
+            _contentSettings);
+        var mediaIndexDataSource = new MediaIndexPopulator(null, mediaService, mediaValueSetBuilder);
+        return mediaIndexDataSource;
+    }
+
+    public static IContentService GetMockContentService()
+    {
+        long longTotalRecs;
+        var demoData = new ExamineDemoDataContentService();
+
+        var allRecs = demoData.GetLatestContentByXPath("//*[@isDoc]")
+            .Root
+            .Elements()
+            .Select((xmlElement, index) => Mock.Of<IContent>(
+                m =>
+                    m.Id == (int)xmlElement.Attribute("id") &&
+                    // have every second one published and include the special one
+                    m.Published == (ExamineDemoDataContentService.ProtectedNode == (int)xmlElement.Attribute("id") ||
+                                    (index % 2 == 0 ? true : false)) &&
+                    m.ParentId == (int)xmlElement.Attribute("parentID") &&
+                    m.Level == (int)xmlElement.Attribute("level") &&
+                    m.CreatorId == 0 &&
+                    m.SortOrder == (int)xmlElement.Attribute("sortOrder") &&
+                    m.CreateDate == (DateTime)xmlElement.Attribute("createDate") &&
+                    m.UpdateDate == (DateTime)xmlElement.Attribute("updateDate") &&
+                    m.Name == (string)xmlElement.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
+                    m.GetCultureName(It.IsAny<string>()) ==
+                    (string)xmlElement.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
+                    m.Path == (string)xmlElement.Attribute("path") &&
+                    m.Properties == new PropertyCollection() &&
+                    m.ContentType == Mock.Of<ISimpleContentType>(mt =>
+                        mt.Icon == "test" &&
+                        mt.Alias == xmlElement.Name.LocalName &&
+                        mt.Id == (int)xmlElement.Attribute("nodeType"))))
+            .ToArray();
+
+
+        return Mock.Of<IContentService>(
+            x => x.GetPagedDescendants(It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs, It.IsAny<IQuery<IContent>>(), It.IsAny<Ordering>())
+                 == allRecs);
+    }
+
+    public IUserService GetMockUserService() => Mock.Of<IUserService>(x =>
+        x.GetProfileById(It.IsAny<int>()) == Mock.Of<IProfile>(p => p.Id == 0 && p.Name == "admin"));
+
+    public static IMediaService GetMockMediaService()
+    {
+        long totalRecs;
+
+        var demoData = new ExamineDemoDataMediaService();
+
+        var allRecs = demoData.GetLatestMediaByXpath("//node")
+            .Root
+            .Elements()
+            .Select(x => Mock.Of<IMedia>(
+                m =>
+                    m.Id == (int)x.Attribute("id") &&
+                    m.ParentId == (int)x.Attribute("parentID") &&
+                    m.Level == (int)x.Attribute("level") &&
+                    m.CreatorId == 0 &&
+                    m.SortOrder == (int)x.Attribute("sortOrder") &&
+                    m.CreateDate == (DateTime)x.Attribute("createDate") &&
+                    m.UpdateDate == (DateTime)x.Attribute("updateDate") &&
+                    m.Name == (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
+                    m.GetCultureName(It.IsAny<string>()) ==
+                    (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
+                    m.Path == (string)x.Attribute("path") &&
+                    m.Properties == new PropertyCollection() &&
+                    m.ContentType == Mock.Of<ISimpleContentType>(mt =>
+                        mt.Alias == (string)x.Attribute("nodeTypeAlias") &&
+                        mt.Id == (int)x.Attribute("nodeType"))))
+            .ToArray();
+
+        // MOCK!
+        var mediaServiceMock = new Mock<IMediaService>();
+
+        mediaServiceMock
+            .Setup(x => x.GetPagedDescendants(
+                It.IsAny<int>(),
+                It.IsAny<long>(),
+                It.IsAny<int>(),
+                out totalRecs,
+                It.IsAny<IQuery<IMedia>>(),
+                It.IsAny<Ordering>()))
+            .Returns(() => allRecs);
+
+        //mediaServiceMock.Setup(service => service.GetPagedXmlEntries(It.IsAny<string>(), It.IsAny<long>(), It.IsAny<int>(), out longTotalRecs))
+        //    .Returns(() => allRecs.Select(x => x.ToXml()));
+
+        return mediaServiceMock.Object;
+    }
+
+    public ILocalizationService GetMockLocalizationService() =>
+        Mock.Of<ILocalizationService>(x => x.GetAllLanguages() == Array.Empty<ILanguage>());
+
+    public static IMediaTypeService GetMockMediaTypeService(IShortStringHelper shortStringHelper)
+    {
+        var mediaTypeServiceMock = new Mock<IMediaTypeService>();
+        mediaTypeServiceMock.Setup(x => x.GetAll())
+            .Returns(new List<IMediaType>
+            {
+                new MediaType(shortStringHelper, -1)
+                {
+                    Alias = "Folder", Name = "Folder", Id = 1031, Icon = "icon-folder"
+                },
+                new MediaType(shortStringHelper, -1)
+                {
+                    Alias = "Image", Name = "Image", Id = 1032, Icon = "icon-picture"
+                }
+            });
+        return mediaTypeServiceMock.Object;
+    }
+
+    public IProfilingLogger GetMockProfilingLogger() =>
+        new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
+
+    public UmbracoContentIndex GetUmbracoIndexer(
+        IHostingEnvironment hostingEnvironment,
+        IRuntimeState runtimeState,
+        Directory luceneDir,
+        Analyzer analyzer = null,
+        ILocalizationService languageService = null,
+        IContentValueSetValidator validator = null)
+    {
+        if (languageService == null)
+        {
+            languageService = GetMockLocalizationService();
+        }
+
+        if (analyzer == null)
+        {
+            analyzer = new StandardAnalyzer(LuceneInfo.CurrentVersion);
+        }
+
+        if (validator == null)
+        {
+            validator = new ContentValueSetValidator(true);
+        }
+
+        var options = GetOptions(
+            "testIndexer",
+            new LuceneDirectoryIndexOptions
+            {
+                Analyzer = analyzer,
+                Validator = validator,
+                DirectoryFactory = new GenericDirectoryFactory(s => luceneDir),
+                FieldDefinitions = new UmbracoFieldDefinitionCollection()
+            });
+
+        var i = new UmbracoContentIndex(
+            _loggerFactory,
+            "testIndexer",
+            options,
+            hostingEnvironment,
+            runtimeState,
+            languageService);
+
+        i.IndexingError += IndexingError;
+        i.IndexOperationComplete += I_IndexOperationComplete;
+
+        return i;
+    }
+
+    private void I_IndexOperationComplete(object sender, IndexOperationEventArgs e)
+    {
+    }
+
+    //public static MultiIndexSearcher GetMultiSearcher(Directory pdfDir, Directory simpleDir, Directory conventionDir, Directory cwsDir)
+    //{
+    //    var i = new MultiIndexSearcher("testSearcher", new[] { pdfDir, simpleDir, conventionDir, cwsDir }, new StandardAnalyzer(Version.LUCENE_29));
+    //    return i;
+    //}
+
+    public static IOptionsMonitor<LuceneDirectoryIndexOptions> GetOptions(string indexName, LuceneDirectoryIndexOptions options)
+        => Mock.Of<IOptionsMonitor<LuceneDirectoryIndexOptions>>(x => x.Get(indexName) == options);
+
+    internal void IndexingError(object sender, IndexingErrorEventArgs e) =>
+        throw new ApplicationException(e.Message, e.Exception);
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs
index aa2fafe7d3..b271cabb08 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/IndexTest.cs
@@ -11,140 +11,138 @@ using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Extensions;
+using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+/// <summary>
+///     Tests the standard indexing capabilities
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.None)]
+public class IndexTest : ExamineBaseTest
 {
-
-    /// <summary>
-    /// Tests the standard indexing capabilities
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
-    public class IndexTest : ExamineBaseTest
+    [Test]
+    public void GivenValidationParentNode_WhenContentIndexedUnderDifferentParent_DocumentIsNotIndexed()
     {
-        [Test]
-        public void GivenValidationParentNode_WhenContentIndexedUnderDifferentParent_DocumentIsNotIndexed()
+        using (GetSynchronousContentIndex(false, out var index, out _, out _, 999))
         {
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out _, out _, 999))
-            {
-                var searcher = index.Searcher;
+            var searcher = index.Searcher;
 
-                var contentService = new ExamineDemoDataContentService();
-                //get a node from the data repo
-                var node = contentService.GetPublishedContentByXPath("//*[string-length(@id)>0 and number(@id)>0]")
-                                          .Root
-                                          .Elements()
-                                          .First();
+            var contentService = new ExamineDemoDataContentService();
+            //get a node from the data repo
+            var node = contentService.GetPublishedContentByXPath("//*[string-length(@id)>0 and number(@id)>0]")
+                .Root
+                .Elements()
+                .First();
 
-                ValueSet valueSet = node.ConvertToValueSet(IndexTypes.Content);
+            var valueSet = node.ConvertToValueSet(IndexTypes.Content);
 
-                // Ignored since the path isn't under 999
-                index.IndexItems(new[] { valueSet });
-                Assert.AreEqual(0, searcher.CreateQuery().Id(valueSet.Id).Execute().TotalItemCount);
+            // Ignored since the path isn't under 999
+            index.IndexItems(new[] { valueSet });
+            Assert.AreEqual(0, searcher.CreateQuery().Id(valueSet.Id).Execute().TotalItemCount);
 
-                // Change so that it's under 999 and verify
-                var values = valueSet.Values.ToDictionary(x => x.Key, x => x.Value.ToList());
-                values["path"] = new List<object> { "-1,999," + valueSet.Id };
-                var newValueSet = new ValueSet(valueSet.Id, valueSet.Category, valueSet.ItemType,
-                    values.ToDictionary(x => x.Key, x => (IEnumerable<object>)x.Value));
-                index.IndexItems(new[] { newValueSet });
-                Assert.AreEqual(1, searcher.CreateQuery().Id(valueSet.Id).Execute().TotalItemCount);
-            }
+            // Change so that it's under 999 and verify
+            var values = valueSet.Values.ToDictionary(x => x.Key, x => x.Value.ToList());
+            values["path"] = new List<object> { "-1,999," + valueSet.Id };
+            var newValueSet = new ValueSet(valueSet.Id, valueSet.Category, valueSet.ItemType, values.ToDictionary(x => x.Key, x => (IEnumerable<object>)x.Value));
+            index.IndexItems(new[] { newValueSet });
+            Assert.AreEqual(1, searcher.CreateQuery().Id(valueSet.Id).Execute().TotalItemCount);
         }
+    }
 
-        [Test]
-        public void GivenIndexingDocument_WhenRichTextPropertyData_CanStoreImmenseFields()
+    [Test]
+    public void GivenIndexingDocument_WhenRichTextPropertyData_CanStoreImmenseFields()
+    {
+        using (GetSynchronousContentIndex(false, out var index, out _, out var contentValueSetBuilder))
         {
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out _, out ContentValueSetBuilder contentValueSetBuilder, null))
+            index.CreateIndex();
+
+            var contentType = ContentTypeBuilder.CreateBasicContentType();
+            contentType.AddPropertyType(new PropertyType(TestHelper.ShortStringHelper, "test", ValueStorageType.Ntext)
             {
-                index.CreateIndex();
+                Alias = "rte",
+                Name = "RichText",
+                PropertyEditorAlias = Constants.PropertyEditors.Aliases.TinyMce
+            });
 
-                ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-                contentType.AddPropertyType(new PropertyType(TestHelper.ShortStringHelper, "test", ValueStorageType.Ntext)
-                {
-                    Alias = "rte",
-                    Name = "RichText",
-                    PropertyEditorAlias = Cms.Core.Constants.PropertyEditors.Aliases.TinyMce
-                });
+            var content = ContentBuilder.CreateBasicContent(contentType);
+            content.Id = 555;
+            content.Path = "-1,555";
 
-                Content content = ContentBuilder.CreateBasicContent(contentType);
-                content.Id = 555;
-                content.Path = "-1,555";
+            var luceneStringFieldMaxLength = ByteBlockPool.BYTE_BLOCK_SIZE - 2;
+            var faker = new Faker();
+            var immenseText = faker.Random.String(luceneStringFieldMaxLength + 10);
 
-                var luceneStringFieldMaxLength = ByteBlockPool.BYTE_BLOCK_SIZE - 2;
-                var faker = new Faker();
-                var immenseText = faker.Random.String(length: luceneStringFieldMaxLength + 10);
+            content.Properties["rte"].SetValue(immenseText);
 
-                content.Properties["rte"].SetValue(immenseText);
+            var valueSet = contentValueSetBuilder.GetValueSets(content);
+            index.IndexItems(valueSet);
 
-                IEnumerable<ValueSet> valueSet = contentValueSetBuilder.GetValueSets(content);
-                index.IndexItems(valueSet);
+            var results = index.Searcher.CreateQuery().Id(555).Execute();
+            var result = results.First();
 
-                ISearchResults results = index.Searcher.CreateQuery().Id(555).Execute();
-                ISearchResult result = results.First();
-
-                var key = $"{UmbracoExamineFieldNames.RawFieldPrefix}rte";
-                Assert.IsTrue(result.Values.ContainsKey(key));
-                Assert.Greater(result.Values[key].Length, luceneStringFieldMaxLength);
-            }
+            var key = $"{UmbracoExamineFieldNames.RawFieldPrefix}rte";
+            Assert.IsTrue(result.Values.ContainsKey(key));
+            Assert.Greater(result.Values[key].Length, luceneStringFieldMaxLength);
         }
+    }
 
-        [Test]
-        public void GivenIndexingDocument_WhenGridPropertyData_ThenDataIndexedInSegregatedFields()
+    [Test]
+    public void GivenIndexingDocument_WhenGridPropertyData_ThenDataIndexedInSegregatedFields()
+    {
+        using (GetSynchronousContentIndex(false, out var index, out _, out var contentValueSetBuilder))
         {
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out _, out ContentValueSetBuilder contentValueSetBuilder, null))
-            {
-                index.CreateIndex();
+            index.CreateIndex();
 
-                ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-                contentType.AddPropertyType(new PropertyType(TestHelper.ShortStringHelper, "test", ValueStorageType.Ntext)
+            var contentType = ContentTypeBuilder.CreateBasicContentType();
+            contentType.AddPropertyType(new PropertyType(TestHelper.ShortStringHelper, "test", ValueStorageType.Ntext)
+            {
+                Alias = "grid",
+                Name = "Grid",
+                PropertyEditorAlias = Constants.PropertyEditors.Aliases.Grid
+            });
+            var content = ContentBuilder.CreateBasicContent(contentType);
+            content.Id = 555;
+            content.Path = "-1,555";
+            var gridVal = new GridValue
+            {
+                Name = "n1",
+                Sections = new List<GridValue.GridSection>
                 {
-                    Alias = "grid",
-                    Name = "Grid",
-                    PropertyEditorAlias = Cms.Core.Constants.PropertyEditors.Aliases.Grid
-                });
-                Content content = ContentBuilder.CreateBasicContent(contentType);
-                content.Id = 555;
-                content.Path = "-1,555";
-                var gridVal = new GridValue
-                {
-                    Name = "n1",
-                    Sections = new List<GridValue.GridSection>
+                    new()
                     {
-                        new GridValue.GridSection
+                        Grid = "g1",
+                        Rows = new List<GridValue.GridRow>
                         {
-                            Grid = "g1",
-                            Rows = new List<GridValue.GridRow>
+                            new()
                             {
-                                new GridValue.GridRow
+                                Id = Guid.NewGuid(),
+                                Name = "row1",
+                                Areas = new List<GridValue.GridArea>
                                 {
-                                    Id = Guid.NewGuid(),
-                                    Name = "row1",
-                                    Areas = new List<GridValue.GridArea>
+                                    new()
                                     {
-                                        new GridValue.GridArea
+                                        Grid = "g2",
+                                        Controls = new List<GridValue.GridControl>
                                         {
-                                            Grid = "g2",
-                                            Controls = new List<GridValue.GridControl>
+                                            new()
                                             {
-                                                new GridValue.GridControl
+                                                Editor = new GridValue.GridEditor
                                                 {
-                                                    Editor = new GridValue.GridEditor
-                                                    {
-                                                        Alias = "editor1",
-                                                        View = "view1"
-                                                    },
-                                                    Value = "value1"
+                                                    Alias = "editor1",
+                                                    View = "view1"
                                                 },
-                                                new GridValue.GridControl
+                                                Value = "value1"
+                                            },
+                                            new()
+                                            {
+                                                Editor = new GridValue.GridEditor
                                                 {
-                                                    Editor = new GridValue.GridEditor
-                                                    {
-                                                        Alias = "editor1",
-                                                        View = "view1"
-                                                    },
-                                                    Value = "value2"
-                                                }
+                                                    Alias = "editor1",
+                                                    View = "view1"
+                                                },
+                                                Value = "value2"
                                             }
                                         }
                                     }
@@ -152,209 +150,209 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
                             }
                         }
                     }
-                };
+                }
+            };
 
-                var json = JsonConvert.SerializeObject(gridVal);
-                content.Properties["grid"].SetValue(json);
+            var json = JsonConvert.SerializeObject(gridVal);
+            content.Properties["grid"].SetValue(json);
 
-                IEnumerable<ValueSet> valueSet = contentValueSetBuilder.GetValueSets(content);
-                index.IndexItems(valueSet);
+            var valueSet = contentValueSetBuilder.GetValueSets(content);
+            index.IndexItems(valueSet);
 
-                ISearchResults results = index.Searcher.CreateQuery().Id(555).Execute();
-                Assert.AreEqual(1, results.TotalItemCount);
+            var results = index.Searcher.CreateQuery().Id(555).Execute();
+            Assert.AreEqual(1, results.TotalItemCount);
 
-                ISearchResult result = results.First();
-                Assert.IsTrue(result.Values.ContainsKey("grid.row1"));
-                Assert.AreEqual("value1", result.AllValues["grid.row1"][0]);
-                Assert.AreEqual("value2", result.AllValues["grid.row1"][1]);
-                Assert.IsTrue(result.Values.ContainsKey("grid"));
-                Assert.AreEqual("value1 value2 ", result["grid"]);
-                Assert.IsTrue(result.Values.ContainsKey($"{UmbracoExamineFieldNames.RawFieldPrefix}grid"));
-                Assert.AreEqual(json, result[$"{UmbracoExamineFieldNames.RawFieldPrefix}grid"]);
-            }
+            var result = results.First();
+            Assert.IsTrue(result.Values.ContainsKey("grid.row1"));
+            Assert.AreEqual("value1", result.AllValues["grid.row1"][0]);
+            Assert.AreEqual("value2", result.AllValues["grid.row1"][1]);
+            Assert.IsTrue(result.Values.ContainsKey("grid"));
+            Assert.AreEqual("value1 value2 ", result["grid"]);
+            Assert.IsTrue(result.Values.ContainsKey($"{UmbracoExamineFieldNames.RawFieldPrefix}grid"));
+            Assert.AreEqual(json, result[$"{UmbracoExamineFieldNames.RawFieldPrefix}grid"]);
         }
-
-        [Test]
-        public void GivenEmptyIndex_WhenUsingWithContentAndMediaPopulators_ThenIndexPopulated()
-        {            
-            var mediaRebuilder = IndexInitializer.GetMediaIndexRebuilder(IndexInitializer.GetMockMediaService());
-
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out ContentIndexPopulator contentRebuilder, out _, null))
-            {
-                //create the whole thing
-                contentRebuilder.Populate(index);
-                mediaRebuilder.Populate(index);
-
-                var result = index.Searcher.CreateQuery().All().Execute();
-
-                Assert.AreEqual(29, result.TotalItemCount);
-            }
-        }
-
-        /// <summary>
-        /// Check that the node signalled as protected in the content service is not present in the index.
-        /// </summary>
-        [Test]
-        public void GivenPublishedContentIndex_WhenProtectedContentIndexed_ThenItIsIgnored()
-        {
-            using (GetSynchronousContentIndex(true, out UmbracoContentIndex index, out ContentIndexPopulator contentRebuilder, out _, null))
-            {
-                //create the whole thing
-                contentRebuilder.Populate(index);
-
-                Assert.Greater(
-                    index.Searcher.CreateQuery().All().Execute().TotalItemCount,
-                    0);
-
-                Assert.AreEqual(
-                    0,
-                    index.Searcher.CreateQuery().Id(ExamineDemoDataContentService.ProtectedNode.ToString()).Execute().TotalItemCount);
-            }
-        }
-
-        [Test]
-        public void GivenMediaUnderNonIndexableParent_WhenMediaMovedUnderIndexableParent_ThenItIsIncludedInTheIndex()
-        {
-            // create a validator with
-            // publishedValuesOnly false
-            // parentId 1116 (only content under that parent will be indexed)            
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out ContentIndexPopulator contentRebuilder, out _, 1116))
-            {
-                //get a node from the data repo (this one exists underneath 2222)
-                var node = _mediaService.GetLatestMediaByXpath("//*[string-length(@id)>0 and number(@id)>0]")
-                                        .Root.Elements()
-                                        .First(x => (int)x.Attribute("id") == 2112);
-
-                var currPath = (string)node.Attribute("path"); //should be : -1,1111,2222,2112
-                Assert.AreEqual("-1,1111,2222,2112", currPath);
-
-                //ensure it's indexed
-                index.IndexItem(node.ConvertToValueSet(IndexTypes.Media));
-
-                //it will not exist because it exists under 2222
-                var results = index.Searcher.CreateQuery().Id(2112).Execute();
-                Assert.AreEqual(0, results.Count());
-
-                //now mimic moving 2112 to 1116
-                //node.SetAttributeValue("path", currPath.Replace("2222", "1116"));
-                node.SetAttributeValue("path", "-1,1116,2112");
-                node.SetAttributeValue("parentID", "1116");
-
-                //now reindex the node, this should first delete it and then WILL add it because of the parent id constraint
-                index.IndexItems(new[] { node.ConvertToValueSet(IndexTypes.Media) });
-
-                //now ensure it exists
-                results = index.Searcher.CreateQuery().Id(2112).Execute();
-                Assert.AreEqual(1, results.Count());
-            }
-        }
-
-        [Test]
-        public void GivenMediaUnderIndexableParent_WhenMediaMovedUnderNonIndexableParent_ThenItIsRemovedFromTheIndex()
-        {
-            // create a validator with
-            // publishedValuesOnly false
-            // parentId 2222 (only content under that parent will be indexed)
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out ContentIndexPopulator contentRebuilder, out _, 2222))
-            {
-                var searcher = index.Searcher;
-
-                //get a node from the data repo (this one exists underneath 2222)
-                var node = _mediaService.GetLatestMediaByXpath("//*[string-length(@id)>0 and number(@id)>0]")
-                                    .Root.Elements()
-                                    .First(x => (int)x.Attribute("id") == 2112);
-
-                var currPath = (string)node.Attribute("path"); //should be : -1,1111,2222,2112
-                Assert.AreEqual("-1,1111,2222,2112", currPath);
-
-                //ensure it's indexed
-                index.IndexItem(node.ConvertToValueSet(IndexTypes.Media));
-
-                //it will exist because it exists under 2222
-                var results = searcher.CreateQuery().Id(2112).Execute();
-                Assert.AreEqual(1, results.Count());
-
-                //now mimic moving the node underneath 1116 instead of 2222
-                node.SetAttributeValue("path", currPath.Replace("2222", "1116"));
-                node.SetAttributeValue("parentID", "1116");
-
-                //now reindex the node, this should first delete it and then NOT add it because of the parent id constraint
-                index.IndexItems(new[] { node.ConvertToValueSet(IndexTypes.Media) });
-
-                //now ensure it's deleted
-                results = searcher.CreateQuery().Id(2112).Execute();
-                Assert.AreEqual(0, results.Count());
-            }
-        }
-
-
-        /// <summary>
-        /// This will ensure that all 'Content' (not media) is cleared from the index using the Lucene API directly.
-        /// We then call the Examine method to re-index Content and do some comparisons to ensure that it worked correctly.
-        /// </summary>
-        [Test]
-        public void GivenEmptyIndex_WhenIndexedWithContentPopulator_ThenTheIndexIsPopulated()
-        {
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out ContentIndexPopulator contentRebuilder, out _, null))
-            {
-                //create the whole thing
-                contentRebuilder.Populate(index);
-
-                var result = index.Searcher
-                    .CreateQuery()
-                    .Field(ExamineFieldNames.CategoryFieldName, IndexTypes.Content)
-                    .Execute();
-                Assert.AreEqual(21, result.TotalItemCount);
-
-                //delete all content
-                index.DeleteFromIndex(result.Select(x => x.Id));
-
-                //ensure it's all gone
-                result = index.Searcher.CreateQuery().Field(ExamineFieldNames.CategoryFieldName, IndexTypes.Content).Execute();
-                Assert.AreEqual(0, result.TotalItemCount);
-
-                //call our indexing methods
-                contentRebuilder.Populate(index);
-
-                result = index.Searcher
-                    .CreateQuery()
-                    .Field(ExamineFieldNames.CategoryFieldName, IndexTypes.Content)
-                    .Execute();
-
-                Assert.AreEqual(21, result.TotalItemCount);
-            }
-        }
-
-        /// <summary>
-        /// This will delete an item from the index and ensure that all children of the node are deleted too!
-        /// </summary>
-        [Test]
-        public void GivenPopulatedIndex_WhenDocumentDeleted_ThenItsHierarchyIsAlsoDeleted()
-        {
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out ContentIndexPopulator contentRebuilder, out _, null))
-            {
-                var searcher = index.Searcher;
-
-                //create the whole thing
-                contentRebuilder.Populate(index);
-
-                var results = searcher.CreateQuery().Id(1141).Execute();
-                Assert.AreEqual(1, results.Count());
-
-                //now delete a node that has children
-
-                index.DeleteFromIndex(1140.ToString());
-                //this node had children: 1141 & 1142, let's ensure they are also removed
-
-                results = searcher.CreateQuery().Id(1141).Execute();
-                Assert.AreEqual(0, results.Count());
-
-                results = searcher.CreateQuery().Id(1142).Execute();
-                Assert.AreEqual(0, results.Count());
-
-            }
-        }
-
-        private readonly ExamineDemoDataMediaService _mediaService = new ExamineDemoDataMediaService();
     }
+
+    [Test]
+    public void GivenEmptyIndex_WhenUsingWithContentAndMediaPopulators_ThenIndexPopulated()
+    {
+        var mediaRebuilder = IndexInitializer.GetMediaIndexRebuilder(IndexInitializer.GetMockMediaService());
+
+        using (GetSynchronousContentIndex(false, out var index, out var contentRebuilder, out _))
+        {
+            //create the whole thing
+            contentRebuilder.Populate(index);
+            mediaRebuilder.Populate(index);
+
+            var result = index.Searcher.CreateQuery().All().Execute();
+
+            Assert.AreEqual(29, result.TotalItemCount);
+        }
+    }
+
+    /// <summary>
+    ///     Check that the node signalled as protected in the content service is not present in the index.
+    /// </summary>
+    [Test]
+    public void GivenPublishedContentIndex_WhenProtectedContentIndexed_ThenItIsIgnored()
+    {
+        using (GetSynchronousContentIndex(true, out var index, out var contentRebuilder, out _))
+        {
+            //create the whole thing
+            contentRebuilder.Populate(index);
+
+            Assert.Greater(
+                index.Searcher.CreateQuery().All().Execute().TotalItemCount,
+                0);
+
+            Assert.AreEqual(
+                0,
+                index.Searcher.CreateQuery().Id(ExamineDemoDataContentService.ProtectedNode.ToString()).Execute()
+                    .TotalItemCount);
+        }
+    }
+
+    [Test]
+    public void GivenMediaUnderNonIndexableParent_WhenMediaMovedUnderIndexableParent_ThenItIsIncludedInTheIndex()
+    {
+        // create a validator with
+        // publishedValuesOnly false
+        // parentId 1116 (only content under that parent will be indexed)
+        using (GetSynchronousContentIndex(false, out var index, out var contentRebuilder, out _, 1116))
+        {
+            //get a node from the data repo (this one exists underneath 2222)
+            var node = _mediaService.GetLatestMediaByXpath("//*[string-length(@id)>0 and number(@id)>0]").Root.Elements()
+                .First(x => (int)x.Attribute("id") == 2112);
+
+            var currPath = (string)node.Attribute("path"); //should be : -1,1111,2222,2112
+            Assert.AreEqual("-1,1111,2222,2112", currPath);
+
+            //ensure it's indexed
+            index.IndexItem(node.ConvertToValueSet(IndexTypes.Media));
+
+            //it will not exist because it exists under 2222
+            var results = index.Searcher.CreateQuery().Id(2112).Execute();
+            Assert.AreEqual(0, results.Count());
+
+            //now mimic moving 2112 to 1116
+            //node.SetAttributeValue("path", currPath.Replace("2222", "1116"));
+            node.SetAttributeValue("path", "-1,1116,2112");
+            node.SetAttributeValue("parentID", "1116");
+
+            //now reindex the node, this should first delete it and then WILL add it because of the parent id constraint
+            index.IndexItems(new[] { node.ConvertToValueSet(IndexTypes.Media) });
+
+            //now ensure it exists
+            results = index.Searcher.CreateQuery().Id(2112).Execute();
+            Assert.AreEqual(1, results.Count());
+        }
+    }
+
+    [Test]
+    public void GivenMediaUnderIndexableParent_WhenMediaMovedUnderNonIndexableParent_ThenItIsRemovedFromTheIndex()
+    {
+        // create a validator with
+        // publishedValuesOnly false
+        // parentId 2222 (only content under that parent will be indexed)
+        using (GetSynchronousContentIndex(false, out var index, out var contentRebuilder, out _, 2222))
+        {
+            var searcher = index.Searcher;
+
+            //get a node from the data repo (this one exists underneath 2222)
+            var node = _mediaService.GetLatestMediaByXpath("//*[string-length(@id)>0 and number(@id)>0]")
+                .Root.Elements()
+                .First(x => (int)x.Attribute("id") == 2112);
+
+            var currPath = (string)node.Attribute("path"); //should be : -1,1111,2222,2112
+            Assert.AreEqual("-1,1111,2222,2112", currPath);
+
+            //ensure it's indexed
+            index.IndexItem(node.ConvertToValueSet(IndexTypes.Media));
+
+            //it will exist because it exists under 2222
+            var results = searcher.CreateQuery().Id(2112).Execute();
+            Assert.AreEqual(1, results.Count());
+
+            //now mimic moving the node underneath 1116 instead of 2222
+            node.SetAttributeValue("path", currPath.Replace("2222", "1116"));
+            node.SetAttributeValue("parentID", "1116");
+
+            //now reindex the node, this should first delete it and then NOT add it because of the parent id constraint
+            index.IndexItems(new[] { node.ConvertToValueSet(IndexTypes.Media) });
+
+            //now ensure it's deleted
+            results = searcher.CreateQuery().Id(2112).Execute();
+            Assert.AreEqual(0, results.Count());
+        }
+    }
+
+
+    /// <summary>
+    ///     This will ensure that all 'Content' (not media) is cleared from the index using the Lucene API directly.
+    ///     We then call the Examine method to re-index Content and do some comparisons to ensure that it worked correctly.
+    /// </summary>
+    [Test]
+    public void GivenEmptyIndex_WhenIndexedWithContentPopulator_ThenTheIndexIsPopulated()
+    {
+        using (GetSynchronousContentIndex(false, out var index, out var contentRebuilder, out _))
+        {
+            //create the whole thing
+            contentRebuilder.Populate(index);
+
+            var result = index.Searcher
+                .CreateQuery()
+                .Field(ExamineFieldNames.CategoryFieldName, IndexTypes.Content)
+                .Execute();
+            Assert.AreEqual(21, result.TotalItemCount);
+
+            //delete all content
+            index.DeleteFromIndex(result.Select(x => x.Id));
+
+            //ensure it's all gone
+            result = index.Searcher.CreateQuery().Field(ExamineFieldNames.CategoryFieldName, IndexTypes.Content)
+                .Execute();
+            Assert.AreEqual(0, result.TotalItemCount);
+
+            //call our indexing methods
+            contentRebuilder.Populate(index);
+
+            result = index.Searcher
+                .CreateQuery()
+                .Field(ExamineFieldNames.CategoryFieldName, IndexTypes.Content)
+                .Execute();
+
+            Assert.AreEqual(21, result.TotalItemCount);
+        }
+    }
+
+    /// <summary>
+    ///     This will delete an item from the index and ensure that all children of the node are deleted too!
+    /// </summary>
+    [Test]
+    public void GivenPopulatedIndex_WhenDocumentDeleted_ThenItsHierarchyIsAlsoDeleted()
+    {
+        using (GetSynchronousContentIndex(false, out var index, out var contentRebuilder, out _))
+        {
+            var searcher = index.Searcher;
+
+            //create the whole thing
+            contentRebuilder.Populate(index);
+
+            var results = searcher.CreateQuery().Id(1141).Execute();
+            Assert.AreEqual(1, results.Count());
+
+            //now delete a node that has children
+
+            index.DeleteFromIndex(1140.ToString());
+            //this node had children: 1141 & 1142, let's ensure they are also removed
+
+            results = searcher.CreateQuery().Id(1141).Execute();
+            Assert.AreEqual(0, results.Count());
+
+            results = searcher.CreateQuery().Id(1142).Execute();
+            Assert.AreEqual(0, results.Count());
+        }
+    }
+
+    private readonly ExamineDemoDataMediaService _mediaService = new();
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs
index f2269916a4..0d5a6bf0be 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/PublishedContentQueryTests.cs
@@ -15,95 +15,103 @@ using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Tests.Common.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.None)]
+public class PublishedContentQueryTests : ExamineBaseTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
-    public class PublishedContentQueryTests : ExamineBaseTest
+    private class TestIndex : LuceneIndex, IUmbracoIndex
     {
+        private readonly string[] _fieldNames;
 
-        private class TestIndex : LuceneIndex, IUmbracoIndex
+        public TestIndex(ILoggerFactory loggerFactory, string name, Directory luceneDirectory, string[] fieldNames)
+            : base(
+                loggerFactory,
+                name,
+                IndexInitializer.GetOptions(
+                    name,
+                    new LuceneDirectoryIndexOptions
+                    {
+                        DirectoryFactory = new GenericDirectoryFactory(s => luceneDirectory)
+                    })) =>
+            _fieldNames = fieldNames;
+
+        public bool EnableDefaultEventHandler => throw new NotImplementedException();
+        public bool PublishedValuesOnly => throw new NotImplementedException();
+        public IEnumerable<string> GetFields() => _fieldNames;
+    }
+
+    private TestIndex CreateTestIndex(Directory luceneDirectory, string[] fieldNames)
+    {
+        var index = new TestIndex(LoggerFactory, "TestIndex", luceneDirectory, fieldNames);
+
+        using (index.WithThreadingMode(IndexThreadingMode.Synchronous))
         {
-            private readonly string[] _fieldNames;
-
-            public TestIndex(ILoggerFactory loggerFactory, string name, Directory luceneDirectory, string[] fieldNames)
-                : base(
-                      loggerFactory,
-                      name,
-                      IndexInitializer.GetOptions(name, new LuceneDirectoryIndexOptions
-                      {
-                          DirectoryFactory = new GenericDirectoryFactory(s => luceneDirectory)
-                      }))
-            {
-                _fieldNames = fieldNames;
-            }
-
-            public bool EnableDefaultEventHandler => throw new NotImplementedException();
-            public bool PublishedValuesOnly => throw new NotImplementedException();
-            public IEnumerable<string> GetFields() => _fieldNames;
-        }
-
-        private TestIndex CreateTestIndex(Directory luceneDirectory, string[] fieldNames)
-        {
-            var index = new TestIndex(LoggerFactory, "TestIndex", luceneDirectory, fieldNames);
-
-            using (index.WithThreadingMode(IndexThreadingMode.Synchronous))
-            {
-                //populate with some test data
-                index.IndexItem(new ValueSet("1", "content", new Dictionary<string, object>
+            //populate with some test data
+            index.IndexItem(new ValueSet(
+                "1",
+                "content",
+                new Dictionary<string, object>
                 {
                     [fieldNames[0]] = "Hello world, there are products here",
                     [UmbracoExamineFieldNames.VariesByCultureFieldName] = "n"
                 }));
-                index.IndexItem(new ValueSet("2", "content", new Dictionary<string, object>
+            index.IndexItem(new ValueSet(
+                "2",
+                "content",
+                new Dictionary<string, object>
                 {
                     [fieldNames[1]] = "Hello world, there are products here",
                     [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y"
                 }));
-                index.IndexItem(new ValueSet("3", "content", new Dictionary<string, object>
+            index.IndexItem(new ValueSet(
+                "3",
+                "content",
+                new Dictionary<string, object>
                 {
                     [fieldNames[2]] = "Hello world, there are products here",
                     [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y"
                 }));
-            }
-
-            return index;
         }
 
-        private PublishedContentQuery CreatePublishedContentQuery(IIndex indexer)
+        return index;
+    }
+
+    private PublishedContentQuery CreatePublishedContentQuery(IIndex indexer)
+    {
+        var examineManager = new Mock<IExamineManager>();
+        var outarg = indexer;
+        examineManager.Setup(x => x.TryGetIndex("TestIndex", out outarg)).Returns(true);
+
+        var contentCache = new Mock<IPublishedContentCache>();
+        contentCache.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int intId) => Mock.Of<IPublishedContent>(x => x.Id == intId));
+        var snapshot = Mock.Of<IPublishedSnapshot>(x => x.Content == contentCache.Object);
+        var variationContext = new VariationContext();
+        var variationContextAccessor = Mock.Of<IVariationContextAccessor>(x => x.VariationContext == variationContext);
+
+        return new PublishedContentQuery(snapshot, variationContextAccessor, examineManager.Object);
+    }
+
+    [TestCase("fr-fr", ExpectedResult = "1, 3", Description = "Search Culture: fr-fr. Must return both fr-fr and invariant results")]
+    [TestCase("en-us", ExpectedResult = "1, 2", Description = "Search Culture: en-us. Must return both en-us and invariant results")]
+    [TestCase("*", ExpectedResult = "1, 2, 3", Description = "Search Culture: *. Must return all cultures and all invariant results")]
+    [TestCase(null, ExpectedResult = "1", Description = "Search Culture: null. Must return only invariant results")]
+    public string Search(string culture)
+    {
+        using (var luceneDir = new RandomIdRAMDirectory())
         {
-            var examineManager = new Mock<IExamineManager>();
-            IIndex outarg = indexer;
-            examineManager.Setup(x => x.TryGetIndex("TestIndex", out outarg)).Returns(true);
-
-            var contentCache = new Mock<IPublishedContentCache>();
-            contentCache.Setup(x => x.GetById(It.IsAny<int>())).Returns((int intId) => Mock.Of<IPublishedContent>(x => x.Id == intId));
-            var snapshot = Mock.Of<IPublishedSnapshot>(x => x.Content == contentCache.Object);
-            var variationContext = new VariationContext();
-            var variationContextAccessor = Mock.Of<IVariationContextAccessor>(x => x.VariationContext == variationContext);
-
-            return new PublishedContentQuery(snapshot, variationContextAccessor, examineManager.Object);
-        }
-
-        [TestCase("fr-fr", ExpectedResult = "1, 3", Description = "Search Culture: fr-fr. Must return both fr-fr and invariant results")]
-        [TestCase("en-us", ExpectedResult = "1, 2", Description = "Search Culture: en-us. Must return both en-us and invariant results")]
-        [TestCase("*", ExpectedResult = "1, 2, 3", Description = "Search Culture: *. Must return all cultures and all invariant results")]
-        [TestCase(null, ExpectedResult = "1", Description = "Search Culture: null. Must return only invariant results")]
-        public string Search(string culture)
-        {
-            using (var luceneDir = new RandomIdRAMDirectory())
+            var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
+            using (var indexer = CreateTestIndex(luceneDir, fieldNames))
             {
-                var fieldNames = new[] { "title", "title_en-us", "title_fr-fr" };
-                using (var indexer = CreateTestIndex(luceneDir, fieldNames))
-                {
-                    var pcq = CreatePublishedContentQuery(indexer);
+                var pcq = CreatePublishedContentQuery(indexer);
 
-                    var results = pcq.Search("Products", culture, "TestIndex");
+                var results = pcq.Search("Products", culture, "TestIndex");
 
-                    var ids = results.Select(x => x.Content.Id).ToArray();
+                var ids = results.Select(x => x.Content.Id).ToArray();
 
-                    return string.Join(", ", ids);
-                }
+                return string.Join(", ", ids);
             }
         }
     }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs
index 3d8fc1f192..92c7d6581b 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/RandomIdRAMDirectory.cs
@@ -1,11 +1,10 @@
 using System;
 using Lucene.Net.Store;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+public class RandomIdRAMDirectory : RAMDirectory
 {
-    public class RandomIdRAMDirectory : RAMDirectory
-    {
-        private readonly string _lockId = Guid.NewGuid().ToString();
-        public override string GetLockID() => _lockId;
-    }
+    private readonly string _lockId = Guid.NewGuid().ToString();
+    public override string GetLockID() => _lockId;
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs
index 2aefc593db..0b3a7ef45a 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Examine.Lucene/UmbracoExamine/SearchTests.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Examine;
-using Examine.Lucene.Providers;
 using Examine.Search;
 using Moq;
 using NUnit.Framework;
@@ -13,87 +12,87 @@ using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Examine.Lucene.UmbracoExamine;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
+public class SearchTests : ExamineBaseTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
-    public class SearchTests : ExamineBaseTest
+    [Test]
+    public void Test_Sort_Order_Sorting()
     {
+        long totalRecs;
+        var demoData = new ExamineDemoDataContentService(TestFiles.umbraco_sort);
+        var allRecs = demoData.GetLatestContentByXPath("//*[@isDoc]")
+            .Root
+            .Elements()
+            .Select(x => Mock.Of<IContent>(
+                m =>
+                    m.Id == (int)x.Attribute("id") &&
+                    m.ParentId == (int)x.Attribute("parentID") &&
+                    m.Level == (int)x.Attribute("level") &&
+                    m.CreatorId == 0 &&
+                    m.SortOrder == (int)x.Attribute("sortOrder") &&
+                    m.CreateDate == (DateTime)x.Attribute("createDate") &&
+                    m.UpdateDate == (DateTime)x.Attribute("updateDate") &&
+                    m.Name == (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
+                    m.GetCultureName(It.IsAny<string>()) ==
+                    (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
+                    m.Path == (string)x.Attribute("path") &&
+                    m.Properties == new PropertyCollection() &&
+                    m.Published == true &&
+                    m.ContentType == Mock.Of<ISimpleContentType>(mt =>
+                        mt.Icon == "test" &&
+                        mt.Alias == x.Name.LocalName &&
+                        mt.Id == (int)x.Attribute("nodeType"))))
+            .ToArray();
+        var contentService = Mock.Of<IContentService>(
+            x => x.GetPagedDescendants(
+                     It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out totalRecs, It.IsAny<IQuery<IContent>>(), It.IsAny<Ordering>())
+                 ==
+                 allRecs);
 
-        [Test]
-        public void Test_Sort_Order_Sorting()
+        using (GetSynchronousContentIndex(false, out var index, out var contentRebuilder, out _, null, contentService))
         {
-            long totalRecs;
-            var demoData = new ExamineDemoDataContentService(TestFiles.umbraco_sort);
-            var allRecs = demoData.GetLatestContentByXPath("//*[@isDoc]")
-                .Root
-                .Elements()
-                .Select(x => Mock.Of<IContent>(
-                    m =>
-                        m.Id == (int)x.Attribute("id") &&
-                        m.ParentId == (int)x.Attribute("parentID") &&
-                        m.Level == (int)x.Attribute("level") &&
-                        m.CreatorId == 0 &&
-                        m.SortOrder == (int)x.Attribute("sortOrder") &&
-                        m.CreateDate == (DateTime)x.Attribute("createDate") &&
-                        m.UpdateDate == (DateTime)x.Attribute("updateDate") &&
-                        m.Name == (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
-                        m.GetCultureName(It.IsAny<string>()) == (string)x.Attribute(UmbracoExamineFieldNames.NodeNameFieldName) &&
-                        m.Path == (string)x.Attribute("path") &&
-                        m.Properties == new PropertyCollection() &&
-                        m.Published == true &&
-                        m.ContentType == Mock.Of<ISimpleContentType>(mt =>
-                            mt.Icon == "test" &&
-                            mt.Alias == x.Name.LocalName &&
-                            mt.Id == (int)x.Attribute("nodeType"))))
-                .ToArray();
-            var contentService = Mock.Of<IContentService>(
-                x => x.GetPagedDescendants(
-                    It.IsAny<int>(), It.IsAny<long>(), It.IsAny<int>(), out totalRecs, It.IsAny<IQuery<IContent>>(), It.IsAny<Ordering>())
-                    ==
-                    allRecs);
+            index.CreateIndex();
+            contentRebuilder.Populate(index);
 
-            using (GetSynchronousContentIndex(false, out UmbracoContentIndex index, out ContentIndexPopulator contentRebuilder, out _, null, contentService))
+            var searcher = index.Searcher;
+
+            Assert.Greater(searcher.CreateQuery().All().Execute().TotalItemCount, 0);
+
+            var numberSortedCriteria = searcher.CreateQuery()
+                .ParentId(1148)
+                .OrderBy(new SortableField("sortOrder", SortType.Int));
+            var numberSortedResult = numberSortedCriteria.Execute();
+
+            var stringSortedCriteria = searcher.CreateQuery()
+                .ParentId(1148)
+                .OrderBy(new SortableField("sortOrder")); //will default to string
+            var stringSortedResult = stringSortedCriteria.Execute();
+
+            Assert.AreEqual(12, numberSortedResult.TotalItemCount);
+            Assert.AreEqual(12, stringSortedResult.TotalItemCount);
+
+            Assert.IsTrue(IsSortedByNumber(numberSortedResult));
+            Assert.IsFalse(IsSortedByNumber(stringSortedResult));
+        }
+    }
+
+    private bool IsSortedByNumber(IEnumerable<ISearchResult> results)
+    {
+        var currentSort = 0;
+        foreach (var searchResult in results)
+        {
+            var sort = int.Parse(searchResult.Values["sortOrder"]);
+            if (currentSort >= sort)
             {
-                index.CreateIndex();
-                contentRebuilder.Populate(index);
-
-                var searcher = index.Searcher;
-
-                Assert.Greater(searcher.CreateQuery().All().Execute().TotalItemCount, 0);
-
-                var numberSortedCriteria = searcher.CreateQuery()
-                    .ParentId(1148)
-                    .OrderBy(new SortableField("sortOrder", SortType.Int));
-                var numberSortedResult = numberSortedCriteria.Execute();
-
-                var stringSortedCriteria = searcher.CreateQuery()
-                    .ParentId(1148)
-                    .OrderBy(new SortableField("sortOrder"));//will default to string
-                var stringSortedResult = stringSortedCriteria.Execute();
-
-                Assert.AreEqual(12, numberSortedResult.TotalItemCount);
-                Assert.AreEqual(12, stringSortedResult.TotalItemCount);
-
-                Assert.IsTrue(IsSortedByNumber(numberSortedResult));
-                Assert.IsFalse(IsSortedByNumber(stringSortedResult));
+                return false;
             }
+
+            currentSort = sort;
         }
 
-        private bool IsSortedByNumber(IEnumerable<ISearchResult> results)
-        {
-            var currentSort = 0;
-            foreach (var searchResult in results)
-            {
-                var sort = int.Parse(searchResult.Values["sortOrder"]);
-                if (currentSort >= sort)
-                {
-                    return false;
-                }
-                currentSort = sort;
-            }
-            return true;
-        }
-
+        return true;
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs
index f8ed2b595a..fe33fd5147 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Migrations/AdvancedMigrationTests.cs
@@ -3,317 +3,303 @@
 
 using System;
 using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Migrations;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
-using Umbraco.Cms.Infrastructure.Persistence.DatabaseModelDefinitions;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
-using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Migrations
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
+public class AdvancedMigrationTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
-    public class AdvancedMigrationTests : UmbracoIntegrationTest
+    private IUmbracoVersion UmbracoVersion => GetRequiredService<IUmbracoVersion>();
+    private IEventAggregator EventAggregator => GetRequiredService<IEventAggregator>();
+    private IMigrationPlanExecutor MigrationPlanExecutor => GetRequiredService<IMigrationPlanExecutor>();
+
+    [Test]
+    public void CreateTableOfTDto()
     {
-        private IUmbracoVersion UmbracoVersion => GetRequiredService<IUmbracoVersion>();
-        private IEventAggregator EventAggregator => GetRequiredService<IEventAggregator>();
-        private IMigrationPlanExecutor MigrationPlanExecutor => GetRequiredService<IMigrationPlanExecutor>();
-
-        [Test]
-        public void CreateTableOfTDto()
-        {
-            IMigrationBuilder builder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(builder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
+        var builder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(builder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
+            {
+                if (t != typeof(CreateTableOfTDtoMigration))
                 {
-                    if (t != typeof(CreateTableOfTDtoMigration))
-                    {
+                    throw new NotSupportedException();
+                }
+
+                return new CreateTableOfTDtoMigration(c);
+            });
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
+        {
+            var upgrader = new Upgrader(
+                new MigrationPlan("test")
+                    .From(string.Empty)
+                    .To<CreateTableOfTDtoMigration>("done"));
+
+            upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
+
+            var db = ScopeAccessor.AmbientScope.Database;
+            var exists = ScopeAccessor.AmbientScope.SqlContext.SqlSyntax.DoesTableExist(db, "umbracoUser");
+
+            Assert.IsTrue(exists);
+        }
+    }
+
+    [Test]
+    public void DeleteKeysAndIndexesOfTDto()
+    {
+        var builder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(builder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
+            {
+                switch (t.Name)
+                {
+                    case "CreateTableOfTDtoMigration":
+                        return new CreateTableOfTDtoMigration(c);
+                    case "DeleteKeysAndIndexesMigration":
+                        return new DeleteKeysAndIndexesMigration(c);
+                    default:
                         throw new NotSupportedException();
-                    }
-
-                    return new CreateTableOfTDtoMigration(c);
-                });
-
-            using (ScopeProvider.CreateScope(autoComplete: true))
-            {
-                var upgrader = new Upgrader(
-                    new MigrationPlan("test")
-                        .From(string.Empty)
-                        .To<CreateTableOfTDtoMigration>("done"));
-
-                upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
-
-                var db = ScopeAccessor.AmbientScope.Database;
-                var exists = ScopeAccessor.AmbientScope.SqlContext.SqlSyntax.DoesTableExist(db, "umbracoUser");
-
-                Assert.IsTrue(exists);
-            }
-        }
-
-        [Test]
-        public void DeleteKeysAndIndexesOfTDto()
-        {
-            IMigrationBuilder builder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(builder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
-                {
-                    switch (t.Name)
-                    {
-                        case "CreateTableOfTDtoMigration":
-                            return new CreateTableOfTDtoMigration(c);
-                        case "DeleteKeysAndIndexesMigration":
-                            return new DeleteKeysAndIndexesMigration(c);
-                        default:
-                            throw new NotSupportedException();
-                    }
-                });
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var upgrader = new Upgrader(
-                    new MigrationPlan("test")
-                        .From(string.Empty)
-                        .To<CreateTableOfTDtoMigration>("a")
-                        .To<DeleteKeysAndIndexesMigration>("done"));
-
-                upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void CreateKeysAndIndexesOfTDto()
-        {
-            if (BaseTestDatabase.IsSqlite())
-            {
-                // TODO: Think about this for future migrations.
-                Assert.Ignore("Can't add / drop keys in SQLite.");
-                return;
-            }
-
-            IMigrationBuilder builder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(builder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
-                {
-                    switch (t.Name)
-                    {
-                        case "CreateTableOfTDtoMigration":
-                            return new CreateTableOfTDtoMigration(c);
-                        case "DeleteKeysAndIndexesMigration":
-                            return new DeleteKeysAndIndexesMigration(c);
-                        case "CreateKeysAndIndexesOfTDtoMigration":
-                            return new CreateKeysAndIndexesOfTDtoMigration(c);
-                        default:
-                            throw new NotSupportedException();
-                    }
-                });
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var upgrader = new Upgrader(
-                    new MigrationPlan("test")
-                        .From(string.Empty)
-                        .To<CreateTableOfTDtoMigration>("a")
-                        .To<DeleteKeysAndIndexesMigration>("b")
-                        .To<CreateKeysAndIndexesOfTDtoMigration>("done"));
-
-                upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void CreateKeysAndIndexes()
-        {
-            if (BaseTestDatabase.IsSqlite())
-            {
-                // TODO: Think about this for future migrations.
-                Assert.Ignore("Can't add / drop keys in SQLite.");
-                return;
-            }
-
-            IMigrationBuilder builder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(builder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
-                {
-                    switch (t.Name)
-                    {
-                        case "CreateTableOfTDtoMigration":
-                            return new CreateTableOfTDtoMigration(c);
-                        case "DeleteKeysAndIndexesMigration":
-                            return new DeleteKeysAndIndexesMigration(c);
-                        case "CreateKeysAndIndexesMigration":
-                            return new CreateKeysAndIndexesMigration(c);
-                        default:
-                            throw new NotSupportedException();
-                    }
-                });
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var upgrader = new Upgrader(
-                    new MigrationPlan("test")
-                        .From(string.Empty)
-                        .To<CreateTableOfTDtoMigration>("a")
-                        .To<DeleteKeysAndIndexesMigration>("b")
-                        .To<CreateKeysAndIndexesMigration>("done"));
-
-                upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void AddColumn()
-        {
-            IMigrationBuilder builder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(builder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
-                {
-                    switch (t.Name)
-                    {
-                        case "CreateTableOfTDtoMigration":
-                            return new CreateTableOfTDtoMigration(c);
-                        case "CreateColumnMigration":
-                            return new AddColumnMigration(c);
-                        default:
-                            throw new NotSupportedException();
-                    }
-                });
-
-            using (ScopeProvider.CreateScope(autoComplete: true))
-            {
-                var upgrader = new Upgrader(
-                    new MigrationPlan("test")
-                        .From(string.Empty)
-                        .To<CreateTableOfTDtoMigration>("a")
-                        .To<AddColumnMigration>("done"));
-
-                upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
-
-                var db = ScopeAccessor.AmbientScope.Database;
-
-                var columnInfo = ScopeAccessor.AmbientScope.SqlContext.SqlSyntax.GetColumnsInSchema(db)
-                    .Where(x => x.TableName == "umbracoUser")
-                    .FirstOrDefault(x => x.ColumnName == "Foo");
-
-                Assert.Multiple(() =>
-                {
-                    Assert.NotNull(columnInfo);
-                    Assert.IsTrue(columnInfo.DataType.Contains("nvarchar"));
-                });
-            }
-        }
-
-        public class CreateTableOfTDtoMigration : MigrationBase
-        {
-            public CreateTableOfTDtoMigration(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate() =>
-
-                // Create User table with keys, indexes, etc.
-                Create.Table<UserDto>().Do();
-        }
-
-        public class DeleteKeysAndIndexesMigration : MigrationBase
-        {
-            public DeleteKeysAndIndexesMigration(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate()
-            {
-                // drops User table keys and indexes
-                // Execute.DropKeysAndIndexes("umbracoUser");
-
-                // drops *all* tables keys and indexes
-                var tables = SqlSyntax.GetTablesInSchema(Context.Database).ToList();
-                foreach (string table in tables)
-                {
-                    Delete.KeysAndIndexes(table, false, true).Do();
                 }
+            });
 
-                foreach (string table in tables)
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var upgrader = new Upgrader(
+                new MigrationPlan("test")
+                    .From(string.Empty)
+                    .To<CreateTableOfTDtoMigration>("a")
+                    .To<DeleteKeysAndIndexesMigration>("done"));
+
+            upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void CreateKeysAndIndexesOfTDto()
+    {
+        if (BaseTestDatabase.IsSqlite())
+        {
+            // TODO: Think about this for future migrations.
+            Assert.Ignore("Can't add / drop keys in SQLite.");
+            return;
+        }
+
+        var builder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(builder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
+            {
+                switch (t.Name)
                 {
-                    Delete.KeysAndIndexes(table, true, false).Do();
+                    case "CreateTableOfTDtoMigration":
+                        return new CreateTableOfTDtoMigration(c);
+                    case "DeleteKeysAndIndexesMigration":
+                        return new DeleteKeysAndIndexesMigration(c);
+                    case "CreateKeysAndIndexesOfTDtoMigration":
+                        return new CreateKeysAndIndexesOfTDtoMigration(c);
+                    default:
+                        throw new NotSupportedException();
                 }
-            }
+            });
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var upgrader = new Upgrader(
+                new MigrationPlan("test")
+                    .From(string.Empty)
+                    .To<CreateTableOfTDtoMigration>("a")
+                    .To<DeleteKeysAndIndexesMigration>("b")
+                    .To<CreateKeysAndIndexesOfTDtoMigration>("done"));
+
+            upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void CreateKeysAndIndexes()
+    {
+        if (BaseTestDatabase.IsSqlite())
+        {
+            // TODO: Think about this for future migrations.
+            Assert.Ignore("Can't add / drop keys in SQLite.");
+            return;
         }
 
-        public class CreateKeysAndIndexesOfTDtoMigration : MigrationBase
-        {
-            public CreateKeysAndIndexesOfTDtoMigration(IMigrationContext context)
-                : base(context)
+        var builder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(builder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
             {
-            }
-
-            protected override void Migrate() =>
-
-                // Create User table keys and indexes.
-                Create.KeysAndIndexes<UserDto>().Do();
-        }
-
-        public class CreateKeysAndIndexesMigration : MigrationBase
-        {
-            public CreateKeysAndIndexesMigration(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate()
-            {
-                // Creates *all* tables keys and indexes
-                foreach (Type x in DatabaseSchemaCreator._orderedTables)
+                switch (t.Name)
                 {
-                    // ok - for tests, restrict to Node
-                    if (x != typeof(UserDto))
-                    {
-                        continue;
-                    }
-
-                    Create.KeysAndIndexes(x).Do();
+                    case "CreateTableOfTDtoMigration":
+                        return new CreateTableOfTDtoMigration(c);
+                    case "DeleteKeysAndIndexesMigration":
+                        return new DeleteKeysAndIndexesMigration(c);
+                    case "CreateKeysAndIndexesMigration":
+                        return new CreateKeysAndIndexesMigration(c);
+                    default:
+                        throw new NotSupportedException();
                 }
-            }
+            });
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var upgrader = new Upgrader(
+                new MigrationPlan("test")
+                    .From(string.Empty)
+                    .To<CreateTableOfTDtoMigration>("a")
+                    .To<DeleteKeysAndIndexesMigration>("b")
+                    .To<CreateKeysAndIndexesMigration>("done"));
+
+            upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void AddColumn()
+    {
+        var builder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(builder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
+            {
+                switch (t.Name)
+                {
+                    case "CreateTableOfTDtoMigration":
+                        return new CreateTableOfTDtoMigration(c);
+                    case "CreateColumnMigration":
+                        return new AddColumnMigration(c);
+                    default:
+                        throw new NotSupportedException();
+                }
+            });
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
+        {
+            var upgrader = new Upgrader(
+                new MigrationPlan("test")
+                    .From(string.Empty)
+                    .To<CreateTableOfTDtoMigration>("a")
+                    .To<AddColumnMigration>("done"));
+
+            upgrader.Execute(MigrationPlanExecutor, ScopeProvider, Mock.Of<IKeyValueService>());
+
+            var db = ScopeAccessor.AmbientScope.Database;
+
+            var columnInfo = ScopeAccessor.AmbientScope.SqlContext.SqlSyntax.GetColumnsInSchema(db)
+                .Where(x => x.TableName == "umbracoUser")
+                .FirstOrDefault(x => x.ColumnName == "Foo");
+
+            Assert.Multiple(() =>
+            {
+                Assert.NotNull(columnInfo);
+                Assert.IsTrue(columnInfo.DataType.Contains("nvarchar"));
+            });
+        }
+    }
+
+    public class CreateTableOfTDtoMigration : MigrationBase
+    {
+        public CreateTableOfTDtoMigration(IMigrationContext context)
+            : base(context)
+        {
         }
 
-        public class AddColumnMigration : MigrationBase
+        protected override void Migrate() =>
+
+            // Create User table with keys, indexes, etc.
+            Create.Table<UserDto>().Do();
+    }
+
+    public class DeleteKeysAndIndexesMigration : MigrationBase
+    {
+        public DeleteKeysAndIndexesMigration(IMigrationContext context)
+            : base(context)
         {
-            public AddColumnMigration(IMigrationContext context)
-                : base(context)
+        }
+
+        protected override void Migrate()
+        {
+            // drops User table keys and indexes
+            // Execute.DropKeysAndIndexes("umbracoUser");
+
+            // drops *all* tables keys and indexes
+            var tables = SqlSyntax.GetTablesInSchema(Context.Database).ToList();
+            foreach (var table in tables)
             {
+                Delete.KeysAndIndexes(table, false).Do();
             }
 
-            protected override void Migrate()
+            foreach (var table in tables)
             {
-                Database.Execute($"ALTER TABLE {SqlSyntax.GetQuotedTableName("umbracoUser")} ADD Foo nvarchar(255)");
+                Delete.KeysAndIndexes(table, true, false).Do();
             }
         }
     }
+
+    public class CreateKeysAndIndexesOfTDtoMigration : MigrationBase
+    {
+        public CreateKeysAndIndexesOfTDtoMigration(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        protected override void Migrate() =>
+
+            // Create User table keys and indexes.
+            Create.KeysAndIndexes<UserDto>().Do();
+    }
+
+    public class CreateKeysAndIndexesMigration : MigrationBase
+    {
+        public CreateKeysAndIndexesMigration(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        protected override void Migrate()
+        {
+            // Creates *all* tables keys and indexes
+            foreach (var x in DatabaseSchemaCreator._orderedTables)
+            {
+                // ok - for tests, restrict to Node
+                if (x != typeof(UserDto))
+                {
+                    continue;
+                }
+
+                Create.KeysAndIndexes(x).Do();
+            }
+        }
+    }
+
+    public class AddColumnMigration : MigrationBase
+    {
+        public AddColumnMigration(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        protected override void Migrate() =>
+            Database.Execute($"ALTER TABLE {SqlSyntax.GetQuotedTableName("umbracoUser")} ADD Foo nvarchar(255)");
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/CreatedPackageSchemaTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/CreatedPackageSchemaTests.cs
index c07f23ecb2..f37aac5d64 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/CreatedPackageSchemaTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/CreatedPackageSchemaTests.cs
@@ -1,62 +1,56 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Packaging;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class CreatedPackageSchemaTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class CreatedPackageSchemaTests : UmbracoIntegrationTest
+    private ICreatedPackagesRepository CreatedPackageSchemaRepository =>
+        GetRequiredService<ICreatedPackagesRepository>();
+
+    [Test]
+    public void PackagesRepository_Can_Save_PackageDefinition()
     {
-        private ICreatedPackagesRepository CreatedPackageSchemaRepository =>
-            GetRequiredService<ICreatedPackagesRepository>();
+        var packageDefinition = new PackageDefinition { Name = "NewPack", DocumentTypes = new List<string> { "Root" } };
+        var result = CreatedPackageSchemaRepository.SavePackage(packageDefinition);
+        Assert.IsTrue(result);
+    }
 
-        [Test]
-        public void PackagesRepository_Can_Save_PackageDefinition()
+    [Test]
+    public void PackageRepository_GetAll_Returns_All_PackageDefinitions()
+    {
+        var packageDefinitionList = new List<PackageDefinition>
         {
-            var packageDefinition = new PackageDefinition()
-            {
-                Name = "NewPack", DocumentTypes = new List<string>() { "Root" }
-            };
-            var result = CreatedPackageSchemaRepository.SavePackage(packageDefinition);
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void PackageRepository_GetAll_Returns_All_PackageDefinitions()
+            new() {Name = "PackOne"}, new() {Name = "PackTwo"}, new() {Name = "PackThree"}
+        };
+        foreach (var packageDefinition in packageDefinitionList)
         {
-            var packageDefinitionList = new List<PackageDefinition>()
-            {
-                new () { Name = "PackOne" },
-                new () { Name = "PackTwo" },
-                new () { Name = "PackThree" }
-            };
-            foreach (PackageDefinition packageDefinition in packageDefinitionList)
-            {
-                CreatedPackageSchemaRepository.SavePackage(packageDefinition);
-            }
-
-            var loadedPackageDefinitions = CreatedPackageSchemaRepository.GetAll().ToList();
-            CollectionAssert.IsNotEmpty(loadedPackageDefinitions);
-            CollectionAssert.AllItemsAreUnique(loadedPackageDefinitions);
-            Assert.AreEqual(loadedPackageDefinitions.Count, 3);
-        }
-
-        [Test]
-        public void PackageRepository_Can_Update_Package()
-        {
-            var packageDefinition = new PackageDefinition() { Name = "TestPackage" };
             CreatedPackageSchemaRepository.SavePackage(packageDefinition);
-
-            packageDefinition.Name = "UpdatedName";
-            CreatedPackageSchemaRepository.SavePackage(packageDefinition);
-            var results = CreatedPackageSchemaRepository.GetAll().ToList();
-
-            Assert.AreEqual(expected: 1, actual: results.Count);
-            Assert.AreEqual(expected: "UpdatedName", actual: results.FirstOrDefault()?.Name);
         }
+
+        var loadedPackageDefinitions = CreatedPackageSchemaRepository.GetAll().ToList();
+        CollectionAssert.IsNotEmpty(loadedPackageDefinitions);
+        CollectionAssert.AllItemsAreUnique(loadedPackageDefinitions);
+        Assert.AreEqual(loadedPackageDefinitions.Count, 3);
+    }
+
+    [Test]
+    public void PackageRepository_Can_Update_Package()
+    {
+        var packageDefinition = new PackageDefinition { Name = "TestPackage" };
+        CreatedPackageSchemaRepository.SavePackage(packageDefinition);
+
+        packageDefinition.Name = "UpdatedName";
+        CreatedPackageSchemaRepository.SavePackage(packageDefinition);
+        var results = CreatedPackageSchemaRepository.GetAll().ToList();
+
+        Assert.AreEqual(1, results.Count);
+        Assert.AreEqual("UpdatedName", results.FirstOrDefault()?.Name);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs
index cc446e0ea6..ff7b7a7275 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageDataInstallationTests.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Packaging;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Packaging;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
@@ -18,876 +18,885 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services.Importing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging
+[TestFixture]
+[Category("Slow")]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)]
+public class PackageDataInstallationTests : UmbracoIntegrationTestWithContent
 {
-    [TestFixture]
-    [Category("Slow")]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)]
-    public class PackageDataInstallationTests : UmbracoIntegrationTestWithContent
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IMacroService MacroService => GetRequiredService<IMacroService>();
+
+    [HideFromTypeFinder]
+    [DataEditor("7e062c13-7c41-4ad9-b389-41d88aeef87c", "Editor1", "editor1")]
+    public class Editor1 : DataEditor
     {
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
-
-        private IMacroService MacroService => GetRequiredService<IMacroService>();
-
-        [HideFromTypeFinder]
-        [DataEditor("7e062c13-7c41-4ad9-b389-41d88aeef87c", "Editor1", "editor1")]
-        public class Editor1 : DataEditor
+        public Editor1(IDataValueEditorFactory dataValueEditorFactory)
+            : base(dataValueEditorFactory)
         {
-            public Editor1(IDataValueEditorFactory dataValueEditorFactory)
-                : base(dataValueEditorFactory)
-            {
-            }
-        }
-
-        [HideFromTypeFinder]
-        [DataEditor("d15e1281-e456-4b24-aa86-1dda3e4299d5", "Editor2", "editor2")]
-        public class Editor2 : DataEditor
-        {
-            public Editor2(IDataValueEditorFactory dataValueEditorFactory)
-                : base(dataValueEditorFactory)
-            {
-            }
-        }
-
-        //// protected override void Compose()
-        //// {
-        ////     base.Compose();
-        ////
-        ////     // the packages that are used by these tests reference totally bogus property
-        ////     // editors that must exist - so they are defined here - and in order not to
-        ////     // pollute everything, they are ignored by the type finder and explicitely
-        ////     // added to the editors collection
-        ////
-        ////     Builder.WithCollectionBuilder<DataEditorCollectionBuilder>()
-        ////         .Add<Editor1>()
-        ////         .Add<Editor2>();
-        //// }
-        ////
-        //// protected override void ComposeApplication(bool withApplication)
-        //// {
-        ////     base.ComposeApplication(withApplication);
-        ////
-        ////     if (!withApplication) return;
-        ////
-        ////     // re-register with actual media fs
-        ////     Builder.ComposeFileSystems();
-        //// }
-
-        private PackageDataInstallation PackageDataInstallation => GetRequiredService<PackageDataInstallation>();
-
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
-
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
-
-        [Test]
-        public void Can_Import_uBlogsy_ContentTypes_And_Verify_Structure()
-        {
-            // Arrange
-            string strXml = ImportResources.uBlogsy_Package;
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement templateElement = xml.Descendants("Templates").First();
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<IDataType> dataTypes = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-
-            int numberOfTemplates = (from doc in templateElement.Elements("Template") select doc).Count();
-            int numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
-
-            // Assert
-            Assert.That(dataTypes.Any(), Is.True);
-            Assert.That(templates.Any(), Is.True);
-            Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
-
-            IContentType uBlogsyBaseDocType = contentTypes.First(x => x.Alias == "uBlogsyBaseDocType");
-            Assert.That(uBlogsyBaseDocType.PropertyTypes.Count(), Is.EqualTo(5));
-            Assert.That(uBlogsyBaseDocType.PropertyGroups.Any(), Is.False);
-
-            IContentType uBlogsyBasePage = contentTypes.First(x => x.Alias == "uBlogsyBasePage");
-            Assert.That(uBlogsyBasePage.ContentTypeCompositionExists("uBlogsyBaseDocType"), Is.True);
-            Assert.That(uBlogsyBasePage.PropertyTypes.Count(), Is.EqualTo(7));
-            Assert.That(uBlogsyBasePage.PropertyGroups.Count, Is.EqualTo(3));
-            Assert.That(uBlogsyBasePage.PropertyGroups["content"].PropertyTypes.Count, Is.EqualTo(3));
-            Assert.That(uBlogsyBasePage.PropertyGroups["sEO"].PropertyTypes.Count(), Is.EqualTo(3));
-            Assert.That(uBlogsyBasePage.PropertyGroups["navigation"].PropertyTypes.Count(), Is.EqualTo(1));
-            Assert.That(uBlogsyBasePage.CompositionPropertyTypes.Count(), Is.EqualTo(12));
-
-            IContentType uBlogsyLanding = contentTypes.First(x => x.Alias == "uBlogsyLanding");
-            Assert.That(uBlogsyLanding.ContentTypeCompositionExists("uBlogsyBasePage"), Is.True);
-            Assert.That(uBlogsyLanding.ContentTypeCompositionExists("uBlogsyBaseDocType"), Is.True);
-            Assert.That(uBlogsyLanding.PropertyTypes.Count(), Is.EqualTo(5));
-            Assert.That(uBlogsyLanding.PropertyGroups.Count(), Is.EqualTo(2));
-            Assert.That(uBlogsyLanding.CompositionPropertyTypes.Count(), Is.EqualTo(17));
-            Assert.That(uBlogsyLanding.CompositionPropertyGroups.Count(), Is.EqualTo(5));
-        }
-
-        [Test]
-        public void Can_Import_Inherited_ContentTypes_And_Verify_PropertyTypes_UniqueIds()
-        {
-            // Arrange
-            string strXml = ImportResources.InheritedDocTypes_Package;
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement templateElement = xml.Descendants("Templates").First();
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<IDataType> dataTypes = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-
-            // Assert
-            IContentType mRBasePage = contentTypes.First(x => x.Alias == "MRBasePage");
-            using IScope scope = ScopeProvider.CreateScope();
-            foreach (IPropertyType propertyType in mRBasePage.PropertyTypes)
-            {
-                PropertyTypeDto propertyTypeDto = ScopeAccessor.AmbientScope.Database.First<PropertyTypeDto>("WHERE id = @id", new { id = propertyType.Id });
-                Assert.AreEqual(propertyTypeDto.UniqueId, propertyType.Key);
-            }
-        }
-
-        [Test]
-        public void Can_Import_Inherited_ContentTypes_And_Verify_PropertyGroups_And_PropertyTypes()
-        {
-            // Arrange
-            string strXml = ImportResources.InheritedDocTypes_Package;
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement templateElement = xml.Descendants("Templates").First();
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<IDataType> dataTypes = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-
-            int numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
-
-            // Assert
-            Assert.That(dataTypes.Any(), Is.False);
-            Assert.That(templates.Any(), Is.False);
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
-
-            IContentType mRBasePage = contentTypes.First(x => x.Alias == "MRBasePage");
-            Assert.That(mRBasePage.PropertyTypes.Count(), Is.EqualTo(3));
-            Assert.That(mRBasePage.PropertyGroups.Count(), Is.EqualTo(1));
-            Assert.That(mRBasePage.PropertyGroups["metadaten"].PropertyTypes.Count(), Is.EqualTo(2));
-
-            IContentType mRStartPage = contentTypes.First(x => x.Alias == "MRStartPage");
-            Assert.That(mRStartPage.ContentTypeCompositionExists("MRBasePage"), Is.True);
-            Assert.That(mRStartPage.PropertyTypes.Count(), Is.EqualTo(28));
-            Assert.That(mRStartPage.PropertyGroups.Count(), Is.EqualTo(7));
-
-            IEnumerable<PropertyGroup> propertyGroups = mRStartPage.CompositionPropertyGroups.Where(x => x.Name == "Metadaten");
-            IEnumerable<IPropertyType> propertyTypes = propertyGroups.SelectMany(x => x.PropertyTypes);
-            Assert.That(propertyGroups.Count(), Is.EqualTo(2));
-            Assert.That(propertyTypes.Count(), Is.EqualTo(6));
-        }
-
-        [Test]
-        public void Can_Import_Template_Package_Xml()
-        {
-            // Arrange
-            string strXml = ImportResources.StandardMvc_Package;
-            var xml = XElement.Parse(strXml);
-            XElement element = xml.Descendants("Templates").First();
-
-            int init = FileService.GetTemplates().Count();
-
-            // Act
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(element.Elements("Template").ToList(), 0);
-            int numberOfTemplates = (from doc in element.Elements("Template") select doc).Count();
-            IEnumerable<ITemplate> allTemplates = FileService.GetTemplates();
-
-            // Assert
-            Assert.That(templates, Is.Not.Null);
-            Assert.That(templates.Any(), Is.True);
-            Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
-
-            Assert.AreEqual(init + numberOfTemplates, allTemplates.Count());
-            Assert.IsTrue(allTemplates.All(x => x.Content.Contains("UmbracoViewPage")));
-        }
-
-        [Test]
-        public void Can_Import_Single_Template()
-        {
-            // Arrange
-            string strXml = ImportResources.StandardMvc_Package;
-            var xml = XElement.Parse(strXml);
-            XElement element = xml.Descendants("Templates").First();
-
-            // Act
-            IEnumerable<ITemplate> templates = PackageDataInstallation.ImportTemplate(element.Elements("Template").First(), 0);
-
-            // Assert
-            Assert.That(templates, Is.Not.Null);
-            Assert.That(templates.Any(), Is.True);
-            Assert.That(templates.Count(), Is.EqualTo(1));
-
-            var template = templates.First();
-            Assert.AreEqual(template.Name, "Articles");
-        }
-
-        [Test]
-        public void Can_Import_Single_Template_With_Key()
-        {
-            // Arrange
-            string strXml = ImportResources.StandardMvc_Package;
-            var xml = XElement.Parse(strXml);
-            XElement element = xml.Descendants("Templates").First();
-
-            var firstTemplateElement = element.Elements("Template").First();
-            var key = Guid.NewGuid();
-            firstTemplateElement.Add(new XElement("Key", key));
-
-            // Act
-            IEnumerable<ITemplate> templates = PackageDataInstallation.ImportTemplate(firstTemplateElement, 0);
-
-            // Assert
-            Assert.That(templates, Is.Not.Null);
-            Assert.That(templates.Any(), Is.True);
-            Assert.That(templates.Count(), Is.EqualTo(1));
-
-            var template = templates.First();
-            Assert.AreEqual(template.Name, "Articles");
-            Assert.AreEqual(template.Key, key);
-        }
-
-        [Test]
-        public void Can_Import_StandardMvc_ContentTypes_Package_Xml()
-        {
-            // Arrange
-            string strXml = ImportResources.StandardMvc_Package;
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement templateElement = xml.Descendants("Templates").First();
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<IDataType> dataTypeDefinitions = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-            int numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
-
-            // Assert
-            Assert.That(dataTypeDefinitions, Is.Not.Null);
-            Assert.That(dataTypeDefinitions.Any(), Is.True);
-            Assert.That(templates.Any(), Is.True);
-            Assert.That(contentTypes, Is.Not.Null);
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
-            Assert.That(contentTypes.Count(x => x.ParentId == -1), Is.EqualTo(1));
-
-            IContentType contentMaster = contentTypes.First(x => x.Alias == "ContentMaster");
-            Assert.That(contentMaster.PropertyTypes.Count(), Is.EqualTo(3));
-            Assert.That(contentMaster.PropertyGroups.Count(), Is.EqualTo(1));
-            Assert.That(contentMaster.PropertyGroups["sEO"].PropertyTypes.Count(), Is.EqualTo(3));
-            Assert.That(contentMaster.ContentTypeCompositionExists("Base"), Is.True);
-
-            int propertyGroupId = contentMaster.PropertyGroups["sEO"].Id;
-            Assert.That(contentMaster.PropertyGroups["sEO"].PropertyTypes.Any(x => x.PropertyGroupId.Value != propertyGroupId), Is.False);
-        }
-
-        [Test]
-        public void Can_Import_StandardMvc_ContentTypes_And_Templates_Xml()
-        {
-            // Arrange
-            string strXml = ImportResources.StandardMvc_Package;
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement templateElement = xml.Descendants("Templates").First();
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<IDataType> dataTypeDefinitions = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-            int numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
-
-            // Assert - Re-Import contenttypes doesn't throw
-            Assert.DoesNotThrow(() => PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0));
-            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
-            Assert.That(dataTypeDefinitions, Is.Not.Null);
-            Assert.That(dataTypeDefinitions.Any(), Is.True);
-            Assert.That(templates.Any(), Is.True);
-        }
-
-        [Test]
-        public void Can_Import_Fanoe_Starterkit_ContentTypes_And_Templates_Xml()
-        {
-            // Arrange
-            string strXml = ImportResources.Fanoe_Package;
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement templateElement = xml.Descendants("Templates").First();
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<IDataType> dataTypeDefinitions = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-            int numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
-
-            // Assert - Re-Import contenttypes doesn't throw
-            Assert.DoesNotThrow(() => PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0));
-            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
-            Assert.That(dataTypeDefinitions, Is.Not.Null);
-            Assert.That(dataTypeDefinitions.Any(), Is.True);
-            Assert.That(templates.Any(), Is.True);
-        }
-
-        [Test]
-        public void Can_Import_Content_Package_Xml()
-        {
-            // Arrange
-            string strXml = ImportResources.StandardMvc_Package;
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement docTypesElement = xml.Descendants("DocumentTypes").First();
-            XElement element = xml.Descendants("DocumentSet").First();
-            var packageDocument = CompiledPackageContentBase.Create(element);
-
-            // Act
-            IReadOnlyList<IDataType> dataTypeDefinitions = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypesElement.Elements("DocumentType"), 0);
-            var importedContentTypes = contentTypes.ToDictionary(x => x.Alias, x => x);
-            IReadOnlyList<IContent> contents = PackageDataInstallation.ImportContentBase(packageDocument.Yield(), importedContentTypes, 0, ContentTypeService, ContentService);
-            int numberOfDocs = (from doc in element.Descendants()
-                                where (string)doc.Attribute("isDoc") == string.Empty
-                                select doc).Count();
-
-            // Assert
-            Assert.That(contents, Is.Not.Null);
-            Assert.That(dataTypeDefinitions.Any(), Is.True);
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contents.Any(), Is.True);
-            Assert.That(contents.Count(), Is.EqualTo(numberOfDocs));
-        }
-
-        [Test]
-        public void Can_Import_Media_Package_Xml()
-        {
-            // Arrange
-            string strXml = ImportResources.MediaTypesAndMedia_Package_xml;
-            var xml = XElement.Parse(strXml);
-            XElement mediaTypesElement = xml.Descendants("MediaTypes").First();
-            XElement element = xml.Descendants("MediaSet").First();
-            var packageMedia = CompiledPackageContentBase.Create(element);
-
-            // Act
-            IReadOnlyList<IMediaType> mediaTypes = PackageDataInstallation.ImportMediaTypes(mediaTypesElement.Elements("MediaType"), 0);
-            var importedMediaTypes = mediaTypes.ToDictionary(x => x.Alias, x => x);
-            IReadOnlyList<IMedia> medias = PackageDataInstallation.ImportContentBase(packageMedia.Yield(), importedMediaTypes, 0, MediaTypeService, MediaService);
-            int numberOfDocs = (from doc in element.Descendants()
-                                where (string)doc.Attribute("isDoc") == string.Empty
-                                select doc).Count();
-
-            // Assert
-            Assert.That(medias, Is.Not.Null);
-            Assert.That(mediaTypes.Any(), Is.True);
-            Assert.That(medias.Any(), Is.True);
-            Assert.That(medias.Count(), Is.EqualTo(numberOfDocs));
-        }
-
-        [Test]
-        public void Can_Import_CheckboxList_Content_Package_Xml_With_Property_Editor_Aliases()
-            => AssertCheckBoxListTests(ImportResources.CheckboxList_Content_Package);
-
-        private void AssertCheckBoxListTests(string strXml)
-        {
-            // Arrange
-            var xml = XElement.Parse(strXml);
-            XElement dataTypeElement = xml.Descendants("DataTypes").First();
-            XElement docTypesElement = xml.Descendants("DocumentTypes").First();
-            XElement element = xml.Descendants("DocumentSet").First();
-            var packageDocument = CompiledPackageContentBase.Create(element);
-
-            // Act
-            IReadOnlyList<IDataType> dataTypeDefinitions = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypesElement.Elements("DocumentType"), 0);
-            var importedContentTypes = contentTypes.ToDictionary(x => x.Alias, x => x);
-            IReadOnlyList<IContent> contents = PackageDataInstallation.ImportContentBase(packageDocument.Yield(), importedContentTypes, 0, ContentTypeService, ContentService);
-            int numberOfDocs = (from doc in element.Descendants()
-                                where (string)doc.Attribute("isDoc") == string.Empty
-                                select doc).Count();
-
-            string configuration;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                List<DataTypeDto> dtos = ScopeAccessor.AmbientScope.Database.Fetch<DataTypeDto>("WHERE nodeId = @Id", new { dataTypeDefinitions.First().Id });
-                configuration = dtos.Single().Configuration;
-            }
-
-            // Assert
-            Assert.That(dataTypeDefinitions, Is.Not.Null);
-            Assert.That(dataTypeDefinitions.Any(), Is.True);
-            Assert.AreEqual(Constants.PropertyEditors.Aliases.CheckBoxList, dataTypeDefinitions.First().EditorAlias);
-            Assert.That(contents, Is.Not.Null);
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contents.Any(), Is.True);
-            Assert.That(contents.Count(), Is.EqualTo(numberOfDocs));
-            Assert.AreEqual("{\"items\":[{\"id\":59,\"value\":\"test\"},{\"id\":60,\"value\":\"test3\"},{\"id\":61,\"value\":\"test2\"}]}", configuration);
-        }
-
-        [Test]
-        public void Can_Import_Templates_Package_Xml_With_Invalid_Master()
-        {
-            // Arrange
-            string strXml = ImportResources.XsltSearch_Package;
-            var xml = XElement.Parse(strXml);
-            XElement templateElement = xml.Descendants("Templates").First();
-
-            // Act
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            int numberOfTemplates = (from doc in templateElement.Elements("Template") select doc).Count();
-
-            // Assert
-            Assert.That(templates.Any(), Is.True);
-            Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
-        }
-
-        [Test]
-        public void Can_Import_Single_DocType()
-        {
-            // Arrange
-            string strXml = ImportResources.SingleDocType;
-            var docTypeElement = XElement.Parse(strXml);
-
-            // Act
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
-
-            // Assert
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contentTypes.Any(x => x.HasIdentity == false), Is.False);
-            Assert.That(contentTypes.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Can_Export_Single_DocType()
-        {
-            // Arrange
-            string strXml = ImportResources.SingleDocType;
-            var docTypeElement = XElement.Parse(strXml);
-
-            IEntityXmlSerializer serializer = GetRequiredService<IEntityXmlSerializer>();
-
-            // Act
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
-            IContentType contentType = contentTypes.FirstOrDefault();
-            XElement element = serializer.Serialize(contentType);
-
-            // Assert
-            Assert.That(element, Is.Not.Null);
-            Assert.That(element.Element("Info"), Is.Not.Null);
-            Assert.That(element.Element("Structure"), Is.Not.Null);
-            Assert.That(element.Element("GenericProperties"), Is.Not.Null);
-            Assert.That(element.Element("Tabs"), Is.Not.Null);
-
-            // Can't compare this XElement because the templates are not imported (they don't exist)
-            //// Assert.That(XNode.DeepEquals(docTypeElement, element), Is.True);
-        }
-
-        [Test]
-        public void Can_ReImport_Single_DocType()
-        {
-            // Arrange
-            string strXml = ImportResources.SingleDocType;
-            var docTypeElement = XElement.Parse(strXml);
-
-            // Act
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
-            IReadOnlyList<IContentType> contentTypesUpdated = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
-
-            // Assert
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contentTypes.Any(x => x.HasIdentity == false), Is.False);
-            Assert.That(contentTypes.Count(), Is.EqualTo(1));
-            Assert.That(contentTypes.First().AllowedContentTypes.Count(), Is.EqualTo(1));
-
-            Assert.That(contentTypesUpdated.Any(), Is.True);
-            Assert.That(contentTypesUpdated.Any(x => x.HasIdentity == false), Is.False);
-            Assert.That(contentTypesUpdated.Count(), Is.EqualTo(1));
-            Assert.That(contentTypesUpdated.First().AllowedContentTypes.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Can_ReImport_Templates_To_Update()
-        {
-            var newPackageXml = XElement.Parse(ImportResources.TemplateOnly_Package);
-            var updatedPackageXml = XElement.Parse(ImportResources.TemplateOnly_Updated_Package);
-
-            XElement templateElement = newPackageXml.Descendants("Templates").First();
-            XElement templateElementUpdated = updatedPackageXml.Descendants("Templates").First();
-
-            IFileService fileService = FileService;
-
-            // kill default test data
-            fileService.DeleteTemplate("Textpage");
-
-            // Act
-            int numberOfTemplates = (from doc in templateElement.Elements("Template") select doc).Count();
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<ITemplate> templatesAfterUpdate = PackageDataInstallation.ImportTemplates(templateElementUpdated.Elements("Template").ToList(), 0);
-            IEnumerable<ITemplate> allTemplates = fileService.GetTemplates();
-
-            // Assert
-            Assert.That(templates.Any(), Is.True);
-            Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
-            Assert.That(templatesAfterUpdate.Count(), Is.EqualTo(numberOfTemplates));
-            Assert.That(allTemplates.Count(), Is.EqualTo(numberOfTemplates));
-            Assert.That(allTemplates.First(x => x.Alias == "umbHomepage").Content, Contains.Substring("THIS HAS BEEN UPDATED!"));
-        }
-
-        [Test]
-        public void Can_Import_DictionaryItems()
-        {
-            // Arrange
-            const string expectedEnglishParentValue = "ParentValue";
-            const string expectedNorwegianParentValue = "ForelderVerdi";
-            const string expectedEnglishChildValue = "ChildValue";
-            const string expectedNorwegianChildValue = "BarnVerdi";
-
-            var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
-            XElement dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
-
-            AddLanguages();
-
-            // Act
-            PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
-
-            // Assert
-            AssertDictionaryItem("Parent", expectedEnglishParentValue, "en-GB");
-            AssertDictionaryItem("Parent", expectedNorwegianParentValue, "nb-NO");
-            AssertDictionaryItem("Child", expectedEnglishChildValue, "en-GB");
-            AssertDictionaryItem("Child", expectedNorwegianChildValue, "nb-NO");
-        }
-
-        [Test]
-        public void Can_Import_Nested_DictionaryItems()
-        {
-            // Arrange
-            const string parentKey = "Parent";
-            const string childKey = "Child";
-
-            var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
-            XElement dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
-
-            AddLanguages();
-
-            // Act
-            IReadOnlyList<IDictionaryItem> dictionaryItems = PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
-
-            // Assert
-            Assert.That(LocalizationService.DictionaryItemExists(parentKey), "DictionaryItem parentKey does not exist");
-            Assert.That(LocalizationService.DictionaryItemExists(childKey), "DictionaryItem childKey does not exist");
-
-            IDictionaryItem parentDictionaryItem = LocalizationService.GetDictionaryItemByKey(parentKey);
-            IDictionaryItem childDictionaryItem = LocalizationService.GetDictionaryItemByKey(childKey);
-
-            Assert.That(parentDictionaryItem.ParentId, Is.Not.EqualTo(childDictionaryItem.ParentId));
-            Assert.That(childDictionaryItem.ParentId, Is.EqualTo(parentDictionaryItem.Key));
-        }
-
-        [Test]
-        public void WhenExistingDictionaryKey_ImportsNewChildren()
-        {
-            // Arrange
-            const string expectedEnglishParentValue = "ExistingParentValue";
-            const string expectedNorwegianParentValue = "EksisterendeForelderVerdi";
-            const string expectedEnglishChildValue = "ChildValue";
-            const string expectedNorwegianChildValue = "BarnVerdi";
-
-            var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
-            XElement dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
-
-            AddLanguages();
-            AddExistingEnglishAndNorwegianParentDictionaryItem(expectedEnglishParentValue, expectedNorwegianParentValue);
-
-            // Act
-            PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
-
-            // Assert
-            AssertDictionaryItem("Parent", expectedEnglishParentValue, "en-GB");
-            AssertDictionaryItem("Parent", expectedNorwegianParentValue, "nb-NO");
-            AssertDictionaryItem("Child", expectedEnglishChildValue, "en-GB");
-            AssertDictionaryItem("Child", expectedNorwegianChildValue, "nb-NO");
-        }
-
-        [Test]
-        public void WhenExistingDictionaryKey_OnlyAddsNewLanguages()
-        {
-            // Arrange
-            const string expectedEnglishParentValue = "ExistingParentValue";
-            const string expectedNorwegianParentValue = "ForelderVerdi";
-            const string expectedEnglishChildValue = "ChildValue";
-            const string expectedNorwegianChildValue = "BarnVerdi";
-
-            var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
-            XElement dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
-
-            AddLanguages();
-            AddExistingEnglishParentDictionaryItem(expectedEnglishParentValue);
-
-            // Act
-            PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
-
-            // Assert
-            AssertDictionaryItem("Parent", expectedEnglishParentValue, "en-GB");
-            AssertDictionaryItem("Parent", expectedNorwegianParentValue, "nb-NO");
-            AssertDictionaryItem("Child", expectedEnglishChildValue, "en-GB");
-            AssertDictionaryItem("Child", expectedNorwegianChildValue, "nb-NO");
-        }
-
-        [Test]
-        public void Can_Import_Languages()
-        {
-            // Arrange
-            var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
-            XElement languageItemsElement = newPackageXml.Elements("Languages").First();
-
-            // Act
-            IReadOnlyList<ILanguage> languages = PackageDataInstallation.ImportLanguages(languageItemsElement.Elements("Language"), 0);
-            IEnumerable<ILanguage> allLanguages = LocalizationService.GetAllLanguages();
-
-            // Assert
-            Assert.That(languages.Any(x => x.HasIdentity == false), Is.False);
-            foreach (ILanguage language in languages)
-            {
-                Assert.That(allLanguages.Any(x => x.IsoCode == language.IsoCode), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Import_Macros()
-        {
-            // Arrange
-            string strXml = ImportResources.uBlogsy_Package;
-            var xml = XElement.Parse(strXml);
-            XElement macrosElement = xml.Descendants("Macros").First();
-
-            // Act
-            var macros = PackageDataInstallation.ImportMacros(
-                macrosElement.Elements("macro"),
-                0).ToList();
-
-            // Assert
-            Assert.That(macros.Any(), Is.True);
-
-            var allMacros = MacroService.GetAll().ToList();
-            foreach (IMacro macro in macros)
-            {
-                Assert.That(allMacros.Any(x => x.Alias == macro.Alias), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Import_Macros_With_Properties()
-        {
-            // Arrange
-            string strXml = ImportResources.XsltSearch_Package;
-            var xml = XElement.Parse(strXml);
-            XElement macrosElement = xml.Descendants("Macros").First();
-
-            // Act
-            var macros = PackageDataInstallation.ImportMacros(
-                macrosElement.Elements("macro"),
-                0).ToList();
-
-            // Assert
-            Assert.That(macros.Any(), Is.True);
-            Assert.That(macros.First().Properties.Values.Any(), Is.True);
-
-            var allMacros = MacroService.GetAll().ToList();
-            foreach (IMacro macro in macros)
-            {
-                Assert.That(allMacros.Any(x => x.Alias == macro.Alias), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Import_Package_With_Compositions()
-        {
-            // Arrange
-            string strXml = ImportResources.CompositionsTestPackage;
-            var xml = XElement.Parse(strXml);
-            XElement templateElement = xml.Descendants("Templates").First();
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<ITemplate> templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-            int numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
-
-            // Assert
-            Assert.That(contentTypes, Is.Not.Null);
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
-            Assert.That(contentTypes.Count(x => x.ParentId == -1), Is.EqualTo(3));
-
-            IContentType textpage = contentTypes.First(x => x.Alias.Equals("umbTextyPage"));
-            Assert.That(textpage.ParentId, Is.Not.EqualTo(-1));
-            Assert.That(textpage.ContentTypeComposition.Count(), Is.EqualTo(3));
-            Assert.That(textpage.ContentTypeCompositionExists("umbMaster"), Is.True);
-            Assert.That(textpage.ContentTypeCompositionExists("Meta"), Is.True);
-            Assert.That(textpage.ContentTypeCompositionExists("Seo"), Is.True);
-        }
-
-        [Test]
-        public void Can_Import_Package_With_Compositions_Ordered()
-        {
-            // Arrange
-            string strXml = ImportResources.CompositionsTestPackage_Random;
-            var xml = XElement.Parse(strXml);
-            XElement docTypeElement = xml.Descendants("DocumentTypes").First();
-
-            // Act
-            IReadOnlyList<IContentType> contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
-            int numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
-
-            // Assert
-            Assert.That(contentTypes, Is.Not.Null);
-            Assert.That(contentTypes.Any(), Is.True);
-            Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
-
-            IContentType testContentType = contentTypes.First(x => x.Alias.Equals("CompositeTest"));
-            Assert.That(testContentType.ContentTypeComposition.Count(), Is.EqualTo(3));
-            Assert.That(testContentType.ContentTypeCompositionExists("Content"), Is.True);
-            Assert.That(testContentType.ContentTypeCompositionExists("Meta"), Is.True);
-            Assert.That(testContentType.ContentTypeCompositionExists("Seo"), Is.True);
-        }
-
-        [Test]
-        public void ImportDocumentType_NewTypeWithOmittedHistoryCleanupPolicy_InsertsDefaultPolicy()
-        {
-            // Arrange
-            var withoutCleanupPolicy = XElement.Parse(ImportResources.SingleDocType);
-
-            // Act
-            var contentTypes = PackageDataInstallation
-                .ImportDocumentType(withoutCleanupPolicy, 0)
-                .OfType<IContentTypeWithHistoryCleanup>();
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(contentTypes.Single().HistoryCleanup);
-                Assert.IsFalse(contentTypes.Single().HistoryCleanup.PreventCleanup);
-            });
-        }
-
-        [Test]
-        public void ImportDocumentType_WithHistoryCleanupPolicyElement_ImportsWithCorrectValues()
-        {
-            // Arrange
-            var docTypeElement = XElement.Parse(ImportResources.SingleDocType_WithCleanupPolicy);
-
-            // Act
-            var contentTypes = PackageDataInstallation
-                .ImportDocumentType(docTypeElement, 0)
-                .OfType<IContentTypeWithHistoryCleanup>();
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(contentTypes.Single().HistoryCleanup);
-                Assert.IsTrue(contentTypes.Single().HistoryCleanup.PreventCleanup);
-                Assert.AreEqual(1, contentTypes.Single().HistoryCleanup.KeepAllVersionsNewerThanDays);
-                Assert.AreEqual(2, contentTypes.Single().HistoryCleanup.KeepLatestVersionPerDayForDays);
-            });
-        }
-
-        [Test]
-        public void ImportDocumentType_ExistingTypeWithOmittedHistoryCleanupPolicy_DoesNotOverwriteDatabaseContent()
-        {
-            // Arrange
-            var withoutCleanupPolicy = XElement.Parse(ImportResources.SingleDocType);
-            var withCleanupPolicy = XElement.Parse(ImportResources.SingleDocType_WithCleanupPolicy);
-
-            // Act
-            var contentTypes = PackageDataInstallation
-                .ImportDocumentType(withCleanupPolicy, 0)
-                .OfType<IContentTypeWithHistoryCleanup>();
-
-            var contentTypesUpdated = PackageDataInstallation
-                .ImportDocumentType(withoutCleanupPolicy, 0)
-                .OfType<IContentTypeWithHistoryCleanup>();
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(contentTypes.Single().HistoryCleanup);
-                Assert.IsTrue(contentTypes.Single().HistoryCleanup.PreventCleanup);
-                Assert.AreEqual(1, contentTypes.Single().HistoryCleanup.KeepAllVersionsNewerThanDays);
-                Assert.AreEqual(2, contentTypes.Single().HistoryCleanup.KeepLatestVersionPerDayForDays);
-
-                Assert.NotNull(contentTypesUpdated.Single().HistoryCleanup);
-                Assert.IsTrue(contentTypesUpdated.Single().HistoryCleanup.PreventCleanup);
-                Assert.AreEqual(1, contentTypes.Single().HistoryCleanup.KeepAllVersionsNewerThanDays);
-                Assert.AreEqual(2, contentTypes.Single().HistoryCleanup.KeepLatestVersionPerDayForDays);
-            });
-        }
-
-        private void AddLanguages()
-        {
-            var norwegian = new Language("nb-NO", "Norwegian Bokmål (Norway)");
-            var english = new Language("en-GB", "English (United Kingdom)");
-            LocalizationService.Save(norwegian, 0);
-            LocalizationService.Save(english, 0);
-        }
-
-        private void AssertDictionaryItem(string dictionaryItemName, string expectedValue, string cultureCode)
-        {
-            Assert.That(LocalizationService.DictionaryItemExists(dictionaryItemName), "DictionaryItem key does not exist");
-            IDictionaryItem dictionaryItem = LocalizationService.GetDictionaryItemByKey(dictionaryItemName);
-            IDictionaryTranslation translation = dictionaryItem.Translations.SingleOrDefault(i => i.Language.IsoCode == cultureCode);
-            Assert.IsNotNull(translation, "Translation to {0} was not added", cultureCode);
-            string value = translation.Value;
-            Assert.That(value, Is.EqualTo(expectedValue), "Translation value was not set");
-        }
-
-        private void AddExistingEnglishParentDictionaryItem(string expectedEnglishParentValue)
-        {
-            var languages = LocalizationService.GetAllLanguages().ToList();
-            ILanguage englishLanguage = languages.Single(l => l.IsoCode == "en-GB");
-            LocalizationService.Save(
-                new DictionaryItem("Parent")
-                {
-                    // This matches what is in the package.xml file
-                    Key = new Guid("28f2e02a-8c66-4fcd-85e3-8524d551c0d3"),
-                    Translations = new List<IDictionaryTranslation>
-                                    {
-                                            new DictionaryTranslation(englishLanguage, expectedEnglishParentValue),
-                                    }
-                });
-        }
-
-        private void AddExistingEnglishAndNorwegianParentDictionaryItem(string expectedEnglishParentValue, string expectedNorwegianParentValue)
-        {
-            var languages = LocalizationService.GetAllLanguages().ToList();
-            ILanguage englishLanguage = languages.Single(l => l.IsoCode == "en-GB");
-            ILanguage norwegianLanguage = languages.Single(l => l.IsoCode == "nb-NO");
-            LocalizationService.Save(
-                new DictionaryItem("Parent")
-                {
-                    // This matches what is in the package.xml file
-                    Key = new Guid("28f2e02a-8c66-4fcd-85e3-8524d551c0d3"),
-                    Translations = new List<IDictionaryTranslation>
-                                    {
-                                            new DictionaryTranslation(englishLanguage, expectedEnglishParentValue),
-                                            new DictionaryTranslation(norwegianLanguage, expectedNorwegianParentValue),
-                                    }
-                });
         }
     }
+
+    [HideFromTypeFinder]
+    [DataEditor("d15e1281-e456-4b24-aa86-1dda3e4299d5", "Editor2", "editor2")]
+    public class Editor2 : DataEditor
+    {
+        public Editor2(IDataValueEditorFactory dataValueEditorFactory)
+            : base(dataValueEditorFactory)
+        {
+        }
+    }
+
+    //// protected override void Compose()
+    //// {
+    ////     base.Compose();
+    ////
+    ////     // the packages that are used by these tests reference totally bogus property
+    ////     // editors that must exist - so they are defined here - and in order not to
+    ////     // pollute everything, they are ignored by the type finder and explicitely
+    ////     // added to the editors collection
+    ////
+    ////     Builder.WithCollectionBuilder<DataEditorCollectionBuilder>()
+    ////         .Add<Editor1>()
+    ////         .Add<Editor2>();
+    //// }
+    ////
+    //// protected override void ComposeApplication(bool withApplication)
+    //// {
+    ////     base.ComposeApplication(withApplication);
+    ////
+    ////     if (!withApplication) return;
+    ////
+    ////     // re-register with actual media fs
+    ////     Builder.ComposeFileSystems();
+    //// }
+
+    private PackageDataInstallation PackageDataInstallation => GetRequiredService<PackageDataInstallation>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    [Test]
+    public void Can_Import_uBlogsy_ContentTypes_And_Verify_Structure()
+    {
+        // Arrange
+        var strXml = ImportResources.uBlogsy_Package;
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var templateElement = xml.Descendants("Templates").First();
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var dataTypes = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+
+        var numberOfTemplates = (from doc in templateElement.Elements("Template") select doc).Count();
+        var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+        // Assert
+        Assert.That(dataTypes.Any(), Is.True);
+        Assert.That(templates.Any(), Is.True);
+        Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+
+        var uBlogsyBaseDocType = contentTypes.First(x => x.Alias == "uBlogsyBaseDocType");
+        Assert.That(uBlogsyBaseDocType.PropertyTypes.Count(), Is.EqualTo(5));
+        Assert.That(uBlogsyBaseDocType.PropertyGroups.Any(), Is.False);
+
+        var uBlogsyBasePage = contentTypes.First(x => x.Alias == "uBlogsyBasePage");
+        Assert.That(uBlogsyBasePage.ContentTypeCompositionExists("uBlogsyBaseDocType"), Is.True);
+        Assert.That(uBlogsyBasePage.PropertyTypes.Count(), Is.EqualTo(7));
+        Assert.That(uBlogsyBasePage.PropertyGroups.Count, Is.EqualTo(3));
+        Assert.That(uBlogsyBasePage.PropertyGroups["content"].PropertyTypes.Count, Is.EqualTo(3));
+        Assert.That(uBlogsyBasePage.PropertyGroups["sEO"].PropertyTypes.Count(), Is.EqualTo(3));
+        Assert.That(uBlogsyBasePage.PropertyGroups["navigation"].PropertyTypes.Count(), Is.EqualTo(1));
+        Assert.That(uBlogsyBasePage.CompositionPropertyTypes.Count(), Is.EqualTo(12));
+
+        var uBlogsyLanding = contentTypes.First(x => x.Alias == "uBlogsyLanding");
+        Assert.That(uBlogsyLanding.ContentTypeCompositionExists("uBlogsyBasePage"), Is.True);
+        Assert.That(uBlogsyLanding.ContentTypeCompositionExists("uBlogsyBaseDocType"), Is.True);
+        Assert.That(uBlogsyLanding.PropertyTypes.Count(), Is.EqualTo(5));
+        Assert.That(uBlogsyLanding.PropertyGroups.Count(), Is.EqualTo(2));
+        Assert.That(uBlogsyLanding.CompositionPropertyTypes.Count(), Is.EqualTo(17));
+        Assert.That(uBlogsyLanding.CompositionPropertyGroups.Count(), Is.EqualTo(5));
+    }
+
+    [Test]
+    public void Can_Import_Inherited_ContentTypes_And_Verify_PropertyTypes_UniqueIds()
+    {
+        // Arrange
+        var strXml = ImportResources.InheritedDocTypes_Package;
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var templateElement = xml.Descendants("Templates").First();
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var dataTypes = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+
+        // Assert
+        var mRBasePage = contentTypes.First(x => x.Alias == "MRBasePage");
+        using var scope = ScopeProvider.CreateScope();
+        foreach (var propertyType in mRBasePage.PropertyTypes)
+        {
+            var propertyTypeDto =
+                ScopeAccessor.AmbientScope.Database.First<PropertyTypeDto>("WHERE id = @id", new { id = propertyType.Id });
+            Assert.AreEqual(propertyTypeDto.UniqueId, propertyType.Key);
+        }
+    }
+
+    [Test]
+    public void Can_Import_Inherited_ContentTypes_And_Verify_PropertyGroups_And_PropertyTypes()
+    {
+        // Arrange
+        var strXml = ImportResources.InheritedDocTypes_Package;
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var templateElement = xml.Descendants("Templates").First();
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var dataTypes = PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+
+        var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+        // Assert
+        Assert.That(dataTypes.Any(), Is.False);
+        Assert.That(templates.Any(), Is.False);
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+
+        var mRBasePage = contentTypes.First(x => x.Alias == "MRBasePage");
+        Assert.That(mRBasePage.PropertyTypes.Count(), Is.EqualTo(3));
+        Assert.That(mRBasePage.PropertyGroups.Count(), Is.EqualTo(1));
+        Assert.That(mRBasePage.PropertyGroups["metadaten"].PropertyTypes.Count(), Is.EqualTo(2));
+
+        var mRStartPage = contentTypes.First(x => x.Alias == "MRStartPage");
+        Assert.That(mRStartPage.ContentTypeCompositionExists("MRBasePage"), Is.True);
+        Assert.That(mRStartPage.PropertyTypes.Count(), Is.EqualTo(28));
+        Assert.That(mRStartPage.PropertyGroups.Count(), Is.EqualTo(7));
+
+        var propertyGroups = mRStartPage.CompositionPropertyGroups.Where(x => x.Name == "Metadaten");
+        var propertyTypes = propertyGroups.SelectMany(x => x.PropertyTypes);
+        Assert.That(propertyGroups.Count(), Is.EqualTo(2));
+        Assert.That(propertyTypes.Count(), Is.EqualTo(6));
+    }
+
+    [Test]
+    public void Can_Import_Template_Package_Xml()
+    {
+        // Arrange
+        var strXml = ImportResources.StandardMvc_Package;
+        var xml = XElement.Parse(strXml);
+        var element = xml.Descendants("Templates").First();
+
+        var init = FileService.GetTemplates().Count();
+
+        // Act
+        var templates = PackageDataInstallation.ImportTemplates(element.Elements("Template").ToList(), 0);
+        var numberOfTemplates = (from doc in element.Elements("Template") select doc).Count();
+        var allTemplates = FileService.GetTemplates();
+
+        // Assert
+        Assert.That(templates, Is.Not.Null);
+        Assert.That(templates.Any(), Is.True);
+        Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
+
+        Assert.AreEqual(init + numberOfTemplates, allTemplates.Count());
+        Assert.IsTrue(allTemplates.All(x => x.Content.Contains("UmbracoViewPage")));
+    }
+
+    [Test]
+    public void Can_Import_Single_Template()
+    {
+        // Arrange
+        var strXml = ImportResources.StandardMvc_Package;
+        var xml = XElement.Parse(strXml);
+        var element = xml.Descendants("Templates").First();
+
+        // Act
+        var templates = PackageDataInstallation.ImportTemplate(element.Elements("Template").First(), 0);
+
+        // Assert
+        Assert.That(templates, Is.Not.Null);
+        Assert.That(templates.Any(), Is.True);
+        Assert.That(templates.Count(), Is.EqualTo(1));
+
+        var template = templates.First();
+        Assert.AreEqual(template.Name, "Articles");
+    }
+
+    [Test]
+    public void Can_Import_Single_Template_With_Key()
+    {
+        // Arrange
+        var strXml = ImportResources.StandardMvc_Package;
+        var xml = XElement.Parse(strXml);
+        var element = xml.Descendants("Templates").First();
+
+        var firstTemplateElement = element.Elements("Template").First();
+        var key = Guid.NewGuid();
+        firstTemplateElement.Add(new XElement("Key", key));
+
+        // Act
+        var templates = PackageDataInstallation.ImportTemplate(firstTemplateElement, 0);
+
+        // Assert
+        Assert.That(templates, Is.Not.Null);
+        Assert.That(templates.Any(), Is.True);
+        Assert.That(templates.Count(), Is.EqualTo(1));
+
+        var template = templates.First();
+        Assert.AreEqual(template.Name, "Articles");
+        Assert.AreEqual(template.Key, key);
+    }
+
+    [Test]
+    public void Can_Import_StandardMvc_ContentTypes_Package_Xml()
+    {
+        // Arrange
+        var strXml = ImportResources.StandardMvc_Package;
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var templateElement = xml.Descendants("Templates").First();
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var dataTypeDefinitions =
+            PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+        var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+        // Assert
+        Assert.That(dataTypeDefinitions, Is.Not.Null);
+        Assert.That(dataTypeDefinitions.Any(), Is.True);
+        Assert.That(templates.Any(), Is.True);
+        Assert.That(contentTypes, Is.Not.Null);
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+        Assert.That(contentTypes.Count(x => x.ParentId == -1), Is.EqualTo(1));
+
+        var contentMaster = contentTypes.First(x => x.Alias == "ContentMaster");
+        Assert.That(contentMaster.PropertyTypes.Count(), Is.EqualTo(3));
+        Assert.That(contentMaster.PropertyGroups.Count(), Is.EqualTo(1));
+        Assert.That(contentMaster.PropertyGroups["sEO"].PropertyTypes.Count(), Is.EqualTo(3));
+        Assert.That(contentMaster.ContentTypeCompositionExists("Base"), Is.True);
+
+        var propertyGroupId = contentMaster.PropertyGroups["sEO"].Id;
+        Assert.That(
+            contentMaster.PropertyGroups["sEO"].PropertyTypes.Any(x => x.PropertyGroupId.Value != propertyGroupId),
+            Is.False);
+    }
+
+    [Test]
+    public void Can_Import_StandardMvc_ContentTypes_And_Templates_Xml()
+    {
+        // Arrange
+        var strXml = ImportResources.StandardMvc_Package;
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var templateElement = xml.Descendants("Templates").First();
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var dataTypeDefinitions =
+            PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+        var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+        // Assert - Re-Import contenttypes doesn't throw
+        Assert.DoesNotThrow(() =>
+            PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0));
+        Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+        Assert.That(dataTypeDefinitions, Is.Not.Null);
+        Assert.That(dataTypeDefinitions.Any(), Is.True);
+        Assert.That(templates.Any(), Is.True);
+    }
+
+    [Test]
+    public void Can_Import_Fanoe_Starterkit_ContentTypes_And_Templates_Xml()
+    {
+        // Arrange
+        var strXml = ImportResources.Fanoe_Package;
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var templateElement = xml.Descendants("Templates").First();
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var dataTypeDefinitions =
+            PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+        var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+        // Assert - Re-Import contenttypes doesn't throw
+        Assert.DoesNotThrow(() =>
+            PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0));
+        Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+        Assert.That(dataTypeDefinitions, Is.Not.Null);
+        Assert.That(dataTypeDefinitions.Any(), Is.True);
+        Assert.That(templates.Any(), Is.True);
+    }
+
+    [Test]
+    public void Can_Import_Content_Package_Xml()
+    {
+        // Arrange
+        var strXml = ImportResources.StandardMvc_Package;
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var docTypesElement = xml.Descendants("DocumentTypes").First();
+        var element = xml.Descendants("DocumentSet").First();
+        var packageDocument = CompiledPackageContentBase.Create(element);
+
+        // Act
+        var dataTypeDefinitions =
+            PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypesElement.Elements("DocumentType"), 0);
+        var importedContentTypes = contentTypes.ToDictionary(x => x.Alias, x => x);
+        var contents = PackageDataInstallation.ImportContentBase(packageDocument.Yield(), importedContentTypes, 0, ContentTypeService, ContentService);
+        var numberOfDocs = (from doc in element.Descendants()
+                            where (string)doc.Attribute("isDoc") == string.Empty
+                            select doc).Count();
+
+        // Assert
+        Assert.That(contents, Is.Not.Null);
+        Assert.That(dataTypeDefinitions.Any(), Is.True);
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contents.Any(), Is.True);
+        Assert.That(contents.Count(), Is.EqualTo(numberOfDocs));
+    }
+
+    [Test]
+    public void Can_Import_Media_Package_Xml()
+    {
+        // Arrange
+        var strXml = ImportResources.MediaTypesAndMedia_Package_xml;
+        var xml = XElement.Parse(strXml);
+        var mediaTypesElement = xml.Descendants("MediaTypes").First();
+        var element = xml.Descendants("MediaSet").First();
+        var packageMedia = CompiledPackageContentBase.Create(element);
+
+        // Act
+        var mediaTypes = PackageDataInstallation.ImportMediaTypes(mediaTypesElement.Elements("MediaType"), 0);
+        var importedMediaTypes = mediaTypes.ToDictionary(x => x.Alias, x => x);
+        var medias = PackageDataInstallation.ImportContentBase(packageMedia.Yield(), importedMediaTypes, 0, MediaTypeService, MediaService);
+        var numberOfDocs = (from doc in element.Descendants()
+                            where (string)doc.Attribute("isDoc") == string.Empty
+                            select doc).Count();
+
+        // Assert
+        Assert.That(medias, Is.Not.Null);
+        Assert.That(mediaTypes.Any(), Is.True);
+        Assert.That(medias.Any(), Is.True);
+        Assert.That(medias.Count(), Is.EqualTo(numberOfDocs));
+    }
+
+    [Test]
+    public void Can_Import_CheckboxList_Content_Package_Xml_With_Property_Editor_Aliases()
+        => AssertCheckBoxListTests(ImportResources.CheckboxList_Content_Package);
+
+    private void AssertCheckBoxListTests(string strXml)
+    {
+        // Arrange
+        var xml = XElement.Parse(strXml);
+        var dataTypeElement = xml.Descendants("DataTypes").First();
+        var docTypesElement = xml.Descendants("DocumentTypes").First();
+        var element = xml.Descendants("DocumentSet").First();
+        var packageDocument = CompiledPackageContentBase.Create(element);
+
+        // Act
+        var dataTypeDefinitions =
+            PackageDataInstallation.ImportDataTypes(dataTypeElement.Elements("DataType").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypesElement.Elements("DocumentType"), 0);
+        var importedContentTypes = contentTypes.ToDictionary(x => x.Alias, x => x);
+        var contents = PackageDataInstallation.ImportContentBase(packageDocument.Yield(), importedContentTypes, 0, ContentTypeService, ContentService);
+        var numberOfDocs = (from doc in element.Descendants()
+                            where (string)doc.Attribute("isDoc") == string.Empty
+                            select doc).Count();
+
+        string configuration;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var dtos = ScopeAccessor.AmbientScope.Database.Fetch<DataTypeDto>("WHERE nodeId = @Id", new { dataTypeDefinitions.First().Id });
+            configuration = dtos.Single().Configuration;
+        }
+
+        // Assert
+        Assert.That(dataTypeDefinitions, Is.Not.Null);
+        Assert.That(dataTypeDefinitions.Any(), Is.True);
+        Assert.AreEqual(Constants.PropertyEditors.Aliases.CheckBoxList, dataTypeDefinitions.First().EditorAlias);
+        Assert.That(contents, Is.Not.Null);
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contents.Any(), Is.True);
+        Assert.That(contents.Count(), Is.EqualTo(numberOfDocs));
+        Assert.AreEqual(
+            "{\"items\":[{\"id\":59,\"value\":\"test\"},{\"id\":60,\"value\":\"test3\"},{\"id\":61,\"value\":\"test2\"}]}",
+            configuration);
+    }
+
+    [Test]
+    public void Can_Import_Templates_Package_Xml_With_Invalid_Master()
+    {
+        // Arrange
+        var strXml = ImportResources.XsltSearch_Package;
+        var xml = XElement.Parse(strXml);
+        var templateElement = xml.Descendants("Templates").First();
+
+        // Act
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var numberOfTemplates = (from doc in templateElement.Elements("Template") select doc).Count();
+
+        // Assert
+        Assert.That(templates.Any(), Is.True);
+        Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
+    }
+
+    [Test]
+    public void Can_Import_Single_DocType()
+    {
+        // Arrange
+        var strXml = ImportResources.SingleDocType;
+        var docTypeElement = XElement.Parse(strXml);
+
+        // Act
+        var contentTypes = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
+
+        // Assert
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contentTypes.Any(x => x.HasIdentity == false), Is.False);
+        Assert.That(contentTypes.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void Can_Export_Single_DocType()
+    {
+        // Arrange
+        var strXml = ImportResources.SingleDocType;
+        var docTypeElement = XElement.Parse(strXml);
+
+        var serializer = GetRequiredService<IEntityXmlSerializer>();
+
+        // Act
+        var contentTypes = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
+        var contentType = contentTypes.FirstOrDefault();
+        var element = serializer.Serialize(contentType);
+
+        // Assert
+        Assert.That(element, Is.Not.Null);
+        Assert.That(element.Element("Info"), Is.Not.Null);
+        Assert.That(element.Element("Structure"), Is.Not.Null);
+        Assert.That(element.Element("GenericProperties"), Is.Not.Null);
+        Assert.That(element.Element("Tabs"), Is.Not.Null);
+
+        // Can't compare this XElement because the templates are not imported (they don't exist)
+        //// Assert.That(XNode.DeepEquals(docTypeElement, element), Is.True);
+    }
+
+    [Test]
+    public void Can_ReImport_Single_DocType()
+    {
+        // Arrange
+        var strXml = ImportResources.SingleDocType;
+        var docTypeElement = XElement.Parse(strXml);
+
+        // Act
+        var contentTypes = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
+        var contentTypesUpdated = PackageDataInstallation.ImportDocumentType(docTypeElement, 0);
+
+        // Assert
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contentTypes.Any(x => x.HasIdentity == false), Is.False);
+        Assert.That(contentTypes.Count(), Is.EqualTo(1));
+        Assert.That(contentTypes.First().AllowedContentTypes.Count(), Is.EqualTo(1));
+
+        Assert.That(contentTypesUpdated.Any(), Is.True);
+        Assert.That(contentTypesUpdated.Any(x => x.HasIdentity == false), Is.False);
+        Assert.That(contentTypesUpdated.Count(), Is.EqualTo(1));
+        Assert.That(contentTypesUpdated.First().AllowedContentTypes.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void Can_ReImport_Templates_To_Update()
+    {
+        var newPackageXml = XElement.Parse(ImportResources.TemplateOnly_Package);
+        var updatedPackageXml = XElement.Parse(ImportResources.TemplateOnly_Updated_Package);
+
+        var templateElement = newPackageXml.Descendants("Templates").First();
+        var templateElementUpdated = updatedPackageXml.Descendants("Templates").First();
+
+        var fileService = FileService;
+
+        // kill default test data
+        fileService.DeleteTemplate("Textpage");
+
+        // Act
+        var numberOfTemplates = (from doc in templateElement.Elements("Template") select doc).Count();
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var templatesAfterUpdate =
+            PackageDataInstallation.ImportTemplates(templateElementUpdated.Elements("Template").ToList(), 0);
+        var allTemplates = fileService.GetTemplates();
+
+        // Assert
+        Assert.That(templates.Any(), Is.True);
+        Assert.That(templates.Count(), Is.EqualTo(numberOfTemplates));
+        Assert.That(templatesAfterUpdate.Count(), Is.EqualTo(numberOfTemplates));
+        Assert.That(allTemplates.Count(), Is.EqualTo(numberOfTemplates));
+        Assert.That(allTemplates.First(x => x.Alias == "umbHomepage").Content, Contains.Substring("THIS HAS BEEN UPDATED!"));
+    }
+
+    [Test]
+    public void Can_Import_DictionaryItems()
+    {
+        // Arrange
+        const string expectedEnglishParentValue = "ParentValue";
+        const string expectedNorwegianParentValue = "ForelderVerdi";
+        const string expectedEnglishChildValue = "ChildValue";
+        const string expectedNorwegianChildValue = "BarnVerdi";
+
+        var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
+        var dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
+
+        AddLanguages();
+
+        // Act
+        PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
+
+        // Assert
+        AssertDictionaryItem("Parent", expectedEnglishParentValue, "en-GB");
+        AssertDictionaryItem("Parent", expectedNorwegianParentValue, "nb-NO");
+        AssertDictionaryItem("Child", expectedEnglishChildValue, "en-GB");
+        AssertDictionaryItem("Child", expectedNorwegianChildValue, "nb-NO");
+    }
+
+    [Test]
+    public void Can_Import_Nested_DictionaryItems()
+    {
+        // Arrange
+        const string parentKey = "Parent";
+        const string childKey = "Child";
+
+        var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
+        var dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
+
+        AddLanguages();
+
+        // Act
+        var dictionaryItems =
+            PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
+
+        // Assert
+        Assert.That(LocalizationService.DictionaryItemExists(parentKey), "DictionaryItem parentKey does not exist");
+        Assert.That(LocalizationService.DictionaryItemExists(childKey), "DictionaryItem childKey does not exist");
+
+        var parentDictionaryItem = LocalizationService.GetDictionaryItemByKey(parentKey);
+        var childDictionaryItem = LocalizationService.GetDictionaryItemByKey(childKey);
+
+        Assert.That(parentDictionaryItem.ParentId, Is.Not.EqualTo(childDictionaryItem.ParentId));
+        Assert.That(childDictionaryItem.ParentId, Is.EqualTo(parentDictionaryItem.Key));
+    }
+
+    [Test]
+    public void WhenExistingDictionaryKey_ImportsNewChildren()
+    {
+        // Arrange
+        const string expectedEnglishParentValue = "ExistingParentValue";
+        const string expectedNorwegianParentValue = "EksisterendeForelderVerdi";
+        const string expectedEnglishChildValue = "ChildValue";
+        const string expectedNorwegianChildValue = "BarnVerdi";
+
+        var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
+        var dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
+
+        AddLanguages();
+        AddExistingEnglishAndNorwegianParentDictionaryItem(expectedEnglishParentValue, expectedNorwegianParentValue);
+
+        // Act
+        PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
+
+        // Assert
+        AssertDictionaryItem("Parent", expectedEnglishParentValue, "en-GB");
+        AssertDictionaryItem("Parent", expectedNorwegianParentValue, "nb-NO");
+        AssertDictionaryItem("Child", expectedEnglishChildValue, "en-GB");
+        AssertDictionaryItem("Child", expectedNorwegianChildValue, "nb-NO");
+    }
+
+    [Test]
+    public void WhenExistingDictionaryKey_OnlyAddsNewLanguages()
+    {
+        // Arrange
+        const string expectedEnglishParentValue = "ExistingParentValue";
+        const string expectedNorwegianParentValue = "ForelderVerdi";
+        const string expectedEnglishChildValue = "ChildValue";
+        const string expectedNorwegianChildValue = "BarnVerdi";
+
+        var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
+        var dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
+
+        AddLanguages();
+        AddExistingEnglishParentDictionaryItem(expectedEnglishParentValue);
+
+        // Act
+        PackageDataInstallation.ImportDictionaryItems(dictionaryItemsElement.Elements("DictionaryItem"), 0);
+
+        // Assert
+        AssertDictionaryItem("Parent", expectedEnglishParentValue, "en-GB");
+        AssertDictionaryItem("Parent", expectedNorwegianParentValue, "nb-NO");
+        AssertDictionaryItem("Child", expectedEnglishChildValue, "en-GB");
+        AssertDictionaryItem("Child", expectedNorwegianChildValue, "nb-NO");
+    }
+
+    [Test]
+    public void Can_Import_Languages()
+    {
+        // Arrange
+        var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
+        var languageItemsElement = newPackageXml.Elements("Languages").First();
+
+        // Act
+        var languages = PackageDataInstallation.ImportLanguages(languageItemsElement.Elements("Language"), 0);
+        var allLanguages = LocalizationService.GetAllLanguages();
+
+        // Assert
+        Assert.That(languages.Any(x => x.HasIdentity == false), Is.False);
+        foreach (var language in languages)
+        {
+            Assert.That(allLanguages.Any(x => x.IsoCode == language.IsoCode), Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Import_Macros()
+    {
+        // Arrange
+        var strXml = ImportResources.uBlogsy_Package;
+        var xml = XElement.Parse(strXml);
+        var macrosElement = xml.Descendants("Macros").First();
+
+        // Act
+        var macros = PackageDataInstallation.ImportMacros(
+            macrosElement.Elements("macro"),
+            0).ToList();
+
+        // Assert
+        Assert.That(macros.Any(), Is.True);
+
+        var allMacros = MacroService.GetAll().ToList();
+        foreach (var macro in macros)
+        {
+            Assert.That(allMacros.Any(x => x.Alias == macro.Alias), Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Import_Macros_With_Properties()
+    {
+        // Arrange
+        var strXml = ImportResources.XsltSearch_Package;
+        var xml = XElement.Parse(strXml);
+        var macrosElement = xml.Descendants("Macros").First();
+
+        // Act
+        var macros = PackageDataInstallation.ImportMacros(
+            macrosElement.Elements("macro"),
+            0).ToList();
+
+        // Assert
+        Assert.That(macros.Any(), Is.True);
+        Assert.That(macros.First().Properties.Values.Any(), Is.True);
+
+        var allMacros = MacroService.GetAll().ToList();
+        foreach (var macro in macros)
+        {
+            Assert.That(allMacros.Any(x => x.Alias == macro.Alias), Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Import_Package_With_Compositions()
+    {
+        // Arrange
+        var strXml = ImportResources.CompositionsTestPackage;
+        var xml = XElement.Parse(strXml);
+        var templateElement = xml.Descendants("Templates").First();
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var templates = PackageDataInstallation.ImportTemplates(templateElement.Elements("Template").ToList(), 0);
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+        var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+        // Assert
+        Assert.That(contentTypes, Is.Not.Null);
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+        Assert.That(contentTypes.Count(x => x.ParentId == -1), Is.EqualTo(3));
+
+        var textpage = contentTypes.First(x => x.Alias.Equals("umbTextyPage"));
+        Assert.That(textpage.ParentId, Is.Not.EqualTo(-1));
+        Assert.That(textpage.ContentTypeComposition.Count(), Is.EqualTo(3));
+        Assert.That(textpage.ContentTypeCompositionExists("umbMaster"), Is.True);
+        Assert.That(textpage.ContentTypeCompositionExists("Meta"), Is.True);
+        Assert.That(textpage.ContentTypeCompositionExists("Seo"), Is.True);
+    }
+
+    [Test]
+    public void Can_Import_Package_With_Compositions_Ordered()
+    {
+        // Arrange
+        var strXml = ImportResources.CompositionsTestPackage_Random;
+        var xml = XElement.Parse(strXml);
+        var docTypeElement = xml.Descendants("DocumentTypes").First();
+
+        // Act
+        var contentTypes = PackageDataInstallation.ImportDocumentTypes(docTypeElement.Elements("DocumentType"), 0);
+        var numberOfDocTypes = (from doc in docTypeElement.Elements("DocumentType") select doc).Count();
+
+        // Assert
+        Assert.That(contentTypes, Is.Not.Null);
+        Assert.That(contentTypes.Any(), Is.True);
+        Assert.That(contentTypes.Count(), Is.EqualTo(numberOfDocTypes));
+
+        var testContentType = contentTypes.First(x => x.Alias.Equals("CompositeTest"));
+        Assert.That(testContentType.ContentTypeComposition.Count(), Is.EqualTo(3));
+        Assert.That(testContentType.ContentTypeCompositionExists("Content"), Is.True);
+        Assert.That(testContentType.ContentTypeCompositionExists("Meta"), Is.True);
+        Assert.That(testContentType.ContentTypeCompositionExists("Seo"), Is.True);
+    }
+
+    [Test]
+    public void ImportDocumentType_NewTypeWithOmittedHistoryCleanupPolicy_InsertsDefaultPolicy()
+    {
+        // Arrange
+        var withoutCleanupPolicy = XElement.Parse(ImportResources.SingleDocType);
+
+        // Act
+        var contentTypes = PackageDataInstallation
+            .ImportDocumentType(withoutCleanupPolicy, 0)
+            .OfType<IContentTypeWithHistoryCleanup>();
+
+        // Assert
+        Assert.Multiple(() =>
+        {
+            Assert.NotNull(contentTypes.Single().HistoryCleanup);
+            Assert.IsFalse(contentTypes.Single().HistoryCleanup.PreventCleanup);
+        });
+    }
+
+    [Test]
+    public void ImportDocumentType_WithHistoryCleanupPolicyElement_ImportsWithCorrectValues()
+    {
+        // Arrange
+        var docTypeElement = XElement.Parse(ImportResources.SingleDocType_WithCleanupPolicy);
+
+        // Act
+        var contentTypes = PackageDataInstallation
+            .ImportDocumentType(docTypeElement, 0)
+            .OfType<IContentTypeWithHistoryCleanup>();
+
+        // Assert
+        Assert.Multiple(() =>
+        {
+            Assert.NotNull(contentTypes.Single().HistoryCleanup);
+            Assert.IsTrue(contentTypes.Single().HistoryCleanup.PreventCleanup);
+            Assert.AreEqual(1, contentTypes.Single().HistoryCleanup.KeepAllVersionsNewerThanDays);
+            Assert.AreEqual(2, contentTypes.Single().HistoryCleanup.KeepLatestVersionPerDayForDays);
+        });
+    }
+
+    [Test]
+    public void ImportDocumentType_ExistingTypeWithOmittedHistoryCleanupPolicy_DoesNotOverwriteDatabaseContent()
+    {
+        // Arrange
+        var withoutCleanupPolicy = XElement.Parse(ImportResources.SingleDocType);
+        var withCleanupPolicy = XElement.Parse(ImportResources.SingleDocType_WithCleanupPolicy);
+
+        // Act
+        var contentTypes = PackageDataInstallation
+            .ImportDocumentType(withCleanupPolicy, 0)
+            .OfType<IContentTypeWithHistoryCleanup>();
+
+        var contentTypesUpdated = PackageDataInstallation
+            .ImportDocumentType(withoutCleanupPolicy, 0)
+            .OfType<IContentTypeWithHistoryCleanup>();
+
+        // Assert
+        Assert.Multiple(() =>
+        {
+            Assert.NotNull(contentTypes.Single().HistoryCleanup);
+            Assert.IsTrue(contentTypes.Single().HistoryCleanup.PreventCleanup);
+            Assert.AreEqual(1, contentTypes.Single().HistoryCleanup.KeepAllVersionsNewerThanDays);
+            Assert.AreEqual(2, contentTypes.Single().HistoryCleanup.KeepLatestVersionPerDayForDays);
+
+            Assert.NotNull(contentTypesUpdated.Single().HistoryCleanup);
+            Assert.IsTrue(contentTypesUpdated.Single().HistoryCleanup.PreventCleanup);
+            Assert.AreEqual(1, contentTypes.Single().HistoryCleanup.KeepAllVersionsNewerThanDays);
+            Assert.AreEqual(2, contentTypes.Single().HistoryCleanup.KeepLatestVersionPerDayForDays);
+        });
+    }
+
+    private void AddLanguages()
+    {
+        var norwegian = new Language("nb-NO", "Norwegian Bokmål (Norway)");
+        var english = new Language("en-GB", "English (United Kingdom)");
+        LocalizationService.Save(norwegian, 0);
+        LocalizationService.Save(english, 0);
+    }
+
+    private void AssertDictionaryItem(string dictionaryItemName, string expectedValue, string cultureCode)
+    {
+        Assert.That(LocalizationService.DictionaryItemExists(dictionaryItemName), "DictionaryItem key does not exist");
+        var dictionaryItem = LocalizationService.GetDictionaryItemByKey(dictionaryItemName);
+        var translation = dictionaryItem.Translations.SingleOrDefault(i => i.Language.IsoCode == cultureCode);
+        Assert.IsNotNull(translation, "Translation to {0} was not added", cultureCode);
+        var value = translation.Value;
+        Assert.That(value, Is.EqualTo(expectedValue), "Translation value was not set");
+    }
+
+    private void AddExistingEnglishParentDictionaryItem(string expectedEnglishParentValue)
+    {
+        var languages = LocalizationService.GetAllLanguages().ToList();
+        var englishLanguage = languages.Single(l => l.IsoCode == "en-GB");
+        LocalizationService.Save(
+            new DictionaryItem("Parent")
+            {
+                // This matches what is in the package.xml file
+                Key = new Guid("28f2e02a-8c66-4fcd-85e3-8524d551c0d3"),
+                Translations = new List<IDictionaryTranslation>
+                {
+                    new DictionaryTranslation(englishLanguage, expectedEnglishParentValue)
+                }
+            });
+    }
+
+    private void AddExistingEnglishAndNorwegianParentDictionaryItem(string expectedEnglishParentValue, string expectedNorwegianParentValue)
+    {
+        var languages = LocalizationService.GetAllLanguages().ToList();
+        var englishLanguage = languages.Single(l => l.IsoCode == "en-GB");
+        var norwegianLanguage = languages.Single(l => l.IsoCode == "nb-NO");
+        LocalizationService.Save(
+            new DictionaryItem("Parent")
+            {
+                // This matches what is in the package.xml file
+                Key = new Guid("28f2e02a-8c66-4fcd-85e3-8524d551c0d3"),
+                Translations = new List<IDictionaryTranslation>
+                {
+                    new DictionaryTranslation(englishLanguage, expectedEnglishParentValue),
+                    new DictionaryTranslation(norwegianLanguage, expectedNorwegianParentValue)
+                }
+            });
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs
index ee19cd081c..10df853cef 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Packaging/PackageInstallationTest.cs
@@ -7,97 +7,96 @@ using System.Linq;
 using System.Xml.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.Models.Packaging;
 using Umbraco.Cms.Core.Packaging;
 using Umbraco.Cms.Infrastructure.Packaging;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Packaging;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
+public class PackageInstallationTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
-    public class PackageInstallationTest : UmbracoIntegrationTest
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+
+    private PackageInstallation PackageInstallation => (PackageInstallation)GetRequiredService<IPackageInstallation>();
+
+    private const string DocumentTypePickerPackage = "Document_Type_Picker_1.1.package.xml";
+    private const string HelloPackage = "Hello_1.0.0.package.xml";
+
+    [Test]
+    public void Can_Read_Compiled_Package_1()
     {
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
-
-        private PackageInstallation PackageInstallation => (PackageInstallation)GetRequiredService<IPackageInstallation>();
-
-        private const string DocumentTypePickerPackage = "Document_Type_Picker_1.1.package.xml";
-        private const string HelloPackage = "Hello_1.0.0.package.xml";
-
-        [Test]
-        public void Can_Read_Compiled_Package_1()
+        var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage));
+        using var fileStream = testPackageFile.OpenRead();
+        var package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
+        Assert.Multiple(() =>
         {
-            var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage));
-            using var fileStream = testPackageFile.OpenRead();
-            CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(package);
-                Assert.AreEqual("Document Type Picker", package.Name);
-                Assert.AreEqual(1, package.DataTypes.Count());
-            });
-        }
+            Assert.IsNotNull(package);
+            Assert.AreEqual("Document Type Picker", package.Name);
+            Assert.AreEqual(1, package.DataTypes.Count());
+        });
+    }
 
-        [Test]
-        public void Can_Read_Compiled_Package_2()
+    [Test]
+    public void Can_Read_Compiled_Package_2()
+    {
+        var testPackageFile =
+            new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), HelloPackage));
+        using var fileStream = testPackageFile.OpenRead();
+        var package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
+        Assert.Multiple(() =>
         {
-            var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), HelloPackage));
-            using var fileStream = testPackageFile.OpenRead();
-            CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(package);
-                Assert.AreEqual("Hello", package.Name);
-                Assert.AreEqual(1, package.Documents.Count());
-                Assert.AreEqual(1, package.DocumentTypes.Count());
-                Assert.AreEqual(1, package.Templates.Count());
-                Assert.AreEqual(1, package.DataTypes.Count());
-            });
-        }
+            Assert.IsNotNull(package);
+            Assert.AreEqual("Hello", package.Name);
+            Assert.AreEqual(1, package.Documents.Count());
+            Assert.AreEqual(1, package.DocumentTypes.Count());
+            Assert.AreEqual(1, package.Templates.Count());
+            Assert.AreEqual(1, package.DataTypes.Count());
+        });
+    }
 
-        [Test]
-        public void Can_Read_Compiled_Package_Warnings()
+    [Test]
+    public void Can_Read_Compiled_Package_Warnings()
+    {
+        // Copy a file to the same path that the package will install so we can detect file conflicts.
+        var filePath = Path.Combine(HostingEnvironment.MapPathContentRoot("~/"), "bin", "Auros.DocumentTypePicker.dll");
+        Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+        File.WriteAllText(filePath, "test");
+
+        // this is where our test zip file is
+        var packageFile = Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage);
+        Console.WriteLine(packageFile);
+
+        using var fileStream = File.OpenRead(packageFile);
+        var package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
+        var preInstallWarnings = package.Warnings;
+        var dataType = package.DataTypes.First();
+        Assert.Multiple(() =>
         {
-            // Copy a file to the same path that the package will install so we can detect file conflicts.
-            string filePath = Path.Combine(HostingEnvironment.MapPathContentRoot("~/"), "bin", "Auros.DocumentTypePicker.dll");
-            Directory.CreateDirectory(Path.GetDirectoryName(filePath));
-            File.WriteAllText(filePath, "test");
+            Assert.AreEqual("Document Type Picker", package.Name);
+            Assert.AreEqual("3593d8e7-8b35-47b9-beda-5e830ca8c93c", dataType.LastAttribute?.Value);
+            Assert.AreEqual("Document Type Picker", dataType.FirstAttribute?.Value);
+            Assert.IsNotNull(preInstallWarnings);
+            Assert.AreEqual(0, preInstallWarnings.ConflictingMacros.Count());
+            Assert.AreEqual(0, preInstallWarnings.ConflictingStylesheets.Count());
+            Assert.AreEqual(0, preInstallWarnings.ConflictingTemplates.Count());
+        });
+    }
 
-            // this is where our test zip file is
-            string packageFile = Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage);
-            Console.WriteLine(packageFile);
+    [Test]
+    public void Install_Data()
+    {
+        var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage));
+        using var fileStream = testPackageFile.OpenRead();
+        var package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
 
-            using var fileStream = File.OpenRead(packageFile);
-            CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
-            InstallWarnings preInstallWarnings = package.Warnings;
-            var dataType = package.DataTypes.First();
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual("Document Type Picker", package.Name);
-                Assert.AreEqual("3593d8e7-8b35-47b9-beda-5e830ca8c93c", dataType.LastAttribute?.Value);
-                Assert.AreEqual("Document Type Picker", dataType.FirstAttribute?.Value);
-                Assert.IsNotNull(preInstallWarnings);
-                Assert.AreEqual(0, preInstallWarnings.ConflictingMacros.Count());
-                Assert.AreEqual(0, preInstallWarnings.ConflictingStylesheets.Count());
-                Assert.AreEqual(0, preInstallWarnings.ConflictingTemplates.Count());
-            });
-        }
+        var summary = PackageInstallation.InstallPackageData(package, -1, out var def);
 
-        [Test]
-        public void Install_Data()
-        {
-            var testPackageFile = new FileInfo(Path.Combine(HostingEnvironment.MapPathContentRoot("~/TestData/Packages"), DocumentTypePickerPackage));
-            using var fileStream = testPackageFile.OpenRead();
-            CompiledPackage package = PackageInstallation.ReadPackage(XDocument.Load(fileStream));
+        Assert.AreEqual(1, summary.DataTypesInstalled.Count());
 
-            InstallationSummary summary = PackageInstallation.InstallPackageData(package, -1, out PackageDefinition def);
-
-            Assert.AreEqual(1, summary.DataTypesInstalled.Count());
-
-            // make sure the def is updated too
-            Assert.AreEqual(summary.DataTypesInstalled.Count(), def.DataTypes.Count);
-        }
+        // make sure the def is updated too
+        Assert.AreEqual(summary.DataTypesInstalled.Count(), def.DataTypes.Count);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
index f26dd22194..393f28668e 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/LocksTests.cs
@@ -16,610 +16,615 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence;
+
+[TestFixture]
+[Timeout(60000)]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
+public class LocksTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [Timeout(60000)]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
-    public class LocksTests : UmbracoIntegrationTest
+    [SetUp]
+    protected void SetUp()
     {
-        protected override void ConfigureTestServices(IServiceCollection services)
+        // create a few lock objects
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // SQLite + retry policy makes tests fail, we retry before throwing distributed locking timeout.
-            services.RemoveAll(x => x.ImplementationType == typeof(SqliteAddRetryPolicyInterceptor));
-        }
-
-        [SetUp]
-        protected void SetUp()
-        {
-
-            // create a few lock objects
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                var database = ScopeAccessor.AmbientScope.Database;
-                database.Insert("umbracoLock", "id", false, new LockDto { Id = 1, Name = "Lock.1" });
-                database.Insert("umbracoLock", "id", false, new LockDto { Id = 2, Name = "Lock.2" });
-                database.Insert("umbracoLock", "id", false, new LockDto { Id = 3, Name = "Lock.3" });
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void SingleReadLockTest()
-        {
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                scope.EagerReadLock(Constants.Locks.Servers);
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void ConcurrentReadersTest()
-        {
-
-            const int threadCount = 8;
-            var threads = new Thread[threadCount];
-            var exceptions = new Exception[threadCount];
-            var locker = new object();
-            var acquired = 0;
-            var m2 = new ManualResetEventSlim(false);
-            var m1 = new ManualResetEventSlim(false);
-
-            for (var i = 0; i < threadCount; i++)
-            {
-                var ic = i; // capture
-                threads[i] = new Thread(() =>
-                {
-                    using (var scope = ScopeProvider.CreateScope())
-                    {
-                        try
-                        {
-                            scope.EagerReadLock(Constants.Locks.Servers);
-                            lock (locker)
-                            {
-                                acquired++;
-                                if (acquired == threadCount) m2.Set();
-                            }
-                            m1.Wait();
-                            lock (locker)
-                            {
-                                acquired--;
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            exceptions[ic] = e;
-                        }
-                        scope.Complete();
-                    }
-                });
-            }
-
-            // ensure that current scope does not leak into starting threads
-            using (ExecutionContext.SuppressFlow())
-            {
-                foreach (var thread in threads)
-                {
-                    thread.Start();
-                }
-            }
-
-            m2.Wait();
-            // all threads have locked in parallel
-            var maxAcquired = acquired;
-            m1.Set();
-
-            foreach (var thread in threads)
-            {
-                thread.Join();
-            }
-
-            Assert.AreEqual(threadCount, maxAcquired);
-            Assert.AreEqual(0, acquired);
-
-            for (var i = 0; i < threadCount; i++)
-            {
-                Assert.IsNull(exceptions[i]);
-            }
-        }
-
-        [Test]
-        public void GivenNonEagerLocking_WhenNoDbIsAccessed_ThenNoSqlIsExecuted()
-        {
-            var sqlCount = 0;
-
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                var db = ScopeAccessor.AmbientScope.Database;
-                try
-                {
-                    db.EnableSqlCount = true;
-
-                    // Issue a lock request, but we are using non-eager
-                    // locks so this only queues the request.
-                    // The lock will not be issued unless we resolve
-                    // scope.Database
-                    scope.WriteLock(Constants.Locks.Servers);
-
-                    sqlCount = db.SqlCount;
-                }
-                finally
-                {
-                    db.EnableSqlCount = false;
-                }
-            }
-
-            Assert.AreEqual(0, sqlCount);
-        }
-
-        [Test]
-        public void ConcurrentWritersTest()
-        {
-
-            const int threadCount = 8;
-            var threads = new Thread[threadCount];
-            var exceptions = new Exception[threadCount];
-            var locker = new object();
-            var acquired = 0;
-            var entered = 0;
-            var ms = new AutoResetEvent[threadCount];
-            for (var i = 0; i < threadCount; i++)
-            {
-                ms[i] = new AutoResetEvent(false);
-            }
-
-            var m1 = new ManualResetEventSlim(false);
-
-            for (var i = 0; i < threadCount; i++)
-            {
-                var ic = i; // capture
-                threads[i] = new Thread(() =>
-                {
-                    using (var scope = ScopeProvider.CreateScope())
-                    {
-                        try
-                        {
-                            lock (locker)
-                            {
-                                entered++;
-                                if (entered == threadCount) m1.Set();
-                            }
-                            ms[ic].WaitOne();
-                            scope.EagerWriteLock(Constants.Locks.Servers);
-                            lock (locker)
-                            {
-                                acquired++;
-                            }
-                            ms[ic].WaitOne();
-                            lock (locker)
-                            {
-                                acquired--;
-                            }
-                        }
-                        catch (Exception e)
-                        {
-                            exceptions[ic] = e;
-                        }
-                        scope.Complete();
-                    }
-                });
-            }
-
-            // ensure that current scope does not leak into starting threads
-            using (ExecutionContext.SuppressFlow())
-            {
-                foreach (var thread in threads)
-                {
-                    thread.Start();
-                }
-            }
-
-            m1.Wait();
-            // all threads have entered
-            ms[0].Set(); // let 0 go
-            // TODO: This timing is flaky
-            Thread.Sleep(100);
-            for (var i = 1; i < threadCount; i++)
-            {
-                ms[i].Set(); // let others go
-            }
-
-            // TODO: This timing is flaky
-            Thread.Sleep(500);
-            // only 1 thread has locked
-            Assert.AreEqual(1, acquired);
-            for (var i = 0; i < threadCount; i++)
-            {
-                ms[i].Set(); // let all go
-            }
-
-            foreach (var thread in threads)
-            {
-                thread.Join();
-            }
-
-            Assert.AreEqual(0, acquired);
-
-            for (var i = 0; i < threadCount; i++)
-            {
-                Assert.IsNull(exceptions[i]);
-            }
-        }
-
-        [Retry(10)] // TODO make this test non-flaky.
-        [Test]
-        public void DeadLockTest()
-        {
-            if (BaseTestDatabase.IsSqlite())
-            {
-                Assert.Ignore("This test doesn't work with Microsoft.Data.Sqlite - SELECT * FROM sys.dm_tran_locks;");
-                return;
-            }
-
-            Exception e1 = null, e2 = null;
-            AutoResetEvent ev1 = new AutoResetEvent(false), ev2 = new AutoResetEvent(false);
-
-            // testing:
-            // two threads will each obtain exclusive write locks over two
-            // identical lock objects deadlock each other
-
-            var thread1 = new Thread(() => DeadLockTestThread(1, 2, ev1, ev2, ref e1));
-            var thread2 = new Thread(() => DeadLockTestThread(2, 1, ev2, ev1, ref e2));
-
-            // ensure that current scope does not leak into starting threads
-            using (ExecutionContext.SuppressFlow())
-            {
-                thread1.Start();
-                thread2.Start();
-            }
-
-            ev2.Set();
-
-            thread1.Join();
-            thread2.Join();
-
-            //Assert.IsNotNull(e1);
-            if (e1 != null)
-            {
-                AssertIsDistributedLockingTimeoutException(e1);
-            }
-
-            // the assertion below depends on timing conditions - on a fast enough environment,
-            // thread1 dies (deadlock) and frees thread2, which succeeds - however on a slow
-            // environment (CI) both threads can end up dying due to deadlock - so, cannot test
-            // that e2 is null - but if it's not, can test that it's a timeout
-            //
-            //Assert.IsNull(e2);
-            if (e2 != null)
-            {
-                AssertIsDistributedLockingTimeoutException(e2);
-            }
-
-        }
-
-        private void AssertIsDistributedLockingTimeoutException(Exception e)
-        {
-            var sqlException = e as DistributedLockingTimeoutException;
-            Assert.IsNotNull(sqlException);
-        }
-
-        private void DeadLockTestThread(int id1, int id2, EventWaitHandle myEv, WaitHandle otherEv, ref Exception exception)
-        {
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                try
-                {
-                    otherEv.WaitOne();
-                    Console.WriteLine($"[{id1}] WAIT {id1}");
-                    scope.EagerWriteLock(id1);
-                    Console.WriteLine($"[{id1}] GRANT {id1}");
-                    WriteLocks(ScopeAccessor.AmbientScope.Database);
-                    myEv.Set();
-
-                    if (id1 == 1)
-                    {
-                        otherEv.WaitOne();
-                    }
-                    else
-                    {
-                        Thread.Sleep(5200); // wait for deadlock...
-                    }
-
-                    Console.WriteLine($"[{id1}] WAIT {id2}");
-                    scope.EagerWriteLock(id2);
-                    Console.WriteLine($"[{id1}] GRANT {id2}");
-                    WriteLocks(ScopeAccessor.AmbientScope.Database);
-                }
-                catch (Exception e)
-                {
-                    exception = e;
-                }
-                finally
-                {
-                    scope.Complete();
-                }
-            }
-        }
-
-        [Test]
-        public void NoDeadLockTest()
-        {
-            if (BaseTestDatabase.IsSqlite())
-            {
-                Assert.Ignore("This test doesn't work with Microsoft.Data.Sqlite - SELECT * FROM sys.dm_tran_locks;");
-                return;
-            }
-
-
-            Exception e1 = null, e2 = null;
-            AutoResetEvent ev1 = new AutoResetEvent(false), ev2 = new AutoResetEvent(false);
-
-            // testing:
-            // two threads will each obtain exclusive write lock over two
-            // different lock objects without blocking each other
-
-            var thread1 = new Thread(() => NoDeadLockTestThread(1, ev1, ev2, ref e1));
-            var thread2 = new Thread(() => NoDeadLockTestThread(2, ev2, ev1, ref e1));
-
-            // ensure that current scope does not leak into starting threads
-            using (ExecutionContext.SuppressFlow())
-            {
-                thread1.Start();
-                thread2.Start();
-            }
-
-            ev2.Set();
-
-            thread1.Join();
-            thread2.Join();
-
-            Assert.IsNull(e1);
-            Assert.IsNull(e2);
-        }
-
-        [Test]
-        public void Throws_When_Lock_Timeout_Is_Exceeded_Read()
-        {
-            if (BaseTestDatabase.IsSqlite())
-            {
-                // Reader reads snapshot, isolated from the writer.
-                Assert.Ignore("Doesn't apply to SQLite with journal_mode=wal");
-            }
-
-            using (ExecutionContext.SuppressFlow())
-            {
-                var t1 = Task.Run(() =>
-                {
-                    using (var scope = ScopeProvider.CreateScope())
-                    {
-                        Console.WriteLine("Write lock A");
-                        // This will acquire right away
-                        scope.EagerWriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
-                        Thread.Sleep(6000); // Wait longer than the Read Lock B timeout
-                        scope.Complete();
-                        Console.WriteLine("Finished Write lock A");
-                    }
-                });
-
-                Thread.Sleep(500); // 100% sure task 1 starts first
-
-                var t2 = Task.Run(() =>
-                {
-                    using (var scope = ScopeProvider.CreateScope())
-                    {
-                        Console.WriteLine("Read lock B");
-
-                        // This will wait for the write lock to release but it isn't going to wait long
-                        // enough so an exception will be thrown.
-                        Assert.Throws<DistributedReadLockTimeoutException>(() =>
-                            scope.EagerReadLock(TimeSpan.FromMilliseconds(3000), Constants.Locks.ContentTree));
-                        scope.Complete();
-                        Console.WriteLine("Finished Read lock B");
-                    }
-                });
-
-                Task.WaitAll(t1, t2);
-            }
-        }
-
-        [Test]
-        public void Throws_When_Lock_Timeout_Is_Exceeded_Write()
-        {
-            var counter = 0;
-            var gate = new ManualResetEventSlim(false);
-            var logger = GetRequiredService<ILogger<LocksTests>>();
-
-            using (ExecutionContext.SuppressFlow())
-            {
-                var t1 = Task.Run(() =>
-                {
-                    using var scope = ScopeProvider.CreateScope();
-
-                    _ = scope.Database; // Begin transaction
-                    Interlocked.Increment(ref counter);
-                    gate.Wait();
-
-                    logger.LogInformation("t1 - Attempting to acquire write lock");
-                    Assert.DoesNotThrow(() =>
-                    {
-                        // ReSharper disable once AccessToDisposedClosure
-                        // This will acquire right away
-                        scope.EagerWriteLock(TimeSpan.FromMilliseconds(1000), Constants.Locks.ContentTree);
-                    });
-
-                    logger.LogInformation("t1 - Acquired write lock, sleeping");
-                    Thread.Sleep(1500); // Wait longer than the Read Lock B timeout
-
-                    scope.Complete();
-                    logger.LogInformation("t1 -  Complete transaction");
-                });
-
-                var t2 = Task.Run(() =>
-                {
-                    using var scope = ScopeProvider.CreateScope();
-
-                    _ = scope.Database; // Begin transaction
-                    Interlocked.Increment(ref counter);
-                    gate.Wait();
-                    Thread.Sleep(100); // Let other transaction obtain write lock first.
-
-                    logger.LogInformation("t2 - Attempting to acquire write lock");
-                    var ex = Assert.Throws<DistributedWriteLockTimeoutException>(() =>
-                    {
-                        // ReSharper disable once AccessToDisposedClosure
-                        scope.EagerWriteLock(TimeSpan.FromMilliseconds(1000), Constants.Locks.ContentTree);
-                        logger.LogInformation("t2 - Acquired write lock, something has gone wrong.");
-                    });
-
-                    if (ex != null)
-                    {
-                        logger.LogInformation("t2 - Failed to acquire write lock in time, all is well.");
-                    }
-
-                    scope.Complete();
-                });
-
-                while (counter < 2)
-                {
-                    Thread.Sleep(10);
-                }
-
-                gate.Set();
-                Task.WaitAll(t1, t2);
-            }
-        }
-
-        [Test]
-        public void Read_Lock_Waits_For_Write_Lock()
-        {
-            if (BaseTestDatabase.IsSqlite())
-            {
-                // Reader reads snapshot, isolated from the writer.
-                Assert.Ignore("Doesn't apply to SQLite with journal_mode=wal");
-            }
-
-            var locksCompleted = 0;
-
-            using (ExecutionContext.SuppressFlow())
-            {
-                var t1 = Task.Run(() =>
-                {
-                    using (var scope = ScopeProvider.CreateScope())
-                    {
-                        Console.WriteLine("Write lock A");
-                        // This will acquire right away
-                        scope.EagerWriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
-                        Thread.Sleep(4000); // Wait less than the Read Lock B timeout
-                        scope.Complete();
-                        Interlocked.Increment(ref locksCompleted);
-                        Console.WriteLine("Finished Write lock A");
-                    }
-                });
-
-                Thread.Sleep(500); // 100% sure task 1 starts first
-
-                var t2 = Task.Run(() =>
-                {
-                    using (var scope = ScopeProvider.CreateScope())
-                    {
-                        Console.WriteLine("Read lock B");
-
-                        // This will wait for the write lock to release
-                        Assert.DoesNotThrow(() =>
-                            scope.EagerReadLock(TimeSpan.FromMilliseconds(6000), Constants.Locks.ContentTree));
-
-                        Assert.GreaterOrEqual(locksCompleted, 1);
-
-                        scope.Complete();
-                        Interlocked.Increment(ref locksCompleted);
-                        Console.WriteLine("Finished Read lock B");
-                    }
-                });
-
-
-                var t3 = Task.Run(() =>
-                {
-                    using (var scope = ScopeProvider.CreateScope())
-                    {
-                        Console.WriteLine("Read lock C");
-
-                        // This will wait for the write lock to release
-                        Assert.DoesNotThrow(() =>
-                            scope.EagerReadLock(TimeSpan.FromMilliseconds(6000), Constants.Locks.ContentTree));
-
-                        Assert.GreaterOrEqual(locksCompleted, 1);
-
-                        scope.Complete();
-                        Interlocked.Increment(ref locksCompleted);
-                        Console.WriteLine("Finished Read lock C");
-                    }
-                });
-
-                Task.WaitAll(t1, t2, t3);
-            }
-
-            Assert.AreEqual(3, locksCompleted);
-        }
-
-        [Test]
-        public void Lock_Exceeds_Command_Timeout()
-        {
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                var realDb = (Database)ScopeAccessor.AmbientScope.Database;
-                realDb.CommandTimeout = 1000;
-
-                Console.WriteLine("Write lock A");
-                // TODO: In theory this would throw
-                scope.EagerWriteLock(TimeSpan.FromMilliseconds(3000), Constants.Locks.ContentTree);
-                scope.Complete();
-                Console.WriteLine("Finished Write lock A");
-            }
-        }
-
-
-        private void NoDeadLockTestThread(int id, EventWaitHandle myEv, WaitHandle otherEv, ref Exception exception)
-        {
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                try
-                {
-                    otherEv.WaitOne();
-                    Console.WriteLine($"[{id}] WAIT {id}");
-                    scope.EagerWriteLock(id);
-                    Console.WriteLine($"[{id}] GRANT {id}");
-                    WriteLocks(ScopeAccessor.AmbientScope.Database);
-                    myEv.Set();
-                    otherEv.WaitOne();
-                }
-                catch (Exception e)
-                {
-                    exception = e;
-                }
-                finally
-                {
-                    scope.Complete();
-                    myEv.Set();
-                }
-            }
-        }
-
-        private void WriteLocks(IDatabaseQuery database)
-        {
-            Console.WriteLine("LOCKS:");
-            var info = database.Query<dynamic>("SELECT * FROM sys.dm_tran_locks;").ToList();
-            var sb = new StringBuilder("> ");
-            foreach (var row in info)
-            {
-                if (row is IDictionary<string, object> values)
-                {
-                    sb.AppendJoin(", ", values);
-                }
-                sb.AppendLine(string.Empty);
-            }
-            Console.WriteLine(sb.ToString());
-
+            var database = ScopeAccessor.AmbientScope.Database;
+            database.Insert("umbracoLock", "id", false, new LockDto { Id = 1, Name = "Lock.1" });
+            database.Insert("umbracoLock", "id", false, new LockDto { Id = 2, Name = "Lock.2" });
+            database.Insert("umbracoLock", "id", false, new LockDto { Id = 3, Name = "Lock.3" });
+            scope.Complete();
         }
     }
+
+    protected override void ConfigureTestServices(IServiceCollection services) =>
+        // SQLite + retry policy makes tests fail, we retry before throwing distributed locking timeout.
+        services.RemoveAll(x => x.ImplementationType == typeof(SqliteAddRetryPolicyInterceptor));
+
+    [Test]
+    public void SingleReadLockTest()
+    {
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            scope.EagerReadLock(Constants.Locks.Servers);
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void ConcurrentReadersTest()
+    {
+        const int threadCount = 8;
+        var threads = new Thread[threadCount];
+        var exceptions = new Exception[threadCount];
+        var locker = new object();
+        var acquired = 0;
+        var m2 = new ManualResetEventSlim(false);
+        var m1 = new ManualResetEventSlim(false);
+
+        for (var i = 0; i < threadCount; i++)
+        {
+            var ic = i; // capture
+            threads[i] = new Thread(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    try
+                    {
+                        scope.EagerReadLock(Constants.Locks.Servers);
+                        lock (locker)
+                        {
+                            acquired++;
+                            if (acquired == threadCount)
+                            {
+                                m2.Set();
+                            }
+                        }
+
+                        m1.Wait();
+                        lock (locker)
+                        {
+                            acquired--;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        exceptions[ic] = e;
+                    }
+
+                    scope.Complete();
+                }
+            });
+        }
+
+        // ensure that current scope does not leak into starting threads
+        using (ExecutionContext.SuppressFlow())
+        {
+            foreach (var thread in threads)
+            {
+                thread.Start();
+            }
+        }
+
+        m2.Wait();
+        // all threads have locked in parallel
+        var maxAcquired = acquired;
+        m1.Set();
+
+        foreach (var thread in threads)
+        {
+            thread.Join();
+        }
+
+        Assert.AreEqual(threadCount, maxAcquired);
+        Assert.AreEqual(0, acquired);
+
+        for (var i = 0; i < threadCount; i++)
+        {
+            Assert.IsNull(exceptions[i]);
+        }
+    }
+
+    [Test]
+    public void GivenNonEagerLocking_WhenNoDbIsAccessed_ThenNoSqlIsExecuted()
+    {
+        var sqlCount = 0;
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var db = ScopeAccessor.AmbientScope.Database;
+            try
+            {
+                db.EnableSqlCount = true;
+
+                // Issue a lock request, but we are using non-eager
+                // locks so this only queues the request.
+                // The lock will not be issued unless we resolve
+                // scope.Database
+                scope.WriteLock(Constants.Locks.Servers);
+
+                sqlCount = db.SqlCount;
+            }
+            finally
+            {
+                db.EnableSqlCount = false;
+            }
+        }
+
+        Assert.AreEqual(0, sqlCount);
+    }
+
+    [Test]
+    public void ConcurrentWritersTest()
+    {
+        const int threadCount = 8;
+        var threads = new Thread[threadCount];
+        var exceptions = new Exception[threadCount];
+        var locker = new object();
+        var acquired = 0;
+        var entered = 0;
+        var ms = new AutoResetEvent[threadCount];
+        for (var i = 0; i < threadCount; i++)
+        {
+            ms[i] = new AutoResetEvent(false);
+        }
+
+        var m1 = new ManualResetEventSlim(false);
+
+        for (var i = 0; i < threadCount; i++)
+        {
+            var ic = i; // capture
+            threads[i] = new Thread(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    try
+                    {
+                        lock (locker)
+                        {
+                            entered++;
+                            if (entered == threadCount)
+                            {
+                                m1.Set();
+                            }
+                        }
+
+                        ms[ic].WaitOne();
+                        scope.EagerWriteLock(Constants.Locks.Servers);
+                        lock (locker)
+                        {
+                            acquired++;
+                        }
+
+                        ms[ic].WaitOne();
+                        lock (locker)
+                        {
+                            acquired--;
+                        }
+                    }
+                    catch (Exception e)
+                    {
+                        exceptions[ic] = e;
+                    }
+
+                    scope.Complete();
+                }
+            });
+        }
+
+        // ensure that current scope does not leak into starting threads
+        using (ExecutionContext.SuppressFlow())
+        {
+            foreach (var thread in threads)
+            {
+                thread.Start();
+            }
+        }
+
+        m1.Wait();
+        // all threads have entered
+        ms[0].Set(); // let 0 go
+        // TODO: This timing is flaky
+        Thread.Sleep(100);
+        for (var i = 1; i < threadCount; i++)
+        {
+            ms[i].Set(); // let others go
+        }
+
+        // TODO: This timing is flaky
+        Thread.Sleep(500);
+        // only 1 thread has locked
+        Assert.AreEqual(1, acquired);
+        for (var i = 0; i < threadCount; i++)
+        {
+            ms[i].Set(); // let all go
+        }
+
+        foreach (var thread in threads)
+        {
+            thread.Join();
+        }
+
+        Assert.AreEqual(0, acquired);
+
+        for (var i = 0; i < threadCount; i++)
+        {
+            Assert.IsNull(exceptions[i]);
+        }
+    }
+
+    [Retry(10)] // TODO make this test non-flaky.
+    [Test]
+    public void DeadLockTest()
+    {
+        if (BaseTestDatabase.IsSqlite())
+        {
+            Assert.Ignore("This test doesn't work with Microsoft.Data.Sqlite - SELECT * FROM sys.dm_tran_locks;");
+            return;
+        }
+
+        Exception e1 = null, e2 = null;
+        AutoResetEvent ev1 = new(false), ev2 = new(false);
+
+        // testing:
+        // two threads will each obtain exclusive write locks over two
+        // identical lock objects deadlock each other
+
+        var thread1 = new Thread(() => DeadLockTestThread(1, 2, ev1, ev2, ref e1));
+        var thread2 = new Thread(() => DeadLockTestThread(2, 1, ev2, ev1, ref e2));
+
+        // ensure that current scope does not leak into starting threads
+        using (ExecutionContext.SuppressFlow())
+        {
+            thread1.Start();
+            thread2.Start();
+        }
+
+        ev2.Set();
+
+        thread1.Join();
+        thread2.Join();
+
+        //Assert.IsNotNull(e1);
+        if (e1 != null)
+        {
+            AssertIsDistributedLockingTimeoutException(e1);
+        }
+
+        // the assertion below depends on timing conditions - on a fast enough environment,
+        // thread1 dies (deadlock) and frees thread2, which succeeds - however on a slow
+        // environment (CI) both threads can end up dying due to deadlock - so, cannot test
+        // that e2 is null - but if it's not, can test that it's a timeout
+        //
+        //Assert.IsNull(e2);
+        if (e2 != null)
+        {
+            AssertIsDistributedLockingTimeoutException(e2);
+        }
+    }
+
+    private void AssertIsDistributedLockingTimeoutException(Exception e)
+    {
+        var sqlException = e as DistributedLockingTimeoutException;
+        Assert.IsNotNull(sqlException);
+    }
+
+    private void DeadLockTestThread(int id1, int id2, EventWaitHandle myEv, WaitHandle otherEv, ref Exception exception)
+    {
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            try
+            {
+                otherEv.WaitOne();
+                Console.WriteLine($"[{id1}] WAIT {id1}");
+                scope.EagerWriteLock(id1);
+                Console.WriteLine($"[{id1}] GRANT {id1}");
+                WriteLocks(ScopeAccessor.AmbientScope.Database);
+                myEv.Set();
+
+                if (id1 == 1)
+                {
+                    otherEv.WaitOne();
+                }
+                else
+                {
+                    Thread.Sleep(5200); // wait for deadlock...
+                }
+
+                Console.WriteLine($"[{id1}] WAIT {id2}");
+                scope.EagerWriteLock(id2);
+                Console.WriteLine($"[{id1}] GRANT {id2}");
+                WriteLocks(ScopeAccessor.AmbientScope.Database);
+            }
+            catch (Exception e)
+            {
+                exception = e;
+            }
+            finally
+            {
+                scope.Complete();
+            }
+        }
+    }
+
+    [Test]
+    public void NoDeadLockTest()
+    {
+        if (BaseTestDatabase.IsSqlite())
+        {
+            Assert.Ignore("This test doesn't work with Microsoft.Data.Sqlite - SELECT * FROM sys.dm_tran_locks;");
+            return;
+        }
+
+
+        Exception e1 = null, e2 = null;
+        AutoResetEvent ev1 = new(false), ev2 = new(false);
+
+        // testing:
+        // two threads will each obtain exclusive write lock over two
+        // different lock objects without blocking each other
+
+        var thread1 = new Thread(() => NoDeadLockTestThread(1, ev1, ev2, ref e1));
+        var thread2 = new Thread(() => NoDeadLockTestThread(2, ev2, ev1, ref e1));
+
+        // ensure that current scope does not leak into starting threads
+        using (ExecutionContext.SuppressFlow())
+        {
+            thread1.Start();
+            thread2.Start();
+        }
+
+        ev2.Set();
+
+        thread1.Join();
+        thread2.Join();
+
+        Assert.IsNull(e1);
+        Assert.IsNull(e2);
+    }
+
+    [Test]
+    public void Throws_When_Lock_Timeout_Is_Exceeded_Read()
+    {
+        if (BaseTestDatabase.IsSqlite())
+        {
+            // Reader reads snapshot, isolated from the writer.
+            Assert.Ignore("Doesn't apply to SQLite with journal_mode=wal");
+        }
+
+        using (ExecutionContext.SuppressFlow())
+        {
+            var t1 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    Console.WriteLine("Write lock A");
+                    // This will acquire right away
+                    scope.EagerWriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
+                    Thread.Sleep(6000); // Wait longer than the Read Lock B timeout
+                    scope.Complete();
+                    Console.WriteLine("Finished Write lock A");
+                }
+            });
+
+            Thread.Sleep(500); // 100% sure task 1 starts first
+
+            var t2 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    Console.WriteLine("Read lock B");
+
+                    // This will wait for the write lock to release but it isn't going to wait long
+                    // enough so an exception will be thrown.
+                    Assert.Throws<DistributedReadLockTimeoutException>(() =>
+                        scope.EagerReadLock(TimeSpan.FromMilliseconds(3000), Constants.Locks.ContentTree));
+                    scope.Complete();
+                    Console.WriteLine("Finished Read lock B");
+                }
+            });
+
+            Task.WaitAll(t1, t2);
+        }
+    }
+
+    [Test]
+    public void Throws_When_Lock_Timeout_Is_Exceeded_Write()
+    {
+        var counter = 0;
+        var gate = new ManualResetEventSlim(false);
+        var logger = GetRequiredService<ILogger<LocksTests>>();
+
+        using (ExecutionContext.SuppressFlow())
+        {
+            var t1 = Task.Run(() =>
+            {
+                using var scope = ScopeProvider.CreateScope();
+
+                _ = scope.Database; // Begin transaction
+                Interlocked.Increment(ref counter);
+                gate.Wait();
+
+                logger.LogInformation("t1 - Attempting to acquire write lock");
+                Assert.DoesNotThrow(() =>
+                {
+                    // ReSharper disable once AccessToDisposedClosure
+                    // This will acquire right away
+                    scope.EagerWriteLock(TimeSpan.FromMilliseconds(1000), Constants.Locks.ContentTree);
+                });
+
+                logger.LogInformation("t1 - Acquired write lock, sleeping");
+                Thread.Sleep(1500); // Wait longer than the Read Lock B timeout
+
+                scope.Complete();
+                logger.LogInformation("t1 -  Complete transaction");
+            });
+
+            var t2 = Task.Run(() =>
+            {
+                using var scope = ScopeProvider.CreateScope();
+
+                _ = scope.Database; // Begin transaction
+                Interlocked.Increment(ref counter);
+                gate.Wait();
+                Thread.Sleep(100); // Let other transaction obtain write lock first.
+
+                logger.LogInformation("t2 - Attempting to acquire write lock");
+                var ex = Assert.Throws<DistributedWriteLockTimeoutException>(() =>
+                {
+                    // ReSharper disable once AccessToDisposedClosure
+                    scope.EagerWriteLock(TimeSpan.FromMilliseconds(1000), Constants.Locks.ContentTree);
+                    logger.LogInformation("t2 - Acquired write lock, something has gone wrong.");
+                });
+
+                if (ex != null)
+                {
+                    logger.LogInformation("t2 - Failed to acquire write lock in time, all is well.");
+                }
+
+                scope.Complete();
+            });
+
+            while (counter < 2)
+            {
+                Thread.Sleep(10);
+            }
+
+            gate.Set();
+            Task.WaitAll(t1, t2);
+        }
+    }
+
+    [Test]
+    public void Read_Lock_Waits_For_Write_Lock()
+    {
+        if (BaseTestDatabase.IsSqlite())
+        {
+            // Reader reads snapshot, isolated from the writer.
+            Assert.Ignore("Doesn't apply to SQLite with journal_mode=wal");
+        }
+
+        var locksCompleted = 0;
+
+        using (ExecutionContext.SuppressFlow())
+        {
+            var t1 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    Console.WriteLine("Write lock A");
+                    // This will acquire right away
+                    scope.EagerWriteLock(TimeSpan.FromMilliseconds(2000), Constants.Locks.ContentTree);
+                    Thread.Sleep(4000); // Wait less than the Read Lock B timeout
+                    scope.Complete();
+                    Interlocked.Increment(ref locksCompleted);
+                    Console.WriteLine("Finished Write lock A");
+                }
+            });
+
+            Thread.Sleep(500); // 100% sure task 1 starts first
+
+            var t2 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    Console.WriteLine("Read lock B");
+
+                    // This will wait for the write lock to release
+                    Assert.DoesNotThrow(() =>
+                        scope.EagerReadLock(TimeSpan.FromMilliseconds(6000), Constants.Locks.ContentTree));
+
+                    Assert.GreaterOrEqual(locksCompleted, 1);
+
+                    scope.Complete();
+                    Interlocked.Increment(ref locksCompleted);
+                    Console.WriteLine("Finished Read lock B");
+                }
+            });
+
+
+            var t3 = Task.Run(() =>
+            {
+                using (var scope = ScopeProvider.CreateScope())
+                {
+                    Console.WriteLine("Read lock C");
+
+                    // This will wait for the write lock to release
+                    Assert.DoesNotThrow(() =>
+                        scope.EagerReadLock(TimeSpan.FromMilliseconds(6000), Constants.Locks.ContentTree));
+
+                    Assert.GreaterOrEqual(locksCompleted, 1);
+
+                    scope.Complete();
+                    Interlocked.Increment(ref locksCompleted);
+                    Console.WriteLine("Finished Read lock C");
+                }
+            });
+
+            Task.WaitAll(t1, t2, t3);
+        }
+
+        Assert.AreEqual(3, locksCompleted);
+    }
+
+    [Test]
+    public void Lock_Exceeds_Command_Timeout()
+    {
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var realDb = (Database)ScopeAccessor.AmbientScope.Database;
+            realDb.CommandTimeout = 1000;
+
+            Console.WriteLine("Write lock A");
+            // TODO: In theory this would throw
+            scope.EagerWriteLock(TimeSpan.FromMilliseconds(3000), Constants.Locks.ContentTree);
+            scope.Complete();
+            Console.WriteLine("Finished Write lock A");
+        }
+    }
+
+
+    private void NoDeadLockTestThread(int id, EventWaitHandle myEv, WaitHandle otherEv, ref Exception exception)
+    {
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            try
+            {
+                otherEv.WaitOne();
+                Console.WriteLine($"[{id}] WAIT {id}");
+                scope.EagerWriteLock(id);
+                Console.WriteLine($"[{id}] GRANT {id}");
+                WriteLocks(ScopeAccessor.AmbientScope.Database);
+                myEv.Set();
+                otherEv.WaitOne();
+            }
+            catch (Exception e)
+            {
+                exception = e;
+            }
+            finally
+            {
+                scope.Complete();
+                myEv.Set();
+            }
+        }
+    }
+
+    private void WriteLocks(IDatabaseQuery database)
+    {
+        Console.WriteLine("LOCKS:");
+        var info = database.Query<dynamic>("SELECT * FROM sys.dm_tran_locks;").ToList();
+        var sb = new StringBuilder("> ");
+        foreach (var row in info)
+        {
+            if (row is IDictionary<string, object> values)
+            {
+                sb.AppendJoin(", ", values);
+            }
+
+            sb.AppendLine(string.Empty);
+        }
+
+        Console.WriteLine(sb.ToString());
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs
index 319b9aa973..48aa0e2849 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoBulkInsertTests.cs
@@ -6,49 +6,43 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Text.RegularExpressions;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Logging;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Implementations;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests
+// FIXME: npoco - is this still appropriate?
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class NPocoBulkInsertTests : UmbracoIntegrationTest
 {
-    // FIXME: npoco - is this still appropriate?
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class NPocoBulkInsertTests : UmbracoIntegrationTest
+    private readonly TestHelper _testHelper = new();
+
+    private IProfilingLogger ProfilingLogger => _testHelper.ProfilingLogger;
+
+    [Ignore("Ignored because you need to configure your own SQL Server to test this with")]
+    [Test]
+    public void Can_Bulk_Insert_Native_Sql_Server_Bulk_Inserts()
     {
-        private readonly TestHelper _testHelper = new TestHelper();
-
-        private IProfilingLogger ProfilingLogger => _testHelper.ProfilingLogger;
-
-        [NUnit.Framework.Ignore("Ignored because you need to configure your own SQL Server to test this with")]
-        [Test]
-        public void Can_Bulk_Insert_Native_Sql_Server_Bulk_Inserts()
+        // create the db
+        // prob not what we want, this is not a real database, but hey, the test is ignored anyways
+        // we'll fix this when we have proper testing infrastructure
+        // var dbSqlServer = TestObjects.GetUmbracoSqlServerDatabase(new NullLogger<UmbracoDatabase>());
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // create the db
-            // prob not what we want, this is not a real database, but hey, the test is ignored anyways
-            // we'll fix this when we have proper testing infrastructure
-            // var dbSqlServer = TestObjects.GetUmbracoSqlServerDatabase(new NullLogger<UmbracoDatabase>());
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // Still no what we want, but look above.
-                IUmbracoDatabase dbSqlServer = ScopeAccessor.AmbientScope.Database;
+            // Still no what we want, but look above.
+            var dbSqlServer = ScopeAccessor.AmbientScope.Database;
 
-                // drop the table
-                dbSqlServer.Execute("DROP TABLE [umbracoServer]");
+            // drop the table
+            dbSqlServer.Execute("DROP TABLE [umbracoServer]");
 
-                // re-create it
-                dbSqlServer.Execute(@"CREATE TABLE [umbracoServer](
+            // re-create it
+            dbSqlServer.Execute(@"CREATE TABLE [umbracoServer](
     [id] [int] IDENTITY(1,1) NOT NULL,
     [address] [nvarchar](500) NOT NULL,
     [computerName] [nvarchar](255) NOT NULL,
@@ -61,37 +55,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPoco
     [id] ASC
 )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
 )");
-                var data = new List<ServerRegistrationDto>();
-                for (int i = 0; i < 1000; i++)
-                {
-                    data.Add(new ServerRegistrationDto
-                    {
-                        ServerAddress = "address" + i,
-                        ServerIdentity = "computer" + i,
-                        DateRegistered = DateTime.Now,
-                        IsActive = true,
-                        DateAccessed = DateTime.Now
-                    });
-                }
-
-                using (ITransaction tr = dbSqlServer.GetTransaction())
-                {
-                    dbSqlServer.BulkInsertRecords(data);
-                    tr.Complete();
-                }
-
-                // Assert
-                Assert.That(dbSqlServer.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoServer"), Is.EqualTo(1000));
-            }
-        }
-
-        [Test]
-        public void Can_Bulk_Insert_Native_Sql_Bulk_Inserts()
-        {
-            var servers = new List<ServerRegistrationDto>();
-            for (int i = 0; i < 1000; i++)
+            var data = new List<ServerRegistrationDto>();
+            for (var i = 0; i < 1000; i++)
             {
-                servers.Add(new ServerRegistrationDto
+                data.Add(new ServerRegistrationDto
                 {
                     ServerAddress = "address" + i,
                     ServerIdentity = "computer" + i,
@@ -101,116 +68,143 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPoco
                 });
             }
 
-            // Act
-            using (ProfilingLogger.TraceDuration<NPocoBulkInsertTests>("starting insert", "finished insert"))
+            using (var tr = dbSqlServer.GetTransaction())
             {
-                using (IScope scope = ScopeProvider.CreateScope())
-                {
-                    ScopeAccessor.AmbientScope.Database.BulkInsertRecords(servers);
-                    scope.Complete();
-                }
+                dbSqlServer.BulkInsertRecords(data);
+                tr.Complete();
             }
 
             // Assert
-            using (IScope scope = ScopeProvider.CreateScope())
+            Assert.That(dbSqlServer.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoServer"), Is.EqualTo(1000));
+        }
+    }
+
+    [Test]
+    public void Can_Bulk_Insert_Native_Sql_Bulk_Inserts()
+    {
+        var servers = new List<ServerRegistrationDto>();
+        for (var i = 0; i < 1000; i++)
+        {
+            servers.Add(new ServerRegistrationDto
             {
-                Assert.That(ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoServer"), Is.EqualTo(1000));
-            }
+                ServerAddress = "address" + i,
+                ServerIdentity = "computer" + i,
+                DateRegistered = DateTime.Now,
+                IsActive = true,
+                DateAccessed = DateTime.Now
+            });
         }
 
-        [Test]
-        public void Can_Bulk_Insert_Native_Sql_Bulk_Inserts_Transaction_Rollback()
+        // Act
+        using (ProfilingLogger.TraceDuration<NPocoBulkInsertTests>("starting insert", "finished insert"))
         {
-            var servers = new List<ServerRegistrationDto>();
-            for (int i = 0; i < 1000; i++)
+            using (var scope = ScopeProvider.CreateScope())
             {
-                servers.Add(new ServerRegistrationDto
-                {
-                    ServerAddress = "address" + i,
-                    ServerIdentity = "computer" + i,
-                    DateRegistered = DateTime.Now,
-                    IsActive = true,
-                    DateAccessed = DateTime.Now
-                });
-            }
-
-            // Act
-            using (ProfilingLogger.TraceDuration<NPocoBulkInsertTests>("starting insert", "finished insert"))
-            {
-                using (IScope scope = ScopeProvider.CreateScope())
-                {
-                    ScopeAccessor.AmbientScope.Database.BulkInsertRecords(servers);
-
-                    // Don't call complete here - the transaction will be rolled back.
-                }
-            }
-
-            // Assert
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                Assert.That(ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoServer"), Is.EqualTo(0));
-            }
-        }
-
-        [Test]
-        public void Generate_Bulk_Import_Sql()
-        {
-            var servers = new List<ServerRegistrationDto>();
-            for (int i = 0; i < 2; i++)
-            {
-                servers.Add(new ServerRegistrationDto
-                {
-                    ServerAddress = "address" + i,
-                    ServerIdentity = "computer" + i,
-                    DateRegistered = DateTime.Now,
-                    IsActive = true,
-                    DateAccessed = DateTime.Now
-                });
-            }
-
-            IDbCommand[] commands;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                commands = ScopeAccessor.AmbientScope.Database.GenerateBulkInsertCommands(servers.ToArray());
+                ScopeAccessor.AmbientScope.Database.BulkInsertRecords(servers);
                 scope.Complete();
             }
-
-            // Assert
-            Assert.That(
-                commands[0].CommandText,
-                Is.EqualTo("INSERT INTO [umbracoServer] ([umbracoServer].[address], [umbracoServer].[computerName], [umbracoServer].[registeredDate], [umbracoServer].[lastNotifiedDate], [umbracoServer].[isActive], [umbracoServer].[isSchedulingPublisher]) VALUES (@0,@1,@2,@3,@4,@5), (@6,@7,@8,@9,@10,@11)"));
         }
 
-        [Test]
-        public void Generate_Bulk_Import_Sql_Exceeding_Max_Params()
+        // Assert
+        using (var scope = ScopeProvider.CreateScope())
         {
-            var servers = new List<ServerRegistrationDto>();
-            for (int i = 0; i < 1500; i++)
-            {
-                servers.Add(new ServerRegistrationDto
-                {
-                    ServerAddress = "address" + i,
-                    ServerIdentity = "computer" + i,
-                    DateRegistered = DateTime.Now,
-                    IsActive = true,
-                    DateAccessed = DateTime.Now,
-                    IsSchedulingPublisher = true
-                });
-            }
+            Assert.That(ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoServer"), Is.EqualTo(1000));
+        }
+    }
 
-            IDbCommand[] commands;
-            using (IScope scope = ScopeProvider.CreateScope())
+    [Test]
+    public void Can_Bulk_Insert_Native_Sql_Bulk_Inserts_Transaction_Rollback()
+    {
+        var servers = new List<ServerRegistrationDto>();
+        for (var i = 0; i < 1000; i++)
+        {
+            servers.Add(new ServerRegistrationDto
             {
-                commands = ScopeAccessor.AmbientScope.Database.GenerateBulkInsertCommands(servers.ToArray());
-                scope.Complete();
-            }
+                ServerAddress = "address" + i,
+                ServerIdentity = "computer" + i,
+                DateRegistered = DateTime.Now,
+                IsActive = true,
+                DateAccessed = DateTime.Now
+            });
+        }
 
-            // Assert
-            Assert.That(commands.Length, Is.EqualTo(5));
-            foreach (string s in commands.Select(x => x.CommandText))
+        // Act
+        using (ProfilingLogger.TraceDuration<NPocoBulkInsertTests>("starting insert", "finished insert"))
+        {
+            using (var scope = ScopeProvider.CreateScope())
             {
-                Assert.LessOrEqual(Regex.Matches(s, "@\\d+").Count, 2000);
+                ScopeAccessor.AmbientScope.Database.BulkInsertRecords(servers);
+
+                // Don't call complete here - the transaction will be rolled back.
             }
         }
+
+        // Assert
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            Assert.That(ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoServer"), Is.EqualTo(0));
+        }
+    }
+
+    [Test]
+    public void Generate_Bulk_Import_Sql()
+    {
+        var servers = new List<ServerRegistrationDto>();
+        for (var i = 0; i < 2; i++)
+        {
+            servers.Add(new ServerRegistrationDto
+            {
+                ServerAddress = "address" + i,
+                ServerIdentity = "computer" + i,
+                DateRegistered = DateTime.Now,
+                IsActive = true,
+                DateAccessed = DateTime.Now
+            });
+        }
+
+        IDbCommand[] commands;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            commands = ScopeAccessor.AmbientScope.Database.GenerateBulkInsertCommands(servers.ToArray());
+            scope.Complete();
+        }
+
+        // Assert
+        Assert.That(
+            commands[0].CommandText,
+            Is.EqualTo(
+                "INSERT INTO [umbracoServer] ([umbracoServer].[address], [umbracoServer].[computerName], [umbracoServer].[registeredDate], [umbracoServer].[lastNotifiedDate], [umbracoServer].[isActive], [umbracoServer].[isSchedulingPublisher]) VALUES (@0,@1,@2,@3,@4,@5), (@6,@7,@8,@9,@10,@11)"));
+    }
+
+    [Test]
+    public void Generate_Bulk_Import_Sql_Exceeding_Max_Params()
+    {
+        var servers = new List<ServerRegistrationDto>();
+        for (var i = 0; i < 1500; i++)
+        {
+            servers.Add(new ServerRegistrationDto
+            {
+                ServerAddress = "address" + i,
+                ServerIdentity = "computer" + i,
+                DateRegistered = DateTime.Now,
+                IsActive = true,
+                DateAccessed = DateTime.Now,
+                IsSchedulingPublisher = true
+            });
+        }
+
+        IDbCommand[] commands;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            commands = ScopeAccessor.AmbientScope.Database.GenerateBulkInsertCommands(servers.ToArray());
+            scope.Complete();
+        }
+
+        // Assert
+        Assert.That(commands.Length, Is.EqualTo(5));
+        foreach (var s in commands.Select(x => x.CommandText))
+        {
+            Assert.LessOrEqual(Regex.Matches(s, "@\\d+").Count, 2000);
+        }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs
index 4438c541d2..d342a1b3cc 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoFetchTests.cs
@@ -6,445 +6,390 @@ using System.Collections.Generic;
 using System.Linq;
 using NPoco;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.NPocoTests
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)]
+public class NPocoFetchTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true)]
-    public class NPocoFetchTests : UmbracoIntegrationTest
+    [SetUp]
+    protected void SeedDatabase()
     {
-        [SetUp]
-        protected void SeedDatabase()
+        using (var scope = ScopeProvider.CreateScope())
         {
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                InsertData(ScopeAccessor.AmbientScope.Database);
-                scope.Complete();
-            }
+            InsertData(ScopeAccessor.AmbientScope.Database);
+            scope.Complete();
         }
+    }
 
-        private static void InsertData(IDatabase database)
-        {
-            database.Execute(@"
+    private static void InsertData(IDatabase database)
+    {
+        database.Execute(@"
                 CREATE TABLE zbThing1 (
                     id int PRIMARY KEY NOT NULL,
                     name NVARCHAR(255) NULL
                 );");
 
-            database.Insert(new Thing1Dto
-            {
-                Id = 1,
-                Name = "one"
-            });
+        database.Insert(new Thing1Dto { Id = 1, Name = "one" });
 
-            database.Insert(new Thing1Dto
-            {
-                Id = 2,
-                Name = "two"
-            });
+        database.Insert(new Thing1Dto { Id = 2, Name = "two" });
 
-            database.Execute(@"
+        database.Execute(@"
                 CREATE TABLE zbThing2 (
                     id int PRIMARY KEY NOT NULL,
                     name NVARCHAR(255) NULL,
                     thingId int NULL
                 );");
 
-            database.Insert(new Thing2Dto
-            {
-                Id = 1,
-                Name = "uno",
-                ThingId = 1
-            });
+        database.Insert(new Thing2Dto { Id = 1, Name = "uno", ThingId = 1 });
 
-            database.Insert(new Thing2Dto
-            {
-                Id = 2,
-                Name = "due",
-                ThingId = 2
-            });
+        database.Insert(new Thing2Dto { Id = 2, Name = "due", ThingId = 2 });
 
-            database.Insert(new Thing2Dto
-            {
-                Id = 3,
-                Name = "tri",
-                ThingId = 1
-            });
+        database.Insert(new Thing2Dto { Id = 3, Name = "tri", ThingId = 1 });
 
-            database.Execute(@"
+        database.Execute(@"
                 CREATE TABLE zbThingGroup (
                     id int PRIMARY KEY NOT NULL,
                     name NVARCHAR(255) NULL
                 );");
 
-            database.Insert(new ThingGroupDto
-            {
-                Id = 1,
-                Name = "g-one"
-            });
+        database.Insert(new ThingGroupDto { Id = 1, Name = "g-one" });
 
-            database.Insert(new ThingGroupDto
-            {
-                Id = 2,
-                Name = "g-two"
-            });
+        database.Insert(new ThingGroupDto { Id = 2, Name = "g-two" });
 
-            database.Insert(new ThingGroupDto
-            {
-                Id = 3,
-                Name = "g-three"
-            });
+        database.Insert(new ThingGroupDto { Id = 3, Name = "g-three" });
 
-            database.Execute(@"
+        database.Execute(@"
                 CREATE TABLE zbThing2Group (
                     thingId int NOT NULL,
                     groupId int NOT NULL
                 );");
 
-            database.Insert(new Thing2GroupDto
-            {
-                ThingId = 1,
-                GroupId = 1
-            });
+        database.Insert(new Thing2GroupDto { ThingId = 1, GroupId = 1 });
 
-            database.Insert(new Thing2GroupDto
-            {
-                ThingId = 1,
-                GroupId = 2
-            });
+        database.Insert(new Thing2GroupDto { ThingId = 1, GroupId = 2 });
 
-            database.Insert(new Thing2GroupDto
-            {
-                ThingId = 2,
-                GroupId = 2
-            });
+        database.Insert(new Thing2GroupDto { ThingId = 2, GroupId = 2 });
 
-            database.Insert(new Thing2GroupDto
-            {
-                ThingId = 3,
-                GroupId = 3
-            });
+        database.Insert(new Thing2GroupDto { ThingId = 3, GroupId = 3 });
 
-            database.Execute(@"
+        database.Execute(@"
                 CREATE TABLE zbThingA1 (
                     id int PRIMARY KEY NOT NULL,
                     name NVARCHAR(255) NULL
                 );");
 
-            database.Execute(@"
+        database.Execute(@"
                 CREATE TABLE zbThingA2 (
                     id int PRIMARY KEY NOT NULL,
                     name NVARCHAR(255) NULL
                 );");
 
-            database.Execute(@"
+        database.Execute(@"
                 CREATE TABLE zbThingA3 (
                     id int PRIMARY KEY NOT NULL,
                     name NVARCHAR(255) NULL
                 );");
 
-            database.Execute(@"
+        database.Execute(@"
                 CREATE TABLE zbThingA12 (
                     thing1id int NOT NULL,
                     thing2id int NOT NULL,
                     name NVARCHAR(255) NOT NULL
                 );");
-        }
+    }
 
-        [Test]
-        public void TestSimple()
+    [Test]
+    public void TestSimple()
+    {
+        // Fetching a simple POCO
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // Fetching a simple POCO
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // This is the raw SQL, but it's better to use expressions and no magic strings!
-                // var sql = @"
-                //    SELECT zbThing1.id, zbThing1.name
-                //    FROM zbThing1";
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .Select<Thing1Dto>()
-                    .From<Thing1Dto>();
+            // This is the raw SQL, but it's better to use expressions and no magic strings!
+            // var sql = @"
+            //    SELECT zbThing1.id, zbThing1.name
+            //    FROM zbThing1";
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .Select<Thing1Dto>()
+                .From<Thing1Dto>();
 
-                List<Thing1Dto> dtos = ScopeAccessor.AmbientScope.Database.Fetch<Thing1Dto>(sql);
-                Assert.AreEqual(2, dtos.Count);
-                Assert.AreEqual("one", dtos.First(x => x.Id == 1).Name);
-            }
+            var dtos = ScopeAccessor.AmbientScope.Database.Fetch<Thing1Dto>(sql);
+            Assert.AreEqual(2, dtos.Count);
+            Assert.AreEqual("one", dtos.First(x => x.Id == 1).Name);
         }
+    }
 
-        [Test]
-        public void TestOneToOne()
+    [Test]
+    public void TestOneToOne()
+    {
+        // Fetching a POCO that contains the ID of another POCO,
+        // and fetching that other POCO at the same time.
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // Fetching a POCO that contains the ID of another POCO,
-            // and fetching that other POCO at the same time.
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // This is the raw SQL, but it's better to use expressions and no magic strings!
-                // var sql = @"
-                //    SELECT zbThing2.id, zbThing2.name, zbThing2.thingId,
-                //           zbThing1.id Thing__id, zbThing1.name Thing__name
-                //    FROM zbThing2
-                //    JOIN zbThing1 ON zbThing2.thingId=zbThing1.id";
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .Select<Thing2Dto>(r => r.Select(x => x.Thing))
-                    .From<Thing2Dto>()
-                    .InnerJoin<Thing1Dto>().On<Thing2Dto, Thing1Dto>((t2, t1) => t2.ThingId == t1.Id);
+            // This is the raw SQL, but it's better to use expressions and no magic strings!
+            // var sql = @"
+            //    SELECT zbThing2.id, zbThing2.name, zbThing2.thingId,
+            //           zbThing1.id Thing__id, zbThing1.name Thing__name
+            //    FROM zbThing2
+            //    JOIN zbThing1 ON zbThing2.thingId=zbThing1.id";
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .Select<Thing2Dto>(r => r.Select(x => x.Thing))
+                .From<Thing2Dto>()
+                .InnerJoin<Thing1Dto>().On<Thing2Dto, Thing1Dto>((t2, t1) => t2.ThingId == t1.Id);
 
-                List<Thing2Dto> dtos = ScopeAccessor.AmbientScope.Database.Fetch<Thing2Dto>(sql);
-                Assert.AreEqual(3, dtos.Count);
-                Assert.AreEqual("uno", dtos.First(x => x.Id == 1).Name);
-                Assert.IsNotNull(dtos.First(x => x.Id == 1).Thing);
-                Assert.AreEqual("one", dtos.First(x => x.Id == 1).Thing.Name);
-            }
+            var dtos = ScopeAccessor.AmbientScope.Database.Fetch<Thing2Dto>(sql);
+            Assert.AreEqual(3, dtos.Count);
+            Assert.AreEqual("uno", dtos.First(x => x.Id == 1).Name);
+            Assert.IsNotNull(dtos.First(x => x.Id == 1).Thing);
+            Assert.AreEqual("one", dtos.First(x => x.Id == 1).Thing.Name);
         }
+    }
 
-        [Test]
-        public void TestOneToManyOnOne()
+    [Test]
+    public void TestOneToManyOnOne()
+    {
+        // Fetching a POCO that has a list of other POCOs,
+        // and fetching these POCOs at the same time,
+        // with a pk/fk relationship
+        // for one single POCO.
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // Fetching a POCO that has a list of other POCOs,
-            // and fetching these POCOs at the same time,
-            // with a pk/fk relationship
-            // for one single POCO.
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // This is the raw SQL, but it's better to use expressions and no magic strings!
-                // var dtos = scope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, x => x.Id, @"
-                //    SELECT zbThing1.id AS Id, zbThing1.name AS Name,
-                //           zbThing2.id AS Things__Id, zbThing2.name AS Things__Name, zbThing2.thingId AS Things__ThingId
-                //    FROM zbThing1
-                //    JOIN zbThing2 ON zbThing1.id=zbThing2.thingId
-                //    WHERE zbThing1.id=1");
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .Select<Thing3Dto>(r => r.Select(x => x.Things))
-                    .From<Thing3Dto>()
-                    .InnerJoin<Thing2Dto>().On<Thing3Dto, Thing2Dto>(left => left.Id, right => right.ThingId)
-                    .Where<Thing3Dto>(x => x.Id == 1);
+            // This is the raw SQL, but it's better to use expressions and no magic strings!
+            // var dtos = scope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, x => x.Id, @"
+            //    SELECT zbThing1.id AS Id, zbThing1.name AS Name,
+            //           zbThing2.id AS Things__Id, zbThing2.name AS Things__Name, zbThing2.thingId AS Things__ThingId
+            //    FROM zbThing1
+            //    JOIN zbThing2 ON zbThing1.id=zbThing2.thingId
+            //    WHERE zbThing1.id=1");
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .Select<Thing3Dto>(r => r.Select(x => x.Things))
+                .From<Thing3Dto>()
+                .InnerJoin<Thing2Dto>().On<Thing3Dto, Thing2Dto>(left => left.Id, right => right.ThingId)
+                .Where<Thing3Dto>(x => x.Id == 1);
 
-                // var dtos = scope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, x => x.Id, sql);
-                List<Thing3Dto> dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, sql);
+            // var dtos = scope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, x => x.Id, sql);
+            var dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, sql);
 
-                Assert.AreEqual(1, dtos.Count);
-                Thing3Dto dto1 = dtos.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto1);
-                Assert.AreEqual("one", dto1.Name);
-                Assert.IsNotNull(dto1.Things);
-                Assert.AreEqual(2, dto1.Things.Count);
-                Thing2Dto dto2 = dto1.Things.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto2);
-                Assert.AreEqual("uno", dto2.Name);
-            }
+            Assert.AreEqual(1, dtos.Count);
+            var dto1 = dtos.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto1);
+            Assert.AreEqual("one", dto1.Name);
+            Assert.IsNotNull(dto1.Things);
+            Assert.AreEqual(2, dto1.Things.Count);
+            var dto2 = dto1.Things.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto2);
+            Assert.AreEqual("uno", dto2.Name);
         }
+    }
 
-        [Test]
-        public void TestOneToManyOnMany()
+    [Test]
+    public void TestOneToManyOnMany()
+    {
+        // Fetching a POCO that has a list of other POCOs,
+        // and fetching these POCOs at the same time,
+        // with a pk/fk relationship
+        // for several POCOs.
+        //
+        // The ORDER BY clause (matching x => x.Id) is required
+        // for proper aggregation to take place.
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // Fetching a POCO that has a list of other POCOs,
-            // and fetching these POCOs at the same time,
-            // with a pk/fk relationship
-            // for several POCOs.
-            //
-            // The ORDER BY clause (matching x => x.Id) is required
-            // for proper aggregation to take place.
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // This is the raw SQL, but it's better to use expressions and no magic strings!
-                // var sql = @"
-                //    SELECT zbThing1.id AS Id, zbThing1.name AS Name,
-                //           zbThing2.id AS Things__Id, zbThing2.name AS Things__Name, zbThing2.thingId AS Things__ThingId
-                //    FROM zbThing1
-                //    JOIN zbThing2 ON zbThing1.id=zbThing2.thingId
-                //    ORDER BY zbThing1.id";
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .Select<Thing3Dto>(r => r.Select(x => x.Things)) // select Thing3Dto, and Thing2Dto for Things
-                    .From<Thing3Dto>()
-                    .InnerJoin<Thing2Dto>().On<Thing3Dto, Thing2Dto>(left => left.Id, right => right.ThingId)
-                    .OrderBy<Thing3Dto>(x => x.Id);
+            // This is the raw SQL, but it's better to use expressions and no magic strings!
+            // var sql = @"
+            //    SELECT zbThing1.id AS Id, zbThing1.name AS Name,
+            //           zbThing2.id AS Things__Id, zbThing2.name AS Things__Name, zbThing2.thingId AS Things__ThingId
+            //    FROM zbThing1
+            //    JOIN zbThing2 ON zbThing1.id=zbThing2.thingId
+            //    ORDER BY zbThing1.id";
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .Select<Thing3Dto>(r => r.Select(x => x.Things)) // select Thing3Dto, and Thing2Dto for Things
+                .From<Thing3Dto>()
+                .InnerJoin<Thing2Dto>().On<Thing3Dto, Thing2Dto>(left => left.Id, right => right.ThingId)
+                .OrderBy<Thing3Dto>(x => x.Id);
 
-                List<Thing3Dto> dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, /*x => x.Id,*/ sql);
+            var dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, /*x => x.Id,*/ sql);
 
-                Assert.AreEqual(2, dtos.Count);
-                Thing3Dto dto1 = dtos.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto1);
-                Assert.AreEqual("one", dto1.Name);
-                Assert.IsNotNull(dto1.Things);
-                Assert.AreEqual(2, dto1.Things.Count);
-                Thing2Dto dto2 = dto1.Things.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto2);
-                Assert.AreEqual("uno", dto2.Name);
-            }
+            Assert.AreEqual(2, dtos.Count);
+            var dto1 = dtos.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto1);
+            Assert.AreEqual("one", dto1.Name);
+            Assert.IsNotNull(dto1.Things);
+            Assert.AreEqual(2, dto1.Things.Count);
+            var dto2 = dto1.Things.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto2);
+            Assert.AreEqual("uno", dto2.Name);
         }
+    }
 
-        [Test]
-        public void TestOneToManyOnManyTemplate()
+    [Test]
+    public void TestOneToManyOnManyTemplate()
+    {
+        using (var scope = ScopeProvider.CreateScope())
         {
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                ScopeAccessor.AmbientScope.SqlContext.Templates.Clear();
+            ScopeAccessor.AmbientScope.SqlContext.Templates.Clear();
 
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Templates.Get("xxx", s => s
-                    .Select<Thing3Dto>(r => r.Select(x => x.Things)) // select Thing3Dto, and Thing2Dto for Things
-                    .From<Thing3Dto>()
-                    .InnerJoin<Thing2Dto>().On<Thing3Dto, Thing2Dto>(left => left.Id, right => right.ThingId)
-                    .OrderBy<Thing3Dto>(x => x.Id)).Sql();
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Templates.Get("xxx", s => s
+                .Select<Thing3Dto>(r => r.Select(x => x.Things)) // select Thing3Dto, and Thing2Dto for Things
+                .From<Thing3Dto>()
+                .InnerJoin<Thing2Dto>().On<Thing3Dto, Thing2Dto>(left => left.Id, right => right.ThingId)
+                .OrderBy<Thing3Dto>(x => x.Id)).Sql();
 
-                // cached
-                sql = ScopeAccessor.AmbientScope.SqlContext.Templates.Get("xxx", s => throw new InvalidOperationException()).Sql();
+            // cached
+            sql = ScopeAccessor.AmbientScope.SqlContext.Templates.Get("xxx", s => throw new InvalidOperationException())
+                .Sql();
 
-                List<Thing3Dto> dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, /*x => x.Id,*/ sql);
+            var dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing3Dto>(x => x.Things, /*x => x.Id,*/ sql);
 
-                Assert.AreEqual(2, dtos.Count);
-                Thing3Dto dto1 = dtos.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto1);
-                Assert.AreEqual("one", dto1.Name);
-                Assert.IsNotNull(dto1.Things);
-                Assert.AreEqual(2, dto1.Things.Count);
-                Thing2Dto dto2 = dto1.Things.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto2);
-                Assert.AreEqual("uno", dto2.Name);
-            }
+            Assert.AreEqual(2, dtos.Count);
+            var dto1 = dtos.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto1);
+            Assert.AreEqual("one", dto1.Name);
+            Assert.IsNotNull(dto1.Things);
+            Assert.AreEqual(2, dto1.Things.Count);
+            var dto2 = dto1.Things.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto2);
+            Assert.AreEqual("uno", dto2.Name);
         }
+    }
 
-        [Test]
-        public void TestManyToMany()
+    [Test]
+    public void TestManyToMany()
+    {
+        // Fetching a POCO that has a list of other POCOs,
+        // and fetching these POCOs at the same time,
+        // with an n-to-n intermediate table.
+        //
+        // The ORDER BY clause (matching x => x.Id) is required
+        // for proper aggregation to take place.
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // Fetching a POCO that has a list of other POCOs,
-            // and fetching these POCOs at the same time,
-            // with an n-to-n intermediate table.
-            //
-            // The ORDER BY clause (matching x => x.Id) is required
-            // for proper aggregation to take place.
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // This is the raw SQL, but it's better to use expressions and no magic strings!
-                // var sql = @"
-                //    SELECT zbThing1.id, zbThing1.name, zbThingGroup.id, zbThingGroup.name
-                //    FROM zbThing1
-                //    JOIN zbThing2Group ON zbThing1.id=zbThing2Group.thingId
-                //    JOIN zbThingGroup ON zbThing2Group.groupId=zbThingGroup.id
-                //    ORDER BY zbThing1.id";
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .Select<Thing4Dto>(r => r.Select(x => x.Groups))
-                    .From<Thing4Dto>()
-                    .InnerJoin<Thing2GroupDto>().On<Thing4Dto, Thing2GroupDto>((t, t2g) => t.Id == t2g.ThingId)
-                    .InnerJoin<ThingGroupDto>().On<Thing2GroupDto, ThingGroupDto>((t2g, tg) => t2g.GroupId == tg.Id)
-                    .OrderBy<Thing4Dto>(x => x.Id);
+            // This is the raw SQL, but it's better to use expressions and no magic strings!
+            // var sql = @"
+            //    SELECT zbThing1.id, zbThing1.name, zbThingGroup.id, zbThingGroup.name
+            //    FROM zbThing1
+            //    JOIN zbThing2Group ON zbThing1.id=zbThing2Group.thingId
+            //    JOIN zbThingGroup ON zbThing2Group.groupId=zbThingGroup.id
+            //    ORDER BY zbThing1.id";
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .Select<Thing4Dto>(r => r.Select(x => x.Groups))
+                .From<Thing4Dto>()
+                .InnerJoin<Thing2GroupDto>().On<Thing4Dto, Thing2GroupDto>((t, t2g) => t.Id == t2g.ThingId)
+                .InnerJoin<ThingGroupDto>().On<Thing2GroupDto, ThingGroupDto>((t2g, tg) => t2g.GroupId == tg.Id)
+                .OrderBy<Thing4Dto>(x => x.Id);
 
-                List<Thing4Dto> dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing4Dto>(x => x.Groups, /*x => x.Id,*/ sql);
+            var dtos = ScopeAccessor.AmbientScope.Database.FetchOneToMany<Thing4Dto>(x => x.Groups, /*x => x.Id,*/ sql);
 
-                Assert.AreEqual(2, dtos.Count);
-                Thing4Dto dto1 = dtos.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto1);
-                Assert.AreEqual("one", dto1.Name);
-                Assert.IsNotNull(dto1.Groups);
-                Assert.AreEqual(2, dto1.Groups.Count);
-                ThingGroupDto dto2 = dto1.Groups.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto2);
-                Assert.AreEqual("g-one", dto2.Name);
-            }
+            Assert.AreEqual(2, dtos.Count);
+            var dto1 = dtos.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto1);
+            Assert.AreEqual("one", dto1.Name);
+            Assert.IsNotNull(dto1.Groups);
+            Assert.AreEqual(2, dto1.Groups.Count);
+            var dto2 = dto1.Groups.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto2);
+            Assert.AreEqual("g-one", dto2.Name);
         }
+    }
 
-        [Test]
-        public void TestCalculated()
+    [Test]
+    public void TestCalculated()
+    {
+        // Fetching a POCO that has a countof other POCOs,
+        // with an n-to-n intermediate table.
+        using (var scope = ScopeProvider.CreateScope())
         {
-            // Fetching a POCO that has a countof other POCOs,
-            // with an n-to-n intermediate table.
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // This is the raw SQL, but it's better to use expressions and no magic strings!
-                // var sql = @"
-                //    SELECT zbThing1.id, zbThing1.name, COUNT(zbThing2Group.groupId) as groupCount
-                //    FROM zbThing1
-                //    JOIN zbThing2Group ON zbThing1.id=zbThing2Group.thingId
-                //    GROUP BY zbThing1.id, zbThing1.name";
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .Select<Thing1Dto>()
-                    .Append(", COUNT(zbThing2Group.groupId) AS groupCount") // FIXME:
-                    .From<Thing1Dto>()
-                    .InnerJoin<Thing2GroupDto>().On<Thing1Dto, Thing2GroupDto>((t, t2g) => t.Id == t2g.ThingId)
-                    .GroupBy<Thing1Dto>(x => x.Id, x => x.Name);
+            // This is the raw SQL, but it's better to use expressions and no magic strings!
+            // var sql = @"
+            //    SELECT zbThing1.id, zbThing1.name, COUNT(zbThing2Group.groupId) as groupCount
+            //    FROM zbThing1
+            //    JOIN zbThing2Group ON zbThing1.id=zbThing2Group.thingId
+            //    GROUP BY zbThing1.id, zbThing1.name";
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .Select<Thing1Dto>()
+                .Append(", COUNT(zbThing2Group.groupId) AS groupCount") // FIXME:
+                .From<Thing1Dto>()
+                .InnerJoin<Thing2GroupDto>().On<Thing1Dto, Thing2GroupDto>((t, t2g) => t.Id == t2g.ThingId)
+                .GroupBy<Thing1Dto>(x => x.Id, x => x.Name);
 
-                List<Thing5Dto> dtos = ScopeAccessor.AmbientScope.Database.Fetch<Thing5Dto>(sql);
+            var dtos = ScopeAccessor.AmbientScope.Database.Fetch<Thing5Dto>(sql);
 
-                Assert.AreEqual(2, dtos.Count);
-                Thing5Dto dto1 = dtos.FirstOrDefault(x => x.Id == 1);
-                Assert.IsNotNull(dto1);
-                Assert.AreEqual("one", dto1.Name);
-                Assert.AreEqual(2, dto1.GroupCount);
-                Thing5Dto dto2 = dtos.FirstOrDefault(x => x.Id == 2);
-                Assert.IsNotNull(dto2);
-                Assert.AreEqual("two", dto2.Name);
-                Assert.AreEqual(1, dto2.GroupCount);
-            }
+            Assert.AreEqual(2, dtos.Count);
+            var dto1 = dtos.FirstOrDefault(x => x.Id == 1);
+            Assert.IsNotNull(dto1);
+            Assert.AreEqual("one", dto1.Name);
+            Assert.AreEqual(2, dto1.GroupCount);
+            var dto2 = dtos.FirstOrDefault(x => x.Id == 2);
+            Assert.IsNotNull(dto2);
+            Assert.AreEqual("two", dto2.Name);
+            Assert.AreEqual(1, dto2.GroupCount);
         }
+    }
 
-        // no test for ReferenceType.Foreign at the moment
-        // it's more or less OneToOne, but NPoco manages the keys when
-        // inserting or updating
+    // no test for ReferenceType.Foreign at the moment
+    // it's more or less OneToOne, but NPoco manages the keys when
+    // inserting or updating
 
-        [Test]
-        public void TestSql()
+    [Test]
+    public void TestSql()
+    {
+        using (var scope = ScopeProvider.CreateScope())
         {
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .SelectAll()
-                    .From<Thing1Dto>()
-                    .Where<Thing1Dto>(x => x.Id == 1);
+            var sql = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .SelectAll()
+                .From<Thing1Dto>()
+                .Where<Thing1Dto>(x => x.Id == 1);
 
-                Thing1Dto dto = ScopeAccessor.AmbientScope.Database.Fetch<Thing1Dto>(sql).FirstOrDefault();
-                Assert.IsNotNull(dto);
-                Assert.AreEqual("one", dto.Name);
+            var dto = ScopeAccessor.AmbientScope.Database.Fetch<Thing1Dto>(sql).FirstOrDefault();
+            Assert.IsNotNull(dto);
+            Assert.AreEqual("one", dto.Name);
 
-                //// var sql2 = new Sql(sql.SQL, new { id = 1 });
-                //// WriteSql(sql2);
-                //// dto = Database.Fetch<Thing1Dto>(sql2).FirstOrDefault();
-                //// Assert.IsNotNull(dto);
-                //// Assert.AreEqual("one", dto.Name);
+            //// var sql2 = new Sql(sql.SQL, new { id = 1 });
+            //// WriteSql(sql2);
+            //// dto = Database.Fetch<Thing1Dto>(sql2).FirstOrDefault();
+            //// Assert.IsNotNull(dto);
+            //// Assert.AreEqual("one", dto.Name);
 
-                var sql3 = new Sql(sql.SQL, 1);
-                dto = ScopeAccessor.AmbientScope.Database.Fetch<Thing1Dto>(sql3).FirstOrDefault();
-                Assert.IsNotNull(dto);
-                Assert.AreEqual("one", dto.Name);
-            }
+            var sql3 = new Sql(sql.SQL, 1);
+            dto = ScopeAccessor.AmbientScope.Database.Fetch<Thing1Dto>(sql3).FirstOrDefault();
+            Assert.IsNotNull(dto);
+            Assert.AreEqual("one", dto.Name);
         }
+    }
 
-        [Test]
-        public void TestMultipleOneToOne()
+    [Test]
+    public void TestMultipleOneToOne()
+    {
+        using (var scope = ScopeProvider.CreateScope())
         {
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var tA1A = new ThingA1Dto { Id = 1, Name = "a1_a" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA1A);
-                var tA1B = new ThingA1Dto { Id = 2, Name = "a1_b" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA1B);
-                var tA1C = new ThingA1Dto { Id = 3, Name = "a1_c" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA1C);
+            var tA1A = new ThingA1Dto { Id = 1, Name = "a1_a" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA1A);
+            var tA1B = new ThingA1Dto { Id = 2, Name = "a1_b" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA1B);
+            var tA1C = new ThingA1Dto { Id = 3, Name = "a1_c" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA1C);
 
-                var tA2A = new ThingA2Dto { Id = 1, Name = "a2_a" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA2A);
-                var tA2B = new ThingA2Dto { Id = 2, Name = "a2_b" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA2B);
-                var tA2C = new ThingA2Dto { Id = 3, Name = "a2_c" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA2C);
+            var tA2A = new ThingA2Dto { Id = 1, Name = "a2_a" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA2A);
+            var tA2B = new ThingA2Dto { Id = 2, Name = "a2_b" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA2B);
+            var tA2C = new ThingA2Dto { Id = 3, Name = "a2_c" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA2C);
 
-                var tA3A = new ThingA3Dto { Id = 1, Name = "a3_a" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA3A);
-                var tA3B = new ThingA3Dto { Id = 2, Name = "a3_b" };
-                ScopeAccessor.AmbientScope.Database.Insert(tA3B);
+            var tA3A = new ThingA3Dto { Id = 1, Name = "a3_a" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA3A);
+            var tA3B = new ThingA3Dto { Id = 2, Name = "a3_b" };
+            ScopeAccessor.AmbientScope.Database.Insert(tA3B);
 
-                var k1 = new ThingA12Dto { Name = "a", Thing1Id = tA1A.Id, Thing2Id = tA2A.Id };
-                ScopeAccessor.AmbientScope.Database.Insert(k1);
-                var k2 = new ThingA12Dto { Name = "b", Thing1Id = tA1A.Id, Thing2Id = tA2B.Id };
-                ScopeAccessor.AmbientScope.Database.Insert(k2);
+            var k1 = new ThingA12Dto { Name = "a", Thing1Id = tA1A.Id, Thing2Id = tA2A.Id };
+            ScopeAccessor.AmbientScope.Database.Insert(k1);
+            var k2 = new ThingA12Dto { Name = "b", Thing1Id = tA1A.Id, Thing2Id = tA2B.Id };
+            ScopeAccessor.AmbientScope.Database.Insert(k2);
 
-                string sql = @"SELECT a1.id, a1.name,
+            var sql = @"SELECT a1.id, a1.name,
 a2.id AS T2A__Id, a2.name AS T2A__Name, a3.id AS T2A__T3__Id, a3.name AS T2A__T3__Name,
 a2x.id AS T2B__Id, a2x.name AS T2B__Name, a3x.id AS T2B__T3__Id, a3x.name AS T2B__T3__Name
 FROM zbThingA1 a1
@@ -456,187 +401,175 @@ JOIN zbThingA2 a2x ON a12x.thing2id=a2x.id
 JOIN zbThingA3 a3x ON a2x.id=a3x.id
 ";
 
-                List<ThingA1Dto> ts = ScopeAccessor.AmbientScope.Database.Fetch<ThingA1Dto>(sql);
-                Assert.AreEqual(1, ts.Count);
+            var ts = ScopeAccessor.AmbientScope.Database.Fetch<ThingA1Dto>(sql);
+            Assert.AreEqual(1, ts.Count);
 
-                ThingA1Dto t = ts.First();
-                Assert.AreEqual("a1_a", t.Name);
-                Assert.AreEqual("a2_a", t.T2A.Name);
-                Assert.AreEqual("a2_b", t.T2B.Name);
+            var t = ts.First();
+            Assert.AreEqual("a1_a", t.Name);
+            Assert.AreEqual("a2_a", t.T2A.Name);
+            Assert.AreEqual("a2_b", t.T2B.Name);
 
-                Assert.AreEqual("a3_a", t.T2A.T3.Name);
-                Assert.AreEqual("a3_b", t.T2B.T3.Name);
+            Assert.AreEqual("a3_a", t.T2A.T3.Name);
+            Assert.AreEqual("a3_b", t.T2B.T3.Name);
 
-                scope.Complete();
-            }
-        }
-
-        [TableName("zbThing1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing1Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-        }
-
-        [TableName("zbThing2")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing2Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-
-            [Column("thingId")]
-            public int ThingId { get; set; }
-
-            // reference is required else value remains null
-            // columnName indicates which column has the id, referenceMembreName not needed if PK
-            [Reference(ReferenceType.OneToOne, ColumnName = "thingId"/*, ReferenceMemberName="id"*/)]
-            public Thing1Dto Thing { get; set; }
-        }
-
-        [TableName("zbThing1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing3Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-
-            // reference is required else FetchOneToMany aggregation does not happen
-            // does not seem to require ReferenceMemberName="thingId", ColumnName not needed if PK
-            [Reference(ReferenceType.Many/*, ColumnName="id", ReferenceMemberName="thingId"*/)]
-            public List<Thing2Dto> Things { get; set; }
-        }
-
-        [TableName("zbThingGroup")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class ThingGroupDto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-        }
-
-        [TableName("zbThing2Group")]
-        [PrimaryKey("thingId, groupId", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing2GroupDto
-        {
-            [Column("thingId")]
-            public int ThingId { get; set; }
-
-            [Column("groupId")]
-            public int GroupId { get; set; }
-        }
-
-        [TableName("zbThing1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing4Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-
-            // reference is required else FetchOneToMany aggregation does not happen
-            // not sure ColumnName nor ReferenceMemberName make much sense here
-            [Reference(ReferenceType.Many/*, ColumnName="id", ReferenceMemberName="thingId"*/)]
-            public List<ThingGroupDto> Groups { get; set; }
-        }
-
-        [TableName("zbThing1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing5Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-
-            [Column("groupCount")]
-            [ResultColumn] // not included in insert/update, not sql-generated
-            public int GroupCount { get; set; }
-        }
-
-        [TableName("zbThingA1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class ThingA1Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-
-            [ResultColumn]
-            [Reference(ReferenceType.OneToOne)]
-            public ThingA2Dto T2A { get; set; }
-
-            [ResultColumn]
-            [Reference(ReferenceType.OneToOne)]
-            public ThingA2Dto T2B { get; set; }
-        }
-
-        [TableName("zbThingA2")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class ThingA2Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-
-            [ResultColumn]
-            [Reference(ReferenceType.OneToOne)]
-            public ThingA3Dto T3 { get; set; }
-        }
-
-        [TableName("zbThingA3")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class ThingA3Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
-        }
-
-        [TableName("zbThingA12")]
-        [ExplicitColumns]
-        public class ThingA12Dto
-        {
-            [Column("thing1id")]
-            public int Thing1Id { get; set; }
-
-            [Column("thing2id")]
-            public int Thing2Id { get; set; }
-
-            [Column("name")]
-            public string Name { get; set; }
+            scope.Complete();
         }
     }
+
+    [TableName("zbThing1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing1Dto
+    {
+        [Column("id")]
+        public int Id { get; set; }
+
+        [Column("name")]
+        public string Name { get; set; }
+    }
+
+    [TableName("zbThing2")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing2Dto
+    {
+        [Column("id")]
+        public int Id { get; set; }
+
+        [Column("name")]
+        public string Name { get; set; }
+
+        [Column("thingId")]
+        public int ThingId { get; set; }
+
+        // reference is required else value remains null
+        // columnName indicates which column has the id, referenceMembreName not needed if PK
+        [Reference(ReferenceType.OneToOne, ColumnName = "thingId" /*, ReferenceMemberName="id"*/)]
+        public Thing1Dto Thing { get; set; }
+    }
+
+    [TableName("zbThing1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing3Dto
+    {
+        [Column("id")]
+        public int Id { get; set; }
+
+        [Column("name")]
+        public string Name { get; set; }
+
+        // reference is required else FetchOneToMany aggregation does not happen
+        // does not seem to require ReferenceMemberName="thingId", ColumnName not needed if PK
+        [Reference(ReferenceType.Many /*, ColumnName="id", ReferenceMemberName="thingId"*/)]
+        public List<Thing2Dto> Things { get; set; }
+    }
+
+    [TableName("zbThingGroup")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class ThingGroupDto
+    {
+        [Column("id")]
+        public int Id { get; set; }
+
+        [Column("name")]
+        public string Name { get; set; }
+    }
+
+    [TableName("zbThing2Group")]
+    [PrimaryKey("thingId, groupId", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing2GroupDto
+    {
+        [Column("thingId")]
+        public int ThingId { get; set; }
+
+        [Column("groupId")]
+        public int GroupId { get; set; }
+    }
+
+    [TableName("zbThing1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing4Dto
+    {
+        [Column("id")] public int Id { get; set; }
+
+        [Column("name")] public string Name { get; set; }
+
+        // reference is required else FetchOneToMany aggregation does not happen
+        // not sure ColumnName nor ReferenceMemberName make much sense here
+        [Reference(ReferenceType.Many /*, ColumnName="id", ReferenceMemberName="thingId"*/)]
+        public List<ThingGroupDto> Groups { get; set; }
+    }
+
+    [TableName("zbThing1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing5Dto
+    {
+        [Column("id")] public int Id { get; set; }
+
+        [Column("name")] public string Name { get; set; }
+
+        [Column("groupCount")]
+        [ResultColumn] // not included in insert/update, not sql-generated
+        public int GroupCount { get; set; }
+    }
+
+    [TableName("zbThingA1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class ThingA1Dto
+    {
+        [Column("id")]
+        public int Id { get; set; }
+
+        [Column("name")]
+        public string Name { get; set; }
+
+        [ResultColumn]
+        [Reference(ReferenceType.OneToOne)]
+        public ThingA2Dto T2A { get; set; }
+
+        [ResultColumn]
+        [Reference(ReferenceType.OneToOne)]
+        public ThingA2Dto T2B { get; set; }
+    }
+
+    [TableName("zbThingA2")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class ThingA2Dto
+    {
+        [Column("id")] public int Id { get; set; }
+
+        [Column("name")] public string Name { get; set; }
+
+        [ResultColumn]
+        [Reference(ReferenceType.OneToOne)]
+        public ThingA3Dto T3 { get; set; }
+    }
+
+    [TableName("zbThingA3")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class ThingA3Dto
+    {
+        [Column("id")] public int Id { get; set; }
+
+        [Column("name")] public string Name { get; set; }
+    }
+
+    [TableName("zbThingA12")]
+    [ExplicitColumns]
+    public class ThingA12Dto
+    {
+        [Column("thing1id")] public int Thing1Id { get; set; }
+
+        [Column("thing2id")] public int Thing2Id { get; set; }
+
+        [Column("name")] public string Name { get; set; }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs
index 12caa0d8dd..57f484adf2 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/AuditRepositoryTest.cs
@@ -1,14 +1,11 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
@@ -16,186 +13,182 @@ using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
+public class AuditRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
-    public class AuditRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void Prepare() => _logger = LoggerFactory.CreateLogger<AuditRepository>();
+
+    private ILogger<AuditRepository> _logger;
+
+    [Test]
+    public void Can_Add_Audit_Entry()
     {
-        private ILogger<AuditRepository> _logger;
-
-        [SetUp]
-        public void Prepare() => _logger = LoggerFactory.CreateLogger<AuditRepository>();
-
-        [Test]
-        public void Can_Add_Audit_Entry()
+        var sp = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
         {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+            repo.Save(new AuditItem(-1, AuditType.System, -1, UmbracoObjectTypes.Document.GetName(), "This is a System audit trail"));
+
+            var dtos = ScopeAccessor.AmbientScope.Database.Fetch<LogDto>("WHERE id > -1");
+
+            Assert.That(dtos.Any(), Is.True);
+            Assert.That(dtos.First().Comment, Is.EqualTo("This is a System audit trail"));
+        }
+    }
+
+    [Test]
+    public void Get_Paged_Items()
+    {
+        var sp = ScopeProvider;
+        using (var scope = sp.CreateScope())
+        {
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            for (var i = 0; i < 100; i++)
             {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-                repo.Save(new AuditItem(-1, AuditType.System, -1, UmbracoObjectTypes.Document.GetName(), "This is a System audit trail"));
-
-                List<LogDto> dtos = ScopeAccessor.AmbientScope.Database.Fetch<LogDto>("WHERE id > -1");
-
-                Assert.That(dtos.Any(), Is.True);
-                Assert.That(dtos.First().Comment, Is.EqualTo("This is a System audit trail"));
+                repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
+                repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
             }
+
+            scope.Complete();
         }
 
-        [Test]
-        public void Get_Paged_Items()
+        using (var scope = sp.CreateScope())
         {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = sp.CreateScope())
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            var page = repo.GetPagedResultsByQuery(sp.CreateQuery<IAuditItem>(), 0, 10, out var total, Direction.Descending, null, null);
+
+            Assert.AreEqual(10, page.Count());
+            Assert.AreEqual(200, total);
+        }
+    }
+
+    [Test]
+    public void Get_Paged_Items_By_User_Id_With_Query_And_Filter()
+    {
+        var sp = ScopeProvider;
+        using (var scope = sp.CreateScope())
+        {
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            for (var i = 0; i < 100; i++)
             {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-
-                for (int i = 0; i < 100; i++)
-                {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
-                }
-
-                scope.Complete();
+                repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
+                repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
             }
 
-            using (IScope scope = sp.CreateScope())
-            {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-
-                IEnumerable<IAuditItem> page = repo.GetPagedResultsByQuery(sp.CreateQuery<IAuditItem>(), 0, 10, out long total, Direction.Descending, null, null);
-
-                Assert.AreEqual(10, page.Count());
-                Assert.AreEqual(200, total);
-            }
+            scope.Complete();
         }
 
-        [Test]
-        public void Get_Paged_Items_By_User_Id_With_Query_And_Filter()
+        using (var scope = sp.CreateScope())
         {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = sp.CreateScope())
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            var query = sp.CreateQuery<IAuditItem>().Where(x => x.UserId == -1);
+
+            try
             {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
 
-                for (int i = 0; i < 100; i++)
-                {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
-                }
-
-                scope.Complete();
-            }
-
-            using (IScope scope = sp.CreateScope())
-            {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-
-                IQuery<IAuditItem> query = sp.CreateQuery<IAuditItem>().Where(x => x.UserId == -1);
-
-                try
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    IEnumerable<IAuditItem> page = repo.GetPagedResultsByQuery(
-                            query,
-                            0,
-                            10,
-                            out long total,
-                            Direction.Descending,
-                            new[] { AuditType.Publish },
-                            sp.CreateQuery<IAuditItem>()
+                var page = repo.GetPagedResultsByQuery(
+                    query,
+                    0,
+                    10,
+                    out var total,
+                    Direction.Descending,
+                    new[] { AuditType.Publish },
+                    sp.CreateQuery<IAuditItem>()
                         .Where(x => x.UserId > -2));
 
-                    Assert.AreEqual(10, page.Count());
-                    Assert.AreEqual(100, total);
-                }
-                finally
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-        }
-
-        [Test]
-        public void Get_Paged_Items_With_AuditType_Filter()
-        {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = sp.CreateScope())
-            {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-
-                for (int i = 0; i < 100; i++)
-                {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
-                }
-
-                scope.Complete();
-            }
-
-            using (IScope scope = sp.CreateScope())
-            {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-
-                IAuditItem[] page = repo.GetPagedResultsByQuery(
-                        sp.CreateQuery<IAuditItem>(),
-                        0,
-                        9,
-                        out long total,
-                        Direction.Descending,
-                        new[] { AuditType.Publish },
-                        null)
-                    .ToArray();
-
-                Assert.AreEqual(9, page.Length);
-                Assert.IsTrue(page.All(x => x.AuditType == AuditType.Publish));
+                Assert.AreEqual(10, page.Count());
                 Assert.AreEqual(100, total);
             }
-        }
-
-        [Test]
-        public void Get_Paged_Items_With_Custom_Filter()
-        {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = sp.CreateScope())
+            finally
             {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-
-                for (int i = 0; i < 100; i++)
-                {
-                    repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), "Content created"));
-                    repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), "Content published"));
-                }
-
-                scope.Complete();
-            }
-
-            using (IScope scope = sp.CreateScope())
-            {
-                var repo = new AuditRepository((IScopeAccessor)sp, _logger);
-
-                IAuditItem[] page = repo.GetPagedResultsByQuery(
-                        sp.CreateQuery<IAuditItem>(),
-                        0,
-                        8,
-                        out long total,
-                        Direction.Descending,
-                        null,
-                        sp.CreateQuery<IAuditItem>()
-                    .Where(item => item.Comment == "Content created"))
-                    .ToArray();
-
-                Assert.AreEqual(8, page.Length);
-                Assert.IsTrue(page.All(x => x.Comment == "Content created"));
-                Assert.AreEqual(100, total);
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
             }
         }
     }
+
+    [Test]
+    public void Get_Paged_Items_With_AuditType_Filter()
+    {
+        var sp = ScopeProvider;
+        using (var scope = sp.CreateScope())
+        {
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            for (var i = 0; i < 100; i++)
+            {
+                repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} created"));
+                repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), $"Content {i} published"));
+            }
+
+            scope.Complete();
+        }
+
+        using (var scope = sp.CreateScope())
+        {
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            var page = repo.GetPagedResultsByQuery(
+                    sp.CreateQuery<IAuditItem>(),
+                    0,
+                    9,
+                    out var total,
+                    Direction.Descending,
+                    new[] { AuditType.Publish },
+                    null)
+                .ToArray();
+
+            Assert.AreEqual(9, page.Length);
+            Assert.IsTrue(page.All(x => x.AuditType == AuditType.Publish));
+            Assert.AreEqual(100, total);
+        }
+    }
+
+    [Test]
+    public void Get_Paged_Items_With_Custom_Filter()
+    {
+        var sp = ScopeProvider;
+        using (var scope = sp.CreateScope())
+        {
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            for (var i = 0; i < 100; i++)
+            {
+                repo.Save(new AuditItem(i, AuditType.New, -1, UmbracoObjectTypes.Document.GetName(), "Content created"));
+                repo.Save(new AuditItem(i, AuditType.Publish, -1, UmbracoObjectTypes.Document.GetName(), "Content published"));
+            }
+
+            scope.Complete();
+        }
+
+        using (var scope = sp.CreateScope())
+        {
+            var repo = new AuditRepository((IScopeAccessor)sp, _logger);
+
+            var page = repo.GetPagedResultsByQuery(
+                    sp.CreateQuery<IAuditItem>(),
+                    0,
+                    8,
+                    out var total,
+                    Direction.Descending,
+                    null,
+                    sp.CreateQuery<IAuditItem>()
+                        .Where(item => item.Comment == "Content created"))
+                .ToArray();
+
+            Assert.AreEqual(8, page.Length);
+            Assert.IsTrue(page.All(x => x.Comment == "Content created"));
+            Assert.AreEqual(100, total);
+        }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs
index 7f0449db93..4250a3c057 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/CacheInstructionRepositoryTest.cs
@@ -2,156 +2,146 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Extensions.Logging;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
+public class CacheInstructionRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
-    public class CacheInstructionRepositoryTest : UmbracoIntegrationTest
+    private const string OriginIdentiy = "Test1";
+    private const string Instructions = "{}";
+    private readonly DateTime _date = new(2021, 7, 3, 10, 30, 0);
+    private const int InstructionCount = 1;
+
+    [Test]
+    public void Can_Count_All()
     {
-        private const string OriginIdentiy = "Test1";
-        private const string Instructions = "{}";
-        private readonly DateTime _date = new DateTime(2021, 7, 3, 10, 30, 0);
-        private const int InstructionCount = 1;
+        const int Count = 5;
 
-        [Test]
-        public void Can_Count_All()
+        var sp = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
         {
-            const int Count = 5;
-
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
+            var repo = new CacheInstructionRepository((IScopeAccessor)sp);
+            for (var i = 0; i < Count; i++)
             {
-                var repo = new CacheInstructionRepository((IScopeAccessor)sp);
-                for (var i = 0; i < Count; i++)
-                {
-                    repo.Add(new CacheInstruction(0, _date, Instructions, OriginIdentiy, InstructionCount));
-                }
-
-                var count = repo.CountAll();
-
-                Assert.That(count, Is.EqualTo(Count));
-            }
-        }
-
-        [Test]
-        public void Can_Count_Pending_Instructions()
-        {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var repo = new CacheInstructionRepository((IScopeAccessor)sp);
-                for (var i = 0; i < 5; i++)
-                {
-                    repo.Add(new CacheInstruction(0, _date, Instructions, OriginIdentiy, InstructionCount));
-                }
-
-                var count = repo.CountPendingInstructions(2);
-
-                Assert.That(count, Is.EqualTo(3));
-            }
-        }
-
-        [Test]
-        public void Can_Check_Exists()
-        {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var repo = new CacheInstructionRepository((IScopeAccessor)sp);
-
-                var existsBefore = repo.Exists(1);
-
                 repo.Add(new CacheInstruction(0, _date, Instructions, OriginIdentiy, InstructionCount));
-
-                var existsAfter = repo.Exists(1);
-
-                Assert.That(existsBefore, Is.False);
-                Assert.That(existsAfter, Is.True);
             }
+
+            var count = repo.CountAll();
+
+            Assert.That(count, Is.EqualTo(Count));
         }
+    }
 
-        [Test]
-        public void Can_Add_Cache_Instruction()
+    [Test]
+    public void Can_Count_Pending_Instructions()
+    {
+        var sp = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
         {
-            const string OriginIdentiy = "Test1";
-            const string Instructions = "{}";
-            var date = new DateTime(2021, 7, 3, 10, 30, 0);
-            const int InstructionCount = 1;
-
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
+            var repo = new CacheInstructionRepository((IScopeAccessor)sp);
+            for (var i = 0; i < 5; i++)
             {
-                var repo = new CacheInstructionRepository((IScopeAccessor)sp);
+                repo.Add(new CacheInstruction(0, _date, Instructions, OriginIdentiy, InstructionCount));
+            }
+
+            var count = repo.CountPendingInstructions(2);
+
+            Assert.That(count, Is.EqualTo(3));
+        }
+    }
+
+    [Test]
+    public void Can_Check_Exists()
+    {
+        var sp = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = new CacheInstructionRepository((IScopeAccessor)sp);
+
+            var existsBefore = repo.Exists(1);
+
+            repo.Add(new CacheInstruction(0, _date, Instructions, OriginIdentiy, InstructionCount));
+
+            var existsAfter = repo.Exists(1);
+
+            Assert.That(existsBefore, Is.False);
+            Assert.That(existsAfter, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Add_Cache_Instruction()
+    {
+        const string OriginIdentiy = "Test1";
+        const string Instructions = "{}";
+        var date = new DateTime(2021, 7, 3, 10, 30, 0);
+        const int InstructionCount = 1;
+
+        var sp = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = new CacheInstructionRepository((IScopeAccessor)sp);
+            repo.Add(new CacheInstruction(0, date, Instructions, OriginIdentiy, InstructionCount));
+
+            var dtos = ScopeAccessor.AmbientScope.Database.Fetch<CacheInstructionDto>("WHERE id > -1");
+
+            Assert.That(dtos.Any(), Is.True);
+
+            var dto = dtos.First();
+            Assert.That(dto.UtcStamp, Is.EqualTo(date));
+            Assert.That(dto.Instructions, Is.EqualTo(Instructions));
+            Assert.That(dto.OriginIdentity, Is.EqualTo(OriginIdentiy));
+            Assert.That(dto.InstructionCount, Is.EqualTo(InstructionCount));
+        }
+    }
+
+    [Test]
+    public void Can_Get_Pending_Instructions()
+    {
+        var sp = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = new CacheInstructionRepository((IScopeAccessor)sp);
+            for (var i = 0; i < 5; i++)
+            {
+                repo.Add(new CacheInstruction(0, _date, Instructions, OriginIdentiy, InstructionCount));
+            }
+
+            var instructions = repo.GetPendingInstructions(2, 2);
+
+            Assert.That(instructions.Count(), Is.EqualTo(2));
+
+            Assert.That(string.Join(",", instructions.Select(x => x.Id)), Is.EqualTo("3,4"));
+        }
+    }
+
+    [Test]
+    public void Can_Delete_Old_Instructions()
+    {
+        var sp = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = new CacheInstructionRepository((IScopeAccessor)sp);
+            for (var i = 0; i < 5; i++)
+            {
+                var date = i == 0 ? DateTime.UtcNow.AddDays(-2) : DateTime.UtcNow;
                 repo.Add(new CacheInstruction(0, date, Instructions, OriginIdentiy, InstructionCount));
-
-                List<CacheInstructionDto> dtos = ScopeAccessor.AmbientScope.Database.Fetch<CacheInstructionDto>("WHERE id > -1");
-
-                Assert.That(dtos.Any(), Is.True);
-
-                CacheInstructionDto dto = dtos.First();
-                Assert.That(dto.UtcStamp, Is.EqualTo(date));
-                Assert.That(dto.Instructions, Is.EqualTo(Instructions));
-                Assert.That(dto.OriginIdentity, Is.EqualTo(OriginIdentiy));
-                Assert.That(dto.InstructionCount, Is.EqualTo(InstructionCount));
             }
-        }
 
-        [Test]
-        public void Can_Get_Pending_Instructions()
-        {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var repo = new CacheInstructionRepository((IScopeAccessor)sp);
-                for (var i = 0; i < 5; i++)
-                {
-                    repo.Add(new CacheInstruction(0, _date, Instructions, OriginIdentiy, InstructionCount));
-                }
+            repo.DeleteInstructionsOlderThan(DateTime.UtcNow.AddDays(-1));
 
-                IEnumerable<CacheInstruction> instructions = repo.GetPendingInstructions(2, 2);
-
-                Assert.That(instructions.Count(), Is.EqualTo(2));
-
-                Assert.That(string.Join(",", instructions.Select(x => x.Id)), Is.EqualTo("3,4"));
-            }
-        }
-
-        [Test]
-        public void Can_Delete_Old_Instructions()
-        {
-            IScopeProvider sp = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var repo = new CacheInstructionRepository((IScopeAccessor)sp);
-                for (var i = 0; i < 5; i++)
-                {
-                    DateTime date = i == 0 ? DateTime.UtcNow.AddDays(-2) : DateTime.UtcNow;
-                    repo.Add(new CacheInstruction(0, date, Instructions, OriginIdentiy, InstructionCount));
-                }
-
-                repo.DeleteInstructionsOlderThan(DateTime.UtcNow.AddDays(-1));
-
-                var count = repo.CountAll();
-                Assert.That(count, Is.EqualTo(4));  // 5 have been added, 1 is older and deleted.
-            }
+            var count = repo.CountAll();
+            Assert.That(count, Is.EqualTo(4)); // 5 have been added, 1 is older and deleted.
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
index e79227a44d..3547182538 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Mapping;
@@ -14,7 +15,6 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Persistence;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -22,332 +22,337 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
-using Content = Umbraco.Cms.Core.Models.Content;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ContentTypeRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class ContentTypeRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUpData() => CreateTestData();
+
+    private ContentType _simpleContentType;
+    private ContentType _textpageContentType;
+
+    private FileSystems FileSystems => GetRequiredService<FileSystems>();
+
+    private IUmbracoMapper Mapper => GetRequiredService<IUmbracoMapper>();
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IDocumentTypeContainerRepository DocumentTypeContainerRepository =>
+        GetRequiredService<IDocumentTypeContainerRepository>();
+
+    private IMediaTypeContainerRepository MediaTypeContainerRepository =>
+        GetRequiredService<IMediaTypeContainerRepository>();
+
+    private IMediaTypeRepository MediaTypeRepository => GetRequiredService<IMediaTypeRepository>();
+
+    private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private ContentTypeRepository ContentTypeRepository =>
+        (ContentTypeRepository)GetRequiredService<IContentTypeRepository>();
+
+    public void CreateTestData()
     {
-        private ContentType _simpleContentType;
-        private ContentType _textpageContentType;
+        // Create and Save ContentType "umbTextpage" -> (_simpleContentType.Id)
+        _simpleContentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: 0);
 
-        private FileSystems FileSystems => GetRequiredService<FileSystems>();
+        ContentTypeService.Save(_simpleContentType);
 
-        private IUmbracoMapper Mapper => GetRequiredService<IUmbracoMapper>();
+        // Create and Save ContentType "textPage" -> (_textpageContentType.Id)
+        _textpageContentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: 0);
+        ContentTypeService.Save(_textpageContentType);
+    }
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+    // TODO: Add test to verify SetDefaultTemplates updates both AllowedTemplates and DefaultTemplate(id).
 
-        private IDocumentTypeContainerRepository DocumentTypeContainerRepository => GetRequiredService<IDocumentTypeContainerRepository>();
-
-        private IMediaTypeContainerRepository MediaTypeContainerRepository => GetRequiredService<IMediaTypeContainerRepository>();
-
-        private IMediaTypeRepository MediaTypeRepository => GetRequiredService<IMediaTypeRepository>();
-
-        private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
-        private IContentService ContentService => GetRequiredService<IContentService>();
-
-        private ContentTypeRepository ContentTypeRepository => (ContentTypeRepository)GetRequiredService<IContentTypeRepository>();
-
-        [SetUp]
-        public void SetUpData() => CreateTestData();
-
-        public void CreateTestData()
+    [Test]
+    public void Maps_Templates_Correctly()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Create and Save ContentType "umbTextpage" -> (_simpleContentType.Id)
-            _simpleContentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: 0);
-
-            ContentTypeService.Save(_simpleContentType);
-
-            // Create and Save ContentType "textPage" -> (_textpageContentType.Id)
-            _textpageContentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: 0);
-            ContentTypeService.Save(_textpageContentType);
-        }
-
-        // TODO: Add test to verify SetDefaultTemplates updates both AllowedTemplates and DefaultTemplate(id).
-
-        [Test]
-        public void Maps_Templates_Correctly()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var templateRepo = new TemplateRepository(
+                (IScopeAccessor)provider,
+                AppCaches.Disabled,
+                LoggerFactory.CreateLogger<TemplateRepository>(),
+                FileSystems,
+                IOHelper,
+                ShortStringHelper,
+                Mock.Of<IViewHelper>());
+            var repository = ContentTypeRepository;
+            Template[] templates =
             {
-                var templateRepo = new TemplateRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<TemplateRepository>(), FileSystems, IOHelper, ShortStringHelper, Mock.Of<IViewHelper>());
-                ContentTypeRepository repository = ContentTypeRepository;
-                Template[] templates = new[]
-                {
-                    new Template(ShortStringHelper, "test1", "test1"),
-                    new Template(ShortStringHelper, "test2", "test2"),
-                    new Template(ShortStringHelper, "test3", "test3")
-                };
-                foreach (Template template in templates)
-                {
-                    templateRepo.Save(template);
-                }
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType();
-                contentType.AllowedTemplates = new[] { templates[0], templates[1] };
-                contentType.SetDefaultTemplate(templates[0]);
-                repository.Save(contentType);
-
-                // re-get
-                IContentType result = repository.Get(contentType.Id);
-
-                Assert.AreEqual(2, result.AllowedTemplates.Count());
-                Assert.AreEqual(templates[0].Id, result.DefaultTemplate.Id);
+                new(ShortStringHelper, "test1", "test1"), new(ShortStringHelper, "test2", "test2"),
+                new(ShortStringHelper, "test3", "test3")
+            };
+            foreach (var template in templates)
+            {
+                templateRepo.Save(template);
             }
+
+            var contentType = ContentTypeBuilder.CreateSimpleContentType();
+            contentType.AllowedTemplates = new[] { templates[0], templates[1] };
+            contentType.SetDefaultTemplate(templates[0]);
+            repository.Save(contentType);
+
+            // re-get
+            var result = repository.Get(contentType.Id);
+
+            Assert.AreEqual(2, result.AllowedTemplates.Count());
+            Assert.AreEqual(templates[0].Id, result.DefaultTemplate.Id);
         }
+    }
 
-        [Test]
-        public void Can_Move()
+    [Test]
+    public void Can_Move()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var repository = ContentTypeRepository;
+            var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah1" };
+            DocumentTypeContainerRepository.Save(container1);
+
+            var container2 =
+                new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah2", ParentId = container1.Id };
+            DocumentTypeContainerRepository.Save(container2);
+
+            var contentType = (IContentType)ContentTypeBuilder.CreateBasicContentType("asdfasdf");
+            contentType.ParentId = container2.Id;
+            repository.Save(contentType);
+
+            // create a
+            var contentType2 =
+                (IContentType)new ContentType(ShortStringHelper, contentType, "hello") { Name = "Blahasdfsadf" };
+            contentType.ParentId = contentType.Id;
+            repository.Save(contentType2);
+
+            var result = repository.Move(contentType, container1).ToArray();
+
+            Assert.AreEqual(2, result.Count());
+
+            // re-get
+            contentType = repository.Get(contentType.Id);
+            contentType2 = repository.Get(contentType2.Id);
+
+            Assert.AreEqual(container1.Id, contentType.ParentId);
+            Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType.Id).OriginalPath, contentType.Path);
+            Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType2.Id).OriginalPath, contentType2.Path);
+        }
+    }
+
+    [Test]
+    public void Can_Create_Container()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" };
+            DocumentTypeContainerRepository.Save(container);
+
+            Assert.That(container.Id, Is.GreaterThan(0));
+
+            var found = DocumentTypeContainerRepository.Get(container.Id);
+            Assert.IsNotNull(found);
+        }
+    }
+
+    [Test]
+    public void Can_Get_All_Containers()
+    {
+        EntityContainer container1, container2, container3;
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container1" };
+            DocumentTypeContainerRepository.Save(container1);
+            container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container2" };
+            DocumentTypeContainerRepository.Save(container2);
+            container3 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container3" };
+            DocumentTypeContainerRepository.Save(container3);
+
+            Assert.That(container1.Id, Is.GreaterThan(0));
+            Assert.That(container2.Id, Is.GreaterThan(0));
+            Assert.That(container3.Id, Is.GreaterThan(0));
+
+            var found1 = DocumentTypeContainerRepository.Get(container1.Id);
+            Assert.IsNotNull(found1);
+            var found2 = DocumentTypeContainerRepository.Get(container2.Id);
+            Assert.IsNotNull(found2);
+            var found3 = DocumentTypeContainerRepository.Get(container3.Id);
+            Assert.IsNotNull(found3);
+            var allContainers = DocumentTypeContainerRepository.GetMany();
+            Assert.AreEqual(3, allContainers.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Delete_Container()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" };
+            DocumentTypeContainerRepository.Save(container);
+
+            // Act
+            DocumentTypeContainerRepository.Delete(container);
+
+            var found = DocumentTypeContainerRepository.Get(container.Id);
+            Assert.IsNull(found);
+        }
+    }
+
+    [Test]
+    public void Can_Create_Container_Containing_Media_Types()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
+            MediaTypeContainerRepository.Save(container);
+
+            var contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup", defaultTemplateId: 0);
+            contentType.ParentId = container.Id;
+            repository.Save(contentType);
+
+            Assert.AreEqual(container.Id, contentType.ParentId);
+        }
+    }
+
+    [Test]
+    public void Can_Delete_Container_Containing_Media_Types()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
+            MediaTypeContainerRepository.Save(container);
+
+            IMediaType contentType = MediaTypeBuilder.CreateSimpleMediaType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
+            contentType.ParentId = container.Id;
+            MediaTypeRepository.Save(contentType);
+
+            // Act
+            MediaTypeContainerRepository.Delete(container);
+
+            var found = MediaTypeContainerRepository.Get(container.Id);
+            Assert.IsNull(found);
+
+            contentType = MediaTypeRepository.Get(contentType.Id);
+            Assert.IsNotNull(contentType);
+            Assert.AreEqual(-1, contentType.ParentId);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            // Act
+            var contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
+            ContentTypeRepository.Save(contentType);
+
+            var fetched = ContentTypeRepository.Get(contentType.Id);
+
+            // Assert
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(contentType.PropertyGroups.All(x => x.HasIdentity), Is.True);
+            Assert.That(contentType.PropertyTypes.All(x => x.HasIdentity), Is.True);
+            Assert.That(contentType.Path.Contains(","), Is.True);
+            Assert.That(contentType.SortOrder, Is.GreaterThan(0));
+
+            Assert.That(contentType.PropertyGroups.ElementAt(0).Name == "testGroup", Is.True);
+            var groupId = contentType.PropertyGroups.ElementAt(0).Id;
+            Assert.That(contentType.PropertyTypes.All(x => x.PropertyGroupId.Value == groupId), Is.True);
+
+            foreach (var propertyType in contentType.PropertyTypes)
             {
-                ContentTypeRepository repository = ContentTypeRepository;
-                var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah1" };
-                DocumentTypeContainerRepository.Save(container1);
-
-                var container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah2", ParentId = container1.Id };
-                DocumentTypeContainerRepository.Save(container2);
-
-                var contentType = (IContentType)ContentTypeBuilder.CreateBasicContentType("asdfasdf");
-                contentType.ParentId = container2.Id;
-                repository.Save(contentType);
-
-                // create a
-                var contentType2 = (IContentType)new ContentType(ShortStringHelper, contentType, "hello")
-                {
-                    Name = "Blahasdfsadf"
-                };
-                contentType.ParentId = contentType.Id;
-                repository.Save(contentType2);
-
-                global::Umbraco.Cms.Core.Events.MoveEventInfo<IContentType>[] result = repository.Move(contentType, container1).ToArray();
-
-                Assert.AreEqual(2, result.Count());
-
-                // re-get
-                contentType = repository.Get(contentType.Id);
-                contentType2 = repository.Get(contentType2.Id);
-
-                Assert.AreEqual(container1.Id, contentType.ParentId);
-                Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType.Id).OriginalPath, contentType.Path);
-                Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType2.Id).OriginalPath, contentType2.Path);
+                Assert.AreNotEqual(propertyType.Key, Guid.Empty);
             }
+
+            TestHelper.AssertPropertyValuesAreEqual(fetched, contentType, ignoreProperties: new[] { "DefaultTemplate", "AllowedTemplates", "UpdateDate", "HistoryCleanup" });
         }
+    }
 
-        [Test]
-        public void Can_Create_Container()
+    [Test]
+    public void Can_Perform_Add_On_ContentTypeRepository_After_Model_Mapping()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" };
-                DocumentTypeContainerRepository.Save(container);
+            var repository = ContentTypeRepository;
 
-                Assert.That(container.Id, Is.GreaterThan(0));
+            // Act
+            var contentType = (IContentType)ContentTypeBuilder.CreateSimpleContentType2("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
 
-                EntityContainer found = DocumentTypeContainerRepository.Get(container.Id);
-                Assert.IsNotNull(found);
-            }
+            Assert.AreEqual(4, contentType.PropertyTypes.Count());
+
+            // remove all templates - since they are not saved, they would break the (!) mapping code
+            contentType.AllowedTemplates = new ITemplate[0];
+
+            // there is NO mapping from display to contentType, but only from save
+            // to contentType, so if we want to test, let's to it properly!
+            var display = Mapper.Map<DocumentTypeDisplay>(contentType);
+            var save = MapToContentTypeSave(display);
+            var mapped = Mapper.Map<IContentType>(save);
+
+            Assert.AreEqual(4, mapped.PropertyTypes.Count());
+
+            repository.Save(mapped);
+
+            Assert.AreEqual(4, mapped.PropertyTypes.Count());
+
+            // re-get
+            contentType = repository.Get(mapped.Id);
+
+            Assert.AreEqual(4, contentType.PropertyTypes.Count());
+
+            // Assert
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(contentType.PropertyGroups.All(x => x.HasIdentity), Is.True);
+            Assert.That(contentType.PropertyTypes.All(x => x.HasIdentity), Is.True);
+            Assert.That(contentType.Path.Contains(","), Is.True);
+            Assert.That(contentType.SortOrder, Is.GreaterThan(0));
+
+            Assert.That(contentType.PropertyGroups.ElementAt(0).Name == "testGroup", Is.True);
+            var groupId = contentType.PropertyGroups.ElementAt(0).Id;
+
+            var propertyTypes = contentType.PropertyTypes.ToArray();
+            Assert.AreEqual("gen", propertyTypes[0].Alias); // just to be sure
+            Assert.IsNull(propertyTypes[0].PropertyGroupId);
+            Assert.IsTrue(propertyTypes.Skip(1).All(x => x.PropertyGroupId.Value == groupId));
+            Assert.That(propertyTypes.Single(x => x.Alias == "title").LabelOnTop, Is.True);
         }
+    }
 
-        [Test]
-        public void Can_Get_All_Containers()
+    [Test]
+    public void Can_Perform_Update_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            EntityContainer container1, container2, container3;
+            var repository = ContentTypeRepository;
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container1" };
-                DocumentTypeContainerRepository.Save(container1);
-                container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container2" };
-                DocumentTypeContainerRepository.Save(container2);
-                container3 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container3" };
-                DocumentTypeContainerRepository.Save(container3);
+            // Act
+            var contentType = repository.Get(_textpageContentType.Id);
 
-                Assert.That(container1.Id, Is.GreaterThan(0));
-                Assert.That(container2.Id, Is.GreaterThan(0));
-                Assert.That(container3.Id, Is.GreaterThan(0));
-
-                EntityContainer found1 = DocumentTypeContainerRepository.Get(container1.Id);
-                Assert.IsNotNull(found1);
-                EntityContainer found2 = DocumentTypeContainerRepository.Get(container2.Id);
-                Assert.IsNotNull(found2);
-                EntityContainer found3 = DocumentTypeContainerRepository.Get(container3.Id);
-                Assert.IsNotNull(found3);
-                IEnumerable<EntityContainer> allContainers = DocumentTypeContainerRepository.GetMany();
-                Assert.AreEqual(3, allContainers.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Delete_Container()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "blah" };
-                DocumentTypeContainerRepository.Save(container);
-
-                // Act
-                DocumentTypeContainerRepository.Delete(container);
-
-                EntityContainer found = DocumentTypeContainerRepository.Get(container.Id);
-                Assert.IsNull(found);
-            }
-        }
-
-        [Test]
-        public void Can_Create_Container_Containing_Media_Types()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                MediaTypeContainerRepository.Save(container);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup", defaultTemplateId: 0);
-                contentType.ParentId = container.Id;
-                repository.Save(contentType);
-
-                Assert.AreEqual(container.Id, contentType.ParentId);
-            }
-        }
-
-        [Test]
-        public void Can_Delete_Container_Containing_Media_Types()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                MediaTypeContainerRepository.Save(container);
-
-                IMediaType contentType = MediaTypeBuilder.CreateSimpleMediaType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
-                contentType.ParentId = container.Id;
-                MediaTypeRepository.Save(contentType);
-
-                // Act
-                MediaTypeContainerRepository.Delete(container);
-
-                EntityContainer found = MediaTypeContainerRepository.Get(container.Id);
-                Assert.IsNull(found);
-
-                contentType = MediaTypeRepository.Get(contentType.Id);
-                Assert.IsNotNull(contentType);
-                Assert.AreEqual(-1, contentType.ParentId);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                // Act
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
-                ContentTypeRepository.Save(contentType);
-
-                IContentType fetched = ContentTypeRepository.Get(contentType.Id);
-
-                // Assert
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(contentType.PropertyGroups.All(x => x.HasIdentity), Is.True);
-                Assert.That(contentType.PropertyTypes.All(x => x.HasIdentity), Is.True);
-                Assert.That(contentType.Path.Contains(","), Is.True);
-                Assert.That(contentType.SortOrder, Is.GreaterThan(0));
-
-                Assert.That(contentType.PropertyGroups.ElementAt(0).Name == "testGroup", Is.True);
-                int groupId = contentType.PropertyGroups.ElementAt(0).Id;
-                Assert.That(contentType.PropertyTypes.All(x => x.PropertyGroupId.Value == groupId), Is.True);
-
-                foreach (IPropertyType propertyType in contentType.PropertyTypes)
-                {
-                    Assert.AreNotEqual(propertyType.Key, Guid.Empty);
-                }
-
-                TestHelper.AssertPropertyValuesAreEqual(fetched, contentType, ignoreProperties: new[] { "DefaultTemplate", "AllowedTemplates", "UpdateDate", "HistoryCleanup" });
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_ContentTypeRepository_After_Model_Mapping()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                var contentType = (IContentType)ContentTypeBuilder.CreateSimpleContentType2("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
-
-                Assert.AreEqual(4, contentType.PropertyTypes.Count());
-
-                // remove all templates - since they are not saved, they would break the (!) mapping code
-                contentType.AllowedTemplates = new ITemplate[0];
-
-                // there is NO mapping from display to contentType, but only from save
-                // to contentType, so if we want to test, let's to it properly!
-                DocumentTypeDisplay display = Mapper.Map<DocumentTypeDisplay>(contentType);
-                DocumentTypeSave save = MapToContentTypeSave(display);
-                IContentType mapped = Mapper.Map<IContentType>(save);
-
-                Assert.AreEqual(4, mapped.PropertyTypes.Count());
-
-                repository.Save(mapped);
-
-                Assert.AreEqual(4, mapped.PropertyTypes.Count());
-
-                // re-get
-                contentType = repository.Get(mapped.Id);
-
-                Assert.AreEqual(4, contentType.PropertyTypes.Count());
-
-                // Assert
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(contentType.PropertyGroups.All(x => x.HasIdentity), Is.True);
-                Assert.That(contentType.PropertyTypes.All(x => x.HasIdentity), Is.True);
-                Assert.That(contentType.Path.Contains(","), Is.True);
-                Assert.That(contentType.SortOrder, Is.GreaterThan(0));
-
-                Assert.That(contentType.PropertyGroups.ElementAt(0).Name == "testGroup", Is.True);
-                int groupId = contentType.PropertyGroups.ElementAt(0).Id;
-
-                IPropertyType[] propertyTypes = contentType.PropertyTypes.ToArray();
-                Assert.AreEqual("gen", propertyTypes[0].Alias); // just to be sure
-                Assert.IsNull(propertyTypes[0].PropertyGroupId);
-                Assert.IsTrue(propertyTypes.Skip(1).All(x => x.PropertyGroupId.Value == groupId));
-                Assert.That(propertyTypes.Single(x => x.Alias == "title").LabelOnTop, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                contentType.Thumbnail = "Doc2.png";
-                contentType.PropertyGroups["content"].PropertyTypes.Add(new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "subtitle")
+            contentType.Thumbnail = "Doc2.png";
+            contentType.PropertyGroups["content"].PropertyTypes.Add(
+                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "subtitle")
                 {
                     Name = "Subtitle",
                     Description = "Optional Subtitle",
@@ -356,688 +361,714 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repos
                     DataTypeId = -88,
                     LabelOnTop = true
                 });
-                repository.Save(contentType);
+            repository.Save(contentType);
 
-                bool dirty = contentType.IsDirty();
+            var dirty = contentType.IsDirty();
 
-                // Assert
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(dirty, Is.False);
-                Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
-                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
-                Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
+            // Assert
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(dirty, Is.False);
+            Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
+            Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
+            Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
+        }
+    }
+
+    // this is for tests only because it makes no sense at all to have such a
+    // mapping defined, we only need it for the weird tests that use it
+    private DocumentTypeSave MapToContentTypeSave(DocumentTypeDisplay display) =>
+        new()
+        {
+            // EntityBasic
+            Name = display.Name,
+            Icon = display.Icon,
+            Trashed = display.Trashed,
+            Key = display.Key,
+            ParentId = display.ParentId,
+            //// Alias = display.Alias,
+            Path = display.Path,
+            //// AdditionalData = display.AdditionalData,
+            HistoryCleanup = display.HistoryCleanup,
+
+            // ContentTypeBasic
+            Alias = display.Alias,
+            UpdateDate = display.UpdateDate,
+            CreateDate = display.CreateDate,
+            Description = display.Description,
+            Thumbnail = display.Thumbnail,
+
+            // ContentTypeSave
+            CompositeContentTypes = display.CompositeContentTypes,
+            IsContainer = display.IsContainer,
+            AllowAsRoot = display.AllowAsRoot,
+            AllowedTemplates = display.AllowedTemplates.Select(x => x.Alias),
+            AllowedContentTypes = display.AllowedContentTypes,
+            DefaultTemplate = display.DefaultTemplate?.Alias,
+            Groups = display.Groups.Select(x => new PropertyGroupBasic<PropertyTypeBasic>
+            {
+                Inherited = x.Inherited,
+                Id = x.Id,
+                Key = x.Key,
+                Type = x.Type,
+                Name = x.Name,
+                Alias = x.Alias,
+                SortOrder = x.SortOrder,
+                Properties = x.Properties
+            }).ToArray()
+        };
+
+    [Test]
+    public void Can_Perform_Update_On_ContentTypeRepository_After_Model_Mapping()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            // there is NO mapping from display to contentType, but only from save
+            // to contentType, so if we want to test, let's to it properly!
+            var display = Mapper.Map<DocumentTypeDisplay>(contentType);
+            var save = MapToContentTypeSave(display);
+
+            // modify...
+            save.Thumbnail = "Doc2.png";
+            var contentGroup = save.Groups.Single(x => x.Name == "Content");
+            contentGroup.Properties = contentGroup.Properties.Concat(new[]
+            {
+                new PropertyTypeBasic
+                {
+                    Alias = "subtitle",
+                    Label = "Subtitle",
+                    Description = "Optional Subtitle",
+                    Validation = new PropertyTypeValidation {Mandatory = false, Pattern = string.Empty},
+                    SortOrder = 1,
+                    DataTypeId = -88,
+                    LabelOnTop = true
+                }
+            });
+
+            var mapped = Mapper.Map(save, contentType);
+
+            // just making sure
+            Assert.AreEqual(mapped.Thumbnail, "Doc2.png");
+            Assert.IsTrue(mapped.PropertyTypes.Any(x => x.Alias == "subtitle"));
+            Assert.IsTrue(mapped.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop);
+
+            repository.Save(mapped);
+
+            var dirty = mapped.IsDirty();
+
+            // re-get
+            contentType = repository.Get(_textpageContentType.Id);
+
+            // Assert
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(dirty, Is.False);
+            Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
+            Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
+
+            Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
+
+            foreach (var propertyType in contentType.PropertyTypes)
+            {
+                Assert.IsTrue(propertyType.HasIdentity);
+                Assert.Greater(propertyType.Id, 0);
             }
         }
+    }
 
-        // this is for tests only because it makes no sense at all to have such a
-        // mapping defined, we only need it for the weird tests that use it
-        private DocumentTypeSave MapToContentTypeSave(DocumentTypeDisplay display) =>
-            new DocumentTypeSave
+    [Test]
+    public void Can_Perform_Delete_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: 0);
+            repository.Save(contentType);
+
+            var contentType2 = repository.Get(contentType.Id);
+            repository.Delete(contentType2);
+
+            var exists = repository.Exists(contentType.Id);
+
+            // Assert
+            Assert.That(exists, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_With_Heirarchy_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var ctMain = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: 0);
+            var ctChild1 = ContentTypeBuilder.CreateSimpleContentType("child1", "Child 1", ctMain, randomizeAliases: true, defaultTemplateId: 0);
+            var ctChild2 = ContentTypeBuilder.CreateSimpleContentType("child2", "Child 2", ctChild1, randomizeAliases: true, defaultTemplateId: 0);
+
+            repository.Save(ctMain);
+            repository.Save(ctChild1);
+            repository.Save(ctChild2);
+
+            // Act
+            var resolvedParent = repository.Get(ctMain.Id);
+            repository.Delete(resolvedParent);
+
+            // Assert
+            Assert.That(repository.Exists(ctMain.Id), Is.False);
+            Assert.That(repository.Exists(ctChild1.Id), Is.False);
+            Assert.That(repository.Exists(ctChild2.Id), Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Query_On_ContentTypeRepository_Sort_By_Name()
+    {
+        IContentType contentType;
+
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            contentType = repository.Get(_textpageContentType.Id);
+            var child1 = ContentTypeBuilder.CreateSimpleContentType("abc", "abc", contentType, randomizeAliases: true, defaultTemplateId: 0);
+            repository.Save(child1);
+            var child3 = ContentTypeBuilder.CreateSimpleContentType("zyx", "zyx", contentType, randomizeAliases: true, defaultTemplateId: 0);
+            repository.Save(child3);
+            var child2 = ContentTypeBuilder.CreateSimpleContentType("a123", "a123", contentType, randomizeAliases: true, defaultTemplateId: 0);
+            repository.Save(child2);
+
+            scope.Complete();
+        }
+
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var contentTypes = repository.Get(provider.CreateQuery<IContentType>().Where(x => x.ParentId == contentType.Id)).ToArray();;
+
+            // Assert
+            Assert.That(contentTypes.Count(), Is.EqualTo(3));
+            Assert.AreEqual("a123", contentTypes.ElementAt(0).Name);
+            Assert.AreEqual("abc", contentTypes.ElementAt(1).Name);
+            Assert.AreEqual("zyx", contentTypes.ElementAt(2).Name);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            // Assert
+            Assert.That(contentType, Is.Not.Null);
+            Assert.That(contentType.Id, Is.EqualTo(_textpageContentType.Id));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_By_Guid_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var contentType = repository.Get(_textpageContentType.Id);
+            var childContentType = ContentTypeBuilder.CreateSimpleContentType("blah", "Blah", contentType, randomizeAliases: true, defaultTemplateId: 0);
+            repository.Save(childContentType);
+
+            // Act
+            var result = repository.Get(childContentType.Key);
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Id, Is.EqualTo(childContentType.Id));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_By_Missing_Guid_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var result = repository.Get(Guid.NewGuid());
+
+            // Assert
+            Assert.That(result, Is.Null);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var contentTypes = repository.GetMany().ToArray();
+            var count =
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                    "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
+                    new { NodeObjectType = Constants.ObjectTypes.DocumentType });
+
+            // Assert
+            Assert.That(contentTypes.Any(), Is.True);
+            Assert.That(contentTypes.Count(), Is.EqualTo(count));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_By_Guid_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var allGuidIds = repository.GetMany().Select(x => x.Key).ToArray();
+
+            // Act
+            var contentTypes = ((IReadRepository<Guid, IContentType>)repository).GetMany(allGuidIds).ToArray();
+            var count =
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                    "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
+                    new { NodeObjectType = Constants.ObjectTypes.DocumentType });
+
+            // Assert
+            Assert.That(contentTypes.Any(), Is.True);
+            Assert.That(contentTypes.Count(), Is.EqualTo(count));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists_On_ContentTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var exists = repository.Exists(_simpleContentType.Id);
+
+            // Assert
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Update_ContentType_With_PropertyType_Removed()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            // Act
+            contentType.PropertyGroups["meta"].PropertyTypes.Remove("description");
+            repository.Save(contentType);
+
+            var result = repository.Get(_textpageContentType.Id);
+
+            // Assert
+            Assert.That(result.PropertyTypes.Any(x => x.Alias == "description"), Is.False);
+            Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(result.PropertyGroups.Count));
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(result.PropertyTypes.Count()));
+        }
+    }
+
+    [Test]
+    public void Can_Verify_PropertyTypes_On_SimpleTextpage()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var contentType = repository.Get(_simpleContentType.Id);
+
+            // Assert
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Can_Verify_PropertyTypes_On_Textpage()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            // Act
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            // Assert
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(4));
+            Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Verify_PropertyType_With_No_Group()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(2));
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(4));
+
+            // Act
+            var urlAlias = new PropertyType(ShortStringHelper, "test", ValueStorageType.Nvarchar, "urlAlias")
             {
-                // EntityBasic
-                Name = display.Name,
-                Icon = display.Icon,
-                Trashed = display.Trashed,
-                Key = display.Key,
-                ParentId = display.ParentId,
-                //// Alias = display.Alias,
-                Path = display.Path,
-                //// AdditionalData = display.AdditionalData,
-                HistoryCleanup = display.HistoryCleanup,
-
-                // ContentTypeBasic
-                Alias = display.Alias,
-                UpdateDate = display.UpdateDate,
-                CreateDate = display.CreateDate,
-                Description = display.Description,
-                Thumbnail = display.Thumbnail,
-
-                // ContentTypeSave
-                CompositeContentTypes = display.CompositeContentTypes,
-                IsContainer = display.IsContainer,
-                AllowAsRoot = display.AllowAsRoot,
-                AllowedTemplates = display.AllowedTemplates.Select(x => x.Alias),
-                AllowedContentTypes = display.AllowedContentTypes,
-                DefaultTemplate = display.DefaultTemplate?.Alias,
-                Groups = display.Groups.Select(x => new PropertyGroupBasic<PropertyTypeBasic>
-                {
-                    Inherited = x.Inherited,
-                    Id = x.Id,
-                    Key = x.Key,
-                    Type = x.Type,
-                    Name = x.Name,
-                    Alias = x.Alias,
-                    SortOrder = x.SortOrder,
-                    Properties = x.Properties
-                }).ToArray()
+                Name = "Url Alias",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
             };
 
-        [Test]
-        public void Can_Perform_Update_On_ContentTypeRepository_After_Model_Mapping()
+            var addedPropertyType = contentType.AddPropertyType(urlAlias);
+
+            Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(2));
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
+
+            repository.Save(contentType);
+
+            // Assert
+            var updated = repository.Get(_textpageContentType.Id);
+            Assert.That(addedPropertyType, Is.True);
+            Assert.That(updated.PropertyGroups.Count, Is.EqualTo(2));
+            Assert.That(updated.PropertyTypes.Count(), Is.EqualTo(5));
+            Assert.That(updated.PropertyTypes.Any(x => x.Alias == "urlAlias"), Is.True);
+            Assert.That(updated.PropertyTypes.First(x => x.Alias == "urlAlias").PropertyGroupId, Is.Null);
+        }
+    }
+
+    [Test]
+    public void Can_Verify_AllowedChildContentTypes_On_ContentType()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var repository = ContentTypeRepository;
+
+            var subpageContentType = ContentTypeBuilder.CreateSimpleContentType("umbSubpage", "Subpage");
+            var simpleSubpageContentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbSimpleSubpage", "Simple Subpage");
+            repository.Save(subpageContentType);
+            repository.Save(simpleSubpageContentType);
+
+            // Act
+            var contentType = repository.Get(_simpleContentType.Id);
+            contentType.AllowedContentTypes = new List<ContentTypeSort>
             {
-                ContentTypeRepository repository = ContentTypeRepository;
+                new(new Lazy<int>(() => subpageContentType.Id), 0, subpageContentType.Alias),
+                new(new Lazy<int>(() => simpleSubpageContentType.Id), 1, simpleSubpageContentType.Alias)
+            };
+            repository.Save(contentType);
 
-                // Act
-                IContentType contentType = repository.Get(_textpageContentType.Id);
+            // Assert
+            var updated = repository.Get(_simpleContentType.Id);
 
-                // there is NO mapping from display to contentType, but only from save
-                // to contentType, so if we want to test, let's to it properly!
-                DocumentTypeDisplay display = Mapper.Map<DocumentTypeDisplay>(contentType);
-                DocumentTypeSave save = MapToContentTypeSave(display);
+            Assert.That(updated.AllowedContentTypes.Any(), Is.True);
+            Assert.That(updated.AllowedContentTypes.Any(x => x.Alias == subpageContentType.Alias), Is.True);
+            Assert.That(updated.AllowedContentTypes.Any(x => x.Alias == simpleSubpageContentType.Alias), Is.True);
+        }
+    }
 
-                // modify...
-                save.Thumbnail = "Doc2.png";
-                PropertyGroupBasic<PropertyTypeBasic> contentGroup = save.Groups.Single(x => x.Name == "Content");
-                contentGroup.Properties = contentGroup.Properties.Concat(new[]
+    [Test]
+    public void Can_Verify_Removal_Of_Used_PropertyType_From_ContentType()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            var subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
+            DocumentRepository.Save(subpage);
+
+            // Act
+            contentType.RemovePropertyType("keywords");
+            repository.Save(contentType);
+
+            // Assert
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "keywords"), Is.False);
+            Assert.That(subpage.Properties.First(x => x.Alias == "description").GetValue(), Is.EqualTo("This is the meta description for a textpage"));
+        }
+    }
+
+    [Test]
+    public void Can_Verify_Addition_Of_PropertyType_After_ContentType_Is_Used()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            var subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
+            DocumentRepository.Save(subpage);
+
+            // Act
+            var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
+            propertyGroup.PropertyTypes.Add(
+                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "metaAuthor")
                 {
-                    new PropertyTypeBasic
-                    {
-                        Alias = "subtitle",
-                        Label = "Subtitle",
-                        Description = "Optional Subtitle",
-                        Validation = new PropertyTypeValidation
-                        {
-                            Mandatory = false,
-                            Pattern = string.Empty
-                        },
-                        SortOrder = 1,
-                        DataTypeId = -88,
-                        LabelOnTop = true
-                    }
-                });
-
-                IContentType mapped = Mapper.Map(save, contentType);
-
-                // just making sure
-                Assert.AreEqual(mapped.Thumbnail, "Doc2.png");
-                Assert.IsTrue(mapped.PropertyTypes.Any(x => x.Alias == "subtitle"));
-                Assert.IsTrue(mapped.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop);
-
-                repository.Save(mapped);
-
-                bool dirty = mapped.IsDirty();
-
-                // re-get
-                contentType = repository.Get(_textpageContentType.Id);
-
-                // Assert
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(dirty, Is.False);
-                Assert.That(contentType.Thumbnail, Is.EqualTo("Doc2.png"));
-                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
-
-                Assert.That(contentType.PropertyTypes.Single(x => x.Alias == "subtitle").LabelOnTop, Is.True);
-
-                foreach (IPropertyType propertyType in contentType.PropertyTypes)
-                {
-                    Assert.IsTrue(propertyType.HasIdentity);
-                    Assert.Greater(propertyType.Id, 0);
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: 0);
-                repository.Save(contentType);
-
-                IContentType contentType2 = repository.Get(contentType.Id);
-                repository.Delete(contentType2);
-
-                bool exists = repository.Exists(contentType.Id);
-
-                // Assert
-                Assert.That(exists, Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_With_Heirarchy_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                ContentType ctMain = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: 0);
-                ContentType ctChild1 = ContentTypeBuilder.CreateSimpleContentType("child1", "Child 1", ctMain, randomizeAliases: true, defaultTemplateId: 0);
-                ContentType ctChild2 = ContentTypeBuilder.CreateSimpleContentType("child2", "Child 2", ctChild1, randomizeAliases: true, defaultTemplateId: 0);
-
-                repository.Save(ctMain);
-                repository.Save(ctChild1);
-                repository.Save(ctChild2);
-
-                // Act
-                IContentType resolvedParent = repository.Get(ctMain.Id);
-                repository.Delete(resolvedParent);
-
-                // Assert
-                Assert.That(repository.Exists(ctMain.Id), Is.False);
-                Assert.That(repository.Exists(ctChild1.Id), Is.False);
-                Assert.That(repository.Exists(ctChild2.Id), Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Query_On_ContentTypeRepository_Sort_By_Name()
-        {
-            IContentType contentType;
-
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                contentType = repository.Get(_textpageContentType.Id);
-                ContentType child1 = ContentTypeBuilder.CreateSimpleContentType("abc", "abc", contentType, randomizeAliases: true, defaultTemplateId: 0);
-                repository.Save(child1);
-                ContentType child3 = ContentTypeBuilder.CreateSimpleContentType("zyx", "zyx", contentType, randomizeAliases: true, defaultTemplateId: 0);
-                repository.Save(child3);
-                ContentType child2 = ContentTypeBuilder.CreateSimpleContentType("a123", "a123", contentType, randomizeAliases: true, defaultTemplateId: 0);
-                repository.Save(child2);
-
-                scope.Complete();
-            }
-
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                IEnumerable<IContentType> contentTypes = repository.Get(provider.CreateQuery<IContentType>().Where(x => x.ParentId == contentType.Id));
-
-                // Assert
-                Assert.That(contentTypes.Count(), Is.EqualTo(3));
-                Assert.AreEqual("a123", contentTypes.ElementAt(0).Name);
-                Assert.AreEqual("abc", contentTypes.ElementAt(1).Name);
-                Assert.AreEqual("zyx", contentTypes.ElementAt(2).Name);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                // Assert
-                Assert.That(contentType, Is.Not.Null);
-                Assert.That(contentType.Id, Is.EqualTo(_textpageContentType.Id));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_By_Guid_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-                ContentType childContentType = ContentTypeBuilder.CreateSimpleContentType("blah", "Blah", contentType, randomizeAliases: true, defaultTemplateId: 0);
-                repository.Save(childContentType);
-
-                // Act
-                IContentType result = repository.Get(childContentType.Key);
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Id, Is.EqualTo(childContentType.Id));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_By_Missing_Guid_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                IContentType result = repository.Get(Guid.NewGuid());
-
-                // Assert
-                Assert.That(result, Is.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repository = (ContentTypeRepository)ContentTypeRepository;
-
-                // Act
-                IEnumerable<IContentType> contentTypes = repository.GetMany();
-                int count =
-                    ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                        "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
-                        new { NodeObjectType = Constants.ObjectTypes.DocumentType });
-
-                // Assert
-                Assert.That(contentTypes.Any(), Is.True);
-                Assert.That(contentTypes.Count(), Is.EqualTo(count));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_By_Guid_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repository = (ContentTypeRepository)ContentTypeRepository;
-                Guid[] allGuidIds = repository.GetMany().Select(x => x.Key).ToArray();
-
-                // Act
-                IEnumerable<IContentType> contentTypes = ((IReadRepository<Guid, IContentType>)repository).GetMany(allGuidIds);
-                int count =
-                    ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                        "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
-                        new { NodeObjectType = Constants.ObjectTypes.DocumentType });
-
-                // Assert
-                Assert.That(contentTypes.Any(), Is.True);
-                Assert.That(contentTypes.Count(), Is.EqualTo(count));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_ContentTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                bool exists = repository.Exists(_simpleContentType.Id);
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Update_ContentType_With_PropertyType_Removed()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                // Act
-                contentType.PropertyGroups["meta"].PropertyTypes.Remove("description");
-                repository.Save(contentType);
-
-                IContentType result = repository.Get(_textpageContentType.Id);
-
-                // Assert
-                Assert.That(result.PropertyTypes.Any(x => x.Alias == "description"), Is.False);
-                Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(result.PropertyGroups.Count));
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(result.PropertyTypes.Count()));
-            }
-        }
-
-        [Test]
-        public void Can_Verify_PropertyTypes_On_SimpleTextpage()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                IContentType contentType = repository.Get(_simpleContentType.Id);
-
-                // Assert
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3));
-                Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Can_Verify_PropertyTypes_On_Textpage()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                // Act
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                // Assert
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(4));
-                Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Verify_PropertyType_With_No_Group()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(2));
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(4));
-
-                // Act
-                var urlAlias = new PropertyType(ShortStringHelper, "test", ValueStorageType.Nvarchar, "urlAlias")
-                    {
-                        Name = "Url Alias",
-                        Description = string.Empty,
-                        Mandatory = false,
-                        SortOrder = 1,
-                        DataTypeId = -88
-                    };
-
-                bool addedPropertyType = contentType.AddPropertyType(urlAlias);
-
-                Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(2));
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
-
-                repository.Save(contentType);
-
-                // Assert
-                IContentType updated = repository.Get(_textpageContentType.Id);
-                Assert.That(addedPropertyType, Is.True);
-                Assert.That(updated.PropertyGroups.Count, Is.EqualTo(2));
-                Assert.That(updated.PropertyTypes.Count(), Is.EqualTo(5));
-                Assert.That(updated.PropertyTypes.Any(x => x.Alias == "urlAlias"), Is.True);
-                Assert.That(updated.PropertyTypes.First(x => x.Alias == "urlAlias").PropertyGroupId, Is.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_AllowedChildContentTypes_On_ContentType()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                ContentType subpageContentType = ContentTypeBuilder.CreateSimpleContentType("umbSubpage", "Subpage");
-                ContentType simpleSubpageContentType = ContentTypeBuilder.CreateSimpleContentType("umbSimpleSubpage", "Simple Subpage");
-                repository.Save(subpageContentType);
-                repository.Save(simpleSubpageContentType);
-
-                // Act
-                IContentType contentType = repository.Get(_simpleContentType.Id);
-                contentType.AllowedContentTypes = new List<ContentTypeSort>
-                    {
-                        new ContentTypeSort(new Lazy<int>(() => subpageContentType.Id), 0, subpageContentType.Alias),
-                        new ContentTypeSort(new Lazy<int>(() => simpleSubpageContentType.Id), 1, simpleSubpageContentType.Alias)
-                    };
-                repository.Save(contentType);
-
-                // Assert
-                IContentType updated = repository.Get(_simpleContentType.Id);
-
-                Assert.That(updated.AllowedContentTypes.Any(), Is.True);
-                Assert.That(updated.AllowedContentTypes.Any(x => x.Alias == subpageContentType.Alias), Is.True);
-                Assert.That(updated.AllowedContentTypes.Any(x => x.Alias == simpleSubpageContentType.Alias), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Removal_Of_Used_PropertyType_From_ContentType()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                Content subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                DocumentRepository.Save(subpage);
-
-                // Act
-                contentType.RemovePropertyType("keywords");
-                repository.Save(contentType);
-
-                // Assert
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3));
-                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "keywords"), Is.False);
-                Assert.That(subpage.Properties.First(x => x.Alias == "description").GetValue(), Is.EqualTo("This is the meta description for a textpage"));
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Addition_Of_PropertyType_After_ContentType_Is_Used()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                Content subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                DocumentRepository.Save(subpage);
-
-                // Act
-                PropertyGroup propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
-                propertyGroup.PropertyTypes.Add(new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "metaAuthor") { Name = "Meta Author", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88 });
-                repository.Save(contentType);
-
-                // Assert
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
-                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "metaAuthor"), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Usage_Of_New_PropertyType_On_Content()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                Content subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                DocumentRepository.Save(subpage);
-
-                PropertyGroup propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
-                propertyGroup.PropertyTypes.Add(new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "metaAuthor") { Name = "Meta Author", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88 });
-                repository.Save(contentType);
-
-                // Act
-                IContent content = DocumentRepository.Get(subpage.Id);
-                content.SetValue("metaAuthor", "John Doe");
-                DocumentRepository.Save(content);
-
-                // Assert
-                IContent updated = DocumentRepository.Get(subpage.Id);
-                Assert.That(updated.GetValue("metaAuthor").ToString(), Is.EqualTo("John Doe"));
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
-                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "metaAuthor"), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_That_A_Combination_Of_Adding_And_Deleting_PropertyTypes_Doesnt_Cause_Issues_For_Content_And_ContentType()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                IContentType contentType = repository.Get(_textpageContentType.Id);
-
-                Content subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
-                DocumentRepository.Save(subpage);
-
-                // Remove PropertyType
-                contentType.RemovePropertyType("keywords");
-
-                // Add PropertyType
-                PropertyGroup propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
-                propertyGroup.PropertyTypes.Add(new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "metaAuthor") { Name = "Meta Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88 });
-                repository.Save(contentType);
-
-                // Act
-                IContent content = DocumentRepository.Get(subpage.Id);
-                content.SetValue("metaAuthor", "John Doe");
-                DocumentRepository.Save(content);
-
-                // Assert
-                IContent updated = DocumentRepository.Get(subpage.Id);
-                Assert.That(updated.GetValue("metaAuthor").ToString(), Is.EqualTo("John Doe"));
-                Assert.That(updated.Properties.First(x => x.Alias == "description").GetValue(), Is.EqualTo("This is the meta description for a textpage"));
-
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(4));
-                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "metaAuthor"), Is.True);
-                Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "keywords"), Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Content_Type_Has_Content_Nodes()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-
-                int contentTypeId = _textpageContentType.Id;
-                IContentType contentType = repository.Get(contentTypeId);
-
-                // Act
-                bool result = repository.HasContentNodes(contentTypeId);
-
-                Content subpage = ContentBuilder.CreateTextpageContent(contentType, "Test Page 1", contentType.Id);
-                DocumentRepository.Save(subpage);
-
-                bool result2 = repository.HasContentNodes(contentTypeId);
-
-                // Assert
-                Assert.That(result, Is.False);
-                Assert.That(result2, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Update_Variation_Of_Element_Type_Property()
-        {
-            var provider = ScopeProvider;
-            using (var scope = provider.CreateScope())
-            {
-                ContentTypeRepository repository = ContentTypeRepository;
-                var contentRepository = DocumentRepository;
-
-                // Create elementType
-                var elementType = new ContentType(ShortStringHelper, -1)
-                {
-                    Alias = "elementType",
-                    Name = "Element type",
-                    Description = "Element type to use as compositions",
-                    Icon = ".sprTreeDoc3",
-                    Thumbnail = "doc.png",
+                    Name = "Meta Author",
+                    Description = string.Empty,
+                    Mandatory = false,
                     SortOrder = 1,
-                    CreatorId = 0,
-                    Trashed = false,
-                    IsElement = true,
-                    Variations = ContentVariation.Nothing
-                };
+                    DataTypeId = -88
+                });
+            repository.Save(contentType);
 
-                var contentCollection = new PropertyTypeCollection(true);
-                contentCollection.Add(new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext)
+            // Assert
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
+            Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "metaAuthor"), Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Verify_Usage_Of_New_PropertyType_On_Content()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            var subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
+            DocumentRepository.Save(subpage);
+
+            var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
+            propertyGroup.PropertyTypes.Add(
+                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "metaAuthor")
+                {
+                    Name = "Meta Author",
+                    Description = string.Empty,
+                    Mandatory = false,
+                    SortOrder = 1,
+                    DataTypeId = -88
+                });
+            repository.Save(contentType);
+
+            // Act
+            var content = DocumentRepository.Get(subpage.Id);
+            content.SetValue("metaAuthor", "John Doe");
+            DocumentRepository.Save(content);
+
+            // Assert
+            var updated = DocumentRepository.Get(subpage.Id);
+            Assert.That(updated.GetValue("metaAuthor").ToString(), Is.EqualTo("John Doe"));
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(5));
+            Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "metaAuthor"), Is.True);
+        }
+    }
+
+    [Test]
+    public void
+        Can_Verify_That_A_Combination_Of_Adding_And_Deleting_PropertyTypes_Doesnt_Cause_Issues_For_Content_And_ContentType()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            var contentType = repository.Get(_textpageContentType.Id);
+
+            var subpage = ContentBuilder.CreateTextpageContent(contentType, "Text Page 1", contentType.Id);
+            DocumentRepository.Save(subpage);
+
+            // Remove PropertyType
+            contentType.RemovePropertyType("keywords");
+
+            // Add PropertyType
+            var propertyGroup = contentType.PropertyGroups.First(x => x.Name == "Meta");
+            propertyGroup.PropertyTypes.Add(
+                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "metaAuthor")
+                {
+                    Name = "Meta Author",
+                    Description = string.Empty,
+                    Mandatory = false,
+                    SortOrder = 1,
+                    DataTypeId = -88
+                });
+            repository.Save(contentType);
+
+            // Act
+            var content = DocumentRepository.Get(subpage.Id);
+            content.SetValue("metaAuthor", "John Doe");
+            DocumentRepository.Save(content);
+
+            // Assert
+            var updated = DocumentRepository.Get(subpage.Id);
+            Assert.That(updated.GetValue("metaAuthor").ToString(), Is.EqualTo("John Doe"));
+            Assert.That(updated.Properties.First(x => x.Alias == "description").GetValue(), Is.EqualTo("This is the meta description for a textpage"));
+
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(4));
+            Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "metaAuthor"), Is.True);
+            Assert.That(contentType.PropertyTypes.Any(x => x.Alias == "keywords"), Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Verify_Content_Type_Has_Content_Nodes()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+
+            var contentTypeId = _textpageContentType.Id;
+            var contentType = repository.Get(contentTypeId);
+
+            // Act
+            var result = repository.HasContentNodes(contentTypeId);
+
+            var subpage = ContentBuilder.CreateTextpageContent(contentType, "Test Page 1", contentType.Id);
+            DocumentRepository.Save(subpage);
+
+            var result2 = repository.HasContentNodes(contentTypeId);
+
+            // Assert
+            Assert.That(result, Is.False);
+            Assert.That(result2, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Update_Variation_Of_Element_Type_Property()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = ContentTypeRepository;
+            var contentRepository = DocumentRepository;
+
+            // Create elementType
+            var elementType = new ContentType(ShortStringHelper, -1)
+            {
+                Alias = "elementType",
+                Name = "Element type",
+                Description = "Element type to use as compositions",
+                Icon = ".sprTreeDoc3",
+                Thumbnail = "doc.png",
+                SortOrder = 1,
+                CreatorId = 0,
+                Trashed = false,
+                IsElement = true,
+                Variations = ContentVariation.Nothing
+            };
+
+            var contentCollection = new PropertyTypeCollection(true)
+            {
+                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext)
                 {
                     Alias = "title",
                     Name = "Title",
-                    Description = "",
+                    Description = string.Empty,
                     Mandatory = false,
                     SortOrder = 1,
                     DataTypeId = Constants.DataTypes.Textbox,
                     LabelOnTop = true,
                     Variations = ContentVariation.Nothing
-                });
-                elementType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", Alias = "content", SortOrder = 1});
-                elementType.ResetDirtyProperties(false);
-                elementType.SetDefaultTemplate(new Template(ShortStringHelper, "ElementType", "elementType"));
-                repository.Save(elementType);
+                }
+            };
+            elementType.PropertyGroups.Add(
+                new PropertyGroup(contentCollection) { Name = "Content", Alias = "content", SortOrder = 1 });
+            elementType.ResetDirtyProperties(false);
+            elementType.SetDefaultTemplate(new Template(ShortStringHelper, "ElementType", "elementType"));
+            repository.Save(elementType);
 
-                // Create the basic "home" doc type that uses element type as comp
-                var docType = new ContentType(ShortStringHelper, -1)
-                {
-                    Alias = "home",
-                    Name = "Home",
-                    Description = "Home containing elementType",
-                    Icon = ".sprTreeDoc3",
-                    Thumbnail = "doc.png",
-                    SortOrder = 1,
-                    CreatorId = 0,
-                    Trashed = false,
-                    Variations = ContentVariation.Nothing
-                };
-                var comp = new List<IContentTypeComposition>();
-                comp.Add(elementType);
-                docType.ContentTypeComposition = comp;
-                repository.Save(docType);
+            // Create the basic "home" doc type that uses element type as comp
+            var docType = new ContentType(ShortStringHelper, -1)
+            {
+                Alias = "home",
+                Name = "Home",
+                Description = "Home containing elementType",
+                Icon = ".sprTreeDoc3",
+                Thumbnail = "doc.png",
+                SortOrder = 1,
+                CreatorId = 0,
+                Trashed = false,
+                Variations = ContentVariation.Nothing
+            };
+            var comp = new List<IContentTypeComposition>
+            {
+                elementType
+            };
+            docType.ContentTypeComposition = comp;
+            repository.Save(docType);
 
-                // Create "home" content
-                var content = new Content("Home", -1, docType){Level = 1, SortOrder = 1, CreatorId = 0, WriterId = 0};
-                object obj = new {title = "test title"};
-                content.PropertyValues(obj);
-                content.ResetDirtyProperties(false);
-                contentRepository.Save(content);
+            // Create "home" content
+            var content = new Content("Home", -1, docType) { Level = 1, SortOrder = 1, CreatorId = 0, WriterId = 0 };
+            object obj = new { title = "test title" };
+            content.PropertyValues(obj);
+            content.ResetDirtyProperties(false);
+            contentRepository.Save(content);
 
-                // Update variation on element type
-                elementType.Variations = ContentVariation.Culture;
-                elementType.PropertyTypes.First().Variations = ContentVariation.Culture;
-                repository.Save(elementType);
+            // Update variation on element type
+            elementType.Variations = ContentVariation.Culture;
+            elementType.PropertyTypes.First().Variations = ContentVariation.Culture;
+            repository.Save(elementType);
 
-                // Update variation on doc type
-                docType.Variations = ContentVariation.Culture;
-                repository.Save(docType);
+            // Update variation on doc type
+            docType.Variations = ContentVariation.Culture;
+            repository.Save(docType);
 
-                // Re fetch renewedContent and make sure that the culture has been set.
-                var renewedContent = ContentService.GetById(content.Id);
-                var hasCulture = renewedContent.Properties["title"].Values.First().Culture != null;
-                Assert.That(hasCulture, Is.True);
-            }
+            // Re fetch renewedContent and make sure that the culture has been set.
+            var renewedContent = ContentService.GetById(content.Id);
+            var hasCulture = renewedContent.Properties["title"].Values.First().Culture != null;
+            Assert.That(hasCulture, Is.True);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
index f4a3037436..c4d90b347b 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
@@ -1,317 +1,315 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class DataTypeDefinitionRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class DataTypeDefinitionRepositoryTest : UmbracoIntegrationTest
+    private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private ILocalizedTextService LocalizedTextService => GetRequiredService<ILocalizedTextService>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
+
+    private IDataTypeContainerRepository DataTypeContainerRepository =>
+        GetRequiredService<IDataTypeContainerRepository>();
+
+    private IDataTypeRepository DataTypeRepository => GetRequiredService<IDataTypeRepository>();
+
+    private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer =>
+        GetRequiredService<IConfigurationEditorJsonSerializer>();
+
+    private IJsonSerializer JsonSerializer => GetRequiredService<IJsonSerializer>();
+
+    [Test]
+    public void Can_Find_Usages()
     {
-        private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
-
-        private ILocalizedTextService LocalizedTextService => GetRequiredService<ILocalizedTextService>();
-
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
-
-        private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
-
-        private IDataTypeContainerRepository DataTypeContainerRepository => GetRequiredService<IDataTypeContainerRepository>();
-
-        private IDataTypeRepository DataTypeRepository => GetRequiredService<IDataTypeRepository>();
-
-        private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer => GetRequiredService<IConfigurationEditorJsonSerializer>();
-
-        private IJsonSerializer JsonSerializer => GetRequiredService<IJsonSerializer>();
-
-        [Test]
-        public void Can_Find_Usages()
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                IDataType dataType1 = new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer) { Name = "dt1" };
-                DataTypeRepository.Save(dataType1);
-                IDataType dataType2 = new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer) { Name = "dt2" };
-                DataTypeRepository.Save(dataType2);
+            IDataType dataType1 =
+                new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer)
+                { Name = "dt1" };
+            DataTypeRepository.Save(dataType1);
+            IDataType dataType2 =
+                new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer)
+                { Name = "dt2" };
+            DataTypeRepository.Save(dataType2);
 
-                IContentType ct = new ContentType(ShortStringHelper, -1)
+            IContentType ct = new ContentType(ShortStringHelper, -1)
+            {
+                Alias = "ct1",
+                Name = "CT1",
+                AllowedAsRoot = true,
+                Icon = "icon-home",
+                PropertyGroups = new PropertyGroupCollection
                 {
-                    Alias = "ct1",
-                    Name = "CT1",
-                    AllowedAsRoot = true,
-                    Icon = "icon-home",
-                    PropertyGroups = new PropertyGroupCollection
+                    new(true)
                     {
-                        new PropertyGroup(true)
+                        Name = "PG1",
+                        Alias = "pg1",
+                        PropertyTypes = new PropertyTypeCollection(true)
                         {
-                            Name = "PG1",
-                            Alias = "pg1",
-                            PropertyTypes = new PropertyTypeCollection(true)
-                            {
-                                new PropertyType(ShortStringHelper, dataType1, "pt1")
-                                {
-                                    Name = "PT1"
-                                },
-                                new PropertyType(ShortStringHelper, dataType1, "pt2")
-                                {
-                                    Name = "PT2"
-                                },
-                                new PropertyType(ShortStringHelper, dataType2, "pt3")
-                                {
-                                    Name = "PT3"
-                                }
-                            }
+                            new PropertyType(ShortStringHelper, dataType1, "pt1") {Name = "PT1"},
+                            new PropertyType(ShortStringHelper, dataType1, "pt2") {Name = "PT2"},
+                            new PropertyType(ShortStringHelper, dataType2, "pt3") {Name = "PT3"}
                         }
                     }
-                };
-                ContentTypeRepository.Save(ct);
+                }
+            };
+            ContentTypeRepository.Save(ct);
 
-                IReadOnlyDictionary<Udi, IEnumerable<string>> usages = DataTypeRepository.FindUsages(dataType1.Id);
+            var usages = DataTypeRepository.FindUsages(dataType1.Id);
 
-                Udi key = usages.First().Key;
-                Assert.AreEqual(ct.Key, ((GuidUdi)key).Guid);
-                Assert.AreEqual(2, usages[key].Count());
-                Assert.AreEqual("pt1", usages[key].ElementAt(0));
-                Assert.AreEqual("pt2", usages[key].ElementAt(1));
+            var key = usages.First().Key;
+            Assert.AreEqual(ct.Key, ((GuidUdi)key).Guid);
+            Assert.AreEqual(2, usages[key].Count());
+            Assert.AreEqual("pt1", usages[key].ElementAt(0));
+            Assert.AreEqual("pt2", usages[key].ElementAt(1));
 
-                usages = DataTypeRepository.FindUsages(dataType2.Id);
+            usages = DataTypeRepository.FindUsages(dataType2.Id);
 
-                key = usages.First().Key;
-                Assert.AreEqual(ct.Key, ((GuidUdi)key).Guid);
-                Assert.AreEqual(1, usages[key].Count());
-                Assert.AreEqual("pt3", usages[key].ElementAt(0));
-            }
+            key = usages.First().Key;
+            Assert.AreEqual(ct.Key, ((GuidUdi)key).Guid);
+            Assert.AreEqual(1, usages[key].Count());
+            Assert.AreEqual("pt3", usages[key].ElementAt(0));
         }
+    }
 
-        [Test]
-        public void Can_Move()
+    [Test]
+    public void Can_Move()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var container1 = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah1" };
-                DataTypeContainerRepository.Save(container1);
+            var container1 = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah1" };
+            DataTypeContainerRepository.Save(container1);
 
-                var container2 = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah2", ParentId = container1.Id };
-                DataTypeContainerRepository.Save(container2);
+            var container2 =
+                new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah2", ParentId = container1.Id };
+            DataTypeContainerRepository.Save(container2);
 
-                var dataType = (IDataType)new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory,  IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer, container2.Id)
-                {
-                    Name = "dt1"
-                };
-                DataTypeRepository.Save(dataType);
+            var dataType =
+                (IDataType)new DataType(
+                    new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer, container2.Id)
+                { Name = "dt1" };
+            DataTypeRepository.Save(dataType);
 
-                // create a
-                var dataType2 = (IDataType)new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper,  LocalizedTextService), ConfigurationEditorJsonSerializer, dataType.Id)
-                {
-                    Name = "dt2"
-                };
-                DataTypeRepository.Save(dataType2);
+            // create a
+            var dataType2 =
+                (IDataType)new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer, dataType.Id)
+                { Name = "dt2" };
+            DataTypeRepository.Save(dataType2);
 
-                MoveEventInfo<IDataType>[] result = DataTypeRepository.Move(dataType, container1).ToArray();
+            var result = DataTypeRepository.Move(dataType, container1).ToArray();
 
-                Assert.AreEqual(2, result.Length);
+            Assert.AreEqual(2, result.Length);
 
-                // re-get
-                dataType = DataTypeRepository.Get(dataType.Id);
-                dataType2 = DataTypeRepository.Get(dataType2.Id);
+            // re-get
+            dataType = DataTypeRepository.Get(dataType.Id);
+            dataType2 = DataTypeRepository.Get(dataType2.Id);
 
-                Assert.AreEqual(container1.Id, dataType.ParentId);
-                Assert.AreNotEqual(result.Single(x => x.Entity.Id == dataType.Id).OriginalPath, dataType.Path);
-                Assert.AreNotEqual(result.Single(x => x.Entity.Id == dataType2.Id).OriginalPath, dataType2.Path);
-            }
+            Assert.AreEqual(container1.Id, dataType.ParentId);
+            Assert.AreNotEqual(result.Single(x => x.Entity.Id == dataType.Id).OriginalPath, dataType.Path);
+            Assert.AreNotEqual(result.Single(x => x.Entity.Id == dataType2.Id).OriginalPath, dataType2.Path);
         }
+    }
 
-        [Test]
-        public void Can_Create_Container()
+    [Test]
+    public void Can_Create_Container()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                DataTypeContainerRepository.Save(container);
+            var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
+            DataTypeContainerRepository.Save(container);
 
-                Assert.That(container.Id, Is.GreaterThan(0));
+            Assert.That(container.Id, Is.GreaterThan(0));
 
-                EntityContainer found = DataTypeContainerRepository.Get(container.Id);
-                Assert.IsNotNull(found);
-            }
+            var found = DataTypeContainerRepository.Get(container.Id);
+            Assert.IsNotNull(found);
         }
+    }
 
-        [Test]
-        public void Can_Delete_Container()
+    [Test]
+    public void Can_Delete_Container()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                DataTypeContainerRepository.Save(container);
+            var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
+            DataTypeContainerRepository.Save(container);
 
-                // Act
-                DataTypeContainerRepository.Delete(container);
+            // Act
+            DataTypeContainerRepository.Delete(container);
 
-                EntityContainer found = DataTypeContainerRepository.Get(container.Id);
-                Assert.IsNull(found);
-            }
+            var found = DataTypeContainerRepository.Get(container.Id);
+            Assert.IsNull(found);
         }
+    }
 
-        [Test]
-        public void Can_Create_Container_Containing_Data_Types()
+    [Test]
+    public void Can_Create_Container_Containing_Data_Types()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                DataTypeContainerRepository.Save(container);
+            var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
+            DataTypeContainerRepository.Save(container);
 
-                var dataTypeDefinition = new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer, container.Id) { Name = "test" };
-                DataTypeRepository.Save(dataTypeDefinition);
+            var dataTypeDefinition =
+                new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer, container.Id)
+                { Name = "test" };
+            DataTypeRepository.Save(dataTypeDefinition);
 
-                Assert.AreEqual(container.Id, dataTypeDefinition.ParentId);
-            }
+            Assert.AreEqual(container.Id, dataTypeDefinition.ParentId);
         }
+    }
 
-        [Test]
-        public void Can_Delete_Container_Containing_Data_Types()
+    [Test]
+    public void Can_Delete_Container_Containing_Data_Types()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
-                DataTypeContainerRepository.Save(container);
+            var container = new EntityContainer(Constants.ObjectTypes.DataType) { Name = "blah" };
+            DataTypeContainerRepository.Save(container);
 
-                IDataType dataType = new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer, container.Id) { Name = "test" };
-                DataTypeRepository.Save(dataType);
+            IDataType dataType =
+                new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer, container.Id)
+                { Name = "test" };
+            DataTypeRepository.Save(dataType);
 
-                // Act
-                DataTypeContainerRepository.Delete(container);
+            // Act
+            DataTypeContainerRepository.Delete(container);
 
-                EntityContainer found = DataTypeContainerRepository.Get(container.Id);
-                Assert.IsNull(found);
+            var found = DataTypeContainerRepository.Get(container.Id);
+            Assert.IsNull(found);
 
-                dataType = DataTypeRepository.Get(dataType.Id);
-                Assert.IsNotNull(dataType);
-                Assert.AreEqual(-1, dataType.ParentId);
-            }
+            dataType = DataTypeRepository.Get(dataType.Id);
+            Assert.IsNotNull(dataType);
+            Assert.AreEqual(-1, dataType.ParentId);
         }
+    }
 
-        [Test]
-        public void Can_Create()
+    [Test]
+    public void Can_Create()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                IDataType dataType = new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer) { Name = "test" };
+            IDataType dataType =
+                new DataType(new RadioButtonsPropertyEditor(DataValueEditorFactory, IOHelper, LocalizedTextService), ConfigurationEditorJsonSerializer)
+                { Name = "test" };
 
-                DataTypeRepository.Save(dataType);
+            DataTypeRepository.Save(dataType);
 
-                int id = dataType.Id;
-                Assert.That(id, Is.GreaterThan(0));
+            var id = dataType.Id;
+            Assert.That(id, Is.GreaterThan(0));
 
-                // Act
-                dataType = DataTypeRepository.Get(id);
+            // Act
+            dataType = DataTypeRepository.Get(id);
 
-                // Assert
-                Assert.That(dataType, Is.Not.Null);
-                Assert.That(dataType.HasIdentity, Is.True);
-            }
+            // Assert
+            Assert.That(dataType, Is.Not.Null);
+            Assert.That(dataType.HasIdentity, Is.True);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Get_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_Get_On_DataTypeDefinitionRepository()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                // Act
-                IDataType dataTypeDefinition = DataTypeRepository.Get(Constants.DataTypes.DropDownSingle);
+            // Act
+            var dataTypeDefinition = DataTypeRepository.Get(Constants.DataTypes.DropDownSingle);
 
-                // Assert
-                Assert.That(dataTypeDefinition, Is.Not.Null);
-                Assert.That(dataTypeDefinition.HasIdentity, Is.True);
-                Assert.That(dataTypeDefinition.Name, Is.EqualTo("Dropdown"));
-            }
+            // Assert
+            Assert.That(dataTypeDefinition, Is.Not.Null);
+            Assert.That(dataTypeDefinition.HasIdentity, Is.True);
+            Assert.That(dataTypeDefinition.Name, Is.EqualTo("Dropdown"));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetAll_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_GetAll_On_DataTypeDefinitionRepository()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                // Act
-                IDataType[] dataTypeDefinitions = DataTypeRepository.GetMany().ToArray();
+            // Act
+            var dataTypeDefinitions = DataTypeRepository.GetMany().ToArray();
 
-                // Assert
-                Assert.That(dataTypeDefinitions, Is.Not.Null);
-                Assert.That(dataTypeDefinitions.Any(), Is.True);
-                Assert.That(dataTypeDefinitions.Any(x => x == null), Is.False);
-                Assert.That(dataTypeDefinitions.Length, Is.EqualTo(37));
-            }
+            // Assert
+            Assert.That(dataTypeDefinitions, Is.Not.Null);
+            Assert.That(dataTypeDefinitions.Any(), Is.True);
+            Assert.That(dataTypeDefinitions.Any(x => x == null), Is.False);
+            Assert.That(dataTypeDefinitions.Length, Is.EqualTo(37));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetAll_With_Params_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_GetAll_With_Params_On_DataTypeDefinitionRepository()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                // Act
-                IDataType[] dataTypeDefinitions = DataTypeRepository.GetMany(-40, -41, -42).ToArray();
+            // Act
+            var dataTypeDefinitions = DataTypeRepository.GetMany(-40, -41, -42).ToArray();
 
-                // Assert
-                Assert.That(dataTypeDefinitions, Is.Not.Null);
-                Assert.That(dataTypeDefinitions.Any(), Is.True);
-                Assert.That(dataTypeDefinitions.Any(x => x == null), Is.False);
-                Assert.That(dataTypeDefinitions.Length, Is.EqualTo(3));
-            }
+            // Assert
+            Assert.That(dataTypeDefinitions, Is.Not.Null);
+            Assert.That(dataTypeDefinitions.Any(), Is.True);
+            Assert.That(dataTypeDefinitions.Any(x => x == null), Is.False);
+            Assert.That(dataTypeDefinitions.Length, Is.EqualTo(3));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetByQuery_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_GetByQuery_On_DataTypeDefinitionRepository()
+    {
+        using (var scope = ScopeProvider.CreateScope())
         {
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // Act
-                IQuery<IDataType> query = ScopeProvider.CreateQuery<IDataType>().Where(x => x.EditorAlias == Constants.PropertyEditors.Aliases.RadioButtonList);
-                IDataType[] result = DataTypeRepository.Get(query).ToArray();
+            // Act
+            var query = ScopeProvider.CreateQuery<IDataType>()
+                .Where(x => x.EditorAlias == Constants.PropertyEditors.Aliases.RadioButtonList);
+            var result = DataTypeRepository.Get(query).ToArray();
 
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.FirstOrDefault()?.Name, Is.EqualTo("Radiobox"));
-            }
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.FirstOrDefault()?.Name, Is.EqualTo("Radiobox"));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Count_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_Count_On_DataTypeDefinitionRepository()
+    {
+        using (var scope = ScopeProvider.CreateScope())
         {
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // Act
-                IQuery<IDataType> query = ScopeProvider.CreateQuery<IDataType>().Where(x => x.Name.StartsWith("D"));
-                int count = DataTypeRepository.Count(query);
+            // Act
+            var query = ScopeProvider.CreateQuery<IDataType>().Where(x => x.Name.StartsWith("D"));
+            var count = DataTypeRepository.Count(query);
 
-                // Assert
-                Assert.That(count, Is.EqualTo(4));
-            }
+            // Assert
+            Assert.That(count, Is.EqualTo(4));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Add_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_Add_On_DataTypeDefinitionRepository()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var dataTypeDefinition = new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer)
+            var dataTypeDefinition =
+                new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer)
                 {
                     DatabaseType = ValueStorageType.Integer,
                     Name = "AgeDataType",
@@ -319,96 +317,99 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repos
                     Configuration = new LabelConfiguration { ValueType = ValueTypes.Xml }
                 };
 
-                // Act
-                DataTypeRepository.Save(dataTypeDefinition);
+            // Act
+            DataTypeRepository.Save(dataTypeDefinition);
 
-                bool exists = DataTypeRepository.Exists(dataTypeDefinition.Id);
-                IDataType fetched = DataTypeRepository.Get(dataTypeDefinition.Id);
+            var exists = DataTypeRepository.Exists(dataTypeDefinition.Id);
+            var fetched = DataTypeRepository.Get(dataTypeDefinition.Id);
 
-                // Assert
-                Assert.That(dataTypeDefinition.HasIdentity, Is.True);
-                Assert.That(exists, Is.True);
+            // Assert
+            Assert.That(dataTypeDefinition.HasIdentity, Is.True);
+            Assert.That(exists, Is.True);
 
-                // cannot compare 'configuration' as it's two different objects
-                TestHelper.AssertPropertyValuesAreEqual(dataTypeDefinition, fetched, ignoreProperties: new[] { "Configuration" });
+            // cannot compare 'configuration' as it's two different objects
+            TestHelper.AssertPropertyValuesAreEqual(dataTypeDefinition, fetched, ignoreProperties: new[] { "Configuration" });
 
-                // still, can compare explicitely
-                Assert.IsNotNull(dataTypeDefinition.Configuration);
-                Assert.IsInstanceOf<LabelConfiguration>(dataTypeDefinition.Configuration);
-                Assert.IsNotNull(fetched.Configuration);
-                Assert.IsInstanceOf<LabelConfiguration>(fetched.Configuration);
-                Assert.AreEqual(ConfigurationEditor.ConfigurationAs<LabelConfiguration>(dataTypeDefinition.Configuration).ValueType, ConfigurationEditor.ConfigurationAs<LabelConfiguration>(fetched.Configuration).ValueType);
-            }
+            // still, can compare explicitely
+            Assert.IsNotNull(dataTypeDefinition.Configuration);
+            Assert.IsInstanceOf<LabelConfiguration>(dataTypeDefinition.Configuration);
+            Assert.IsNotNull(fetched.Configuration);
+            Assert.IsInstanceOf<LabelConfiguration>(fetched.Configuration);
+            Assert.AreEqual(
+                ConfigurationEditor.ConfigurationAs<LabelConfiguration>(dataTypeDefinition.Configuration).ValueType,
+                ConfigurationEditor.ConfigurationAs<LabelConfiguration>(fetched.Configuration).ValueType);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Update_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_Update_On_DataTypeDefinitionRepository()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var dataTypeDefinition = new DataType(new IntegerPropertyEditor(DataValueEditorFactory), ConfigurationEditorJsonSerializer)
+            var dataTypeDefinition =
+                new DataType(new IntegerPropertyEditor(DataValueEditorFactory), ConfigurationEditorJsonSerializer)
                 {
                     DatabaseType = ValueStorageType.Integer,
                     Name = "AgeDataType",
                     CreatorId = 0
                 };
-                DataTypeRepository.Save(dataTypeDefinition);
+            DataTypeRepository.Save(dataTypeDefinition);
 
-                // Act
-                IDataType definition = DataTypeRepository.Get(dataTypeDefinition.Id);
-                definition.Name = "AgeDataType Updated";
-                definition.Editor = new LabelPropertyEditor(DataValueEditorFactory, IOHelper); // change
-                DataTypeRepository.Save(definition);
+            // Act
+            var definition = DataTypeRepository.Get(dataTypeDefinition.Id);
+            definition.Name = "AgeDataType Updated";
+            definition.Editor = new LabelPropertyEditor(DataValueEditorFactory, IOHelper); // change
+            DataTypeRepository.Save(definition);
 
-                IDataType definitionUpdated = DataTypeRepository.Get(dataTypeDefinition.Id);
+            var definitionUpdated = DataTypeRepository.Get(dataTypeDefinition.Id);
 
-                // Assert
-                Assert.That(definitionUpdated, Is.Not.Null);
-                Assert.That(definitionUpdated.Name, Is.EqualTo("AgeDataType Updated"));
-                Assert.That(definitionUpdated.EditorAlias, Is.EqualTo(Constants.PropertyEditors.Aliases.Label));
-            }
+            // Assert
+            Assert.That(definitionUpdated, Is.Not.Null);
+            Assert.That(definitionUpdated.Name, Is.EqualTo("AgeDataType Updated"));
+            Assert.That(definitionUpdated.EditorAlias, Is.EqualTo(Constants.PropertyEditors.Aliases.Label));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Delete_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_Delete_On_DataTypeDefinitionRepository()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                var dataTypeDefinition = new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer)
+            var dataTypeDefinition =
+                new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer)
                 {
                     DatabaseType = ValueStorageType.Integer,
                     Name = "AgeDataType",
                     CreatorId = 0
                 };
 
-                // Act
-                DataTypeRepository.Save(dataTypeDefinition);
+            // Act
+            DataTypeRepository.Save(dataTypeDefinition);
 
-                bool existsBefore = DataTypeRepository.Exists(dataTypeDefinition.Id);
+            var existsBefore = DataTypeRepository.Exists(dataTypeDefinition.Id);
 
-                DataTypeRepository.Delete(dataTypeDefinition);
+            DataTypeRepository.Delete(dataTypeDefinition);
 
-                bool existsAfter = DataTypeRepository.Exists(dataTypeDefinition.Id);
+            var existsAfter = DataTypeRepository.Exists(dataTypeDefinition.Id);
 
-                // Assert
-                Assert.That(existsBefore, Is.True);
-                Assert.That(existsAfter, Is.False);
-            }
+            // Assert
+            Assert.That(existsBefore, Is.True);
+            Assert.That(existsAfter, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Exists_On_DataTypeDefinitionRepository()
+    [Test]
+    public void Can_Perform_Exists_On_DataTypeDefinitionRepository()
+    {
+        using (ScopeProvider.CreateScope())
         {
-            using (ScopeProvider.CreateScope())
-            {
-                // Act
-                bool exists = DataTypeRepository.Exists(1046); // Content picker
-                bool doesntExist = DataTypeRepository.Exists(-80);
+            // Act
+            var exists = DataTypeRepository.Exists(1046); // Content picker
+            var doesntExist = DataTypeRepository.Exists(-80);
 
-                // Assert
-                Assert.That(exists, Is.True);
-                Assert.That(doesntExist, Is.False);
-            }
+            // Assert
+            Assert.That(exists, Is.True);
+            Assert.That(doesntExist, Is.False);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs
index 0ceb0f1732..4d71da076b 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DictionaryRepositoryTest.cs
@@ -6,389 +6,378 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class DictionaryRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class DictionaryRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => CreateTestData();
+
+    private IDictionaryRepository CreateRepository() => GetRequiredService<IDictionaryRepository>();
+
+    [Test]
+    public void Can_Perform_Get_By_Key_On_DictionaryRepository()
     {
-        [SetUp]
-        public void SetUp() => CreateTestData();
-
-        private IDictionaryRepository CreateRepository() => GetRequiredService<IDictionaryRepository>();
-
-        [Test]
-        public void Can_Perform_Get_By_Key_On_DictionaryRepository()
+        // Arrange
+        var localizationService = GetRequiredService<ILocalizationService>();
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
+            var repository = CreateRepository();
+            var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
             {
-                IDictionaryRepository repository = CreateRepository();
-                var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
+                Translations = new List<IDictionaryTranslation>
                 {
-                    Translations = new List<IDictionaryTranslation>
-                    {
-                        new DictionaryTranslation(localizationService.GetLanguageByIsoCode("en-US"), "Hello world")
-                    }
-                };
-
-                repository.Save(dictionaryItem);
-
-                // re-get
-                dictionaryItem = repository.Get("Testing1235");
-
-                // Assert
-                Assert.That(dictionaryItem, Is.Not.Null);
-                Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
-                Assert.That(dictionaryItem.Translations.Any(), Is.True);
-                Assert.That(dictionaryItem.Translations.Any(x => x == null), Is.False);
-                Assert.That(dictionaryItem.Translations.First().Value, Is.EqualTo("Hello world"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_By_UniqueId_On_DictionaryRepository()
-        {
-            // Arrange
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-                var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
-                {
-                    Translations = new List<IDictionaryTranslation>
-                    {
-                        new DictionaryTranslation(localizationService.GetLanguageByIsoCode("en-US"), "Hello world")
-                    }
-                };
-
-                repository.Save(dictionaryItem);
-
-                // re-get
-                dictionaryItem = repository.Get(dictionaryItem.Key);
-
-                // Assert
-                Assert.That(dictionaryItem, Is.Not.Null);
-                Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
-                Assert.That(dictionaryItem.Translations.Any(), Is.True);
-                Assert.That(dictionaryItem.Translations.Any(x => x == null), Is.False);
-                Assert.That(dictionaryItem.Translations.First().Value, Is.EqualTo("Hello world"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_On_DictionaryRepository()
-        {
-            // Arrange
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-                var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
-                {
-                    Translations = new List<IDictionaryTranslation>
-                    {
-                        new DictionaryTranslation(localizationService.GetLanguageByIsoCode("en-US"), "Hello world")
-                    }
-                };
-
-                repository.Save(dictionaryItem);
-
-                // re-get
-                dictionaryItem = repository.Get(dictionaryItem.Id);
-
-                // Assert
-                Assert.That(dictionaryItem, Is.Not.Null);
-                Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
-                Assert.That(dictionaryItem.Translations.Any(), Is.True);
-                Assert.That(dictionaryItem.Translations.Any(x => x == null), Is.False);
-                Assert.That(dictionaryItem.Translations.First().Value, Is.EqualTo("Hello world"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_On_DictionaryRepository_When_No_Language_Assigned()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-                var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235");
-
-                repository.Save(dictionaryItem);
-
-                // re-get
-                dictionaryItem = repository.Get(dictionaryItem.Id);
-
-                // Assert
-                Assert.That(dictionaryItem, Is.Not.Null);
-                Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
-                Assert.That(dictionaryItem.Translations.Any(), Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                // Act
-                IDictionaryItem dictionaryItem = repository.Get(1);
-                IEnumerable<IDictionaryItem> dictionaryItems = repository.GetMany();
-
-                // Assert
-                Assert.That(dictionaryItems, Is.Not.Null);
-                Assert.That(dictionaryItems.Any(), Is.True);
-                Assert.That(dictionaryItems.Any(x => x == null), Is.False);
-                Assert.That(dictionaryItems.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_With_Params_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                // Act
-                IEnumerable<IDictionaryItem> dictionaryItems = repository.GetMany(1, 2);
-
-                // Assert
-                Assert.That(dictionaryItems, Is.Not.Null);
-                Assert.That(dictionaryItems.Any(), Is.True);
-                Assert.That(dictionaryItems.Any(x => x == null), Is.False);
-                Assert.That(dictionaryItems.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetByQuery_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                // Act
-                IQuery<IDictionaryItem> query = provider.CreateQuery<IDictionaryItem>().Where(x => x.ItemKey == "Article");
-                IEnumerable<IDictionaryItem> result = repository.Get(query);
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.FirstOrDefault().ItemKey, Is.EqualTo("Article"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Count_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                // Act
-                IQuery<IDictionaryItem> query = provider.CreateQuery<IDictionaryItem>().Where(x => x.ItemKey.StartsWith("Read"));
-                int result = repository.Count(query);
-
-                // Assert
-                Assert.That(result, Is.EqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ILanguageRepository languageRepository = GetRequiredService<ILanguageRepository>();
-                IDictionaryRepository repository = CreateRepository();
-
-                ILanguage language = languageRepository.Get(1);
-
-                var read = new DictionaryItem("Read");
-                var translations = new List<IDictionaryTranslation>
-                {
-                    new DictionaryTranslation(language, "Read")
-                };
-                read.Translations = translations;
-
-                // Act
-                repository.Save(read);
-
-                bool exists = repository.Exists(read.Id);
-
-                // Assert
-                Assert.That(read.HasIdentity, Is.True);
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                // Act
-                IDictionaryItem item = repository.Get(1);
-                var translations = item.Translations.ToList();
-                translations[0].Value = "Read even more";
-                item.Translations = translations;
-
-                repository.Save(item);
-
-                IDictionaryItem dictionaryItem = repository.Get(1);
-
-                // Assert
-                Assert.That(dictionaryItem, Is.Not.Null);
-                Assert.That(dictionaryItem.Translations.Count(), Is.EqualTo(2));
-                Assert.That(dictionaryItem.Translations.FirstOrDefault().Value, Is.EqualTo("Read even more"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_WithNewTranslation_On_DictionaryRepository()
-        {
-            // Arrange
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                var languageNo = new Language("nb-NO", "Norwegian Bokmål (Norway)");
-                localizationService.Save(languageNo);
-
-                // Act
-                IDictionaryItem item = repository.Get(1);
-                var translations = item.Translations.ToList();
-                translations.Add(new DictionaryTranslation(languageNo, "Les mer"));
-                item.Translations = translations;
-
-                repository.Save(item);
-
-                var dictionaryItem = (DictionaryItem)repository.Get(1);
-
-                // Assert
-                Assert.That(dictionaryItem, Is.Not.Null);
-                Assert.That(dictionaryItem.Translations.Count(), Is.EqualTo(3));
-                Assert.That(dictionaryItem.Translations.Single(t => t.LanguageId == languageNo.Id).Value, Is.EqualTo("Les mer"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                // Act
-                IDictionaryItem item = repository.Get(1);
-                repository.Delete(item);
-
-                bool exists = repository.Exists(1);
-
-                // Assert
-                Assert.That(exists, Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_DictionaryRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-
-                // Act
-                bool exists = repository.Exists(1);
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetDictionaryItemKeyMap_On_DictionaryRepository()
-        {
-            Dictionary<string, Guid> keyMap;
-
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                IDictionaryRepository repository = CreateRepository();
-                keyMap = repository.GetDictionaryItemKeyMap();
-            }
-
-            Assert.IsNotNull(keyMap);
-            Assert.IsNotEmpty(keyMap);
-            foreach (KeyValuePair<string, Guid> kvp in keyMap)
-            {
-                Console.WriteLine("{0}: {1}", kvp.Key, kvp.Value);
-            }
-        }
-
-        public void CreateTestData()
-        {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            ILanguage language = localizationService.GetLanguageByIsoCode("en-US");
-
-            var languageDK = new Language("da-DK", "Danish (Denmark)");
-            localizationService.Save(languageDK);//Id 2
-
-            var readMore = new DictionaryItem("Read More");
-            var translations = new List<IDictionaryTranslation>
-            {
-                new DictionaryTranslation(language, "Read More"),
-                new DictionaryTranslation(languageDK, "Læs mere")
+                    new DictionaryTranslation(localizationService.GetLanguageByIsoCode("en-US"), "Hello world")
+                }
             };
-            readMore.Translations = translations;
-            localizationService.Save(readMore); // Id 1
 
-            var article = new DictionaryItem("Article");
-            var translations2 = new List<IDictionaryTranslation>
-            {
-                new DictionaryTranslation(language, "Article"),
-                new DictionaryTranslation(languageDK, "Artikel")
-            };
-            article.Translations = translations2;
-            localizationService.Save(article); // Id 2
+            repository.Save(dictionaryItem);
+
+            // re-get
+            dictionaryItem = repository.Get("Testing1235");
+
+            // Assert
+            Assert.That(dictionaryItem, Is.Not.Null);
+            Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
+            Assert.That(dictionaryItem.Translations.Any(), Is.True);
+            Assert.That(dictionaryItem.Translations.Any(x => x == null), Is.False);
+            Assert.That(dictionaryItem.Translations.First().Value, Is.EqualTo("Hello world"));
         }
     }
+
+    [Test]
+    public void Can_Perform_Get_By_UniqueId_On_DictionaryRepository()
+    {
+        // Arrange
+        var localizationService = GetRequiredService<ILocalizationService>();
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+            var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
+            {
+                Translations = new List<IDictionaryTranslation>
+                {
+                    new DictionaryTranslation(localizationService.GetLanguageByIsoCode("en-US"), "Hello world")
+                }
+            };
+
+            repository.Save(dictionaryItem);
+
+            // re-get
+            dictionaryItem = repository.Get(dictionaryItem.Key);
+
+            // Assert
+            Assert.That(dictionaryItem, Is.Not.Null);
+            Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
+            Assert.That(dictionaryItem.Translations.Any(), Is.True);
+            Assert.That(dictionaryItem.Translations.Any(x => x == null), Is.False);
+            Assert.That(dictionaryItem.Translations.First().Value, Is.EqualTo("Hello world"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_DictionaryRepository()
+    {
+        // Arrange
+        var localizationService = GetRequiredService<ILocalizationService>();
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+            var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235")
+            {
+                Translations = new List<IDictionaryTranslation>
+                {
+                    new DictionaryTranslation(localizationService.GetLanguageByIsoCode("en-US"), "Hello world")
+                }
+            };
+
+            repository.Save(dictionaryItem);
+
+            // re-get
+            dictionaryItem = repository.Get(dictionaryItem.Id);
+
+            // Assert
+            Assert.That(dictionaryItem, Is.Not.Null);
+            Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
+            Assert.That(dictionaryItem.Translations.Any(), Is.True);
+            Assert.That(dictionaryItem.Translations.Any(x => x == null), Is.False);
+            Assert.That(dictionaryItem.Translations.First().Value, Is.EqualTo("Hello world"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_DictionaryRepository_When_No_Language_Assigned()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+            var dictionaryItem = (IDictionaryItem)new DictionaryItem("Testing1235");
+
+            repository.Save(dictionaryItem);
+
+            // re-get
+            dictionaryItem = repository.Get(dictionaryItem.Id);
+
+            // Assert
+            Assert.That(dictionaryItem, Is.Not.Null);
+            Assert.That(dictionaryItem.ItemKey, Is.EqualTo("Testing1235"));
+            Assert.That(dictionaryItem.Translations.Any(), Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var dictionaryItem = repository.Get(1);
+            var dictionaryItems = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(dictionaryItems, Is.Not.Null);
+            Assert.That(dictionaryItems.Any(), Is.True);
+            Assert.That(dictionaryItems.Any(x => x == null), Is.False);
+            Assert.That(dictionaryItems.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_With_Params_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var dictionaryItems = repository.GetMany(1, 2).ToArray();
+
+            // Assert
+            Assert.That(dictionaryItems, Is.Not.Null);
+            Assert.That(dictionaryItems.Any(), Is.True);
+            Assert.That(dictionaryItems.Any(x => x == null), Is.False);
+            Assert.That(dictionaryItems.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetByQuery_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var query = provider.CreateQuery<IDictionaryItem>().Where(x => x.ItemKey == "Article");
+            var result = repository.Get(query).ToArray();
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.FirstOrDefault().ItemKey, Is.EqualTo("Article"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Count_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var query = provider.CreateQuery<IDictionaryItem>().Where(x => x.ItemKey.StartsWith("Read"));
+            var result = repository.Count(query);
+
+            // Assert
+            Assert.That(result, Is.EqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var languageRepository = GetRequiredService<ILanguageRepository>();
+            var repository = CreateRepository();
+
+            var language = languageRepository.Get(1);
+
+            var read = new DictionaryItem("Read");
+            var translations = new List<IDictionaryTranslation> { new DictionaryTranslation(language, "Read") };
+            read.Translations = translations;
+
+            // Act
+            repository.Save(read);
+
+            var exists = repository.Exists(read.Id);
+
+            // Assert
+            Assert.That(read.HasIdentity, Is.True);
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var item = repository.Get(1);
+            var translations = item.Translations.ToList();
+            translations[0].Value = "Read even more";
+            item.Translations = translations;
+
+            repository.Save(item);
+
+            var dictionaryItem = repository.Get(1);
+
+            // Assert
+            Assert.That(dictionaryItem, Is.Not.Null);
+            Assert.That(dictionaryItem.Translations.Count(), Is.EqualTo(2));
+            Assert.That(dictionaryItem.Translations.FirstOrDefault().Value, Is.EqualTo("Read even more"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_WithNewTranslation_On_DictionaryRepository()
+    {
+        // Arrange
+        var localizationService = GetRequiredService<ILocalizationService>();
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            var languageNo = new Language("nb-NO", "Norwegian Bokmål (Norway)");
+            localizationService.Save(languageNo);
+
+            // Act
+            var item = repository.Get(1);
+            var translations = item.Translations.ToList();
+            translations.Add(new DictionaryTranslation(languageNo, "Les mer"));
+            item.Translations = translations;
+
+            repository.Save(item);
+
+            var dictionaryItem = (DictionaryItem)repository.Get(1);
+
+            // Assert
+            Assert.That(dictionaryItem, Is.Not.Null);
+            Assert.That(dictionaryItem.Translations.Count(), Is.EqualTo(3));
+            Assert.That(dictionaryItem.Translations.Single(t => t.LanguageId == languageNo.Id).Value, Is.EqualTo("Les mer"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var item = repository.Get(1);
+            repository.Delete(item);
+
+            var exists = repository.Exists(1);
+
+            // Assert
+            Assert.That(exists, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists_On_DictionaryRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var exists = repository.Exists(1);
+
+            // Assert
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetDictionaryItemKeyMap_On_DictionaryRepository()
+    {
+        Dictionary<string, Guid> keyMap;
+
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository();
+            keyMap = repository.GetDictionaryItemKeyMap();
+        }
+
+        Assert.IsNotNull(keyMap);
+        Assert.IsNotEmpty(keyMap);
+        foreach (var kvp in keyMap)
+        {
+            Console.WriteLine("{0}: {1}", kvp.Key, kvp.Value);
+        }
+    }
+
+    public void CreateTestData()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+        var language = localizationService.GetLanguageByIsoCode("en-US");
+
+        var languageDK = new Language("da-DK", "Danish (Denmark)");
+        localizationService.Save(languageDK); //Id 2
+
+        var readMore = new DictionaryItem("Read More");
+        var translations = new List<IDictionaryTranslation>
+        {
+            new DictionaryTranslation(language, "Read More"), new DictionaryTranslation(languageDK, "Læs mere")
+        };
+        readMore.Translations = translations;
+        localizationService.Save(readMore); // Id 1
+
+        var article = new DictionaryItem("Article");
+        var translations2 = new List<IDictionaryTranslation>
+        {
+            new DictionaryTranslation(language, "Article"), new DictionaryTranslation(languageDK, "Artikel")
+        };
+        article.Translations = translations2;
+        localizationService.Save(article); // Id 2
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs
index 7c4b0865fd..bcdcf7666a 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentRepositoryTest.cs
@@ -10,1106 +10,1134 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class DocumentRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class DocumentRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUpData()
     {
-        private ContentType _contentType;
-        private Content _textpage;
-        private Content _subpage;
-        private Content _subpage2;
-        private Content _trashed;
+        CreateTestData();
 
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        ContentRepositoryBase.ThrowOnWarning = true;
+    }
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+    [TearDown]
+    public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
 
-        private IFileService FileService => GetRequiredService<IFileService>();
+    private ContentType _contentType;
+    private Content _textpage;
+    private Content _subpage;
+    private Content _subpage2;
+    private Content _trashed;
 
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+    private IContentService ContentService => GetRequiredService<IContentService>();
 
-        private FileSystems FileSystems => GetRequiredService<FileSystems>();
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
 
-        private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer => GetRequiredService<IConfigurationEditorJsonSerializer>();
+    private IFileService FileService => GetRequiredService<IFileService>();
 
-        [SetUp]
-        public void SetUpData()
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private FileSystems FileSystems => GetRequiredService<FileSystems>();
+
+    private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer =>
+        GetRequiredService<IConfigurationEditorJsonSerializer>();
+
+    public void CreateTestData()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        // Create and Save ContentType "umbTextpage" -> (_contentType.Id)
+        _contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        _contentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
+        ContentTypeService.Save(_contentType);
+
+        // Create and Save Content "Homepage" based on "umbTextpage" -> (_textpage.Id)
+        _textpage = ContentBuilder.CreateSimpleContent(_contentType);
+        _textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0");
+        ContentService.Save(_textpage, 0);
+
+        // Create and Save Content "Text Page 1" based on "umbTextpage" -> (_subpage.Id)
+        _subpage = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 1", _textpage.Id);
+        _subpage.Key = new Guid("FF11402B-7E53-4654-81A7-462AC2108059");
+        ContentService.Save(_subpage, 0);
+
+        // Create and Save Content "Text Page 1" based on "umbTextpage" -> (_subpage2.Id)
+        _subpage2 = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 2", _textpage.Id);
+        ContentService.Save(_subpage2, 0);
+
+        // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> (_trashed.Id)
+        _trashed = ContentBuilder.CreateSimpleContent(_contentType, "Text Page Deleted", -20);
+        _trashed.Trashed = true;
+        ContentService.Save(_trashed, 0);
+    }
+
+    private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository, out DataTypeRepository dtdRepository, AppCaches appCaches = null)
+    {
+        appCaches ??= AppCaches;
+
+        var ctRepository = CreateRepository(scopeAccessor, out contentTypeRepository, out TemplateRepository tr);
+        var editors = new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
+        dtdRepository = new DataTypeRepository(scopeAccessor, appCaches, editors, LoggerFactory.CreateLogger<DataTypeRepository>(), LoggerFactory, ConfigurationEditorJsonSerializer);
+        return ctRepository;
+    }
+
+    private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository, AppCaches appCaches = null) =>
+        CreateRepository(scopeAccessor, out contentTypeRepository, out TemplateRepository tr, appCaches);
+
+    private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository, AppCaches appCaches = null)
+    {
+        appCaches ??= AppCaches;
+
+        templateRepository = new TemplateRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<TemplateRepository>(), FileSystems, IOHelper, ShortStringHelper, Mock.Of<IViewHelper>());
+        var tagRepository = new TagRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<TagRepository>());
+        var commonRepository =
+            new ContentTypeCommonRepository(scopeAccessor, templateRepository, appCaches, ShortStringHelper);
+        var languageRepository =
+            new LanguageRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<LanguageRepository>());
+        contentTypeRepository = new ContentTypeRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<ContentTypeRepository>(), commonRepository, languageRepository, ShortStringHelper);
+        var relationTypeRepository = new RelationTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
+        var entityRepository = new EntityRepository(scopeAccessor, AppCaches.Disabled);
+        var relationRepository = new RelationRepository(scopeAccessor, LoggerFactory.CreateLogger<RelationRepository>(), relationTypeRepository, entityRepository);
+        var propertyEditors =
+            new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
+        var dataValueReferences =
+            new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
+        var repository = new DocumentRepository(
+            scopeAccessor,
+            appCaches,
+            LoggerFactory.CreateLogger<DocumentRepository>(),
+            LoggerFactory,
+            contentTypeRepository,
+            templateRepository,
+            tagRepository,
+            languageRepository,
+            relationRepository,
+            relationTypeRepository,
+            propertyEditors,
+            dataValueReferences,
+            DataTypeService,
+            ConfigurationEditorJsonSerializer,
+            Mock.Of<IEventAggregator>());
+        return repository;
+    }
+
+    [Test]
+    public void CacheActiveForIntsAndGuids()
+    {
+        var realCache = new AppCaches(
+            new ObjectCacheAppCache(),
+            new DictionaryAppCache(),
+            new IsolatedCaches(t => new ObjectCacheAppCache()));
+
+        var provider = ScopeProvider;
+        var scopeAccessor = ScopeAccessor;
+
+        using (var scope = provider.CreateScope())
         {
-            CreateTestData();
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository, realCache);
 
-            ContentRepositoryBase.ThrowOnWarning = true;
-        }
+            var udb = scopeAccessor.AmbientScope.Database;
 
-        [TearDown]
-        public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
+            udb.EnableSqlCount = false;
 
-        public void CreateTestData()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
+            var template = TemplateBuilder.CreateTextPageTemplate();
             FileService.SaveTemplate(template);
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
 
-            // Create and Save ContentType "umbTextpage" -> (_contentType.Id)
-            _contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            _contentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
-            ContentTypeService.Save(_contentType);
+            contentTypeRepository.Save(contentType);
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            repository.Save(content);
 
-            // Create and Save Content "Homepage" based on "umbTextpage" -> (_textpage.Id)
-            _textpage = ContentBuilder.CreateSimpleContent(_contentType);
-            _textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0");
-            ContentService.Save(_textpage, 0);
+            udb.EnableSqlCount = true;
 
-            // Create and Save Content "Text Page 1" based on "umbTextpage" -> (_subpage.Id)
-            _subpage = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 1", _textpage.Id);
-            _subpage.Key = new Guid("FF11402B-7E53-4654-81A7-462AC2108059");
-            ContentService.Save(_subpage, 0);
+            // go get it, this should already be cached since the default repository key is the INT
+            repository.Get(content.Id);
+            Assert.AreEqual(0, udb.SqlCount);
 
-            // Create and Save Content "Text Page 1" based on "umbTextpage" -> (_subpage2.Id)
-            _subpage2 = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 2", _textpage.Id);
-            ContentService.Save(_subpage2, 0);
+            // retrieve again, this should use cache
+            repository.Get(content.Id);
+            Assert.AreEqual(0, udb.SqlCount);
 
-            // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> (_trashed.Id)
-            _trashed = ContentBuilder.CreateSimpleContent(_contentType, "Text Page Deleted", -20);
-            _trashed.Trashed = true;
-            ContentService.Save(_trashed, 0);
+            // reset counter
+            udb.EnableSqlCount = false;
+            udb.EnableSqlCount = true;
+
+            // now get by GUID, this won't be cached yet because the default repo key is not a GUID
+            repository.Get(content.Key);
+            var sqlCount = udb.SqlCount;
+            Assert.Greater(sqlCount, 0);
+
+            // retrieve again, this should use cache now
+            repository.Get(content.Key);
+            Assert.AreEqual(sqlCount, udb.SqlCount);
         }
+    }
 
-        private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository, out DataTypeRepository dtdRepository, AppCaches appCaches = null)
+    [Test]
+    public void CreateVersions()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            appCaches ??= AppCaches;
-
-            DocumentRepository ctRepository = CreateRepository(scopeAccessor, out contentTypeRepository, out TemplateRepository tr);
-            var editors = new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
-            dtdRepository = new DataTypeRepository(scopeAccessor, appCaches, editors, LoggerFactory.CreateLogger<DataTypeRepository>(), LoggerFactory, ConfigurationEditorJsonSerializer);
-            return ctRepository;
-        }
-
-        private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository, AppCaches appCaches = null) =>
-            CreateRepository(scopeAccessor, out contentTypeRepository, out TemplateRepository tr, appCaches);
-
-        private DocumentRepository CreateRepository(IScopeAccessor scopeAccessor, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository, AppCaches appCaches = null)
-        {
-            appCaches ??= AppCaches;
-
-            templateRepository = new TemplateRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<TemplateRepository>(), FileSystems, IOHelper, ShortStringHelper, Mock.Of<IViewHelper>());
-            var tagRepository = new TagRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<TagRepository>());
-            var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, appCaches, ShortStringHelper);
-            var languageRepository = new LanguageRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<LanguageRepository>());
-            contentTypeRepository = new ContentTypeRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<ContentTypeRepository>(), commonRepository, languageRepository, ShortStringHelper);
-            var relationTypeRepository = new RelationTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
-            var entityRepository = new EntityRepository(scopeAccessor, AppCaches.Disabled);
-            var relationRepository = new RelationRepository(scopeAccessor, LoggerFactory.CreateLogger<RelationRepository>(), relationTypeRepository, entityRepository);
-            var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
-            var dataValueReferences = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
-            var repository = new DocumentRepository(
-                scopeAccessor,
-                appCaches,
-                LoggerFactory.CreateLogger<DocumentRepository>(),
-                LoggerFactory,
-                contentTypeRepository,
-                templateRepository,
-                tagRepository,
-                languageRepository,
-                relationRepository,
-                relationTypeRepository,
-                propertyEditors,
-                dataValueReferences,
-                DataTypeService,
-                ConfigurationEditorJsonSerializer,
-                Mock.Of<IEventAggregator>());
-            return repository;
-        }
-
-        [Test]
-        public void CacheActiveForIntsAndGuids()
-        {
-            var realCache = new AppCaches(
-                new ObjectCacheAppCache(),
-                new DictionaryAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache()));
-
-            IScopeProvider provider = ScopeProvider;
-            IScopeAccessor scopeAccessor = ScopeAccessor;
-
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository, appCaches: realCache);
-
-                IUmbracoDatabase udb = scopeAccessor.AmbientScope.Database;
-
-                udb.EnableSqlCount = false;
-
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
-
-                contentTypeRepository.Save(contentType);
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                repository.Save(content);
-
-                udb.EnableSqlCount = true;
-
-                // go get it, this should already be cached since the default repository key is the INT
-                repository.Get(content.Id);
-                Assert.AreEqual(0, udb.SqlCount);
-
-                // retrieve again, this should use cache
-                repository.Get(content.Id);
-                Assert.AreEqual(0, udb.SqlCount);
-
-                // reset counter
-                udb.EnableSqlCount = false;
-                udb.EnableSqlCount = true;
-
-                // now get by GUID, this won't be cached yet because the default repo key is not a GUID
-                repository.Get(content.Key);
-                int sqlCount = udb.SqlCount;
-                Assert.Greater(sqlCount, 0);
-
-                // retrieve again, this should use cache now
-                repository.Get(content.Key);
-                Assert.AreEqual(sqlCount, udb.SqlCount);
-            }
-        }
-
-        [Test]
-        public void CreateVersions()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository, out DataTypeRepository _);
-
-                var versions = new List<int>();
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-                ContentType hasPropertiesContentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
-
-                contentTypeRepository.Save(hasPropertiesContentType);
-
-                IContent content1 = ContentBuilder.CreateSimpleContent(hasPropertiesContentType);
-
-                // save = create the initial version
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // the first version
-
-                // publish = new edit version
-                content1.SetValue("title", "title");
-                content1.PublishCulture(CultureImpact.Invariant);
-                content1.PublishedState = PublishedState.Publishing;
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // NEW VERSION
-
-                // new edit version has been created
-                Assert.AreNotEqual(versions[^2], versions[^1]);
-                Assert.IsTrue(content1.Published);
-                Assert.AreEqual(PublishedState.Published, ((Content)content1).PublishedState);
-                Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
-
-                // misc checks
-                Assert.AreEqual(true, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>($"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id", new { id = content1.Id }));
-
-                // change something
-                // save = update the current (draft) version
-                content1.Name = "name-1";
-                content1.SetValue("title", "title-1");
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // the same version
-
-                // no new version has been created
-                Assert.AreEqual(versions[^2], versions[^1]);
-                Assert.IsTrue(content1.Published);
-                Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
-
-                // misc checks
-                Assert.AreEqual(true, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>($"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id", new { id = content1.Id }));
-
-                // unpublish = no impact on versions
-                ((Content)content1).PublishedState = PublishedState.Unpublishing;
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // the same version
-
-                // no new version has been created
-                Assert.AreEqual(versions[^2], versions[^1]);
-                Assert.IsFalse(content1.Published);
-                Assert.AreEqual(PublishedState.Unpublished, ((Content)content1).PublishedState);
-                Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
-
-                // misc checks
-                Assert.AreEqual(false, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>($"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id", new { id = content1.Id }));
-
-                // change something
-                // save = update the current (draft) version
-                content1.Name = "name-2";
-                content1.SetValue("title", "title-2");
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // the same version
-
-                // no new version has been created
-                Assert.AreEqual(versions[^2], versions[^1]);
-                Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
-
-                // misc checks
-                Assert.AreEqual(false, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>($"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id", new { id = content1.Id }));
-
-                // publish = version
-                content1.PublishCulture(CultureImpact.Invariant);
-                content1.PublishedState = PublishedState.Publishing;
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // NEW VERSION
-
-                // new version has been created
-                Assert.AreNotEqual(versions[^2], versions[^1]);
-                Assert.IsTrue(content1.Published);
-                Assert.AreEqual(PublishedState.Published, ((Content)content1).PublishedState);
-                Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
-
-                // misc checks
-                Assert.AreEqual(true, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>($"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id", new { id = content1.Id }));
-
-                // change something
-                // save = update the current (draft) version
-                content1.Name = "name-3";
-                content1.SetValue("title", "title-3");
-
-                //// Thread.Sleep(2000); // force date change
-
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // the same version
-
-                // no new version has been created
-                Assert.AreEqual(versions[^2], versions[^1]);
-                Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
-
-                // misc checks
-                Assert.AreEqual(true, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>($"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id", new { id = content1.Id }));
-
-                // publish = new version
-                content1.Name = "name-4";
-                content1.SetValue("title", "title-4");
-                content1.PublishCulture(CultureImpact.Invariant);
-                content1.PublishedState = PublishedState.Publishing;
-                repository.Save(content1);
-
-                versions.Add(content1.VersionId); // NEW VERSION
-
-                // a new version has been created
-                Assert.AreNotEqual(versions[^2], versions[^1]);
-                Assert.IsTrue(content1.Published);
-                Assert.AreEqual(PublishedState.Published, ((Content)content1).PublishedState);
-                Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
-
-                // misc checks
-                Assert.AreEqual(true, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>($"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id", new { id = content1.Id }));
-
-                // all versions
-                IContent[] allVersions = repository.GetAllVersions(content1.Id).ToArray();
-                Console.WriteLine();
-                foreach (int v in versions)
-                {
-                    Console.WriteLine(v);
-                }
-
-                Console.WriteLine();
-                foreach (IContent v in allVersions)
-                {
-                    var c = (Content)v;
-                    Console.WriteLine($"{c.Id} {c.VersionId} {(c.Published ? "+" : "-")}pub pk={c.VersionId} ppk={c.PublishedVersionId} name=\"{c.Name}\" pname=\"{c.PublishName}\"");
-                }
-
-                // get older version
-                IContent content = repository.GetVersion(versions[^4]);
-                Assert.AreNotEqual(0, content.VersionId);
-                Assert.AreEqual(versions[^4], content.VersionId);
-                Assert.AreEqual("name-4", content1.Name);
-                Assert.AreEqual("title-4", content1.GetValue("title"));
-                Assert.AreEqual("name-2", content.Name);
-                Assert.AreEqual("title-2", content.GetValue("title"));
-
-                // get all versions - most recent first
-                allVersions = repository.GetAllVersions(content1.Id).ToArray();
-                int[] expVersions = versions.Distinct().Reverse().ToArray();
-                Assert.AreEqual(expVersions.Length, allVersions.Length);
-                for (int i = 0; i < expVersions.Length; i++)
-                {
-                    Assert.AreEqual(expVersions[i], allVersions[i].VersionId);
-                }
-            }
-        }
-
-        /// <summary>
-        /// This tests the regression issue of U4-9438
-        /// </summary>
-        /// <remarks>
-        /// The problem was the iteration of the property data in VersionableRepositoryBase when a content item
-        /// in the list actually doesn't have any property types, it would still skip over a property row.
-        /// To test, we have 3 content items, the first has properties, the second doesn't and the third does.
-        /// </remarks>
-        [Test]
-        public void PropertyDataAssignedCorrectly()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository, out DataTypeRepository _);
-
-                ContentType emptyContentType = ContentTypeBuilder.CreateBasicContentType();
-                ContentType hasPropertiesContentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
-                contentTypeRepository.Save(emptyContentType);
-                contentTypeRepository.Save(hasPropertiesContentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(hasPropertiesContentType);
-                Content content2 = ContentBuilder.CreateBasicContent(emptyContentType);
-                Content content3 = ContentBuilder.CreateSimpleContent(hasPropertiesContentType);
-
-                repository.Save(content1);
-                repository.Save(content2);
-                repository.Save(content3);
-
-                // this will cause the GetPropertyCollection to execute and we need to ensure that
-                // all of the properties and property types are all correct
-                IContent[] result = repository.GetMany(content1.Id, content2.Id, content3.Id).ToArray();
-                IContent n1 = result[0];
-                IContent n2 = result[1];
-                IContent n3 = result[2];
-
-                Assert.AreEqual(content1.Id, n1.Id);
-                Assert.AreEqual(content2.Id, n2.Id);
-                Assert.AreEqual(content3.Id, n3.Id);
-
-                // compare everything including properties and their values
-                // this ensures that they have been properly retrieved
-                TestHelper.AssertPropertyValuesAreEqual(content1, n1);
-                TestHelper.AssertPropertyValuesAreEqual(content2, n2);
-                TestHelper.AssertPropertyValuesAreEqual(content3, n3);
-            }
-        }
-
-        //// /// <summary>
-        //// /// This test ensures that when property values using special database fields are saved, the actual data in the
-        //// /// object being stored is also transformed in the same way as the data being stored in the database is.
-        //// /// Before you would see that ex: a decimal value being saved as 100 or "100", would be that exact value in the
-        //// /// object, but the value saved to the database was actually 100.000000.
-        //// /// When querying the database for the value again - the value would then differ from what is in the object.
-        //// /// This caused inconsistencies between saving+publishing and simply saving and then publishing, due to the former
-        //// /// sending the non-transformed data directly on to publishing.
-        //// /// </summary>
-        //// [Test]
-        //// public void PropertyValuesWithSpecialTypes()
-        //// {
-        ////     var provider = ScopeProvider;
-        ////     using (var scope = provider.CreateScope())
-        ////     {
-        ////         var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository, out DataTypeRepository dataTypeDefinitionRepository);
-        ////
-        ////         var editor = new DecimalPropertyEditor(LoggerFactory, DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper);
-        ////         var dtd = new DataType(editor) { Name = "test", DatabaseType = ValueStorageType.Decimal };
-        ////         dataTypeDefinitionRepository.Save(dtd);
-        ////
-        ////         const string decimalPropertyAlias = "decimalProperty";
-        ////         const string intPropertyAlias = "intProperty";
-        ////         const string dateTimePropertyAlias = "datetimeProperty";
-        ////         var dateValue = new DateTime(2016, 1, 6);
-        ////
-        ////         var propertyTypeCollection = new PropertyTypeCollection(true,
-        ////             new List<PropertyType>
-        ////             {
-        ////                 MockedPropertyTypes.CreateDecimalProperty(decimalPropertyAlias, "Decimal property", dtd.Id),
-        ////                 MockedPropertyTypes.CreateIntegerProperty(intPropertyAlias, "Integer property"),
-        ////                 MockedPropertyTypes.CreateDateTimeProperty(dateTimePropertyAlias, "DateTime property")
-        ////             });
-        ////         var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", propertyTypeCollection);
-        ////         contentTypeRepository.Save(contentType);
-        ////
-        ////         // int and decimal values are passed in as strings as they would be from the backoffice UI
-        ////         var textpage = ContentBuilder.CreateSimpleContentWithSpecialDatabaseTypes(contentType, "test@umbraco.org", -1, "100", "150", dateValue);
-        ////
-        ////         repository.Save(textpage);
-        ////         scope.Complete();
-        ////
-        ////         Assert.That(contentType.HasIdentity, Is.True);
-        ////         Assert.That(textpage.HasIdentity, Is.True);
-        ////
-        ////         var persistedTextpage = repository.Get(textpage.Id);
-        ////         Assert.That(persistedTextpage.Name, Is.EqualTo(textpage.Name));
-        ////         Assert.AreEqual(100m, persistedTextpage.GetValue(decimalPropertyAlias));
-        ////         Assert.AreEqual(persistedTextpage.GetValue(decimalPropertyAlias), textpage.GetValue(decimalPropertyAlias));
-        ////         Assert.AreEqual(150, persistedTextpage.GetValue(intPropertyAlias));
-        ////         Assert.AreEqual(persistedTextpage.GetValue(intPropertyAlias), textpage.GetValue(intPropertyAlias));
-        ////         Assert.AreEqual(dateValue, persistedTextpage.GetValue(dateTimePropertyAlias));
-        ////         Assert.AreEqual(persistedTextpage.GetValue(dateTimePropertyAlias), textpage.GetValue(dateTimePropertyAlias));
-        ////     }
-        //// }
-
-        [Test]
-        public void SaveContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository);
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage2", "Textpage", defaultTemplateId: template.Id);
-                contentTypeRepository.Save(contentType);
-
-                IContent textpage = ContentBuilder.CreateSimpleContent(contentType);
-
-                repository.Save(textpage);
-                scope.Complete();
-
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(textpage.HasIdentity, Is.True);
-            }
-        }
-
-        [Test]
-        public void SaveContentWithDefaultTemplate()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository, out TemplateRepository templateRepository);
-
-                var template = new Template(ShortStringHelper, "hello", "hello");
-                templateRepository.Save(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage2", "Textpage");
-                contentType.AllowedTemplates = Enumerable.Empty<ITemplate>(); // because CreateSimpleContentType assigns one already
-                contentType.SetDefaultTemplate(template);
-                contentTypeRepository.Save(contentType);
-
-                Content textpage = ContentBuilder.CreateSimpleContent(contentType);
-                repository.Save(textpage);
-
-                IContent fetched = repository.Get(textpage.Id);
-
-                Assert.True(textpage.TemplateId.HasValue);
-                Assert.NotZero(textpage.TemplateId.Value);
-                Assert.AreEqual(textpage.TemplateId, contentType.DefaultTemplate.Id);
-
-                scope.Complete();
-
-                TestHelper.AssertPropertyValuesAreEqual(textpage, fetched);
-            }
-        }
-
-        // Covers issue U4-2791 and U4-2607
-        [Test]
-        public void SaveContentWithAtSignInName()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository);
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
-                contentTypeRepository.Save(contentType);
-
-                Content textpage = ContentBuilder.CreateSimpleContent(contentType, "test@umbraco.org");
-                Content anotherTextpage = ContentBuilder.CreateSimpleContent(contentType, "@lightgiants");
-
-                repository.Save(textpage);
-                repository.Save(anotherTextpage);
-
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(textpage.HasIdentity, Is.True);
-
-                IContent content = repository.Get(textpage.Id);
-                Assert.That(content.Name, Is.EqualTo(textpage.Name));
-
-                IContent content2 = repository.Get(anotherTextpage.Id);
-                Assert.That(content2.Name, Is.EqualTo(anotherTextpage.Name));
-
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void SaveContentMultiple()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository);
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
-                contentTypeRepository.Save(contentType);
-
-                Content textpage = ContentBuilder.CreateSimpleContent(contentType);
-
-                repository.Save(textpage);
-
-                Content subpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 1", textpage.Id);
-                repository.Save(subpage);
-
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(textpage.HasIdentity, Is.True);
-                Assert.That(subpage.HasIdentity, Is.True);
-                Assert.That(textpage.Id, Is.EqualTo(subpage.ParentId));
-            }
-        }
-
-        [Test]
-        public void GetContentIsNotDirty()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IContent content = repository.Get(_subpage2.Id);
-                bool dirty = ((Content)content).IsDirty();
-
-                Assert.That(dirty, Is.False);
-            }
-        }
-
-        [Test]
-        public void UpdateContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IContent content = repository.Get(_subpage.Id);
-                content.Name = "About 2";
-                repository.Save(content);
-
-                IContent updatedContent = repository.Get(_subpage.Id);
-
-                Assert.AreEqual(content.Id, updatedContent.Id);
-                Assert.AreEqual(content.Name, updatedContent.Name);
-                Assert.AreEqual(content.VersionId, updatedContent.VersionId);
-
-                Assert.AreEqual(content.GetValue("title"), "Welcome to our Home page");
-                content.SetValue("title", "toot");
-                repository.Save(content);
-
-                updatedContent = repository.Get(_subpage.Id);
-
-                Assert.AreEqual("toot", updatedContent.GetValue("title"));
-                Assert.AreEqual(content.VersionId, updatedContent.VersionId);
-            }
-        }
-
-        [Test]
-        public void UpdateContentWithNullTemplate()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IContent content = repository.Get(_subpage.Id);
-                content.TemplateId = null;
-                repository.Save(content);
-
-                IContent updatedContent = repository.Get(_subpage.Id);
-
-                Assert.False(updatedContent.TemplateId.HasValue);
-            }
-        }
-
-        [Test]
-        public void DeleteContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out ContentTypeRepository contentTypeRepository);
-                IContentType contentType = contentTypeRepository.Get(_contentType.Id);
-                var content = new Content("Textpage 2 Child Node", _trashed.Id, contentType)
-                {
-                    CreatorId = 0,
-                    WriterId = 0
-                };
-
-                repository.Save(content);
-
-                int id = content.Id;
-
-                repository.Delete(content);
-
-                IContent content1 = repository.Get(id);
-                Assert.IsNull(content1);
-            }
-        }
-
-        [Test]
-        public void GetContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-                IContent content = repository.Get(_subpage2.Id);
-
-                Assert.AreEqual(_subpage2.Id, content.Id);
-                Assert.That(content.CreateDate, Is.GreaterThan(DateTime.MinValue));
-                Assert.That(content.UpdateDate, Is.GreaterThan(DateTime.MinValue));
-                Assert.AreNotEqual(0, content.ParentId);
-                Assert.AreEqual("Text Page 2", content.Name);
-                Assert.AreNotEqual(0, content.VersionId);
-                Assert.AreEqual(_contentType.Id, content.ContentTypeId);
-                Assert.That(content.Path, Is.Not.Empty);
-                Assert.That(content.Properties.Any(), Is.True);
-            }
-        }
-
-        [Test]
-        public void QueryContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-                IEnumerable<IContent> result = repository.Get(query);
-
-                Assert.GreaterOrEqual(2, result.Count());
-            }
-        }
-
-        [Test]
-        public void GetAllContentManyVersions()
-        {
-            IContent[] result;
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-                result = repository.GetMany().ToArray();
-
-                // save them all
-                foreach (IContent content in result)
-                {
-                    content.SetValue("title", content.GetValue<string>("title") + "x");
-                    repository.Save(content);
-                }
-
-                // publish them all
-                foreach (IContent content in result)
-                {
-                    content.PublishCulture(CultureImpact.Invariant);
-                    repository.Save(content);
-                }
-
-                scope.Complete();
-            }
-
-            // get them all again
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-                IContent[] result2 = repository.GetMany().ToArray();
-
-                Assert.AreEqual(result.Length, result2.Length);
-            }
-        }
-
-        [Test]
-        public void AliasRegexTest()
-        {
-            System.Text.RegularExpressions.Regex regex = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())).AliasRegex;
-            Assert.AreEqual(@"(\[\w+]\.\[\w+])\s+AS\s+(\[\w+])", regex.ToString());
-            const string sql = "SELECT [table].[column1] AS [alias1], [table].[column2] AS [alias2] FROM [table];";
-            System.Text.RegularExpressions.MatchCollection matches = regex.Matches(sql);
-            Assert.AreEqual(2, matches.Count);
-            Assert.AreEqual("[table].[column1]", matches[0].Groups[1].Value);
-            Assert.AreEqual("[alias1]", matches[0].Groups[2].Value);
-            Assert.AreEqual("[table].[column2]", matches[1].Groups[1].Value);
-            Assert.AreEqual("[alias2]", matches[1].Groups[2].Value);
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_With_Variant_Names()
-        {
-            // One invariant content type named "umbInvariantTextPage"
-            Template template = TemplateBuilder.CreateTextPageTemplate();
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository, out DataTypeRepository _);
+            var versions = new List<int>();
+            var template = TemplateBuilder.CreateTextPageTemplate();
             FileService.SaveTemplate(template);
-            ContentType invariantCt = ContentTypeBuilder.CreateSimpleContentType("umbInvariantTextpage", "Invariant Textpage", defaultTemplateId: template.Id);
-            invariantCt.Variations = ContentVariation.Nothing;
-            foreach (IPropertyType p in invariantCt.PropertyTypes)
+            var hasPropertiesContentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
+
+            contentTypeRepository.Save(hasPropertiesContentType);
+
+            IContent content1 = ContentBuilder.CreateSimpleContent(hasPropertiesContentType);
+
+            // save = create the initial version
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // the first version
+
+            // publish = new edit version
+            content1.SetValue("title", "title");
+            content1.PublishCulture(CultureImpact.Invariant);
+            content1.PublishedState = PublishedState.Publishing;
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // NEW VERSION
+
+            // new edit version has been created
+            Assert.AreNotEqual(versions[^2], versions[^1]);
+            Assert.IsTrue(content1.Published);
+            Assert.AreEqual(PublishedState.Published, ((Content)content1).PublishedState);
+            Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
+
+            // misc checks
+            Assert.AreEqual(true, ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>(
+                    $"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id",
+                    new { id = content1.Id }));
+
+            // change something
+            // save = update the current (draft) version
+            content1.Name = "name-1";
+            content1.SetValue("title", "title-1");
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // the same version
+
+            // no new version has been created
+            Assert.AreEqual(versions[^2], versions[^1]);
+            Assert.IsTrue(content1.Published);
+            Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
+
+            // misc checks
+            Assert.AreEqual(
+                true,
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>(
+                    $"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id",
+                    new { id = content1.Id }));
+
+            // unpublish = no impact on versions
+            ((Content)content1).PublishedState = PublishedState.Unpublishing;
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // the same version
+
+            // no new version has been created
+            Assert.AreEqual(versions[^2], versions[^1]);
+            Assert.IsFalse(content1.Published);
+            Assert.AreEqual(PublishedState.Unpublished, ((Content)content1).PublishedState);
+            Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
+
+            // misc checks
+            Assert.AreEqual(
+                false,
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>(
+                    $"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id",
+                    new { id = content1.Id }));
+
+            // change something
+            // save = update the current (draft) version
+            content1.Name = "name-2";
+            content1.SetValue("title", "title-2");
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // the same version
+
+            // no new version has been created
+            Assert.AreEqual(versions[^2], versions[^1]);
+            Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
+
+            // misc checks
+            Assert.AreEqual(
+                false,
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>(
+                    $"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id",
+                    new { id = content1.Id }));
+
+            // publish = version
+            content1.PublishCulture(CultureImpact.Invariant);
+            content1.PublishedState = PublishedState.Publishing;
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // NEW VERSION
+
+            // new version has been created
+            Assert.AreNotEqual(versions[^2], versions[^1]);
+            Assert.IsTrue(content1.Published);
+            Assert.AreEqual(PublishedState.Published, ((Content)content1).PublishedState);
+            Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
+
+            // misc checks
+            Assert.AreEqual(
+                true,
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>(
+                    $"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id",
+                    new { id = content1.Id }));
+
+            // change something
+            // save = update the current (draft) version
+            content1.Name = "name-3";
+            content1.SetValue("title", "title-3");
+
+            //// Thread.Sleep(2000); // force date change
+
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // the same version
+
+            // no new version has been created
+            Assert.AreEqual(versions[^2], versions[^1]);
+            Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
+
+            // misc checks
+            Assert.AreEqual(
+                true,
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>(
+                    $"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id",
+                    new { id = content1.Id }));
+
+            // publish = new version
+            content1.Name = "name-4";
+            content1.SetValue("title", "title-4");
+            content1.PublishCulture(CultureImpact.Invariant);
+            content1.PublishedState = PublishedState.Publishing;
+            repository.Save(content1);
+
+            versions.Add(content1.VersionId); // NEW VERSION
+
+            // a new version has been created
+            Assert.AreNotEqual(versions[^2], versions[^1]);
+            Assert.IsTrue(content1.Published);
+            Assert.AreEqual(PublishedState.Published, ((Content)content1).PublishedState);
+            Assert.AreEqual(versions[^1], repository.Get(content1.Id).VersionId);
+
+            // misc checks
+            Assert.AreEqual(
+                true,
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<bool>(
+                    $"SELECT published FROM {Constants.DatabaseSchema.Tables.Document} WHERE nodeId=@id",
+                    new { id = content1.Id }));
+
+            // all versions
+            var allVersions = repository.GetAllVersions(content1.Id).ToArray();
+            Console.WriteLine();
+            foreach (var v in versions)
             {
-                p.Variations = ContentVariation.Nothing;
+                Console.WriteLine(v);
             }
 
-            ContentTypeService.Save(invariantCt);
-
-            // One variant (by culture) content type named "umbVariantTextPage"
-            // with properties, every 2nd one being variant (by culture), the other being invariant
-            ContentType variantCt = ContentTypeBuilder.CreateSimpleContentType("umbVariantTextpage", "Variant Textpage", defaultTemplateId: template.Id);
-            variantCt.Variations = ContentVariation.Culture;
-            var propTypes = variantCt.PropertyTypes.ToList();
-            for (int i = 0; i < propTypes.Count; i++)
+            Console.WriteLine();
+            foreach (var v in allVersions)
             {
-                IPropertyType p = propTypes[i];
-                p.Variations = i % 2 == 0 ? ContentVariation.Culture : ContentVariation.Nothing;
+                var c = (Content)v;
+                Console.WriteLine(
+                    $"{c.Id} {c.VersionId} {(c.Published ? "+" : "-")}pub pk={c.VersionId} ppk={c.PublishedVersionId} name=\"{c.Name}\" pname=\"{c.PublishName}\"");
             }
 
-            ContentTypeService.Save(variantCt);
+            // get older version
+            var content = repository.GetVersion(versions[^4]);
+            Assert.AreNotEqual(0, content.VersionId);
+            Assert.AreEqual(versions[^4], content.VersionId);
+            Assert.AreEqual("name-4", content1.Name);
+            Assert.AreEqual("title-4", content1.GetValue("title"));
+            Assert.AreEqual("name-2", content.Name);
+            Assert.AreEqual("title-2", content.GetValue("title"));
 
-            invariantCt.AllowedContentTypes = new[] { new ContentTypeSort(invariantCt.Id, 0), new ContentTypeSort(variantCt.Id, 1) };
-            ContentTypeService.Save(invariantCt);
-
-            // Create content
-            Content root = ContentBuilder.CreateSimpleContent(invariantCt);
-            ContentService.Save(root);
-
-            var children = new List<IContent>();
-
-            for (int i = 0; i < 25; i++)
+            // get all versions - most recent first
+            allVersions = repository.GetAllVersions(content1.Id).ToArray();
+            var expVersions = versions.Distinct().Reverse().ToArray();
+            Assert.AreEqual(expVersions.Length, allVersions.Length);
+            for (var i = 0; i < expVersions.Length; i++)
             {
-                bool isInvariant = i % 2 == 0;
-                string name = (isInvariant ? "INV" : "VAR") + "_" + Guid.NewGuid();
-                string culture = isInvariant ? null : "en-US";
-
-                Content child = ContentBuilder.CreateSimpleContent(
-                    isInvariant ? invariantCt : variantCt,
-                    name,
-                    root,
-                    culture,
-                    setPropertyValues: isInvariant);
-
-                if (!isInvariant)
-                {
-                    // manually set the property values since we have mixed variant/invariant property types
-                    child.SetValue("title", name + " Subpage", culture: culture);
-                    child.SetValue("bodyText", "This is a subpage", culture: null); // this one is invariant
-                    child.SetValue("author", "John Doe", culture: culture);
-                }
-
-                ContentService.Save(child);
-                children.Add(child);
-            }
-
-            IContent child1 = children[1];
-            Assert.IsTrue(child1.ContentType.VariesByCulture());
-            Assert.IsTrue(child1.Name.StartsWith("VAR"));
-            Assert.IsTrue(child1.GetCultureName("en-US").StartsWith("VAR"));
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IContent child = repository.Get(children[1].Id); // 1 is variant
-                Assert.IsTrue(child.ContentType.VariesByCulture());
-                Assert.IsTrue(child.Name.StartsWith("VAR"));
-                Assert.IsTrue(child.GetCultureName("en-US").StartsWith("VAR"));
-
-                try
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.ParentId == root.Id);
-                    IEnumerable<IContent> result = repository.GetPage(query, 0, 20, out long totalRecords, null, Ordering.By("UpdateDate"));
-
-                    Assert.AreEqual(25, totalRecords);
-                    foreach (IContent r in result)
-                    {
-                        bool isInvariant = r.ContentType.Alias == "umbInvariantTextpage";
-                        string name = isInvariant ? r.Name : r.CultureInfos["en-US"].Name;
-                        string namePrefix = isInvariant ? "INV" : "VAR";
-
-                        // ensure the correct name (invariant vs variant) is in the result
-                        Assert.IsTrue(name.StartsWith(namePrefix));
-
-                        foreach (IProperty p in r.Properties)
-                        {
-                            // ensure there is a value for the correct variant/invariant property
-                            object value = p.GetValue(p.PropertyType.Variations.VariesByNothing() ? null : "en-US");
-                            Assert.IsNotNull(value);
-                        }
-                    }
-                }
-                finally
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_CustomPropertySort()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Name.Contains("Text"));
-
-                try
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    IEnumerable<IContent> result = repository.GetPage(query, 0, 2, out long totalRecords, null, Ordering.By("title", isCustomField: true));
-
-                    Assert.AreEqual(3, totalRecords);
-                    Assert.AreEqual(2, result.Count());
-
-                    result = repository.GetPage(query, 1, 2, out totalRecords, null, Ordering.By("title", isCustomField: true));
-
-                    Assert.AreEqual(1, result.Count());
-                }
-                finally
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_FirstPage()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-
-                try
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    IEnumerable<IContent> result = repository.GetPage(query, 0, 1, out long totalRecords, null, Ordering.By("Name"));
-
-                    Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                    Assert.That(result.Count(), Is.EqualTo(1));
-                    Assert.That(result.First().Name, Is.EqualTo("Text Page 1"));
-                }
-                finally
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_SecondPage()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-                IEnumerable<IContent> result = repository.GetPage(query, 1, 1, out long totalRecords, null, Ordering.By("Name"));
-
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Text Page 2"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_SinglePage()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-                IEnumerable<IContent> result = repository.GetPage(query, 0, 2, out long totalRecords, null, Ordering.By("Name"));
-
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(2));
-                Assert.That(result.First().Name, Is.EqualTo("Text Page 1"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_DescendingOrder()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-                IEnumerable<IContent> result = repository.GetPage(query, 0, 1, out long totalRecords, null, Ordering.By("Name", Direction.Descending));
-
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Text Page 2"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_FilterMatchingSome()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-
-                IQuery<IContent> filterQuery = ScopeProvider.CreateQuery<IContent>().Where(x => x.Name.Contains("Page 2"));
-                IEnumerable<IContent> result = repository.GetPage(query, 0, 1, out long totalRecords, filterQuery, Ordering.By("Name"));
-
-                Assert.That(totalRecords, Is.EqualTo(1));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Text Page 2"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_FilterMatchingAll()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-
-                IQuery<IContent> filterQuery = ScopeProvider.CreateQuery<IContent>().Where(x => x.Name.Contains("text"));
-                IEnumerable<IContent> result = repository.GetPage(query, 0, 1, out long totalRecords, filterQuery, Ordering.By("Name"));
-
-                Assert.That(totalRecords, Is.EqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Text Page 1"));
-            }
-        }
-
-        [Test]
-        public void GetAllContentByIds()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IEnumerable<IContent> contents = repository.GetMany(_subpage.Id, _subpage2.Id);
-
-                Assert.That(contents, Is.Not.Null);
-                Assert.That(contents.Any(), Is.True);
-                Assert.That(contents.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void GetAllContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IEnumerable<IContent> contents = repository.GetMany();
-
-                Assert.That(contents, Is.Not.Null);
-                Assert.That(contents.Any(), Is.True);
-                Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
-
-                contents = repository.GetMany(contents.Select(x => x.Id).ToArray());
-                Assert.That(contents, Is.Not.Null);
-                Assert.That(contents.Any(), Is.True);
-                Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
-
-                contents = ((IReadRepository<Guid, IContent>)repository).GetMany(contents.Select(x => x.Key).ToArray());
-                Assert.That(contents, Is.Not.Null);
-                Assert.That(contents.Any(), Is.True);
-                Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
-            }
-        }
-
-        [Test]
-        public void ExistContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                bool exists = repository.Exists(_subpage.Id);
-
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void CountContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
-                int result = repository.Count(query);
-
-                Assert.That(result, Is.GreaterThanOrEqualTo(2));
-            }
-        }
-
-        [Test]
-        public void QueryContentByUniqueId()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = CreateRepository((IScopeAccessor)provider, out _);
-
-                IQuery<IContent> query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Key == new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
-                IContent content = repository.Get(query).SingleOrDefault();
-
-                Assert.IsNotNull(content);
-                Assert.AreEqual(_textpage.Id, content.Id);
+                Assert.AreEqual(expVersions[i], allVersions[i].VersionId);
             }
         }
     }
+
+    /// <summary>
+    ///     This tests the regression issue of U4-9438
+    /// </summary>
+    /// <remarks>
+    ///     The problem was the iteration of the property data in VersionableRepositoryBase when a content item
+    ///     in the list actually doesn't have any property types, it would still skip over a property row.
+    ///     To test, we have 3 content items, the first has properties, the second doesn't and the third does.
+    /// </remarks>
+    [Test]
+    public void PropertyDataAssignedCorrectly()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository, out DataTypeRepository _);
+
+            var emptyContentType = ContentTypeBuilder.CreateBasicContentType();
+            var hasPropertiesContentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
+            contentTypeRepository.Save(emptyContentType);
+            contentTypeRepository.Save(hasPropertiesContentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(hasPropertiesContentType);
+            var content2 = ContentBuilder.CreateBasicContent(emptyContentType);
+            var content3 = ContentBuilder.CreateSimpleContent(hasPropertiesContentType);
+
+            repository.Save(content1);
+            repository.Save(content2);
+            repository.Save(content3);
+
+            // this will cause the GetPropertyCollection to execute and we need to ensure that
+            // all of the properties and property types are all correct
+            var result = repository.GetMany(content1.Id, content2.Id, content3.Id).ToArray();
+            var n1 = result[0];
+            var n2 = result[1];
+            var n3 = result[2];
+
+            Assert.AreEqual(content1.Id, n1.Id);
+            Assert.AreEqual(content2.Id, n2.Id);
+            Assert.AreEqual(content3.Id, n3.Id);
+
+            // compare everything including properties and their values
+            // this ensures that they have been properly retrieved
+            TestHelper.AssertPropertyValuesAreEqual(content1, n1);
+            TestHelper.AssertPropertyValuesAreEqual(content2, n2);
+            TestHelper.AssertPropertyValuesAreEqual(content3, n3);
+        }
+    }
+
+    //// /// <summary>
+    //// /// This test ensures that when property values using special database fields are saved, the actual data in the
+    //// /// object being stored is also transformed in the same way as the data being stored in the database is.
+    //// /// Before you would see that ex: a decimal value being saved as 100 or "100", would be that exact value in the
+    //// /// object, but the value saved to the database was actually 100.000000.
+    //// /// When querying the database for the value again - the value would then differ from what is in the object.
+    //// /// This caused inconsistencies between saving+publishing and simply saving and then publishing, due to the former
+    //// /// sending the non-transformed data directly on to publishing.
+    //// /// </summary>
+    //// [Test]
+    //// public void PropertyValuesWithSpecialTypes()
+    //// {
+    ////     var provider = ScopeProvider;
+    ////     using (var scope = provider.CreateScope())
+    ////     {
+    ////         var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository, out DataTypeRepository dataTypeDefinitionRepository);
+    ////
+    ////         var editor = new DecimalPropertyEditor(LoggerFactory, DataTypeService, LocalizationService, LocalizedTextService, ShortStringHelper);
+    ////         var dtd = new DataType(editor) { Name = "test", DatabaseType = ValueStorageType.Decimal };
+    ////         dataTypeDefinitionRepository.Save(dtd);
+    ////
+    ////         const string decimalPropertyAlias = "decimalProperty";
+    ////         const string intPropertyAlias = "intProperty";
+    ////         const string dateTimePropertyAlias = "datetimeProperty";
+    ////         var dateValue = new DateTime(2016, 1, 6);
+    ////
+    ////         var propertyTypeCollection = new PropertyTypeCollection(true,
+    ////             new List<PropertyType>
+    ////             {
+    ////                 MockedPropertyTypes.CreateDecimalProperty(decimalPropertyAlias, "Decimal property", dtd.Id),
+    ////                 MockedPropertyTypes.CreateIntegerProperty(intPropertyAlias, "Integer property"),
+    ////                 MockedPropertyTypes.CreateDateTimeProperty(dateTimePropertyAlias, "DateTime property")
+    ////             });
+    ////         var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", propertyTypeCollection);
+    ////         contentTypeRepository.Save(contentType);
+    ////
+    ////         // int and decimal values are passed in as strings as they would be from the backoffice UI
+    ////         var textpage = ContentBuilder.CreateSimpleContentWithSpecialDatabaseTypes(contentType, "test@umbraco.org", -1, "100", "150", dateValue);
+    ////
+    ////         repository.Save(textpage);
+    ////         scope.Complete();
+    ////
+    ////         Assert.That(contentType.HasIdentity, Is.True);
+    ////         Assert.That(textpage.HasIdentity, Is.True);
+    ////
+    ////         var persistedTextpage = repository.Get(textpage.Id);
+    ////         Assert.That(persistedTextpage.Name, Is.EqualTo(textpage.Name));
+    ////         Assert.AreEqual(100m, persistedTextpage.GetValue(decimalPropertyAlias));
+    ////         Assert.AreEqual(persistedTextpage.GetValue(decimalPropertyAlias), textpage.GetValue(decimalPropertyAlias));
+    ////         Assert.AreEqual(150, persistedTextpage.GetValue(intPropertyAlias));
+    ////         Assert.AreEqual(persistedTextpage.GetValue(intPropertyAlias), textpage.GetValue(intPropertyAlias));
+    ////         Assert.AreEqual(dateValue, persistedTextpage.GetValue(dateTimePropertyAlias));
+    ////         Assert.AreEqual(persistedTextpage.GetValue(dateTimePropertyAlias), textpage.GetValue(dateTimePropertyAlias));
+    ////     }
+    //// }
+
+    [Test]
+    public void SaveContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository);
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage2", "Textpage", defaultTemplateId: template.Id);
+            contentTypeRepository.Save(contentType);
+
+            IContent textpage = ContentBuilder.CreateSimpleContent(contentType);
+
+            repository.Save(textpage);
+            scope.Complete();
+
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(textpage.HasIdentity, Is.True);
+        }
+    }
+
+    [Test]
+    public void SaveContentWithDefaultTemplate()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository, out TemplateRepository templateRepository);
+
+            var template = new Template(ShortStringHelper, "hello", "hello");
+            templateRepository.Save(template);
+
+            var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage2", "Textpage");
+            contentType.AllowedTemplates =
+                Enumerable.Empty<ITemplate>(); // because CreateSimpleContentType assigns one already
+            contentType.SetDefaultTemplate(template);
+            contentTypeRepository.Save(contentType);
+
+            var textpage = ContentBuilder.CreateSimpleContent(contentType);
+            repository.Save(textpage);
+
+            var fetched = repository.Get(textpage.Id);
+
+            Assert.True(textpage.TemplateId.HasValue);
+            Assert.NotZero(textpage.TemplateId.Value);
+            Assert.AreEqual(textpage.TemplateId, contentType.DefaultTemplate.Id);
+
+            scope.Complete();
+
+            TestHelper.AssertPropertyValuesAreEqual(textpage, fetched);
+        }
+    }
+
+    // Covers issue U4-2791 and U4-2607
+    [Test]
+    public void SaveContentWithAtSignInName()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository);
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
+            contentTypeRepository.Save(contentType);
+
+            var textpage = ContentBuilder.CreateSimpleContent(contentType, "test@umbraco.org");
+            var anotherTextpage = ContentBuilder.CreateSimpleContent(contentType, "@lightgiants");
+
+            repository.Save(textpage);
+            repository.Save(anotherTextpage);
+
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(textpage.HasIdentity, Is.True);
+
+            var content = repository.Get(textpage.Id);
+            Assert.That(content.Name, Is.EqualTo(textpage.Name));
+
+            var content2 = repository.Get(anotherTextpage.Id);
+            Assert.That(content2.Name, Is.EqualTo(anotherTextpage.Name));
+
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void SaveContentMultiple()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository);
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
+            contentTypeRepository.Save(contentType);
+
+            var textpage = ContentBuilder.CreateSimpleContent(contentType);
+
+            repository.Save(textpage);
+
+            var subpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 1", textpage.Id);
+            repository.Save(subpage);
+
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(textpage.HasIdentity, Is.True);
+            Assert.That(subpage.HasIdentity, Is.True);
+            Assert.That(textpage.Id, Is.EqualTo(subpage.ParentId));
+        }
+    }
+
+    [Test]
+    public void GetContentIsNotDirty()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var content = repository.Get(_subpage2.Id);
+            var dirty = ((Content)content).IsDirty();
+
+            Assert.That(dirty, Is.False);
+        }
+    }
+
+    [Test]
+    public void UpdateContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var content = repository.Get(_subpage.Id);
+            content.Name = "About 2";
+            repository.Save(content);
+
+            var updatedContent = repository.Get(_subpage.Id);
+
+            Assert.AreEqual(content.Id, updatedContent.Id);
+            Assert.AreEqual(content.Name, updatedContent.Name);
+            Assert.AreEqual(content.VersionId, updatedContent.VersionId);
+
+            Assert.AreEqual(content.GetValue("title"), "Welcome to our Home page");
+            content.SetValue("title", "toot");
+            repository.Save(content);
+
+            updatedContent = repository.Get(_subpage.Id);
+
+            Assert.AreEqual("toot", updatedContent.GetValue("title"));
+            Assert.AreEqual(content.VersionId, updatedContent.VersionId);
+        }
+    }
+
+    [Test]
+    public void UpdateContentWithNullTemplate()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var content = repository.Get(_subpage.Id);
+            content.TemplateId = null;
+            repository.Save(content);
+
+            var updatedContent = repository.Get(_subpage.Id);
+
+            Assert.False(updatedContent.TemplateId.HasValue);
+        }
+    }
+
+    [Test]
+    public void DeleteContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out var contentTypeRepository);
+            var contentType = contentTypeRepository.Get(_contentType.Id);
+            var content = new Content("Textpage 2 Child Node", _trashed.Id, contentType) { CreatorId = 0, WriterId = 0 };
+
+            repository.Save(content);
+
+            var id = content.Id;
+
+            repository.Delete(content);
+
+            var content1 = repository.Get(id);
+            Assert.IsNull(content1);
+        }
+    }
+
+    [Test]
+    public void GetContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+            var content = repository.Get(_subpage2.Id);
+
+            Assert.AreEqual(_subpage2.Id, content.Id);
+            Assert.That(content.CreateDate, Is.GreaterThan(DateTime.MinValue));
+            Assert.That(content.UpdateDate, Is.GreaterThan(DateTime.MinValue));
+            Assert.AreNotEqual(0, content.ParentId);
+            Assert.AreEqual("Text Page 2", content.Name);
+            Assert.AreNotEqual(0, content.VersionId);
+            Assert.AreEqual(_contentType.Id, content.ContentTypeId);
+            Assert.That(content.Path, Is.Not.Empty);
+            Assert.That(content.Properties.Any(), Is.True);
+        }
+    }
+
+    [Test]
+    public void QueryContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+            var result = repository.Get(query);
+
+            Assert.GreaterOrEqual(2, result.Count());
+        }
+    }
+
+    [Test]
+    public void GetAllContentManyVersions()
+    {
+        IContent[] result;
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+            result = repository.GetMany().ToArray();
+
+            // save them all
+            foreach (var content in result)
+            {
+                content.SetValue("title", content.GetValue<string>("title") + "x");
+                repository.Save(content);
+            }
+
+            // publish them all
+            foreach (var content in result)
+            {
+                content.PublishCulture(CultureImpact.Invariant);
+                repository.Save(content);
+            }
+
+            scope.Complete();
+        }
+
+        // get them all again
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+            var result2 = repository.GetMany().ToArray();
+
+            Assert.AreEqual(result.Length, result2.Length);
+        }
+    }
+
+    [Test]
+    public void AliasRegexTest()
+    {
+        var regex = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())).AliasRegex;
+        Assert.AreEqual(@"(\[\w+]\.\[\w+])\s+AS\s+(\[\w+])", regex.ToString());
+        const string sql = "SELECT [table].[column1] AS [alias1], [table].[column2] AS [alias2] FROM [table];";
+        var matches = regex.Matches(sql);
+        Assert.AreEqual(2, matches.Count);
+        Assert.AreEqual("[table].[column1]", matches[0].Groups[1].Value);
+        Assert.AreEqual("[alias1]", matches[0].Groups[2].Value);
+        Assert.AreEqual("[table].[column2]", matches[1].Groups[1].Value);
+        Assert.AreEqual("[alias2]", matches[1].Groups[2].Value);
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_With_Variant_Names()
+    {
+        // One invariant content type named "umbInvariantTextPage"
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var invariantCt = ContentTypeBuilder.CreateSimpleContentType("umbInvariantTextpage", "Invariant Textpage", defaultTemplateId: template.Id);
+        invariantCt.Variations = ContentVariation.Nothing;
+        foreach (var p in invariantCt.PropertyTypes)
+        {
+            p.Variations = ContentVariation.Nothing;
+        }
+
+        ContentTypeService.Save(invariantCt);
+
+        // One variant (by culture) content type named "umbVariantTextPage"
+        // with properties, every 2nd one being variant (by culture), the other being invariant
+        var variantCt = ContentTypeBuilder.CreateSimpleContentType("umbVariantTextpage", "Variant Textpage", defaultTemplateId: template.Id);
+        variantCt.Variations = ContentVariation.Culture;
+        var propTypes = variantCt.PropertyTypes.ToList();
+        for (var i = 0; i < propTypes.Count; i++)
+        {
+            var p = propTypes[i];
+            p.Variations = i % 2 == 0 ? ContentVariation.Culture : ContentVariation.Nothing;
+        }
+
+        ContentTypeService.Save(variantCt);
+
+        invariantCt.AllowedContentTypes =
+            new[] { new ContentTypeSort(invariantCt.Id, 0), new ContentTypeSort(variantCt.Id, 1) };
+        ContentTypeService.Save(invariantCt);
+
+        // Create content
+        var root = ContentBuilder.CreateSimpleContent(invariantCt);
+        ContentService.Save(root);
+
+        var children = new List<IContent>();
+
+        for (var i = 0; i < 25; i++)
+        {
+            var isInvariant = i % 2 == 0;
+            var name = (isInvariant ? "INV" : "VAR") + "_" + Guid.NewGuid();
+            var culture = isInvariant ? null : "en-US";
+
+            var child = ContentBuilder.CreateSimpleContent(
+                isInvariant ? invariantCt : variantCt,
+                name,
+                root,
+                culture,
+                setPropertyValues: isInvariant);
+
+            if (!isInvariant)
+            {
+                // manually set the property values since we have mixed variant/invariant property types
+                child.SetValue("title", name + " Subpage", culture);
+                child.SetValue("bodyText", "This is a subpage"); // this one is invariant
+                child.SetValue("author", "John Doe", culture);
+            }
+
+            ContentService.Save(child);
+            children.Add(child);
+        }
+
+        var child1 = children[1];
+        Assert.IsTrue(child1.ContentType.VariesByCulture());
+        Assert.IsTrue(child1.Name.StartsWith("VAR"));
+        Assert.IsTrue(child1.GetCultureName("en-US").StartsWith("VAR"));
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var child = repository.Get(children[1].Id); // 1 is variant
+            Assert.IsTrue(child.ContentType.VariesByCulture());
+            Assert.IsTrue(child.Name.StartsWith("VAR"));
+            Assert.IsTrue(child.GetCultureName("en-US").StartsWith("VAR"));
+
+            try
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
+
+                var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.ParentId == root.Id);
+                var result = repository.GetPage(query, 0, 20, out var totalRecords, null, Ordering.By("UpdateDate"));
+
+                Assert.AreEqual(25, totalRecords);
+                foreach (var r in result)
+                {
+                    var isInvariant = r.ContentType.Alias == "umbInvariantTextpage";
+                    var name = isInvariant ? r.Name : r.CultureInfos["en-US"].Name;
+                    var namePrefix = isInvariant ? "INV" : "VAR";
+
+                    // ensure the correct name (invariant vs variant) is in the result
+                    Assert.IsTrue(name.StartsWith(namePrefix));
+
+                    foreach (var p in r.Properties)
+                    {
+                        // ensure there is a value for the correct variant/invariant property
+                        var value = p.GetValue(p.PropertyType.Variations.VariesByNothing() ? null : "en-US");
+                        Assert.IsNotNull(value);
+                    }
+                }
+            }
+            finally
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
+            }
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_CustomPropertySort()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Name.Contains("Text"));
+
+            try
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
+
+                var result = repository.GetPage(query, 0, 2, out var totalRecords, null, Ordering.By("title", isCustomField: true));
+
+                Assert.AreEqual(3, totalRecords);
+                Assert.AreEqual(2, result.Count());
+
+                result = repository.GetPage(query, 1, 2, out totalRecords, null, Ordering.By("title", isCustomField: true));
+
+                Assert.AreEqual(1, result.Count());
+            }
+            finally
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
+            }
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_FirstPage()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+
+            try
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
+
+                var result = repository.GetPage(query, 0, 1, out var totalRecords, null, Ordering.By("Name"));
+
+                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+                Assert.That(result.Count(), Is.EqualTo(1));
+                Assert.That(result.First().Name, Is.EqualTo("Text Page 1"));
+            }
+            finally
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
+            }
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_SecondPage()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 1, 1, out var totalRecords, null, Ordering.By("Name")).ToArray();
+
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Text Page 2"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_SinglePage()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 0, 2, out var totalRecords, null, Ordering.By("Name")).ToArray();
+
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(2));
+            Assert.That(result.First().Name, Is.EqualTo("Text Page 1"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_DescendingOrder()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, null, Ordering.By("Name", Direction.Descending)).ToArray();
+
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Text Page 2"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_FilterMatchingSome()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+
+            var filterQuery = ScopeProvider.CreateQuery<IContent>().Where(x => x.Name.Contains("Page 2"));
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, filterQuery, Ordering.By("Name")).ToArray();
+
+            Assert.That(totalRecords, Is.EqualTo(1));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Text Page 2"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_FilterMatchingAll()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+
+            var filterQuery = ScopeProvider.CreateQuery<IContent>().Where(x => x.Name.Contains("text"));
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, filterQuery, Ordering.By("Name")).ToArray();
+
+            Assert.That(totalRecords, Is.EqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Text Page 1"));
+        }
+    }
+
+    [Test]
+    public void GetAllContentByIds()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var contents = repository.GetMany(_subpage.Id, _subpage2.Id).ToArray();
+
+            Assert.That(contents, Is.Not.Null);
+            Assert.That(contents.Any(), Is.True);
+            Assert.That(contents.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void GetAllContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var contents = repository.GetMany().ToArray();
+
+            Assert.That(contents, Is.Not.Null);
+            Assert.That(contents.Any(), Is.True);
+            Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
+
+            contents = repository.GetMany(contents.Select(x => x.Id).ToArray()).ToArray();
+            Assert.That(contents, Is.Not.Null);
+            Assert.That(contents.Any(), Is.True);
+            Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
+
+            contents = ((IReadRepository<Guid, IContent>)repository).GetMany(contents.Select(x => x.Key).ToArray()).ToArray();
+            Assert.That(contents, Is.Not.Null);
+            Assert.That(contents.Any(), Is.True);
+            Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(4));
+        }
+    }
+
+    [Test]
+    public void ExistContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var exists = repository.Exists(_subpage.Id);
+
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void CountContent()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>().Where(x => x.Level == 2);
+            var result = repository.Count(query);
+
+            Assert.That(result, Is.GreaterThanOrEqualTo(2));
+        }
+    }
+
+    [Test]
+    public void QueryContentByUniqueId()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository((IScopeAccessor)provider, out _);
+
+            var query = ScopeProvider.CreateQuery<IContent>()
+                .Where(x => x.Key == new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
+            var content = repository.Get(query).SingleOrDefault();
+
+            Assert.IsNotNull(content);
+            Assert.AreEqual(_textpage.Id, content.Id);
+        }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentVersionRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentVersionRepositoryTest.cs
index c25bd69653..8636869a56 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentVersionRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DocumentVersionRepositoryTest.cs
@@ -2,7 +2,6 @@ using System.Diagnostics;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
@@ -12,194 +11,199 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+/// <remarks>
+///     v9 -> Tests.Integration
+/// </remarks>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class DocumentVersionRepositoryTest : UmbracoIntegrationTest
 {
-    /// <remarks>
-    /// v9 -> Tests.Integration
-    /// </remarks>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class DocumentVersionRepositoryTest : UmbracoIntegrationTest
+    public IFileService FileService => GetRequiredService<IFileService>();
+    public IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+    public IContentService ContentService => GetRequiredService<IContentService>();
+
+    [Test]
+    public void GetDocumentVersionsEligibleForCleanup_Always_ExcludesActiveVersions()
     {
-        public IFileService FileService => GetRequiredService<IFileService>();
-        public IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-        public IContentService ContentService => GetRequiredService<IContentService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        [Test]
-        public void GetDocumentVersionsEligibleForCleanup_Always_ExcludesActiveVersions()
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType);
+
+        ContentService.SaveAndPublish(content);
+        // At this point content has 2 versions, a draft version and a published version.
+
+        ContentService.SaveAndPublish(content);
+        // At this point content has 3 versions, a historic version, a draft version and a published version.
+
+        using (ScopeProvider.CreateScope())
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
+            var sut = new DocumentVersionRepository(ScopeAccessor);
+            var results = sut.GetDocumentVersionsEligibleForCleanup();
 
-            var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            var content = ContentBuilder.CreateSimpleContent(contentType);
-
-            ContentService.SaveAndPublish(content);
-            // At this point content has 2 versions, a draft version and a published version.
-
-            ContentService.SaveAndPublish(content);
-            // At this point content has 3 versions, a historic version, a draft version and a published version.
-
-            using (ScopeProvider.CreateScope())
+            Assert.Multiple(() =>
             {
-                var sut = new DocumentVersionRepository(ScopeAccessor);
-                var results = sut.GetDocumentVersionsEligibleForCleanup();
+                Assert.AreEqual(1, results.Count);
+                Assert.AreEqual(1, results.First().VersionId);
+            });
+        }
+    }
 
-                Assert.Multiple(() =>
-                {
-                    Assert.AreEqual(1, results.Count);
-                    Assert.AreEqual(1, results.First().VersionId);
-                });
-            }
+    [Test]
+    public void GetDocumentVersionsEligibleForCleanup_Always_ExcludesPinnedVersions()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType);
+
+        ContentService.SaveAndPublish(content);
+        // At this point content has 2 versions, a draft version and a published version.
+        ContentService.SaveAndPublish(content);
+        ContentService.SaveAndPublish(content);
+        ContentService.SaveAndPublish(content);
+        // At this point content has 5 versions, 3 historic versions, a draft version and a published version.
+
+        var allVersions = ContentService.GetVersions(content.Id);
+        Debug.Assert(allVersions.Count() == 5); // Sanity check
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            ScopeAccessor.AmbientScope.Database.Update<ContentVersionDto>("set preventCleanup = 1 where id in (1,3)");
+
+            var sut = new DocumentVersionRepository(ScopeAccessor);
+            var results = sut.GetDocumentVersionsEligibleForCleanup();
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual(1, results.Count);
+
+                // We pinned 1 & 3
+                // 4 is current
+                // 5 is published
+                // So all that is left is 2
+                Assert.AreEqual(2, results.First().VersionId);
+            });
+        }
+    }
+
+    [Test]
+    public void DeleteVersions_Always_DeletesSpecifiedVersions()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType);
+
+        ContentService.SaveAndPublish(content);
+        ContentService.SaveAndPublish(content);
+        ContentService.SaveAndPublish(content);
+        ContentService.SaveAndPublish(content);
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var query = ScopeAccessor.AmbientScope.SqlContext.Sql();
+
+            query.Select<ContentVersionDto>()
+                .From<ContentVersionDto>();
+
+            var sut = new DocumentVersionRepository(ScopeAccessor);
+            sut.DeleteVersions(new[] { 1, 2, 3 });
+
+            var after = ScopeAccessor.AmbientScope.Database.Fetch<ContentVersionDto>(query);
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual(2, after.Count);
+                Assert.True(after.All(x => x.Id > 3));
+            });
+        }
+    }
+
+
+    [Test]
+    public void GetPagedItemsByContentId_WithInvariantCultureContent_ReturnsPaginatedResults()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType);
+
+        ContentService.SaveAndPublish(content); // Draft + Published
+        ContentService.SaveAndPublish(content); // New Draft
+
+        using (ScopeProvider.CreateScope())
+        {
+            var sut = new DocumentVersionRepository((IScopeAccessor)ScopeProvider);
+            var page1 = sut.GetPagedItemsByContentId(content.Id, 0, 2, out var page1Total);
+            var page2 = sut.GetPagedItemsByContentId(content.Id, 1, 2, out var page2Total);
+
+            Assert.Multiple(() =>
+            {
+                Assert.AreEqual(2, page1.Count());
+                Assert.AreEqual(3, page1Total);
+
+                Assert.AreEqual(1, page2.Count());
+                Assert.AreEqual(3, page2Total);
+            });
+        }
+    }
+
+    [Test]
+    public void GetPagedItemsByContentId_WithVariantCultureContent_ReturnsPaginatedResults()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        contentType.Variations = ContentVariation.Culture;
+        foreach (var propertyType in contentType.PropertyTypes)
+        {
+            propertyType.Variations = ContentVariation.Culture;
         }
 
-        [Test]
-        public void GetDocumentVersionsEligibleForCleanup_Always_ExcludesPinnedVersions()
+        FileService.SaveTemplate(contentType.DefaultTemplate);
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType, "foo", culture: "en-US");
+        content.SetCultureName("foo", "en-US");
+
+        ContentService.SaveAndPublish(content, "en-US"); // Draft + Published
+        ContentService.SaveAndPublish(content, "en-US"); // New Draft
+
+        using (ScopeProvider.CreateScope())
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
+            var sut = new DocumentVersionRepository((IScopeAccessor)ScopeProvider);
+            var page1 = sut.GetPagedItemsByContentId(content.Id, 0, 2, out var page1Total, 1);
+            var page2 = sut.GetPagedItemsByContentId(content.Id, 1, 2, out var page2Total, 1);
 
-            var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-            ContentTypeService.Save(contentType);
-
-            var content = ContentBuilder.CreateSimpleContent(contentType);
-
-            ContentService.SaveAndPublish(content);
-            // At this point content has 2 versions, a draft version and a published version.
-            ContentService.SaveAndPublish(content);
-            ContentService.SaveAndPublish(content);
-            ContentService.SaveAndPublish(content);
-            // At this point content has 5 versions, 3 historic versions, a draft version and a published version.
-
-            var allVersions = ContentService.GetVersions(content.Id);
-            Debug.Assert(allVersions.Count() == 5); // Sanity check
-
-            using (var scope = ScopeProvider.CreateScope())
+            Assert.Multiple(() =>
             {
-                ScopeAccessor.AmbientScope.Database.Update<ContentVersionDto>("set preventCleanup = 1 where id in (1,3)");
+                Assert.AreEqual(2, page1.Count());
+                Assert.AreEqual(3, page1Total);
 
-                var sut = new DocumentVersionRepository(ScopeAccessor);
-                var results = sut.GetDocumentVersionsEligibleForCleanup();
-
-                Assert.Multiple(() =>
-                {
-                    Assert.AreEqual(1, results.Count);
-
-                    // We pinned 1 & 3
-                    // 4 is current
-                    // 5 is published
-                    // So all that is left is 2
-                    Assert.AreEqual(2, results.First().VersionId);
-                });
-            }
-        }
-
-        [Test]
-        public void DeleteVersions_Always_DeletesSpecifiedVersions()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            var content = ContentBuilder.CreateSimpleContent(contentType);
-
-            ContentService.SaveAndPublish(content);
-            ContentService.SaveAndPublish(content);
-            ContentService.SaveAndPublish(content);
-            ContentService.SaveAndPublish(content);
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                var query = ScopeAccessor.AmbientScope.SqlContext.Sql();
-
-                query.Select<ContentVersionDto>()
-                    .From<ContentVersionDto>();
-
-                var sut = new DocumentVersionRepository(ScopeAccessor);
-                sut.DeleteVersions(new []{1,2,3});
-
-                var after = ScopeAccessor.AmbientScope.Database.Fetch<ContentVersionDto>(query);
-
-                Assert.Multiple(() =>
-                {
-                    Assert.AreEqual(2, after.Count);
-                    Assert.True(after.All(x => x.Id > 3));
-                });
-            }
-        }
-
-
-        [Test]
-        public void GetPagedItemsByContentId_WithInvariantCultureContent_ReturnsPaginatedResults()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            var content = ContentBuilder.CreateSimpleContent(contentType);
-
-            ContentService.SaveAndPublish(content); // Draft + Published
-            ContentService.SaveAndPublish(content); // New Draft
-
-            using (ScopeProvider.CreateScope())
-            {
-                var sut = new DocumentVersionRepository((IScopeAccessor)ScopeProvider);
-                var page1 = sut.GetPagedItemsByContentId(content.Id, 0, 2, out var page1Total);
-                var page2 = sut.GetPagedItemsByContentId(content.Id, 1, 2, out var page2Total);
-
-                Assert.Multiple(() =>
-                {
-                    Assert.AreEqual(2, page1.Count());
-                    Assert.AreEqual(3, page1Total);
-
-                    Assert.AreEqual(1, page2.Count());
-                    Assert.AreEqual(3, page2Total);
-                });
-            }
-        }
-
-        [Test]
-        public void GetPagedItemsByContentId_WithVariantCultureContent_ReturnsPaginatedResults()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            var contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            contentType.Variations = ContentVariation.Culture;
-            foreach (var propertyType in contentType.PropertyTypes)
-            {
-                propertyType.Variations = ContentVariation.Culture;
-            }
-            FileService.SaveTemplate(contentType.DefaultTemplate);
-            ContentTypeService.Save(contentType);
-
-            var content = ContentBuilder.CreateSimpleContent(contentType, "foo", culture:"en-US");
-            content.SetCultureName("foo", "en-US");
-
-            ContentService.SaveAndPublish(content, "en-US"); // Draft + Published
-            ContentService.SaveAndPublish(content, "en-US"); // New Draft
-
-            using (ScopeProvider.CreateScope())
-            {
-                var sut = new DocumentVersionRepository((IScopeAccessor)ScopeProvider);
-                var page1 = sut.GetPagedItemsByContentId(content.Id, 0, 2, out var page1Total, 1);
-                var page2 = sut.GetPagedItemsByContentId(content.Id, 1, 2, out var page2Total, 1);
-
-                Assert.Multiple(() =>
-                {
-                    Assert.AreEqual(2, page1.Count());
-                    Assert.AreEqual(3, page1Total);
-
-                    Assert.AreEqual(1, page2.Count());
-                    Assert.AreEqual(3, page2Total);
-                });
-            }
+                Assert.AreEqual(1, page2.Count());
+                Assert.AreEqual(3, page2Total);
+            });
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs
index 24e99d49a9..262ba5dabc 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/DomainRepositoryTest.cs
@@ -10,409 +10,410 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class DomainRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class DomainRepositoryTest : UmbracoIntegrationTest
+    private ILanguageRepository LanguageRepository => GetRequiredService<ILanguageRepository>();
+
+    private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
+
+    private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
+
+    private DomainRepository CreateRepository(IScopeProvider provider)
     {
-        private ILanguageRepository LanguageRepository => GetRequiredService<ILanguageRepository>();
+        var accessor = (IScopeAccessor)provider;
+        var domainRepository =
+            new DomainRepository(accessor, AppCaches.NoCache, LoggerFactory.CreateLogger<DomainRepository>());
+        return domainRepository;
+    }
 
-        private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
-
-        private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
-
-        private DomainRepository CreateRepository(IScopeProvider provider)
+    private int CreateTestData(string isoName, out ContentType ct)
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            var accessor = (IScopeAccessor)provider;
-            var domainRepository = new DomainRepository(accessor, AppCaches.NoCache, LoggerFactory.CreateLogger<DomainRepository>());
-            return domainRepository;
+            var lang = new Language(isoName, isoName);
+            LanguageRepository.Save(lang);
+
+            ct = ContentTypeBuilder.CreateBasicContentType("test", "Test");
+            ContentTypeRepository.Save(ct);
+            var content = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
+            DocumentRepository.Save(content);
+            scope.Complete();
+            return content.Id;
         }
+    }
 
-        private int CreateTestData(string isoName, out ContentType ct)
+    [Test]
+    public void Can_Create_And_Get_By_Id()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var lang = new Language(isoName, isoName);
-                LanguageRepository.Save(lang);
+            var repo = CreateRepository(provider);
 
-                ct = ContentTypeBuilder.CreateBasicContentType("test", "Test");
-                ContentTypeRepository.Save(ct);
-                var content = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
-                DocumentRepository.Save(content);
-                scope.Complete();
-                return content.Id;
-            }
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
+            repo.Save(domain);
+
+            // re-get
+            domain = repo.Get(domain.Id);
+
+            Assert.NotNull(domain);
+            Assert.IsTrue(domain.HasIdentity);
+            Assert.Greater(domain.Id, 0);
+            Assert.AreEqual("test.com", domain.DomainName);
+            Assert.AreEqual(content.Id, domain.RootContentId);
+            Assert.AreEqual(lang.Id, domain.LanguageId);
+            Assert.AreEqual(lang.IsoCode, domain.LanguageIsoCode);
         }
+    }
 
-        [Test]
-        public void Can_Create_And_Get_By_Id()
+    [Test]
+    public void Can_Create_And_Get_By_Id_Empty_lang()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
+            var repo = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var content = DocumentRepository.Get(contentId);
+
+            var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id };
+            repo.Save(domain);
+
+            // re-get
+            domain = repo.Get(domain.Id);
+
+            Assert.NotNull(domain);
+            Assert.IsTrue(domain.HasIdentity);
+            Assert.Greater(domain.Id, 0);
+            Assert.AreEqual("test.com", domain.DomainName);
+            Assert.AreEqual(content.Id, domain.RootContentId);
+            Assert.IsFalse(domain.LanguageId.HasValue);
+        }
+    }
+
+    [Test]
+    public void Cant_Create_Duplicate_Domain_Name()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            var domain1 = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
+            repo.Save(domain1);
+
+            var domain2 = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
+
+            Assert.Throws<DuplicateNameException>(() => repo.Save(domain2));
+        }
+    }
+
+    [Test]
+    public void Can_Delete()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
+            repo.Save(domain);
+
+            repo.Delete(domain);
+
+            // re-get
+            domain = repo.Get(domain.Id);
+
+            Assert.IsNull(domain);
+        }
+    }
+
+    [Test]
+    public void Can_Update()
+    {
+        var contentId1 = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+
+            var content1 = DocumentRepository.Get(contentId1);
+
+            // more test data
+            var lang1 = LanguageRepository.GetByIsoCode("en-AU");
+            var globalSettings = new GlobalSettings();
+            var lang2 = new Language("es", "Spanish");
+            LanguageRepository.Save(lang2);
+            var content2 = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
+            DocumentRepository.Save(content2);
+
+            var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content1.Id, LanguageId = lang1.Id };
+            repo.Save(domain);
+
+            // re-get
+            domain = repo.Get(domain.Id);
+
+            domain.DomainName = "blah.com";
+            domain.RootContentId = content2.Id;
+            domain.LanguageId = lang2.Id;
+            repo.Save(domain);
+
+            // re-get
+            domain = repo.Get(domain.Id);
+
+            Assert.AreEqual("blah.com", domain.DomainName);
+            Assert.AreEqual(content2.Id, domain.RootContentId);
+            Assert.AreEqual(lang2.Id, domain.LanguageId);
+            Assert.AreEqual(lang2.IsoCode, domain.LanguageIsoCode);
+        }
+    }
+
+    [Test]
+    public void Exists()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            for (var i = 0; i < 10; i++)
             {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
+                var domain =
+                    (IDomain)new UmbracoDomain("test" + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
                 repo.Save(domain);
-
-                // re-get
-                domain = repo.Get(domain.Id);
-
-                Assert.NotNull(domain);
-                Assert.IsTrue(domain.HasIdentity);
-                Assert.Greater(domain.Id, 0);
-                Assert.AreEqual("test.com", domain.DomainName);
-                Assert.AreEqual(content.Id, domain.RootContentId);
-                Assert.AreEqual(lang.Id, domain.LanguageId);
-                Assert.AreEqual(lang.IsoCode, domain.LanguageIsoCode);
             }
+
+            var found = repo.Exists("test1.com");
+
+            Assert.IsTrue(found);
         }
+    }
 
-        [Test]
-        public void Can_Create_And_Get_By_Id_Empty_lang()
+    [Test]
+    public void Get_By_Name()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
+            var repo = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            for (var i = 0; i < 10; i++)
             {
-                DomainRepository repo = CreateRepository(provider);
-
-                IContent content = DocumentRepository.Get(contentId);
-
-                var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id };
+                var domain =
+                    (IDomain)new UmbracoDomain("test" + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
                 repo.Save(domain);
-
-                // re-get
-                domain = repo.Get(domain.Id);
-
-                Assert.NotNull(domain);
-                Assert.IsTrue(domain.HasIdentity);
-                Assert.Greater(domain.Id, 0);
-                Assert.AreEqual("test.com", domain.DomainName);
-                Assert.AreEqual(content.Id, domain.RootContentId);
-                Assert.IsFalse(domain.LanguageId.HasValue);
             }
+
+            var found = repo.GetByName("test1.com");
+
+            Assert.IsNotNull(found);
         }
+    }
 
-        [Test]
-        public void Cant_Create_Duplicate_Domain_Name()
+    [Test]
+    public void Get_All()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
+            var repo = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            for (var i = 0; i < 10; i++)
             {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                var domain1 = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
-                repo.Save(domain1);
-
-                var domain2 = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
-
-                Assert.Throws<DuplicateNameException>(() => repo.Save(domain2));
-            }
-        }
-
-        [Test]
-        public void Can_Delete()
-        {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content.Id, LanguageId = lang.Id };
+                var domain =
+                    (IDomain)new UmbracoDomain("test " + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
                 repo.Save(domain);
-
-                repo.Delete(domain);
-
-                // re-get
-                domain = repo.Get(domain.Id);
-
-                Assert.IsNull(domain);
             }
+
+            var all = repo.GetMany();
+
+            Assert.AreEqual(10, all.Count());
         }
+    }
 
-        [Test]
-        public void Can_Update()
+    [Test]
+    public void Get_All_Ids()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            int contentId1 = CreateTestData("en-AU", out ContentType ct);
+            var repo = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            var ids = new List<int>();
+            for (var i = 0; i < 10; i++)
             {
-                DomainRepository repo = CreateRepository(provider);
-
-                IContent content1 = DocumentRepository.Get(contentId1);
-
-                // more test data
-                ILanguage lang1 = LanguageRepository.GetByIsoCode("en-AU");
-                var globalSettings = new GlobalSettings();
-                var lang2 = new Language("es", "Spanish");
-                LanguageRepository.Save(lang2);
-                var content2 = new Content("test", -1, ct) { CreatorId = 0, WriterId = 0 };
-                DocumentRepository.Save(content2);
-
-                var domain = (IDomain)new UmbracoDomain("test.com") { RootContentId = content1.Id, LanguageId = lang1.Id };
+                var domain =
+                    (IDomain)new UmbracoDomain("test " + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
                 repo.Save(domain);
+                ids.Add(domain.Id);
+            }
 
-                // re-get
-                domain = repo.Get(domain.Id);
+            var all = repo.GetMany(ids.Take(8).ToArray());
 
-                domain.DomainName = "blah.com";
-                domain.RootContentId = content2.Id;
-                domain.LanguageId = lang2.Id;
+            Assert.AreEqual(8, all.Count());
+        }
+    }
+
+    [Test]
+    public void Get_All_Without_Wildcards()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            var content = DocumentRepository.Get(contentId);
+
+            for (var i = 0; i < 10; i++)
+            {
+                var domain = (IDomain)new UmbracoDomain(i % 2 == 0 ? "test " + i + ".com" : "*" + i)
+                {
+                    RootContentId = content.Id,
+                    LanguageId = lang.Id
+                };
                 repo.Save(domain);
-
-                // re-get
-                domain = repo.Get(domain.Id);
-
-                Assert.AreEqual("blah.com", domain.DomainName);
-                Assert.AreEqual(content2.Id, domain.RootContentId);
-                Assert.AreEqual(lang2.Id, domain.LanguageId);
-                Assert.AreEqual(lang2.IsoCode, domain.LanguageIsoCode);
             }
+
+            var all = repo.GetAll(false);
+
+            Assert.AreEqual(5, all.Count());
         }
+    }
 
-        [Test]
-        public void Exists()
+    [Test]
+    public void Get_All_For_Content()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
+            var repo = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var contentItems = new List<IContent>();
+
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            contentItems.Add(DocumentRepository.Get(contentId));
+
+            // more test data (3 content items total)
+            for (var i = 0; i < 2; i++)
             {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var domain = (IDomain)new UmbracoDomain("test" + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.Save(domain);
-                }
-
-                bool found = repo.Exists("test1.com");
-
-                Assert.IsTrue(found);
+                var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
+                DocumentRepository.Save(c);
+                contentItems.Add(c);
             }
+
+            for (var i = 0; i < 10; i++)
+            {
+                var domain = (IDomain)new UmbracoDomain(i % 2 == 0 ? "test " + i + ".com" : "*" + i)
+                {
+                    RootContentId = (i % 2 == 0 ? contentItems[0] : contentItems[1]).Id,
+                    LanguageId = lang.Id
+                };
+                repo.Save(domain);
+            }
+
+            var all1 = repo.GetAssignedDomains(contentItems[0].Id, true);
+            Assert.AreEqual(5, all1.Count());
+
+            var all2 = repo.GetAssignedDomains(contentItems[1].Id, true);
+            Assert.AreEqual(5, all2.Count());
+
+            var all3 = repo.GetAssignedDomains(contentItems[2].Id, true);
+            Assert.AreEqual(0, all3.Count());
         }
+    }
 
-        [Test]
-        public void Get_By_Name()
+    [Test]
+    public void Get_All_For_Content_Without_Wildcards()
+    {
+        var contentId = CreateTestData("en-AU", out var ct);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
+            var repo = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var contentItems = new List<IContent>();
+
+            var lang = LanguageRepository.GetByIsoCode("en-AU");
+            contentItems.Add(DocumentRepository.Get(contentId));
+
+            // more test data (3 content items total)
+            for (var i = 0; i < 2; i++)
             {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var domain = (IDomain)new UmbracoDomain("test" + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.Save(domain);
-                }
-
-                IDomain found = repo.GetByName("test1.com");
-
-                Assert.IsNotNull(found);
+                var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
+                DocumentRepository.Save(c);
+                contentItems.Add(c);
             }
-        }
 
-        [Test]
-        public void Get_All()
-        {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            for (var i = 0; i < 10; i++)
             {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                for (int i = 0; i < 10; i++)
+                var domain = (IDomain)new UmbracoDomain(i % 2 == 0 ? "test " + i + ".com" : "*" + i)
                 {
-                    var domain = (IDomain)new UmbracoDomain("test " + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.Save(domain);
-                }
-
-                IEnumerable<IDomain> all = repo.GetMany();
-
-                Assert.AreEqual(10, all.Count());
+                    RootContentId = (i % 2 == 0 ? contentItems[0] : contentItems[1]).Id,
+                    LanguageId = lang.Id
+                };
+                repo.Save(domain);
             }
-        }
 
-        [Test]
-        public void Get_All_Ids()
-        {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
+            var all1 = repo.GetAssignedDomains(contentItems[0].Id, false);
+            Assert.AreEqual(5, all1.Count());
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                var ids = new List<int>();
-                for (int i = 0; i < 10; i++)
-                {
-                    var domain = (IDomain)new UmbracoDomain("test " + i + ".com") { RootContentId = content.Id, LanguageId = lang.Id };
-                    repo.Save(domain);
-                    ids.Add(domain.Id);
-                }
-
-                IEnumerable<IDomain> all = repo.GetMany(ids.Take(8).ToArray());
-
-                Assert.AreEqual(8, all.Count());
-            }
-        }
-
-        [Test]
-        public void Get_All_Without_Wildcards()
-        {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DomainRepository repo = CreateRepository(provider);
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                IContent content = DocumentRepository.Get(contentId);
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var domain = (IDomain)new UmbracoDomain((i % 2 == 0) ? "test " + i + ".com" : ("*" + i))
-                    {
-                        RootContentId = content.Id,
-                        LanguageId = lang.Id
-                    };
-                    repo.Save(domain);
-                }
-
-                IEnumerable<IDomain> all = repo.GetAll(false);
-
-                Assert.AreEqual(5, all.Count());
-            }
-        }
-
-        [Test]
-        public void Get_All_For_Content()
-        {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DomainRepository repo = CreateRepository(provider);
-
-                var contentItems = new List<IContent>();
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                contentItems.Add(DocumentRepository.Get(contentId));
-
-                // more test data (3 content items total)
-                for (int i = 0; i < 2; i++)
-                {
-                    var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
-                    DocumentRepository.Save(c);
-                    contentItems.Add(c);
-                }
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var domain = (IDomain)new UmbracoDomain((i % 2 == 0) ? "test " + i + ".com" : ("*" + i))
-                    {
-                        RootContentId = ((i % 2 == 0) ? contentItems[0] : contentItems[1]).Id,
-                        LanguageId = lang.Id
-                    };
-                    repo.Save(domain);
-                }
-
-                IEnumerable<IDomain> all1 = repo.GetAssignedDomains(contentItems[0].Id, true);
-                Assert.AreEqual(5, all1.Count());
-
-                IEnumerable<IDomain> all2 = repo.GetAssignedDomains(contentItems[1].Id, true);
-                Assert.AreEqual(5, all2.Count());
-
-                IEnumerable<IDomain> all3 = repo.GetAssignedDomains(contentItems[2].Id, true);
-                Assert.AreEqual(0, all3.Count());
-            }
-        }
-
-        [Test]
-        public void Get_All_For_Content_Without_Wildcards()
-        {
-            int contentId = CreateTestData("en-AU", out ContentType ct);
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DomainRepository repo = CreateRepository(provider);
-
-                var contentItems = new List<IContent>();
-
-                ILanguage lang = LanguageRepository.GetByIsoCode("en-AU");
-                contentItems.Add(DocumentRepository.Get(contentId));
-
-                // more test data (3 content items total)
-                for (int i = 0; i < 2; i++)
-                {
-                    var c = new Content("test" + i, -1, ct) { CreatorId = 0, WriterId = 0 };
-                    DocumentRepository.Save(c);
-                    contentItems.Add(c);
-                }
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var domain = (IDomain)new UmbracoDomain((i % 2 == 0) ? "test " + i + ".com" : ("*" + i))
-                    {
-                        RootContentId = ((i % 2 == 0) ? contentItems[0] : contentItems[1]).Id,
-                        LanguageId = lang.Id
-                    };
-                    repo.Save(domain);
-                }
-
-                IEnumerable<IDomain> all1 = repo.GetAssignedDomains(contentItems[0].Id, false);
-                Assert.AreEqual(5, all1.Count());
-
-                IEnumerable<IDomain> all2 = repo.GetAssignedDomains(contentItems[1].Id, false);
-                Assert.AreEqual(0, all2.Count());
-            }
+            var all2 = repo.GetAssignedDomains(contentItems[1].Id, false);
+            Assert.AreEqual(0, all2.Count());
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs
index 7596841a6c..139a98a57a 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/EntityRepositoryTest.cs
@@ -1,101 +1,101 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class EntityRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Mapper = true, Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class EntityRepositoryTest : UmbracoIntegrationTest
+    [Test]
+    public void Get_Paged_Mixed_Entities_By_Ids()
     {
-        [Test]
-        public void Get_Paged_Mixed_Entities_By_Ids()
+        // Create content
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+        var createdContent = new List<IContent>();
+        var contentType = ContentTypeBuilder.CreateBasicContentType("blah");
+        contentTypeService.Save(contentType);
+        for (var i = 0; i < 10; i++)
         {
-            // Create content
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-            var createdContent = new List<IContent>();
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType("blah");
-            contentTypeService.Save(contentType);
-            for (int i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateBasicContent(contentType);
-                contentService.Save(c1);
-                createdContent.Add(c1);
-            }
-
-            // Create media
-            IMediaService mediaService = GetRequiredService<IMediaService>();
-            IMediaTypeService mediaTypeService = GetRequiredService<IMediaTypeService>();
-            var createdMedia = new List<IMedia>();
-            MediaType imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
-            mediaTypeService.Save(imageType);
-            for (int i = 0; i < 10; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageType, -1);
-                mediaService.Save(c1);
-                createdMedia.Add(c1);
-            }
-
-            // Create members
-            IMemberService memberService = GetRequiredService<IMemberService>();
-            IMemberTypeService memberTypeService = GetRequiredService<IMemberTypeService>();
-            MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType("simple");
-            memberTypeService.Save(memberType);
-            var createdMembers = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10).ToList();
-            memberService.Save(createdMembers);
-
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                EntityRepository repo = CreateRepository((IScopeAccessor)provider);
-
-                IEnumerable<int> ids = createdContent.Select(x => x.Id).Concat(createdMedia.Select(x => x.Id)).Concat(createdMembers.Select(x => x.Id));
-
-                System.Guid[] objectTypes = new[] { Constants.ObjectTypes.Document, Constants.ObjectTypes.Media, Constants.ObjectTypes.Member };
-
-                IQuery<IUmbracoEntity> query = provider.CreateQuery<IUmbracoEntity>()
-                    .WhereIn(e => e.Id, ids);
-
-                var entities = repo.GetPagedResultsByQuery(query, objectTypes, 0, 20, out long totalRecords, null, null).ToList();
-
-                Assert.AreEqual(20, entities.Count);
-                Assert.AreEqual(30, totalRecords);
-
-                // add the next page
-                entities.AddRange(repo.GetPagedResultsByQuery(query, objectTypes, 1, 20, out totalRecords, null, null));
-
-                Assert.AreEqual(30, entities.Count);
-                Assert.AreEqual(30, totalRecords);
-
-                var contentEntities = entities.OfType<IDocumentEntitySlim>().ToList();
-                var mediaEntities = entities.OfType<IMediaEntitySlim>().ToList();
-                var memberEntities = entities.OfType<IMemberEntitySlim>().ToList();
-
-                Assert.AreEqual(10, contentEntities.Count);
-                Assert.AreEqual(10, mediaEntities.Count);
-                Assert.AreEqual(10, memberEntities.Count);
-            }
+            var c1 = ContentBuilder.CreateBasicContent(contentType);
+            contentService.Save(c1);
+            createdContent.Add(c1);
         }
 
-        private EntityRepository CreateRepository(IScopeAccessor scopeAccessor) => new EntityRepository(scopeAccessor, AppCaches.Disabled);
+        // Create media
+        var mediaService = GetRequiredService<IMediaService>();
+        var mediaTypeService = GetRequiredService<IMediaTypeService>();
+        var createdMedia = new List<IMedia>();
+        var imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
+        mediaTypeService.Save(imageType);
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(imageType, -1);
+            mediaService.Save(c1);
+            createdMedia.Add(c1);
+        }
+
+        // Create members
+        var memberService = GetRequiredService<IMemberService>();
+        var memberTypeService = GetRequiredService<IMemberTypeService>();
+        var memberType = MemberTypeBuilder.CreateSimpleMemberType("simple");
+        memberTypeService.Save(memberType);
+        var createdMembers = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10).ToList();
+        memberService.Save(createdMembers);
+
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repo = CreateRepository((IScopeAccessor)provider);
+
+            var ids = createdContent.Select(x => x.Id).Concat(createdMedia.Select(x => x.Id))
+                .Concat(createdMembers.Select(x => x.Id));
+
+            Guid[] objectTypes =
+            {
+                Constants.ObjectTypes.Document, Constants.ObjectTypes.Media, Constants.ObjectTypes.Member
+            };
+
+            var query = provider.CreateQuery<IUmbracoEntity>()
+                .WhereIn(e => e.Id, ids);
+
+            var entities = repo.GetPagedResultsByQuery(query, objectTypes, 0, 20, out var totalRecords, null, null)
+                .ToList();
+
+            Assert.AreEqual(20, entities.Count);
+            Assert.AreEqual(30, totalRecords);
+
+            // add the next page
+            entities.AddRange(repo.GetPagedResultsByQuery(query, objectTypes, 1, 20, out totalRecords, null, null));
+
+            Assert.AreEqual(30, entities.Count);
+            Assert.AreEqual(30, totalRecords);
+
+            var contentEntities = entities.OfType<IDocumentEntitySlim>().ToList();
+            var mediaEntities = entities.OfType<IMediaEntitySlim>().ToList();
+            var memberEntities = entities.OfType<IMemberEntitySlim>().ToList();
+
+            Assert.AreEqual(10, contentEntities.Count);
+            Assert.AreEqual(10, mediaEntities.Count);
+            Assert.AreEqual(10, memberEntities.Count);
+        }
     }
+
+    private EntityRepository CreateRepository(IScopeAccessor scopeAccessor) => new(scopeAccessor, AppCaches.Disabled);
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs
index b8776e4973..d633c08872 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/KeyValueRepositoryTests.cs
@@ -12,63 +12,58 @@ using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class KeyValueRepositoryTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class KeyValueRepositoryTests : UmbracoIntegrationTest
+    [Test]
+    public void CanSetAndGet()
     {
-        [Test]
-        public void CanSetAndGet()
+        ICoreScopeProvider provider = ScopeProvider;
+
+        // Insert new key/value
+        using (var scope = provider.CreateCoreScope())
         {
-            ICoreScopeProvider provider = ScopeProvider;
-
-            // Insert new key/value
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                var keyValue = new KeyValue
-                {
-                    Identifier = "foo",
-                    Value = "bar",
-                    UpdateDate = DateTime.Now,
-                };
-                IKeyValueRepository repo = CreateRepository(provider);
-                repo.Save(keyValue);
-                scope.Complete();
-            }
-
-            // Retrieve key/value
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                IKeyValueRepository repo = CreateRepository(provider);
-                IKeyValue keyValue = repo.Get("foo");
-                scope.Complete();
-
-                Assert.AreEqual("bar", keyValue.Value);
-            }
-
-            // Update value
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                IKeyValueRepository repo = CreateRepository(provider);
-                IKeyValue keyValue = repo.Get("foo");
-                keyValue.Value = "buzz";
-                keyValue.UpdateDate = DateTime.Now;
-                repo.Save(keyValue);
-                scope.Complete();
-            }
-
-            // Retrieve key/value again
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                IKeyValueRepository repo = CreateRepository(provider);
-                IKeyValue keyValue = repo.Get("foo");
-                scope.Complete();
-
-                Assert.AreEqual("buzz", keyValue.Value);
-            }
+            var keyValue = new KeyValue { Identifier = "foo", Value = "bar", UpdateDate = DateTime.Now };
+            var repo = CreateRepository(provider);
+            repo.Save(keyValue);
+            scope.Complete();
         }
 
-        private IKeyValueRepository CreateRepository(ICoreScopeProvider provider) => new KeyValueRepository((IScopeAccessor)provider, LoggerFactory.CreateLogger<KeyValueRepository>());
+        // Retrieve key/value
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repo = CreateRepository(provider);
+            var keyValue = repo.Get("foo");
+            scope.Complete();
+
+            Assert.AreEqual("bar", keyValue.Value);
+        }
+
+        // Update value
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repo = CreateRepository(provider);
+            var keyValue = repo.Get("foo");
+            keyValue.Value = "buzz";
+            keyValue.UpdateDate = DateTime.Now;
+            repo.Save(keyValue);
+            scope.Complete();
+        }
+
+        // Retrieve key/value again
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repo = CreateRepository(provider);
+            var keyValue = repo.Get("foo");
+            scope.Complete();
+
+            Assert.AreEqual("buzz", keyValue.Value);
+        }
     }
+
+    private IKeyValueRepository CreateRepository(ICoreScopeProvider provider) =>
+        new KeyValueRepository((IScopeAccessor)provider, LoggerFactory.CreateLogger<KeyValueRepository>());
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs
index 8a2c3fb7eb..3d9b6c30e1 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/LanguageRepositoryTest.cs
@@ -2,414 +2,387 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class LanguageRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class LanguageRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => CreateTestData();
+
+    [Test]
+    public void Can_Perform_Get_On_LanguageRepository()
     {
-        [SetUp]
-        public void SetUp()
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            CreateTestData();
-        }
+            ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+            var repository = CreateRepository(provider);
 
-        [Test]
-        public void Can_Perform_Get_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                LanguageRepository repository = CreateRepository(provider);
+            // Act
+            var language = repository.Get(1);
 
-                // Act
-                ILanguage language = repository.Get(1);
-
-                // Assert
-                Assert.That(language, Is.Not.Null);
-                Assert.That(language.HasIdentity, Is.True);
-                Assert.That(language.CultureName, Is.EqualTo("English (United States)"));
-                Assert.That(language.IsoCode, Is.EqualTo("en-US"));
-                Assert.That(language.FallbackLanguageId, Is.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_By_Iso_Code_On_LanguageRepository()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                var au = CultureInfo.GetCultureInfo("en-AU");
-                ILanguage language = new Language(au.Name, au.EnglishName)
-                {
-                    FallbackLanguageId = 1
-                };
-                repository.Save(language);
-
-                // re-get
-                language = repository.GetByIsoCode(au.Name);
-
-                // Assert
-                Assert.That(language, Is.Not.Null);
-                Assert.That(language.HasIdentity, Is.True);
-                Assert.That(language.CultureName, Is.EqualTo(au.EnglishName));
-                Assert.That(language.IsoCode, Is.EqualTo(au.Name));
-                Assert.That(language.FallbackLanguageId, Is.EqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Get_When_Id_Doesnt_Exist_Returns_Null()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                ILanguage language = repository.Get(0);
-
-                // Assert
-                Assert.That(language, Is.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                IEnumerable<ILanguage> languages = repository.GetMany();
-
-                // Assert
-                Assert.That(languages, Is.Not.Null);
-                Assert.That(languages.Any(), Is.True);
-                Assert.That(languages.Any(x => x == null), Is.False);
-                Assert.That(languages.Count(), Is.EqualTo(5));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_With_Params_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                IEnumerable<ILanguage> languages = repository.GetMany(1, 2);
-
-                // Assert
-                Assert.That(languages, Is.Not.Null);
-                Assert.That(languages.Any(), Is.True);
-                Assert.That(languages.Any(x => x == null), Is.False);
-                Assert.That(languages.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetByQuery_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                IQuery<ILanguage> query = provider.CreateQuery<ILanguage>().Where(x => x.IsoCode == "da-DK");
-                IEnumerable<ILanguage> result = repository.Get(query);
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.FirstOrDefault().IsoCode, Is.EqualTo("da-DK"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Count_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                IQuery<ILanguage> query = provider.CreateQuery<ILanguage>().Where(x => x.IsoCode.StartsWith("D"));
-                int count = repository.Count(query);
-
-                // Assert
-                Assert.That(count, Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                var languageBR = new Language("pt-BR", "Portuguese (Brazil)");
-                repository.Save(languageBR);
-
-                // Assert
-                Assert.That(languageBR.HasIdentity, Is.True);
-                Assert.That(languageBR.Id, Is.EqualTo(6)); // With 5 existing entries the Id should be 6
-                Assert.IsFalse(languageBR.IsDefault);
-                Assert.IsFalse(languageBR.IsMandatory);
-                Assert.IsNull(languageBR.FallbackLanguageId);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_LanguageRepository_With_Boolean_Properties()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                var languageBR = new Language("pt-BR", "Portuguese (Brazil)") 
-                {
-                    IsDefault = true,
-                    IsMandatory = true
-                };
-                repository.Save(languageBR);
-
-                // Assert
-                Assert.That(languageBR.HasIdentity, Is.True);
-                Assert.That(languageBR.Id, Is.EqualTo(6)); // With 5 existing entries the Id should be 6
-                Assert.IsTrue(languageBR.IsDefault);
-                Assert.IsTrue(languageBR.IsMandatory);
-                Assert.IsNull(languageBR.FallbackLanguageId);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_LanguageRepository_With_Fallback_Language()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                var languageBR = new Language("pt-BR", "Portuguese (Brazil)")
-                {
-                    FallbackLanguageId = 1
-                };
-                repository.Save(languageBR);
-
-                // Assert
-                Assert.That(languageBR.HasIdentity, Is.True);
-                Assert.That(languageBR.Id, Is.EqualTo(6)); // With 5 existing entries the Id should be 6
-                Assert.That(languageBR.FallbackLanguageId, Is.EqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_LanguageRepository_With_New_Default()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                ILanguage languageBR = new Language("pt-BR", "Portuguese (Brazil)")
-                {
-                    IsDefault = true,
-                    IsMandatory = true
-                };
-                repository.Save(languageBR);
-                var languageEN = new Language("en-AU", "English (Australia)");
-                repository.Save(languageEN);
-
-                Assert.IsTrue(languageBR.IsDefault);
-                Assert.IsTrue(languageBR.IsMandatory);
-
-                // Act
-                var languageNZ = new Language("en-NZ", "English (New Zealand)") 
-                {
-                    IsDefault = true,
-                    IsMandatory = true
-                };
-                repository.Save(languageNZ);
-                languageBR = repository.Get(languageBR.Id);
-
-                // Assert
-                Assert.IsFalse(languageBR.IsDefault);
-                Assert.IsTrue(languageNZ.IsDefault);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                ILanguage language = repository.Get(5);
-                language.IsoCode = "pt-BR";
-                language.CultureName = "Portuguese (Brazil)";
-                language.FallbackLanguageId = 1;
-
-                repository.Save(language);
-
-                ILanguage languageUpdated = repository.Get(5);
-
-                // Assert
-                Assert.That(languageUpdated, Is.Not.Null);
-                Assert.That(languageUpdated.IsoCode, Is.EqualTo("pt-BR"));
-                Assert.That(languageUpdated.CultureName, Is.EqualTo("Portuguese (Brazil)"));
-                Assert.That(languageUpdated.FallbackLanguageId, Is.EqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Perform_Update_With_Existing_Culture()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                ILanguage language = repository.Get(5);
-                language.IsoCode = "da-DK";
-                language.CultureName = "Danish (Denmark)";
-
-                Assert.Throws<InvalidOperationException>(() => repository.Save(language));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                ILanguage language = repository.Get(3);
-                repository.Delete(language);
-
-                bool exists = repository.Exists(3);
-
-                // Assert
-                Assert.That(exists, Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_On_LanguageRepository_With_Language_Used_As_Fallback()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                // Add language to delete as a fall-back language to another one
-                LanguageRepository repository = CreateRepository(provider);
-                ILanguage languageToFallbackFrom = repository.Get(5);
-                languageToFallbackFrom.FallbackLanguageId = 2; // fall back to #2 (something we can delete)
-                repository.Save(languageToFallbackFrom);
-
-                // delete #2
-                ILanguage languageToDelete = repository.Get(2);
-                repository.Delete(languageToDelete);
-
-                bool exists = repository.Exists(2);
-
-                // has been deleted
-                Assert.That(exists, Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_LanguageRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                LanguageRepository repository = CreateRepository(provider);
-
-                // Act
-                bool exists = repository.Exists(3);
-                bool doesntExist = repository.Exists(10);
-
-                // Assert
-                Assert.That(exists, Is.True);
-                Assert.That(doesntExist, Is.False);
-            }
-        }
-
-        private LanguageRepository CreateRepository(IScopeProvider provider) => new LanguageRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<LanguageRepository>());
-
-        private void CreateTestData()
-        {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-
-            //Id 1 is en-US - when Umbraco is installed
-
-            var languageDK = new Language("da-DK", "Danish (Denmark)");
-            localizationService.Save(languageDK);//Id 2
-
-            var languageSE = new Language("sv-SE", "Swedish (Sweden)");
-            localizationService.Save(languageSE);//Id 3
-
-            var languageDE = new Language("de-DE", "German (Germany)");
-            localizationService.Save(languageDE);//Id 4
-
-            var languagePT = new Language("pt-PT", "Portuguese (Portugal)");
-            localizationService.Save(languagePT);//Id 5
+            // Assert
+            Assert.That(language, Is.Not.Null);
+            Assert.That(language.HasIdentity, Is.True);
+            Assert.That(language.CultureName, Is.EqualTo("English (United States)"));
+            Assert.That(language.IsoCode, Is.EqualTo("en-US"));
+            Assert.That(language.FallbackLanguageId, Is.Null);
         }
     }
+
+    [Test]
+    public void Can_Perform_Get_By_Iso_Code_On_LanguageRepository()
+    {
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var au = CultureInfo.GetCultureInfo("en-AU");
+            ILanguage language = new Language(au.Name, au.EnglishName) { FallbackLanguageId = 1 };
+            repository.Save(language);
+
+            // re-get
+            language = repository.GetByIsoCode(au.Name);
+
+            // Assert
+            Assert.That(language, Is.Not.Null);
+            Assert.That(language.HasIdentity, Is.True);
+            Assert.That(language.CultureName, Is.EqualTo(au.EnglishName));
+            Assert.That(language.IsoCode, Is.EqualTo(au.Name));
+            Assert.That(language.FallbackLanguageId, Is.EqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Get_When_Id_Doesnt_Exist_Returns_Null()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var language = repository.Get(0);
+
+            // Assert
+            Assert.That(language, Is.Null);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var languages = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(languages, Is.Not.Null);
+            Assert.That(languages.Any(), Is.True);
+            Assert.That(languages.Any(x => x == null), Is.False);
+            Assert.That(languages.Count(), Is.EqualTo(5));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_With_Params_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var languages = repository.GetMany(1, 2).ToArray();
+
+            // Assert
+            Assert.That(languages, Is.Not.Null);
+            Assert.That(languages.Any(), Is.True);
+            Assert.That(languages.Any(x => x == null), Is.False);
+            Assert.That(languages.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetByQuery_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var query = provider.CreateQuery<ILanguage>().Where(x => x.IsoCode == "da-DK");
+            var result = repository.Get(query).ToArray();
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.FirstOrDefault().IsoCode, Is.EqualTo("da-DK"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Count_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var query = provider.CreateQuery<ILanguage>().Where(x => x.IsoCode.StartsWith("D"));
+            var count = repository.Count(query);
+
+            // Assert
+            Assert.That(count, Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var languageBR = new Language("pt-BR", "Portuguese (Brazil)");
+            repository.Save(languageBR);
+
+            // Assert
+            Assert.That(languageBR.HasIdentity, Is.True);
+            Assert.That(languageBR.Id, Is.EqualTo(6)); // With 5 existing entries the Id should be 6
+            Assert.IsFalse(languageBR.IsDefault);
+            Assert.IsFalse(languageBR.IsMandatory);
+            Assert.IsNull(languageBR.FallbackLanguageId);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_LanguageRepository_With_Boolean_Properties()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var languageBR = new Language("pt-BR", "Portuguese (Brazil)") { IsDefault = true, IsMandatory = true };
+            repository.Save(languageBR);
+
+            // Assert
+            Assert.That(languageBR.HasIdentity, Is.True);
+            Assert.That(languageBR.Id, Is.EqualTo(6)); // With 5 existing entries the Id should be 6
+            Assert.IsTrue(languageBR.IsDefault);
+            Assert.IsTrue(languageBR.IsMandatory);
+            Assert.IsNull(languageBR.FallbackLanguageId);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_LanguageRepository_With_Fallback_Language()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var languageBR = new Language("pt-BR", "Portuguese (Brazil)") { FallbackLanguageId = 1 };
+            repository.Save(languageBR);
+
+            // Assert
+            Assert.That(languageBR.HasIdentity, Is.True);
+            Assert.That(languageBR.Id, Is.EqualTo(6)); // With 5 existing entries the Id should be 6
+            Assert.That(languageBR.FallbackLanguageId, Is.EqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_LanguageRepository_With_New_Default()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            ILanguage languageBR = new Language("pt-BR", "Portuguese (Brazil)") { IsDefault = true, IsMandatory = true };
+            repository.Save(languageBR);
+            var languageEN = new Language("en-AU", "English (Australia)");
+            repository.Save(languageEN);
+
+            Assert.IsTrue(languageBR.IsDefault);
+            Assert.IsTrue(languageBR.IsMandatory);
+
+            // Act
+            var languageNZ = new Language("en-NZ", "English (New Zealand)") { IsDefault = true, IsMandatory = true };
+            repository.Save(languageNZ);
+            languageBR = repository.Get(languageBR.Id);
+
+            // Assert
+            Assert.IsFalse(languageBR.IsDefault);
+            Assert.IsTrue(languageNZ.IsDefault);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var language = repository.Get(5);
+            language.IsoCode = "pt-BR";
+            language.CultureName = "Portuguese (Brazil)";
+            language.FallbackLanguageId = 1;
+
+            repository.Save(language);
+
+            var languageUpdated = repository.Get(5);
+
+            // Assert
+            Assert.That(languageUpdated, Is.Not.Null);
+            Assert.That(languageUpdated.IsoCode, Is.EqualTo("pt-BR"));
+            Assert.That(languageUpdated.CultureName, Is.EqualTo("Portuguese (Brazil)"));
+            Assert.That(languageUpdated.FallbackLanguageId, Is.EqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Perform_Update_With_Existing_Culture()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var language = repository.Get(5);
+            language.IsoCode = "da-DK";
+            language.CultureName = "Danish (Denmark)";
+
+            Assert.Throws<InvalidOperationException>(() => repository.Save(language));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var language = repository.Get(3);
+            repository.Delete(language);
+
+            var exists = repository.Exists(3);
+
+            // Assert
+            Assert.That(exists, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_On_LanguageRepository_With_Language_Used_As_Fallback()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            // Add language to delete as a fall-back language to another one
+            var repository = CreateRepository(provider);
+            var languageToFallbackFrom = repository.Get(5);
+            languageToFallbackFrom.FallbackLanguageId = 2; // fall back to #2 (something we can delete)
+            repository.Save(languageToFallbackFrom);
+
+            // delete #2
+            var languageToDelete = repository.Get(2);
+            repository.Delete(languageToDelete);
+
+            var exists = repository.Exists(2);
+
+            // has been deleted
+            Assert.That(exists, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists_On_LanguageRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var exists = repository.Exists(3);
+            var doesntExist = repository.Exists(10);
+
+            // Assert
+            Assert.That(exists, Is.True);
+            Assert.That(doesntExist, Is.False);
+        }
+    }
+
+    private LanguageRepository CreateRepository(IScopeProvider provider) => new((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<LanguageRepository>());
+
+    private void CreateTestData()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+
+        //Id 1 is en-US - when Umbraco is installed
+
+        var languageDK = new Language("da-DK", "Danish (Denmark)");
+        localizationService.Save(languageDK); //Id 2
+
+        var languageSE = new Language("sv-SE", "Swedish (Sweden)");
+        localizationService.Save(languageSE); //Id 3
+
+        var languageDE = new Language("de-DE", "German (Germany)");
+        localizationService.Save(languageDE); //Id 4
+
+        var languagePT = new Language("pt-PT", "Portuguese (Portugal)");
+        localizationService.Save(languagePT); //Id 5
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs
index 834800e675..d3ce181cdc 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MacroRepositoryTest.cs
@@ -1,421 +1,431 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
-using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class MacroRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MacroRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp()
     {
-        private ILogger<MacroRepository> _logger;
+        _logger = LoggerFactory.CreateLogger<MacroRepository>();
+        CreateTestData();
+    }
 
-        [SetUp]
-        public void SetUp()
+    private ILogger<MacroRepository> _logger;
+
+    [Test]
+    public void Cannot_Add_Duplicate_Macros()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            _logger = LoggerFactory.CreateLogger<MacroRepository>();
-            CreateTestData();
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+
+            var macro = new Macro(ShortStringHelper, "test1", "Test", "~/views/macropartials/test.cshtml");
+
+            Assert.That(() => repository.Save(macro), Throws.InstanceOf<DbException>());
         }
+    }
 
-        [Test]
-        public void Cannot_Add_Duplicate_Macros()
+    [Test]
+    public void Cannot_Update_To_Duplicate_Macro_Alias()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "test1", "Test", "~/views/macropartials/test.cshtml");
+            var macro = repository.Get(1);
+            macro.Alias = "test2";
 
-                Assert.That(() => repository.Save(macro), Throws.InstanceOf<DbException>());
-            }
+            Assert.That(() => repository.Save(macro), Throws.InstanceOf<DbException>());
         }
+    }
 
-        [Test]
-        public void Cannot_Update_To_Duplicate_Macro_Alias()
+    [Test]
+    public void Can_Instantiate_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                IMacro macro = repository.Get(1);
-                macro.Alias = "test2";
-
-                Assert.That(() => repository.Save(macro), Throws.InstanceOf<DbException>());
-            }
+            // Assert
+            Assert.That(repository, Is.Not.Null);
         }
+    }
 
-        [Test]
-        public void Can_Instantiate_Repository()
+    [Test]
+    public void Can_Perform_Get_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Assert
-                Assert.That(repository, Is.Not.Null);
-            }
+            // Act
+            var macro = repository.Get(1);
+
+            // Assert
+            Assert.That(macro, Is.Not.Null);
+            Assert.That(macro.HasIdentity, Is.True);
+            Assert.That(macro.Alias, Is.EqualTo("test1"));
+            Assert.That(macro.CacheByPage, Is.EqualTo(false));
+            Assert.That(macro.CacheByMember, Is.EqualTo(false));
+            Assert.That(macro.DontRender, Is.EqualTo(true));
+            Assert.That(macro.Name, Is.EqualTo("Test1"));
+            Assert.That(macro.CacheDuration, Is.EqualTo(0));
+            Assert.That(macro.MacroSource, Is.EqualTo("~/views/macropartials/test1.cshtml"));
+            Assert.That(macro.UseInEditor, Is.EqualTo(false));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Get_On_Repository()
+    [Test]
+    public void Can_Perform_GetAll_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                IMacro macro = repository.Get(1);
+            // Act
+            var macros = repository.GetMany();
 
-                // Assert
-                Assert.That(macro, Is.Not.Null);
-                Assert.That(macro.HasIdentity, Is.True);
-                Assert.That(macro.Alias, Is.EqualTo("test1"));
-                Assert.That(macro.CacheByPage, Is.EqualTo(false));
-                Assert.That(macro.CacheByMember, Is.EqualTo(false));
-                Assert.That(macro.DontRender, Is.EqualTo(true));
-                Assert.That(macro.Name, Is.EqualTo("Test1"));
-                Assert.That(macro.CacheDuration, Is.EqualTo(0));
-                Assert.That(macro.MacroSource, Is.EqualTo("~/views/macropartials/test1.cshtml"));
-                Assert.That(macro.UseInEditor, Is.EqualTo(false));
-            }
+            // Assert
+            Assert.That(macros.Count(), Is.EqualTo(3));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetAll_On_Repository()
+    [Test]
+    public void Can_Perform_GetByQuery_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                IEnumerable<IMacro> macros = repository.GetMany();
+            // Act
+            var query = ScopeAccessor.AmbientScope.SqlContext.Query<IMacro>().Where(x => x.Alias.ToUpper() == "TEST1");
+            var result = repository.Get(query);
 
-                // Assert
-                Assert.That(macros.Count(), Is.EqualTo(3));
-            }
+            // Assert
+            Assert.AreEqual(1, result.Count());
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetByQuery_On_Repository()
+    [Test]
+    public void Can_Perform_Count_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                IQuery<IMacro> query = ScopeAccessor.AmbientScope.SqlContext.Query<IMacro>().Where(x => x.Alias.ToUpper() == "TEST1");
-                IEnumerable<IMacro> result = repository.Get((IQuery<IMacro>)query);
+            // Act
+            var query = ScopeAccessor.AmbientScope.SqlContext.Query<IMacro>().Where(x => x.Name.StartsWith("Test"));
+            var count = repository.Count(query);
 
-                // Assert
-                Assert.AreEqual(1, result.Count());
-            }
+            // Assert
+            Assert.That(count, Is.EqualTo(2));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Count_On_Repository()
+    [Test]
+    public void Can_Perform_Add_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                IQuery<IMacro> query = ScopeAccessor.AmbientScope.SqlContext.Query<IMacro>().Where(x => x.Name.StartsWith("Test"));
-                int count = repository.Count(query);
+            // Act
+            var macro = new Macro(ShortStringHelper, "test", "Test", "~/views/macropartials/test.cshtml");
+            macro.Properties.Add(new MacroProperty("test", "Test", 0, "test"));
+            repository.Save(macro);
 
-                // Assert
-                Assert.That(count, Is.EqualTo(2));
-            }
+            // Assert
+            Assert.That(macro.HasIdentity, Is.True);
+            Assert.That(macro.Id, Is.EqualTo(4)); // With 3 existing entries the Id should be 4
+            Assert.Greater(macro.Properties.Values.Single().Id, 0);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Add_On_Repository()
+    [Test]
+    public void Can_Perform_Update_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                var macro = new Macro(ShortStringHelper, "test", "Test", "~/views/macropartials/test.cshtml");
-                macro.Properties.Add(new MacroProperty("test", "Test", 0, "test"));
-                repository.Save(macro);
+            // Act
+            var macro = repository.Get(2);
+            macro.Name = "Hello";
+            macro.CacheDuration = 1234;
+            macro.CacheByPage = true;
+            macro.CacheByMember = true;
+            macro.DontRender = false;
+            macro.MacroSource = "~/newpath.cshtml";
+            macro.UseInEditor = true;
 
-                // Assert
-                Assert.That(macro.HasIdentity, Is.True);
-                Assert.That(macro.Id, Is.EqualTo(4)); // With 3 existing entries the Id should be 4
-                Assert.Greater(macro.Properties.Values.Single().Id, 0);
-            }
+            repository.Save(macro);
+
+            var macroUpdated = repository.Get(2);
+
+            // Assert
+            Assert.That(macroUpdated, Is.Not.Null);
+            Assert.That(macroUpdated.Name, Is.EqualTo("Hello"));
+            Assert.That(macroUpdated.CacheDuration, Is.EqualTo(1234));
+            Assert.That(macroUpdated.CacheByPage, Is.EqualTo(true));
+            Assert.That(macroUpdated.CacheByMember, Is.EqualTo(true));
+            Assert.That(macroUpdated.DontRender, Is.EqualTo(false));
+            Assert.That(macroUpdated.MacroSource, Is.EqualTo("~/newpath.cshtml"));
+            Assert.That(macroUpdated.UseInEditor, Is.EqualTo(true));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Update_On_Repository()
+    [Test]
+    public void Can_Perform_Delete_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                IMacro macro = repository.Get(2);
-                macro.Name = "Hello";
-                macro.CacheDuration = 1234;
-                macro.CacheByPage = true;
-                macro.CacheByMember = true;
-                macro.DontRender = false;
-                macro.MacroSource = "~/newpath.cshtml";
-                macro.UseInEditor = true;
+            // Act
+            var macro = repository.Get(3);
+            Assert.IsNotNull(macro);
+            repository.Delete(macro);
 
-                repository.Save(macro);
+            var exists = repository.Exists(3);
 
-                IMacro macroUpdated = repository.Get(2);
-
-                // Assert
-                Assert.That(macroUpdated, Is.Not.Null);
-                Assert.That(macroUpdated.Name, Is.EqualTo("Hello"));
-                Assert.That(macroUpdated.CacheDuration, Is.EqualTo(1234));
-                Assert.That(macroUpdated.CacheByPage, Is.EqualTo(true));
-                Assert.That(macroUpdated.CacheByMember, Is.EqualTo(true));
-                Assert.That(macroUpdated.DontRender, Is.EqualTo(false));
-                Assert.That(macroUpdated.MacroSource, Is.EqualTo("~/newpath.cshtml"));
-                Assert.That(macroUpdated.UseInEditor, Is.EqualTo(true));
-            }
+            // Assert
+            Assert.That(exists, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Delete_On_Repository()
+    [Test]
+    public void Can_Perform_Exists_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                IMacro macro = repository.Get(3);
-                Assert.IsNotNull(macro);
-                repository.Delete(macro);
+            // Act
+            var exists = repository.Exists(3);
+            var doesntExist = repository.Exists(10);
 
-                bool exists = repository.Exists(3);
-
-                // Assert
-                Assert.That(exists, Is.False);
-            }
+            // Assert
+            Assert.That(exists, Is.True);
+            Assert.That(doesntExist, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Exists_On_Repository()
+    [Test]
+    public void Can_Add_Property_For_Macro()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                // Act
-                bool exists = repository.Exists(3);
-                bool doesntExist = repository.Exists(10);
+            var macro = repository.Get(1);
+            macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
 
-                // Assert
-                Assert.That(exists, Is.True);
-                Assert.That(doesntExist, Is.False);
-            }
+            repository.Save(macro);
+
+            // Assert
+            Assert.Greater(macro.Properties.Values.First().Id, 0); // ensure id is returned
+            var result = repository.Get(1);
+            Assert.Greater(result.Properties.Values.First().Id, 0);
+            Assert.AreEqual(1, result.Properties.Values.Count());
+            Assert.AreEqual("new1", result.Properties.Values.First().Alias);
+            Assert.AreEqual("New1", result.Properties.Values.First().Name);
+            Assert.AreEqual(3, result.Properties.Values.First().SortOrder);
         }
+    }
 
-        [Test]
-        public void Can_Add_Property_For_Macro()
+    [Test]
+    public void Can_Add_New_Macro_With_Property()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                IMacro macro = repository.Get(1);
-                macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
+            var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
+            macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
 
-                repository.Save(macro);
+            repository.Save(macro);
 
-                // Assert
-                Assert.Greater(macro.Properties.Values.First().Id, 0); // ensure id is returned
-                IMacro result = repository.Get(1);
-                Assert.Greater(result.Properties.Values.First().Id, 0);
-                Assert.AreEqual(1, result.Properties.Values.Count());
-                Assert.AreEqual("new1", result.Properties.Values.First().Alias);
-                Assert.AreEqual("New1", result.Properties.Values.First().Name);
-                Assert.AreEqual(3, result.Properties.Values.First().SortOrder);
-            }
+            // Assert
+            var result = repository.Get(macro.Id);
+            Assert.AreEqual(1, result.Properties.Values.Count());
+            Assert.AreEqual("blah1", result.Properties.Values.First().Alias);
+            Assert.AreEqual("New1", result.Properties.Values.First().Name);
+            Assert.AreEqual(4, result.Properties.Values.First().SortOrder);
         }
+    }
 
-        [Test]
-        public void Can_Add_New_Macro_With_Property()
+    [Test]
+    public void Can_Remove_Macro_Property()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
-                macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
+            var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
+            macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
+            repository.Save(macro);
 
-                repository.Save(macro);
+            var result = repository.Get(macro.Id);
+            result.Properties.Remove("blah1");
+            repository.Save(result);
 
-                // Assert
-                IMacro result = repository.Get(macro.Id);
-                Assert.AreEqual(1, result.Properties.Values.Count());
-                Assert.AreEqual("blah1", result.Properties.Values.First().Alias);
-                Assert.AreEqual("New1", result.Properties.Values.First().Name);
-                Assert.AreEqual(4, result.Properties.Values.First().SortOrder);
-            }
+            // Assert
+            result = repository.Get(macro.Id);
+            Assert.AreEqual(0, result.Properties.Values.Count());
         }
+    }
 
-        [Test]
-        public void Can_Remove_Macro_Property()
+    [Test]
+    public void Can_Add_Remove_Macro_Properties()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
-                macro.Properties.Add(new MacroProperty("blah1", "New1", 4, "test.editor"));
-                repository.Save(macro);
+            var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
+            var prop1 = new MacroProperty("blah1", "New1", 4, "test.editor");
+            var prop2 = new MacroProperty("blah2", "New2", 3, "test.editor");
 
-                IMacro result = repository.Get(macro.Id);
-                result.Properties.Remove("blah1");
-                repository.Save(result);
+            // add/remove a few to test the collection observable
+            macro.Properties.Add(prop1);
+            macro.Properties.Add(prop2);
+            macro.Properties.Remove(prop1);
+            macro.Properties.Remove("blah2");
+            macro.Properties.Add(prop2);
 
-                // Assert
-                result = repository.Get(macro.Id);
-                Assert.AreEqual(0, result.Properties.Values.Count());
-            }
+            repository.Save(macro);
+
+            // Assert
+            var result = repository.Get(macro.Id);
+
+            Assert.AreEqual(1, result.Properties.Values.Count());
+            Assert.AreEqual("blah2", result.Properties.Values.Single().Alias);
         }
+    }
 
-        [Test]
-        public void Can_Add_Remove_Macro_Properties()
+    [Test]
+    public void Can_Update_Property_For_Macro()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                var macro = new Macro(ShortStringHelper, "newmacro", "A new macro", "~/views/macropartials/test1.cshtml");
-                var prop1 = new MacroProperty("blah1", "New1", 4, "test.editor");
-                var prop2 = new MacroProperty("blah2", "New2", 3, "test.editor");
+            var macro = repository.Get(1);
+            macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
+            repository.Save(macro);
 
-                // add/remove a few to test the collection observable
-                macro.Properties.Add(prop1);
-                macro.Properties.Add(prop2);
-                macro.Properties.Remove(prop1);
-                macro.Properties.Remove("blah2");
-                macro.Properties.Add(prop2);
+            // Act
+            macro = repository.Get(1);
+            macro.Properties["new1"].Name = "this is a new name";
+            repository.Save(macro);
 
-                repository.Save(macro);
-
-                // Assert
-                IMacro result = repository.Get(macro.Id);
-
-                Assert.AreEqual(1, result.Properties.Values.Count());
-                Assert.AreEqual("blah2", result.Properties.Values.Single().Alias);
-            }
+            // Assert
+            var result = repository.Get(1);
+            Assert.AreEqual("new1", result.Properties.Values.First().Alias);
+            Assert.AreEqual("this is a new name", result.Properties.Values.First().Name);
         }
+    }
 
-        [Test]
-        public void Can_Update_Property_For_Macro()
+    [Test]
+    public void Can_Update_Macro_Property_Alias()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                IMacro macro = repository.Get(1);
-                macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
-                repository.Save(macro);
+            var macro = repository.Get(1);
+            macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
+            repository.Save(macro);
 
-                // Act
-                macro = repository.Get(1);
-                macro.Properties["new1"].Name = "this is a new name";
-                repository.Save(macro);
+            // Act
+            macro = repository.Get(1);
+            macro.Properties.UpdateProperty("new1", newAlias: "newAlias");
+            repository.Save(macro);
 
-                // Assert
-                IMacro result = repository.Get(1);
-                Assert.AreEqual("new1", result.Properties.Values.First().Alias);
-                Assert.AreEqual("this is a new name", result.Properties.Values.First().Name);
-            }
+            // Assert
+            var result = repository.Get(1);
+            Assert.AreEqual("newAlias", result.Properties.Values.First().Alias);
         }
+    }
 
-        [Test]
-        public void Can_Update_Macro_Property_Alias()
+    public void CreateTestData()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
+            var repository =
+                new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
 
-                IMacro macro = repository.Get(1);
-                macro.Properties.Add(new MacroProperty("new1", "New1", 3, "test"));
-                repository.Save(macro);
-
-                // Act
-                macro = repository.Get(1);
-                macro.Properties.UpdateProperty("new1", newAlias: "newAlias");
-                repository.Save(macro);
-
-                // Assert
-                IMacro result = repository.Get(1);
-                Assert.AreEqual("newAlias", result.Properties.Values.First().Alias);
-            }
-        }
-
-        public void CreateTestData()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)provider, AppCaches.Disabled, _logger, ShortStringHelper);
-
-                repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
-                repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
-                repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
-                scope.Complete();
-            }
+            repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
+            repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
+            repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
+            scope.Complete();
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs
index a1dc79a8de..afe228a8fb 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaRepositoryTest.cs
@@ -2,26 +2,20 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Persistence;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -29,564 +23,579 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class MediaRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MediaRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUpTestData() => CreateTestData();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private ITemplateRepository TemplateRepository => GetRequiredService<ITemplateRepository>();
+
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private IJsonSerializer JsonSerializer => GetRequiredService<IJsonSerializer>();
+
+    // Makes handing IDs easier, these are set by CreateTestData
+    private Media _testFolder;
+    private Media _testImage;
+    private Media _testFile;
+
+    private MediaRepository CreateRepository(IScopeProvider provider, out MediaTypeRepository mediaTypeRepository, AppCaches appCaches = null)
     {
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
+        appCaches ??= AppCaches.NoCache;
+        var scopeAccessor = (IScopeAccessor)provider;
+        var globalSettings = new GlobalSettings();
+        var commonRepository =
+            new ContentTypeCommonRepository(scopeAccessor, TemplateRepository, appCaches, ShortStringHelper);
+        var languageRepository =
+            new LanguageRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<LanguageRepository>());
+        mediaTypeRepository = new MediaTypeRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<MediaTypeRepository>(), commonRepository, languageRepository, ShortStringHelper);
+        var tagRepository = new TagRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<TagRepository>());
+        var relationTypeRepository = new RelationTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
+        var entityRepository = new EntityRepository(scopeAccessor, AppCaches.Disabled);
+        var relationRepository = new RelationRepository(scopeAccessor, LoggerFactory.CreateLogger<RelationRepository>(), relationTypeRepository, entityRepository);
+        var propertyEditors =
+            new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
+        var mediaUrlGenerators = new MediaUrlGeneratorCollection(() => Enumerable.Empty<IMediaUrlGenerator>());
+        var dataValueReferences =
+            new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
+        var repository = new MediaRepository(
+            scopeAccessor,
+            appCaches,
+            LoggerFactory.CreateLogger<MediaRepository>(),
+            LoggerFactory,
+            mediaTypeRepository,
+            tagRepository,
+            Mock.Of<ILanguageRepository>(),
+            relationRepository,
+            relationTypeRepository,
+            propertyEditors,
+            mediaUrlGenerators,
+            dataValueReferences,
+            DataTypeService,
+            JsonSerializer,
+            Mock.Of<IEventAggregator>());
+        return repository;
+    }
 
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+    [Test]
+    public void CacheActiveForIntsAndGuids()
+    {
+        var realCache = new AppCaches(
+            new ObjectCacheAppCache(),
+            new DictionaryAppCache(),
+            new IsolatedCaches(t => new ObjectCacheAppCache()));
 
-        private ITemplateRepository TemplateRepository => GetRequiredService<ITemplateRepository>();
-
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
-
-        private IJsonSerializer JsonSerializer => GetRequiredService<IJsonSerializer>();
-
-        // Makes handing IDs easier, these are set by CreateTestData
-        private Media _testFolder;
-        private Media _testImage;
-        private Media _testFile;
-
-        [SetUp]
-        public void SetUpTestData() => CreateTestData();
-
-        private MediaRepository CreateRepository(IScopeProvider provider, out MediaTypeRepository mediaTypeRepository, AppCaches appCaches = null)
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            appCaches ??= AppCaches.NoCache;
-            var scopeAccessor = (IScopeAccessor)provider;
-            var globalSettings = new GlobalSettings();
-            var commonRepository = new ContentTypeCommonRepository(scopeAccessor, TemplateRepository, appCaches, ShortStringHelper);
-            var languageRepository = new LanguageRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<LanguageRepository>());
-            mediaTypeRepository = new MediaTypeRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<MediaTypeRepository>(), commonRepository, languageRepository, ShortStringHelper);
-            var tagRepository = new TagRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<TagRepository>());
-            var relationTypeRepository = new RelationTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
-            var entityRepository = new EntityRepository(scopeAccessor, AppCaches.Disabled);
-            var relationRepository = new RelationRepository(scopeAccessor, LoggerFactory.CreateLogger<RelationRepository>(), relationTypeRepository, entityRepository);
-            var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
-            var mediaUrlGenerators = new MediaUrlGeneratorCollection(() => Enumerable.Empty<IMediaUrlGenerator>());
-            var dataValueReferences = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
-            var repository = new MediaRepository(scopeAccessor, appCaches, LoggerFactory.CreateLogger<MediaRepository>(), LoggerFactory, mediaTypeRepository, tagRepository, Mock.Of<ILanguageRepository>(), relationRepository, relationTypeRepository, propertyEditors, mediaUrlGenerators, dataValueReferences, DataTypeService, JsonSerializer, Mock.Of<IEventAggregator>());
-            return repository;
-        }
+            var repository = CreateRepository(provider, out var mediaTypeRepository, realCache);
 
-        [Test]
-        public void CacheActiveForIntsAndGuids()
-        {
-            var realCache = new AppCaches(
-                new ObjectCacheAppCache(),
-                new DictionaryAppCache(),
-                new IsolatedCaches(t => new ObjectCacheAppCache()));
+            var udb = ScopeAccessor.AmbientScope.Database;
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository, appCaches: realCache);
+            udb.EnableSqlCount = false;
 
-                IUmbracoDatabase udb = ScopeAccessor.AmbientScope.Database;
+            var mediaType = MediaTypeBuilder.CreateSimpleMediaType("umbTextpage1", "Textpage");
+            mediaTypeRepository.Save(mediaType);
 
-                udb.EnableSqlCount = false;
+            var media = MediaBuilder.CreateSimpleMedia(mediaType, "hello", -1);
+            repository.Save(media);
 
-                MediaType mediaType = MediaTypeBuilder.CreateSimpleMediaType("umbTextpage1", "Textpage");
-                mediaTypeRepository.Save(mediaType);
+            udb.EnableSqlCount = true;
 
-                Media media = MediaBuilder.CreateSimpleMedia(mediaType, "hello", -1);
-                repository.Save(media);
+            // go get it, this should already be cached since the default repository key is the INT
+            var found = repository.Get(media.Id);
+            Assert.AreEqual(0, udb.SqlCount);
 
-                udb.EnableSqlCount = true;
+            // retrieve again, this should use cache
+            found = repository.Get(media.Id);
+            Assert.AreEqual(0, udb.SqlCount);
 
-                // go get it, this should already be cached since the default repository key is the INT
-                IMedia found = repository.Get(media.Id);
-                Assert.AreEqual(0, udb.SqlCount);
+            // reset counter
+            udb.EnableSqlCount = false;
+            udb.EnableSqlCount = true;
 
-                // retrieve again, this should use cache
-                found = repository.Get(media.Id);
-                Assert.AreEqual(0, udb.SqlCount);
+            // now get by GUID, this won't be cached yet because the default repo key is not a GUID
+            found = repository.Get(media.Key);
+            var sqlCount = udb.SqlCount;
+            Assert.Greater(sqlCount, 0);
 
-                // reset counter
-                udb.EnableSqlCount = false;
-                udb.EnableSqlCount = true;
-
-                // now get by GUID, this won't be cached yet because the default repo key is not a GUID
-                found = repository.Get(media.Key);
-                int sqlCount = udb.SqlCount;
-                Assert.Greater(sqlCount, 0);
-
-                // retrieve again, this should use cache now
-                found = repository.Get(media.Key);
-                Assert.AreEqual(sqlCount, udb.SqlCount);
-            }
-        }
-
-        [Test]
-        public void SaveMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                IMediaType mediaType = mediaTypeRepository.Get(1032);
-                Media image = MediaBuilder.CreateMediaImage(mediaType, -1);
-
-                // Act
-                mediaTypeRepository.Save(mediaType);
-                repository.Save(image);
-
-                IMedia fetched = repository.Get(image.Id);
-
-                // Assert
-                Assert.That(mediaType.HasIdentity, Is.True);
-                Assert.That(image.HasIdentity, Is.True);
-
-                TestHelper.AssertPropertyValuesAreEqual(image, fetched);
-            }
-        }
-
-        [Test]
-        public void SaveMediaMultiple()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                IMediaType mediaType = mediaTypeRepository.Get(1032);
-                Media file = MediaBuilder.CreateMediaFile(mediaType, -1);
-
-                // Act
-                repository.Save(file);
-
-                Media image = MediaBuilder.CreateMediaImage(mediaType, -1);
-                repository.Save(image);
-
-                // Assert
-                Assert.That(file.HasIdentity, Is.True);
-                Assert.That(image.HasIdentity, Is.True);
-                Assert.That(file.Name, Is.EqualTo("Test File"));
-                Assert.That(image.Name, Is.EqualTo("Test Image"));
-                Assert.That(file.ContentTypeId, Is.EqualTo(mediaType.Id));
-                Assert.That(image.ContentTypeId, Is.EqualTo(mediaType.Id));
-            }
-        }
-
-        [Test]
-        public void GetMediaIsNotDirty()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IMedia media = repository.Get(_testImage.Id);
-                bool dirty = ((ICanBeDirty)media).IsDirty();
-
-                // Assert
-                Assert.That(dirty, Is.False);
-            }
-        }
-
-        [Test]
-        public void UpdateMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IMedia content = repository.Get(_testFile.Id);
-                content.Name = "Test File Updated";
-                repository.Save(content);
-
-                IMedia updatedContent = repository.Get(_testFile.Id);
-
-                // Assert
-                Assert.That(updatedContent.Id, Is.EqualTo(content.Id));
-                Assert.That(updatedContent.Name, Is.EqualTo(content.Name));
-            }
-        }
-
-        [Test]
-        public void DeleteMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IMedia media = repository.Get(_testFile.Id);
-                repository.Delete(media);
-
-                IMedia deleted = repository.Get(_testFile.Id);
-                bool exists = repository.Exists(_testFile.Id);
-
-                // Assert
-                Assert.That(deleted, Is.Null);
-                Assert.That(exists, Is.False);
-            }
-        }
-
-        [Test]
-        public void GetMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IMedia media = repository.Get(_testImage.Id);
-
-                // Assert
-                Assert.That(media.Id, Is.EqualTo(_testImage.Id));
-                Assert.That(media.CreateDate, Is.GreaterThan(DateTime.MinValue));
-                Assert.That(media.UpdateDate, Is.GreaterThan(DateTime.MinValue));
-                Assert.That(media.ParentId, Is.Not.EqualTo(0));
-                Assert.That(media.Name, Is.EqualTo("Test Image"));
-                Assert.That(media.SortOrder, Is.EqualTo(0));
-                Assert.That(media.VersionId, Is.Not.EqualTo(0));
-                Assert.That(media.ContentTypeId, Is.EqualTo(1032));
-                Assert.That(media.Path, Is.Not.Empty);
-                Assert.That(media.Properties.Any(), Is.True);
-            }
-        }
-
-        [Test]
-        public void QueryMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-                IEnumerable<IMedia> result = repository.Get(query);
-
-                // Assert
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(2)); // There should be two entities on level 2: File and Media
-            }
-        }
-
-        [Test]
-        public void QueryMedia_ContentTypeIdFilter()
-        {
-            // Arrange
-            IMediaType folderMediaType = MediaTypeService.Get(1031);
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                for (int i = 0; i < 10; i++)
-                {
-                    Media folder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
-                    repository.Save(folder);
-                }
-
-                int[] types = new[] { 1031 };
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => types.Contains(x.ContentTypeId));
-                IEnumerable<IMedia> result = repository.Get(query);
-
-                // Assert
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(11));
-            }
-        }
-
-        [Ignore("Unsupported feature.")]
-        [Test]
-        public void QueryMedia_ContentTypeAliasFilter()
-        {
-            // we could support this, but it would require an extra join on the query,
-            // and we don't absolutely need it now, so leaving it out for now
-
-            // Arrange
-            IMediaType folderMediaType = MediaTypeService.Get(1031);
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                for (int i = 0; i < 10; i++)
-                {
-                    Media folder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
-                    repository.Save(folder);
-                }
-
-                string[] types = new[] { "Folder" };
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => types.Contains(x.ContentType.Alias));
-                IEnumerable<IMedia> result = repository.Get(query);
-
-                // Assert
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(11));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_FirstPage()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-                IEnumerable<IMedia> result = repository.GetPage(query, 0, 1, out long totalRecords, null, Ordering.By("SortOrder"));
-
-                // Assert
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Test Image"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_SecondPage()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-                IEnumerable<IMedia> result = repository.GetPage(query, 1, 1, out long totalRecords, null, Ordering.By("SortOrder"));
-
-                // Assert
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Test File"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_SinglePage()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-                IEnumerable<IMedia> result = repository.GetPage(query, 0, 2, out long totalRecords, null, Ordering.By("SortOrder"));
-
-                // Assert
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(2));
-                Assert.That(result.First().Name, Is.EqualTo("Test Image"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_DescendingOrder()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-                IEnumerable<IMedia> result = repository.GetPage(query, 0, 1, out long totalRecords, null, Ordering.By("SortOrder", Direction.Descending));
-
-                // Assert
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Test File"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_AlternateOrder()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-                IEnumerable<IMedia> result = repository.GetPage(query, 0, 1, out long totalRecords, null, Ordering.By("Name"));
-
-                // Assert
-                Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Test File"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_FilterMatchingSome()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-
-                IQuery<IMedia> filter = provider.CreateQuery<IMedia>().Where(x => x.Name.Contains("File"));
-                IEnumerable<IMedia> result = repository.GetPage(query, 0, 1, out long totalRecords, filter, Ordering.By("SortOrder"));
-
-                // Assert
-                Assert.That(totalRecords, Is.EqualTo(1));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Test File"));
-            }
-        }
-
-        [Test]
-        public void GetPagedResultsByQuery_FilterMatchingAll()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out _);
-
-                // Act
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
-
-                IQuery<IMedia> filter = provider.CreateQuery<IMedia>().Where(x => x.Name.Contains("Test"));
-                IEnumerable<IMedia> result = repository.GetPage(query, 0, 1, out long totalRecords, filter, Ordering.By("SortOrder"));
-
-                // Assert
-                Assert.That(totalRecords, Is.EqualTo(2));
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Name, Is.EqualTo("Test Image"));
-            }
-        }
-
-        [Test]
-        public void GetAllMediaByIds()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IEnumerable<IMedia> medias = repository.GetMany(_testImage.Id, _testFile.Id);
-
-                // Assert
-                Assert.That(medias, Is.Not.Null);
-                Assert.That(medias.Any(), Is.True);
-                Assert.That(medias.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void GetAllMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                IEnumerable<IMedia> medias = repository.GetMany();
-
-                // Assert
-                Assert.That(medias, Is.Not.Null);
-                Assert.That(medias.Any(), Is.True);
-                Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
-
-                medias = repository.GetMany(medias.Select(x => x.Id).ToArray());
-                Assert.That(medias, Is.Not.Null);
-                Assert.That(medias.Any(), Is.True);
-                Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
-
-                medias = ((IReadRepository<Guid, IMedia>)repository).GetMany(medias.Select(x => x.Key).ToArray());
-                Assert.That(medias, Is.Not.Null);
-                Assert.That(medias.Any(), Is.True);
-                Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
-            }
-        }
-
-        [Test]
-        public void ExistMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                bool exists = repository.Exists(_testImage.Id);
-                bool existsToo = repository.Exists(_testImage.Id);
-                bool doesntExists = repository.Exists(NodeDto.NodeIdSeed + 5);
-
-                // Assert
-                Assert.That(exists, Is.True);
-                Assert.That(existsToo, Is.True);
-                Assert.That(doesntExists, Is.False);
-            }
-        }
-
-        [Test]
-        public void CountMedia()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaRepository repository = CreateRepository(provider, out MediaTypeRepository mediaTypeRepository);
-
-                // Act
-                int level = 2;
-                IQuery<IMedia> query = provider.CreateQuery<IMedia>().Where(x => x.Level == level);
-                int result = repository.Count(query);
-
-                // Assert
-                Assert.That(result, Is.GreaterThanOrEqualTo(2));
-            }
-        }
-
-        public void CreateTestData()
-        {
-            // Create and Save folder-Media -> (1051)
-            IMediaType folderMediaType = MediaTypeService.Get(1031);
-            _testFolder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
-            MediaService.Save(_testFolder, 0);
-
-            // Create and Save image-Media -> (1052)
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-            _testImage = MediaBuilder.CreateMediaImage(imageMediaType, _testFolder.Id);
-            MediaService.Save(_testImage, 0);
-
-            // Create and Save file-Media -> (1053)
-            IMediaType fileMediaType = MediaTypeService.Get(1033);
-            _testFile = MediaBuilder.CreateMediaFile(fileMediaType, _testFolder.Id);
-            MediaService.Save(_testFile, 0);
+            // retrieve again, this should use cache now
+            found = repository.Get(media.Key);
+            Assert.AreEqual(sqlCount, udb.SqlCount);
         }
     }
+
+    [Test]
+    public void SaveMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            var mediaType = mediaTypeRepository.Get(1032);
+            var image = MediaBuilder.CreateMediaImage(mediaType, -1);
+
+            // Act
+            mediaTypeRepository.Save(mediaType);
+            repository.Save(image);
+
+            var fetched = repository.Get(image.Id);
+
+            // Assert
+            Assert.That(mediaType.HasIdentity, Is.True);
+            Assert.That(image.HasIdentity, Is.True);
+
+            TestHelper.AssertPropertyValuesAreEqual(image, fetched);
+        }
+    }
+
+    [Test]
+    public void SaveMediaMultiple()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            var mediaType = mediaTypeRepository.Get(1032);
+            var file = MediaBuilder.CreateMediaFile(mediaType, -1);
+
+            // Act
+            repository.Save(file);
+
+            var image = MediaBuilder.CreateMediaImage(mediaType, -1);
+            repository.Save(image);
+
+            // Assert
+            Assert.That(file.HasIdentity, Is.True);
+            Assert.That(image.HasIdentity, Is.True);
+            Assert.That(file.Name, Is.EqualTo("Test File"));
+            Assert.That(image.Name, Is.EqualTo("Test Image"));
+            Assert.That(file.ContentTypeId, Is.EqualTo(mediaType.Id));
+            Assert.That(image.ContentTypeId, Is.EqualTo(mediaType.Id));
+        }
+    }
+
+    [Test]
+    public void GetMediaIsNotDirty()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var media = repository.Get(_testImage.Id);
+            var dirty = media.IsDirty();
+
+            // Assert
+            Assert.That(dirty, Is.False);
+        }
+    }
+
+    [Test]
+    public void UpdateMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var content = repository.Get(_testFile.Id);
+            content.Name = "Test File Updated";
+            repository.Save(content);
+
+            var updatedContent = repository.Get(_testFile.Id);
+
+            // Assert
+            Assert.That(updatedContent.Id, Is.EqualTo(content.Id));
+            Assert.That(updatedContent.Name, Is.EqualTo(content.Name));
+        }
+    }
+
+    [Test]
+    public void DeleteMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var media = repository.Get(_testFile.Id);
+            repository.Delete(media);
+
+            var deleted = repository.Get(_testFile.Id);
+            var exists = repository.Exists(_testFile.Id);
+
+            // Assert
+            Assert.That(deleted, Is.Null);
+            Assert.That(exists, Is.False);
+        }
+    }
+
+    [Test]
+    public void GetMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var media = repository.Get(_testImage.Id);
+
+            // Assert
+            Assert.That(media.Id, Is.EqualTo(_testImage.Id));
+            Assert.That(media.CreateDate, Is.GreaterThan(DateTime.MinValue));
+            Assert.That(media.UpdateDate, Is.GreaterThan(DateTime.MinValue));
+            Assert.That(media.ParentId, Is.Not.EqualTo(0));
+            Assert.That(media.Name, Is.EqualTo("Test Image"));
+            Assert.That(media.SortOrder, Is.EqualTo(0));
+            Assert.That(media.VersionId, Is.Not.EqualTo(0));
+            Assert.That(media.ContentTypeId, Is.EqualTo(1032));
+            Assert.That(media.Path, Is.Not.Empty);
+            Assert.That(media.Properties.Any(), Is.True);
+        }
+    }
+
+    [Test]
+    public void QueryMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+            var result = repository.Get(query);
+
+            // Assert
+            Assert.That(result.Count(), Is.GreaterThanOrEqualTo(2)); // There should be two entities on level 2: File and Media
+        }
+    }
+
+    [Test]
+    public void QueryMedia_ContentTypeIdFilter()
+    {
+        // Arrange
+        var folderMediaType = MediaTypeService.Get(1031);
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            for (var i = 0; i < 10; i++)
+            {
+                var folder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
+                repository.Save(folder);
+            }
+
+            int[] types = { 1031 };
+            var query = provider.CreateQuery<IMedia>().Where(x => types.Contains(x.ContentTypeId));
+            var result = repository.Get(query);
+
+            // Assert
+            Assert.That(result.Count(), Is.GreaterThanOrEqualTo(11));
+        }
+    }
+
+    [Ignore("Unsupported feature.")]
+    [Test]
+    public void QueryMedia_ContentTypeAliasFilter()
+    {
+        // we could support this, but it would require an extra join on the query,
+        // and we don't absolutely need it now, so leaving it out for now
+
+        // Arrange
+        var folderMediaType = MediaTypeService.Get(1031);
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            for (var i = 0; i < 10; i++)
+            {
+                var folder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
+                repository.Save(folder);
+            }
+
+            string[] types = { "Folder" };
+            var query = provider.CreateQuery<IMedia>().Where(x => types.Contains(x.ContentType.Alias));
+            var result = repository.Get(query);
+
+            // Assert
+            Assert.That(result.Count(), Is.GreaterThanOrEqualTo(11));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_FirstPage()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, null, Ordering.By("SortOrder")).ToArray();
+
+            // Assert
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Test Image"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_SecondPage()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 1, 1, out var totalRecords, null, Ordering.By("SortOrder")).ToArray();
+
+            // Assert
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Test File"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_SinglePage()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 0, 2, out var totalRecords, null, Ordering.By("SortOrder")).ToArray();
+
+            // Assert
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(2));
+            Assert.That(result.First().Name, Is.EqualTo("Test Image"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_DescendingOrder()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, null, Ordering.By("SortOrder", Direction.Descending)).ToArray();
+
+            // Assert
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Test File"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_AlternateOrder()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, null, Ordering.By("Name")).ToArray();
+
+            // Assert
+            Assert.That(totalRecords, Is.GreaterThanOrEqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Test File"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_FilterMatchingSome()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+
+            var filter = provider.CreateQuery<IMedia>().Where(x => x.Name.Contains("File"));
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, filter, Ordering.By("SortOrder")).ToArray();
+
+            // Assert
+            Assert.That(totalRecords, Is.EqualTo(1));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Test File"));
+        }
+    }
+
+    [Test]
+    public void GetPagedResultsByQuery_FilterMatchingAll()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out _);
+
+            // Act
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == 2);
+
+            var filter = provider.CreateQuery<IMedia>().Where(x => x.Name.Contains("Test"));
+            var result = repository.GetPage(query, 0, 1, out var totalRecords, filter, Ordering.By("SortOrder")).ToArray();
+
+            // Assert
+            Assert.That(totalRecords, Is.EqualTo(2));
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Name, Is.EqualTo("Test Image"));
+        }
+    }
+
+    [Test]
+    public void GetAllMediaByIds()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var medias = repository.GetMany(_testImage.Id, _testFile.Id).ToArray();
+
+            // Assert
+            Assert.That(medias, Is.Not.Null);
+            Assert.That(medias.Any(), Is.True);
+            Assert.That(medias.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void GetAllMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var medias = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(medias, Is.Not.Null);
+            Assert.That(medias.Any(), Is.True);
+            Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
+
+            medias = repository.GetMany(medias.Select(x => x.Id).ToArray()).ToArray();
+            Assert.That(medias, Is.Not.Null);
+            Assert.That(medias.Any(), Is.True);
+            Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
+
+            medias = ((IReadRepository<Guid, IMedia>)repository).GetMany(medias.Select(x => x.Key).ToArray()).ToArray();
+            Assert.That(medias, Is.Not.Null);
+            Assert.That(medias.Any(), Is.True);
+            Assert.That(medias.Count(), Is.GreaterThanOrEqualTo(3));
+        }
+    }
+
+    [Test]
+    public void ExistMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var exists = repository.Exists(_testImage.Id);
+            var existsToo = repository.Exists(_testImage.Id);
+            var doesntExists = repository.Exists(NodeDto.NodeIdSeed + 5);
+
+            // Assert
+            Assert.That(exists, Is.True);
+            Assert.That(existsToo, Is.True);
+            Assert.That(doesntExists, Is.False);
+        }
+    }
+
+    [Test]
+    public void CountMedia()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider, out var mediaTypeRepository);
+
+            // Act
+            var level = 2;
+            var query = provider.CreateQuery<IMedia>().Where(x => x.Level == level);
+            var result = repository.Count(query);
+
+            // Assert
+            Assert.That(result, Is.GreaterThanOrEqualTo(2));
+        }
+    }
+
+    public void CreateTestData()
+    {
+        // Create and Save folder-Media -> (1051)
+        var folderMediaType = MediaTypeService.Get(1031);
+        _testFolder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
+        MediaService.Save(_testFolder, 0);
+
+        // Create and Save image-Media -> (1052)
+        var imageMediaType = MediaTypeService.Get(1032);
+        _testImage = MediaBuilder.CreateMediaImage(imageMediaType, _testFolder.Id);
+        MediaService.Save(_testImage, 0);
+
+        // Create and Save file-Media -> (1053)
+        var fileMediaType = MediaTypeService.Get(1033);
+        _testFile = MediaBuilder.CreateMediaFile(fileMediaType, _testFolder.Id);
+        MediaService.Save(_testFile, 0);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
index 52198c7188..aa783317ac 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MediaTypeRepositoryTest.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
@@ -11,415 +10,410 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class MediaTypeRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MediaTypeRepositoryTest : UmbracoIntegrationTest
+    private IContentTypeCommonRepository CommonRepository => GetRequiredService<IContentTypeCommonRepository>();
+
+    private ILanguageRepository LanguageRepository => GetRequiredService<ILanguageRepository>();
+
+    [Test]
+    public void Can_Move()
     {
-        private IContentTypeCommonRepository CommonRepository => GetRequiredService<IContentTypeCommonRepository>();
-
-        private ILanguageRepository LanguageRepository => GetRequiredService<ILanguageRepository>();
-
-        [Test]
-        public void Can_Move()
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                EntityContainerRepository containerRepository = CreateContainerRepository(provider);
-                MediaTypeRepository repository = CreateRepository(provider);
+            var containerRepository = CreateContainerRepository(provider);
+            var repository = CreateRepository(provider);
 
-                var container1 = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah1" };
-                containerRepository.Save(container1);
+            var container1 = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah1" };
+            containerRepository.Save(container1);
 
-                var container2 = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah2", ParentId = container1.Id };
-                containerRepository.Save(container2);
+            var container2 =
+                new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah2", ParentId = container1.Id };
+            containerRepository.Save(container2);
 
-                IMediaType contentType =
-                    MediaTypeBuilder.CreateNewMediaType();
-                contentType.ParentId = container2.Id;
-                repository.Save(contentType);
+            IMediaType contentType =
+                MediaTypeBuilder.CreateNewMediaType();
+            contentType.ParentId = container2.Id;
+            repository.Save(contentType);
 
-                // create a
-                var contentType2 = (IMediaType)new MediaType(ShortStringHelper, contentType, "hello")
-                {
-                    Name = "Blahasdfsadf"
-                };
-                contentType.ParentId = contentType.Id;
-                repository.Save(contentType2);
+            // create a
+            var contentType2 =
+                (IMediaType)new MediaType(ShortStringHelper, contentType, "hello") { Name = "Blahasdfsadf" };
+            contentType.ParentId = contentType.Id;
+            repository.Save(contentType2);
 
-                global::Umbraco.Cms.Core.Events.MoveEventInfo<IMediaType>[] result = repository.Move(contentType, container1).ToArray();
+            var result = repository.Move(contentType, container1).ToArray();
 
-                Assert.AreEqual(2, result.Length);
+            Assert.AreEqual(2, result.Length);
 
-                // re-get
-                contentType = repository.Get(contentType.Id);
-                contentType2 = repository.Get(contentType2.Id);
+            // re-get
+            contentType = repository.Get(contentType.Id);
+            contentType2 = repository.Get(contentType2.Id);
 
-                Assert.AreEqual(container1.Id, contentType.ParentId);
-                Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType.Id).OriginalPath, contentType.Path);
-                Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType2.Id).OriginalPath, contentType2.Path);
-            }
+            Assert.AreEqual(container1.Id, contentType.ParentId);
+            Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType.Id).OriginalPath, contentType.Path);
+            Assert.AreNotEqual(result.Single(x => x.Entity.Id == contentType2.Id).OriginalPath, contentType2.Path);
         }
-
-        [Test]
-        public void Can_Create_Container()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                EntityContainerRepository containerRepository = CreateContainerRepository(provider);
-
-                var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.Save(container);
-
-                Assert.That(container.Id, Is.GreaterThan(0));
-
-                EntityContainer found = containerRepository.Get(container.Id);
-                Assert.IsNotNull(found);
-            }
-        }
-
-        [Test]
-        public void Can_Delete_Container()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                EntityContainerRepository containerRepository = CreateContainerRepository(provider);
-
-                var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.Save(container);
-
-                Assert.That(container.Id, Is.GreaterThan(0));
-
-                // Act
-                containerRepository.Delete(container);
-
-                EntityContainer found = containerRepository.Get(container.Id);
-                Assert.IsNull(found);
-            }
-        }
-
-        [Test]
-        public void Can_Create_Container_Containing_Media_Types()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                EntityContainerRepository containerRepository = CreateContainerRepository(provider);
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.Save(container);
-
-                MediaType contentType =
-                    MediaTypeBuilder.CreateSimpleMediaType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
-                contentType.ParentId = container.Id;
-                repository.Save(contentType);
-
-                Assert.AreEqual(container.Id, contentType.ParentId);
-            }
-        }
-
-        [Test]
-        public void Can_Delete_Container_Containing_Media_Types()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                EntityContainerRepository containerRepository = CreateContainerRepository(provider);
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
-                containerRepository.Save(container);
-
-                IMediaType contentType =
-                    MediaTypeBuilder.CreateSimpleMediaType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
-                contentType.ParentId = container.Id;
-                repository.Save(contentType);
-
-                // Act
-                containerRepository.Delete(container);
-
-                EntityContainer found = containerRepository.Get(container.Id);
-                Assert.IsNull(found);
-
-                contentType = repository.Get(contentType.Id);
-                Assert.IsNotNull(contentType);
-                Assert.AreEqual(-1, contentType.ParentId);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                // Act
-                MediaType contentType = MediaTypeBuilder.CreateNewMediaType();
-                repository.Save(contentType);
-
-                IMediaType fetched = repository.Get(contentType.Id);
-
-                // Assert
-                Assert.That(contentType.HasIdentity, Is.True);
-                Assert.That(contentType.PropertyGroups.All(x => x.HasIdentity), Is.True);
-                Assert.That(contentType.Path.Contains(","), Is.True);
-                Assert.That(contentType.SortOrder, Is.GreaterThan(0));
-
-                TestHelper.AssertPropertyValuesAreEqual(contentType, fetched, ignoreProperties: new[] { "UpdateDate" });
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                MediaType videoMediaType = MediaTypeBuilder.CreateNewMediaType();
-                repository.Save(videoMediaType);
-
-                // Act
-                IMediaType mediaType = repository.Get(videoMediaType.Id);
-
-                mediaType.Thumbnail = "Doc2.png";
-                mediaType.PropertyGroups["media"].PropertyTypes.Add(new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "subtitle")
-                    {
-                        Name = "Subtitle",
-                        Description = "Optional Subtitle",
-                        Mandatory = false,
-                        SortOrder = 1,
-                        DataTypeId = -88
-                    });
-                repository.Save(mediaType);
-
-                bool dirty = ((MediaType)mediaType).IsDirty();
-
-                // Assert
-                Assert.That(mediaType.HasIdentity, Is.True);
-                Assert.That(dirty, Is.False);
-                Assert.That(mediaType.Thumbnail, Is.EqualTo("Doc2.png"));
-                Assert.That(mediaType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                // Act
-                MediaType mediaType = MediaTypeBuilder.CreateNewMediaType();
-                repository.Save(mediaType);
-
-                IMediaType contentType2 = repository.Get(mediaType.Id);
-                repository.Delete(contentType2);
-
-                bool exists = repository.Exists(mediaType.Id);
-
-                // Assert
-                Assert.That(exists, Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                // Act
-                IMediaType mediaType = repository.Get(1033); // File
-
-                // Assert
-                Assert.That(mediaType, Is.Not.Null);
-                Assert.That(mediaType.Id, Is.EqualTo(1033));
-                Assert.That(mediaType.Name, Is.EqualTo(Constants.Conventions.MediaTypes.File));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_By_Guid_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                IMediaType mediaType = repository.Get(1033); // File
-
-                // Act
-                mediaType = repository.Get(mediaType.Key);
-
-                // Assert
-                Assert.That(mediaType, Is.Not.Null);
-                Assert.That(mediaType.Id, Is.EqualTo(1033));
-                Assert.That(mediaType.Name, Is.EqualTo(Constants.Conventions.MediaTypes.File));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                // Act
-                IEnumerable<IMediaType> mediaTypes = repository.GetMany();
-                int count =
-                    ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                        "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
-                        new { NodeObjectType = Constants.ObjectTypes.MediaType });
-
-                // Assert
-                Assert.That(mediaTypes.Any(), Is.True);
-                Assert.That(mediaTypes.Count(), Is.EqualTo(count));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_By_Guid_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                Guid[] allGuidIds = repository.GetMany().Select(x => x.Key).ToArray();
-
-                // Act
-                IEnumerable<IMediaType> mediaTypes = ((IReadRepository<Guid, IMediaType>)repository).GetMany(allGuidIds);
-
-                int count =
-                    ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                        "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
-                        new { NodeObjectType = Constants.ObjectTypes.MediaType });
-
-                // Assert
-                Assert.That(mediaTypes.Any(), Is.True);
-                Assert.That(mediaTypes.Count(), Is.EqualTo(count));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_MediaTypeRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                // Act
-                bool exists = repository.Exists(1032); // Image
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Update_MediaType_With_PropertyType_Removed()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                MediaType mediaType = MediaTypeBuilder.CreateNewMediaType();
-                repository.Save(mediaType);
-
-                // Act
-                IMediaType mediaTypeV2 = repository.Get(mediaType.Id);
-                mediaTypeV2.PropertyGroups["media"].PropertyTypes.Remove("title");
-                repository.Save(mediaTypeV2);
-
-                IMediaType mediaTypeV3 = repository.Get(mediaType.Id);
-
-                // Assert
-                Assert.That(mediaTypeV3.PropertyTypes.Any(x => x.Alias == "title"), Is.False);
-                Assert.That(mediaTypeV2.PropertyGroups.Count, Is.EqualTo(mediaTypeV3.PropertyGroups.Count));
-                Assert.That(mediaTypeV2.PropertyTypes.Count(), Is.EqualTo(mediaTypeV3.PropertyTypes.Count()));
-            }
-        }
-
-        [Test]
-        public void Can_Verify_PropertyTypes_On_Video_MediaType()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                MediaType mediaType = MediaTypeBuilder.CreateNewMediaType();
-
-                repository.Save(mediaType);
-
-                // Act
-                IMediaType contentType = repository.Get(mediaType.Id);
-
-                // Assert
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(2));
-                Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Can_Verify_PropertyTypes_On_File_MediaType()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MediaTypeRepository repository = CreateRepository(provider);
-
-                // Act
-                IMediaType contentType = repository.Get(1033); // File
-
-                // Assert
-                Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3));
-                Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(1));
-            }
-        }
-
-        private MediaTypeRepository CreateRepository(IScopeProvider provider) =>
-            new MediaTypeRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<MediaTypeRepository>(), CommonRepository, LanguageRepository, ShortStringHelper);
-
-        private EntityContainerRepository CreateContainerRepository(IScopeProvider provider) =>
-            new EntityContainerRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<EntityContainerRepository>(), Constants.ObjectTypes.MediaTypeContainer);
     }
+
+    [Test]
+    public void Can_Create_Container()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var containerRepository = CreateContainerRepository(provider);
+
+            var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
+            containerRepository.Save(container);
+
+            Assert.That(container.Id, Is.GreaterThan(0));
+
+            var found = containerRepository.Get(container.Id);
+            Assert.IsNotNull(found);
+        }
+    }
+
+    [Test]
+    public void Can_Delete_Container()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var containerRepository = CreateContainerRepository(provider);
+
+            var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
+            containerRepository.Save(container);
+
+            Assert.That(container.Id, Is.GreaterThan(0));
+
+            // Act
+            containerRepository.Delete(container);
+
+            var found = containerRepository.Get(container.Id);
+            Assert.IsNull(found);
+        }
+    }
+
+    [Test]
+    public void Can_Create_Container_Containing_Media_Types()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var containerRepository = CreateContainerRepository(provider);
+            var repository = CreateRepository(provider);
+
+            var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
+            containerRepository.Save(container);
+
+            var contentType =
+                MediaTypeBuilder.CreateSimpleMediaType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
+            contentType.ParentId = container.Id;
+            repository.Save(contentType);
+
+            Assert.AreEqual(container.Id, contentType.ParentId);
+        }
+    }
+
+    [Test]
+    public void Can_Delete_Container_Containing_Media_Types()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var containerRepository = CreateContainerRepository(provider);
+            var repository = CreateRepository(provider);
+
+            var container = new EntityContainer(Constants.ObjectTypes.MediaType) { Name = "blah" };
+            containerRepository.Save(container);
+
+            IMediaType contentType =
+                MediaTypeBuilder.CreateSimpleMediaType("test", "Test", propertyGroupAlias: "testGroup", propertyGroupName: "testGroup");
+            contentType.ParentId = container.Id;
+            repository.Save(contentType);
+
+            // Act
+            containerRepository.Delete(container);
+
+            var found = containerRepository.Get(container.Id);
+            Assert.IsNull(found);
+
+            contentType = repository.Get(contentType.Id);
+            Assert.IsNotNull(contentType);
+            Assert.AreEqual(-1, contentType.ParentId);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var contentType = MediaTypeBuilder.CreateNewMediaType();
+            repository.Save(contentType);
+
+            var fetched = repository.Get(contentType.Id);
+
+            // Assert
+            Assert.That(contentType.HasIdentity, Is.True);
+            Assert.That(contentType.PropertyGroups.All(x => x.HasIdentity), Is.True);
+            Assert.That(contentType.Path.Contains(","), Is.True);
+            Assert.That(contentType.SortOrder, Is.GreaterThan(0));
+
+            TestHelper.AssertPropertyValuesAreEqual(contentType, fetched, ignoreProperties: new[] { "UpdateDate" });
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var videoMediaType = MediaTypeBuilder.CreateNewMediaType();
+            repository.Save(videoMediaType);
+
+            // Act
+            var mediaType = repository.Get(videoMediaType.Id);
+
+            mediaType.Thumbnail = "Doc2.png";
+            mediaType.PropertyGroups["media"].PropertyTypes.Add(
+                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "subtitle")
+                {
+                    Name = "Subtitle",
+                    Description = "Optional Subtitle",
+                    Mandatory = false,
+                    SortOrder = 1,
+                    DataTypeId = -88
+                });
+            repository.Save(mediaType);
+
+            var dirty = ((MediaType)mediaType).IsDirty();
+
+            // Assert
+            Assert.That(mediaType.HasIdentity, Is.True);
+            Assert.That(dirty, Is.False);
+            Assert.That(mediaType.Thumbnail, Is.EqualTo("Doc2.png"));
+            Assert.That(mediaType.PropertyTypes.Any(x => x.Alias == "subtitle"), Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var mediaType = MediaTypeBuilder.CreateNewMediaType();
+            repository.Save(mediaType);
+
+            var contentType2 = repository.Get(mediaType.Id);
+            repository.Delete(contentType2);
+
+            var exists = repository.Exists(mediaType.Id);
+
+            // Assert
+            Assert.That(exists, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var mediaType = repository.Get(1033); // File
+
+            // Assert
+            Assert.That(mediaType, Is.Not.Null);
+            Assert.That(mediaType.Id, Is.EqualTo(1033));
+            Assert.That(mediaType.Name, Is.EqualTo(Constants.Conventions.MediaTypes.File));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_By_Guid_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var mediaType = repository.Get(1033); // File
+
+            // Act
+            mediaType = repository.Get(mediaType.Key);
+
+            // Assert
+            Assert.That(mediaType, Is.Not.Null);
+            Assert.That(mediaType.Id, Is.EqualTo(1033));
+            Assert.That(mediaType.Name, Is.EqualTo(Constants.Conventions.MediaTypes.File));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var mediaTypes = repository.GetMany();
+            var count =
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                    "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
+                    new { NodeObjectType = Constants.ObjectTypes.MediaType });
+
+            // Assert
+            Assert.That(mediaTypes.Any(), Is.True);
+            Assert.That(mediaTypes.Count(), Is.EqualTo(count));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_By_Guid_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var allGuidIds = repository.GetMany().Select(x => x.Key).ToArray();
+
+            // Act
+            var mediaTypes = ((IReadRepository<Guid, IMediaType>)repository).GetMany(allGuidIds);
+
+            var count =
+                ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                    "SELECT COUNT(*) FROM umbracoNode WHERE nodeObjectType = @NodeObjectType",
+                    new { NodeObjectType = Constants.ObjectTypes.MediaType });
+
+            // Assert
+            Assert.That(mediaTypes.Any(), Is.True);
+            Assert.That(mediaTypes.Count(), Is.EqualTo(count));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists_On_MediaTypeRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var exists = repository.Exists(1032); // Image
+
+            // Assert
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Update_MediaType_With_PropertyType_Removed()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var mediaType = MediaTypeBuilder.CreateNewMediaType();
+            repository.Save(mediaType);
+
+            // Act
+            var mediaTypeV2 = repository.Get(mediaType.Id);
+            mediaTypeV2.PropertyGroups["media"].PropertyTypes.Remove("title");
+            repository.Save(mediaTypeV2);
+
+            var mediaTypeV3 = repository.Get(mediaType.Id);
+
+            // Assert
+            Assert.That(mediaTypeV3.PropertyTypes.Any(x => x.Alias == "title"), Is.False);
+            Assert.That(mediaTypeV2.PropertyGroups.Count, Is.EqualTo(mediaTypeV3.PropertyGroups.Count));
+            Assert.That(mediaTypeV2.PropertyTypes.Count(), Is.EqualTo(mediaTypeV3.PropertyTypes.Count()));
+        }
+    }
+
+    [Test]
+    public void Can_Verify_PropertyTypes_On_Video_MediaType()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var mediaType = MediaTypeBuilder.CreateNewMediaType();
+
+            repository.Save(mediaType);
+
+            // Act
+            var contentType = repository.Get(mediaType.Id);
+
+            // Assert
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(2));
+            Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Can_Verify_PropertyTypes_On_File_MediaType()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            // Act
+            var contentType = repository.Get(1033); // File
+
+            // Assert
+            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(3));
+            Assert.That(contentType.PropertyGroups.Count(), Is.EqualTo(1));
+        }
+    }
+
+    private MediaTypeRepository CreateRepository(IScopeProvider provider) =>
+        new((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<MediaTypeRepository>(), CommonRepository, LanguageRepository, ShortStringHelper);
+
+    private EntityContainerRepository CreateContainerRepository(IScopeProvider provider) =>
+        new((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<EntityContainerRepository>(), Constants.ObjectTypes.MediaTypeContainer);
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs
index 20ccce4d72..b986ad7168 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberRepositoryTest.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Extensions.Logging;
@@ -12,15 +11,11 @@ using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
@@ -33,376 +28,388 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class MemberRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MemberRepositoryTest : UmbracoIntegrationTest
+    private IPasswordHasher PasswordHasher => GetRequiredService<IPasswordHasher>();
+
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private IMemberTypeRepository MemberTypeRepository => GetRequiredService<IMemberTypeRepository>();
+
+    private IMemberGroupRepository MemberGroupRepository => GetRequiredService<IMemberGroupRepository>();
+
+    private IJsonSerializer JsonSerializer => GetRequiredService<IJsonSerializer>();
+
+    private MemberRepository CreateRepository(IScopeProvider provider)
     {
-        private IPasswordHasher PasswordHasher => GetRequiredService<IPasswordHasher>();
-
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
-
-        private IMemberTypeRepository MemberTypeRepository => GetRequiredService<IMemberTypeRepository>();
-
-        private IMemberGroupRepository MemberGroupRepository => GetRequiredService<IMemberGroupRepository>();
-
-        private IJsonSerializer JsonSerializer => GetRequiredService<IJsonSerializer>();
-
-        private MemberRepository CreateRepository(IScopeProvider provider)
-        {
-            var accessor = (IScopeAccessor)provider;
-            ITagRepository tagRepo = GetRequiredService<ITagRepository>();
-            IRelationTypeRepository relationTypeRepository = GetRequiredService<IRelationTypeRepository>();
-            IRelationRepository relationRepository = GetRequiredService<IRelationRepository>();
-            var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
-            var dataValueReferences = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
-            return new MemberRepository(
-                accessor,
-                AppCaches.Disabled,
-                LoggerFactory.CreateLogger<MemberRepository>(),
-                MemberTypeRepository,
-                MemberGroupRepository,
-                tagRepo,
-                Mock.Of<ILanguageRepository>(),
-                relationRepository,
-                relationTypeRepository,
-                PasswordHasher,
-                propertyEditors,
-                dataValueReferences,
-                DataTypeService,
-                JsonSerializer,
-                Mock.Of<IEventAggregator>(),
-                Options.Create(new MemberPasswordConfigurationSettings()));
-        }
-
-        [Test]
-        public void GetMember()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                IMember member = CreateTestMember();
-
-                member = repository.Get(member.Id);
-
-                Assert.That(member, Is.Not.Null);
-                Assert.That(member.HasIdentity, Is.True);
-            }
-        }
-
-        [Test]
-        public void GetMembers()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                IMemberType type = CreateTestMemberType();
-                IMember m1 = CreateTestMember(type, "Test 1", "test1@test.com", "pass1", "test1");
-                IMember m2 = CreateTestMember(type, "Test 2", "test2@test.com", "pass2", "test2");
-
-                IEnumerable<IMember> members = repository.GetMany(m1.Id, m2.Id);
-
-                Assert.That(members, Is.Not.Null);
-                Assert.That(members.Count(), Is.EqualTo(2));
-                Assert.That(members.Any(x => x == null), Is.False);
-                Assert.That(members.Any(x => x.HasIdentity == false), Is.False);
-            }
-        }
-
-        [Test]
-        public void GetAllMembers()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                IMemberType type = CreateTestMemberType();
-                for (int i = 0; i < 5; i++)
-                {
-                    CreateTestMember(type, "Test " + i, "test" + i + "@test.com", "pass" + i, "test" + i);
-                }
-
-                IEnumerable<IMember> members = repository.GetMany();
-
-                Assert.That(members, Is.Not.Null);
-                Assert.That(members.Any(x => x == null), Is.False);
-                Assert.That(members.Count(), Is.EqualTo(5));
-                Assert.That(members.Any(x => x.HasIdentity == false), Is.False);
-            }
-        }
-
-        [Test]
-        public void QueryMember()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                var key = Guid.NewGuid();
-                IMember member = CreateTestMember(key: key);
-
-                // Act
-                IQuery<IMember> query = provider.CreateQuery<IMember>().Where(x => x.Key == key);
-                IEnumerable<IMember> result = repository.Get(query);
-
-                // Assert
-                Assert.That(result.Count(), Is.EqualTo(1));
-                Assert.That(result.First().Id, Is.EqualTo(member.Id));
-            }
-        }
-
-        [Test]
-        public void SaveMember()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                IMember member = CreateTestMember();
-
-                IMember sut = repository.Get(member.Id);
-
-                Assert.That(sut, Is.Not.Null);
-                Assert.That(sut.HasIdentity, Is.True);
-                Assert.That(sut.Name, Is.EqualTo("Johnny Hefty"));
-                Assert.That(sut.Email, Is.EqualTo("johnny@example.com"));
-                Assert.That(sut.RawPasswordValue, Is.EqualTo("123"));
-                Assert.That(sut.Username, Is.EqualTo("hefty"));
-
-                TestHelper.AssertPropertyValuesAreEqual(sut, member);
-            }
-        }
-
-        [Test]
-        public void MemberHasBuiltinProperties()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                MemberTypeRepository.Save(memberType);
-
-                Member member = MemberBuilder.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
-                repository.Save(member);
-
-                IMember sut = repository.Get(member.Id);
-
-                Assert.That(memberType.CompositionPropertyGroups.Count(), Is.EqualTo(2));
-                Assert.That(memberType.CompositionPropertyTypes.Count(), Is.EqualTo(3 + ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper).Count));
-                Assert.That(sut.Properties.Count(), Is.EqualTo(3 + ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper).Count));
-                PropertyGroup grp = memberType.CompositionPropertyGroups.FirstOrDefault(x => x.Name == Constants.Conventions.Member.StandardPropertiesGroupName);
-                Assert.IsNotNull(grp);
-                string[] aliases = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper).Select(x => x.Key).ToArray();
-                foreach (IPropertyType p in memberType.CompositionPropertyTypes.Where(x => aliases.Contains(x.Alias)))
-                {
-                    Assert.AreEqual(grp.Id, p.PropertyGroupId.Value);
-                }
-            }
-        }
-
-        [Test]
-        public void SavingPreservesPassword()
-        {
-            IMember sut;
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                MemberTypeRepository.Save(memberType);
-
-                Member member = MemberBuilder.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
-                repository.Save(member);
-
-                sut = repository.Get(member.Id);
-
-                // When the password is null it will not overwrite what is already there.
-                sut.RawPasswordValue = null;
-                repository.Save(sut);
-
-                sut = repository.Get(member.Id);
-
-                Assert.That(sut.RawPasswordValue, Is.EqualTo("123"));
-            }
-        }
-
-        [Test]
-        public void SavingUpdatesNameAndEmail()
-        {
-            IMember sut;
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                MemberTypeRepository.Save(memberType);
-
-                Member member = MemberBuilder.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
-                repository.Save(member);
-
-                sut = repository.Get(member.Id);
-                sut.Username = "This is new";
-                sut.Email = "thisisnew@hello.com";
-                repository.Save(sut);
-
-                sut = repository.Get(member.Id);
-
-                Assert.That(sut.Email, Is.EqualTo("thisisnew@hello.com"));
-                Assert.That(sut.Username, Is.EqualTo("This is new"));
-            }
-        }
-
-        [Test]
-        public void QueryMember_WithSubQuery()
-        {
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                IQuery<IMember> query = provider.CreateQuery<IMember>().Where(x =>
-                    ((Member)x).LongStringPropertyValue.Contains("1095") &&
-                    ((Member)x).PropertyTypeAlias == "headshot");
-
-                Sql<ISqlContext> sqlSubquery = GetSubquery();
-                var translator = new SqlTranslator<IMember>(sqlSubquery, query);
-                Sql<ISqlContext> subquery = translator.Translate();
-                Sql<ISqlContext> sql = GetBaseQuery(false)
-                    .Append("WHERE umbracoNode.id IN (" + subquery.SQL + ")", subquery.Arguments)
-                    .OrderByDescending<ContentVersionDto>(x => x.VersionDate)
-                    .OrderBy<NodeDto>(x => x.SortOrder);
-
-                Debug.Print(sql.SQL);
-                Assert.That(sql.SQL, Is.Not.Empty);
-            }
-        }
-
-        private IMember CreateTestMember(IMemberType memberType = null, string name = null, string email = null, string password = null, string username = null, Guid? key = null)
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                if (memberType == null)
-                {
-                    memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                    MemberTypeRepository.Save(memberType);
-                }
-
-                Member member = MemberBuilder.CreateSimpleMember(memberType, name ?? "Johnny Hefty", email ?? "johnny@example.com", password ?? "123", username ?? "hefty", key);
-                repository.Save(member);
-                scope.Complete();
-
-                return member;
-            }
-        }
-
-        private IMemberType CreateTestMemberType(string alias = null)
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberRepository repository = CreateRepository(provider);
-
-                MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType(alias);
-                MemberTypeRepository.Save(memberType);
-                scope.Complete();
-                return memberType;
-            }
-        }
-
-        private Sql<ISqlContext> GetBaseQuery(bool isCount)
-        {
-            IScopeProvider provider = ScopeProvider;
-            if (isCount)
-            {
-                Sql<ISqlContext> sqlCount = ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .SelectCount()
-                    .From<NodeDto>()
-                    .InnerJoin<ContentDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<ContentTypeDto>().On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                    .InnerJoin<ContentVersionDto>().On<ContentVersionDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                    .InnerJoin<MemberDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                    .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-                return sqlCount;
-            }
-
-            Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql();
-            sql.Select(
-                    "umbracoNode.*",
-                    $"{Constants.DatabaseSchema.Tables.Content}.contentTypeId",
-                    "cmsContentType.alias AS ContentTypeAlias",
-                    $"{Constants.DatabaseSchema.Tables.ContentVersion}.versionId",
-                    $"{Constants.DatabaseSchema.Tables.ContentVersion}.versionDate",
-                    "cmsMember.Email",
-                    "cmsMember.LoginName",
-                    "cmsMember.Password",
-                    Constants.DatabaseSchema.Tables.PropertyData + ".id AS PropertyDataId",
-                    Constants.DatabaseSchema.Tables.PropertyData + ".propertytypeid",
-                    Constants.DatabaseSchema.Tables.PropertyData + ".dateValue",
-                    Constants.DatabaseSchema.Tables.PropertyData + ".intValue",
-                    Constants.DatabaseSchema.Tables.PropertyData + ".textValue",
-                    Constants.DatabaseSchema.Tables.PropertyData + ".varcharValue",
-                    "cmsPropertyType.id",
-                    "cmsPropertyType.Alias",
-                    "cmsPropertyType.Description",
-                    "cmsPropertyType.Name",
-                    "cmsPropertyType.mandatory",
-                    "cmsPropertyType.validationRegExp",
-                    "cmsPropertyType.sortOrder AS PropertyTypeSortOrder",
-                    "cmsPropertyType.propertyTypeGroupId",
-                    "cmsPropertyType.dataTypeId",
-                    "cmsDataType.propertyEditorAlias",
-                    "cmsDataType.dbType")
-                .From<NodeDto>()
-                .InnerJoin<ContentDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                .InnerJoin<ContentVersionDto>().On<ContentVersionDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<MemberDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, ContentDto>(left => left.ContentTypeId, right => right.ContentTypeId)
-                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.NodeId, right => right.DataTypeId)
-                .LeftJoin<PropertyDataDto>().On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .Append("AND " + Constants.DatabaseSchema.Tables.PropertyData + $".versionId = {Constants.DatabaseSchema.Tables.ContentVersion}.id")
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            return sql;
-        }
-
-        private Sql<ISqlContext> GetSubquery()
-        {
-            IScopeProvider provider = ScopeProvider;
-            Sql<ISqlContext> sql = ScopeAccessor.AmbientScope.SqlContext.Sql();
-            sql.Select("umbracoNode.id")
-                .From<NodeDto>()
-                .InnerJoin<ContentDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<ContentTypeDto>().On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
-                .InnerJoin<ContentVersionDto>().On<ContentVersionDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<MemberDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                .LeftJoin<PropertyTypeDto>().On<PropertyTypeDto, ContentDto>(left => left.ContentTypeId, right => right.ContentTypeId)
-                .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.NodeId, right => right.DataTypeId)
-                .LeftJoin<PropertyDataDto>().On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
-                .Append("AND " + Constants.DatabaseSchema.Tables.PropertyData + $".versionId = {Constants.DatabaseSchema.Tables.ContentVersion}.id")
-                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
-            return sql;
-        }
-
-        private Guid NodeObjectTypeId => Constants.ObjectTypes.Member;
+        var accessor = (IScopeAccessor)provider;
+        var tagRepo = GetRequiredService<ITagRepository>();
+        var relationTypeRepository = GetRequiredService<IRelationTypeRepository>();
+        var relationRepository = GetRequiredService<IRelationRepository>();
+        var propertyEditors =
+            new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
+        var dataValueReferences =
+            new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
+        return new MemberRepository(
+            accessor,
+            AppCaches.Disabled,
+            LoggerFactory.CreateLogger<MemberRepository>(),
+            MemberTypeRepository,
+            MemberGroupRepository,
+            tagRepo,
+            Mock.Of<ILanguageRepository>(),
+            relationRepository,
+            relationTypeRepository,
+            PasswordHasher,
+            propertyEditors,
+            dataValueReferences,
+            DataTypeService,
+            JsonSerializer,
+            Mock.Of<IEventAggregator>(),
+            Options.Create(new MemberPasswordConfigurationSettings()));
     }
+
+    [Test]
+    public void GetMember()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var member = CreateTestMember();
+
+            member = repository.Get(member.Id);
+
+            Assert.That(member, Is.Not.Null);
+            Assert.That(member.HasIdentity, Is.True);
+        }
+    }
+
+    [Test]
+    public void GetMembers()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var type = CreateTestMemberType();
+            var m1 = CreateTestMember(type, "Test 1", "test1@test.com", "pass1", "test1");
+            var m2 = CreateTestMember(type, "Test 2", "test2@test.com", "pass2", "test2");
+
+            var members = repository.GetMany(m1.Id, m2.Id).ToArray();
+
+            Assert.That(members, Is.Not.Null);
+            Assert.That(members.Count(), Is.EqualTo(2));
+            Assert.That(members.Any(x => x == null), Is.False);
+            Assert.That(members.Any(x => x.HasIdentity == false), Is.False);
+        }
+    }
+
+    [Test]
+    public void GetAllMembers()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var type = CreateTestMemberType();
+            for (var i = 0; i < 5; i++)
+            {
+                CreateTestMember(type, "Test " + i, "test" + i + "@test.com", "pass" + i, "test" + i);
+            }
+
+            var members = repository.GetMany().ToArray();
+
+            Assert.That(members, Is.Not.Null);
+            Assert.That(members.Any(x => x == null), Is.False);
+            Assert.That(members.Count(), Is.EqualTo(5));
+            Assert.That(members.Any(x => x.HasIdentity == false), Is.False);
+        }
+    }
+
+    [Test]
+    public void QueryMember()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var key = Guid.NewGuid();
+            var member = CreateTestMember(key: key);
+
+            // Act
+            var query = provider.CreateQuery<IMember>().Where(x => x.Key == key);
+            var result = repository.Get(query).ToArray();
+
+            // Assert
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.First().Id, Is.EqualTo(member.Id));
+        }
+    }
+
+    [Test]
+    public void SaveMember()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var member = CreateTestMember();
+
+            var sut = repository.Get(member.Id);
+
+            Assert.That(sut, Is.Not.Null);
+            Assert.That(sut.HasIdentity, Is.True);
+            Assert.That(sut.Name, Is.EqualTo("Johnny Hefty"));
+            Assert.That(sut.Email, Is.EqualTo("johnny@example.com"));
+            Assert.That(sut.RawPasswordValue, Is.EqualTo("123"));
+            Assert.That(sut.Username, Is.EqualTo("hefty"));
+
+            TestHelper.AssertPropertyValuesAreEqual(sut, member);
+        }
+    }
+
+    [Test]
+    public void MemberHasBuiltinProperties()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            MemberTypeRepository.Save(memberType);
+
+            var member =
+                MemberBuilder.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
+            repository.Save(member);
+
+            var sut = repository.Get(member.Id);
+
+            Assert.That(memberType.CompositionPropertyGroups.Count(), Is.EqualTo(2));
+            Assert.That(memberType.CompositionPropertyTypes.Count(), Is.EqualTo(3 + ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper).Count));
+            Assert.That(sut.Properties.Count(), Is.EqualTo(3 + ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper).Count));
+            var grp = memberType.CompositionPropertyGroups.FirstOrDefault(x =>
+                x.Name == Constants.Conventions.Member.StandardPropertiesGroupName);
+            Assert.IsNotNull(grp);
+            var aliases = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper).Select(x => x.Key)
+                .ToArray();
+            foreach (var p in memberType.CompositionPropertyTypes.Where(x => aliases.Contains(x.Alias)))
+            {
+                Assert.AreEqual(grp.Id, p.PropertyGroupId.Value);
+            }
+        }
+    }
+
+    [Test]
+    public void SavingPreservesPassword()
+    {
+        IMember sut;
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            MemberTypeRepository.Save(memberType);
+
+            var member =
+                MemberBuilder.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
+            repository.Save(member);
+
+            sut = repository.Get(member.Id);
+
+            // When the password is null it will not overwrite what is already there.
+            sut.RawPasswordValue = null;
+            repository.Save(sut);
+
+            sut = repository.Get(member.Id);
+
+            Assert.That(sut.RawPasswordValue, Is.EqualTo("123"));
+        }
+    }
+
+    [Test]
+    public void SavingUpdatesNameAndEmail()
+    {
+        IMember sut;
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            MemberTypeRepository.Save(memberType);
+
+            var member =
+                MemberBuilder.CreateSimpleMember(memberType, "Johnny Hefty", "johnny@example.com", "123", "hefty");
+            repository.Save(member);
+
+            sut = repository.Get(member.Id);
+            sut.Username = "This is new";
+            sut.Email = "thisisnew@hello.com";
+            repository.Save(sut);
+
+            sut = repository.Get(member.Id);
+
+            Assert.That(sut.Email, Is.EqualTo("thisisnew@hello.com"));
+            Assert.That(sut.Username, Is.EqualTo("This is new"));
+        }
+    }
+
+    [Test]
+    public void QueryMember_WithSubQuery()
+    {
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var query = provider.CreateQuery<IMember>().Where(x =>
+                ((Member)x).LongStringPropertyValue.Contains("1095") &&
+                ((Member)x).PropertyTypeAlias == "headshot");
+
+            var sqlSubquery = GetSubquery();
+            var translator = new SqlTranslator<IMember>(sqlSubquery, query);
+            var subquery = translator.Translate();
+            var sql = GetBaseQuery(false)
+                .Append("WHERE umbracoNode.id IN (" + subquery.SQL + ")", subquery.Arguments)
+                .OrderByDescending<ContentVersionDto>(x => x.VersionDate)
+                .OrderBy<NodeDto>(x => x.SortOrder);
+
+            Debug.Print(sql.SQL);
+            Assert.That(sql.SQL, Is.Not.Empty);
+        }
+    }
+
+    private IMember CreateTestMember(IMemberType memberType = null, string name = null, string email = null, string password = null, string username = null, Guid? key = null)
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            if (memberType == null)
+            {
+                memberType = MemberTypeBuilder.CreateSimpleMemberType();
+                MemberTypeRepository.Save(memberType);
+            }
+
+            var member = MemberBuilder.CreateSimpleMember(memberType, name ?? "Johnny Hefty", email ?? "johnny@example.com", password ?? "123", username ?? "hefty", key);
+            repository.Save(member);
+            scope.Complete();
+
+            return member;
+        }
+    }
+
+    private IMemberType CreateTestMemberType(string alias = null)
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var memberType = MemberTypeBuilder.CreateSimpleMemberType(alias);
+            MemberTypeRepository.Save(memberType);
+            scope.Complete();
+            return memberType;
+        }
+    }
+
+    private Sql<ISqlContext> GetBaseQuery(bool isCount)
+    {
+        var provider = ScopeProvider;
+        if (isCount)
+        {
+            var sqlCount = ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .SelectCount()
+                .From<NodeDto>()
+                .InnerJoin<ContentDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<ContentTypeDto>()
+                .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
+                .InnerJoin<ContentVersionDto>()
+                .On<ContentVersionDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+                .InnerJoin<MemberDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+                .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+            return sqlCount;
+        }
+
+        var sql = ScopeAccessor.AmbientScope.SqlContext.Sql();
+        sql.Select(
+                "umbracoNode.*",
+                $"{Constants.DatabaseSchema.Tables.Content}.contentTypeId",
+                "cmsContentType.alias AS ContentTypeAlias",
+                $"{Constants.DatabaseSchema.Tables.ContentVersion}.versionId",
+                $"{Constants.DatabaseSchema.Tables.ContentVersion}.versionDate",
+                "cmsMember.Email",
+                "cmsMember.LoginName",
+                "cmsMember.Password",
+                Constants.DatabaseSchema.Tables.PropertyData + ".id AS PropertyDataId",
+                Constants.DatabaseSchema.Tables.PropertyData + ".propertytypeid",
+                Constants.DatabaseSchema.Tables.PropertyData + ".dateValue",
+                Constants.DatabaseSchema.Tables.PropertyData + ".intValue",
+                Constants.DatabaseSchema.Tables.PropertyData + ".textValue",
+                Constants.DatabaseSchema.Tables.PropertyData + ".varcharValue",
+                "cmsPropertyType.id",
+                "cmsPropertyType.Alias",
+                "cmsPropertyType.Description",
+                "cmsPropertyType.Name",
+                "cmsPropertyType.mandatory",
+                "cmsPropertyType.validationRegExp",
+                "cmsPropertyType.sortOrder AS PropertyTypeSortOrder",
+                "cmsPropertyType.propertyTypeGroupId",
+                "cmsPropertyType.dataTypeId",
+                "cmsDataType.propertyEditorAlias",
+                "cmsDataType.dbType")
+            .From<NodeDto>()
+            .InnerJoin<ContentDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .InnerJoin<ContentTypeDto>()
+            .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
+            .InnerJoin<ContentVersionDto>().On<ContentVersionDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .InnerJoin<MemberDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+            .LeftJoin<PropertyTypeDto>()
+            .On<PropertyTypeDto, ContentDto>(left => left.ContentTypeId, right => right.ContentTypeId)
+            .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.NodeId, right => right.DataTypeId)
+            .LeftJoin<PropertyDataDto>()
+            .On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
+            .Append("AND " + Constants.DatabaseSchema.Tables.PropertyData +
+                    $".versionId = {Constants.DatabaseSchema.Tables.ContentVersion}.id")
+            .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+        return sql;
+    }
+
+    private Sql<ISqlContext> GetSubquery()
+    {
+        var provider = ScopeProvider;
+        var sql = ScopeAccessor.AmbientScope.SqlContext.Sql();
+        sql.Select("umbracoNode.id")
+            .From<NodeDto>()
+            .InnerJoin<ContentDto>().On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .InnerJoin<ContentTypeDto>()
+            .On<ContentTypeDto, ContentDto>(left => left.NodeId, right => right.ContentTypeId)
+            .InnerJoin<ContentVersionDto>().On<ContentVersionDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .InnerJoin<MemberDto>().On<MemberDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+            .LeftJoin<PropertyTypeDto>()
+            .On<PropertyTypeDto, ContentDto>(left => left.ContentTypeId, right => right.ContentTypeId)
+            .LeftJoin<DataTypeDto>().On<DataTypeDto, PropertyTypeDto>(left => left.NodeId, right => right.DataTypeId)
+            .LeftJoin<PropertyDataDto>()
+            .On<PropertyDataDto, PropertyTypeDto>(left => left.PropertyTypeId, right => right.Id)
+            .Append("AND " + Constants.DatabaseSchema.Tables.PropertyData +
+                    $".versionId = {Constants.DatabaseSchema.Tables.ContentVersion}.id")
+            .Where<NodeDto>(x => x.NodeObjectType == NodeObjectTypeId);
+        return sql;
+    }
+
+    private Guid NodeObjectTypeId => Constants.ObjectTypes.Member;
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs
index 4d378615b0..6562f21d5e 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/MemberTypeRepositoryTest.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -12,378 +11,372 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class MemberTypeRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MemberTypeRepositoryTest : UmbracoIntegrationTest
+    private MemberTypeRepository CreateRepository(IScopeProvider provider)
     {
-        private MemberTypeRepository CreateRepository(IScopeProvider provider)
+        var commonRepository = GetRequiredService<IContentTypeCommonRepository>();
+        var languageRepository = GetRequiredService<ILanguageRepository>();
+        return new MemberTypeRepository((IScopeAccessor)provider, AppCaches.Disabled, Mock.Of<ILogger<MemberTypeRepository>>(), commonRepository, languageRepository, ShortStringHelper);
+    }
+
+    [Test]
+    public void Can_Persist_Member_Type()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IContentTypeCommonRepository commonRepository = GetRequiredService<IContentTypeCommonRepository>();
-            ILanguageRepository languageRepository = GetRequiredService<ILanguageRepository>();
-            return new MemberTypeRepository((IScopeAccessor)provider, AppCaches.Disabled, Mock.Of<ILogger<MemberTypeRepository>>(), commonRepository, languageRepository, ShortStringHelper);
+            var repository = CreateRepository(provider);
+
+            var memberType = (IMemberType)MemberTypeBuilder.CreateSimpleMemberType();
+            repository.Save(memberType);
+
+            var sut = repository.Get(memberType.Id);
+
+            var standardProps = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+
+            Assert.That(sut, Is.Not.Null);
+            Assert.That(sut.PropertyGroups.Count, Is.EqualTo(2));
+            Assert.That(sut.PropertyTypes.Count(), Is.EqualTo(3 + standardProps.Count));
+
+            Assert.That(sut.PropertyGroups.Any(x => x.HasIdentity == false || x.Id == 0), Is.False);
+            Assert.That(sut.PropertyTypes.Any(x => x.HasIdentity == false || x.Id == 0), Is.False);
+
+            TestHelper.AssertPropertyValuesAreEqual(sut, memberType);
         }
+    }
 
-        [Test]
-        public void Can_Persist_Member_Type()
+    [Test]
+    public void Can_Persist_Member_Type_Same_Property_Keys()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                var memberType = (IMemberType)MemberTypeBuilder.CreateSimpleMemberType();
-                repository.Save(memberType);
+            var memberType = (IMemberType)MemberTypeBuilder.CreateSimpleMemberType();
 
-                IMemberType sut = repository.Get(memberType.Id);
+            repository.Save(memberType);
+            scope.Complete();
 
-                Dictionary<string, PropertyType> standardProps = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+            var propertyKeys = memberType.PropertyTypes.Select(x => x.Key).OrderBy(x => x).ToArray();
+            var groupKeys = memberType.PropertyGroups.Select(x => x.Key).OrderBy(x => x).ToArray();
 
-                Assert.That(sut, Is.Not.Null);
-                Assert.That(sut.PropertyGroups.Count, Is.EqualTo(2));
-                Assert.That(sut.PropertyTypes.Count(), Is.EqualTo(3 + standardProps.Count));
+            memberType = repository.Get(memberType.Id);
+            var propertyKeys2 = memberType.PropertyTypes.Select(x => x.Key).OrderBy(x => x).ToArray();
+            var groupKeys2 = memberType.PropertyGroups.Select(x => x.Key).OrderBy(x => x).ToArray();
 
-                Assert.That(sut.PropertyGroups.Any(x => x.HasIdentity == false || x.Id == 0), Is.False);
-                Assert.That(sut.PropertyTypes.Any(x => x.HasIdentity == false || x.Id == 0), Is.False);
-
-                TestHelper.AssertPropertyValuesAreEqual(sut, memberType);
-            }
+            Assert.IsTrue(propertyKeys.SequenceEqual(propertyKeys2));
+            Assert.IsTrue(groupKeys.SequenceEqual(groupKeys2));
         }
+    }
 
-        [Test]
-        public void Can_Persist_Member_Type_Same_Property_Keys()
+    [Test]
+    public void Cannot_Persist_Member_Type_Without_Alias()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                var memberType = (IMemberType)MemberTypeBuilder.CreateSimpleMemberType();
+            var memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            memberType.Alias = null;
 
-                repository.Save(memberType);
-                scope.Complete();
-
-                Guid[] propertyKeys = memberType.PropertyTypes.Select(x => x.Key).OrderBy(x => x).ToArray();
-                Guid[] groupKeys = memberType.PropertyGroups.Select(x => x.Key).OrderBy(x => x).ToArray();
-
-                memberType = repository.Get(memberType.Id);
-                Guid[] propertyKeys2 = memberType.PropertyTypes.Select(x => x.Key).OrderBy(x => x).ToArray();
-                Guid[] groupKeys2 = memberType.PropertyGroups.Select(x => x.Key).OrderBy(x => x).ToArray();
-
-                Assert.IsTrue(propertyKeys.SequenceEqual(propertyKeys2));
-                Assert.IsTrue(groupKeys.SequenceEqual(groupKeys2));
-            }
+            Assert.Throws<InvalidOperationException>(() => repository.Save(memberType));
         }
+    }
 
-        [Test]
-        public void Cannot_Persist_Member_Type_Without_Alias()
+    [Test]
+    public void Can_Get_All_Member_Types()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                memberType.Alias = null;
+            var memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
+            repository.Save(memberType1);
 
-                Assert.Throws<InvalidOperationException>(() => repository.Save(memberType));
-            }
+            var memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
+            memberType2.Name = "AnotherType";
+            memberType2.Alias = "anotherType";
+            repository.Save(memberType2);
+
+            var result = repository.GetMany();
+
+            // there are 3 because of the Member type created for init data
+            Assert.AreEqual(3, result.Count());
         }
+    }
 
-        [Test]
-        public void Can_Get_All_Member_Types()
+    [Test]
+    public void Can_Get_All_Member_Types_By_Guid_Ids()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                MemberType memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
-                repository.Save(memberType1);
+            var memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
+            repository.Save(memberType1);
 
-                MemberType memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
-                memberType2.Name = "AnotherType";
-                memberType2.Alias = "anotherType";
-                repository.Save(memberType2);
+            var memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
+            memberType2.Name = "AnotherType";
+            memberType2.Alias = "anotherType";
+            repository.Save(memberType2);
 
-                IEnumerable<IMemberType> result = repository.GetMany();
+            var result = ((IReadRepository<Guid, IMemberType>)repository).GetMany(memberType1.Key, memberType2.Key);
 
-                // there are 3 because of the Member type created for init data
-                Assert.AreEqual(3, result.Count());
-            }
+            // there are 3 because of the Member type created for init data
+            Assert.AreEqual(2, result.Count());
         }
+    }
 
-        [Test]
-        public void Can_Get_All_Member_Types_By_Guid_Ids()
+    [Test]
+    public void Can_Get_Member_Types_By_Guid_Id()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                MemberType memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
-                repository.Save(memberType1);
+            var memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
+            repository.Save(memberType1);
 
-                MemberType memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
-                memberType2.Name = "AnotherType";
-                memberType2.Alias = "anotherType";
-                repository.Save(memberType2);
+            var memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
+            memberType2.Name = "AnotherType";
+            memberType2.Alias = "anotherType";
+            repository.Save(memberType2);
 
-                IEnumerable<IMemberType> result = ((IReadRepository<Guid, IMemberType>)repository).GetMany(memberType1.Key, memberType2.Key);
+            var result = repository.Get(memberType1.Key);
 
-                // there are 3 because of the Member type created for init data
-                Assert.AreEqual(2, result.Count());
-            }
+            // there are 3 because of the Member type created for init data
+            Assert.IsNotNull(result);
+            Assert.AreEqual(memberType1.Key, result.Key);
         }
+    }
 
-        [Test]
-        public void Can_Get_Member_Types_By_Guid_Id()
+    // NOTE: This tests for left join logic (rev 7b14e8eacc65f82d4f184ef46c23340c09569052)
+    [Test]
+    public void Can_Get_All_Members_When_No_Properties_Assigned()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                MemberType memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
-                repository.Save(memberType1);
+            var memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
+            memberType1.PropertyTypeCollection.Clear();
+            repository.Save(memberType1);
 
-                MemberType memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
-                memberType2.Name = "AnotherType";
-                memberType2.Alias = "anotherType";
-                repository.Save(memberType2);
+            var memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
+            memberType2.PropertyTypeCollection.Clear();
+            memberType2.Name = "AnotherType";
+            memberType2.Alias = "anotherType";
+            repository.Save(memberType2);
 
-                IMemberType result = repository.Get(memberType1.Key);
+            var result = repository.GetMany();
 
-                // there are 3 because of the Member type created for init data
-                Assert.IsNotNull(result);
-                Assert.AreEqual(memberType1.Key, result.Key);
-            }
+            // there are 3 because of the Member type created for init data
+            Assert.AreEqual(3, result.Count());
         }
+    }
 
-        // NOTE: This tests for left join logic (rev 7b14e8eacc65f82d4f184ef46c23340c09569052)
-        [Test]
-        public void Can_Get_All_Members_When_No_Properties_Assigned()
+    [Test]
+    public void Can_Get_Member_Type_By_Id()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                MemberType memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
-                memberType1.PropertyTypeCollection.Clear();
-                repository.Save(memberType1);
+            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            repository.Save(memberType);
 
-                MemberType memberType2 = MemberTypeBuilder.CreateSimpleMemberType();
-                memberType2.PropertyTypeCollection.Clear();
-                memberType2.Name = "AnotherType";
-                memberType2.Alias = "anotherType";
-                repository.Save(memberType2);
-
-                IEnumerable<IMemberType> result = repository.GetMany();
-
-                // there are 3 because of the Member type created for init data
-                Assert.AreEqual(3, result.Count());
-            }
+            memberType = repository.Get(memberType.Id);
+            Assert.That(memberType, Is.Not.Null);
         }
+    }
 
-        [Test]
-        public void Can_Get_Member_Type_By_Id()
+    [Test]
+    public void Can_Get_Member_Type_By_Guid_Id()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                repository.Save(memberType);
+            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            repository.Save(memberType);
 
-                memberType = repository.Get(memberType.Id);
-                Assert.That(memberType, Is.Not.Null);
-            }
+            memberType = repository.Get(memberType.Key);
+            Assert.That(memberType, Is.Not.Null);
         }
+    }
 
-        [Test]
-        public void Can_Get_Member_Type_By_Guid_Id()
+    // See: https://github.com/umbraco/Umbraco-CMS/issues/4963#issuecomment-483516698
+    [Test]
+    public void Bug_Changing_Built_In_Member_Type_Property_Type_Aliases_Results_In_Exception()
+    {
+        var stubs = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var repository = CreateRepository(provider);
+
+            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType("mtype");
+
+            // created without the stub properties
+            Assert.AreEqual(1, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3, memberType.PropertyTypes.Count());
+
+            // saving *new* member type adds the stub properties
+            repository.Save(memberType);
+
+            // saving has added (and saved) the stub properties
+            Assert.AreEqual(2, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
+
+            foreach (var stub in stubs)
             {
-                MemberTypeRepository repository = CreateRepository(provider);
-
-                IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                repository.Save(memberType);
-
-                memberType = repository.Get(memberType.Key);
-                Assert.That(memberType, Is.Not.Null);
+                var prop = memberType.PropertyTypes.First(x => x.Alias == stub.Key);
+                prop.Alias += "__0000";
             }
+
+            // saving *existing* member type does *not* ensure stub properties
+            repository.Save(memberType);
+
+            // therefore, nothing has changed
+            Assert.AreEqual(2, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
+
+            // fetching ensures that the stub properties are there
+            memberType = repository.Get("mtype");
+            Assert.IsNotNull(memberType);
+
+            Assert.AreEqual(2, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3 + (stubs.Count * 2), memberType.PropertyTypes.Count());
         }
+    }
 
-        // See: https://github.com/umbraco/Umbraco-CMS/issues/4963#issuecomment-483516698
-        [Test]
-        public void Bug_Changing_Built_In_Member_Type_Property_Type_Aliases_Results_In_Exception()
+    [Test]
+    public void Built_In_Member_Type_Properties_Are_Automatically_Added_When_Creating()
+    {
+        var stubs = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            Dictionary<string, PropertyType> stubs = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+            var repository = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
 
-                IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType("mtype");
+            // created without the stub properties
+            Assert.AreEqual(1, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3, memberType.PropertyTypes.Count());
 
-                // created without the stub properties
-                Assert.AreEqual(1, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3, memberType.PropertyTypes.Count());
+            // saving *new* member type adds the stub properties
+            repository.Save(memberType);
 
-                // saving *new* member type adds the stub properties
-                repository.Save(memberType);
+            // saving has added (and saved) the stub properties
+            Assert.AreEqual(2, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
 
-                // saving has added (and saved) the stub properties
-                Assert.AreEqual(2, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
+            // getting with stub properties
+            memberType = repository.Get(memberType.Id);
 
-                foreach (KeyValuePair<string, PropertyType> stub in stubs)
-                {
-                    IPropertyType prop = memberType.PropertyTypes.First(x => x.Alias == stub.Key);
-                    prop.Alias += "__0000";
-                }
-
-                // saving *existing* member type does *not* ensure stub properties
-                repository.Save(memberType);
-
-                // therefore, nothing has changed
-                Assert.AreEqual(2, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
-
-                // fetching ensures that the stub properties are there
-                memberType = repository.Get("mtype");
-                Assert.IsNotNull(memberType);
-
-                Assert.AreEqual(2, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3 + (stubs.Count * 2), memberType.PropertyTypes.Count());
-            }
+            Assert.AreEqual(2, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
         }
+    }
 
-        [Test]
-        public void Built_In_Member_Type_Properties_Are_Automatically_Added_When_Creating()
+    [Test]
+    public void Built_In_Member_Type_Properties_Missing_Are_Automatically_Added_When_Creating()
+    {
+        var stubs = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            Dictionary<string, PropertyType> stubs = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+            var repository = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
 
-                IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            // created without the stub properties
+            Assert.AreEqual(1, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3, memberType.PropertyTypes.Count());
 
-                // created without the stub properties
-                Assert.AreEqual(1, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3, memberType.PropertyTypes.Count());
+            // add one stub property, others are still missing
+            memberType.AddPropertyType(stubs.First().Value, Constants.Conventions.Member.StandardPropertiesGroupAlias, Constants.Conventions.Member.StandardPropertiesGroupName);
 
-                // saving *new* member type adds the stub properties
-                repository.Save(memberType);
+            // saving *new* member type adds the (missing) stub properties
+            repository.Save(memberType);
 
-                // saving has added (and saved) the stub properties
-                Assert.AreEqual(2, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
+            // saving has added (and saved) the (missing) stub properties
+            Assert.AreEqual(2, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
 
-                // getting with stub properties
-                memberType = repository.Get(memberType.Id);
+            // getting with stub properties
+            memberType = repository.Get(memberType.Id);
 
-                Assert.AreEqual(2, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
-            }
+            Assert.AreEqual(2, memberType.PropertyGroups.Count);
+            Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
         }
+    }
 
-        [Test]
-        public void Built_In_Member_Type_Properties_Missing_Are_Automatically_Added_When_Creating()
+    // This is to show that new properties are created for each member type - there was a bug before
+    // that was reusing the same properties with the same Ids between member types
+    [Test]
+    public void Built_In_Member_Type_Properties_Are_Not_Reused_For_Different_Member_Types()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            Dictionary<string, PropertyType> stubs = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+            var repository = CreateRepository(provider);
 
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            IMemberType memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
+            IMemberType memberType2 = MemberTypeBuilder.CreateSimpleMemberType("test2");
+            repository.Save(memberType1);
+            repository.Save(memberType2);
 
-                IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            var m1Ids = memberType1.PropertyTypes.Select(x => x.Id).ToArray();
+            var m2Ids = memberType2.PropertyTypes.Select(x => x.Id).ToArray();
 
-                // created without the stub properties
-                Assert.AreEqual(1, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3, memberType.PropertyTypes.Count());
-
-                // add one stub property, others are still missing
-                memberType.AddPropertyType(stubs.First().Value, Constants.Conventions.Member.StandardPropertiesGroupAlias, Constants.Conventions.Member.StandardPropertiesGroupName);
-
-                // saving *new* member type adds the (missing) stub properties
-                repository.Save(memberType);
-
-                // saving has added (and saved) the (missing) stub properties
-                Assert.AreEqual(2, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
-
-                // getting with stub properties
-                memberType = repository.Get(memberType.Id);
-
-                Assert.AreEqual(2, memberType.PropertyGroups.Count);
-                Assert.AreEqual(3 + stubs.Count, memberType.PropertyTypes.Count());
-            }
+            Assert.IsFalse(m1Ids.Any(m2Ids.Contains));
         }
+    }
 
-        // This is to show that new properties are created for each member type - there was a bug before
-        // that was reusing the same properties with the same Ids between member types
-        [Test]
-        public void Built_In_Member_Type_Properties_Are_Not_Reused_For_Different_Member_Types()
+    [Test]
+    public void Can_Delete_MemberType()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                IMemberType memberType1 = MemberTypeBuilder.CreateSimpleMemberType();
-                IMemberType memberType2 = MemberTypeBuilder.CreateSimpleMemberType("test2");
-                repository.Save(memberType1);
-                repository.Save(memberType2);
+            // Act
+            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+            repository.Save(memberType);
 
-                int[] m1Ids = memberType1.PropertyTypes.Select(x => x.Id).ToArray();
-                int[] m2Ids = memberType2.PropertyTypes.Select(x => x.Id).ToArray();
+            var contentType2 = repository.Get(memberType.Id);
+            repository.Delete(contentType2);
 
-                Assert.IsFalse(m1Ids.Any(m2Ids.Contains));
-            }
-        }
+            var exists = repository.Exists(memberType.Id);
 
-        [Test]
-        public void Can_Delete_MemberType()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                MemberTypeRepository repository = CreateRepository(provider);
-
-                // Act
-                IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-                repository.Save(memberType);
-
-                IMemberType contentType2 = repository.Get(memberType.Id);
-                repository.Delete(contentType2);
-
-                bool exists = repository.Exists(memberType.Id);
-
-                // Assert
-                Assert.That(exists, Is.False);
-            }
+            // Assert
+            Assert.That(exists, Is.False);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs
index bf33238178..05b9946425 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/NotificationsRepositoryTest.cs
@@ -2,177 +2,278 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class NotificationsRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class NotificationsRepositoryTest : UmbracoIntegrationTest
+    [Test]
+    public void CreateNotification()
     {
-        [Test]
-        public void CreateNotification()
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new NotificationsRepository((IScopeAccessor)provider);
+            var repo = new NotificationsRepository((IScopeAccessor)provider);
 
-                var node = new NodeDto // create bogus item so we can add a notification
+            var node = new NodeDto // create bogus item so we can add a notification
+            {
+                CreateDate = DateTime.Now,
+                Level = 1,
+                NodeObjectType = Constants.ObjectTypes.ContentItem,
+                ParentId = -1,
+                Path = "-1,123",
+                SortOrder = 1,
+                Text = "hello",
+                Trashed = false,
+                UniqueId = Guid.NewGuid(),
+                UserId = Constants.Security.SuperUserId
+            };
+            var result = ScopeAccessor.AmbientScope.Database.Insert(node);
+            var entity = Mock.Of<IEntity>(e => e.Id == node.NodeId);
+            var user = Mock.Of<IUser>(e => e.Id == node.UserId);
+
+            var notification = repo.CreateNotification(user, entity, "A");
+
+            Assert.AreEqual("A", notification.Action);
+            Assert.AreEqual(node.NodeId, notification.EntityId);
+            Assert.AreEqual(node.NodeObjectType, notification.EntityType);
+            Assert.AreEqual(node.UserId, notification.UserId);
+        }
+    }
+
+    [Test]
+    public void GetUserNotifications()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = new NotificationsRepository((IScopeAccessor)provider);
+
+            var userDto = new UserDto
+            {
+                Email = "test",
+                Login = "test",
+                Password = "test",
+                UserName = "test",
+                UserLanguage = "en",
+                CreateDate = DateTime.Now,
+                UpdateDate = DateTime.Now
+            };
+            ScopeAccessor.AmbientScope.Database.Insert(userDto);
+
+            var userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
+            var userAdmin = Mock.Of<IUser>(e => e.Id == Constants.Security.SuperUserId);
+
+            for (var i = 0; i < 10; i++)
+            {
+                var node = new NodeDto
                 {
                     CreateDate = DateTime.Now,
                     Level = 1,
                     NodeObjectType = Constants.ObjectTypes.ContentItem,
                     ParentId = -1,
-                    Path = "-1,123",
+                    Path = "-1," + i,
                     SortOrder = 1,
-                    Text = "hello",
+                    Text = "hello" + i,
                     Trashed = false,
                     UniqueId = Guid.NewGuid(),
-                    UserId = Constants.Security.SuperUserId
+                    UserId = -1
                 };
-                object result = ScopeAccessor.AmbientScope.Database.Insert(node);
-                IEntity entity = Mock.Of<IEntity>(e => e.Id == node.NodeId);
-                IUser user = Mock.Of<IUser>(e => e.Id == node.UserId);
-
-                Notification notification = repo.CreateNotification(user, entity, "A");
-
-                Assert.AreEqual("A", notification.Action);
-                Assert.AreEqual(node.NodeId, notification.EntityId);
-                Assert.AreEqual(node.NodeObjectType, notification.EntityType);
-                Assert.AreEqual(node.UserId, notification.UserId);
+                var result = ScopeAccessor.AmbientScope.Database.Insert(node);
+                var entity = Mock.Of<IEntity>(e => e.Id == node.NodeId);
+                var notification = repo.CreateNotification(i % 2 == 0 ? userAdmin : userNew, entity, i.ToString(CultureInfo.InvariantCulture));
             }
+
+            var notifications = repo.GetUserNotifications(userAdmin);
+
+            Assert.AreEqual(5, notifications.Count());
         }
+    }
 
-        [Test]
-        public void GetUserNotifications()
+    [Test]
+    public void GetEntityNotifications()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new NotificationsRepository((IScopeAccessor)provider);
+            var repo = new NotificationsRepository((IScopeAccessor)provider);
 
-                var userDto = new UserDto { Email = "test", Login = "test", Password = "test", UserName = "test", UserLanguage = "en", CreateDate = DateTime.Now, UpdateDate = DateTime.Now };
+            var node1 = new NodeDto
+            {
+                CreateDate = DateTime.Now,
+                Level = 1,
+                NodeObjectType = Constants.ObjectTypes.ContentItem,
+                ParentId = -1,
+                Path = "-1,1",
+                SortOrder = 1,
+                Text = "hello1",
+                Trashed = false,
+                UniqueId = Guid.NewGuid(),
+                UserId = -1
+            };
+            ScopeAccessor.AmbientScope.Database.Insert(node1);
+            var entity1 = Mock.Of<IEntity>(e => e.Id == node1.NodeId);
+            var node2 = new NodeDto
+            {
+                CreateDate = DateTime.Now,
+                Level = 1,
+                NodeObjectType = Constants.ObjectTypes.ContentItem,
+                ParentId = -1,
+                Path = "-1,2",
+                SortOrder = 1,
+                Text = "hello2",
+                Trashed = false,
+                UniqueId = Guid.NewGuid(),
+                UserId = -1
+            };
+            ScopeAccessor.AmbientScope.Database.Insert(node2);
+            var entity2 = Mock.Of<IEntity>(e => e.Id == node2.NodeId);
+
+            for (var i = 0; i < 10; i++)
+            {
+                var userDto = new UserDto
+                {
+                    Email = "test" + i,
+                    Login = "test" + i,
+                    Password = "test",
+                    UserName = "test" + i,
+                    UserLanguage = "en",
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now
+                };
                 ScopeAccessor.AmbientScope.Database.Insert(userDto);
-
-                IUser userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
-                IUser userAdmin = Mock.Of<IUser>(e => e.Id == Constants.Security.SuperUserId);
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1," + i, SortOrder = 1, Text = "hello" + i, Trashed = false, UniqueId = Guid.NewGuid(), UserId = -1 };
-                    object result = ScopeAccessor.AmbientScope.Database.Insert(node);
-                    IEntity entity = Mock.Of<IEntity>(e => e.Id == node.NodeId);
-                    Notification notification = repo.CreateNotification((i % 2 == 0) ? userAdmin : userNew, entity, i.ToString(CultureInfo.InvariantCulture));
-                }
-
-                IEnumerable<Notification> notifications = repo.GetUserNotifications(userAdmin);
-
-                Assert.AreEqual(5, notifications.Count());
+                var userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
+                var notification = repo.CreateNotification(userNew, i % 2 == 0 ? entity1 : entity2, i.ToString(CultureInfo.InvariantCulture));
             }
+
+            var notifications = repo.GetEntityNotifications(entity1);
+
+            Assert.AreEqual(5, notifications.Count());
         }
+    }
 
-        [Test]
-        public void GetEntityNotifications()
+    [Test]
+    public void Delete_By_Entity()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var repo = new NotificationsRepository((IScopeAccessor)provider);
+
+            var node1 = new NodeDto
             {
-                var repo = new NotificationsRepository((IScopeAccessor)provider);
+                CreateDate = DateTime.Now,
+                Level = 1,
+                NodeObjectType = Constants.ObjectTypes.ContentItem,
+                ParentId = -1,
+                Path = "-1,1",
+                SortOrder = 1,
+                Text = "hello1",
+                Trashed = false,
+                UniqueId = Guid.NewGuid(),
+                UserId = -1
+            };
+            ScopeAccessor.AmbientScope.Database.Insert(node1);
+            var entity1 = Mock.Of<IEntity>(e => e.Id == node1.NodeId);
+            var node2 = new NodeDto
+            {
+                CreateDate = DateTime.Now,
+                Level = 1,
+                NodeObjectType = Constants.ObjectTypes.ContentItem,
+                ParentId = -1,
+                Path = "-1,2",
+                SortOrder = 1,
+                Text = "hello2",
+                Trashed = false,
+                UniqueId = Guid.NewGuid(),
+                UserId = -1
+            };
+            ScopeAccessor.AmbientScope.Database.Insert(node2);
+            var entity2 = Mock.Of<IEntity>(e => e.Id == node2.NodeId);
 
-                var node1 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,1", SortOrder = 1, Text = "hello1", Trashed = false, UniqueId = Guid.NewGuid(), UserId = -1 };
-                ScopeAccessor.AmbientScope.Database.Insert(node1);
-                IEntity entity1 = Mock.Of<IEntity>(e => e.Id == node1.NodeId);
-                var node2 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,2", SortOrder = 1, Text = "hello2", Trashed = false, UniqueId = Guid.NewGuid(), UserId = -1 };
-                ScopeAccessor.AmbientScope.Database.Insert(node2);
-                IEntity entity2 = Mock.Of<IEntity>(e => e.Id == node2.NodeId);
-
-                for (int i = 0; i < 10; i++)
+            for (var i = 0; i < 10; i++)
+            {
+                var userDto = new UserDto
                 {
-                    var userDto = new UserDto { Email = "test" + i, Login = "test" + i, Password = "test", UserName = "test" + i, UserLanguage = "en", CreateDate = DateTime.Now, UpdateDate = DateTime.Now };
-                    ScopeAccessor.AmbientScope.Database.Insert(userDto);
-                    IUser userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
-                    Notification notification = repo.CreateNotification(userNew, (i % 2 == 0) ? entity1 : entity2, i.ToString(CultureInfo.InvariantCulture));
-                }
-
-                IEnumerable<Notification> notifications = repo.GetEntityNotifications(entity1);
-
-                Assert.AreEqual(5, notifications.Count());
-            }
-        }
-
-        [Test]
-        public void Delete_By_Entity()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new NotificationsRepository((IScopeAccessor)provider);
-
-                var node1 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,1", SortOrder = 1, Text = "hello1", Trashed = false, UniqueId = Guid.NewGuid(), UserId = -1 };
-                ScopeAccessor.AmbientScope.Database.Insert(node1);
-                IEntity entity1 = Mock.Of<IEntity>(e => e.Id == node1.NodeId);
-                var node2 = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1,2", SortOrder = 1, Text = "hello2", Trashed = false, UniqueId = Guid.NewGuid(), UserId = -1 };
-                ScopeAccessor.AmbientScope.Database.Insert(node2);
-                IEntity entity2 = Mock.Of<IEntity>(e => e.Id == node2.NodeId);
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var userDto = new UserDto { Email = "test" + i, Login = "test" + i, Password = "test", UserName = "test" + i, UserLanguage = "en", CreateDate = DateTime.Now, UpdateDate = DateTime.Now };
-                    ScopeAccessor.AmbientScope.Database.Insert(userDto);
-                    IUser userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
-                    Notification notification = repo.CreateNotification(userNew, (i % 2 == 0) ? entity1 : entity2, i.ToString(CultureInfo.InvariantCulture));
-                }
-
-                int delCount = repo.DeleteNotifications(entity1);
-
-                Assert.AreEqual(5, delCount);
-            }
-        }
-
-        [Test]
-        public void Delete_By_User()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new NotificationsRepository((IScopeAccessor)provider);
-
-                var userDto = new UserDto { Email = "test", Login = "test", Password = "test", UserName = "test", UserLanguage = "en", CreateDate = DateTime.Now, UpdateDate = DateTime.Now };
+                    Email = "test" + i,
+                    Login = "test" + i,
+                    Password = "test",
+                    UserName = "test" + i,
+                    UserLanguage = "en",
+                    CreateDate = DateTime.Now,
+                    UpdateDate = DateTime.Now
+                };
                 ScopeAccessor.AmbientScope.Database.Insert(userDto);
-
-                IUser userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
-                IUser userAdmin = Mock.Of<IUser>(e => e.Id == Constants.Security.SuperUserId);
-
-                for (int i = 0; i < 10; i++)
-                {
-                    var node = new NodeDto { CreateDate = DateTime.Now, Level = 1, NodeObjectType = Constants.ObjectTypes.ContentItem, ParentId = -1, Path = "-1," + i, SortOrder = 1, Text = "hello" + i, Trashed = false, UniqueId = Guid.NewGuid(), UserId = -1 };
-                    object result = ScopeAccessor.AmbientScope.Database.Insert(node);
-                    IEntity entity = Mock.Of<IEntity>(e => e.Id == node.NodeId);
-                    Notification notification = repo.CreateNotification((i % 2 == 0) ? userAdmin : userNew, entity, i.ToString(CultureInfo.InvariantCulture));
-                }
-
-                int delCount = repo.DeleteNotifications(userAdmin);
-
-                Assert.AreEqual(5, delCount);
+                var userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
+                var notification = repo.CreateNotification(userNew, i % 2 == 0 ? entity1 : entity2, i.ToString(CultureInfo.InvariantCulture));
             }
+
+            var delCount = repo.DeleteNotifications(entity1);
+
+            Assert.AreEqual(5, delCount);
+        }
+    }
+
+    [Test]
+    public void Delete_By_User()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = new NotificationsRepository((IScopeAccessor)provider);
+
+            var userDto = new UserDto
+            {
+                Email = "test",
+                Login = "test",
+                Password = "test",
+                UserName = "test",
+                UserLanguage = "en",
+                CreateDate = DateTime.Now,
+                UpdateDate = DateTime.Now
+            };
+            ScopeAccessor.AmbientScope.Database.Insert(userDto);
+
+            var userNew = Mock.Of<IUser>(e => e.Id == userDto.Id);
+            var userAdmin = Mock.Of<IUser>(e => e.Id == Constants.Security.SuperUserId);
+
+            for (var i = 0; i < 10; i++)
+            {
+                var node = new NodeDto
+                {
+                    CreateDate = DateTime.Now,
+                    Level = 1,
+                    NodeObjectType = Constants.ObjectTypes.ContentItem,
+                    ParentId = -1,
+                    Path = "-1," + i,
+                    SortOrder = 1,
+                    Text = "hello" + i,
+                    Trashed = false,
+                    UniqueId = Guid.NewGuid(),
+                    UserId = -1
+                };
+                var result = ScopeAccessor.AmbientScope.Database.Insert(node);
+                var entity = Mock.Of<IEntity>(e => e.Id == node.NodeId);
+                var notification = repo.CreateNotification(i % 2 == 0 ? userAdmin : userNew, entity, i.ToString(CultureInfo.InvariantCulture));
+            }
+
+            var delCount = repo.DeleteNotifications(userAdmin);
+
+            Assert.AreEqual(5, delCount);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs
index 3596c0c30f..6f59f62e55 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PartialViewRepositoryTests.cs
@@ -2,127 +2,138 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.None)]
+public class PartialViewRepositoryTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
-    public class PartialViewRepositoryTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() =>
+        _fileSystem = new PhysicalFileSystem(
+            IOHelper,
+            HostingEnvironment,
+            LoggerFactory.CreateLogger<PhysicalFileSystem>(),
+            HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.PartialViews),
+            HostingEnvironment.ToAbsolute(Constants.SystemDirectories.PartialViews));
+
+    [TearDown]
+    public void TearDownFiles()
     {
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+        // Delete all files
+        Purge((PhysicalFileSystem)_fileSystem, string.Empty);
+        _fileSystem = null;
+    }
 
-        private IFileSystem _fileSystem;
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
 
-        [SetUp]
-        public void SetUp() =>
-            _fileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, LoggerFactory.CreateLogger<PhysicalFileSystem>(), HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.PartialViews), HostingEnvironment.ToAbsolute(Constants.SystemDirectories.PartialViews));
+    private IFileSystem _fileSystem;
 
-        [TearDown]
-        public void TearDownFiles()
+    [Test]
+    public void PathTests()
+    {
+        // unless noted otherwise, no changes / 7.2.8
+        var fileSystems = FileSystemsCreator.CreateTestFileSystems(
+            LoggerFactory,
+            IOHelper,
+            GetRequiredService<IOptions<GlobalSettings>>(),
+            HostingEnvironment,
+            null,
+            _fileSystem,
+            null,
+            null,
+            null);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Delete all files
-            Purge((PhysicalFileSystem)_fileSystem, string.Empty);
-            _fileSystem = null;
+            var repository = new PartialViewRepository(fileSystems);
+
+            IPartialView partialView =
+                new PartialView(PartialViewType.PartialView, "test-path-1.cshtml") { Content = "// partialView" };
+            repository.Save(partialView);
+            Assert.IsTrue(_fileSystem.FileExists("test-path-1.cshtml"));
+            Assert.AreEqual("test-path-1.cshtml", partialView.Path);
+            Assert.AreEqual("/Views/Partials/test-path-1.cshtml", partialView.VirtualPath);
+
+            partialView =
+                new PartialView(PartialViewType.PartialView, "path-2/test-path-2.cshtml") { Content = "// partialView" };
+            repository.Save(partialView);
+            Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.cshtml"));
+            Assert.AreEqual("path-2\\test-path-2.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
+            Assert.AreEqual("/Views/Partials/path-2/test-path-2.cshtml", partialView.VirtualPath);
+
+            partialView = repository.Get("path-2/test-path-2.cshtml");
+            Assert.IsNotNull(partialView);
+            Assert.AreEqual("path-2\\test-path-2.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
+            Assert.AreEqual("/Views/Partials/path-2/test-path-2.cshtml", partialView.VirtualPath);
+
+            partialView =
+                new PartialView(PartialViewType.PartialView, "path-2\\test-path-3.cshtml") { Content = "// partialView" };
+            repository.Save(partialView);
+            Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.cshtml"));
+            Assert.AreEqual("path-2\\test-path-3.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
+            Assert.AreEqual("/Views/Partials/path-2/test-path-3.cshtml", partialView.VirtualPath);
+
+            partialView = repository.Get("path-2/test-path-3.cshtml");
+            Assert.IsNotNull(partialView);
+            Assert.AreEqual("path-2\\test-path-3.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
+            Assert.AreEqual("/Views/Partials/path-2/test-path-3.cshtml", partialView.VirtualPath);
+
+            partialView = repository.Get("path-2\\test-path-3.cshtml");
+            Assert.IsNotNull(partialView);
+            Assert.AreEqual("path-2\\test-path-3.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
+            Assert.AreEqual("/Views/Partials/path-2/test-path-3.cshtml", partialView.VirtualPath);
+
+            partialView =
+                new PartialView(PartialViewType.PartialView, "..\\test-path-4.cshtml") { Content = "// partialView" };
+            Assert.Throws<UnauthorizedAccessException>(() =>
+                repository.Save(partialView));
+
+            partialView =
+                new PartialView(PartialViewType.PartialView, "\\test-path-5.cshtml") { Content = "// partialView" };
+            repository.Save(partialView);
+
+            partialView = repository.Get("\\test-path-5.cshtml");
+            Assert.IsNotNull(partialView);
+            Assert.AreEqual("test-path-5.cshtml", partialView.Path);
+            Assert.AreEqual("/Views/Partials/test-path-5.cshtml", partialView.VirtualPath);
+
+            partialView = repository.Get("missing.cshtml");
+            Assert.IsNull(partialView);
+
+            Assert.Throws<UnauthorizedAccessException>(() => partialView = repository.Get("..\\test-path-4.cshtml"));
+            Assert.Throws<UnauthorizedAccessException>(() => partialView = repository.Get("../../packages.config"));
+        }
+    }
+
+    private void Purge(PhysicalFileSystem fs, string path)
+    {
+        var files = fs.GetFiles(path, "*.cshtml");
+        foreach (var file in files)
+        {
+            fs.DeleteFile(file);
         }
 
-        [Test]
-        public void PathTests()
+        var dirs = fs.GetDirectories(path);
+        foreach (var dir in dirs)
         {
-            // unless noted otherwise, no changes / 7.2.8
-            FileSystems fileSystems = FileSystemsCreator.CreateTestFileSystems(LoggerFactory, IOHelper,
-                GetRequiredService<IOptions<GlobalSettings>>(), HostingEnvironment,
-                null, _fileSystem, null, null, null);
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repository = new PartialViewRepository(fileSystems);
-
-                IPartialView partialView = new PartialView(PartialViewType.PartialView, "test-path-1.cshtml") { Content = "// partialView" };
-                repository.Save(partialView);
-                Assert.IsTrue(_fileSystem.FileExists("test-path-1.cshtml"));
-                Assert.AreEqual("test-path-1.cshtml", partialView.Path);
-                Assert.AreEqual("/Views/Partials/test-path-1.cshtml", partialView.VirtualPath);
-
-                partialView = new PartialView(PartialViewType.PartialView, "path-2/test-path-2.cshtml") { Content = "// partialView" };
-                repository.Save(partialView);
-                Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.cshtml"));
-                Assert.AreEqual("path-2\\test-path-2.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
-                Assert.AreEqual("/Views/Partials/path-2/test-path-2.cshtml", partialView.VirtualPath);
-
-                partialView = repository.Get("path-2/test-path-2.cshtml");
-                Assert.IsNotNull(partialView);
-                Assert.AreEqual("path-2\\test-path-2.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
-                Assert.AreEqual("/Views/Partials/path-2/test-path-2.cshtml", partialView.VirtualPath);
-
-                partialView = new PartialView(PartialViewType.PartialView, "path-2\\test-path-3.cshtml") { Content = "// partialView" };
-                repository.Save(partialView);
-                Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.cshtml"));
-                Assert.AreEqual("path-2\\test-path-3.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
-                Assert.AreEqual("/Views/Partials/path-2/test-path-3.cshtml", partialView.VirtualPath);
-
-                partialView = repository.Get("path-2/test-path-3.cshtml");
-                Assert.IsNotNull(partialView);
-                Assert.AreEqual("path-2\\test-path-3.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
-                Assert.AreEqual("/Views/Partials/path-2/test-path-3.cshtml", partialView.VirtualPath);
-
-                partialView = repository.Get("path-2\\test-path-3.cshtml");
-                Assert.IsNotNull(partialView);
-                Assert.AreEqual("path-2\\test-path-3.cshtml".Replace("\\", $"{Path.DirectorySeparatorChar}"), partialView.Path);
-                Assert.AreEqual("/Views/Partials/path-2/test-path-3.cshtml", partialView.VirtualPath);
-
-                partialView = new PartialView(PartialViewType.PartialView, "..\\test-path-4.cshtml") { Content = "// partialView" };
-                Assert.Throws<UnauthorizedAccessException>(() =>
-                    repository.Save(partialView));
-
-                partialView = new PartialView(PartialViewType.PartialView, "\\test-path-5.cshtml") { Content = "// partialView" };
-                repository.Save(partialView);
-
-                partialView = repository.Get("\\test-path-5.cshtml");
-                Assert.IsNotNull(partialView);
-                Assert.AreEqual("test-path-5.cshtml", partialView.Path);
-                Assert.AreEqual("/Views/Partials/test-path-5.cshtml", partialView.VirtualPath);
-
-                partialView = repository.Get("missing.cshtml");
-                Assert.IsNull(partialView);
-
-                Assert.Throws<UnauthorizedAccessException>(() => partialView = repository.Get("..\\test-path-4.cshtml"));
-                Assert.Throws<UnauthorizedAccessException>(() => partialView = repository.Get("../../packages.config"));
-            }
-        }
-
-        private void Purge(PhysicalFileSystem fs, string path)
-        {
-            IEnumerable<string> files = fs.GetFiles(path, "*.cshtml");
-            foreach (string file in files)
-            {
-                fs.DeleteFile(file);
-            }
-
-            IEnumerable<string> dirs = fs.GetDirectories(path);
-            foreach (string dir in dirs)
-            {
-                Purge(fs, dir);
-                fs.DeleteDirectory(dir);
-            }
+            Purge(fs, dir);
+            fs.DeleteDirectory(dir);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs
index 36b394d5f4..a7c04d2503 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/PublicAccessRepositoryTest.cs
@@ -8,324 +8,264 @@ using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Content = Umbraco.Cms.Core.Models.Content;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class PublicAccessRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class PublicAccessRepositoryTest : UmbracoIntegrationTest
+    private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
+
+    private DocumentRepository DocumentRepository => (DocumentRepository)GetRequiredService<IDocumentRepository>();
+
+    [Test]
+    public void Can_Delete()
     {
-        private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
+        var content = CreateTestData(3).ToArray();
 
-        private DocumentRepository DocumentRepository => (DocumentRepository)GetRequiredService<IDocumentRepository>();
-
-        [Test]
-        public void Can_Delete()
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IContent[] content = CreateTestData(3).ToArray();
+            var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
+            PublicAccessRule[] rules = { new PublicAccessRule { RuleValue = "test", RuleType = "RoleName" } };
+            var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
+            repo.Save(entry);
 
-                PublicAccessRule[] rules = new[]
-                    {
-                        new PublicAccessRule
-                        {
-                            RuleValue = "test",
-                            RuleType = "RoleName"
-                        },
-                    };
-                var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
-                repo.Save(entry);
+            repo.Delete(entry);
 
-                repo.Delete(entry);
-
-                entry = repo.Get(entry.Key);
-                Assert.IsNull(entry);
-            }
+            entry = repo.Get(entry.Key);
+            Assert.IsNull(entry);
         }
+    }
 
-        [Test]
-        public void Can_Add()
+    [Test]
+    public void Can_Add()
+    {
+        var content = CreateTestData(3).ToArray();
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IContent[] content = CreateTestData(3).ToArray();
+            ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+            var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
+            PublicAccessRule[] rules = { new PublicAccessRule { RuleValue = "test", RuleType = "RoleName" } };
+            var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
+            repo.Save(entry);
 
-                PublicAccessRule[] rules = new[]
-                    {
-                        new PublicAccessRule
-                        {
-                            RuleValue = "test",
-                            RuleType = "RoleName"
-                        },
-                    };
-                var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
-                repo.Save(entry);
+            var found = repo.GetMany().ToArray();
 
-                PublicAccessEntry[] found = repo.GetMany().ToArray();
-
-                Assert.AreEqual(1, found.Length);
-                Assert.AreEqual(content[0].Id, found[0].ProtectedNodeId);
-                Assert.AreEqual(content[1].Id, found[0].LoginNodeId);
-                Assert.AreEqual(content[2].Id, found[0].NoAccessNodeId);
-                Assert.IsTrue(found[0].HasIdentity);
-                Assert.AreNotEqual(default(DateTime), found[0].CreateDate);
-                Assert.AreNotEqual(default(DateTime), found[0].UpdateDate);
-                Assert.AreEqual(1, found[0].Rules.Count());
-                Assert.AreEqual("test", found[0].Rules.First().RuleValue);
-                Assert.AreEqual("RoleName", found[0].Rules.First().RuleType);
-                Assert.AreNotEqual(default(DateTime), found[0].Rules.First().CreateDate);
-                Assert.AreNotEqual(default(DateTime), found[0].Rules.First().UpdateDate);
-                Assert.IsTrue(found[0].Rules.First().HasIdentity);
-            }
+            Assert.AreEqual(1, found.Length);
+            Assert.AreEqual(content[0].Id, found[0].ProtectedNodeId);
+            Assert.AreEqual(content[1].Id, found[0].LoginNodeId);
+            Assert.AreEqual(content[2].Id, found[0].NoAccessNodeId);
+            Assert.IsTrue(found[0].HasIdentity);
+            Assert.AreNotEqual(default(DateTime), found[0].CreateDate);
+            Assert.AreNotEqual(default(DateTime), found[0].UpdateDate);
+            Assert.AreEqual(1, found[0].Rules.Count());
+            Assert.AreEqual("test", found[0].Rules.First().RuleValue);
+            Assert.AreEqual("RoleName", found[0].Rules.First().RuleType);
+            Assert.AreNotEqual(default(DateTime), found[0].Rules.First().CreateDate);
+            Assert.AreNotEqual(default(DateTime), found[0].Rules.First().UpdateDate);
+            Assert.IsTrue(found[0].Rules.First().HasIdentity);
         }
+    }
 
-        [Test]
-        public void Can_Add2()
+    [Test]
+    public void Can_Add2()
+    {
+        var content = CreateTestData(3).ToArray();
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IContent[] content = CreateTestData(3).ToArray();
+            ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+            var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            PublicAccessRule[] rules =
             {
-                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
+                new PublicAccessRule {RuleValue = "test", RuleType = "RoleName"},
+                new PublicAccessRule {RuleValue = "test2", RuleType = "RoleName2"}
+            };
+            var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
+            repo.Save(entry);
 
-                PublicAccessRule[] rules = new[]
-                    {
-                        new PublicAccessRule
-                        {
-                            RuleValue = "test",
-                            RuleType = "RoleName"
-                        },
-                        new PublicAccessRule
-                        {
-                            RuleValue = "test2",
-                            RuleType = "RoleName2"
-                        },
-                    };
-                var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
-                repo.Save(entry);
+            var found = repo.GetMany().ToArray();
 
-                PublicAccessEntry[] found = repo.GetMany().ToArray();
-
-                Assert.AreEqual(1, found.Length);
-                Assert.AreEqual(content[0].Id, found[0].ProtectedNodeId);
-                Assert.AreEqual(content[1].Id, found[0].LoginNodeId);
-                Assert.AreEqual(content[2].Id, found[0].NoAccessNodeId);
-                Assert.IsTrue(found[0].HasIdentity);
-                Assert.AreNotEqual(default(DateTime), found[0].CreateDate);
-                Assert.AreNotEqual(default(DateTime), found[0].UpdateDate);
-                CollectionAssert.AreEquivalent(found[0].Rules, entry.Rules);
-                Assert.AreNotEqual(default(DateTime), found[0].Rules.First().CreateDate);
-                Assert.AreNotEqual(default(DateTime), found[0].Rules.First().UpdateDate);
-                Assert.IsTrue(found[0].Rules.First().HasIdentity);
-            }
+            Assert.AreEqual(1, found.Length);
+            Assert.AreEqual(content[0].Id, found[0].ProtectedNodeId);
+            Assert.AreEqual(content[1].Id, found[0].LoginNodeId);
+            Assert.AreEqual(content[2].Id, found[0].NoAccessNodeId);
+            Assert.IsTrue(found[0].HasIdentity);
+            Assert.AreNotEqual(default(DateTime), found[0].CreateDate);
+            Assert.AreNotEqual(default(DateTime), found[0].UpdateDate);
+            CollectionAssert.AreEquivalent(found[0].Rules, entry.Rules);
+            Assert.AreNotEqual(default(DateTime), found[0].Rules.First().CreateDate);
+            Assert.AreNotEqual(default(DateTime), found[0].Rules.First().UpdateDate);
+            Assert.IsTrue(found[0].Rules.First().HasIdentity);
         }
+    }
 
-        [Test]
-        public void Can_Update()
+    [Test]
+    public void Can_Update()
+    {
+        var content = CreateTestData(3).ToArray();
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IContent[] content = CreateTestData(3).ToArray();
+            var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
+            PublicAccessRule[] rules = { new PublicAccessRule { RuleValue = "test", RuleType = "RoleName" } };
+            var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
+            repo.Save(entry);
 
-                PublicAccessRule[] rules = new[]
-                    {
-                        new PublicAccessRule
-                        {
-                            RuleValue = "test",
-                            RuleType = "RoleName"
-                        }
-                    };
-                var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
-                repo.Save(entry);
+            // re-get
+            entry = repo.Get(entry.Key);
 
-                // re-get
-                entry = repo.Get(entry.Key);
+            entry.Rules.First().RuleValue = "blah";
+            entry.Rules.First().RuleType = "asdf";
+            repo.Save(entry);
 
-                entry.Rules.First().RuleValue = "blah";
-                entry.Rules.First().RuleType = "asdf";
-                repo.Save(entry);
+            // re-get
+            entry = repo.Get(entry.Key);
 
-                // re-get
-                entry = repo.Get(entry.Key);
-
-                Assert.AreEqual("blah", entry.Rules.First().RuleValue);
-                Assert.AreEqual("asdf", entry.Rules.First().RuleType);
-            }
+            Assert.AreEqual("blah", entry.Rules.First().RuleValue);
+            Assert.AreEqual("asdf", entry.Rules.First().RuleType);
         }
+    }
 
-        [Test]
-        public void Get_By_Id()
+    [Test]
+    public void Get_By_Id()
+    {
+        var content = CreateTestData(3).ToArray();
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IContent[] content = CreateTestData(3).ToArray();
+            var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
+            PublicAccessRule[] rules = { new PublicAccessRule { RuleValue = "test", RuleType = "RoleName" } };
+            var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
+            repo.Save(entry);
 
-                PublicAccessRule[] rules = new[]
-                    {
-                        new PublicAccessRule
-                        {
-                            RuleValue = "test",
-                            RuleType = "RoleName"
-                        }
-                    };
-                var entry = new PublicAccessEntry(content[0], content[1], content[2], rules);
-                repo.Save(entry);
+            // re-get
+            entry = repo.Get(entry.Key);
 
-                // re-get
-                entry = repo.Get(entry.Key);
-
-                Assert.IsNotNull(entry);
-            }
+            Assert.IsNotNull(entry);
         }
+    }
 
-        [Test]
-        public void Get_All()
+    [Test]
+    public void Get_All()
+    {
+        var content = CreateTestData(30).ToArray();
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IContent[] content = CreateTestData(30).ToArray();
+            var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
 
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            var allEntries = new List<PublicAccessEntry>();
+            for (var i = 0; i < 10; i++)
             {
-                var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
-
-                var allEntries = new List<PublicAccessEntry>();
-                for (int i = 0; i < 10; i++)
+                var rules = new List<PublicAccessRule>();
+                for (var j = 0; j < 50; j++)
                 {
-                    var rules = new List<PublicAccessRule>();
-                    for (int j = 0; j < 50; j++)
-                    {
-                        rules.Add(new PublicAccessRule
-                        {
-                            RuleValue = "test" + j,
-                            RuleType = "RoleName" + j
-                        });
-                    }
-
-                    var entry1 = new PublicAccessEntry(content[i], content[i + 1], content[i + 2], rules);
-                    repo.Save(entry1);
-
-                    allEntries.Add(entry1);
+                    rules.Add(new PublicAccessRule { RuleValue = "test" + j, RuleType = "RoleName" + j });
                 }
 
-                // now remove a few rules from a few of the items and then add some more, this will put things 'out of order' which
-                // we need to verify our sort order is working for the relator
-                // FIXME: no "relator" in v8?!
-                for (int i = 0; i < allEntries.Count; i++)
-                {
-                    // all the even ones
-                    if (i % 2 == 0)
-                    {
-                        PublicAccessRule[] rules = allEntries[i].Rules.ToArray();
-                        for (int j = 0; j < rules.Length; j++)
-                        {
-                            // all the even ones
-                            if (j % 2 == 0)
-                            {
-                                allEntries[i].RemoveRule(rules[j]);
-                            }
-                        }
-
-                        allEntries[i].AddRule("newrule" + i, "newrule" + i);
-                        repo.Save(allEntries[i]);
-                    }
-                }
-
-                PublicAccessEntry[] found = repo.GetMany().ToArray();
-                Assert.AreEqual(10, found.Length);
-
-                foreach (PublicAccessEntry publicAccessEntry in found)
-                {
-                    PublicAccessEntry matched = allEntries.First(x => x.Key == publicAccessEntry.Key);
-
-                    Assert.AreEqual(matched.Rules.Count(), publicAccessEntry.Rules.Count());
-                }
-            }
-        }
-
-        [Test]
-        public void Get_All_With_Id()
-        {
-            IContent[] content = CreateTestData(3).ToArray();
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
-
-                PublicAccessRule[] rules1 = new[]
-                {
-                    new PublicAccessRule
-                    {
-                        RuleValue = "test",
-                        RuleType = "RoleName"
-                    },
-                };
-                var entry1 = new PublicAccessEntry(content[0], content[1], content[2], rules1);
+                var entry1 = new PublicAccessEntry(content[i], content[i + 1], content[i + 2], rules);
                 repo.Save(entry1);
 
-                PublicAccessRule[] rules2 = new[]
-                {
-                    new PublicAccessRule
-                    {
-                        RuleValue = "test",
-                        RuleType = "RoleName"
-                    },
-                };
-                var entry2 = new PublicAccessEntry(content[1], content[0], content[2], rules2);
-                repo.Save(entry2);
-
-                PublicAccessEntry[] found = repo.GetMany(entry1.Key).ToArray();
-                Assert.AreEqual(1, found.Count());
+                allEntries.Add(entry1);
             }
-        }
 
-        private IEnumerable<IContent> CreateTestData(int count)
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            // now remove a few rules from a few of the items and then add some more, this will put things 'out of order' which
+            // we need to verify our sort order is working for the relator
+            // FIXME: no "relator" in v8?!
+            for (var i = 0; i < allEntries.Count; i++)
             {
-                ContentType ct = ContentTypeBuilder.CreateBasicContentType("testing");
-                ContentTypeRepository.Save(ct);
-
-                var result = new List<IContent>();
-                for (int i = 0; i < count; i++)
+                // all the even ones
+                if (i % 2 == 0)
                 {
-                    var c = new Content("test" + i, -1, ct);
-                    DocumentRepository.Save(c);
-                    result.Add(c);
+                    var rules = allEntries[i].Rules.ToArray();
+                    for (var j = 0; j < rules.Length; j++)
+                    {
+                        // all the even ones
+                        if (j % 2 == 0)
+                        {
+                            allEntries[i].RemoveRule(rules[j]);
+                        }
+                    }
+
+                    allEntries[i].AddRule("newrule" + i, "newrule" + i);
+                    repo.Save(allEntries[i]);
                 }
+            }
 
-                scope.Complete();
+            var found = repo.GetMany().ToArray();
+            Assert.AreEqual(10, found.Length);
 
-                return result;
+            foreach (var publicAccessEntry in found)
+            {
+                var matched = allEntries.First(x => x.Key == publicAccessEntry.Key);
+
+                Assert.AreEqual(matched.Rules.Count(), publicAccessEntry.Rules.Count());
             }
         }
     }
+
+    [Test]
+    public void Get_All_With_Id()
+    {
+        var content = CreateTestData(3).ToArray();
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repo = new PublicAccessRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<PublicAccessRepository>());
+
+            PublicAccessRule[] rules1 = { new PublicAccessRule { RuleValue = "test", RuleType = "RoleName" } };
+            var entry1 = new PublicAccessEntry(content[0], content[1], content[2], rules1);
+            repo.Save(entry1);
+
+            PublicAccessRule[] rules2 = { new PublicAccessRule { RuleValue = "test", RuleType = "RoleName" } };
+            var entry2 = new PublicAccessEntry(content[1], content[0], content[2], rules2);
+            repo.Save(entry2);
+
+            var found = repo.GetMany(entry1.Key).ToArray();
+            Assert.AreEqual(1, found.Count());
+        }
+    }
+
+    private IEnumerable<IContent> CreateTestData(int count)
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var ct = ContentTypeBuilder.CreateBasicContentType("testing");
+            ContentTypeRepository.Save(ct);
+
+            var result = new List<IContent>();
+            for (var i = 0; i < count; i++)
+            {
+                var c = new Content("test" + i, -1, ct);
+                DocumentRepository.Save(c);
+                result.Add(c);
+            }
+
+            scope.Complete();
+
+            return result;
+        }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs
index aa8823db28..e6e06a684f 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RedirectUrlRepositoryTests.cs
@@ -2,13 +2,11 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -16,302 +14,269 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class RedirectUrlRepositoryTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class RedirectUrlRepositoryTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => CreateTestData();
+
+    [Test]
+    public void CanSaveAndGet()
     {
-        [SetUp]
-        public void SetUp() => CreateTestData();
+        var provider = ScopeProvider;
 
-        [Test]
-        public void CanSaveAndGet()
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
+            var repo = CreateRepository(provider);
+            var rurl = new RedirectUrl { ContentKey = _textpage.Key, Url = "blah" };
+            repo.Save(rurl);
+            scope.Complete();
 
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                var rurl = new RedirectUrl
-                {
-                    ContentKey = _textpage.Key,
-                    Url = "blah"
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-            }
-
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                IRedirectUrl rurl = repo.GetMostRecentUrl("blah");
-                scope.Complete();
-
-                Assert.IsNotNull(rurl);
-                Assert.AreEqual(_textpage.Id, rurl.ContentId);
-            }
+            Assert.AreNotEqual(0, rurl.Id);
         }
 
-        [Test]
-        public void CanSaveAndGetWithCulture()
+        using (var scope = provider.CreateScope())
         {
-            string culture = "en";
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(ScopeProvider);
-                var rurl = new RedirectUrl
-                {
-                    ContentKey = _textpage.Key,
-                    Url = "blah",
-                    Culture = culture
-                };
-                repo.Save(rurl);
-                scope.Complete();
+            var repo = CreateRepository(provider);
+            var rurl = repo.GetMostRecentUrl("blah");
+            scope.Complete();
 
-                Assert.AreNotEqual(0, rurl.Id);
-            }
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(ScopeProvider);
-                IRedirectUrl rurl = repo.GetMostRecentUrl("blah");
-                scope.Complete();
-
-                Assert.IsNotNull(rurl);
-                Assert.AreEqual(_textpage.Id, rurl.ContentId);
-                Assert.AreEqual(culture, rurl.Culture);
-            }
-        }
-
-        [Test]
-        public void CanSaveAndGetMostRecent()
-        {
-            IScopeProvider provider = ScopeProvider;
-
-            Assert.AreNotEqual(_textpage.Id, _otherpage.Id);
-
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                var rurl = new RedirectUrl
-                {
-                    ContentKey = _textpage.Key,
-                    Url = "blah"
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-
-                // FIXME: too fast = same date = key violation?
-                // and... can that happen in real life?
-                // we don't really *care* about the IX, only supposed to make things faster...
-                // BUT in realife we AddOrUpdate in a trx so it should be safe, always
-                rurl = new RedirectUrl
-                {
-                    ContentKey = _otherpage.Key,
-                    Url = "blah",
-                    CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1) // ensure time difference
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-            }
-
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                IRedirectUrl rurl = repo.GetMostRecentUrl("blah");
-                scope.Complete();
-
-                Assert.IsNotNull(rurl);
-                Assert.AreEqual(_otherpage.Id, rurl.ContentId);
-            }
-        }
-
-        [Test]
-        public void CanSaveAndGetMostRecentForCulture()
-        {
-            string cultureA = "en";
-            string cultureB = "de";
-            Assert.AreNotEqual(_textpage.Id, _otherpage.Id);
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(ScopeProvider);
-                var rurl = new RedirectUrl
-                {
-                    ContentKey = _textpage.Key,
-                    Url = "blah",
-                    Culture = cultureA
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-
-                // FIXME: too fast = same date = key violation?
-                // and... can that happen in real life?
-                // we don't really *care* about the IX, only supposed to make things faster...
-                // BUT in realife we AddOrUpdate in a trx so it should be safe, always
-                rurl = new RedirectUrl
-                {
-                    ContentKey = _otherpage.Key,
-                    Url = "blah",
-                    CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1), // ensure time difference
-                    Culture = cultureB
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-            }
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(ScopeProvider);
-                IRedirectUrl rurl = repo.GetMostRecentUrl("blah", cultureA);
-                scope.Complete();
-
-                Assert.IsNotNull(rurl);
-                Assert.AreEqual(_textpage.Id, rurl.ContentId);
-                Assert.AreEqual(cultureA, rurl.Culture);
-            }
-        }
-
-        [Test]
-        public void CanSaveAndGetByContent()
-        {
-            IScopeProvider provider = ScopeProvider;
-
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                var rurl = new RedirectUrl
-                {
-                    ContentKey = _textpage.Key,
-                    Url = "blah"
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-
-                // FIXME: goes too fast and bam, errors, first is blah
-                rurl = new RedirectUrl
-                {
-                    ContentKey = _textpage.Key,
-                    Url = "durg",
-                    CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1) // ensure time difference
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-            }
-
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                IRedirectUrl[] rurls = repo.GetContentUrls(_textpage.Key).ToArray();
-                scope.Complete();
-
-                Assert.AreEqual(2, rurls.Length);
-                Assert.AreEqual("durg", rurls[0].Url);
-                Assert.AreEqual("blah", rurls[1].Url);
-            }
-        }
-
-        [Test]
-        public void CanSaveAndDelete()
-        {
-            IScopeProvider provider = ScopeProvider;
-
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                var rurl = new RedirectUrl
-                {
-                    ContentKey = _textpage.Key,
-                    Url = "blah"
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-
-                rurl = new RedirectUrl
-                {
-                    ContentKey = _otherpage.Key,
-                    Url = "durg"
-                };
-                repo.Save(rurl);
-                scope.Complete();
-
-                Assert.AreNotEqual(0, rurl.Id);
-            }
-
-            using (IScope scope = provider.CreateScope())
-            {
-                IRedirectUrlRepository repo = CreateRepository(provider);
-                repo.DeleteContentUrls(_textpage.Key);
-                scope.Complete();
-
-                IEnumerable<IRedirectUrl> rurls = repo.GetContentUrls(_textpage.Key);
-
-                Assert.AreEqual(0, rurls.Count());
-            }
-        }
-
-        private IRedirectUrlRepository CreateRepository(IScopeProvider provider) =>
-            new RedirectUrlRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<RedirectUrlRepository>());
-
-        private IContent _textpage;
-        private IContent _subpage;
-        private IContent _otherpage;
-        private IContent _trashed;
-
-        public void CreateTestData()
-        {
-            IFileService fileService = GetRequiredService<IFileService>();
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            fileService.SaveTemplate(template); // else, FK violation on contentType!
-
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-
-            // Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            contentType.Key = Guid.NewGuid();
-            contentTypeService.Save(contentType);
-
-            // Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1)
-            _textpage = ContentBuilder.CreateSimpleContent(contentType);
-            _textpage.Key = Guid.NewGuid();
-            contentService.Save(_textpage);
-
-            // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2)
-            _subpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 1", _textpage.Id);
-            _subpage.Key = Guid.NewGuid();
-            contentService.Save(_subpage);
-
-            // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3)
-            _otherpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 2", _textpage.Id);
-            _otherpage.Key = Guid.NewGuid();
-            contentService.Save(_otherpage);
-
-            // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 4)
-            _trashed = ContentBuilder.CreateSimpleContent(contentType, "Text Page Deleted", -20);
-            _trashed.Key = Guid.NewGuid();
-            ((Content)_trashed).Trashed = true;
-            contentService.Save(_trashed);
+            Assert.IsNotNull(rurl);
+            Assert.AreEqual(_textpage.Id, rurl.ContentId);
         }
     }
+
+    [Test]
+    public void CanSaveAndGetWithCulture()
+    {
+        var culture = "en";
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = CreateRepository(ScopeProvider);
+            var rurl = new RedirectUrl { ContentKey = _textpage.Key, Url = "blah", Culture = culture };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+        }
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = CreateRepository(ScopeProvider);
+            var rurl = repo.GetMostRecentUrl("blah");
+            scope.Complete();
+
+            Assert.IsNotNull(rurl);
+            Assert.AreEqual(_textpage.Id, rurl.ContentId);
+            Assert.AreEqual(culture, rurl.Culture);
+        }
+    }
+
+    [Test]
+    public void CanSaveAndGetMostRecent()
+    {
+        var provider = ScopeProvider;
+
+        Assert.AreNotEqual(_textpage.Id, _otherpage.Id);
+
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+            var rurl = new RedirectUrl { ContentKey = _textpage.Key, Url = "blah" };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+
+            // FIXME: too fast = same date = key violation?
+            // and... can that happen in real life?
+            // we don't really *care* about the IX, only supposed to make things faster...
+            // BUT in realife we AddOrUpdate in a trx so it should be safe, always
+            rurl = new RedirectUrl
+            {
+                ContentKey = _otherpage.Key,
+                Url = "blah",
+                CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1) // ensure time difference
+            };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+        }
+
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+            var rurl = repo.GetMostRecentUrl("blah");
+            scope.Complete();
+
+            Assert.IsNotNull(rurl);
+            Assert.AreEqual(_otherpage.Id, rurl.ContentId);
+        }
+    }
+
+    [Test]
+    public void CanSaveAndGetMostRecentForCulture()
+    {
+        var cultureA = "en";
+        var cultureB = "de";
+        Assert.AreNotEqual(_textpage.Id, _otherpage.Id);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = CreateRepository(ScopeProvider);
+            var rurl = new RedirectUrl { ContentKey = _textpage.Key, Url = "blah", Culture = cultureA };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+
+            // FIXME: too fast = same date = key violation?
+            // and... can that happen in real life?
+            // we don't really *care* about the IX, only supposed to make things faster...
+            // BUT in realife we AddOrUpdate in a trx so it should be safe, always
+            rurl = new RedirectUrl
+            {
+                ContentKey = _otherpage.Key,
+                Url = "blah",
+                CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1), // ensure time difference
+                Culture = cultureB
+            };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+        }
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repo = CreateRepository(ScopeProvider);
+            var rurl = repo.GetMostRecentUrl("blah", cultureA);
+            scope.Complete();
+
+            Assert.IsNotNull(rurl);
+            Assert.AreEqual(_textpage.Id, rurl.ContentId);
+            Assert.AreEqual(cultureA, rurl.Culture);
+        }
+    }
+
+    [Test]
+    public void CanSaveAndGetByContent()
+    {
+        var provider = ScopeProvider;
+
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+            var rurl = new RedirectUrl { ContentKey = _textpage.Key, Url = "blah" };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+
+            // FIXME: goes too fast and bam, errors, first is blah
+            rurl = new RedirectUrl
+            {
+                ContentKey = _textpage.Key,
+                Url = "durg",
+                CreateDateUtc = rurl.CreateDateUtc.AddSeconds(1) // ensure time difference
+            };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+        }
+
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+            var rurls = repo.GetContentUrls(_textpage.Key).ToArray();
+            scope.Complete();
+
+            Assert.AreEqual(2, rurls.Length);
+            Assert.AreEqual("durg", rurls[0].Url);
+            Assert.AreEqual("blah", rurls[1].Url);
+        }
+    }
+
+    [Test]
+    public void CanSaveAndDelete()
+    {
+        var provider = ScopeProvider;
+
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+            var rurl = new RedirectUrl { ContentKey = _textpage.Key, Url = "blah" };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+
+            rurl = new RedirectUrl { ContentKey = _otherpage.Key, Url = "durg" };
+            repo.Save(rurl);
+            scope.Complete();
+
+            Assert.AreNotEqual(0, rurl.Id);
+        }
+
+        using (var scope = provider.CreateScope())
+        {
+            var repo = CreateRepository(provider);
+            repo.DeleteContentUrls(_textpage.Key);
+            scope.Complete();
+
+            var rurls = repo.GetContentUrls(_textpage.Key);
+
+            Assert.AreEqual(0, rurls.Count());
+        }
+    }
+
+    private IRedirectUrlRepository CreateRepository(IScopeProvider provider) =>
+        new RedirectUrlRepository((IScopeAccessor)provider, AppCaches, LoggerFactory.CreateLogger<RedirectUrlRepository>());
+
+    private IContent _textpage;
+    private IContent _subpage;
+    private IContent _otherpage;
+    private IContent _trashed;
+
+    public void CreateTestData()
+    {
+        var fileService = GetRequiredService<IFileService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        fileService.SaveTemplate(template); // else, FK violation on contentType!
+
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+
+        // Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        contentType.Key = Guid.NewGuid();
+        contentTypeService.Save(contentType);
+
+        // Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1)
+        _textpage = ContentBuilder.CreateSimpleContent(contentType);
+        _textpage.Key = Guid.NewGuid();
+        contentService.Save(_textpage);
+
+        // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2)
+        _subpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 1", _textpage.Id);
+        _subpage.Key = Guid.NewGuid();
+        contentService.Save(_subpage);
+
+        // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3)
+        _otherpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 2", _textpage.Id);
+        _otherpage.Key = Guid.NewGuid();
+        contentService.Save(_otherpage);
+
+        // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 4)
+        _trashed = ContentBuilder.CreateSimpleContent(contentType, "Text Page Deleted", -20);
+        _trashed.Key = Guid.NewGuid();
+        ((Content)_trashed).Trashed = true;
+        contentService.Save(_trashed);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs
index 72766a97f5..3b9768088f 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationRepositoryTest.cs
@@ -7,583 +7,592 @@ using System.Linq;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class RelationRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class RelationRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => CreateTestData();
+
+    private RelationType _relateContent;
+    private RelationType _relateContentType;
+    private ContentType _contentType;
+    private Content _textpage;
+    private Content _subpage;
+    private Content _subpage2;
+    private Relation _relation;
+    private Relation _relation2;
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IMemberTypeService MemberTypeService => GetRequiredService<IMemberTypeService>();
+
+    private IMemberService GetMemberService() => GetRequiredService<IMemberService>();
+
+    private IRelationService RelationService => GetRequiredService<IRelationService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private RelationRepository CreateRepository(IScopeProvider provider, out RelationTypeRepository relationTypeRepository)
     {
-        private RelationType _relateContent;
-        private RelationType _relateContentType;
-        private ContentType _contentType;
-        private Content _textpage;
-        private Content _subpage;
-        private Content _subpage2;
-        private Relation _relation;
-        private Relation _relation2;
+        relationTypeRepository = (RelationTypeRepository)GetRequiredService<IRelationTypeRepository>();
+        return (RelationRepository)GetRequiredService<IRelationRepository>();
+    }
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-
-        private IContentService ContentService => GetRequiredService<IContentService>();
-
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
-
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
-
-        private IMemberTypeService MemberTypeService => GetRequiredService<IMemberTypeService>();
-
-        private IMemberService GetMemberService() => GetRequiredService<IMemberService>();
-
-        private IRelationService RelationService => GetRequiredService<IRelationService>();
-
-        private IFileService FileService => GetRequiredService<IFileService>();
-
-        [SetUp]
-        public void SetUp() => CreateTestData();
-
-        private RelationRepository CreateRepository(IScopeProvider provider, out RelationTypeRepository relationTypeRepository)
+    [Test]
+    public void Can_Perform_Add_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
         {
-            relationTypeRepository = (RelationTypeRepository)GetRequiredService<IRelationTypeRepository>();
-            return (RelationRepository)GetRequiredService<IRelationRepository>();
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var relationType = repositoryType.Get(1);
+            var relation = new Relation(_textpage.Id, _subpage.Id, relationType);
+            repository.Save(relation);
+
+            // Assert
+            Assert.That(relation, Is.Not.Null);
+            Assert.That(relation.HasIdentity, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var relation = repository.Get(1);
+            relation.Comment = "This relation has been updated";
+            repository.Save(relation);
+
+            var relationUpdated = repository.Get(1);
+
+            // Assert
+            Assert.That(relationUpdated, Is.Not.Null);
+            Assert.That(relationUpdated.Comment, Is.EqualTo("This relation has been updated"));
+            Assert.AreNotEqual(relationUpdated.UpdateDate, relation.UpdateDate);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var relation = repository.Get(2);
+            repository.Delete(relation);
+
+            var exists = repository.Exists(2);
+
+            // Assert
+            Assert.That(exists, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var relation = repository.Get(1);
+
+            // Assert
+            Assert.That(relation, Is.Not.Null);
+            Assert.That(relation.HasIdentity, Is.True);
+            Assert.That(relation.ChildId, Is.EqualTo(_subpage.Id));
+            Assert.That(relation.ParentId, Is.EqualTo(_textpage.Id));
+            Assert.That(relation.RelationType.Alias, Is.EqualTo("relateContentOnCopy"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var relations = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(relations, Is.Not.Null);
+            Assert.That(relations.Any(), Is.True);
+            Assert.That(relations.Any(x => x == null), Is.False);
+            Assert.That(relations.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_With_Params_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var relations = repository.GetMany(1, 2).ToArray();
+
+            // Assert
+            Assert.That(relations, Is.Not.Null);
+            Assert.That(relations.Any(), Is.True);
+            Assert.That(relations.Any(x => x == null), Is.False);
+            Assert.That(relations.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Get_Paged_Parent_Entities_By_Child_Id()
+    {
+        CreateTestDataForPagingTests(out var createdContent, out var createdMembers, out var createdMedia);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var relationTypeRepository);
+
+            // Get parent entities for child id
+            var parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 11, out var totalRecords)
+                .ToList();
+            Assert.AreEqual(9, totalRecords);
+            Assert.AreEqual(9, parents.Count);
+
+            // Add the next page
+            parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 1, 11, out totalRecords));
+            Assert.AreEqual(9, totalRecords);
+            Assert.AreEqual(9, parents.Count);
+
+            var contentEntities = parents.OfType<IDocumentEntitySlim>().ToList();
+            var mediaEntities = parents.OfType<IMediaEntitySlim>().ToList();
+            var memberEntities = parents.OfType<IMemberEntitySlim>().ToList();
+
+            Assert.AreEqual(3, contentEntities.Count);
+            Assert.AreEqual(3, mediaEntities.Count);
+            Assert.AreEqual(3, memberEntities.Count);
+
+            // Only of a certain type
+            parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Document.GetGuid()));
+            Assert.AreEqual(3, totalRecords);
+
+            parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Member.GetGuid()));
+            Assert.AreEqual(3, totalRecords);
+
+            parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Media.GetGuid()));
+            Assert.AreEqual(3, totalRecords);
+
+            // Test relations on content
+            var contentParents = repository
+                .GetPagedParentEntitiesByChildId(createdContent[0].Id, 0, int.MaxValue, out totalRecords).ToList();
+            Assert.AreEqual(6, totalRecords);
+            Assert.AreEqual(6, contentParents.Count);
+
+            // Test getting relations of specified relation types
+            var relatedMediaRelType =
+                RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
+            var relatedContentRelType =
+                RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
+
+            parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 11, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
+            Assert.AreEqual(6, totalRecords);
+            Assert.AreEqual(6, parents.Count);
+
+            parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 1, 11, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
+            Assert.AreEqual(6, totalRecords);
+            Assert.AreEqual(0, parents.Count);
+
+            parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 0, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
+            Assert.AreEqual(3, totalRecords);
+            Assert.AreEqual(3, parents.Count);
+
+            parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 1, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
+            Assert.AreEqual(3, totalRecords);
+            Assert.AreEqual(0, parents.Count);
+        }
+    }
+
+    [Test]
+    public void Get_Paged_Parent_Child_Entities_With_Same_Entity_Relation()
+    {
+        // Create a media item and create a relationship between itself (parent -> child)
+        var imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
+        MediaTypeService.Save(imageType);
+        var media = MediaBuilder.CreateMediaImage(imageType, -1);
+        MediaService.Save(media);
+        var relType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
+        RelationService.Relate(media.Id, media.Id, relType);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var relationTypeRepository);
+
+            // Get parent entities for child id
+            var parents = repository.GetPagedParentEntitiesByChildId(media.Id, 0, 10, out var totalRecords).ToList();
+            Assert.AreEqual(1, totalRecords);
+            Assert.AreEqual(1, parents.Count);
+
+            // Get child entities for parent id
+            var children = repository.GetPagedChildEntitiesByParentId(media.Id, 0, 10, out totalRecords).ToList();
+            Assert.AreEqual(1, totalRecords);
+            Assert.AreEqual(1, children.Count);
+        }
+    }
+
+    [Test]
+    public void Get_Paged_Child_Entities_By_Parent_Id()
+    {
+        CreateTestDataForPagingTests(out var createdContent, out var createdMembers, out _);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out _);
+
+            // Get parent entities for child id
+            var parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 6, out var totalRecords)
+                .ToList();
+            Assert.AreEqual(6, totalRecords);
+            Assert.AreEqual(6, parents.Count);
+
+            // Add the next page
+            parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 6, out totalRecords));
+            Assert.AreEqual(6, totalRecords);
+            Assert.AreEqual(6, parents.Count);
+
+            var contentEntities = parents.OfType<IDocumentEntitySlim>().ToList();
+            var mediaEntities = parents.OfType<IMediaEntitySlim>().ToList();
+            var memberEntities = parents.OfType<IMemberEntitySlim>().ToList();
+
+            Assert.AreEqual(3, contentEntities.Count);
+            Assert.AreEqual(3, mediaEntities.Count);
+            Assert.AreEqual(0, memberEntities.Count);
+
+            // only of a certain type
+            parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Media.GetGuid()));
+            Assert.AreEqual(3, totalRecords);
+
+            parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdMembers[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Media.GetGuid()));
+            Assert.AreEqual(3, totalRecords);
+
+            parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Member.GetGuid()));
+            Assert.AreEqual(0, totalRecords);
+
+            // Test getting relations of specified relation types
+            var relatedMediaRelType =
+                RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
+            var relatedContentRelType =
+                RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
+
+            parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
+            Assert.AreEqual(3, totalRecords);
+            Assert.AreEqual(3, parents.Count);
+
+            parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 6, out totalRecords, new[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
+            Assert.AreEqual(3, totalRecords);
+            Assert.AreEqual(0, parents.Count);
+        }
+    }
+
+    private void CreateTestDataForPagingTests(out List<IContent> createdContent, out List<IMember> createdMembers, out List<IMedia> createdMedia)
+    {
+        // Create content
+        createdContent = new List<IContent>();
+        var contentType = ContentTypeBuilder.CreateBasicContentType("blah");
+        ContentTypeService.Save(contentType);
+        for (var i = 0; i < 3; i++)
+        {
+            var c1 = ContentBuilder.CreateBasicContent(contentType);
+            ContentService.Save(c1);
+            createdContent.Add(c1);
         }
 
-        [Test]
-        public void Can_Perform_Add_On_RelationRepository()
+        // Create related content
+        var relatedContent = new List<IContent>();
+        for (var i = 0; i < 3; i++)
         {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
+            var c1 = ContentBuilder.CreateBasicContent(contentType);
+            ContentService.Save(c1);
+            relatedContent.Add(c1);
+        }
+
+        // Create media
+        createdMedia = new List<IMedia>();
+        var imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
+        MediaTypeService.Save(imageType);
+        for (var i = 0; i < 3; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(imageType, -1);
+            MediaService.Save(c1);
+            createdMedia.Add(c1);
+        }
+
+        // Create members
+        var memberType = MemberTypeBuilder.CreateSimpleMemberType("simple");
+        MemberTypeService.Save(memberType);
+        createdMembers = MemberBuilder.CreateSimpleMembers(memberType, 3).ToList();
+        GetMemberService().Save(createdMembers);
+
+        var relatedMediaRelType =
+            RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
+        var relatedContentRelType =
+            RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
+
+        // Relate content to media
+        foreach (var content in createdContent)
+        {
+            foreach (var media in createdMedia)
             {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IRelationType relationType = repositoryType.Get(1);
-                var relation = new Relation(_textpage.Id, _subpage.Id, relationType);
-                repository.Save(relation);
-
-                // Assert
-                Assert.That(relation, Is.Not.Null);
-                Assert.That(relation.HasIdentity, Is.True);
+                RelationService.Relate(content.Id, media.Id, relatedMediaRelType);
             }
         }
 
-        [Test]
-        public void Can_Perform_Update_On_RelationRepository()
+        // Relate content to content
+        foreach (var relContent in relatedContent)
         {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
+            foreach (var content in createdContent)
             {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IRelation relation = repository.Get(1);
-                relation.Comment = "This relation has been updated";
-                repository.Save(relation);
-
-                IRelation relationUpdated = repository.Get(1);
-
-                // Assert
-                Assert.That(relationUpdated, Is.Not.Null);
-                Assert.That(relationUpdated.Comment, Is.EqualTo("This relation has been updated"));
-                Assert.AreNotEqual(relationUpdated.UpdateDate, relation.UpdateDate);
+                RelationService.Relate(relContent.Id, content.Id, relatedContentRelType);
             }
         }
 
-        [Test]
-        public void Can_Perform_Delete_On_RelationRepository()
+        // Relate members to media
+        foreach (var member in createdMembers)
         {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
+            foreach (var media in createdMedia)
             {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IRelation relation = repository.Get(2);
-                repository.Delete(relation);
-
-                bool exists = repository.Exists(2);
-
-                // Assert
-                Assert.That(exists, Is.False);
+                RelationService.Relate(member.Id, media.Id, relatedMediaRelType);
             }
         }
 
-        [Test]
-        public void Can_Perform_Get_On_RelationRepository()
+        // Create copied content
+        var copiedContent = new List<IContent>();
+        for (var i = 0; i < 3; i++)
         {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
+            var c1 = ContentBuilder.CreateBasicContent(contentType);
+            ContentService.Save(c1);
+            copiedContent.Add(c1);
+        }
+
+        var copiedContentRelType =
+            RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias);
+
+        // Relate content to content (mimics copy)
+        foreach (var content in createdContent)
+        {
+            foreach (var cpContent in copiedContent)
             {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IRelation relation = repository.Get(1);
-
-                // Assert
-                Assert.That(relation, Is.Not.Null);
-                Assert.That(relation.HasIdentity, Is.True);
-                Assert.That(relation.ChildId, Is.EqualTo(_subpage.Id));
-                Assert.That(relation.ParentId, Is.EqualTo(_textpage.Id));
-                Assert.That(relation.RelationType.Alias, Is.EqualTo("relateContentOnCopy"));
+                RelationService.Relate(content.Id, cpContent.Id, copiedContentRelType);
             }
         }
 
-        [Test]
-        public void Can_Perform_GetAll_On_RelationRepository()
+        // Create trashed content
+        var trashedContent = new List<IContent>();
+        for (var i = 0; i < 3; i++)
         {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
+            var c1 = ContentBuilder.CreateBasicContent(contentType);
+            ContentService.Save(c1);
+            trashedContent.Add(c1);
+        }
+
+        var trashedRelType =
+            RelationService.GetRelationTypeByAlias(
+                Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias);
+
+        // Relate to trashed content
+        foreach (var trContent in trashedContent)
+        {
+            foreach (var content in createdContent)
             {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IEnumerable<IRelation> relations = repository.GetMany();
-
-                // Assert
-                Assert.That(relations, Is.Not.Null);
-                Assert.That(relations.Any(), Is.True);
-                Assert.That(relations.Any(x => x == null), Is.False);
-                Assert.That(relations.Count(), Is.EqualTo(2));
+                RelationService.Relate(trContent.Id, content.Id, trashedRelType);
             }
         }
 
-        [Test]
-        public void Can_Perform_GetAll_With_Params_On_RelationRepository()
+        // Create trashed media
+        var trashedMedia = new List<IMedia>();
+        for (var i = 0; i < 3; i++)
         {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IEnumerable<IRelation> relations = repository.GetMany(1, 2);
-
-                // Assert
-                Assert.That(relations, Is.Not.Null);
-                Assert.That(relations.Any(), Is.True);
-                Assert.That(relations.Any(x => x == null), Is.False);
-                Assert.That(relations.Count(), Is.EqualTo(2));
-            }
+            var m1 = MediaBuilder.CreateMediaImage(imageType, -1);
+            MediaService.Save(m1);
+            trashedMedia.Add(m1);
         }
 
-        [Test]
-        public void Get_Paged_Parent_Entities_By_Child_Id()
+        var trashedMediaRelType =
+            RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes
+                .RelateParentMediaFolderOnDeleteAlias);
+
+        // Relate to trashed media
+        foreach (var trMedia in trashedMedia)
         {
-            CreateTestDataForPagingTests(out List<IContent> createdContent, out List<IMember> createdMembers, out List<IMedia> createdMedia);
-
-            using (IScope scope = ScopeProvider.CreateScope())
+            foreach (var media in createdMedia)
             {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository relationTypeRepository);
-
-                // Get parent entities for child id
-                var parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 11, out long totalRecords).ToList();
-                Assert.AreEqual(9, totalRecords);
-                Assert.AreEqual(9, parents.Count);
-
-                // Add the next page
-                parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 1, 11, out totalRecords));
-                Assert.AreEqual(9, totalRecords);
-                Assert.AreEqual(9, parents.Count);
-
-                var contentEntities = parents.OfType<IDocumentEntitySlim>().ToList();
-                var mediaEntities = parents.OfType<IMediaEntitySlim>().ToList();
-                var memberEntities = parents.OfType<IMemberEntitySlim>().ToList();
-
-                Assert.AreEqual(3, contentEntities.Count);
-                Assert.AreEqual(3, mediaEntities.Count);
-                Assert.AreEqual(3, memberEntities.Count);
-
-                // Only of a certain type
-                parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Document.GetGuid()));
-                Assert.AreEqual(3, totalRecords);
-
-                parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Member.GetGuid()));
-                Assert.AreEqual(3, totalRecords);
-
-                parents.AddRange(repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Media.GetGuid()));
-                Assert.AreEqual(3, totalRecords);
-
-                // Test relations on content
-                var contentParents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 0, int.MaxValue, out totalRecords).ToList();
-                Assert.AreEqual(6, totalRecords);
-                Assert.AreEqual(6, contentParents.Count);
-
-                // Test getting relations of specified relation types
-                var relatedMediaRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
-                var relatedContentRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
-
-                parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 0, 11, out totalRecords, new int[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
-                Assert.AreEqual(6, totalRecords);
-                Assert.AreEqual(6, parents.Count);
-
-                parents = repository.GetPagedParentEntitiesByChildId(createdMedia[0].Id, 1, 11, out totalRecords, new int[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
-                Assert.AreEqual(6, totalRecords);
-                Assert.AreEqual(0, parents.Count);
-
-                parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 0, 6, out totalRecords, new int[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
-                Assert.AreEqual(3, totalRecords);
-                Assert.AreEqual(3, parents.Count);
-
-                parents = repository.GetPagedParentEntitiesByChildId(createdContent[0].Id, 1, 6, out totalRecords, new int[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
-                Assert.AreEqual(3, totalRecords);
-                Assert.AreEqual(0, parents.Count);
-            }
-        }
-
-        [Test]
-        public void Get_Paged_Parent_Child_Entities_With_Same_Entity_Relation()
-        {
-            // Create a media item and create a relationship between itself (parent -> child)
-            MediaType imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
-            MediaTypeService.Save(imageType);
-            Media media = MediaBuilder.CreateMediaImage(imageType, -1);
-            MediaService.Save(media);
-            IRelationType relType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
-            RelationService.Relate(media.Id, media.Id, relType);
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository relationTypeRepository);
-
-                // Get parent entities for child id
-                var parents = repository.GetPagedParentEntitiesByChildId(media.Id, 0, 10, out long totalRecords).ToList();
-                Assert.AreEqual(1, totalRecords);
-                Assert.AreEqual(1, parents.Count);
-
-                // Get child entities for parent id
-                var children = repository.GetPagedChildEntitiesByParentId(media.Id, 0, 10, out totalRecords).ToList();
-                Assert.AreEqual(1, totalRecords);
-                Assert.AreEqual(1, children.Count);
-            }
-        }
-
-        [Test]
-        public void Get_Paged_Child_Entities_By_Parent_Id()
-        {
-            CreateTestDataForPagingTests(out List<IContent> createdContent, out List<IMember> createdMembers, out _);
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                RelationRepository repository = CreateRepository(ScopeProvider, out _);
-
-                // Get parent entities for child id
-                var parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 6, out long totalRecords).ToList();
-                Assert.AreEqual(6, totalRecords);
-                Assert.AreEqual(6, parents.Count);
-
-                // Add the next page
-                parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 6, out totalRecords));
-                Assert.AreEqual(6, totalRecords);
-                Assert.AreEqual(6, parents.Count);
-
-                var contentEntities = parents.OfType<IDocumentEntitySlim>().ToList();
-                var mediaEntities = parents.OfType<IMediaEntitySlim>().ToList();
-                var memberEntities = parents.OfType<IMemberEntitySlim>().ToList();
-
-                Assert.AreEqual(3, contentEntities.Count);
-                Assert.AreEqual(3, mediaEntities.Count);
-                Assert.AreEqual(0, memberEntities.Count);
-
-                // only of a certain type
-                parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Media.GetGuid()));
-                Assert.AreEqual(3, totalRecords);
-
-                parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdMembers[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Media.GetGuid()));
-                Assert.AreEqual(3, totalRecords);
-
-                parents.AddRange(repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 100, out totalRecords, UmbracoObjectTypes.Member.GetGuid()));
-                Assert.AreEqual(0, totalRecords);
-
-                // Test getting relations of specified relation types
-                IRelationType relatedMediaRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
-                IRelationType relatedContentRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
-
-                parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 0, 6, out totalRecords, new int[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
-                Assert.AreEqual(3, totalRecords);
-                Assert.AreEqual(3, parents.Count);
-
-                parents = repository.GetPagedChildEntitiesByParentId(createdContent[0].Id, 1, 6, out totalRecords, new int[] { relatedContentRelType.Id, relatedMediaRelType.Id }).ToList();
-                Assert.AreEqual(3, totalRecords);
-                Assert.AreEqual(0, parents.Count);
-            }
-        }
-
-        private void CreateTestDataForPagingTests(out List<IContent> createdContent, out List<IMember> createdMembers, out List<IMedia> createdMedia)
-        {
-            // Create content
-            createdContent = new List<IContent>();
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType("blah");
-            ContentTypeService.Save(contentType);
-            for (int i = 0; i < 3; i++)
-            {
-                Content c1 = ContentBuilder.CreateBasicContent(contentType);
-                ContentService.Save(c1);
-                createdContent.Add(c1);
-            }
-
-            // Create related content
-            var relatedContent = new List<IContent>();
-            for (int i = 0; i < 3; i++)
-            {
-                Content c1 = ContentBuilder.CreateBasicContent(contentType);
-                ContentService.Save(c1);
-                relatedContent.Add(c1);
-            }
-
-            // Create media
-            createdMedia = new List<IMedia>();
-            MediaType imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
-            MediaTypeService.Save(imageType);
-            for (int i = 0; i < 3; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageType, -1);
-                MediaService.Save(c1);
-                createdMedia.Add(c1);
-            }
-
-            // Create members
-            MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType("simple");
-            MemberTypeService.Save(memberType);
-            createdMembers = MemberBuilder.CreateSimpleMembers(memberType, 3).ToList();
-            GetMemberService().Save(createdMembers);
-
-            IRelationType relatedMediaRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
-            IRelationType relatedContentRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedDocumentAlias);
-
-            // Relate content to media
-            foreach (IContent content in createdContent)
-            {
-                foreach (IMedia media in createdMedia)
-                {
-                    RelationService.Relate(content.Id, media.Id, relatedMediaRelType);
-                }
-            }
-
-            // Relate content to content
-            foreach (IContent relContent in relatedContent)
-            {
-                foreach (IContent content in createdContent)
-                {
-                    RelationService.Relate(relContent.Id, content.Id, relatedContentRelType);
-                }
-            }
-
-            // Relate members to media
-            foreach (IMember member in createdMembers)
-            {
-                foreach (IMedia media in createdMedia)
-                {
-                    RelationService.Relate(member.Id, media.Id, relatedMediaRelType);
-                }
-            }
-
-            // Create copied content
-            var copiedContent = new List<IContent>();
-            for (int i = 0; i < 3; i++)
-            {
-                Content c1 = ContentBuilder.CreateBasicContent(contentType);
-                ContentService.Save(c1);
-                copiedContent.Add(c1);
-            }
-
-            IRelationType copiedContentRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelateDocumentOnCopyAlias);
-
-            // Relate content to content (mimics copy)
-            foreach (IContent content in createdContent)
-            {
-                foreach (IContent cpContent in copiedContent)
-                {
-                    RelationService.Relate(content.Id, cpContent.Id, copiedContentRelType);
-                }
-            }
-
-            // Create trashed content
-            var trashedContent = new List<IContent>();
-            for (int i = 0; i < 3; i++)
-            {
-                Content c1 = ContentBuilder.CreateBasicContent(contentType);
-                ContentService.Save(c1);
-                trashedContent.Add(c1);
-            }
-
-            IRelationType trashedRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelateParentDocumentOnDeleteAlias);
-
-            // Relate to trashed content
-            foreach (IContent trContent in trashedContent)
-            {
-                foreach (IContent content in createdContent)
-                {
-                    RelationService.Relate(trContent.Id, content.Id, trashedRelType);
-                }
-            }
-
-            // Create trashed media
-            var trashedMedia = new List<IMedia>();
-            for (int i = 0; i < 3; i++)
-            {
-                Media m1 = MediaBuilder.CreateMediaImage(imageType, -1);
-                MediaService.Save(m1);
-                trashedMedia.Add(m1);
-            }
-
-            IRelationType trashedMediaRelType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias);
-
-            // Relate to trashed media
-            foreach (IMedia trMedia in trashedMedia)
-            {
-                foreach (IMedia media in createdMedia)
-                {
-                    RelationService.Relate(trMedia.Id, media.Id, trashedMediaRelType);
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_RelationRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                bool exists = repository.Exists(2);
-                bool doesntExist = repository.Exists(5);
-
-                // Assert
-                Assert.That(exists, Is.True);
-                Assert.That(doesntExist, Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Count_On_RelationRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IQuery<IRelation> query = ScopeProvider.CreateQuery<IRelation>().Where(x => x.ParentId == _textpage.Id);
-                int count = repository.Count(query);
-
-                // Assert
-                Assert.That(count, Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetByQuery_On_RelationRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                // Act
-                IQuery<IRelation> query = ScopeProvider.CreateQuery<IRelation>().Where(x => x.RelationTypeId == _relateContent.Id);
-                IEnumerable<IRelation> relations = repository.Get(query);
-
-                // Assert
-                Assert.That(relations, Is.Not.Null);
-                Assert.That(relations.Any(), Is.True);
-                Assert.That(relations.Any(x => x == null), Is.False);
-                Assert.That(relations.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Delete_Content_And_Verify_Relation_Is_Removed()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                RelationRepository repository = CreateRepository(ScopeProvider, out RelationTypeRepository repositoryType);
-
-                IContent content = ContentService.GetById(_subpage.Id);
-                ContentService.Delete(content, 0);
-
-                // Act
-                bool shouldntExist = repository.Exists(1);
-                bool shouldExist = repository.Exists(2);
-
-                // Assert
-                Assert.That(shouldntExist, Is.False);
-                Assert.That(shouldExist, Is.True);
-            }
-        }
-
-        public void CreateTestData()
-        {
-            _relateContent = new RelationType(
-                "Relate Content on Copy",
-                "relateContentOnCopy",
-                true,
-                Constants.ObjectTypes.Document,
-                new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"),
-                false);
-
-            _relateContentType = new RelationType(
-                "Relate ContentType on Copy",
-                "relateContentTypeOnCopy",
-                true,
-                Constants.ObjectTypes.DocumentType,
-                new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"),
-                false);
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var accessor = (IScopeAccessor)ScopeProvider;
-                var relationTypeRepository = new RelationTypeRepository(accessor, AppCaches.Disabled, Mock.Of<ILogger<RelationTypeRepository>>());
-                var entityRepository = new EntityRepository(accessor, AppCaches.Disabled);
-                var relationRepository = new RelationRepository(accessor, Mock.Of<ILogger<RelationRepository>>(), relationTypeRepository, entityRepository);
-
-                relationTypeRepository.Save(_relateContent);
-                relationTypeRepository.Save(_relateContentType);
-
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                // Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
-                _contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-
-                ContentTypeService.Save(_contentType);
-
-                // Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1)
-                _textpage = ContentBuilder.CreateSimpleContent(_contentType);
-                ContentService.Save(_textpage, 0);
-
-                // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2)
-                _subpage = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 1", _textpage.Id);
-                ContentService.Save(_subpage, 0);
-
-                // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3)
-                _subpage2 = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 2", _textpage.Id);
-                ContentService.Save(_subpage2, 0);
-
-                _relation = new Relation(_textpage.Id, _subpage.Id, _relateContent) { Comment = string.Empty };
-                _relation2 = new Relation(_textpage.Id, _subpage2.Id, _relateContent) { Comment = string.Empty };
-                relationRepository.Save(_relation);
-                relationRepository.Save(_relation2);
-                scope.Complete();
+                RelationService.Relate(trMedia.Id, media.Id, trashedMediaRelType);
             }
         }
     }
+
+    [Test]
+    public void Can_Perform_Exists_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var exists = repository.Exists(2);
+            var doesntExist = repository.Exists(5);
+
+            // Assert
+            Assert.That(exists, Is.True);
+            Assert.That(doesntExist, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Count_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var query = ScopeProvider.CreateQuery<IRelation>().Where(x => x.ParentId == _textpage.Id);
+            var count = repository.Count(query);
+
+            // Assert
+            Assert.That(count, Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetByQuery_On_RelationRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            // Act
+            var query = ScopeProvider.CreateQuery<IRelation>().Where(x => x.RelationTypeId == _relateContent.Id);
+            var relations = repository.Get(query).ToArray();
+
+            // Assert
+            Assert.That(relations, Is.Not.Null);
+            Assert.That(relations.Any(), Is.True);
+            Assert.That(relations.Any(x => x == null), Is.False);
+            Assert.That(relations.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Delete_Content_And_Verify_Relation_Is_Removed()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(ScopeProvider, out var repositoryType);
+
+            var content = ContentService.GetById(_subpage.Id);
+            ContentService.Delete(content, 0);
+
+            // Act
+            var shouldntExist = repository.Exists(1);
+            var shouldExist = repository.Exists(2);
+
+            // Assert
+            Assert.That(shouldntExist, Is.False);
+            Assert.That(shouldExist, Is.True);
+        }
+    }
+
+    public void CreateTestData()
+    {
+        _relateContent = new RelationType(
+            "Relate Content on Copy",
+            "relateContentOnCopy",
+            true,
+            Constants.ObjectTypes.Document,
+            new Guid("C66BA18E-EAF3-4CFF-8A22-41B16D66A972"),
+            false);
+
+        _relateContentType = new RelationType(
+            "Relate ContentType on Copy",
+            "relateContentTypeOnCopy",
+            true,
+            Constants.ObjectTypes.DocumentType,
+            new Guid("A2CB7800-F571-4787-9638-BC48539A0EFB"),
+            false);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var accessor = (IScopeAccessor)ScopeProvider;
+            var relationTypeRepository = new RelationTypeRepository(accessor, AppCaches.Disabled, Mock.Of<ILogger<RelationTypeRepository>>());
+            var entityRepository = new EntityRepository(accessor, AppCaches.Disabled);
+            var relationRepository = new RelationRepository(accessor, Mock.Of<ILogger<RelationRepository>>(), relationTypeRepository, entityRepository);
+
+            relationTypeRepository.Save(_relateContent);
+            relationTypeRepository.Save(_relateContentType);
+
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            // Create and Save ContentType "umbTextpage" -> (NodeDto.NodeIdSeed)
+            _contentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+
+            ContentTypeService.Save(_contentType);
+
+            // Create and Save Content "Homepage" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 1)
+            _textpage = ContentBuilder.CreateSimpleContent(_contentType);
+            ContentService.Save(_textpage, 0);
+
+            // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 2)
+            _subpage = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 1", _textpage.Id);
+            ContentService.Save(_subpage, 0);
+
+            // Create and Save Content "Text Page 1" based on "umbTextpage" -> (NodeDto.NodeIdSeed + 3)
+            _subpage2 = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 2", _textpage.Id);
+            ContentService.Save(_subpage2, 0);
+
+            _relation = new Relation(_textpage.Id, _subpage.Id, _relateContent) { Comment = string.Empty };
+            _relation2 = new Relation(_textpage.Id, _subpage2.Id, _relateContent) { Comment = string.Empty };
+            relationRepository.Save(_relation);
+            relationRepository.Save(_relation2);
+            scope.Complete();
+        }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs
index ba1fb3f7d4..2fbf06bb6c 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/RelationTypeRepositoryTest.cs
@@ -1,236 +1,251 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class RelationTypeRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class RelationTypeRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => CreateTestData();
+
+    private RelationTypeRepository CreateRepository(ICoreScopeProvider provider) =>
+        new((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
+
+    [Test]
+    public void Can_Perform_Add_On_RelationTypeRepository()
     {
-        [SetUp]
-        public void SetUp() => CreateTestData();
-
-        private RelationTypeRepository CreateRepository(ICoreScopeProvider provider) =>
-            new RelationTypeRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
-
-        [Test]
-        public void Can_Perform_Add_On_RelationTypeRepository()
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                var relateMemberToContent = new RelationType("Relate Member to Content", "relateMemberToContent", true, Constants.ObjectTypes.Member, Constants.ObjectTypes.Document, true);
+            // Act
+            var relateMemberToContent = new RelationType("Relate Member to Content", "relateMemberToContent", true, Constants.ObjectTypes.Member, Constants.ObjectTypes.Document, true);
 
-                repository.Save(relateMemberToContent);
+            repository.Save(relateMemberToContent);
 
-                // Assert
-                Assert.That(relateMemberToContent.HasIdentity, Is.True);
-                Assert.That(repository.Exists(relateMemberToContent.Id), Is.True);
-            }
+            // Assert
+            Assert.That(relateMemberToContent.HasIdentity, Is.True);
+            Assert.That(repository.Exists(relateMemberToContent.Id), Is.True);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Update_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_Update_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IRelationType relationType = repository.Get(3);
-                relationType.Alias += "Updated";
-                relationType.Name += " Updated";
-                repository.Save(relationType);
+            // Act
+            var relationType = repository.Get(3);
+            relationType.Alias += "Updated";
+            relationType.Name += " Updated";
+            repository.Save(relationType);
 
-                IRelationType relationTypeUpdated = repository.Get(3);
+            var relationTypeUpdated = repository.Get(3);
 
-                // Assert
-                Assert.That(relationTypeUpdated, Is.Not.Null);
-                Assert.That(relationTypeUpdated.HasIdentity, Is.True);
-                Assert.That(relationTypeUpdated.Alias, Is.EqualTo(relationType.Alias));
-                Assert.That(relationTypeUpdated.Name, Is.EqualTo(relationType.Name));
-            }
+            // Assert
+            Assert.That(relationTypeUpdated, Is.Not.Null);
+            Assert.That(relationTypeUpdated.HasIdentity, Is.True);
+            Assert.That(relationTypeUpdated.Alias, Is.EqualTo(relationType.Alias));
+            Assert.That(relationTypeUpdated.Name, Is.EqualTo(relationType.Name));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Delete_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_Delete_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IRelationType relationType = repository.Get(3);
-                repository.Delete(relationType);
+            // Act
+            var relationType = repository.Get(3);
+            repository.Delete(relationType);
 
-                bool exists = repository.Exists(3);
+            var exists = repository.Exists(3);
 
-                // Assert
-                Assert.That(exists, Is.False);
-            }
+            // Assert
+            Assert.That(exists, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Get_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_Get_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                var relationType = repository.Get(8) as IRelationTypeWithIsDependency;
+            // Act
+            var relationType = repository.Get(8) as IRelationTypeWithIsDependency;
 
-                // Assert
-                Assert.That(relationType, Is.Not.Null);
-                Assert.That(relationType.HasIdentity, Is.True);
-                Assert.That(relationType.IsBidirectional, Is.True);
-                Assert.That(relationType.IsDependency, Is.True);
-                Assert.That(relationType.Alias, Is.EqualTo("relateContentToMedia"));
-                Assert.That(relationType.Name, Is.EqualTo("Relate Content to Media"));
-                Assert.That(relationType.ChildObjectType, Is.EqualTo(Constants.ObjectTypes.Media));
-                Assert.That(relationType.ParentObjectType, Is.EqualTo(Constants.ObjectTypes.Document));
-            }
+            // Assert
+            Assert.That(relationType, Is.Not.Null);
+            Assert.That(relationType.HasIdentity, Is.True);
+            Assert.That(relationType.IsBidirectional, Is.True);
+            Assert.That(relationType.IsDependency, Is.True);
+            Assert.That(relationType.Alias, Is.EqualTo("relateContentToMedia"));
+            Assert.That(relationType.Name, Is.EqualTo("Relate Content to Media"));
+            Assert.That(relationType.ChildObjectType, Is.EqualTo(Constants.ObjectTypes.Media));
+            Assert.That(relationType.ParentObjectType, Is.EqualTo(Constants.ObjectTypes.Document));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetAll_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_GetAll_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IEnumerable<IRelationType> relationTypes = repository.GetMany();
+            // Act
+            var relationTypes = repository.GetMany().ToArray();
 
-                // Assert
-                Assert.That(relationTypes, Is.Not.Null);
-                Assert.That(relationTypes.Any(), Is.True);
-                Assert.That(relationTypes.Any(x => x == null), Is.False);
-                Assert.That(relationTypes.Count(), Is.EqualTo(8));
-            }
+            // Assert
+            Assert.That(relationTypes, Is.Not.Null);
+            Assert.That(relationTypes.Any(), Is.True);
+            Assert.That(relationTypes.Any(x => x == null), Is.False);
+            Assert.That(relationTypes.Count(), Is.EqualTo(8));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetAll_With_Params_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_GetAll_With_Params_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IEnumerable<IRelationType> relationTypes = repository.GetMany(2, 3);
+            // Act
+            var relationTypes = repository.GetMany(2, 3).ToArray();
 
-                // Assert
-                Assert.That(relationTypes, Is.Not.Null);
-                Assert.That(relationTypes.Any(), Is.True);
-                Assert.That(relationTypes.Any(x => x == null), Is.False);
-                Assert.That(relationTypes.Count(), Is.EqualTo(2));
-            }
+            // Assert
+            Assert.That(relationTypes, Is.Not.Null);
+            Assert.That(relationTypes.Any(), Is.True);
+            Assert.That(relationTypes.Any(x => x == null), Is.False);
+            Assert.That(relationTypes.Count(), Is.EqualTo(2));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Exists_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_Exists_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                bool exists = repository.Exists(3);
-                bool doesntExist = repository.Exists(9);
+            // Act
+            var exists = repository.Exists(3);
+            var doesntExist = repository.Exists(9);
 
-                // Assert
-                Assert.That(exists, Is.True);
-                Assert.That(doesntExist, Is.False);
-            }
+            // Assert
+            Assert.That(exists, Is.True);
+            Assert.That(doesntExist, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Count_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_Count_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IQuery<IRelationType> query = provider.CreateQuery<IRelationType>().Where(x => x.Alias.StartsWith("relate"));
-                int count = repository.Count(query);
+            // Act
+            var query = provider.CreateQuery<IRelationType>().Where(x => x.Alias.StartsWith("relate"));
+            var count = repository.Count(query);
 
-                // Assert
-                Assert.That(count, Is.EqualTo(6));
-            }
+            // Assert
+            Assert.That(count, Is.EqualTo(6));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetByQuery_On_RelationTypeRepository()
+    [Test]
+    public void Can_Perform_GetByQuery_On_RelationTypeRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                RelationTypeRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                System.Guid childObjType = Constants.ObjectTypes.DocumentType;
-                IQuery<IRelationType> query = provider.CreateQuery<IRelationType>().Where(x => x.ChildObjectType == childObjType);
-                IEnumerable<IRelationType> result = repository.Get(query);
+            // Act
+            var childObjType = Constants.ObjectTypes.DocumentType;
+            var query = provider.CreateQuery<IRelationType>().Where(x => x.ChildObjectType == childObjType);
+            var result = repository.Get(query).ToArray();
 
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.Any(x => x == null), Is.False);
-                Assert.That(result.Count(), Is.EqualTo(1));
-            }
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.Any(x => x == null), Is.False);
+            Assert.That(result.Count(), Is.EqualTo(1));
         }
+    }
 
-        public void CreateTestData()
+    public void CreateTestData()
+    {
+        var relateContent = new RelationType(
+            "Relate Content on Copy",
+            "relateContentOnCopy",
+            true,
+            Constants.ObjectTypes.Document,
+            Constants.ObjectTypes.Document,
+            false);
+        var relateContentType = new RelationType(
+            "Relate ContentType on Copy",
+            "relateContentTypeOnCopy",
+            true,
+            Constants.ObjectTypes.DocumentType,
+            Constants.ObjectTypes.DocumentType,
+            false);
+        var relateContentMedia = new RelationType(
+            "Relate Content to Media",
+            "relateContentToMedia",
+            true,
+            Constants.ObjectTypes.Document,
+            Constants.ObjectTypes.Media,
+            true);
+
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            var relateContent = new RelationType("Relate Content on Copy", "relateContentOnCopy", true, Constants.ObjectTypes.Document, Constants.ObjectTypes.Document, false);
-            var relateContentType = new RelationType("Relate ContentType on Copy", "relateContentTypeOnCopy", true, Constants.ObjectTypes.DocumentType, Constants.ObjectTypes.DocumentType, false);
-            var relateContentMedia = new RelationType("Relate Content to Media", "relateContentToMedia", true, Constants.ObjectTypes.Document, Constants.ObjectTypes.Media, true);
+            var repository = new RelationTypeRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
 
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                var repository = new RelationTypeRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
-
-                repository.Save(relateContent); // Id 2
-                repository.Save(relateContentType); // Id 3
-                repository.Save(relateContentMedia); // Id 4
-                scope.Complete();
-            }
+            repository.Save(relateContent); // Id 2
+            repository.Save(relateContentType); // Id 3
+            repository.Save(relateContentMedia); // Id 4
+            scope.Complete();
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs
index 939e774a01..5897052752 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ScriptRepositoryTest.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -14,345 +13,347 @@ using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.None)]
+public class ScriptRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.None)]
-    public class ScriptRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUpFileSystem()
     {
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+        var path = GlobalSettings.UmbracoScriptsPath;
+        _fileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, LoggerFactory.CreateLogger<PhysicalFileSystem>(), HostingEnvironment.MapPathWebRoot(path), HostingEnvironment.ToAbsolute(path));
 
-        private FileSystems _fileSystems;
-        private IFileSystem _fileSystem;
-
-        [SetUp]
-        public void SetUpFileSystem()
+        _fileSystems = FileSystemsCreator.CreateTestFileSystems(
+            LoggerFactory,
+            IOHelper,
+            GetRequiredService<IOptions<GlobalSettings>>(),
+            HostingEnvironment,
+            null,
+            null,
+            null,
+            _fileSystem,
+            null);
+        using (var stream = CreateStream("Umbraco.Sys.registerNamespace(\"Umbraco.Utils\");"))
         {
-            string path = GlobalSettings.UmbracoScriptsPath;
-            _fileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, LoggerFactory.CreateLogger<PhysicalFileSystem>(), HostingEnvironment.MapPathWebRoot(path), HostingEnvironment.ToAbsolute(path));
-
-            _fileSystems = FileSystemsCreator.CreateTestFileSystems(LoggerFactory, IOHelper, GetRequiredService<IOptions<GlobalSettings>>(),
-                HostingEnvironment,
-                null, null, null, _fileSystem, null);
-            using (Stream stream = CreateStream("Umbraco.Sys.registerNamespace(\"Umbraco.Utils\");"))
-            {
-                _fileSystem.AddFile("test-script.js", stream);
-            }
-        }
-
-        [TearDown]
-        public void TearDownFileSystem()
-        {
-            // Delete all files
-            Purge(_fileSystems.ScriptsFileSystem, string.Empty);
-            _fileSystems = null;
-        }
-
-        private IScriptRepository CreateRepository()
-        {
-            var globalSettings = new GlobalSettings();
-            return new ScriptRepository(_fileSystems);
-        }
-
-        [Test]
-        public void Can_Instantiate_Repository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // Act
-                IScriptRepository repository = CreateRepository();
-
-                // Assert
-                Assert.That(repository, Is.Not.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add_On_ScriptRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                // Act
-                var script = new Script("test-add-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script);
-
-                // Assert
-                Assert.That(_fileSystem.FileExists("test-add-script.js"), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_On_ScriptRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                // Act
-                var script = new Script("test-updated-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script);
-
-                script.Content = "/// <reference name=\"MicrosoftAjax-Updated.js\"/>";
-                repository.Save(script);
-
-                IScript scriptUpdated = repository.Get("test-updated-script.js");
-
-                // Assert
-                Assert.That(_fileSystem.FileExists("test-updated-script.js"), Is.True);
-                Assert.That(scriptUpdated.Content, Is.EqualTo("/// <reference name=\"MicrosoftAjax-Updated.js\"/>"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_On_ScriptRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                // Act
-                IScript script = repository.Get("test-script.js");
-                repository.Delete(script);
-
-                // Assert
-                Assert.IsFalse(repository.Exists("test-script.js"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_On_ScriptRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                // Act
-                IScript exists = repository.Get("test-script.js");
-
-                // Assert
-                Assert.That(exists, Is.Not.Null);
-                Assert.That(exists.Alias, Is.EqualTo("test-script"));
-                Assert.That(exists.Name, Is.EqualTo("test-script.js"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_ScriptRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script);
-                var script2 = new Script("test-script2.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script2);
-                var script3 = new Script("test-script3.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script3);
-
-                // Act
-                IEnumerable<IScript> scripts = repository.GetMany();
-
-                // Assert
-                Assert.That(scripts, Is.Not.Null);
-                Assert.That(scripts.Any(), Is.True);
-                Assert.That(scripts.Any(x => x == null), Is.False);
-                Assert.That(scripts.Count(), Is.EqualTo(4));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_With_Params_On_ScriptRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script);
-                var script2 = new Script("test-script2.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script2);
-                var script3 = new Script("test-script3.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
-                repository.Save(script3);
-
-                // Act
-                IEnumerable<IScript> scripts = repository.GetMany("test-script1.js", "test-script2.js");
-
-                // Assert
-                Assert.That(scripts, Is.Not.Null);
-                Assert.That(scripts.Any(), Is.True);
-                Assert.That(scripts.Any(x => x == null), Is.False);
-                Assert.That(scripts.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_ScriptRepository()
-        {
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                // Act
-                bool exists = repository.Exists("test-script.js");
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Move_On_ScriptRepository()
-        {
-            const string content = "/// <reference name=\"MicrosoftAjax.js\"/>";
-
-            // Arrange
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                IScript script = new Script("test-move-script.js") { Content = content };
-                repository.Save(script);
-
-                // Act
-                script = repository.Get("test-move-script.js");
-                script.Path = "moved/test-move-script.js";
-                repository.Save(script);
-
-                bool existsOld = repository.Exists("test-move-script.js");
-                bool existsNew = repository.Exists("moved/test-move-script.js");
-
-                script = repository.Get("moved/test-move-script.js");
-
-                // Assert
-                Assert.IsNotNull(script);
-                Assert.IsFalse(existsOld);
-                Assert.IsTrue(existsNew);
-                Assert.AreEqual(content, script.Content);
-            }
-        }
-
-        [Test]
-        public void PathTests()
-        {
-            // unless noted otherwise, no changes / 7.2.8
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IScriptRepository repository = CreateRepository();
-
-                IScript script = new Script("test-path-1.js") { Content = "// script" };
-                repository.Save(script);
-
-                Assert.IsTrue(_fileSystem.FileExists("test-path-1.js"));
-                Assert.AreEqual("test-path-1.js", script.Path);
-                Assert.AreEqual("/scripts/test-path-1.js", script.VirtualPath);
-
-                // ensure you can prefix the same path as the root path name
-                script = new Script("scripts/path-2/test-path-2.js") { Content = "// script" };
-                repository.Save(script);
-
-                Assert.IsTrue(_fileSystem.FileExists("scripts/path-2/test-path-2.js"));
-                Assert.AreEqual("scripts\\path-2\\test-path-2.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
-                Assert.AreEqual("/scripts/scripts/path-2/test-path-2.js", script.VirtualPath);
-
-                script = new Script("path-2/test-path-2.js") { Content = "// script" };
-                repository.Save(script);
-
-                Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.js"));
-                Assert.AreEqual("path-2\\test-path-2.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path); // fixed in 7.3 - 7.2.8 does not update the path
-                Assert.AreEqual("/scripts/path-2/test-path-2.js", script.VirtualPath);
-
-                script = repository.Get("path-2/test-path-2.js");
-                Assert.IsNotNull(script);
-                Assert.AreEqual("path-2\\test-path-2.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
-                Assert.AreEqual("/scripts/path-2/test-path-2.js", script.VirtualPath);
-
-                script = new Script("path-2\\test-path-3.js") { Content = "// script" };
-                repository.Save(script);
-
-                Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.js"));
-                Assert.AreEqual("path-2\\test-path-3.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
-                Assert.AreEqual("/scripts/path-2/test-path-3.js", script.VirtualPath);
-
-                script = repository.Get("path-2/test-path-3.js");
-                Assert.IsNotNull(script);
-                Assert.AreEqual("path-2\\test-path-3.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
-                Assert.AreEqual("/scripts/path-2/test-path-3.js", script.VirtualPath);
-
-                script = repository.Get("path-2\\test-path-3.js");
-                Assert.IsNotNull(script);
-                Assert.AreEqual("path-2\\test-path-3.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
-                Assert.AreEqual("/scripts/path-2/test-path-3.js", script.VirtualPath);
-
-                script = new Script("..\\test-path-4.js") { Content = "// script" };
-                Assert.Throws<UnauthorizedAccessException>(() =>
-                    repository.Save(script));
-
-                script = new Script("\\test-path-5.js") { Content = "// script" };
-                repository.Save(script);
-
-                script = repository.Get("\\test-path-5.js");
-                Assert.IsNotNull(script);
-                Assert.AreEqual("test-path-5.js", script.Path);
-                Assert.AreEqual("/scripts/test-path-5.js", script.VirtualPath);
-
-                script = repository.Get("missing.js");
-                Assert.IsNull(script);
-
-                Assert.Throws<UnauthorizedAccessException>(() => script = repository.Get("..\\test-path-4.js"));
-                Assert.Throws<UnauthorizedAccessException>(() => script = repository.Get("../packages.config"));
-            }
-        }
-
-        private void Purge(IFileSystem fs, string path)
-        {
-            IEnumerable<string> files = fs.GetFiles(path, "*.js");
-            foreach (string file in files)
-            {
-                fs.DeleteFile(file);
-            }
-
-            IEnumerable<string> dirs = fs.GetDirectories(path);
-            foreach (string dir in dirs)
-            {
-                Purge(fs, dir);
-                fs.DeleteDirectory(dir);
-            }
-        }
-
-        protected Stream CreateStream(string contents = null)
-        {
-            if (string.IsNullOrEmpty(contents))
-            {
-                contents = "/* test */";
-            }
-
-            byte[] bytes = Encoding.UTF8.GetBytes(contents);
-            var stream = new MemoryStream(bytes);
-
-            return stream;
+            _fileSystem.AddFile("test-script.js", stream);
         }
     }
+
+    [TearDown]
+    public void TearDownFileSystem()
+    {
+        // Delete all files
+        Purge(_fileSystems.ScriptsFileSystem, string.Empty);
+        _fileSystems = null;
+    }
+
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+
+    private FileSystems _fileSystems;
+    private IFileSystem _fileSystem;
+
+    private IScriptRepository CreateRepository()
+    {
+        var globalSettings = new GlobalSettings();
+        return new ScriptRepository(_fileSystems);
+    }
+
+    [Test]
+    public void Can_Instantiate_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            // Act
+            var repository = CreateRepository();
+
+            // Assert
+            Assert.That(repository, Is.Not.Null);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Add_On_ScriptRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var script = new Script("test-add-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script);
+
+            // Assert
+            Assert.That(_fileSystem.FileExists("test-add-script.js"), Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_On_ScriptRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var script = new Script("test-updated-script.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script);
+
+            script.Content = "/// <reference name=\"MicrosoftAjax-Updated.js\"/>";
+            repository.Save(script);
+
+            var scriptUpdated = repository.Get("test-updated-script.js");
+
+            // Assert
+            Assert.That(_fileSystem.FileExists("test-updated-script.js"), Is.True);
+            Assert.That(scriptUpdated.Content, Is.EqualTo("/// <reference name=\"MicrosoftAjax-Updated.js\"/>"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_On_ScriptRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var script = repository.Get("test-script.js");
+            repository.Delete(script);
+
+            // Assert
+            Assert.IsFalse(repository.Exists("test-script.js"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_ScriptRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var exists = repository.Get("test-script.js");
+
+            // Assert
+            Assert.That(exists, Is.Not.Null);
+            Assert.That(exists.Alias, Is.EqualTo("test-script"));
+            Assert.That(exists.Name, Is.EqualTo("test-script.js"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_ScriptRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script);
+            var script2 = new Script("test-script2.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script2);
+            var script3 = new Script("test-script3.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script3);
+
+            // Act
+            var scripts = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(scripts, Is.Not.Null);
+            Assert.That(scripts.Any(), Is.True);
+            Assert.That(scripts.Any(x => x == null), Is.False);
+            Assert.That(scripts.Count(), Is.EqualTo(4));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_With_Params_On_ScriptRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            var script = new Script("test-script1.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script);
+            var script2 = new Script("test-script2.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script2);
+            var script3 = new Script("test-script3.js") { Content = "/// <reference name=\"MicrosoftAjax.js\"/>" };
+            repository.Save(script3);
+
+            // Act
+            var scripts = repository.GetMany("test-script1.js", "test-script2.js").ToArray();
+
+            // Assert
+            Assert.That(scripts, Is.Not.Null);
+            Assert.That(scripts.Any(), Is.True);
+            Assert.That(scripts.Any(x => x == null), Is.False);
+            Assert.That(scripts.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists_On_ScriptRepository()
+    {
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var exists = repository.Exists("test-script.js");
+
+            // Assert
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Move_On_ScriptRepository()
+    {
+        const string content = "/// <reference name=\"MicrosoftAjax.js\"/>";
+
+        // Arrange
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            IScript script = new Script("test-move-script.js") { Content = content };
+            repository.Save(script);
+
+            // Act
+            script = repository.Get("test-move-script.js");
+            script.Path = "moved/test-move-script.js";
+            repository.Save(script);
+
+            var existsOld = repository.Exists("test-move-script.js");
+            var existsNew = repository.Exists("moved/test-move-script.js");
+
+            script = repository.Get("moved/test-move-script.js");
+
+            // Assert
+            Assert.IsNotNull(script);
+            Assert.IsFalse(existsOld);
+            Assert.IsTrue(existsNew);
+            Assert.AreEqual(content, script.Content);
+        }
+    }
+
+    [Test]
+    public void PathTests()
+    {
+        // unless noted otherwise, no changes / 7.2.8
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            IScript script = new Script("test-path-1.js") { Content = "// script" };
+            repository.Save(script);
+
+            Assert.IsTrue(_fileSystem.FileExists("test-path-1.js"));
+            Assert.AreEqual("test-path-1.js", script.Path);
+            Assert.AreEqual("/scripts/test-path-1.js", script.VirtualPath);
+
+            // ensure you can prefix the same path as the root path name
+            script = new Script("scripts/path-2/test-path-2.js") { Content = "// script" };
+            repository.Save(script);
+
+            Assert.IsTrue(_fileSystem.FileExists("scripts/path-2/test-path-2.js"));
+            Assert.AreEqual("scripts\\path-2\\test-path-2.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
+            Assert.AreEqual("/scripts/scripts/path-2/test-path-2.js", script.VirtualPath);
+
+            script = new Script("path-2/test-path-2.js") { Content = "// script" };
+            repository.Save(script);
+
+            Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.js"));
+            Assert.AreEqual("path-2\\test-path-2.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path); // fixed in 7.3 - 7.2.8 does not update the path
+            Assert.AreEqual("/scripts/path-2/test-path-2.js", script.VirtualPath);
+
+            script = repository.Get("path-2/test-path-2.js");
+            Assert.IsNotNull(script);
+            Assert.AreEqual("path-2\\test-path-2.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
+            Assert.AreEqual("/scripts/path-2/test-path-2.js", script.VirtualPath);
+
+            script = new Script("path-2\\test-path-3.js") { Content = "// script" };
+            repository.Save(script);
+
+            Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.js"));
+            Assert.AreEqual("path-2\\test-path-3.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
+            Assert.AreEqual("/scripts/path-2/test-path-3.js", script.VirtualPath);
+
+            script = repository.Get("path-2/test-path-3.js");
+            Assert.IsNotNull(script);
+            Assert.AreEqual("path-2\\test-path-3.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
+            Assert.AreEqual("/scripts/path-2/test-path-3.js", script.VirtualPath);
+
+            script = repository.Get("path-2\\test-path-3.js");
+            Assert.IsNotNull(script);
+            Assert.AreEqual("path-2\\test-path-3.js".Replace("\\", $"{Path.DirectorySeparatorChar}"), script.Path);
+            Assert.AreEqual("/scripts/path-2/test-path-3.js", script.VirtualPath);
+
+            script = new Script("..\\test-path-4.js") { Content = "// script" };
+            Assert.Throws<UnauthorizedAccessException>(() =>
+                repository.Save(script));
+
+            script = new Script("\\test-path-5.js") { Content = "// script" };
+            repository.Save(script);
+
+            script = repository.Get("\\test-path-5.js");
+            Assert.IsNotNull(script);
+            Assert.AreEqual("test-path-5.js", script.Path);
+            Assert.AreEqual("/scripts/test-path-5.js", script.VirtualPath);
+
+            script = repository.Get("missing.js");
+            Assert.IsNull(script);
+
+            Assert.Throws<UnauthorizedAccessException>(() => script = repository.Get("..\\test-path-4.js"));
+            Assert.Throws<UnauthorizedAccessException>(() => script = repository.Get("../packages.config"));
+        }
+    }
+
+    private void Purge(IFileSystem fs, string path)
+    {
+        var files = fs.GetFiles(path, "*.js");
+        foreach (var file in files)
+        {
+            fs.DeleteFile(file);
+        }
+
+        var dirs = fs.GetDirectories(path);
+        foreach (var dir in dirs)
+        {
+            Purge(fs, dir);
+            fs.DeleteDirectory(dir);
+        }
+    }
+
+    protected Stream CreateStream(string contents = null)
+    {
+        if (string.IsNullOrEmpty(contents))
+        {
+            contents = "/* test */";
+        }
+
+        var bytes = Encoding.UTF8.GetBytes(contents);
+        var stream = new MemoryStream(bytes);
+
+        return stream;
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
index c7c01bde6f..4611f69882 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ServerRegistrationRepositoryTest.cs
@@ -2,253 +2,246 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
-using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ServerRegistrationRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class ServerRegistrationRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp()
     {
-        private AppCaches _appCaches;
+        _appCaches = AppCaches.Disabled;
+        CreateTestData();
+    }
 
-        [SetUp]
-        public void SetUp()
+    private AppCaches _appCaches;
+
+    private ServerRegistrationRepository CreateRepository(IScopeProvider provider) =>
+        new((IScopeAccessor)provider, LoggerFactory.CreateLogger<ServerRegistrationRepository>());
+
+    [Test]
+    public void Cannot_Add_Duplicate_Server_Identities()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            _appCaches = AppCaches.Disabled;
-            CreateTestData();
+            var repository = CreateRepository(provider);
+
+            var server = new ServerRegistration("http://shazwazza.com", "COMPUTER1", DateTime.Now);
+
+            Assert.That(() => repository.Save(server), Throws.InstanceOf<DbException>());
         }
+    }
 
-        private ServerRegistrationRepository CreateRepository(IScopeProvider provider) =>
-            new ServerRegistrationRepository((IScopeAccessor)provider, LoggerFactory.CreateLogger<ServerRegistrationRepository>());
-
-        [Test]
-        public void Cannot_Add_Duplicate_Server_Identities()
+    [Test]
+    public void Cannot_Update_To_Duplicate_Server_Identities()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                var server = new ServerRegistration("http://shazwazza.com", "COMPUTER1", DateTime.Now);
+            var server = repository.Get(1);
+            server.ServerIdentity = "COMPUTER2";
 
-                Assert.That(() => repository.Save(server), Throws.InstanceOf<DbException>());
-            }
+            Assert.That(() => repository.Save(server), Throws.InstanceOf<DbException>());
         }
+    }
 
-        [Test]
-        public void Cannot_Update_To_Duplicate_Server_Identities()
+    [Test]
+    public void Can_Instantiate_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                IServerRegistration server = repository.Get(1);
-                server.ServerIdentity = "COMPUTER2";
-
-                Assert.That(() => repository.Save(server), Throws.InstanceOf<DbException>());
-            }
+            // Assert
+            Assert.That(repository, Is.Not.Null);
         }
+    }
 
-        [Test]
-        public void Can_Instantiate_Repository()
+    [Test]
+    public void Can_Perform_Get_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Assert
-                Assert.That(repository, Is.Not.Null);
-            }
+            // Act
+            var server = repository.Get(1);
+
+            // Assert
+            Assert.That(server, Is.Not.Null);
+            Assert.That(server.HasIdentity, Is.True);
+            Assert.That(server.ServerAddress, Is.EqualTo("http://localhost"));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Get_On_Repository()
+    [Test]
+    public void Can_Perform_GetAll_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IServerRegistration server = repository.Get(1);
+            // Act
+            var servers = repository.GetMany();
 
-                // Assert
-                Assert.That(server, Is.Not.Null);
-                Assert.That(server.HasIdentity, Is.True);
-                Assert.That(server.ServerAddress, Is.EqualTo("http://localhost"));
-            }
+            // Assert
+            Assert.That(servers.Count(), Is.EqualTo(3));
         }
+    }
 
-        [Test]
-        public void Can_Perform_GetAll_On_Repository()
+    // queries are not supported due to in-memory caching
+    //// [Test]
+    //// public void Can_Perform_GetByQuery_On_Repository()
+    //// {
+    ////    // Arrange
+    ////    var provider = ScopeProvider;
+    ////    using (var unitOfWork = provider.GetUnitOfWork())
+    ////    using (var repository = CreateRepository(provider))
+    ////    {
+    ////        // Act
+    ////        var query = Query<IServerRegistration>.Builder.Where(x => x.ServerIdentity.ToUpper() == "COMPUTER3");
+    ////        var result = repository.GetByQuery(query);
+
+    //// // Assert
+    ////        Assert.AreEqual(1, result.Count());
+    ////    }
+    //// }
+
+    //// [Test]
+    //// public void Can_Perform_Count_On_Repository()
+    //// {
+    ////    // Arrange
+    ////    var provider = ScopeProvider;
+    ////    using (var unitOfWork = provider.GetUnitOfWork())
+    ////    using (var repository = CreateRepository(provider))
+    ////    {
+    ////        // Act
+    ////        var query = Query<IServerRegistration>.Builder.Where(x => x.ServerAddress.StartsWith("http://"));
+    ////        int count = repository.Count(query);
+
+    //// // Assert
+    ////        Assert.That(count, Is.EqualTo(2));
+    ////    }
+    //// }
+
+    [Test]
+    public void Can_Perform_Add_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IEnumerable<IServerRegistration> servers = repository.GetMany();
+            // Act
+            var server = new ServerRegistration("http://shazwazza.com", "COMPUTER4", DateTime.Now);
+            repository.Save(server);
 
-                // Assert
-                Assert.That(servers.Count(), Is.EqualTo(3));
-            }
+            // Assert
+            Assert.That(server.HasIdentity, Is.True);
+            Assert.That(server.Id, Is.EqualTo(4)); // With 3 existing entries the Id should be 4
         }
+    }
 
-        // queries are not supported due to in-memory caching
-        //// [Test]
-        //// public void Can_Perform_GetByQuery_On_Repository()
-        //// {
-        ////    // Arrange
-        ////    var provider = ScopeProvider;
-        ////    using (var unitOfWork = provider.GetUnitOfWork())
-        ////    using (var repository = CreateRepository(provider))
-        ////    {
-        ////        // Act
-        ////        var query = Query<IServerRegistration>.Builder.Where(x => x.ServerIdentity.ToUpper() == "COMPUTER3");
-        ////        var result = repository.GetByQuery(query);
-
-        //// // Assert
-        ////        Assert.AreEqual(1, result.Count());
-        ////    }
-        //// }
-
-        //// [Test]
-        //// public void Can_Perform_Count_On_Repository()
-        //// {
-        ////    // Arrange
-        ////    var provider = ScopeProvider;
-        ////    using (var unitOfWork = provider.GetUnitOfWork())
-        ////    using (var repository = CreateRepository(provider))
-        ////    {
-        ////        // Act
-        ////        var query = Query<IServerRegistration>.Builder.Where(x => x.ServerAddress.StartsWith("http://"));
-        ////        int count = repository.Count(query);
-
-        //// // Assert
-        ////        Assert.That(count, Is.EqualTo(2));
-        ////    }
-        //// }
-
-        [Test]
-        public void Can_Perform_Add_On_Repository()
+    [Test]
+    public void Can_Perform_Update_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                var server = new ServerRegistration("http://shazwazza.com", "COMPUTER4", DateTime.Now);
-                repository.Save(server);
+            // Act
+            var server = repository.Get(2);
+            server.ServerAddress = "https://umbraco.com";
+            server.IsActive = true;
 
-                // Assert
-                Assert.That(server.HasIdentity, Is.True);
-                Assert.That(server.Id, Is.EqualTo(4)); // With 3 existing entries the Id should be 4
-            }
+            repository.Save(server);
+
+            var serverUpdated = repository.Get(2);
+
+            // Assert
+            Assert.That(serverUpdated, Is.Not.Null);
+            Assert.That(serverUpdated.ServerAddress, Is.EqualTo("https://umbraco.com"));
+            Assert.That(serverUpdated.IsActive, Is.EqualTo(true));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Update_On_Repository()
+    [Test]
+    public void Can_Perform_Delete_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IServerRegistration server = repository.Get(2);
-                server.ServerAddress = "https://umbraco.com";
-                server.IsActive = true;
+            // Act
+            var server = repository.Get(3);
+            Assert.IsNotNull(server);
+            repository.Delete(server);
 
-                repository.Save(server);
+            var exists = repository.Exists(3);
 
-                IServerRegistration serverUpdated = repository.Get(2);
-
-                // Assert
-                Assert.That(serverUpdated, Is.Not.Null);
-                Assert.That(serverUpdated.ServerAddress, Is.EqualTo("https://umbraco.com"));
-                Assert.That(serverUpdated.IsActive, Is.EqualTo(true));
-            }
+            // Assert
+            Assert.That(exists, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Delete_On_Repository()
+    [Test]
+    public void Can_Perform_Exists_On_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                IServerRegistration server = repository.Get(3);
-                Assert.IsNotNull(server);
-                repository.Delete(server);
+            // Act
+            var exists = repository.Exists(3);
+            var doesntExist = repository.Exists(10);
 
-                bool exists = repository.Exists(3);
-
-                // Assert
-                Assert.That(exists, Is.False);
-            }
+            // Assert
+            Assert.That(exists, Is.True);
+            Assert.That(doesntExist, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Exists_On_Repository()
+    public void CreateTestData()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                // Act
-                bool exists = repository.Exists(3);
-                bool doesntExist = repository.Exists(10);
-
-                // Assert
-                Assert.That(exists, Is.True);
-                Assert.That(doesntExist, Is.False);
-            }
-        }
-
-        public void CreateTestData()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                ServerRegistrationRepository repository = CreateRepository(provider);
-
-                repository.Save(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true });
-                repository.Save(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now));
-                repository.Save(new ServerRegistration("https://www.another.domain.com", "Computer3", DateTime.Now));
-                scope.Complete();
-            }
+            repository.Save(new ServerRegistration("http://localhost", "COMPUTER1", DateTime.Now) { IsActive = true });
+            repository.Save(new ServerRegistration("http://www.mydomain.com", "COMPUTER2", DateTime.Now));
+            repository.Save(new ServerRegistration("https://www.another.domain.com", "Computer3", DateTime.Now));
+            scope.Complete();
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs
index 87ffdaa3e6..a7f05c0387 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/SimilarNodeNameTests.cs
@@ -4,224 +4,197 @@
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+[TestFixture]
+public class SimilarNodeNameTests
 {
-    [TestFixture]
-    public class SimilarNodeNameTests
+    public void Name_Is_Suffixed()
     {
-        public void Name_Is_Suffixed()
+        SimilarNodeName[] names = { new SimilarNodeName { Id = 1, Name = "Zulu" } };
+
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Zulu");
+        Assert.AreEqual("Zulu (1)", res);
+    }
+
+    [Test]
+    public void Suffixed_Name_Is_Incremented()
+    {
+        SimilarNodeName[] names =
         {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Zulu" }
-            };
+            new SimilarNodeName {Id = 1, Name = "Zulu"}, new SimilarNodeName {Id = 2, Name = "Kilo (1)"},
+            new SimilarNodeName {Id = 3, Name = "Kilo"}
+        };
 
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Zulu");
-            Assert.AreEqual("Zulu (1)", res);
-        }
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Kilo (1)");
+        Assert.AreEqual("Kilo (2)", res);
+    }
 
-        [Test]
-        public void Suffixed_Name_Is_Incremented()
+    [Test]
+    public void Lower_Number_Suffix_Is_Inserted()
+    {
+        SimilarNodeName[] names =
         {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Zulu" },
-                new SimilarNodeName { Id = 2, Name = "Kilo (1)" },
-                new SimilarNodeName { Id = 3, Name = "Kilo" },
-            };
+            new SimilarNodeName {Id = 1, Name = "Golf"}, new SimilarNodeName {Id = 2, Name = "Golf (2)"}
+        };
 
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Kilo (1)");
-            Assert.AreEqual("Kilo (2)", res);
-        }
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Golf");
+        Assert.AreEqual("Golf (1)", res);
+    }
 
-        [Test]
-        public void Lower_Number_Suffix_Is_Inserted()
+    [Test]
+    [TestCase(0, "Alpha", "Alpha (3)")]
+    [TestCase(0, "alpha", "alpha (3)")]
+    public void Case_Is_Ignored(int nodeId, string nodeName, string expected)
+    {
+        SimilarNodeName[] names =
         {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Golf" },
-                new SimilarNodeName { Id = 2, Name = "Golf (2)" },
-            };
+            new SimilarNodeName {Id = 1, Name = "Alpha"}, new SimilarNodeName {Id = 2, Name = "Alpha (1)"},
+            new SimilarNodeName {Id = 3, Name = "Alpha (2)"}
+        };
+        var res = SimilarNodeName.GetUniqueName(names, nodeId, nodeName);
 
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Golf");
-            Assert.AreEqual("Golf (1)", res);
-        }
+        Assert.AreEqual(expected, res);
+    }
 
-        [Test]
-        [TestCase(0, "Alpha", "Alpha (3)")]
-        [TestCase(0, "alpha", "alpha (3)")]
-        public void Case_Is_Ignored(int nodeId, string nodeName, string expected)
+    [Test]
+    public void Empty_List_Causes_Unchanged_Name()
+    {
+        var names = new SimilarNodeName[] { };
+
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Charlie");
+
+        Assert.AreEqual("Charlie", res);
+    }
+
+    [Test]
+    [TestCase(0, "", " (1)")]
+    [TestCase(0, null, " (1)")]
+    public void Empty_Name_Is_Suffixed(int nodeId, string nodeName, string expected)
+    {
+        var names = new SimilarNodeName[] { };
+
+        var res = SimilarNodeName.GetUniqueName(names, nodeId, nodeName);
+
+        Assert.AreEqual(expected, res);
+    }
+
+    [Test]
+    public void Matching_NoedId_Causes_No_Change()
+    {
+        SimilarNodeName[] names =
         {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Alpha" },
-                new SimilarNodeName { Id = 2, Name = "Alpha (1)" },
-                new SimilarNodeName { Id = 3, Name = "Alpha (2)" },
-            };
-            string res = SimilarNodeName.GetUniqueName(names, nodeId, nodeName);
+            new SimilarNodeName {Id = 1, Name = "Kilo (1)"}, new SimilarNodeName {Id = 2, Name = "Yankee"},
+            new SimilarNodeName {Id = 3, Name = "Kilo"}
+        };
 
-            Assert.AreEqual(expected, res);
-        }
+        var res = SimilarNodeName.GetUniqueName(names, 1, "Kilo (1)");
 
-        [Test]
-        public void Empty_List_Causes_Unchanged_Name()
+        Assert.AreEqual("Kilo (1)", res);
+    }
+
+    [Test]
+    public void Extra_MultiSuffixed_Name_Is_Ignored()
+    {
+        // Sequesnce is: Test, Test (1), Test (2)
+        // Ignore: Test (1) (1)
+        SimilarNodeName[] names =
         {
-            var names = new SimilarNodeName[] { };
+            new SimilarNodeName {Id = 1, Name = "Alpha (2)"}, new SimilarNodeName {Id = 2, Name = "Test"},
+            new SimilarNodeName {Id = 3, Name = "Test (1)"}, new SimilarNodeName {Id = 4, Name = "Test (2)"},
+            new SimilarNodeName {Id = 5, Name = "Test (1) (1)"}
+        };
 
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Charlie");
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Test");
 
-            Assert.AreEqual("Charlie", res);
-        }
+        Assert.AreEqual("Test (3)", res);
+    }
 
-        [Test]
-        [TestCase(0, "", " (1)")]
-        [TestCase(0, null, " (1)")]
-        public void Empty_Name_Is_Suffixed(int nodeId, string nodeName, string expected)
+    [Test]
+    public void Matched_Name_Is_Suffixed()
+    {
+        SimilarNodeName[] names = { new SimilarNodeName { Id = 1, Name = "Test" } };
+
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Test");
+
+        Assert.AreEqual("Test (1)", res);
+    }
+
+    [Test]
+    public void MultiSuffixed_Name_Is_Icremented()
+    {
+        // "Test (1)" is treated as the "original" version of the name.
+        // "Test (1) (1)" is the suffixed result of a copy, and therefore is incremented
+        // Hence this test result should be the same as Suffixed_Name_Is_Incremented
+        SimilarNodeName[] names =
         {
-            var names = new SimilarNodeName[] { };
+            new SimilarNodeName {Id = 1, Name = "Test (1)"}, new SimilarNodeName {Id = 2, Name = "Test (1) (1)"}
+        };
 
-            string res = SimilarNodeName.GetUniqueName(names, nodeId, nodeName);
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Test (1) (1)");
 
-            Assert.AreEqual(expected, res);
-        }
+        Assert.AreEqual("Test (1) (2)", res);
+    }
 
-        [Test]
-        public void Matching_NoedId_Causes_No_Change()
+    [Test]
+    public void Suffixed_Name_Causes_Secondary_Suffix()
+    {
+        SimilarNodeName[] names = { new SimilarNodeName { Id = 6, Name = "Alpha (1)" } };
+        var res = SimilarNodeName.GetUniqueName(names, 0, "Alpha (1)");
+
+        Assert.AreEqual("Alpha (1) (1)", res);
+    }
+
+    [TestCase("Test (0)", "Test (0) (1)")]
+    [TestCase("Test (-1)", "Test (-1) (1)")]
+    [TestCase("Test (1) (-1)", "Test (1) (-1) (1)")]
+    public void NonPositive_Suffix_Is_Ignored(string suffix, string expected)
+    {
+        SimilarNodeName[] names = { new SimilarNodeName { Id = 6, Name = suffix } };
+        var res = SimilarNodeName.GetUniqueName(names, 0, suffix);
+
+        Assert.AreEqual(expected, res);
+    }
+
+    /* Original Tests - Can be deleted, as new tests cover all cases */
+
+    [TestCase(0, "Charlie", "Charlie")]
+    [TestCase(0, "Zulu", "Zulu (1)")]
+    [TestCase(0, "Golf", "Golf (1)")]
+    [TestCase(0, "Kilo", "Kilo (2)")]
+    [TestCase(0, "Alpha", "Alpha (3)")]
+    //// [TestCase(0, "Kilo (1)", "Kilo (1) (1)")] // though... we might consider "Kilo (2)"
+    [TestCase(0, "Kilo (1)", "Kilo (2)")] // names[] contains "Kilo" AND "Kilo (1)", which implies that result should be "Kilo (2)"
+    [TestCase(6, "Kilo (1)", "Kilo (1)")] // because of the id
+    [TestCase(0, "alpha", "alpha (3)")]
+    [TestCase(0, "", " (1)")]
+    [TestCase(0, null, " (1)")]
+    public void Test(int nodeId, string nodeName, string expected)
+    {
+        SimilarNodeName[] names =
         {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Kilo (1)" },
-                new SimilarNodeName { Id = 2, Name = "Yankee" },
-                new SimilarNodeName { Id = 3, Name = "Kilo" },
-            };
+            new SimilarNodeName {Id = 1, Name = "Alpha (2)"}, new SimilarNodeName {Id = 2, Name = "Alpha"},
+            new SimilarNodeName {Id = 3, Name = "Golf"}, new SimilarNodeName {Id = 4, Name = "Zulu"},
+            new SimilarNodeName {Id = 5, Name = "Mike"}, new SimilarNodeName {Id = 6, Name = "Kilo (1)"},
+            new SimilarNodeName {Id = 7, Name = "Yankee"}, new SimilarNodeName {Id = 8, Name = "Kilo"},
+            new SimilarNodeName {Id = 9, Name = "Golf (2)"}, new SimilarNodeName {Id = 10, Name = "Alpha (1)"}
+        };
 
-            string res = SimilarNodeName.GetUniqueName(names, 1, "Kilo (1)");
+        Assert.AreEqual(expected, SimilarNodeName.GetUniqueName(names, nodeId, nodeName));
+    }
 
-            Assert.AreEqual("Kilo (1)", res);
-        }
-
-        [Test]
-        public void Extra_MultiSuffixed_Name_Is_Ignored()
+    [Test]
+    [Explicit("This test fails! We need to fix up the logic")]
+    public void TestMany()
+    {
+        SimilarNodeName[] names =
         {
-            // Sequesnce is: Test, Test (1), Test (2)
-            // Ignore: Test (1) (1)
-            SimilarNodeName[] names = new[]
-            {
-               new SimilarNodeName { Id = 1, Name = "Alpha (2)" },
-               new SimilarNodeName { Id = 2, Name = "Test" },
-               new SimilarNodeName { Id = 3, Name = "Test (1)" },
-               new SimilarNodeName { Id = 4, Name = "Test (2)" },
-               new SimilarNodeName { Id = 5, Name = "Test (1) (1)" },
-            };
+            new SimilarNodeName {Id = 1, Name = "Alpha (2)"}, new SimilarNodeName {Id = 2, Name = "Test"},
+            new SimilarNodeName {Id = 3, Name = "Test (1)"}, new SimilarNodeName {Id = 4, Name = "Test (2)"},
+            new SimilarNodeName {Id = 22, Name = "Test (1) (1)"}
+        };
 
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Test");
-
-            Assert.AreEqual("Test (3)", res);
-        }
-
-        [Test]
-        public void Matched_Name_Is_Suffixed()
-        {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Test" },
-            };
-
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Test");
-
-            Assert.AreEqual("Test (1)", res);
-        }
-
-        [Test]
-        public void MultiSuffixed_Name_Is_Icremented()
-        {
-            // "Test (1)" is treated as the "original" version of the name.
-            // "Test (1) (1)" is the suffixed result of a copy, and therefore is incremented
-            // Hence this test result should be the same as Suffixed_Name_Is_Incremented
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Test (1)" },
-                new SimilarNodeName { Id = 2, Name = "Test (1) (1)" },
-            };
-
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Test (1) (1)");
-
-            Assert.AreEqual("Test (1) (2)", res);
-        }
-
-        [Test]
-        public void Suffixed_Name_Causes_Secondary_Suffix()
-        {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 6, Name = "Alpha (1)" }
-            };
-            string res = SimilarNodeName.GetUniqueName(names, 0, "Alpha (1)");
-
-            Assert.AreEqual("Alpha (1) (1)", res);
-        }
-
-        [TestCase("Test (0)", "Test (0) (1)")]
-        [TestCase("Test (-1)", "Test (-1) (1)")]
-        [TestCase("Test (1) (-1)", "Test (1) (-1) (1)")]
-        public void NonPositive_Suffix_Is_Ignored(string suffix, string expected)
-        {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 6, Name = suffix }
-            };
-            string res = SimilarNodeName.GetUniqueName(names, 0, suffix);
-
-            Assert.AreEqual(expected, res);
-        }
-
-        /* Original Tests - Can be deleted, as new tests cover all cases */
-
-        [TestCase(0, "Charlie", "Charlie")]
-        [TestCase(0, "Zulu", "Zulu (1)")]
-        [TestCase(0, "Golf", "Golf (1)")]
-        [TestCase(0, "Kilo", "Kilo (2)")]
-        [TestCase(0, "Alpha", "Alpha (3)")]
-        //// [TestCase(0, "Kilo (1)", "Kilo (1) (1)")] // though... we might consider "Kilo (2)"
-        [TestCase(0, "Kilo (1)", "Kilo (2)")] // names[] contains "Kilo" AND "Kilo (1)", which implies that result should be "Kilo (2)"
-        [TestCase(6, "Kilo (1)", "Kilo (1)")] // because of the id
-        [TestCase(0, "alpha", "alpha (3)")]
-        [TestCase(0, "", " (1)")]
-        [TestCase(0, null, " (1)")]
-        public void Test(int nodeId, string nodeName, string expected)
-        {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Alpha (2)" },
-                new SimilarNodeName { Id = 2, Name = "Alpha" },
-                new SimilarNodeName { Id = 3, Name = "Golf" },
-                new SimilarNodeName { Id = 4, Name = "Zulu" },
-                new SimilarNodeName { Id = 5, Name = "Mike" },
-                new SimilarNodeName { Id = 6, Name = "Kilo (1)" },
-                new SimilarNodeName { Id = 7, Name = "Yankee" },
-                new SimilarNodeName { Id = 8, Name = "Kilo" },
-                new SimilarNodeName { Id = 9, Name = "Golf (2)" },
-                new SimilarNodeName { Id = 10, Name = "Alpha (1)" },
-            };
-
-            Assert.AreEqual(expected, SimilarNodeName.GetUniqueName(names, nodeId, nodeName));
-        }
-
-        [Test]
-        [Explicit("This test fails! We need to fix up the logic")]
-        public void TestMany()
-        {
-            SimilarNodeName[] names = new[]
-            {
-                new SimilarNodeName { Id = 1, Name = "Alpha (2)" },
-                new SimilarNodeName { Id = 2, Name = "Test" },
-                new SimilarNodeName { Id = 3, Name = "Test (1)" },
-                new SimilarNodeName { Id = 4, Name = "Test (2)" },
-                new SimilarNodeName { Id = 22, Name = "Test (1) (1)" },
-            };
-
-            // fixme - this will yield "Test (2)" which is already in use
-            Assert.AreEqual("Test (3)", SimilarNodeName.GetUniqueName(names, 0, "Test"));
-        }
+        // fixme - this will yield "Test (2)" which is already in use
+        Assert.AreEqual("Test (3)", SimilarNodeName.GetUniqueName(names, 0, "Test"));
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs
index a32638ed4d..dcc672dee9 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/StylesheetRepositoryTest.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Data;
 using System.IO;
 using System.Linq;
@@ -20,338 +19,361 @@ using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.None, Logger = UmbracoTestOptions.Logger.Console)]
+public class StylesheetRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.None, Logger = UmbracoTestOptions.Logger.Console)]
-    public class StylesheetRepositoryTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUpFileSystem()
     {
-        private FileSystems _fileSystems;
-        private IFileSystem _fileSystem;
+        var path = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoCssPath);
+        _fileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), path, "/css");
 
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+        _fileSystems = FileSystemsCreator.CreateTestFileSystems(
+            LoggerFactory,
+            IOHelper,
+            GetRequiredService<IOptions<GlobalSettings>>(),
+            HostingEnvironment,
+            null,
+            null,
+            _fileSystem,
+            null,
+            null);
 
-        [SetUp]
-        public void SetUpFileSystem()
+        var stream = CreateStream("body {background:#EE7600; color:#FFF;}");
+        _fileSystem.AddFile("styles.css", stream);
+    }
+
+    [TearDown]
+    public void TearDownFileSystem()
+    {
+        // Delete all files
+        Purge((PhysicalFileSystem)_fileSystem, string.Empty);
+        _fileSystem = null;
+    }
+
+    private FileSystems _fileSystems;
+    private IFileSystem _fileSystem;
+
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+
+    private IStylesheetRepository CreateRepository()
+    {
+        var globalSettings = new GlobalSettings();
+        return new StylesheetRepository(_fileSystems);
+    }
+
+    [Test]
+    public void Can_Instantiate_Repository()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
         {
-            string path = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoCssPath);
-            _fileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), path, "/css");
+            // Act
+            var repository = CreateRepository();
 
-            _fileSystems = FileSystemsCreator.CreateTestFileSystems(LoggerFactory, IOHelper, GetRequiredService<IOptions<GlobalSettings>>(),
-                HostingEnvironment,
-                null, null, _fileSystem, null, null);
-
-            Stream stream = CreateStream("body {background:#EE7600; color:#FFF;}");
-            _fileSystem.AddFile("styles.css", stream);
-        }
-
-        [TearDown]
-        public void TearDownFileSystem()
-        {
-            // Delete all files
-            Purge((PhysicalFileSystem)_fileSystem, string.Empty);
-            _fileSystem = null;
-        }
-
-        private IStylesheetRepository CreateRepository()
-        {
-            var globalSettings = new GlobalSettings();
-            return new StylesheetRepository(_fileSystems);
-        }
-
-        [Test]
-        public void Can_Instantiate_Repository()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                // Act
-                IStylesheetRepository repository = CreateRepository();
-
-                // Assert
-                Assert.That(repository, Is.Not.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Add()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                // Act
-                var stylesheet = new Stylesheet("test-add.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                // Assert
-                Assert.That(_fileSystem.FileExists("test-add.css"), Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                // Act
-                var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                IStylesheet stylesheetUpdate = repository.Get("test-update.css");
-                stylesheetUpdate.Content = "body { color:#000; }";
-                repository.Save(stylesheetUpdate);
-
-                IStylesheet stylesheetUpdated = repository.Get("test-update.css");
-
-                // Assert
-                Assert.That(stylesheetUpdated, Is.Not.Null);
-                Assert.That(stylesheetUpdated.HasIdentity, Is.True);
-                Assert.That(stylesheetUpdated.Content, Is.EqualTo("body { color:#000; }"));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_With_Property()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                // Act
-                IStylesheet stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-size:2em;"));
-
-                repository.Save(stylesheet);
-
-                // re-get
-                stylesheet = repository.Get(stylesheet.Name);
-
-                // Assert
-                Assert.That(stylesheet.Content, Is.EqualTo("body { color:#000; } .bold {font-weight:bold;}\r\n\r\n/**umb_name:Test*/\r\np {\r\n\tfont-size:2em;\r\n}".Replace("\r\n", Environment.NewLine)));
-                Assert.AreEqual(1, stylesheet.Properties.Count());
-            }
-        }
-
-        [Test]
-        public void Throws_When_Adding_Duplicate_Properties()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                // Act
-                var stylesheet = new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-size:2em;"));
-
-                Assert.Throws<DuplicateNameException>(() => stylesheet.AddProperty(new StylesheetProperty("test", "p", "font-size:2em;")));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                // Act
-                var stylesheet = new Stylesheet("test-delete.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                repository.Delete(stylesheet);
-
-                // Assert
-                Assert.That(_fileSystem.FileExists("test-delete.css"), Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                // Act
-                IStylesheet stylesheet = repository.Get("styles.css");
-
-                // Assert
-                Assert.That(stylesheet, Is.Not.Null);
-                Assert.That(stylesheet.HasIdentity, Is.True);
-                Assert.That(stylesheet.Content, Is.EqualTo("body {background:#EE7600; color:#FFF;}"));
-                //// Assert.That(repository.ValidateStylesheet(stylesheet), Is.True); //TODO this can't be activated before we handle file systems correct
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                var stylesheet = new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                // Act
-                IEnumerable<IStylesheet> stylesheets = repository.GetMany();
-
-                // Assert
-                Assert.That(stylesheets, Is.Not.Null);
-                Assert.That(stylesheets.Any(), Is.True);
-                Assert.That(stylesheets.Any(x => x == null), Is.False);
-                Assert.That(stylesheets.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_With_Params()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                var stylesheet = new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                // Act
-                IEnumerable<IStylesheet> stylesheets = repository.GetMany("styles-v2.css", "styles.css");
-
-                // Assert
-                Assert.That(stylesheets, Is.Not.Null);
-                Assert.That(stylesheets.Any(), Is.True);
-                Assert.That(stylesheets.Any(x => x == null), Is.False);
-                Assert.That(stylesheets.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists()
-        {
-            // Arrange
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                // Act
-                bool exists = repository.Exists("styles.css");
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void PathTests()
-        {
-            // unless noted otherwise, no changes / 7.2.8
-            using (ScopeProvider.CreateScope())
-            {
-                IStylesheetRepository repository = CreateRepository();
-
-                IStylesheet stylesheet = new Stylesheet("test-path-1.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                Assert.IsTrue(_fileSystem.FileExists("test-path-1.css"));
-                Assert.AreEqual("test-path-1.css", stylesheet.Path);
-                Assert.AreEqual("/css/test-path-1.css", stylesheet.VirtualPath);
-
-                stylesheet = new Stylesheet("path-2/test-path-2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.css"));
-                Assert.AreEqual("path-2\\test-path-2.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
-                Assert.AreEqual("/css/path-2/test-path-2.css", stylesheet.VirtualPath);
-
-                stylesheet = repository.Get("path-2/test-path-2.css");
-                Assert.IsNotNull(stylesheet);
-                Assert.AreEqual("path-2\\test-path-2.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
-                Assert.AreEqual("/css/path-2/test-path-2.css", stylesheet.VirtualPath);
-
-                stylesheet = new Stylesheet("path-2\\test-path-3.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.css"));
-                Assert.AreEqual("path-2\\test-path-3.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
-                Assert.AreEqual("/css/path-2/test-path-3.css", stylesheet.VirtualPath);
-
-                stylesheet = repository.Get("path-2/test-path-3.css");
-                Assert.IsNotNull(stylesheet);
-                Assert.AreEqual("path-2\\test-path-3.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
-                Assert.AreEqual("/css/path-2/test-path-3.css", stylesheet.VirtualPath);
-
-                stylesheet = repository.Get("path-2\\test-path-3.css");
-                Assert.IsNotNull(stylesheet);
-                Assert.AreEqual("path-2\\test-path-3.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
-                Assert.AreEqual("/css/path-2/test-path-3.css", stylesheet.VirtualPath);
-
-                stylesheet = new Stylesheet("..\\test-path-4.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                Assert.Throws<UnauthorizedAccessException>(() =>
-                    repository.Save(stylesheet));
-
-                stylesheet = new Stylesheet("\\test-path-5.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
-                repository.Save(stylesheet);
-
-                stylesheet = repository.Get("\\test-path-5.css");
-                Assert.IsNotNull(stylesheet);
-                Assert.AreEqual("test-path-5.css", stylesheet.Path);
-                Assert.AreEqual("/css/test-path-5.css", stylesheet.VirtualPath);
-
-                stylesheet = repository.Get("missing.css");
-                Assert.IsNull(stylesheet);
-
-                // #7713 changes behaviour to return null when outside the filesystem
-                // to accomodate changing the CSS path and not flooding the backoffice with errors
-                stylesheet = repository.Get("..\\test-path-4.css"); // outside the filesystem, does not exist
-                Assert.IsNull(stylesheet);
-
-                stylesheet = repository.Get("../packages.config"); // outside the filesystem, exists
-                Assert.IsNull(stylesheet);
-            }
-        }
-
-        private void Purge(PhysicalFileSystem fs, string path)
-        {
-            IEnumerable<string> files = fs.GetFiles(path, "*.css");
-            foreach (string file in files)
-            {
-                fs.DeleteFile(file);
-            }
-
-            IEnumerable<string> dirs = fs.GetDirectories(path);
-            foreach (string dir in dirs)
-            {
-                Purge(fs, dir);
-                fs.DeleteDirectory(dir);
-            }
-        }
-
-        protected Stream CreateStream(string contents = null)
-        {
-            if (string.IsNullOrEmpty(contents))
-            {
-                contents = "/* test */";
-            }
-
-            byte[] bytes = Encoding.UTF8.GetBytes(contents);
-            var stream = new MemoryStream(bytes);
-
-            return stream;
+            // Assert
+            Assert.That(repository, Is.Not.Null);
         }
     }
+
+    [Test]
+    public void Can_Perform_Add()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var stylesheet =
+                new Stylesheet("test-add.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            // Assert
+            Assert.That(_fileSystem.FileExists("test-add.css"), Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var stylesheet =
+                new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            var stylesheetUpdate = repository.Get("test-update.css");
+            stylesheetUpdate.Content = "body { color:#000; }";
+            repository.Save(stylesheetUpdate);
+
+            var stylesheetUpdated = repository.Get("test-update.css");
+
+            // Assert
+            Assert.That(stylesheetUpdated, Is.Not.Null);
+            Assert.That(stylesheetUpdated.HasIdentity, Is.True);
+            Assert.That(stylesheetUpdated.Content, Is.EqualTo("body { color:#000; }"));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_With_Property()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            IStylesheet stylesheet =
+                new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-size:2em;"));
+
+            repository.Save(stylesheet);
+
+            // re-get
+            stylesheet = repository.Get(stylesheet.Name);
+
+            // Assert
+            Assert.That(
+                stylesheet.Content,
+                Is.EqualTo(
+                    "body { color:#000; } .bold {font-weight:bold;}\r\n\r\n/**umb_name:Test*/\r\np {\r\n\tfont-size:2em;\r\n}"
+                        .Replace("\r\n", Environment.NewLine)));
+            Assert.AreEqual(1, stylesheet.Properties.Count());
+        }
+    }
+
+    [Test]
+    public void Throws_When_Adding_Duplicate_Properties()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var stylesheet =
+                new Stylesheet("test-update.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-size:2em;"));
+
+            Assert.Throws<DuplicateNameException>(() =>
+                stylesheet.AddProperty(new StylesheetProperty("test", "p", "font-size:2em;")));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var stylesheet =
+                new Stylesheet("test-delete.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            repository.Delete(stylesheet);
+
+            // Assert
+            Assert.That(_fileSystem.FileExists("test-delete.css"), Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var stylesheet = repository.Get("styles.css");
+
+            // Assert
+            Assert.That(stylesheet, Is.Not.Null);
+            Assert.That(stylesheet.HasIdentity, Is.True);
+            Assert.That(stylesheet.Content, Is.EqualTo("body {background:#EE7600; color:#FFF;}"));
+            //// Assert.That(repository.ValidateStylesheet(stylesheet), Is.True); //TODO this can't be activated before we handle file systems correct
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            var stylesheet =
+                new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            // Act
+            var stylesheets = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(stylesheets, Is.Not.Null);
+            Assert.That(stylesheets.Any(), Is.True);
+            Assert.That(stylesheets.Any(x => x == null), Is.False);
+            Assert.That(stylesheets.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_With_Params()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            var stylesheet =
+                new Stylesheet("styles-v2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            // Act
+            var stylesheets = repository.GetMany("styles-v2.css", "styles.css").ToArray();
+
+            // Assert
+            Assert.That(stylesheets, Is.Not.Null);
+            Assert.That(stylesheets.Any(), Is.True);
+            Assert.That(stylesheets.Any(x => x == null), Is.False);
+            Assert.That(stylesheets.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists()
+    {
+        // Arrange
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            // Act
+            var exists = repository.Exists("styles.css");
+
+            // Assert
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void PathTests()
+    {
+        // unless noted otherwise, no changes / 7.2.8
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository();
+
+            IStylesheet stylesheet =
+                new Stylesheet("test-path-1.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            Assert.IsTrue(_fileSystem.FileExists("test-path-1.css"));
+            Assert.AreEqual("test-path-1.css", stylesheet.Path);
+            Assert.AreEqual("/css/test-path-1.css", stylesheet.VirtualPath);
+
+            stylesheet =
+                new Stylesheet("path-2/test-path-2.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-2.css"));
+            Assert.AreEqual("path-2\\test-path-2.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
+            Assert.AreEqual("/css/path-2/test-path-2.css", stylesheet.VirtualPath);
+
+            stylesheet = repository.Get("path-2/test-path-2.css");
+            Assert.IsNotNull(stylesheet);
+            Assert.AreEqual("path-2\\test-path-2.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
+            Assert.AreEqual("/css/path-2/test-path-2.css", stylesheet.VirtualPath);
+
+            stylesheet =
+                new Stylesheet("path-2\\test-path-3.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            Assert.IsTrue(_fileSystem.FileExists("path-2/test-path-3.css"));
+            Assert.AreEqual("path-2\\test-path-3.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
+            Assert.AreEqual("/css/path-2/test-path-3.css", stylesheet.VirtualPath);
+
+            stylesheet = repository.Get("path-2/test-path-3.css");
+            Assert.IsNotNull(stylesheet);
+            Assert.AreEqual("path-2\\test-path-3.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
+            Assert.AreEqual("/css/path-2/test-path-3.css", stylesheet.VirtualPath);
+
+            stylesheet = repository.Get("path-2\\test-path-3.css");
+            Assert.IsNotNull(stylesheet);
+            Assert.AreEqual("path-2\\test-path-3.css".Replace("\\", $"{Path.DirectorySeparatorChar}"), stylesheet.Path);
+            Assert.AreEqual("/css/path-2/test-path-3.css", stylesheet.VirtualPath);
+
+            stylesheet =
+                new Stylesheet("..\\test-path-4.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            Assert.Throws<UnauthorizedAccessException>(() =>
+                repository.Save(stylesheet));
+
+            stylesheet =
+                new Stylesheet("\\test-path-5.css") { Content = "body { color:#000; } .bold {font-weight:bold;}" };
+            repository.Save(stylesheet);
+
+            stylesheet = repository.Get("\\test-path-5.css");
+            Assert.IsNotNull(stylesheet);
+            Assert.AreEqual("test-path-5.css", stylesheet.Path);
+            Assert.AreEqual("/css/test-path-5.css", stylesheet.VirtualPath);
+
+            stylesheet = repository.Get("missing.css");
+            Assert.IsNull(stylesheet);
+
+            // #7713 changes behaviour to return null when outside the filesystem
+            // to accomodate changing the CSS path and not flooding the backoffice with errors
+            stylesheet = repository.Get("..\\test-path-4.css"); // outside the filesystem, does not exist
+            Assert.IsNull(stylesheet);
+
+            stylesheet = repository.Get("../packages.config"); // outside the filesystem, exists
+            Assert.IsNull(stylesheet);
+        }
+    }
+
+    private void Purge(PhysicalFileSystem fs, string path)
+    {
+        var files = fs.GetFiles(path, "*.css");
+        foreach (var file in files)
+        {
+            fs.DeleteFile(file);
+        }
+
+        var dirs = fs.GetDirectories(path);
+        foreach (var dir in dirs)
+        {
+            Purge(fs, dir);
+            fs.DeleteDirectory(dir);
+        }
+    }
+
+    protected Stream CreateStream(string contents = null)
+    {
+        if (string.IsNullOrEmpty(contents))
+        {
+            contents = "/* test */";
+        }
+
+        var bytes = Encoding.UTF8.GetBytes(contents);
+        var stream = new MemoryStream(bytes);
+
+        return stream;
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs
index 2432f754f4..1ce5eeefd9 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TagRepositoryTest.cs
@@ -1,14 +1,12 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -16,1045 +14,956 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class TagRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class TagRepositoryTest : UmbracoIntegrationTest
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
+
+    private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
+
+    private IMediaRepository MediaRepository => GetRequiredService<IMediaRepository>();
+
+    private IMediaTypeRepository MediaTypeRepository => GetRequiredService<IMediaTypeRepository>();
+
+    [Test]
+    public void Can_Perform_Add_On_Repository()
     {
-        private IFileService FileService => GetRequiredService<IFileService>();
-
-        private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
-
-        private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
-
-        private IMediaRepository MediaRepository => GetRequiredService<IMediaRepository>();
-
-        private IMediaTypeRepository MediaTypeRepository => GetRequiredService<IMediaTypeRepository>();
-
-        [Test]
-        public void Can_Perform_Add_On_Repository()
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                TagRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                var tag = new Tag
-                {
-                    Group = "Test",
-                    Text = "Test"
-                };
+            var tag = new Tag { Group = "Test", Text = "Test" };
 
-                repository.Save(tag);
+            repository.Save(tag);
 
-                Assert.That(tag.HasIdentity, Is.True);
-            }
+            Assert.That(tag.HasIdentity, Is.True);
         }
-
-        [Test]
-        public void Can_Perform_Multiple_Adds_On_Repository()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                TagRepository repository = CreateRepository(provider);
-
-                var tag = new Tag
-                {
-                    Group = "Test",
-                    Text = "Test"
-                };
-
-                repository.Save(tag);
-
-                var tag2 = new Tag
-                {
-                    Group = "Test",
-                    Text = "Test2"
-                };
-
-                repository.Save(tag2);
-
-                Assert.That(tag.HasIdentity, Is.True);
-                Assert.That(tag2.HasIdentity, Is.True);
-                Assert.AreNotEqual(tag.Id, tag2.Id);
-            }
-        }
-
-        [Test]
-        public void Can_Create_Tag_Relations()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Assert.AreEqual(2, repository.GetTagsForEntity(content.Id).Count());
-            }
-        }
-
-        [Test]
-        public void Can_Append_Tag_Relations()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                    {
-                        new Tag { Text = "tag3", Group = "test" },
-                        new Tag { Text = "tag4", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags2,
-                    false);
-
-                Assert.AreEqual(4, repository.GetTagsForEntity(content.Id).Count());
-            }
-        }
-
-        [Test]
-        public void Can_Replace_Tag_Relations()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                    {
-                        new Tag { Text = "tag3", Group = "test" },
-                        new Tag { Text = "tag4", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags2,
-                    true);
-
-                ITag[] result = repository.GetTagsForEntity(content.Id).ToArray();
-                Assert.AreEqual(2, result.Length);
-                Assert.AreEqual("tag3", result[0].Text);
-                Assert.AreEqual("tag4", result[1].Text);
-            }
-        }
-
-        [Test]
-        public void Can_Merge_Tag_Relations()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                    {
-                        new Tag { Text = "tag2", Group = "test" },
-                        new Tag { Text = "tag3", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags2,
-                    false);
-
-                IEnumerable<ITag> result = repository.GetTagsForEntity(content.Id);
-                Assert.AreEqual(3, result.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Clear_Tag_Relations()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    Enumerable.Empty<ITag>(),
-                    true);
-
-                IEnumerable<ITag> result = repository.GetTagsForEntity(content.Id);
-                Assert.AreEqual(0, result.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Remove_Specific_Tags_From_Property()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                        new Tag { Text = "tag3", Group = "test" },
-                        new Tag { Text = "tag4", Group = "test" }
-                    };
-                repository.Assign(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tagsToRemove = new[]
-                    {
-                        new Tag { Text = "tag2", Group = "test" },
-                        new Tag { Text = "tag3", Group = "test" }
-                    };
-                repository.Remove(
-                    content.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tagsToRemove);
-
-                ITag[] result = repository.GetTagsForEntity(content.Id).ToArray();
-                Assert.AreEqual(2, result.Length);
-                Assert.AreEqual("tag1", result[0].Text);
-                Assert.AreEqual("tag4", result[1].Text);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Content_By_Id()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-                Content content2 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content2);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                        new Tag { Text = "tag3", Group = "test" },
-                        new Tag { Text = "tag4", Group = "test" }
-                    };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" }
-                    };
-                repository.Assign(
-                    content2.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags2,
-                    false);
-
-                IEnumerable<ITag> result = repository.GetTagsForEntity(content2.Id);
-                Assert.AreEqual(2, result.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Content_By_Key()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-                Content content2 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content2);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                        new Tag { Text = "tag3", Group = "test" },
-                        new Tag { Text = "tag4", Group = "test" }
-                    };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" }
-                    };
-                repository.Assign(
-                    content2.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags2,
-                    false);
-
-                // get by key
-                IEnumerable<ITag> result = repository.GetTagsForEntity(content2.Key);
-                Assert.AreEqual(2, result.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_All()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-                Content content2 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content2);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                    {
-                        new Tag { Text = "tag1", Group = "test" },
-                        new Tag { Text = "tag2", Group = "test" },
-                        new Tag { Text = "tag3", Group = "test" },
-                        new Tag { Text = "tag4", Group = "test" }
-                    };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                IEnumerable<ITag> result = repository.GetMany();
-                Assert.AreEqual(4, result.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_All_With_Ids()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-                Content content2 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content2);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test" },
-                    new Tag { Text = "tag3", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                // TODO: This would be nice to be able to map the ids back but unfortunately we are not doing this
-                // var result = repository.GetAll(new[] {tags[0].Id, tags[1].Id, tags[2].Id});
-                ITag[] all = repository.GetMany().ToArray();
-
-                IEnumerable<ITag> result = repository.GetMany(all[0].Id, all[1].Id, all[2].Id);
-                Assert.AreEqual(3, result.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Content_For_Group()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-                Content content2 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content2);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" },
-                    new Tag { Text = "tag3", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test1" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test" }
-                };
-                repository.Assign(
-                    content2.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags2,
-                    false);
-
-                IEnumerable<ITag> result = repository.GetTagsForEntity(content1.Id, "test1");
-                Assert.AreEqual(2, result.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Property_By_Id()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test" },
-                    new Tag { Text = "tag3", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.Last().Id,
-                    tags2,
-                    false);
-
-                ITag[] result1 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.First().Alias).ToArray();
-                ITag[] result2 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.Last().Alias).ToArray();
-                Assert.AreEqual(4, result1.Length);
-                Assert.AreEqual(2, result2.Length);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Property_By_Key()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test" },
-                    new Tag { Text = "tag3", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.Last().Id,
-                    tags2,
-                    false);
-
-                ITag[] result1 = repository.GetTagsForProperty(content1.Key, contentType.PropertyTypes.First().Alias).ToArray();
-                ITag[] result2 = repository.GetTagsForProperty(content1.Key, contentType.PropertyTypes.Last().Alias).ToArray();
-                Assert.AreEqual(4, result1.Length);
-                Assert.AreEqual(2, result2.Length);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Property_For_Group()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" },
-                    new Tag { Text = "tag3", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test1" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.Last().Id,
-                    tags2,
-                    false);
-
-                ITag[] result1 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.First().Alias, "test1").ToArray();
-                ITag[] result2 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.Last().Alias, "test1").ToArray();
-
-                Assert.AreEqual(2, result1.Length);
-                Assert.AreEqual(1, result2.Length);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Entity_Type()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
-                MediaTypeRepository.Save(mediaType);
-
-                Media media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
-                MediaRepository.Save(media1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" },
-                    new Tag { Text = "tag3", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test1" }
-                };
-                repository.Assign(
-                    media1.Id,
-                    mediaType.PropertyTypes.Last().Id,
-                    tags2,
-                    false);
-
-                ITag[] result1 = repository.GetTagsForEntityType(TaggableObjectTypes.Content).ToArray();
-                ITag[] result2 = repository.GetTagsForEntityType(TaggableObjectTypes.Media).ToArray();
-                ITag[] result3 = repository.GetTagsForEntityType(TaggableObjectTypes.All).ToArray();
-
-                Assert.AreEqual(3, result1.Length);
-                Assert.AreEqual(2, result2.Length);
-                Assert.AreEqual(4, result3.Length);
-
-                Assert.AreEqual(1, result1.Single(x => x.Text == "tag1").NodeCount);
-                Assert.AreEqual(2, result3.Single(x => x.Text == "tag1").NodeCount);
-                Assert.AreEqual(1, result3.Single(x => x.Text == "tag4").NodeCount);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tags_For_Entity_Type_For_Group()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
-                MediaTypeRepository.Save(mediaType);
-
-                Media media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
-                MediaRepository.Save(media1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" },
-                    new Tag { Text = "tag3", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test1" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" }
-                };
-                repository.Assign(
-                    media1.Id,
-                    mediaType.PropertyTypes.Last().Id,
-                    tags2,
-                    false);
-
-                ITag[] result1 = repository.GetTagsForEntityType(TaggableObjectTypes.Content,  "test1").ToArray();
-                ITag[] result2 = repository.GetTagsForEntityType(TaggableObjectTypes.Media, "test1").ToArray();
-
-                Assert.AreEqual(2, result1.Length);
-                Assert.AreEqual(1, result2.Length);
-            }
-        }
-
-        [Test]
-        public void Cascade_Deletes_Tag_Relations()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test" },
-                    new Tag { Text = "tag3", Group = "test" },
-                    new Tag { Text = "tag4", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                DocumentRepository.Delete(content1);
-
-                Assert.AreEqual(0, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = content1.Id, propTypeId = contentType.PropertyTypes.First().Id }));
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tagged_Entities_For_Tag_Group()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                Content content2 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content2);
-
-                MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
-                MediaTypeRepository.Save(mediaType);
-
-                Media media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
-                MediaRepository.Save(media1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag {Text = "tag1", Group = "test"},
-                    new Tag {Text = "tag2", Group = "test1"},
-                    new Tag {Text = "tag3", Group = "test"}
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" },
-                    new Tag { Text = "tag3", Group = "test" }
-                };
-                repository.Assign(
-                    content2.Id,
-                    contentType.PropertyTypes.Last().Id,
-                    tags2,
-                    false);
-
-                Tag[] tags3 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" }
-                };
-                repository.Assign(
-                    media1.Id,
-                    mediaType.PropertyTypes.Last().Id,
-                    tags3,
-                    false);
-
-                TaggedEntity[] contentTestIds = repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Content, "test").ToArray();
-
-                // there are two content items tagged against the 'test' group
-                Assert.AreEqual(2, contentTestIds.Length);
-
-                // there are a total of two property types tagged against the 'test' group
-                Assert.AreEqual(2, contentTestIds.SelectMany(x => x.TaggedProperties).Count());
-
-                // there are a total of 2 tags tagged against the 'test' group
-                Assert.AreEqual(2, contentTestIds.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct().Count());
-
-                TaggedEntity[] contentTest1Ids = repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Content, "test1").ToArray();
-
-                // there are two content items tagged against the 'test1' group
-                Assert.AreEqual(2, contentTest1Ids.Length);
-
-                // there are a total of two property types tagged against the 'test1' group
-                Assert.AreEqual(2, contentTest1Ids.SelectMany(x => x.TaggedProperties).Count());
-
-                // there are a total of 1 tags tagged against the 'test1' group
-                Assert.AreEqual(1, contentTest1Ids.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct().Count());
-
-                IEnumerable<TaggedEntity> mediaTestIds = repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Media, "test");
-                Assert.AreEqual(1, mediaTestIds.Count());
-
-                IEnumerable<TaggedEntity> mediaTest1Ids = repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Media, "test1");
-                Assert.AreEqual(1, mediaTest1Ids.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_Tagged_Entities_For_Tag()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (ScopeProvider.CreateScope())
-            {
-                // create data to relate to
-                // We have to create and save a template, otherwise we get an FK violation on contentType.
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
-                ContentTypeRepository.Save(contentType);
-
-                Content content1 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content1);
-
-                Content content2 = ContentBuilder.CreateSimpleContent(contentType);
-                DocumentRepository.Save(content2);
-
-                MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
-                MediaTypeRepository.Save(mediaType);
-
-                Media media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
-                MediaRepository.Save(media1);
-
-                TagRepository repository = CreateRepository(provider);
-                Tag[] tags = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" },
-                    new Tag { Text = "tag3", Group = "test" }
-                };
-                repository.Assign(
-                    content1.Id,
-                    contentType.PropertyTypes.First().Id,
-                    tags,
-                    false);
-
-                Tag[] tags2 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" },
-                };
-                repository.Assign(
-                    content2.Id,
-                    contentType.PropertyTypes.Last().Id,
-                    tags2,
-                    false);
-
-                Tag[] tags3 = new[]
-                {
-                    new Tag { Text = "tag1", Group = "test" },
-                    new Tag { Text = "tag2", Group = "test1" }
-                };
-                repository.Assign(
-                    media1.Id,
-                    mediaType.PropertyTypes.Last().Id,
-                    tags3,
-                    false);
-
-                TaggedEntity[] contentTestIds = repository.GetTaggedEntitiesByTag(TaggableObjectTypes.Content, "tag1").ToArray();
-
-                // there are two content items tagged against the 'tag1' tag
-                Assert.AreEqual(2, contentTestIds.Length);
-
-                // there are a total of two property types tagged against the 'tag1' tag
-                Assert.AreEqual(2, contentTestIds.SelectMany(x => x.TaggedProperties).Count());
-
-                // there are a total of 1 tags since we're only looking against one tag
-                Assert.AreEqual(1, contentTestIds.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct().Count());
-
-                TaggedEntity[] contentTest1Ids = repository.GetTaggedEntitiesByTag(TaggableObjectTypes.Content, "tag3").ToArray();
-
-                // there are 1 content items tagged against the 'tag3' tag
-                Assert.AreEqual(1, contentTest1Ids.Length);
-
-                // there are a total of two property types tagged against the 'tag3' tag
-                Assert.AreEqual(1, contentTest1Ids.SelectMany(x => x.TaggedProperties).Count());
-
-                // there are a total of 1 tags since we're only looking against one tag
-                Assert.AreEqual(1, contentTest1Ids.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct().Count());
-
-                IEnumerable<TaggedEntity> mediaTestIds = repository.GetTaggedEntitiesByTag(TaggableObjectTypes.Media, "tag1");
-                Assert.AreEqual(1, mediaTestIds.Count());
-            }
-        }
-
-        private TagRepository CreateRepository(IScopeProvider provider) =>
-            new TagRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<TagRepository>());
     }
+
+    [Test]
+    public void Can_Perform_Multiple_Adds_On_Repository()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var tag = new Tag { Group = "Test", Text = "Test" };
+
+            repository.Save(tag);
+
+            var tag2 = new Tag { Group = "Test", Text = "Test2" };
+
+            repository.Save(tag2);
+
+            Assert.That(tag.HasIdentity, Is.True);
+            Assert.That(tag2.HasIdentity, Is.True);
+            Assert.AreNotEqual(tag.Id, tag2.Id);
+        }
+    }
+
+    [Test]
+    public void Can_Create_Tag_Relations()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Assert.AreEqual(2, repository.GetTagsForEntity(content.Id).Count());
+        }
+    }
+
+    [Test]
+    public void Can_Append_Tag_Relations()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag3", Group = "test" }, new Tag { Text = "tag4", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags2,
+                false);
+
+            Assert.AreEqual(4, repository.GetTagsForEntity(content.Id).Count());
+        }
+    }
+
+    [Test]
+    public void Can_Replace_Tag_Relations()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag3", Group = "test" }, new Tag { Text = "tag4", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags2);
+
+            var result = repository.GetTagsForEntity(content.Id).ToArray();
+            Assert.AreEqual(2, result.Length);
+            Assert.AreEqual("tag3", result[0].Text);
+            Assert.AreEqual("tag4", result[1].Text);
+        }
+    }
+
+    [Test]
+    public void Can_Merge_Tag_Relations()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag2", Group = "test" }, new Tag { Text = "tag3", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags2,
+                false);
+
+            var result = repository.GetTagsForEntity(content.Id);
+            Assert.AreEqual(3, result.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Clear_Tag_Relations()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                Enumerable.Empty<ITag>());
+
+            var result = repository.GetTagsForEntity(content.Id);
+            Assert.AreEqual(0, result.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Remove_Specific_Tags_From_Property()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tagsToRemove = { new Tag { Text = "tag2", Group = "test" }, new Tag { Text = "tag3", Group = "test" } };
+            repository.Remove(
+                content.Id,
+                contentType.PropertyTypes.First().Id,
+                tagsToRemove);
+
+            var result = repository.GetTagsForEntity(content.Id).ToArray();
+            Assert.AreEqual(2, result.Length);
+            Assert.AreEqual("tag1", result[0].Text);
+            Assert.AreEqual("tag4", result[1].Text);
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Content_By_Id()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+            var content2 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content2);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content2.Id,
+                contentType.PropertyTypes.First().Id,
+                tags2,
+                false);
+
+            var result = repository.GetTagsForEntity(content2.Id);
+            Assert.AreEqual(2, result.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Content_By_Key()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+            var content2 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content2);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content2.Id,
+                contentType.PropertyTypes.First().Id,
+                tags2,
+                false);
+
+            // get by key
+            var result = repository.GetTagsForEntity(content2.Key);
+            Assert.AreEqual(2, result.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_All()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+            var content2 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content2);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            var result = repository.GetMany();
+            Assert.AreEqual(4, result.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_All_With_Ids()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+            var content2 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content2);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            // TODO: This would be nice to be able to map the ids back but unfortunately we are not doing this
+            // var result = repository.GetAll(new[] {tags[0].Id, tags[1].Id, tags[2].Id});
+            var all = repository.GetMany().ToArray();
+
+            var result = repository.GetMany(all[0].Id, all[1].Id, all[2].Id);
+            Assert.AreEqual(3, result.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Content_For_Group()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+            var content2 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content2);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test1"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test1"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content2.Id,
+                contentType.PropertyTypes.First().Id,
+                tags2,
+                false);
+
+            var result = repository.GetTagsForEntity(content1.Id, "test1");
+            Assert.AreEqual(2, result.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Property_By_Id()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.Last().Id,
+                tags2,
+                false);
+
+            var result1 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.First().Alias).ToArray();
+            var result2 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.Last().Alias).ToArray();
+            Assert.AreEqual(4, result1.Length);
+            Assert.AreEqual(2, result2.Length);
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Property_By_Key()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test" } };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.Last().Id,
+                tags2,
+                false);
+
+            var result1 = repository.GetTagsForProperty(content1.Key, contentType.PropertyTypes.First().Alias)
+                .ToArray();
+            var result2 = repository.GetTagsForProperty(content1.Key, contentType.PropertyTypes.Last().Alias).ToArray();
+            Assert.AreEqual(4, result1.Length);
+            Assert.AreEqual(2, result2.Length);
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Property_For_Group()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test1"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test1"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test1" } };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.Last().Id,
+                tags2,
+                false);
+
+            var result1 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.First().Alias, "test1")
+                .ToArray();
+            var result2 = repository.GetTagsForProperty(content1.Id, contentType.PropertyTypes.Last().Alias, "test1")
+                .ToArray();
+
+            Assert.AreEqual(2, result1.Length);
+            Assert.AreEqual(1, result2.Length);
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Entity_Type()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
+            MediaTypeRepository.Save(mediaType);
+
+            var media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
+            MediaRepository.Save(media1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test1"},
+                new Tag {Text = "tag3", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag4", Group = "test1" } };
+            repository.Assign(
+                media1.Id,
+                mediaType.PropertyTypes.Last().Id,
+                tags2,
+                false);
+
+            var result1 = repository.GetTagsForEntityType(TaggableObjectTypes.Content).ToArray();
+            var result2 = repository.GetTagsForEntityType(TaggableObjectTypes.Media).ToArray();
+            var result3 = repository.GetTagsForEntityType(TaggableObjectTypes.All).ToArray();
+
+            Assert.AreEqual(3, result1.Length);
+            Assert.AreEqual(2, result2.Length);
+            Assert.AreEqual(4, result3.Length);
+
+            Assert.AreEqual(1, result1.Single(x => x.Text == "tag1").NodeCount);
+            Assert.AreEqual(2, result3.Single(x => x.Text == "tag1").NodeCount);
+            Assert.AreEqual(1, result3.Single(x => x.Text == "tag4").NodeCount);
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tags_For_Entity_Type_For_Group()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
+            MediaTypeRepository.Save(mediaType);
+
+            var media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
+            MediaRepository.Save(media1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test1"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test1"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test1" } };
+            repository.Assign(
+                media1.Id,
+                mediaType.PropertyTypes.Last().Id,
+                tags2,
+                false);
+
+            var result1 = repository.GetTagsForEntityType(TaggableObjectTypes.Content, "test1").ToArray();
+            var result2 = repository.GetTagsForEntityType(TaggableObjectTypes.Media, "test1").ToArray();
+
+            Assert.AreEqual(2, result1.Length);
+            Assert.AreEqual(1, result2.Length);
+        }
+    }
+
+    [Test]
+    public void Cascade_Deletes_Tag_Relations()
+    {
+        var provider = ScopeProvider;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test"},
+                new Tag {Text = "tag3", Group = "test"}, new Tag {Text = "tag4", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            DocumentRepository.Delete(content1);
+
+            Assert.AreEqual(0, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = content1.Id, propTypeId = contentType.PropertyTypes.First().Id }));
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tagged_Entities_For_Tag_Group()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var content2 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content2);
+
+            var mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
+            MediaTypeRepository.Save(mediaType);
+
+            var media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
+            MediaRepository.Save(media1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test1"},
+                new Tag {Text = "tag3", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test1"},
+                new Tag {Text = "tag3", Group = "test"}
+            };
+            repository.Assign(
+                content2.Id,
+                contentType.PropertyTypes.Last().Id,
+                tags2,
+                false);
+
+            Tag[] tags3 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test1" } };
+            repository.Assign(
+                media1.Id,
+                mediaType.PropertyTypes.Last().Id,
+                tags3,
+                false);
+
+            var contentTestIds = repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Content, "test").ToArray();
+
+            // there are two content items tagged against the 'test' group
+            Assert.AreEqual(2, contentTestIds.Length);
+
+            // there are a total of two property types tagged against the 'test' group
+            Assert.AreEqual(2, contentTestIds.SelectMany(x => x.TaggedProperties).Count());
+
+            // there are a total of 2 tags tagged against the 'test' group
+            Assert.AreEqual(
+                2,
+                contentTestIds.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct()
+                    .Count());
+
+            var contentTest1Ids =
+                repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Content, "test1").ToArray();
+
+            // there are two content items tagged against the 'test1' group
+            Assert.AreEqual(2, contentTest1Ids.Length);
+
+            // there are a total of two property types tagged against the 'test1' group
+            Assert.AreEqual(2, contentTest1Ids.SelectMany(x => x.TaggedProperties).Count());
+
+            // there are a total of 1 tags tagged against the 'test1' group
+            Assert.AreEqual(
+                1,
+                contentTest1Ids.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct()
+                    .Count());
+
+            var mediaTestIds = repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Media, "test");
+            Assert.AreEqual(1, mediaTestIds.Count());
+
+            var mediaTest1Ids = repository.GetTaggedEntitiesByTagGroup(TaggableObjectTypes.Media, "test1");
+            Assert.AreEqual(1, mediaTest1Ids.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_Tagged_Entities_For_Tag()
+    {
+        var provider = ScopeProvider;
+        using (ScopeProvider.CreateScope())
+        {
+            // create data to relate to
+            // We have to create and save a template, otherwise we get an FK violation on contentType.
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("test", "Test", defaultTemplateId: template.Id);
+            ContentTypeRepository.Save(contentType);
+
+            var content1 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content1);
+
+            var content2 = ContentBuilder.CreateSimpleContent(contentType);
+            DocumentRepository.Save(content2);
+
+            var mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
+            MediaTypeRepository.Save(mediaType);
+
+            var media1 = MediaBuilder.CreateMediaImage(mediaType, -1);
+            MediaRepository.Save(media1);
+
+            var repository = CreateRepository(provider);
+            Tag[] tags =
+            {
+                new Tag {Text = "tag1", Group = "test"}, new Tag {Text = "tag2", Group = "test1"},
+                new Tag {Text = "tag3", Group = "test"}
+            };
+            repository.Assign(
+                content1.Id,
+                contentType.PropertyTypes.First().Id,
+                tags,
+                false);
+
+            Tag[] tags2 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test1" } };
+            repository.Assign(
+                content2.Id,
+                contentType.PropertyTypes.Last().Id,
+                tags2,
+                false);
+
+            Tag[] tags3 = { new Tag { Text = "tag1", Group = "test" }, new Tag { Text = "tag2", Group = "test1" } };
+            repository.Assign(
+                media1.Id,
+                mediaType.PropertyTypes.Last().Id,
+                tags3,
+                false);
+
+            var contentTestIds = repository.GetTaggedEntitiesByTag(TaggableObjectTypes.Content, "tag1").ToArray();
+
+            // there are two content items tagged against the 'tag1' tag
+            Assert.AreEqual(2, contentTestIds.Length);
+
+            // there are a total of two property types tagged against the 'tag1' tag
+            Assert.AreEqual(2, contentTestIds.SelectMany(x => x.TaggedProperties).Count());
+
+            // there are a total of 1 tags since we're only looking against one tag
+            Assert.AreEqual(
+                1,
+                contentTestIds.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct()
+                    .Count());
+
+            var contentTest1Ids = repository.GetTaggedEntitiesByTag(TaggableObjectTypes.Content, "tag3").ToArray();
+
+            // there are 1 content items tagged against the 'tag3' tag
+            Assert.AreEqual(1, contentTest1Ids.Length);
+
+            // there are a total of two property types tagged against the 'tag3' tag
+            Assert.AreEqual(1, contentTest1Ids.SelectMany(x => x.TaggedProperties).Count());
+
+            // there are a total of 1 tags since we're only looking against one tag
+            Assert.AreEqual(
+                1,
+                contentTest1Ids.SelectMany(x => x.TaggedProperties).SelectMany(x => x.Tags).Select(x => x.Id).Distinct()
+                    .Count());
+
+            var mediaTestIds = repository.GetTaggedEntitiesByTag(TaggableObjectTypes.Media, "tag1");
+            Assert.AreEqual(1, mediaTestIds.Count());
+        }
+    }
+
+    private TagRepository CreateRepository(IScopeProvider provider) =>
+        new((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<TagRepository>());
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
index b2315d16b5..bcf0f185d1 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
@@ -11,7 +11,6 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Hosting;
@@ -19,7 +18,6 @@ using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -30,622 +28,449 @@ using Umbraco.Cms.Tests.Integration.Implementations;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class TemplateRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class TemplateRepositoryTest : UmbracoIntegrationTest
+    [TearDown]
+    public void TearDown()
     {
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+        var testHelper = new TestHelper();
 
-        private FileSystems FileSystems => GetRequiredService<FileSystems>();
-        private IViewHelper ViewHelper => GetRequiredService<IViewHelper>();
-
-        private ITemplateRepository CreateRepository(IScopeProvider provider) =>
-            new TemplateRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<TemplateRepository>(), FileSystems, IOHelper, ShortStringHelper, ViewHelper);
-        
-        [Test]
-        public void Can_Instantiate_Repository()
+        // Delete all files
+        var fsViews = new PhysicalFileSystem(
+            IOHelper,
+            HostingEnvironment,
+            LoggerFactory.CreateLogger<PhysicalFileSystem>(),
+            HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.MvcViews),
+            HostingEnvironment.ToAbsolute(Constants.SystemDirectories.MvcViews));
+        var views = fsViews.GetFiles(string.Empty, "*.cshtml");
+        foreach (var file in views)
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                // Assert
-                Assert.That(repository, Is.Not.Null);
-            }
+            fsViews.DeleteFile(file);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Add_View()
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+
+    private FileSystems FileSystems => GetRequiredService<FileSystems>();
+    private IViewHelper ViewHelper => GetRequiredService<IViewHelper>();
+
+    private ITemplateRepository CreateRepository(IScopeProvider provider) =>
+        new TemplateRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<TemplateRepository>(), FileSystems, IOHelper, ShortStringHelper, ViewHelper);
+
+    [Test]
+    public void Can_Instantiate_Repository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                // Act
-                var template = new Template(ShortStringHelper, "test", "test");
-                repository.Save(template);
-
-                // Assert
-                Assert.That(repository.Get("test"), Is.Not.Null);
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
-            }
+            // Assert
+            Assert.That(repository, Is.Not.Null);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Add_View_With_Default_Content()
+    [Test]
+    public void Can_Perform_Add_View()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
+            // Act
+            var template = new Template(ShortStringHelper, "test", "test");
+            repository.Save(template);
 
-                // Act
-                var template = new Template(ShortStringHelper, "test", "test")
-                {
-                    Content = "mock-content"
-                };
-                repository.Save(template);
-
-                // Assert
-                Assert.That(repository.Get("test"), Is.Not.Null);
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
-                Assert.AreEqual("mock-content", template.Content.StripWhitespace());
-            }
+            // Assert
+            Assert.That(repository.Get("test"), Is.Not.Null);
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Add_View_With_Default_Content_With_Parent()
+    [Test]
+    public void Can_Perform_Add_View_With_Default_Content()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
+            // Act
+            var template = new Template(ShortStringHelper, "test", "test") { Content = "mock-content" };
+            repository.Save(template);
 
-                // NOTE: This has to be persisted first
-                var template = new Template(ShortStringHelper, "test", "test");
-                repository.Save(template);
-
-                // Act
-                var template2 = new Template(ShortStringHelper, "test2", "test2");
-                template2.SetMasterTemplate(template);
-                repository.Save(template2);
-
-                // Assert
-                Assert.That(repository.Get("test2"), Is.Not.Null);
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test2.cshtml"), Is.True);
-                Assert.AreEqual(
-                    "@usingUmbraco.Cms.Web.Common.PublishedModels;@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage @{ Layout = \"test.cshtml\";}".StripWhitespace(),
-                    template2.Content.StripWhitespace());
-            }
+            // Assert
+            Assert.That(repository.Get("test"), Is.Not.Null);
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
+            Assert.AreEqual("mock-content", template.Content.StripWhitespace());
         }
+    }
 
-        [Test]
-        public void Can_Perform_Add_Unique_Alias()
+    [Test]
+    public void Can_Perform_Add_View_With_Default_Content_With_Parent()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
+            // NOTE: This has to be persisted first
+            var template = new Template(ShortStringHelper, "test", "test");
+            repository.Save(template);
 
-                // Act
-                var template = new Template(ShortStringHelper, "test", "test")
-                {
-                    Content = "mock-content"
-                };
-                repository.Save(template);
+            // Act
+            var template2 = new Template(ShortStringHelper, "test2", "test2");
+            template2.SetMasterTemplate(template);
+            repository.Save(template2);
 
-                var template2 = new Template(ShortStringHelper, "test", "test")
-                {
-                    Content = "mock-content"
-                };
-                repository.Save(template2);
-
-                // Assert
-                Assert.AreEqual("test1", template2.Alias);
-            }
+            // Assert
+            Assert.That(repository.Get("test2"), Is.Not.Null);
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test2.cshtml"), Is.True);
+            Assert.AreEqual(
+                "@usingUmbraco.Cms.Web.Common.PublishedModels;@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage @{ Layout = \"test.cshtml\";}"
+                    .StripWhitespace(),
+                template2.Content.StripWhitespace());
         }
+    }
 
-        [Test]
-        public void Can_Perform_Update_Unique_Alias()
+    [Test]
+    public void Can_Perform_Add_Unique_Alias()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
+            // Act
+            var template = new Template(ShortStringHelper, "test", "test") { Content = "mock-content" };
+            repository.Save(template);
 
-                // Act
-                var template = new Template(ShortStringHelper, "test", "test")
-                {
-                    Content = "mock-content"
-                };
-                repository.Save(template);
+            var template2 = new Template(ShortStringHelper, "test", "test") { Content = "mock-content" };
+            repository.Save(template2);
 
-                var template2 = new Template(ShortStringHelper, "test1", "test1")
-                {
-                    Content = "mock-content"
-                };
-                repository.Save(template2);
-
-                template.Alias = "test1";
-                repository.Save(template);
-
-                // Assert
-                Assert.AreEqual("test11", template.Alias);
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test11.cshtml"), Is.True);
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.False);
-            }
+            // Assert
+            Assert.AreEqual("test1", template2.Alias);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Update_View()
+    [Test]
+    public void Can_Perform_Update_Unique_Alias()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
+            // Act
+            var template = new Template(ShortStringHelper, "test", "test") { Content = "mock-content" };
+            repository.Save(template);
 
-                // Act
-                var template = new Template(ShortStringHelper, "test", "test")
-                {
-                    Content = "mock-content"
-                };
-                repository.Save(template);
+            var template2 = new Template(ShortStringHelper, "test1", "test1") { Content = "mock-content" };
+            repository.Save(template2);
 
-                template.Content += "<html></html>";
-                repository.Save(template);
+            template.Alias = "test1";
+            repository.Save(template);
 
-                ITemplate updated = repository.Get("test");
-
-                // Assert
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
-                Assert.That(updated.Content, Is.EqualTo("mock-content" + "<html></html>"));
-            }
+            // Assert
+            Assert.AreEqual("test11", template.Alias);
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test11.cshtml"), Is.True);
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Delete_View()
+    [Test]
+    public void Can_Perform_Update_View()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
+            // Act
+            var template = new Template(ShortStringHelper, "test", "test") { Content = "mock-content" };
+            repository.Save(template);
 
-                var template = new Template(ShortStringHelper, "test", "test")
-                {
-                    Content = "mock-content"
-                };
-                repository.Save(template);
+            template.Content += "<html></html>";
+            repository.Save(template);
 
-                // Act
-                ITemplate templates = repository.Get("test");
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
-                repository.Delete(templates);
+            var updated = repository.Get("test");
 
-                // Assert
-                Assert.IsNull(repository.Get("test"));
-                Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.False);
-            }
+            // Assert
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
+            Assert.That(updated.Content, Is.EqualTo("mock-content" + "<html></html>"));
         }
+    }
 
-        [Test]
-        public void Can_Perform_Delete_When_Assigned_To_Doc()
+    [Test]
+    public void Can_Perform_Delete_View()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            var scopeAccessor = (IScopeAccessor)provider;
-            IDataTypeService dataTypeService = GetRequiredService<IDataTypeService>();
-            IFileService fileService = GetRequiredService<IFileService>();
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository templateRepository = CreateRepository(provider);
-                var globalSettings = new GlobalSettings();
-                var serializer = new JsonNetSerializer();
-                var tagRepository = new TagRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<TagRepository>());
-                var commonRepository = new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches, ShortStringHelper);
-                var languageRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<LanguageRepository>());
-                var contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<ContentTypeRepository>(), commonRepository, languageRepository, ShortStringHelper);
-                var relationTypeRepository = new RelationTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
-                var entityRepository = new EntityRepository(scopeAccessor, AppCaches.Disabled);
-                var relationRepository = new RelationRepository(scopeAccessor, LoggerFactory.CreateLogger<RelationRepository>(), relationTypeRepository, entityRepository);
-                var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
-                var dataValueReferences = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
-                var contentRepo = new DocumentRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<DocumentRepository>(), LoggerFactory, contentTypeRepository, templateRepository, tagRepository, languageRepository, relationRepository, relationTypeRepository, propertyEditors, dataValueReferences, dataTypeService, serializer, Mock.Of<IEventAggregator>());
+            var template = new Template(ShortStringHelper, "test", "test") { Content = "mock-content" };
+            repository.Save(template);
 
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                fileService.SaveTemplate(template); // else, FK violation on contentType!
+            // Act
+            var templates = repository.Get("test");
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
+            repository.Delete(templates);
 
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage2", "Textpage", defaultTemplateId: template.Id);
-                contentTypeRepository.Save(contentType);
-
-                Content textpage = ContentBuilder.CreateSimpleContent(contentType);
-                contentRepo.Save(textpage);
-
-                textpage.TemplateId = template.Id;
-                contentRepo.Save(textpage);
-
-                // Act
-                ITemplate templates = templateRepository.Get("textPage");
-                templateRepository.Delete(templates);
-
-                // Assert
-                Assert.IsNull(templateRepository.Get("textPage"));
-            }
+            // Assert
+            Assert.IsNull(repository.Get("test"));
+            Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Delete_On_Nested_Templates()
+    [Test]
+    public void Can_Perform_Delete_When_Assigned_To_Doc()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        var scopeAccessor = (IScopeAccessor)provider;
+        var dataTypeService = GetRequiredService<IDataTypeService>();
+        var fileService = GetRequiredService<IFileService>();
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var templateRepository = CreateRepository(provider);
+            var globalSettings = new GlobalSettings();
+            var serializer = new JsonNetSerializer();
+            var tagRepository = new TagRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<TagRepository>());
+            var commonRepository =
+                new ContentTypeCommonRepository(scopeAccessor, templateRepository, AppCaches, ShortStringHelper);
+            var languageRepository = new LanguageRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<LanguageRepository>());
+            var contentTypeRepository = new ContentTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<ContentTypeRepository>(), commonRepository, languageRepository, ShortStringHelper);
+            var relationTypeRepository = new RelationTypeRepository(scopeAccessor, AppCaches.Disabled, LoggerFactory.CreateLogger<RelationTypeRepository>());
+            var entityRepository = new EntityRepository(scopeAccessor, AppCaches.Disabled);
+            var relationRepository = new RelationRepository(scopeAccessor, LoggerFactory.CreateLogger<RelationRepository>(), relationTypeRepository, entityRepository);
+            var propertyEditors =
+                new PropertyEditorCollection(new DataEditorCollection(() => Enumerable.Empty<IDataEditor>()));
+            var dataValueReferences =
+                new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
+            var contentRepo = new DocumentRepository(
+                scopeAccessor,
+                AppCaches.Disabled,
+                LoggerFactory.CreateLogger<DocumentRepository>(),
+                LoggerFactory,
+                contentTypeRepository,
+                templateRepository,
+                tagRepository,
+                languageRepository,
+                relationRepository,
+                relationTypeRepository,
+                propertyEditors,
+                dataValueReferences,
+                dataTypeService,
+                serializer,
+                Mock.Of<IEventAggregator>());
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            fileService.SaveTemplate(template); // else, FK violation on contentType!
 
-                var parent = new Template(ShortStringHelper, "parent", "parent")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var child = new Template(ShortStringHelper, "child", "child")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                var baby = new Template(ShortStringHelper, "baby", "baby")
-                {
-                    Content = @"<%@ Master Language=""C#"" %>"
-                };
-                child.MasterTemplateAlias = parent.Alias;
-                child.MasterTemplateId = new Lazy<int>(() => parent.Id);
-                baby.MasterTemplateAlias = child.Alias;
-                baby.MasterTemplateId = new Lazy<int>(() => child.Id);
-                repository.Save(parent);
-                repository.Save(child);
-                repository.Save(baby);
+            var contentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage2", "Textpage", defaultTemplateId: template.Id);
+            contentTypeRepository.Save(contentType);
 
-                // Act
-                ITemplate templates = repository.Get("parent");
-                repository.Delete(templates);
+            var textpage = ContentBuilder.CreateSimpleContent(contentType);
+            contentRepo.Save(textpage);
 
-                // Assert
-                Assert.IsNull(repository.Get("test"));
-            }
+            textpage.TemplateId = template.Id;
+            contentRepo.Save(textpage);
+
+            // Act
+            var templates = templateRepository.Get("textPage");
+            templateRepository.Delete(templates);
+
+            // Assert
+            Assert.IsNull(templateRepository.Get("textPage"));
         }
+    }
 
-        [Test]
-        public void Can_Get_All()
+    [Test]
+    public void Can_Perform_Delete_On_Nested_Templates()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
+            var repository = CreateRepository(provider);
 
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                ITemplate[] created = CreateHierarchy(repository).ToArray();
-
-                // Act
-                IEnumerable<ITemplate> all = repository.GetAll();
-                IEnumerable<ITemplate> allByAlias = repository.GetAll("parent", "child2", "baby2", "notFound");
-                IEnumerable<ITemplate> allById = repository.GetMany(created[0].Id, created[2].Id, created[4].Id, created[5].Id, 999999);
-
-                // Assert
-                Assert.AreEqual(9, all.Count());
-                Assert.AreEqual(9, all.DistinctBy(x => x.Id).Count());
-
-                Assert.AreEqual(3, allByAlias.Count());
-                Assert.AreEqual(3, allByAlias.DistinctBy(x => x.Id).Count());
-
-                Assert.AreEqual(4, allById.Count());
-                Assert.AreEqual(4, allById.DistinctBy(x => x.Id).Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_Children()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                ITemplate[] created = CreateHierarchy(repository).ToArray();
-
-                // Act
-                IEnumerable<ITemplate> childrenById = repository.GetChildren(created[1].Id);
-
-                // Assert
-                Assert.AreEqual(2, childrenById.Count());
-                Assert.AreEqual(2, childrenById.DistinctBy(x => x.Id).Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_Children_At_Root()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                CreateHierarchy(repository).ToArray();
-
-                // Act
-                IEnumerable<ITemplate> children = repository.GetChildren(-1);
-
-                // Assert
-                Assert.AreEqual(1, children.Count());
-                Assert.AreEqual(1, children.DistinctBy(x => x.Id).Count());
-            }
-        }
-
-        [Test]
-        public void Can_Get_Descendants()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-                ITemplate[] created = CreateHierarchy(repository).ToArray();
-
-                // Act
-                IEnumerable<ITemplate> descendantsById = repository.GetDescendants(created[1].Id);
-
-                // Assert
-                Assert.AreEqual(3, descendantsById.Count());
-                Assert.AreEqual(3, descendantsById.DistinctBy(x => x.Id).Count());
-            }
-        }
-
-        [Test]
-        public void Path_Is_Set_Correctly_On_Creation()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                var parent = new Template(ShortStringHelper, "parent", "parent");
-                var child1 = new Template(ShortStringHelper, "child1", "child1");
-                var toddler1 = new Template(ShortStringHelper, "toddler1", "toddler1");
-                var toddler2 = new Template(ShortStringHelper, "toddler2", "toddler2");
-                var baby1 = new Template(ShortStringHelper, "baby1", "baby1");
-                var child2 = new Template(ShortStringHelper, "child2", "child2");
-                var toddler3 = new Template(ShortStringHelper, "toddler3", "toddler3");
-                var toddler4 = new Template(ShortStringHelper, "toddler4", "toddler4");
-                var baby2 = new Template(ShortStringHelper, "baby2", "baby2");
-
-                child1.MasterTemplateAlias = parent.Alias;
-                child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
-                child2.MasterTemplateAlias = parent.Alias;
-                child2.MasterTemplateId = new Lazy<int>(() => parent.Id);
-                toddler1.MasterTemplateAlias = child1.Alias;
-                toddler1.MasterTemplateId = new Lazy<int>(() => child1.Id);
-                toddler2.MasterTemplateAlias = child1.Alias;
-                toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
-                toddler3.MasterTemplateAlias = child2.Alias;
-                toddler3.MasterTemplateId = new Lazy<int>(() => child2.Id);
-                toddler4.MasterTemplateAlias = child2.Alias;
-                toddler4.MasterTemplateId = new Lazy<int>(() => child2.Id);
-                baby1.MasterTemplateAlias = toddler2.Alias;
-                baby1.MasterTemplateId = new Lazy<int>(() => toddler2.Id);
-                baby2.MasterTemplateAlias = toddler4.Alias;
-                baby2.MasterTemplateId = new Lazy<int>(() => toddler4.Id);
-
-                // Act
-                repository.Save(parent);
-                repository.Save(child1);
-                repository.Save(child2);
-                repository.Save(toddler1);
-                repository.Save(toddler2);
-                repository.Save(toddler3);
-                repository.Save(toddler4);
-                repository.Save(baby1);
-                repository.Save(baby2);
-
-                // Assert
-                Assert.AreEqual(string.Format("-1,{0}", parent.Id), parent.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1}", parent.Id, child1.Id), child1.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1}", parent.Id, child2.Id), child2.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1}", parent.Id, child2.Id), child2.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child1.Id, toddler1.Id), toddler1.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child1.Id, toddler2.Id), toddler2.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child2.Id, toddler3.Id), toddler3.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child2.Id, toddler4.Id), toddler4.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1},{2},{3}", parent.Id, child1.Id, toddler2.Id, baby1.Id), baby1.Path);
-                Assert.AreEqual(string.Format("-1,{0},{1},{2},{3}", parent.Id, child2.Id, toddler4.Id, baby2.Id), baby2.Path);
-            }
-        }
-
-        [Test]
-        public void Path_Is_Set_Correctly_On_Update()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                var parent = new Template(ShortStringHelper, "parent", "parent");
-                var child1 = new Template(ShortStringHelper, "child1", "child1");
-                var child2 = new Template(ShortStringHelper, "child2", "child2");
-                var toddler1 = new Template(ShortStringHelper, "toddler1", "toddler1");
-                var toddler2 = new Template(ShortStringHelper, "toddler2", "toddler2");
-
-                child1.MasterTemplateAlias = parent.Alias;
-                child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
-                child2.MasterTemplateAlias = parent.Alias;
-                child2.MasterTemplateId = new Lazy<int>(() => parent.Id);
-                toddler1.MasterTemplateAlias = child1.Alias;
-                toddler1.MasterTemplateId = new Lazy<int>(() => child1.Id);
-                toddler2.MasterTemplateAlias = child1.Alias;
-                toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
-
-                repository.Save(parent);
-                repository.Save(child1);
-                repository.Save(child2);
-                repository.Save(toddler1);
-                repository.Save(toddler2);
-
-                // Act
-                toddler2.SetMasterTemplate(child2);
-                repository.Save(toddler2);
-
-                // Assert
-                Assert.AreEqual($"-1,{parent.Id},{child2.Id},{toddler2.Id}", toddler2.Path);
-            }
-        }
-
-        [Test]
-        public void Path_Is_Set_Correctly_On_Update_With_Master_Template_Removal()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-
-            using (provider.CreateScope())
-            {
-                ITemplateRepository repository = CreateRepository(provider);
-
-                var parent = new Template(ShortStringHelper, "parent", "parent");
-                var child1 = new Template(ShortStringHelper, "child1", "child1")
-                {
-                    MasterTemplateAlias = parent.Alias,
-                    MasterTemplateId = new Lazy<int>(() => parent.Id)
-                };
-
-                repository.Save(parent);
-                repository.Save(child1);
-
-                // Act
-                child1.SetMasterTemplate(null);
-                repository.Save(child1);
-
-                // Assert
-                Assert.AreEqual($"-1,{child1.Id}", child1.Path);
-            }
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            var testHelper = new TestHelper();
-
-            // Delete all files
-            var fsViews = new PhysicalFileSystem(IOHelper, HostingEnvironment, LoggerFactory.CreateLogger<PhysicalFileSystem>(), HostingEnvironment.MapPathContentRoot(Constants.SystemDirectories.MvcViews), HostingEnvironment.ToAbsolute(Constants.SystemDirectories.MvcViews));
-            IEnumerable<string> views = fsViews.GetFiles(string.Empty, "*.cshtml");
-            foreach (string file in views)
-            {
-                fsViews.DeleteFile(file);
-            }
-        }
-
-        protected Stream CreateStream(string contents = null)
-        {
-            if (string.IsNullOrEmpty(contents))
-            {
-                contents = "/* test */";
-            }
-
-            byte[] bytes = Encoding.UTF8.GetBytes(contents);
-            var stream = new MemoryStream(bytes);
-
-            return stream;
-        }
-
-        private IEnumerable<ITemplate> CreateHierarchy(ITemplateRepository repository)
-        {
             var parent = new Template(ShortStringHelper, "parent", "parent")
             {
                 Content = @"<%@ Master Language=""C#"" %>"
             };
+            var child = new Template(ShortStringHelper, "child", "child") { Content = @"<%@ Master Language=""C#"" %>" };
+            var baby = new Template(ShortStringHelper, "baby", "baby") { Content = @"<%@ Master Language=""C#"" %>" };
+            child.MasterTemplateAlias = parent.Alias;
+            child.MasterTemplateId = new Lazy<int>(() => parent.Id);
+            baby.MasterTemplateAlias = child.Alias;
+            baby.MasterTemplateId = new Lazy<int>(() => child.Id);
+            repository.Save(parent);
+            repository.Save(child);
+            repository.Save(baby);
 
-            var child1 = new Template(ShortStringHelper, "child1", "child1")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
-            var toddler1 = new Template(ShortStringHelper, "toddler1", "toddler1")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
-            var toddler2 = new Template(ShortStringHelper, "toddler2", "toddler2")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
-            var baby1 = new Template(ShortStringHelper, "baby1", "baby1")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
+            // Act
+            var templates = repository.Get("parent");
+            repository.Delete(templates);
 
-            var child2 = new Template(ShortStringHelper, "child2", "child2")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
-            var toddler3 = new Template(ShortStringHelper, "toddler3", "toddler3")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
-            var toddler4 = new Template(ShortStringHelper, "toddler4", "toddler4")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
-            var baby2 = new Template(ShortStringHelper, "baby2", "baby2")
-            {
-                Content = @"<%@ Master Language=""C#"" %>"
-            };
+            // Assert
+            Assert.IsNull(repository.Get("test"));
+        }
+    }
+
+    [Test]
+    public void Can_Get_All()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var created = CreateHierarchy(repository).ToArray();
+
+            // Act
+            var all = repository.GetAll().ToArray();
+            var allByAlias = repository.GetAll("parent", "child2", "baby2", "notFound").ToArray();
+            var allById = repository.GetMany(created[0].Id, created[2].Id, created[4].Id, created[5].Id, 999999).ToArray();
+
+            // Assert
+            Assert.AreEqual(9, all.Count());
+            Assert.AreEqual(9, all.DistinctBy(x => x.Id).Count());
+
+            Assert.AreEqual(3, allByAlias.Count());
+            Assert.AreEqual(3, allByAlias.DistinctBy(x => x.Id).Count());
+
+            Assert.AreEqual(4, allById.Count());
+            Assert.AreEqual(4, allById.DistinctBy(x => x.Id).Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_Children()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var created = CreateHierarchy(repository).ToArray();
+
+            // Act
+            var childrenById = repository.GetChildren(created[1].Id).ToArray();
+
+            // Assert
+            Assert.AreEqual(2, childrenById.Count());
+            Assert.AreEqual(2, childrenById.DistinctBy(x => x.Id).Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_Children_At_Root()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            CreateHierarchy(repository).ToArray();
+
+            // Act
+            var children = repository.GetChildren(-1).ToArray();
+
+            // Assert
+            Assert.AreEqual(1, children.Count());
+            Assert.AreEqual(1, children.DistinctBy(x => x.Id).Count());
+        }
+    }
+
+    [Test]
+    public void Can_Get_Descendants()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+            var created = CreateHierarchy(repository).ToArray();
+
+            // Act
+            var descendantsById = repository.GetDescendants(created[1].Id).ToArray();
+
+            // Assert
+            Assert.AreEqual(3, descendantsById.Count());
+            Assert.AreEqual(3, descendantsById.DistinctBy(x => x.Id).Count());
+        }
+    }
+
+    [Test]
+    public void Path_Is_Set_Correctly_On_Creation()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var parent = new Template(ShortStringHelper, "parent", "parent");
+            var child1 = new Template(ShortStringHelper, "child1", "child1");
+            var toddler1 = new Template(ShortStringHelper, "toddler1", "toddler1");
+            var toddler2 = new Template(ShortStringHelper, "toddler2", "toddler2");
+            var baby1 = new Template(ShortStringHelper, "baby1", "baby1");
+            var child2 = new Template(ShortStringHelper, "child2", "child2");
+            var toddler3 = new Template(ShortStringHelper, "toddler3", "toddler3");
+            var toddler4 = new Template(ShortStringHelper, "toddler4", "toddler4");
+            var baby2 = new Template(ShortStringHelper, "baby2", "baby2");
 
             child1.MasterTemplateAlias = parent.Alias;
             child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
             child2.MasterTemplateAlias = parent.Alias;
             child2.MasterTemplateId = new Lazy<int>(() => parent.Id);
-
             toddler1.MasterTemplateAlias = child1.Alias;
             toddler1.MasterTemplateId = new Lazy<int>(() => child1.Id);
             toddler2.MasterTemplateAlias = child1.Alias;
             toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
-
             toddler3.MasterTemplateAlias = child2.Alias;
             toddler3.MasterTemplateId = new Lazy<int>(() => child2.Id);
             toddler4.MasterTemplateAlias = child2.Alias;
             toddler4.MasterTemplateId = new Lazy<int>(() => child2.Id);
-
             baby1.MasterTemplateAlias = toddler2.Alias;
             baby1.MasterTemplateId = new Lazy<int>(() => toddler2.Id);
-
             baby2.MasterTemplateAlias = toddler4.Alias;
             baby2.MasterTemplateId = new Lazy<int>(() => toddler4.Id);
 
+            // Act
             repository.Save(parent);
             repository.Save(child1);
             repository.Save(child2);
@@ -656,7 +481,159 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repos
             repository.Save(baby1);
             repository.Save(baby2);
 
-            return new[] { parent, child1, child2, toddler1, toddler2, toddler3, toddler4, baby1, baby2 };
+            // Assert
+            Assert.AreEqual(string.Format("-1,{0}", parent.Id), parent.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1}", parent.Id, child1.Id), child1.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1}", parent.Id, child2.Id), child2.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1}", parent.Id, child2.Id), child2.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child1.Id, toddler1.Id), toddler1.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child1.Id, toddler2.Id), toddler2.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child2.Id, toddler3.Id), toddler3.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1},{2}", parent.Id, child2.Id, toddler4.Id), toddler4.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1},{2},{3}", parent.Id, child1.Id, toddler2.Id, baby1.Id), baby1.Path);
+            Assert.AreEqual(string.Format("-1,{0},{1},{2},{3}", parent.Id, child2.Id, toddler4.Id, baby2.Id), baby2.Path);
         }
     }
+
+    [Test]
+    public void Path_Is_Set_Correctly_On_Update()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var parent = new Template(ShortStringHelper, "parent", "parent");
+            var child1 = new Template(ShortStringHelper, "child1", "child1");
+            var child2 = new Template(ShortStringHelper, "child2", "child2");
+            var toddler1 = new Template(ShortStringHelper, "toddler1", "toddler1");
+            var toddler2 = new Template(ShortStringHelper, "toddler2", "toddler2");
+
+            child1.MasterTemplateAlias = parent.Alias;
+            child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
+            child2.MasterTemplateAlias = parent.Alias;
+            child2.MasterTemplateId = new Lazy<int>(() => parent.Id);
+            toddler1.MasterTemplateAlias = child1.Alias;
+            toddler1.MasterTemplateId = new Lazy<int>(() => child1.Id);
+            toddler2.MasterTemplateAlias = child1.Alias;
+            toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
+
+            repository.Save(parent);
+            repository.Save(child1);
+            repository.Save(child2);
+            repository.Save(toddler1);
+            repository.Save(toddler2);
+
+            // Act
+            toddler2.SetMasterTemplate(child2);
+            repository.Save(toddler2);
+
+            // Assert
+            Assert.AreEqual($"-1,{parent.Id},{child2.Id},{toddler2.Id}", toddler2.Path);
+        }
+    }
+
+    [Test]
+    public void Path_Is_Set_Correctly_On_Update_With_Master_Template_Removal()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var parent = new Template(ShortStringHelper, "parent", "parent");
+            var child1 = new Template(ShortStringHelper, "child1", "child1")
+            {
+                MasterTemplateAlias = parent.Alias,
+                MasterTemplateId = new Lazy<int>(() => parent.Id)
+            };
+
+            repository.Save(parent);
+            repository.Save(child1);
+
+            // Act
+            child1.SetMasterTemplate(null);
+            repository.Save(child1);
+
+            // Assert
+            Assert.AreEqual($"-1,{child1.Id}", child1.Path);
+        }
+    }
+
+    protected Stream CreateStream(string contents = null)
+    {
+        if (string.IsNullOrEmpty(contents))
+        {
+            contents = "/* test */";
+        }
+
+        var bytes = Encoding.UTF8.GetBytes(contents);
+        var stream = new MemoryStream(bytes);
+
+        return stream;
+    }
+
+    private IEnumerable<ITemplate> CreateHierarchy(ITemplateRepository repository)
+    {
+        var parent = new Template(ShortStringHelper, "parent", "parent") { Content = @"<%@ Master Language=""C#"" %>" };
+
+        var child1 = new Template(ShortStringHelper, "child1", "child1") { Content = @"<%@ Master Language=""C#"" %>" };
+        var toddler1 = new Template(ShortStringHelper, "toddler1", "toddler1")
+        {
+            Content = @"<%@ Master Language=""C#"" %>"
+        };
+        var toddler2 = new Template(ShortStringHelper, "toddler2", "toddler2")
+        {
+            Content = @"<%@ Master Language=""C#"" %>"
+        };
+        var baby1 = new Template(ShortStringHelper, "baby1", "baby1") { Content = @"<%@ Master Language=""C#"" %>" };
+
+        var child2 = new Template(ShortStringHelper, "child2", "child2") { Content = @"<%@ Master Language=""C#"" %>" };
+        var toddler3 = new Template(ShortStringHelper, "toddler3", "toddler3")
+        {
+            Content = @"<%@ Master Language=""C#"" %>"
+        };
+        var toddler4 = new Template(ShortStringHelper, "toddler4", "toddler4")
+        {
+            Content = @"<%@ Master Language=""C#"" %>"
+        };
+        var baby2 = new Template(ShortStringHelper, "baby2", "baby2") { Content = @"<%@ Master Language=""C#"" %>" };
+
+        child1.MasterTemplateAlias = parent.Alias;
+        child1.MasterTemplateId = new Lazy<int>(() => parent.Id);
+        child2.MasterTemplateAlias = parent.Alias;
+        child2.MasterTemplateId = new Lazy<int>(() => parent.Id);
+
+        toddler1.MasterTemplateAlias = child1.Alias;
+        toddler1.MasterTemplateId = new Lazy<int>(() => child1.Id);
+        toddler2.MasterTemplateAlias = child1.Alias;
+        toddler2.MasterTemplateId = new Lazy<int>(() => child1.Id);
+
+        toddler3.MasterTemplateAlias = child2.Alias;
+        toddler3.MasterTemplateId = new Lazy<int>(() => child2.Id);
+        toddler4.MasterTemplateAlias = child2.Alias;
+        toddler4.MasterTemplateId = new Lazy<int>(() => child2.Id);
+
+        baby1.MasterTemplateAlias = toddler2.Alias;
+        baby1.MasterTemplateId = new Lazy<int>(() => toddler2.Id);
+
+        baby2.MasterTemplateAlias = toddler4.Alias;
+        baby2.MasterTemplateId = new Lazy<int>(() => toddler4.Id);
+
+        repository.Save(parent);
+        repository.Save(child1);
+        repository.Save(child2);
+        repository.Save(toddler1);
+        repository.Save(toddler2);
+        repository.Save(toddler3);
+        repository.Save(toddler4);
+        repository.Save(baby1);
+        repository.Save(baby2);
+
+        return new[] { parent, child1, child2, toddler1, toddler2, toddler3, toddler4, baby1, baby2 };
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs
index a24f7eadb6..e095452e24 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserGroupRepositoryTest.cs
@@ -1,431 +1,426 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
+using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class UserGroupRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class UserGroupRepositoryTest : UmbracoIntegrationTest
+    private UserGroupRepository CreateRepository(IScopeProvider provider) =>
+        new((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
+
+    [Test]
+    public void Can_Perform_Add_On_UserGroupRepository()
     {
-        private UserGroupRepository CreateRepository(IScopeProvider provider) =>
-            new UserGroupRepository((IScopeAccessor)provider, global::Umbraco.Cms.Core.Cache.AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
-
-        [Test]
-        public void Can_Perform_Add_On_UserGroupRepository()
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                UserGroup userGroup = UserGroupBuilder.CreateUserGroup();
+            var userGroup = UserGroupBuilder.CreateUserGroup();
 
-                // Act
-                repository.Save(userGroup);
-                scope.Complete();
+            // Act
+            repository.Save(userGroup);
+            scope.Complete();
 
-                // Assert
-                Assert.That(userGroup.HasIdentity, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Multiple_Adds_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                UserGroup userGroup1 = UserGroupBuilder.CreateUserGroup(suffix: "1");
-                UserGroup userGroup2 = UserGroupBuilder.CreateUserGroup(suffix: "2");
-
-                // Act
-                repository.Save(userGroup1);
-
-                repository.Save(userGroup2);
-                scope.Complete();
-
-                // Assert
-                Assert.That(userGroup1.HasIdentity, Is.True);
-                Assert.That(userGroup2.HasIdentity, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                UserGroup userGroup = UserGroupBuilder.CreateUserGroup();
-                repository.Save(userGroup);
-                scope.Complete();
-
-                // Act
-                IUserGroup resolved = repository.Get((int)userGroup.Id);
-                bool dirty = ((UserGroup)resolved).IsDirty();
-
-                // Assert
-                Assert.That(dirty, Is.False);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                UserGroup userGroup = UserGroupBuilder.CreateUserGroup();
-                repository.Save(userGroup);
-
-                // Act
-                IUserGroup resolved = repository.Get((int)userGroup.Id);
-                resolved.Name = "New Name";
-                resolved.Permissions = new[] { "Z", "Y", "X" };
-                repository.Save(resolved);
-                scope.Complete();
-                IUserGroup updatedItem = repository.Get((int)userGroup.Id);
-
-                // Assert
-                Assert.That(updatedItem.Id, Is.EqualTo(resolved.Id));
-                Assert.That(updatedItem.Name, Is.EqualTo(resolved.Name));
-                Assert.That(updatedItem.Permissions, Is.EqualTo(resolved.Permissions));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Delete_On_UserGroupRepository()
-        {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                UserGroup userGroup = UserGroupBuilder.CreateUserGroup();
-
-                // Act
-                repository.Save(userGroup);
-
-                int id = userGroup.Id;
-
-                var repository2 = new UserGroupRepository((IScopeAccessor)provider, global::Umbraco.Cms.Core.Cache.AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
-                repository2.Delete(userGroup);
-                scope.Complete();
-
-                IUserGroup resolved = repository2.Get((int)id);
-
-                // Assert
-                Assert.That(resolved, Is.Null);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Get_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                UserGroup userGroup = UserGroupBuilder.CreateUserGroup();
-                repository.Save(userGroup);
-                scope.Complete();
-
-                // Act
-                IUserGroup resolved = repository.Get((int)userGroup.Id);
-
-                // Assert
-                Assert.That(resolved.Id, Is.EqualTo(userGroup.Id));
-                //// Assert.That(resolved.CreateDate, Is.GreaterThan(DateTime.MinValue));
-                //// Assert.That(resolved.UpdateDate, Is.GreaterThan(DateTime.MinValue));
-                Assert.That(resolved.Name, Is.EqualTo(userGroup.Name));
-                Assert.That(resolved.Alias, Is.EqualTo(userGroup.Alias));
-                Assert.That(resolved.Permissions, Is.EqualTo(userGroup.Permissions));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetByQuery_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-                IQuery<IUserGroup> query = provider.CreateQuery<IUserGroup>().Where(x => x.Alias == "testGroup1");
-                IEnumerable<IUserGroup> result = repository.Get(query);
-
-                // Assert
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_By_Param_Ids_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                IUserGroup[] userGroups = CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-                IEnumerable<IUserGroup> result = repository.GetMany(userGroups[0].Id, userGroups[1].Id);
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-                IEnumerable<IUserGroup> result = repository.GetMany();
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(3));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                IUserGroup[] userGroups = CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-                bool exists = repository.Exists(userGroups[0].Id);
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Count_On_UserGroupRepository()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                IUserGroup[] userGroups = CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-                IQuery<IUserGroup> query = provider.CreateQuery<IUserGroup>().Where(x => x.Alias == "testGroup1" || x.Alias == "testGroup2");
-                int result = repository.Count(query);
-
-                // Assert
-                Assert.That(result, Is.GreaterThanOrEqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Remove_Section_For_Group()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                IUserGroup[] groups = CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-
-                // add and remove a few times, this tests the internal collection
-                groups[0].RemoveAllowedSection("content");
-                groups[0].RemoveAllowedSection("content");
-                groups[0].AddAllowedSection("content");
-                groups[0].RemoveAllowedSection("content");
-
-                groups[1].RemoveAllowedSection("media");
-                groups[1].RemoveAllowedSection("media");
-
-                repository.Save(groups[0]);
-                repository.Save(groups[1]);
-                scope.Complete();
-
-                // Assert
-                IUserGroup[] result = repository.GetMany((int)groups[0].Id, (int)groups[1].Id).ToArray();
-                Assert.AreEqual(1, result[0].AllowedSections.Count());
-                Assert.AreEqual("media", result[0].AllowedSections.First());
-                Assert.AreEqual(1, result[1].AllowedSections.Count());
-                Assert.AreEqual("content", result[1].AllowedSections.First());
-            }
-        }
-
-        [Test]
-        public void Can_Add_Section_ForGroup()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                IUserGroup[] groups = CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-
-                // add and remove a few times, this tests the internal collection
-                groups[0].ClearAllowedSections();
-                groups[0].AddAllowedSection("content");
-                groups[0].AddAllowedSection("media");
-                groups[0].RemoveAllowedSection("content");
-                groups[0].AddAllowedSection("content");
-                groups[0].AddAllowedSection("settings");
-
-                // add the same even though it's already there
-                groups[0].AddAllowedSection("content");
-
-                groups[1].ClearAllowedSections();
-                groups[1].AddAllowedSection("developer");
-
-                groups[2].ClearAllowedSections();
-
-                repository.Save(groups[0]);
-                repository.Save(groups[1]);
-                repository.Save(groups[2]);
-                scope.Complete();
-
-                for (int i = 0; i < 3; i++)
-                {
-                    Assert.IsNotNull(repository.Get(groups[i].Id));
-                }
-
-                // Assert
-                IUserGroup[] result = repository.GetMany(groups[0].Id, groups[1].Id, groups[2].Id).ToArray();
-                Assert.AreEqual(3, result.Length);
-
-                Assert.AreEqual(3, result[0].AllowedSections.Count());
-                Assert.IsTrue(result[0].AllowedSections.Contains("content"));
-                Assert.IsTrue(result[0].AllowedSections.Contains("media"));
-                Assert.IsTrue(result[0].AllowedSections.Contains("settings"));
-                Assert.AreEqual(1, result[1].AllowedSections.Count());
-                Assert.IsTrue(result[1].AllowedSections.Contains("developer"));
-                Assert.AreEqual(0, result[2].AllowedSections.Count());
-            }
-        }
-
-        [Test]
-        public void Can_Update_Section_For_Group()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                IUserGroup[] groups = CreateAndCommitMultipleUserGroups(repository);
-
-                // Act
-                groups[0].RemoveAllowedSection("content");
-                groups[0].AddAllowedSection("settings");
-
-                repository.Save(groups[0]);
-                scope.Complete();
-
-                // Assert
-                IUserGroup result = repository.Get(groups[0].Id);
-                Assert.AreEqual(2, result.AllowedSections.Count());
-                Assert.IsTrue(result.AllowedSections.Contains("settings"));
-                Assert.IsTrue(result.AllowedSections.Contains("media"));
-            }
-        }
-
-        [Test]
-        public void Get_Groups_Assigned_To_Section()
-        {
-            // Arrange
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                UserGroupRepository repository = CreateRepository(provider);
-
-                UserGroup user1 = UserGroupBuilder.CreateUserGroup(suffix: "1", allowedSections: new[] { "test1" });
-                UserGroup user2 = UserGroupBuilder.CreateUserGroup(suffix: "2", allowedSections: new[] { "test2" });
-                UserGroup user3 = UserGroupBuilder.CreateUserGroup(suffix: "3", allowedSections: new[] { "test1" });
-                repository.Save(user1);
-                repository.Save(user2);
-                repository.Save(user3);
-                scope.Complete();
-
-                // Act
-                IEnumerable<IUserGroup> groups = repository.GetGroupsAssignedToSection("test1");
-
-                // Assert
-                Assert.AreEqual(2, groups.Count());
-                string[] names = groups.Select(x => x.Name).ToArray();
-                Assert.IsTrue(names.Contains("Test Group1"));
-                Assert.IsFalse(names.Contains("Test Group2"));
-                Assert.IsTrue(names.Contains("Test Group3"));
-            }
-        }
-
-        private IUserGroup[] CreateAndCommitMultipleUserGroups(IUserGroupRepository repository)
-        {
-            UserGroup userGroup1 = UserGroupBuilder.CreateUserGroup(suffix: "1");
-            UserGroup userGroup2 = UserGroupBuilder.CreateUserGroup(suffix: "2");
-            UserGroup userGroup3 = UserGroupBuilder.CreateUserGroup(suffix: "3");
-            repository.Save(userGroup1);
-            repository.Save(userGroup2);
-            repository.Save(userGroup3);
-
-            return new IUserGroup[] { userGroup1, userGroup2, userGroup3 };
+            // Assert
+            Assert.That(userGroup.HasIdentity, Is.True);
         }
     }
+
+    [Test]
+    public void Can_Perform_Multiple_Adds_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroup1 = UserGroupBuilder.CreateUserGroup(suffix: "1");
+            var userGroup2 = UserGroupBuilder.CreateUserGroup(suffix: "2");
+
+            // Act
+            repository.Save(userGroup1);
+
+            repository.Save(userGroup2);
+            scope.Complete();
+
+            // Assert
+            Assert.That(userGroup1.HasIdentity, Is.True);
+            Assert.That(userGroup2.HasIdentity, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroup = UserGroupBuilder.CreateUserGroup();
+            repository.Save(userGroup);
+            scope.Complete();
+
+            // Act
+            var resolved = repository.Get(userGroup.Id);
+            var dirty = ((UserGroup)resolved).IsDirty();
+
+            // Assert
+            Assert.That(dirty, Is.False);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Update_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroup = UserGroupBuilder.CreateUserGroup();
+            repository.Save(userGroup);
+
+            // Act
+            var resolved = repository.Get(userGroup.Id);
+            resolved.Name = "New Name";
+            resolved.Permissions = new[] { "Z", "Y", "X" };
+            repository.Save(resolved);
+            scope.Complete();
+            var updatedItem = repository.Get(userGroup.Id);
+
+            // Assert
+            Assert.That(updatedItem.Id, Is.EqualTo(resolved.Id));
+            Assert.That(updatedItem.Name, Is.EqualTo(resolved.Name));
+            Assert.That(updatedItem.Permissions, Is.EqualTo(resolved.Permissions));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Delete_On_UserGroupRepository()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroup = UserGroupBuilder.CreateUserGroup();
+
+            // Act
+            repository.Save(userGroup);
+
+            var id = userGroup.Id;
+
+            var repository2 = new UserGroupRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
+            repository2.Delete(userGroup);
+            scope.Complete();
+
+            var resolved = repository2.Get(id);
+
+            // Assert
+            Assert.That(resolved, Is.Null);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroup = UserGroupBuilder.CreateUserGroup();
+            repository.Save(userGroup);
+            scope.Complete();
+
+            // Act
+            var resolved = repository.Get(userGroup.Id);
+
+            // Assert
+            Assert.That(resolved.Id, Is.EqualTo(userGroup.Id));
+            //// Assert.That(resolved.CreateDate, Is.GreaterThan(DateTime.MinValue));
+            //// Assert.That(resolved.UpdateDate, Is.GreaterThan(DateTime.MinValue));
+            Assert.That(resolved.Name, Is.EqualTo(userGroup.Name));
+            Assert.That(resolved.Alias, Is.EqualTo(userGroup.Alias));
+            Assert.That(resolved.Permissions, Is.EqualTo(userGroup.Permissions));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetByQuery_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+            var query = provider.CreateQuery<IUserGroup>().Where(x => x.Alias == "testGroup1");
+            var result = repository.Get(query);
+
+            // Assert
+            Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_By_Param_Ids_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroups = CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+            var result = repository.GetMany(userGroups[0].Id, userGroups[1].Id).ToArray();
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+            var result = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.Count(), Is.GreaterThanOrEqualTo(3));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroups = CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+            var exists = repository.Exists(userGroups[0].Id);
+
+            // Assert
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Count_On_UserGroupRepository()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var userGroups = CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+            var query = provider.CreateQuery<IUserGroup>()
+                .Where(x => x.Alias == "testGroup1" || x.Alias == "testGroup2");
+            var result = repository.Count(query);
+
+            // Assert
+            Assert.That(result, Is.GreaterThanOrEqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Remove_Section_For_Group()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var groups = CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+
+            // add and remove a few times, this tests the internal collection
+            groups[0].RemoveAllowedSection("content");
+            groups[0].RemoveAllowedSection("content");
+            groups[0].AddAllowedSection("content");
+            groups[0].RemoveAllowedSection("content");
+
+            groups[1].RemoveAllowedSection("media");
+            groups[1].RemoveAllowedSection("media");
+
+            repository.Save(groups[0]);
+            repository.Save(groups[1]);
+            scope.Complete();
+
+            // Assert
+            var result = repository.GetMany(groups[0].Id, groups[1].Id).ToArray();
+            Assert.AreEqual(1, result[0].AllowedSections.Count());
+            Assert.AreEqual("media", result[0].AllowedSections.First());
+            Assert.AreEqual(1, result[1].AllowedSections.Count());
+            Assert.AreEqual("content", result[1].AllowedSections.First());
+        }
+    }
+
+    [Test]
+    public void Can_Add_Section_ForGroup()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var groups = CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+
+            // add and remove a few times, this tests the internal collection
+            groups[0].ClearAllowedSections();
+            groups[0].AddAllowedSection("content");
+            groups[0].AddAllowedSection("media");
+            groups[0].RemoveAllowedSection("content");
+            groups[0].AddAllowedSection("content");
+            groups[0].AddAllowedSection("settings");
+
+            // add the same even though it's already there
+            groups[0].AddAllowedSection("content");
+
+            groups[1].ClearAllowedSections();
+            groups[1].AddAllowedSection("developer");
+
+            groups[2].ClearAllowedSections();
+
+            repository.Save(groups[0]);
+            repository.Save(groups[1]);
+            repository.Save(groups[2]);
+            scope.Complete();
+
+            for (var i = 0; i < 3; i++)
+            {
+                Assert.IsNotNull(repository.Get(groups[i].Id));
+            }
+
+            // Assert
+            var result = repository.GetMany(groups[0].Id, groups[1].Id, groups[2].Id).ToArray();
+            Assert.AreEqual(3, result.Length);
+
+            Assert.AreEqual(3, result[0].AllowedSections.Count());
+            Assert.IsTrue(result[0].AllowedSections.Contains("content"));
+            Assert.IsTrue(result[0].AllowedSections.Contains("media"));
+            Assert.IsTrue(result[0].AllowedSections.Contains("settings"));
+            Assert.AreEqual(1, result[1].AllowedSections.Count());
+            Assert.IsTrue(result[1].AllowedSections.Contains("developer"));
+            Assert.AreEqual(0, result[2].AllowedSections.Count());
+        }
+    }
+
+    [Test]
+    public void Can_Update_Section_For_Group()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var groups = CreateAndCommitMultipleUserGroups(repository);
+
+            // Act
+            groups[0].RemoveAllowedSection("content");
+            groups[0].AddAllowedSection("settings");
+
+            repository.Save(groups[0]);
+            scope.Complete();
+
+            // Assert
+            var result = repository.Get(groups[0].Id);
+            Assert.AreEqual(2, result.AllowedSections.Count());
+            Assert.IsTrue(result.AllowedSections.Contains("settings"));
+            Assert.IsTrue(result.AllowedSections.Contains("media"));
+        }
+    }
+
+    [Test]
+    public void Get_Groups_Assigned_To_Section()
+    {
+        // Arrange
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var user1 = UserGroupBuilder.CreateUserGroup(suffix: "1", allowedSections: new[] { "test1" });
+            var user2 = UserGroupBuilder.CreateUserGroup(suffix: "2", allowedSections: new[] { "test2" });
+            var user3 = UserGroupBuilder.CreateUserGroup(suffix: "3", allowedSections: new[] { "test1" });
+            repository.Save(user1);
+            repository.Save(user2);
+            repository.Save(user3);
+            scope.Complete();
+
+            // Act
+            var groups = repository.GetGroupsAssignedToSection("test1").ToArray();
+
+            // Assert
+            Assert.AreEqual(2, groups.Count());
+            var names = groups.Select(x => x.Name).ToArray();
+            Assert.IsTrue(names.Contains("Test Group1"));
+            Assert.IsFalse(names.Contains("Test Group2"));
+            Assert.IsTrue(names.Contains("Test Group3"));
+        }
+    }
+
+    private IUserGroup[] CreateAndCommitMultipleUserGroups(IUserGroupRepository repository)
+    {
+        var userGroup1 = UserGroupBuilder.CreateUserGroup(suffix: "1");
+        var userGroup2 = UserGroupBuilder.CreateUserGroup(suffix: "2");
+        var userGroup3 = UserGroupBuilder.CreateUserGroup(suffix: "3");
+        repository.Save(userGroup1);
+        repository.Save(userGroup2);
+        repository.Save(userGroup3);
+
+        return new IUserGroup[] { userGroup1, userGroup2, userGroup3 };
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs
index 1cd1252d67..4886a7b497 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/UserRepositoryTest.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -11,9 +10,7 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
@@ -28,502 +25,518 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
+public class UserRepositoryTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
-    public class UserRepositoryTest : UmbracoIntegrationTest
+    private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
+
+    private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
+
+    private IMediaTypeRepository MediaTypeRepository => GetRequiredService<IMediaTypeRepository>();
+
+    private IMediaRepository MediaRepository => GetRequiredService<IMediaRepository>();
+
+    private UserRepository CreateRepository(ICoreScopeProvider provider)
     {
-        private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
+        var accessor = (IScopeAccessor)provider;
+        var mockRuntimeState = CreateMockRuntimeState(RuntimeLevel.Run);
 
-        private IContentTypeRepository ContentTypeRepository => GetRequiredService<IContentTypeRepository>();
+        var repository = new UserRepository(
+            accessor,
+            AppCaches.Disabled,
+            LoggerFactory.CreateLogger<UserRepository>(),
+            Mappers,
+            Options.Create(GlobalSettings),
+            Options.Create(new UserPasswordConfigurationSettings()),
+            new JsonNetSerializer(),
+            mockRuntimeState.Object);
+        return repository;
+    }
 
-        private IMediaTypeRepository MediaTypeRepository => GetRequiredService<IMediaTypeRepository>();
+    private static Mock<IRuntimeState> CreateMockRuntimeState(RuntimeLevel runtimeLevel)
+    {
+        var mockRuntimeState = new Mock<IRuntimeState>();
+        mockRuntimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
+        return mockRuntimeState;
+    }
 
-        private IMediaRepository MediaRepository => GetRequiredService<IMediaRepository>();
+    private UserGroupRepository CreateUserGroupRepository(ICoreScopeProvider provider)
+    {
+        var accessor = (IScopeAccessor)provider;
+        return new UserGroupRepository(accessor, AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
+    }
 
-        private UserRepository CreateRepository(ICoreScopeProvider provider)
+    [Test]
+    public void Can_Perform_Add_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            var accessor = (IScopeAccessor)provider;
-            Mock<IRuntimeState> mockRuntimeState = CreateMockRuntimeState(RuntimeLevel.Run);
+            var repository = CreateRepository(provider);
 
-            var repository = new UserRepository(accessor, AppCaches.Disabled, LoggerFactory.CreateLogger<UserRepository>(), Mappers, Options.Create(GlobalSettings), Options.Create(new UserPasswordConfigurationSettings()), new JsonNetSerializer(), mockRuntimeState.Object);
-            return repository;
+            var user = UserBuilderInstance.Build();
+
+            // Act
+            repository.Save(user);
+
+            // Assert
+            Assert.That(user.HasIdentity, Is.True);
         }
+    }
 
-        private static Mock<IRuntimeState> CreateMockRuntimeState(RuntimeLevel runtimeLevel)
+    [Test]
+    public void Can_Perform_Multiple_Adds_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            var mockRuntimeState = new Mock<IRuntimeState>();
-            mockRuntimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
-            return mockRuntimeState;
+            var repository = CreateRepository(provider);
+
+            var user1 = UserBuilderInstance.WithSuffix("1").Build();
+            var use2 = UserBuilderInstance.WithSuffix("2").Build();
+
+            // Act
+            repository.Save(user1);
+
+            repository.Save(use2);
+
+            // Assert
+            Assert.That(user1.HasIdentity, Is.True);
+            Assert.That(use2.HasIdentity, Is.True);
         }
+    }
 
-        private UserGroupRepository CreateUserGroupRepository(ICoreScopeProvider provider)
+    [Test]
+    public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            var accessor = (IScopeAccessor)provider;
-            return new UserGroupRepository(accessor, AppCaches.Disabled, LoggerFactory.CreateLogger<UserGroupRepository>(), LoggerFactory, ShortStringHelper);
+            var repository = CreateRepository(provider);
+
+            var user = UserBuilderInstance.WithoutIdentity().Build();
+            repository.Save(user);
+
+            // Act
+            var resolved = repository.Get(user.Id);
+            var dirty = ((User)resolved).IsDirty();
+
+            // Assert
+            Assert.That(dirty, Is.False);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Add_On_UserRepository()
+    [Test]
+    public void Can_Perform_Delete_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
+            var repository = CreateRepository(provider);
+
+            var user = UserBuilderInstance.Build();
+
+            // Act
+            repository.Save(user);
+
+            var id = user.Id;
+
+            var mockRuntimeState = CreateMockRuntimeState(RuntimeLevel.Run);
+
+            var repository2 = new UserRepository(
+                (IScopeAccessor)provider,
+                AppCaches.Disabled,
+                LoggerFactory.CreateLogger<UserRepository>(),
+                Mock.Of<IMapperCollection>(),
+                Options.Create(GlobalSettings),
+                Options.Create(new UserPasswordConfigurationSettings()),
+                new JsonNetSerializer(),
+                mockRuntimeState.Object);
+
+            repository2.Delete(user);
+
+            var resolved = repository2.Get(id);
+
+            // Assert
+            Assert.That(resolved, Is.Null);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Get_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repository = CreateRepository(provider);
+            var userGroupRepository = CreateUserGroupRepository(provider);
+
+            var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
+
+            // Act
+            var updatedItem = repository.Get(user.Id);
+
+            // FIXME: this test cannot work, user has 2 sections but the way it's created,
+            // they don't show, so the comparison with updatedItem fails - fix!
+
+            // Assert
+            AssertPropertyValues(updatedItem, user);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetByQuery_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repository = CreateRepository(provider);
+
+            CreateAndCommitMultipleUsers(repository);
+
+            // Act
+            var query = ScopeProvider.CreateQuery<IUser>().Where(x => x.Username == "TestUser1");
+            var result = repository.Get(query);
+
+            // Assert
+            Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_By_Param_Ids_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var users = CreateAndCommitMultipleUsers(repository);
+
+            // Act
+            var result = repository.GetMany(users[0].Id, users[1].Id).ToArray();
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.Count(), Is.EqualTo(2));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_GetAll_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repository = CreateRepository(provider);
+
+            CreateAndCommitMultipleUsers(repository);
+
+            // Act
+            var result = repository.GetMany().ToArray();
+
+            // Assert
+            Assert.That(result, Is.Not.Null);
+            Assert.That(result.Any(), Is.True);
+            Assert.That(result.Count(), Is.GreaterThanOrEqualTo(3));
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Exists_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var users = CreateAndCommitMultipleUsers(repository);
+
+            // Act
+            var exists = repository.Exists(users[0].Id);
+
+            // Assert
+            Assert.That(exists, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Perform_Count_On_UserRepository()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var users = CreateAndCommitMultipleUsers(repository);
+
+            // Act
+            var query = ScopeProvider.CreateQuery<IUser>()
+                .Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
+            var result = repository.Count(query);
+
+            // Assert
+            Assert.AreEqual(2, result);
+        }
+    }
+
+    [Test]
+    public void Can_Get_Paged_Results_By_Query_And_Filter_And_Groups()
+    {
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
+        {
+            var repository = CreateRepository(provider);
+
+            var users = CreateAndCommitMultipleUsers(repository);
+            var query = provider.CreateQuery<IUser>()
+                .Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
+
+            try
             {
-                UserRepository repository = CreateRepository(provider);
-
-                User user = UserBuilderInstance.Build();
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
 
                 // Act
-                repository.Save(user);
+                var result = repository.GetPagedResultsByQuery(
+                    query,
+                    0,
+                    10,
+                    out var totalRecs,
+                    user => user.Id,
+                    Direction.Ascending,
+                    excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
+                    filter: provider.CreateQuery<IUser>().Where(x => x.Id > -1));
 
                 // Assert
-                Assert.That(user.HasIdentity, Is.True);
+                Assert.AreEqual(2, totalRecs);
+            }
+            finally
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
             }
         }
+    }
 
-        [Test]
-        public void Can_Perform_Multiple_Adds_On_UserRepository()
+    [Test]
+    public void Can_Get_Paged_Results_With_Filter_And_Groups()
+    {
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
 
-                User user1 = UserBuilderInstance.WithSuffix("1").Build();
-                User use2 = UserBuilderInstance.WithSuffix("2").Build();
+            var users = CreateAndCommitMultipleUsers(repository);
+
+            try
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
 
                 // Act
-                repository.Save(user1);
-
-                repository.Save(use2);
+                var result = repository.GetPagedResultsByQuery(
+                    null,
+                    0,
+                    10,
+                    out var totalRecs,
+                    user => user.Id,
+                    Direction.Ascending,
+                    new[] { Constants.Security.AdminGroupAlias, Constants.Security.SensitiveDataGroupAlias },
+                    new[] { Constants.Security.TranslatorGroupAlias },
+                    filter: provider.CreateQuery<IUser>().Where(x => x.Id == -1));
 
                 // Assert
-                Assert.That(user1.HasIdentity, Is.True);
-                Assert.That(use2.HasIdentity, Is.True);
+                Assert.AreEqual(1, totalRecs);
+            }
+            finally
+            {
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
+                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
             }
         }
+    }
 
-        [Test]
-        public void Can_Verify_Fresh_Entity_Is_Not_Dirty()
+    [Test]
+    public void Can_Invalidate_SecurityStamp_On_Username_Change()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope())
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
+            var userGroupRepository = CreateUserGroupRepository(provider);
 
-                User user = UserBuilderInstance.WithoutIdentity().Build();
-                repository.Save(user);
+            var user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
+            var originalSecurityStamp = user.SecurityStamp;
 
-                // Act
-                IUser resolved = repository.Get((int)user.Id);
-                bool dirty = ((User)resolved).IsDirty();
+            // Ensure when user generated a security stamp is present
+            Assert.That(user.SecurityStamp, Is.Not.Null);
+            Assert.That(user.SecurityStamp, Is.Not.Empty);
 
-                // Assert
-                Assert.That(dirty, Is.False);
-            }
+            // Update username
+            user.Username += "UPDATED";
+            repository.Save(user);
+
+            // Get the user
+            var updatedUser = repository.Get(user.Id);
+
+            // Ensure the Security Stamp is invalidated & no longer the same
+            Assert.AreNotEqual(originalSecurityStamp, updatedUser.SecurityStamp);
+        }
+    }
+
+    [Test]
+    public void Validate_Login_Session()
+    {
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        var user = UserBuilder.CreateUser();
+        using (var scope = provider.CreateCoreScope(autoComplete: true))
+        {
+            var repository = CreateRepository(provider);
+            repository.Save(user);
         }
 
-        [Test]
-        public void Can_Perform_Delete_On_UserRepository()
+        using (var scope = provider.CreateCoreScope(autoComplete: true))
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
+            var repository = CreateRepository(provider);
+            var sessionId = repository.CreateLoginSession(user.Id, "1.2.3.4");
 
-                User user = UserBuilderInstance.Build();
+            // manually update this record to be in the past
+            ScopeAccessor.AmbientScope.Database.Execute(ScopeAccessor.AmbientScope.SqlContext.Sql()
+                .Update<UserLoginDto>(u => u.Set(x => x.LoggedOutUtc, DateTime.UtcNow.AddDays(-100)))
+                .Where<UserLoginDto>(x => x.SessionId == sessionId));
 
-                // Act
-                repository.Save(user);
+            var isValid = repository.ValidateLoginSession(user.Id, sessionId);
+            Assert.IsFalse(isValid);
 
-                int id = user.Id;
-
-                Mock<IRuntimeState> mockRuntimeState = CreateMockRuntimeState(RuntimeLevel.Run);
-
-                var repository2 = new UserRepository((IScopeAccessor)provider, AppCaches.Disabled, LoggerFactory.CreateLogger<UserRepository>(), Mock.Of<IMapperCollection>(), Options.Create(GlobalSettings), Options.Create(new UserPasswordConfigurationSettings()), new JsonNetSerializer(), mockRuntimeState.Object);
-
-                repository2.Delete(user);
-
-                IUser resolved = repository2.Get((int)id);
-
-                // Assert
-                Assert.That(resolved, Is.Null);
-            }
+            // create a new one
+            sessionId = repository.CreateLoginSession(user.Id, "1.2.3.4");
+            isValid = repository.ValidateLoginSession(user.Id, sessionId);
+            Assert.IsTrue(isValid);
         }
+    }
 
-        [Test]
-        public void Can_Perform_Get_On_UserRepository()
+    [Test]
+    public void Can_Perform_Update_On_UserRepository()
+    {
+        var ct = ContentTypeBuilder.CreateBasicContentType("test");
+        var mt = MediaTypeBuilder.CreateSimpleMediaType("testmedia", "TestMedia");
+
+        // Arrange
+        ICoreScopeProvider provider = ScopeProvider;
+        using (var scope = provider.CreateCoreScope(autoComplete: true))
         {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
-                UserGroupRepository userGroupRepository = CreateUserGroupRepository(provider);
+            var userRepository = CreateRepository(provider);
+            var userGroupRepository = CreateUserGroupRepository(provider);
 
-                User user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
+            ContentTypeRepository.Save(ct);
+            MediaTypeRepository.Save(mt);
 
-                // Act
-                IUser updatedItem = repository.Get(user.Id);
+            var content = ContentBuilder.CreateBasicContent(ct);
+            var media = MediaBuilder.CreateSimpleMedia(mt, "asdf", -1);
 
-                // FIXME: this test cannot work, user has 2 sections but the way it's created,
-                // they don't show, so the comparison with updatedItem fails - fix!
+            DocumentRepository.Save(content);
+            MediaRepository.Save(media);
 
-                // Assert
-                AssertPropertyValues(updatedItem, user);
-            }
-        }
+            var user = CreateAndCommitUserWithGroup(userRepository, userGroupRepository);
 
-        [Test]
-        public void Can_Perform_GetByQuery_On_UserRepository()
-        {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
+            // Act
+            var resolved = (User)userRepository.Get(user.Id);
 
-                CreateAndCommitMultipleUsers(repository);
+            resolved.Name = "New Name";
 
-                // Act
-                IQuery<IUser> query = ScopeProvider.CreateQuery<IUser>().Where(x => x.Username == "TestUser1");
-                IEnumerable<IUser> result = repository.Get(query);
+            // the db column is not used, default permissions are taken from the user type's permissions, this is a getter only
+            //// resolved.DefaultPermissions = "ZYX";
 
-                // Assert
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(1));
-            }
-        }
+            resolved.Language = "fr";
+            resolved.IsApproved = false;
+            resolved.RawPasswordValue = "new";
+            resolved.IsLockedOut = true;
+            resolved.StartContentIds = new[] { content.Id };
+            resolved.StartMediaIds = new[] { media.Id };
+            resolved.Email = "new@new.com";
+            resolved.Username = "newName";
 
-        [Test]
-        public void Can_Perform_GetAll_By_Param_Ids_On_UserRepository()
-        {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
+            userRepository.Save(resolved);
 
-                IUser[] users = CreateAndCommitMultipleUsers(repository);
+            var updatedItem = (User)userRepository.Get(user.Id);
 
-                // Act
-                IEnumerable<IUser> result = repository.GetMany((int)users[0].Id, (int)users[1].Id);
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.Count(), Is.EqualTo(2));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_GetAll_On_UserRepository()
-        {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
-
-                CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                IEnumerable<IUser> result = repository.GetMany();
-
-                // Assert
-                Assert.That(result, Is.Not.Null);
-                Assert.That(result.Any(), Is.True);
-                Assert.That(result.Count(), Is.GreaterThanOrEqualTo(3));
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Exists_On_UserRepository()
-        {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
-
-                IUser[] users = CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                bool exists = repository.Exists(users[0].Id);
-
-                // Assert
-                Assert.That(exists, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Count_On_UserRepository()
-        {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
-
-                IUser[] users = CreateAndCommitMultipleUsers(repository);
-
-                // Act
-                IQuery<IUser> query = ScopeProvider.CreateQuery<IUser>().Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
-                int result = repository.Count(query);
-
-                // Assert
-                Assert.AreEqual(2, result);
-            }
-        }
-
-        [Test]
-        public void Can_Get_Paged_Results_By_Query_And_Filter_And_Groups()
-        {
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
-
-                IUser[] users = CreateAndCommitMultipleUsers(repository);
-                IQuery<IUser> query = provider.CreateQuery<IUser>().Where(x => x.Username == "TestUser1" || x.Username == "TestUser2");
-
-                try
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    // Act
-                    IEnumerable<IUser> result = repository.GetPagedResultsByQuery(
-                        query,
-                        0,
-                        10,
-                        out long totalRecs,
-                        user => user.Id,
-                        Direction.Ascending,
-                        excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
-                        filter: provider.CreateQuery<IUser>().Where(x => x.Id > -1));
-
-                    // Assert
-                    Assert.AreEqual(2, totalRecs);
-                }
-                finally
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Get_Paged_Results_With_Filter_And_Groups()
-        {
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
-
-                IUser[] users = CreateAndCommitMultipleUsers(repository);
-
-                try
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                    // Act
-                    IEnumerable<IUser> result = repository.GetPagedResultsByQuery(
-                        null,
-                        0,
-                        10,
-                        out long totalRecs,
-                        user => user.Id,
-                        Direction.Ascending,
-                        includeUserGroups: new[] { Constants.Security.AdminGroupAlias, Constants.Security.SensitiveDataGroupAlias },
-                        excludeUserGroups: new[] { Constants.Security.TranslatorGroupAlias },
-                        filter: provider.CreateQuery<IUser>().Where(x => x.Id == -1));
-
-                    // Assert
-                    Assert.AreEqual(1, totalRecs);
-                }
-                finally
-                {
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = false;
-                    ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = false;
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Invalidate_SecurityStamp_On_Username_Change()
-        {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope())
-            {
-                UserRepository repository = CreateRepository(provider);
-                UserGroupRepository userGroupRepository = CreateUserGroupRepository(provider);
-
-                User user = CreateAndCommitUserWithGroup(repository, userGroupRepository);
-                string originalSecurityStamp = user.SecurityStamp;
-
-                // Ensure when user generated a security stamp is present
-                Assert.That(user.SecurityStamp, Is.Not.Null);
-                Assert.That(user.SecurityStamp, Is.Not.Empty);
-
-                // Update username
-                user.Username += "UPDATED";
-                repository.Save(user);
-
-                // Get the user
-                IUser updatedUser = repository.Get(user.Id);
-
-                // Ensure the Security Stamp is invalidated & no longer the same
-                Assert.AreNotEqual(originalSecurityStamp, updatedUser.SecurityStamp);
-            }
-        }
-
-        [Test]
-        public void Validate_Login_Session()
-        {
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            User user = UserBuilder.CreateUser();
-            using (ICoreScope scope = provider.CreateCoreScope(autoComplete: true))
-            {
-                UserRepository repository = CreateRepository(provider);
-                repository.Save(user);
-            }
-
-            using (ICoreScope scope = provider.CreateCoreScope(autoComplete: true))
-            {
-                UserRepository repository = CreateRepository(provider);
-                Guid sessionId = repository.CreateLoginSession(user.Id, "1.2.3.4");
-
-                // manually update this record to be in the past
-                ScopeAccessor.AmbientScope.Database.Execute(ScopeAccessor.AmbientScope.SqlContext.Sql()
-                    .Update<UserLoginDto>(u => u.Set(x => x.LoggedOutUtc, DateTime.UtcNow.AddDays(-100)))
-                    .Where<UserLoginDto>(x => x.SessionId == sessionId));
-
-                bool isValid = repository.ValidateLoginSession(user.Id, sessionId);
-                Assert.IsFalse(isValid);
-
-                // create a new one
-                sessionId = repository.CreateLoginSession(user.Id, "1.2.3.4");
-                isValid = repository.ValidateLoginSession(user.Id, sessionId);
-                Assert.IsTrue(isValid);
-            }
-        }
-
-        [Test]
-        public void Can_Perform_Update_On_UserRepository()
-        {
-            ContentType ct = ContentTypeBuilder.CreateBasicContentType("test");
-            MediaType mt = MediaTypeBuilder.CreateSimpleMediaType("testmedia", "TestMedia");
-
-            // Arrange
-            ICoreScopeProvider provider = ScopeProvider;
-            using (ICoreScope scope = provider.CreateCoreScope(autoComplete: true))
-            {
-                UserRepository userRepository = CreateRepository(provider);
-                UserGroupRepository userGroupRepository = CreateUserGroupRepository(provider);
-
-                ContentTypeRepository.Save(ct);
-                MediaTypeRepository.Save(mt);
-
-                Content content = ContentBuilder.CreateBasicContent(ct);
-                Media media = MediaBuilder.CreateSimpleMedia(mt, "asdf", -1);
-
-                DocumentRepository.Save(content);
-                MediaRepository.Save(media);
-
-                User user = CreateAndCommitUserWithGroup(userRepository, userGroupRepository);
-
-                // Act
-                var resolved = (User)userRepository.Get(user.Id);
-
-                resolved.Name = "New Name";
-
-                // the db column is not used, default permissions are taken from the user type's permissions, this is a getter only
-                //// resolved.DefaultPermissions = "ZYX";
-
-                resolved.Language = "fr";
-                resolved.IsApproved = false;
-                resolved.RawPasswordValue = "new";
-                resolved.IsLockedOut = true;
-                resolved.StartContentIds = new[] { content.Id };
-                resolved.StartMediaIds = new[] { media.Id };
-                resolved.Email = "new@new.com";
-                resolved.Username = "newName";
-
-                userRepository.Save(resolved);
-
-                var updatedItem = (User)userRepository.Get(user.Id);
-
-                // Assert
-                Assert.That(updatedItem.Id, Is.EqualTo(resolved.Id));
-                Assert.That(updatedItem.Name, Is.EqualTo(resolved.Name));
-                Assert.That(updatedItem.Language, Is.EqualTo(resolved.Language));
-                Assert.That(updatedItem.IsApproved, Is.EqualTo(resolved.IsApproved));
-                Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(resolved.RawPasswordValue));
-                Assert.That(updatedItem.IsLockedOut, Is.EqualTo(resolved.IsLockedOut));
-                Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(resolved.StartContentIds));
-                Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(resolved.StartMediaIds));
-                Assert.That(updatedItem.Email, Is.EqualTo(resolved.Email));
-                Assert.That(updatedItem.Username, Is.EqualTo(resolved.Username));
-                Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(resolved.AllowedSections.Count()));
-                foreach (string allowedSection in resolved.AllowedSections)
-                {
-                    Assert.IsTrue(updatedItem.AllowedSections.Contains(allowedSection));
-                }
-            }
-        }
-
-        private void AssertPropertyValues(IUser updatedItem, IUser originalUser)
-        {
-            Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));
-            Assert.That(updatedItem.Name, Is.EqualTo(originalUser.Name));
-            Assert.That(updatedItem.Language, Is.EqualTo(originalUser.Language));
-            Assert.That(updatedItem.IsApproved, Is.EqualTo(originalUser.IsApproved));
-            Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(originalUser.RawPasswordValue));
-            Assert.That(updatedItem.IsLockedOut, Is.EqualTo(originalUser.IsLockedOut));
-            Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(originalUser.StartContentIds));
-            Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(originalUser.StartMediaIds));
-            Assert.That(updatedItem.Email, Is.EqualTo(originalUser.Email));
-            Assert.That(updatedItem.Username, Is.EqualTo(originalUser.Username));
-            Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(originalUser.AllowedSections.Count()));
-            foreach (string allowedSection in originalUser.AllowedSections)
+            // Assert
+            Assert.That(updatedItem.Id, Is.EqualTo(resolved.Id));
+            Assert.That(updatedItem.Name, Is.EqualTo(resolved.Name));
+            Assert.That(updatedItem.Language, Is.EqualTo(resolved.Language));
+            Assert.That(updatedItem.IsApproved, Is.EqualTo(resolved.IsApproved));
+            Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(resolved.RawPasswordValue));
+            Assert.That(updatedItem.IsLockedOut, Is.EqualTo(resolved.IsLockedOut));
+            Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(resolved.StartContentIds));
+            Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(resolved.StartMediaIds));
+            Assert.That(updatedItem.Email, Is.EqualTo(resolved.Email));
+            Assert.That(updatedItem.Username, Is.EqualTo(resolved.Username));
+            Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(resolved.AllowedSections.Count()));
+            foreach (var allowedSection in resolved.AllowedSections)
             {
                 Assert.IsTrue(updatedItem.AllowedSections.Contains(allowedSection));
             }
         }
+    }
 
-        private User CreateAndCommitUserWithGroup(IUserRepository repository, IUserGroupRepository userGroupRepository)
+    private void AssertPropertyValues(IUser updatedItem, IUser originalUser)
+    {
+        Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));
+        Assert.That(updatedItem.Name, Is.EqualTo(originalUser.Name));
+        Assert.That(updatedItem.Language, Is.EqualTo(originalUser.Language));
+        Assert.That(updatedItem.IsApproved, Is.EqualTo(originalUser.IsApproved));
+        Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(originalUser.RawPasswordValue));
+        Assert.That(updatedItem.IsLockedOut, Is.EqualTo(originalUser.IsLockedOut));
+        Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(originalUser.StartContentIds));
+        Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(originalUser.StartMediaIds));
+        Assert.That(updatedItem.Email, Is.EqualTo(originalUser.Email));
+        Assert.That(updatedItem.Username, Is.EqualTo(originalUser.Username));
+        Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(originalUser.AllowedSections.Count()));
+        foreach (var allowedSection in originalUser.AllowedSections)
         {
-            User user = UserBuilderInstance.WithoutIdentity().Build();
-            repository.Save(user);
-
-            IUserGroup group = UserGroupBuilderInstance.Build();
-            userGroupRepository.AddOrUpdateGroupWithUsers(@group, new[] { user.Id });
-
-            user.AddGroup(UserGroupBuilderInstance.BuildReadOnly(group));
-
-            return user;
-        }
-
-        private IUser[] CreateAndCommitMultipleUsers(IUserRepository repository)
-        {
-            User user1 = UserBuilderInstance.WithoutIdentity().WithSuffix("1").Build();
-            User user2 = UserBuilderInstance.WithoutIdentity().WithSuffix("2").Build();
-            User user3 = UserBuilderInstance.WithoutIdentity().WithSuffix("3").Build();
-            repository.Save(user1);
-            repository.Save(user2);
-            repository.Save(user3);
-            return new IUser[] { user1, user2, user3 };
+            Assert.IsTrue(updatedItem.AllowedSections.Contains(allowedSection));
         }
     }
+
+    private User CreateAndCommitUserWithGroup(IUserRepository repository, IUserGroupRepository userGroupRepository)
+    {
+        var user = UserBuilderInstance.WithoutIdentity().Build();
+        repository.Save(user);
+
+        var group = UserGroupBuilderInstance.Build();
+        userGroupRepository.AddOrUpdateGroupWithUsers(group, new[] { user.Id });
+
+        user.AddGroup(UserGroupBuilderInstance.BuildReadOnly(group));
+
+        return user;
+    }
+
+    private IUser[] CreateAndCommitMultipleUsers(IUserRepository repository)
+    {
+        var user1 = UserBuilderInstance.WithoutIdentity().WithSuffix("1").Build();
+        var user2 = UserBuilderInstance.WithoutIdentity().WithSuffix("2").Build();
+        var user3 = UserBuilderInstance.WithoutIdentity().WithSuffix("3").Build();
+        repository.Save(user1);
+        repository.Save(user2);
+        repository.Save(user3);
+        return new IUser[] { user1, user2, user3 };
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs
index 71771a819e..12b0194e75 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SchemaValidationTest.cs
@@ -9,30 +9,36 @@ using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
+public class SchemaValidationTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
-    public class SchemaValidationTest : UmbracoIntegrationTest
+    private IUmbracoVersion UmbracoVersion => GetRequiredService<IUmbracoVersion>();
+
+    private IEventAggregator EventAggregator => GetRequiredService<IEventAggregator>();
+
+    [Test]
+    public void DatabaseSchemaCreation_Produces_DatabaseSchemaResult_With_Zero_Errors()
     {
-        private IUmbracoVersion UmbracoVersion => GetRequiredService<IUmbracoVersion>();
+        DatabaseSchemaResult result;
 
-        private IEventAggregator EventAggregator => GetRequiredService<IEventAggregator>();
-
-        [Test]
-        public void DatabaseSchemaCreation_Produces_DatabaseSchemaResult_With_Zero_Errors()
+        using (ScopeProvider.CreateScope(autoComplete: true))
         {
-            DatabaseSchemaResult result;
-
-            using (ScopeProvider.CreateScope(autoComplete: true))
-            {
-                var schema = new DatabaseSchemaCreator(ScopeAccessor.AmbientScope.Database, LoggerFactory.CreateLogger<DatabaseSchemaCreator>(), LoggerFactory, UmbracoVersion, EventAggregator, Mock.Of<IOptionsMonitor<InstallDefaultDataSettings>>(x => x.CurrentValue == new InstallDefaultDataSettings()));
-                schema.InitializeDatabaseSchema();
-                result = schema.ValidateSchema(DatabaseSchemaCreator._orderedTables);
-            }
-
-            // Assert
-            Assert.That(result.Errors.Count, Is.EqualTo(0));
+            var schema = new DatabaseSchemaCreator(
+                ScopeAccessor.AmbientScope.Database,
+                LoggerFactory.CreateLogger<DatabaseSchemaCreator>(),
+                LoggerFactory,
+                UmbracoVersion,
+                EventAggregator,
+                Mock.Of<IOptionsMonitor<InstallDefaultDataSettings>>(x =>
+                    x.CurrentValue == new InstallDefaultDataSettings()));
+            schema.InitializeDatabaseSchema();
+            result = schema.ValidateSchema(DatabaseSchemaCreator._orderedTables);
         }
+
+        // Assert
+        Assert.That(result.Errors.Count, Is.EqualTo(0));
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs
index 0fae2991a9..0d8e703604 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/SyntaxProvider/SqlServerSyntaxProviderTests.cs
@@ -5,8 +5,8 @@ using Microsoft.Extensions.Options;
 using Moq;
 using NPoco;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Migrations;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Migrations.Expressions.Common.Expressions;
 using Umbraco.Cms.Infrastructure.Migrations.Expressions.Create.Index;
@@ -20,187 +20,176 @@ using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.SyntaxProvider
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.SyntaxProvider;
+
+[TestFixture]
+public class SqlServerSyntaxProviderTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    public class SqlServerSyntaxProviderTests : UmbracoIntegrationTest
+    private ISqlContext SqlContext => GetRequiredService<IUmbracoDatabaseFactory>().SqlContext;
+    private SqlServerSyntaxProvider GetSqlSyntax() => new(Options.Create(new GlobalSettings()));
+
+    private class TestPlan : MigrationPlan
     {
-        private ISqlContext SqlContext => GetRequiredService<IUmbracoDatabaseFactory>().SqlContext;
-        private SqlServerSyntaxProvider GetSqlSyntax() => new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
-        private class TestPlan : MigrationPlan
+        public TestPlan() : base("Test")
         {
-            public TestPlan() : base("Test")
-            {
-            }
         }
-        private MigrationContext GetMigrationContext(out TestDatabase db)
+    }
+
+    private MigrationContext GetMigrationContext(out TestDatabase db)
+    {
+        var logger = Mock.Of<ILogger<MigrationContext>>();
+        var sqlSyntax = GetSqlSyntax();
+        db = new TestDatabase(DatabaseType.SqlServer2005, sqlSyntax);
+        return new MigrationContext(new TestPlan(), db, logger);
+    }
+
+    [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
+    [Test]
+    public void Can_Generate_Delete_SubQuery_Statement()
+    {
+        var mediaObjectType = Constants.ObjectTypes.Media;
+        var subQuery = SqlContext.Sql()
+            .Select("DISTINCT cmsContentNu.nodeId")
+            .From<ContentNuDto>()
+            .InnerJoin<NodeDto>()
+            .On<ContentNuDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .Where<NodeDto>(dto => dto.NodeObjectType == mediaObjectType);
+
+        var sqlOutput = SqlContext.SqlSyntax.GetDeleteSubquery("cmsContentNu", "nodeId", subQuery);
+
+        string t(string x)
         {
-            ILogger<MigrationContext> logger = Mock.Of<ILogger<MigrationContext>>();
-            SqlServerSyntaxProvider sqlSyntax = GetSqlSyntax();
-            db = new TestDatabase(DatabaseType.SqlServer2005, sqlSyntax);
-            return new MigrationContext(new TestPlan(), db, logger);
+            return SqlContext.SqlSyntax.GetQuotedTableName(x);
         }
 
-        [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
-        [Test]
-        public void Can_Generate_Delete_SubQuery_Statement()
+        string c(string x)
         {
-            var mediaObjectType = Constants.ObjectTypes.Media;
-            var subQuery = SqlContext.Sql()
-                            .Select("DISTINCT cmsContentNu.nodeId")
-                            .From<ContentNuDto>()
-                            .InnerJoin<NodeDto>()
-                            .On<ContentNuDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                            .Where<NodeDto>(dto => dto.NodeObjectType == mediaObjectType);
+            return SqlContext.SqlSyntax.GetQuotedColumnName(x);
+        }
 
-            var sqlOutput = SqlContext.SqlSyntax.GetDeleteSubquery("cmsContentNu", "nodeId", subQuery);
-
-            string t(string x) => SqlContext.SqlSyntax.GetQuotedTableName(x);
-            string c(string x) => SqlContext.SqlSyntax.GetQuotedColumnName(x);
-
-            Assert.AreEqual(@$"DELETE FROM {t("cmsContentNu")} WHERE {c("nodeId")} IN (SELECT {c("nodeId")} FROM (SELECT DISTINCT cmsContentNu.nodeId
+        Assert.AreEqual(
+            @$"DELETE FROM {t("cmsContentNu")} WHERE {c("nodeId")} IN (SELECT {c("nodeId")} FROM (SELECT DISTINCT cmsContentNu.nodeId
 FROM {t("cmsContentNu")}
 INNER JOIN {t("umbracoNode")}
 ON {t("cmsContentNu")}.{c("nodeId")} = {t("umbracoNode")}.{c("id")}
-WHERE (({t("umbracoNode")}.{c("nodeObjectType")} = @0))) x)".Replace(Environment.NewLine, " ").Replace("\n", " ").Replace("\r", " "),
-                                                sqlOutput.SQL.Replace(Environment.NewLine, " ").Replace("\n", " ").Replace("\r", " "));
+WHERE (({t("umbracoNode")}.{c("nodeObjectType")} = @0))) x)".Replace(Environment.NewLine, " ").Replace("\n", " ")
+                .Replace("\r", " "),
+            sqlOutput.SQL.Replace(Environment.NewLine, " ").Replace("\n", " ").Replace("\r", " "));
 
-            Assert.AreEqual(1, sqlOutput.Arguments.Length);
-            Assert.AreEqual(mediaObjectType, sqlOutput.Arguments[0]);
+        Assert.AreEqual(1, sqlOutput.Arguments.Length);
+        Assert.AreEqual(mediaObjectType, sqlOutput.Arguments[0]);
+    }
+
+    [NUnit.Framework.Ignore("This doesn't actually test anything")]
+    [Test]
+    public void Can_Generate_Create_Table_Statement()
+    {
+        var type = typeof(NodeDto);
+        var definition = DefinitionFactory.GetTableDefinition(type, SqlContext.SqlSyntax);
+
+        var create = SqlContext.SqlSyntax.Format(definition);
+        var primaryKey = SqlContext.SqlSyntax.FormatPrimaryKey(definition);
+        var indexes = SqlContext.SqlSyntax.Format(definition.Indexes);
+        var keys = SqlContext.SqlSyntax.Format(definition.ForeignKeys);
+
+        Debug.Print(create);
+        Debug.Print(primaryKey);
+        foreach (var sql in keys)
+        {
+            Debug.Print(sql);
         }
 
-        [NUnit.Framework.Ignore("This doesn't actually test anything")]
-        [Test]
-        public void Can_Generate_Create_Table_Statement()
+        foreach (var sql in indexes)
         {
-            var type = typeof (NodeDto);
-            var definition = DefinitionFactory.GetTableDefinition(type, SqlContext.SqlSyntax);
-
-            string create = SqlContext.SqlSyntax.Format(definition);
-            string primaryKey = SqlContext.SqlSyntax.FormatPrimaryKey(definition);
-            var indexes = SqlContext.SqlSyntax.Format(definition.Indexes);
-            var keys = SqlContext.SqlSyntax.Format(definition.ForeignKeys);
-
-            Debug.Print(create);
-            Debug.Print(primaryKey);
-            foreach (var sql in keys)
-            {
-                Debug.Print(sql);
-            }
-
-            foreach (var sql in indexes)
-            {
-                Debug.Print(sql);
-            }
-        }
-
-        [Test]
-        public void Format_SqlServer_NonClusteredIndexDefinition_AddsNonClusteredDirective()
-        {
-            SqlServerSyntaxProvider sqlSyntax = GetSqlSyntax();
-
-            var indexDefinition = CreateIndexDefinition();
-            indexDefinition.IndexType = IndexTypes.NonClustered;
-
-            var actual = sqlSyntax.Format(indexDefinition);
-            Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", actual);            
-        }
-
-        [Test]
-        public void Format_SqlServer_NonClusteredIndexDefinition_UsingIsClusteredFalse_AddsClusteredDirective()
-        {
-            SqlServerSyntaxProvider sqlSyntax = GetSqlSyntax();
-
-            var indexDefinition = CreateIndexDefinition();
-            indexDefinition.IndexType = IndexTypes.Clustered;
-
-            var actual = sqlSyntax.Format(indexDefinition);
-            Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", actual);
-        }
-
-        [Test]
-        public void CreateIndexBuilder_SqlServer_NonClustered_CreatesNonClusteredIndex()
-        {
-            var context = GetMigrationContext(out var db);
-
-            var createExpression = new CreateIndexExpression(context)
-            {
-                Index = { Name = "IX_A" }
-            };
-
-            new CreateIndexBuilder(createExpression)
-                .OnTable("TheTable").OnColumn("A").Ascending().WithOptions().NonClustered()
-                .Do();
-
-            Assert.AreEqual(1, db.Operations.Count);
-            Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
-        }
-
-        [Test]
-        public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex()
-        {
-            var context = GetMigrationContext(out var db);
-
-            var createExpression = new CreateIndexExpression(context)
-            {
-                Index = { Name = "IX_A" }
-            };
-
-            new CreateIndexBuilder(createExpression)
-                .OnTable("TheTable").OnColumn("A").Ascending().WithOptions().Unique()
-                .Do();
-
-            Assert.AreEqual(1, db.Operations.Count);
-            Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
-        }
-
-        [Test]
-        public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex_Multi_Columnn()
-        {
-            var context = GetMigrationContext(out var db);
-
-            var createExpression = new CreateIndexExpression(context)
-            {
-                Index = { Name = "IX_AB" }
-            };
-
-            new CreateIndexBuilder(createExpression)
-                .OnTable("TheTable").OnColumn("A").Ascending().OnColumn("B").Ascending().WithOptions().Unique()
-                .Do();
-
-            Assert.AreEqual(1, db.Operations.Count);
-            Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_AB] ON [TheTable] ([A],[B])", db.Operations[0].Sql);
-        }
-
-        [Test]
-        public void CreateIndexBuilder_SqlServer_Clustered_CreatesClusteredIndex()
-        {
-            var context = GetMigrationContext(out var db);
-
-            var createExpression = new CreateIndexExpression(context)
-            {
-                Index = { Name = "IX_A" }
-            };
-
-            new CreateIndexBuilder(createExpression)
-                .OnTable("TheTable").OnColumn("A").Ascending().WithOptions().Clustered()
-                .Do();
-
-            Assert.AreEqual(1, db.Operations.Count);
-            Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
-        }
-
-        private static IndexDefinition CreateIndexDefinition()
-        {
-            return new IndexDefinition
-            {
-                ColumnName = "A",
-                Name = "IX_A",
-                TableName = "TheTable",
-                SchemaName = "dbo"
-            };
+            Debug.Print(sql);
         }
     }
+
+    [Test]
+    public void Format_SqlServer_NonClusteredIndexDefinition_AddsNonClusteredDirective()
+    {
+        var sqlSyntax = GetSqlSyntax();
+
+        var indexDefinition = CreateIndexDefinition();
+        indexDefinition.IndexType = IndexTypes.NonClustered;
+
+        var actual = sqlSyntax.Format(indexDefinition);
+        Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", actual);
+    }
+
+    [Test]
+    public void Format_SqlServer_NonClusteredIndexDefinition_UsingIsClusteredFalse_AddsClusteredDirective()
+    {
+        var sqlSyntax = GetSqlSyntax();
+
+        var indexDefinition = CreateIndexDefinition();
+        indexDefinition.IndexType = IndexTypes.Clustered;
+
+        var actual = sqlSyntax.Format(indexDefinition);
+        Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", actual);
+    }
+
+    [Test]
+    public void CreateIndexBuilder_SqlServer_NonClustered_CreatesNonClusteredIndex()
+    {
+        var context = GetMigrationContext(out var db);
+
+        var createExpression = new CreateIndexExpression(context) { Index = { Name = "IX_A" } };
+
+        new CreateIndexBuilder(createExpression)
+            .OnTable("TheTable").OnColumn("A").Ascending().WithOptions().NonClustered()
+            .Do();
+
+        Assert.AreEqual(1, db.Operations.Count);
+        Assert.AreEqual("CREATE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
+    }
+
+    [Test]
+    public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex()
+    {
+        var context = GetMigrationContext(out var db);
+
+        var createExpression = new CreateIndexExpression(context) { Index = { Name = "IX_A" } };
+
+        new CreateIndexBuilder(createExpression)
+            .OnTable("TheTable").OnColumn("A").Ascending().WithOptions().Unique()
+            .Do();
+
+        Assert.AreEqual(1, db.Operations.Count);
+        Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
+    }
+
+    [Test]
+    public void CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex_Multi_Columnn()
+    {
+        var context = GetMigrationContext(out var db);
+
+        var createExpression = new CreateIndexExpression(context) { Index = { Name = "IX_AB" } };
+
+        new CreateIndexBuilder(createExpression)
+            .OnTable("TheTable").OnColumn("A").Ascending().OnColumn("B").Ascending().WithOptions().Unique()
+            .Do();
+
+        Assert.AreEqual(1, db.Operations.Count);
+        Assert.AreEqual("CREATE UNIQUE NONCLUSTERED INDEX [IX_AB] ON [TheTable] ([A],[B])", db.Operations[0].Sql);
+    }
+
+    [Test]
+    public void CreateIndexBuilder_SqlServer_Clustered_CreatesClusteredIndex()
+    {
+        var context = GetMigrationContext(out var db);
+
+        var createExpression = new CreateIndexExpression(context) { Index = { Name = "IX_A" } };
+
+        new CreateIndexBuilder(createExpression)
+            .OnTable("TheTable").OnColumn("A").Ascending().WithOptions().Clustered()
+            .Do();
+
+        Assert.AreEqual(1, db.Operations.Count);
+        Assert.AreEqual("CREATE CLUSTERED INDEX [IX_A] ON [TheTable] ([A])", db.Operations[0].Sql);
+    }
+
+    private static IndexDefinition CreateIndexDefinition() =>
+        new IndexDefinition { ColumnName = "A", Name = "IX_A", TableName = "TheTable", SchemaName = "dbo" };
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs
index f6ee9e01b0..92de5a9c17 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/UnitOfWorkTests.cs
@@ -3,77 +3,71 @@
 
 using System;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DistributedLocking;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Persistence.Sqlite.Services;
-using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class UnitOfWorkTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class UnitOfWorkTests : UmbracoIntegrationTest
+    [Test]
+    public void ReadLockNonExisting()
     {
-        [Test]
-        public void ReadLockNonExisting()
+        var lockingMechanism = GetRequiredService<IDistributedLockingMechanismFactory>().DistributedLockingMechanism;
+        if (lockingMechanism is SqliteDistributedLockingMechanism)
         {
-            var lockingMechanism = GetRequiredService<IDistributedLockingMechanismFactory>().DistributedLockingMechanism;
-            if (lockingMechanism is SqliteDistributedLockingMechanism)
-            {
-                Assert.Ignore("SqliteDistributedLockingMechanism doesn't query the umbracoLock table for read locks.");
-            }
-
-            IScopeProvider provider = ScopeProvider;
-            Assert.Throws<ArgumentException>(() =>
-            {
-                using (IScope scope = provider.CreateScope())
-                {
-                    scope.EagerReadLock(-666);
-                    scope.Complete();
-                }
-            });
+            Assert.Ignore("SqliteDistributedLockingMechanism doesn't query the umbracoLock table for read locks.");
         }
 
-        [Test]
-        public void ReadLockExisting()
+        var provider = ScopeProvider;
+        Assert.Throws<ArgumentException>(() =>
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            using (var scope = provider.CreateScope())
             {
-                scope.EagerReadLock(Constants.Locks.Servers);
+                scope.EagerReadLock(-666);
                 scope.Complete();
             }
-        }
+        });
+    }
 
-        [Test]
-        public void WriteLockNonExisting()
+    [Test]
+    public void ReadLockExisting()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
         {
-            IScopeProvider provider = ScopeProvider;
-            Assert.Throws<ArgumentException>(() =>
-            {
-                using (IScope scope = provider.CreateScope())
-                {
-                    scope.EagerWriteLock(-666);
-                    scope.Complete();
-                }
-            });
+            scope.EagerReadLock(Constants.Locks.Servers);
+            scope.Complete();
         }
+    }
 
-        [Test]
-        public void WriteLockExisting()
+    [Test]
+    public void WriteLockNonExisting()
+    {
+        var provider = ScopeProvider;
+        Assert.Throws<ArgumentException>(() =>
         {
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
+            using (var scope = provider.CreateScope())
             {
-                scope.EagerWriteLock(Constants.Locks.Servers);
+                scope.EagerWriteLock(-666);
                 scope.Complete();
             }
+        });
+    }
+
+    [Test]
+    public void WriteLockExisting()
+    {
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            scope.EagerWriteLock(Constants.Locks.Servers);
+            scope.Complete();
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Runtime/FileSystemMainDomLockTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Runtime/FileSystemMainDomLockTests.cs
index ebb9b8a6a7..eea40a0b49 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Runtime/FileSystemMainDomLockTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Runtime/FileSystemMainDomLockTests.cs
@@ -11,101 +11,100 @@ using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Infrastructure.Runtime;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Runtime
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Runtime;
+
+[TestFixture]
+internal class FileSystemMainDomLockTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    internal class FileSystemMainDomLockTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp()
     {
-        private IMainDomKeyGenerator MainDomKeyGenerator { get; set; }
+        MainDomKeyGenerator = GetRequiredService<IMainDomKeyGenerator>();
+        HostingEnvironment = GetRequiredService<IHostingEnvironment>();
 
-        private IHostingEnvironment HostingEnvironment { get; set; }
+        var lockFileName = $"MainDom_{MainDomKeyGenerator.GenerateKey()}.lock";
+        LockFilePath = Path.Combine(HostingEnvironment.LocalTempPath, lockFileName);
+        LockReleaseFilePath = LockFilePath + "_release";
 
-        private FileSystemMainDomLock FileSystemMainDomLock { get; set; }
+        var globalSettings = Mock.Of<IOptionsMonitor<GlobalSettings>>();
+        Mock.Get(globalSettings).Setup(x => x.CurrentValue).Returns(new GlobalSettings());
 
-        private string LockFilePath { get; set; }
-        private string LockReleaseFilePath { get; set; }
+        var log = GetRequiredService<ILogger<FileSystemMainDomLock>>();
+        FileSystemMainDomLock = new FileSystemMainDomLock(log, MainDomKeyGenerator, HostingEnvironment, globalSettings);
+    }
 
-        [SetUp]
-        public void SetUp()
+    [TearDown]
+    public void TearDown()
+    {
+        CleanupTestFile(LockFilePath);
+        CleanupTestFile(LockReleaseFilePath);
+    }
+
+    private IMainDomKeyGenerator MainDomKeyGenerator { get; set; }
+
+    private IHostingEnvironment HostingEnvironment { get; set; }
+
+    private FileSystemMainDomLock FileSystemMainDomLock { get; set; }
+
+    private string LockFilePath { get; set; }
+    private string LockReleaseFilePath { get; set; }
+
+    private static void CleanupTestFile(string path)
+    {
+        for (var i = 0; i < 3; i++)
         {
-            MainDomKeyGenerator = GetRequiredService<IMainDomKeyGenerator>();
-            HostingEnvironment = GetRequiredService<IHostingEnvironment>();
-
-            var lockFileName = $"MainDom_{MainDomKeyGenerator.GenerateKey()}.lock";
-            LockFilePath = Path.Combine(HostingEnvironment.LocalTempPath, lockFileName);
-            LockReleaseFilePath = LockFilePath + "_release";
-
-            var globalSettings = Mock.Of<IOptionsMonitor<GlobalSettings>>();
-            Mock.Get(globalSettings).Setup(x => x.CurrentValue).Returns(new GlobalSettings());
-
-            var log = GetRequiredService<ILogger<FileSystemMainDomLock>>();
-            FileSystemMainDomLock = new FileSystemMainDomLock(log, MainDomKeyGenerator, HostingEnvironment, globalSettings);
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-            CleanupTestFile(LockFilePath);
-            CleanupTestFile(LockReleaseFilePath);
-        }
-
-        private static void CleanupTestFile(string path)
-        {
-            for (var i = 0; i < 3; i++)
+            try
             {
-                try
-                {
-                    File.Delete(path);
-                    return;
-                }
-                catch
-                {
-                    Thread.Sleep(500 * (i + 1));
-                }
+                File.Delete(path);
+                return;
+            }
+            catch
+            {
+                Thread.Sleep(500 * (i + 1));
             }
         }
+    }
 
-        [Test]
-        public async Task AcquireLockAsync_WhenNoOtherHoldsLockFileHandle_ReturnsTrue()
+    [Test]
+    public async Task AcquireLockAsync_WhenNoOtherHoldsLockFileHandle_ReturnsTrue()
+    {
+        using var sut = FileSystemMainDomLock;
+
+        var result = await sut.AcquireLockAsync(1000);
+
+        Assert.True(result);
+    }
+
+    [Test]
+    public async Task AcquireLockAsync_WhenTimeoutExceeded_ReturnsFalse()
+    {
+        await using var lockFile = File.Open(LockFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+
+        using var sut = FileSystemMainDomLock;
+
+        var result = await sut.AcquireLockAsync(1000);
+
+        Assert.False(result);
+    }
+
+    [Test]
+    public async Task ListenAsync_WhenLockReleaseSignalFileFound_DropsLockFileHandle()
+    {
+        using var sut = FileSystemMainDomLock;
+
+        await sut.AcquireLockAsync(1000);
+
+        var before = await sut.AcquireLockAsync(1000);
+
+        sut.CreateLockReleaseSignalFile();
+        await sut.ListenAsync();
+
+        var after = await sut.AcquireLockAsync(1000);
+
+        Assert.Multiple(() =>
         {
-            using var sut = FileSystemMainDomLock;
-
-            var result = await sut.AcquireLockAsync(1000);
-
-            Assert.True(result);
-        }
-
-        [Test]
-        public async Task AcquireLockAsync_WhenTimeoutExceeded_ReturnsFalse()
-        {
-            await using var lockFile = File.Open(LockFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-
-            using var sut = FileSystemMainDomLock;
-
-            var result = await sut.AcquireLockAsync(1000);
-
-            Assert.False(result);
-        }
-
-        [Test]
-        public async Task ListenAsync_WhenLockReleaseSignalFileFound_DropsLockFileHandle()
-        {
-            using var sut = FileSystemMainDomLock;
-
-            await sut.AcquireLockAsync(1000);
-
-            var before = await sut.AcquireLockAsync(1000);
-
-            sut.CreateLockReleaseSignalFile();
-            await sut.ListenAsync();
-
-            var after = await sut.AcquireLockAsync(1000);
-
-            Assert.Multiple(() =>
-            {
-                Assert.False(before);
-                Assert.True(after);
-            });
-        }
+            Assert.False(before);
+            Assert.True(after);
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/LegacyScopeProviderTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/LegacyScopeProviderTests.cs
index ce0c9221e1..dc12ed9dc7 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/LegacyScopeProviderTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/LegacyScopeProviderTests.cs
@@ -12,18 +12,18 @@ public class LegacyScopeProviderTests : UmbracoIntegrationTest
     [Test]
     public void CreateScope_Always_ReturnsLegacyIScope()
     {
-        var scopeProvider = GetRequiredService<global::Umbraco.Cms.Core.Scoping.IScopeProvider>();
+        var scopeProvider = GetRequiredService<IScopeProvider>();
 
         using (var scope = scopeProvider.CreateScope())
         {
-            Assert.IsInstanceOf<global::Umbraco.Cms.Core.Scoping.IScope>(scope);
+            Assert.IsInstanceOf<IScope>(scope);
         }
     }
 
     [Test]
     public void LegacyScopeProvider_Always_IsACoreScopeProvider()
     {
-        var scopeProvider = GetRequiredService<global::Umbraco.Cms.Core.Scoping.IScopeProvider>();
+        var scopeProvider = GetRequiredService<IScopeProvider>();
 
         Assert.IsInstanceOf<ICoreScopeProvider>(scopeProvider);
     }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs
index 3e4268e496..d9832439fb 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeFileSystemsTests.cs
@@ -4,228 +4,219 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
-using FileSystems = Umbraco.Cms.Core.IO.FileSystems;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
+public class ScopeFileSystemsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewEmptyPerTest)]
-    public class ScopeFileSystemsTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => ClearFiles(IOHelper);
+
+    [TearDown]
+    public void Teardown() => ClearFiles(IOHelper);
+
+    private MediaFileManager MediaFileManager => GetRequiredService<MediaFileManager>();
+
+    private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+
+    private void ClearFiles(IIOHelper ioHelper)
     {
-        private MediaFileManager MediaFileManager => GetRequiredService<MediaFileManager>();
+        TestHelper.DeleteDirectory(ioHelper.MapPath("media"));
+        TestHelper.DeleteDirectory(ioHelper.MapPath("FileSysTests"));
+        TestHelper.DeleteDirectory(ioHelper.MapPath(Constants.SystemDirectories.TempData.EnsureEndsWith('/') +
+                                                    "ShadowFs"));
+    }
 
-        private IHostingEnvironment HostingEnvironment => GetRequiredService<IHostingEnvironment>();
+    [Test]
+    public void MediaFileManager_does_not_write_to_physical_file_system_when_scoped_if_scope_does_not_complete()
+    {
+        var rootPath = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoMediaPhysicalRootPath);
+        var rootUrl = HostingEnvironment.ToAbsolute(GlobalSettings.UmbracoMediaPath);
+        var physMediaFileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), rootPath, rootUrl);
+        var mediaFileManager = MediaFileManager;
 
-        [SetUp]
-        public void SetUp() => ClearFiles(IOHelper);
+        Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
 
-        [TearDown]
-        public void Teardown()
+        using (ScopeProvider.CreateScope(scopeFileSystems: true))
         {
-            ClearFiles(IOHelper);
-        }
-
-        private void ClearFiles(IIOHelper ioHelper)
-        {
-            TestHelper.DeleteDirectory(ioHelper.MapPath("media"));
-            TestHelper.DeleteDirectory(ioHelper.MapPath("FileSysTests"));
-            TestHelper.DeleteDirectory(ioHelper.MapPath(Constants.SystemDirectories.TempData.EnsureEndsWith('/') + "ShadowFs"));
-        }
-
-        [Test]
-        public void MediaFileManager_does_not_write_to_physical_file_system_when_scoped_if_scope_does_not_complete()
-        {
-            string rootPath = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoMediaPhysicalRootPath);
-            string rootUrl = HostingEnvironment.ToAbsolute(GlobalSettings.UmbracoMediaPath);
-            var physMediaFileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), rootPath, rootUrl);
-            MediaFileManager mediaFileManager = MediaFileManager;
-
-            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
-
-            using (ScopeProvider.CreateScope(scopeFileSystems: true))
+            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
             {
-                using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                {
-                    MediaFileManager.FileSystem.AddFile("f1.txt", ms);
-                }
-
-                Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
-                Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
-
-                Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
-                Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
+                MediaFileManager.FileSystem.AddFile("f1.txt", ms);
             }
 
-            // After scope is disposed ensure shadow wrapper didn't commit to physical
-            Assert.IsFalse(mediaFileManager.FileSystem.FileExists("f1.txt"));
-            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
-        }
-
-        [Test]
-        public void MediaFileManager_writes_to_physical_file_system_when_scoped_and_scope_is_completed()
-        {
-            string rootPath = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoMediaPhysicalRootPath);
-            string rootUrl = HostingEnvironment.ToAbsolute(GlobalSettings.UmbracoMediaPath);
-            var physMediaFileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), rootPath, rootUrl);
-            MediaFileManager mediaFileManager = MediaFileManager;
-
-            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
-
-            using (IScope scope = ScopeProvider.CreateScope(scopeFileSystems: true))
-            {
-                using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                {
-                    mediaFileManager.FileSystem.AddFile("f1.txt", ms);
-                }
-
-                Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
-                Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
-
-                scope.Complete();
-
-                Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
-                Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
-            }
-
-            // After scope is disposed ensure shadow wrapper writes to physical file system
             Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
-            Assert.IsTrue(physMediaFileSystem.FileExists("f1.txt"));
+            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
+
+            Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
+            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
         }
 
-        [Test]
-        public void MultiThread()
-        {
-            string rootPath = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoMediaPhysicalRootPath);
-            string rootUrl = HostingEnvironment.ToAbsolute(GlobalSettings.UmbracoMediaPath);
-            var physMediaFileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), rootPath, rootUrl);
-            MediaFileManager mediaFileManager = MediaFileManager;
-            var taskHelper = new TaskHelper(Mock.Of<ILogger<TaskHelper>>());
+        // After scope is disposed ensure shadow wrapper didn't commit to physical
+        Assert.IsFalse(mediaFileManager.FileSystem.FileExists("f1.txt"));
+        Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
+    }
 
-            IScopeProvider scopeProvider = ScopeProvider;
-            using (IScope scope = scopeProvider.CreateScope(scopeFileSystems: true))
+    [Test]
+    public void MediaFileManager_writes_to_physical_file_system_when_scoped_and_scope_is_completed()
+    {
+        var rootPath = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoMediaPhysicalRootPath);
+        var rootUrl = HostingEnvironment.ToAbsolute(GlobalSettings.UmbracoMediaPath);
+        var physMediaFileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), rootPath, rootUrl);
+        var mediaFileManager = MediaFileManager;
+
+        Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
+
+        using (var scope = ScopeProvider.CreateScope(scopeFileSystems: true))
+        {
+            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
             {
+                mediaFileManager.FileSystem.AddFile("f1.txt", ms);
+            }
+
+            Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
+            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
+
+            scope.Complete();
+
+            Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
+            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
+        }
+
+        // After scope is disposed ensure shadow wrapper writes to physical file system
+        Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
+        Assert.IsTrue(physMediaFileSystem.FileExists("f1.txt"));
+    }
+
+    [Test]
+    public void MultiThread()
+    {
+        var rootPath = HostingEnvironment.MapPathWebRoot(GlobalSettings.UmbracoMediaPhysicalRootPath);
+        var rootUrl = HostingEnvironment.ToAbsolute(GlobalSettings.UmbracoMediaPath);
+        var physMediaFileSystem = new PhysicalFileSystem(IOHelper, HostingEnvironment, GetRequiredService<ILogger<PhysicalFileSystem>>(), rootPath, rootUrl);
+        var mediaFileManager = MediaFileManager;
+        var taskHelper = new TaskHelper(Mock.Of<ILogger<TaskHelper>>());
+
+        var scopeProvider = ScopeProvider;
+        using (var scope = scopeProvider.CreateScope(scopeFileSystems: true))
+        {
+            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
+            {
+                mediaFileManager.FileSystem.AddFile("f1.txt", ms);
+            }
+
+            Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
+            Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
+
+            // execute on another disconnected thread (execution context will not flow)
+            var t = taskHelper.ExecuteBackgroundTask(() =>
+            {
+                Assert.IsFalse(mediaFileManager.FileSystem.FileExists("f1.txt"));
+
                 using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
                 {
-                    mediaFileManager.FileSystem.AddFile("f1.txt", ms);
+                    mediaFileManager.FileSystem.AddFile("f2.txt", ms);
                 }
 
-                Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f1.txt"));
-                Assert.IsFalse(physMediaFileSystem.FileExists("f1.txt"));
-
-                // execute on another disconnected thread (execution context will not flow)
-                Task t = taskHelper.ExecuteBackgroundTask(() =>
-                {
-                    Assert.IsFalse(mediaFileManager.FileSystem.FileExists("f1.txt"));
-
-                    using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-                    {
-                        mediaFileManager.FileSystem.AddFile("f2.txt", ms);
-                    }
-
-                    Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f2.txt"));
-                    Assert.IsTrue(physMediaFileSystem.FileExists("f2.txt"));
-
-                    return Task.CompletedTask;
-                });
-
-                Task.WaitAll(t);
-
                 Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f2.txt"));
                 Assert.IsTrue(physMediaFileSystem.FileExists("f2.txt"));
-            }
-        }
 
-        [Test]
-        public void SingleShadow()
-        {
-            var taskHelper = new TaskHelper(Mock.Of<ILogger<TaskHelper>>());
-            IScopeProvider scopeProvider = ScopeProvider;
-            bool isThrown = false;
-            using (IScope scope = scopeProvider.CreateScope(scopeFileSystems: true))
-            {
-                // This is testing when another thread concurrently tries to create a scoped file system
-                // because at the moment we don't support concurrent scoped filesystems.
-                Task t = taskHelper.ExecuteBackgroundTask(() =>
-                {
-                    // ok to create a 'normal' other scope
-                    using (IScope other = scopeProvider.CreateScope())
-                    {
-                        other.Complete();
-                    }
-
-                    // not ok to create a 'scoped filesystems' other scope
-                    // we will get a "Already shadowing." exception.
-                    Assert.Throws<InvalidOperationException>(() =>
-                    {
-                        using IScope other = scopeProvider.CreateScope(scopeFileSystems: true);
-                    });
-
-                    isThrown = true;
-
-                    return Task.CompletedTask;
-                });
-
-                Task.WaitAll(t);
-            }
-
-            Assert.IsTrue(isThrown);
-        }
-
-        [Test]
-        public void SingleShadowEvenDetached()
-        {
-            var taskHelper = new TaskHelper(Mock.Of<ILogger<TaskHelper>>());
-            var scopeProvider = (ScopeProvider)ScopeProvider;
-            using (IScope scope = scopeProvider.CreateScope(scopeFileSystems: true))
-            {
-                // This is testing when another thread concurrently tries to create a scoped file system
-                // because at the moment we don't support concurrent scoped filesystems.
-                Task t = taskHelper.ExecuteBackgroundTask(() =>
-                {
-                    // not ok to create a 'scoped filesystems' other scope
-                    // because at the moment we don't support concurrent scoped filesystems
-                    // even a detached one
-                    // we will get a "Already shadowing." exception.
-                    Assert.Throws<InvalidOperationException>(() =>
-                    {
-                        using IScope other = scopeProvider.CreateDetachedScope(scopeFileSystems: true);
-                    });
-
-                    return Task.CompletedTask;
-                });
-
-                Task.WaitAll(t);
-            }
-
-            IScope detached = scopeProvider.CreateDetachedScope(scopeFileSystems: true);
-
-            Assert.IsNull(scopeProvider.AmbientScope);
-
-            Assert.Throws<InvalidOperationException>(() =>
-            {
-                // even if there is no ambient scope, there's a single shadow
-                using IScope other = scopeProvider.CreateScope(scopeFileSystems: true);
+                return Task.CompletedTask;
             });
 
-            scopeProvider.AttachScope(detached);
-            detached.Dispose();
+            Task.WaitAll(t);
+
+            Assert.IsTrue(mediaFileManager.FileSystem.FileExists("f2.txt"));
+            Assert.IsTrue(physMediaFileSystem.FileExists("f2.txt"));
         }
     }
+
+    [Test]
+    public void SingleShadow()
+    {
+        var taskHelper = new TaskHelper(Mock.Of<ILogger<TaskHelper>>());
+        var scopeProvider = ScopeProvider;
+        var isThrown = false;
+        using (var scope = scopeProvider.CreateScope(scopeFileSystems: true))
+        {
+            // This is testing when another thread concurrently tries to create a scoped file system
+            // because at the moment we don't support concurrent scoped filesystems.
+            var t = taskHelper.ExecuteBackgroundTask(() =>
+            {
+                // ok to create a 'normal' other scope
+                using (var other = scopeProvider.CreateScope())
+                {
+                    other.Complete();
+                }
+
+                // not ok to create a 'scoped filesystems' other scope
+                // we will get a "Already shadowing." exception.
+                Assert.Throws<InvalidOperationException>(() =>
+                {
+                    using var other = scopeProvider.CreateScope(scopeFileSystems: true);
+                });
+
+                isThrown = true;
+
+                return Task.CompletedTask;
+            });
+
+            Task.WaitAll(t);
+        }
+
+        Assert.IsTrue(isThrown);
+    }
+
+    [Test]
+    public void SingleShadowEvenDetached()
+    {
+        var taskHelper = new TaskHelper(Mock.Of<ILogger<TaskHelper>>());
+        var scopeProvider = (ScopeProvider)ScopeProvider;
+        using (var scope = scopeProvider.CreateScope(scopeFileSystems: true))
+        {
+            // This is testing when another thread concurrently tries to create a scoped file system
+            // because at the moment we don't support concurrent scoped filesystems.
+            var t = taskHelper.ExecuteBackgroundTask(() =>
+            {
+                // not ok to create a 'scoped filesystems' other scope
+                // because at the moment we don't support concurrent scoped filesystems
+                // even a detached one
+                // we will get a "Already shadowing." exception.
+                Assert.Throws<InvalidOperationException>(() =>
+                {
+                    using var other = scopeProvider.CreateDetachedScope(scopeFileSystems: true);
+                });
+
+                return Task.CompletedTask;
+            });
+
+            Task.WaitAll(t);
+        }
+
+        var detached = scopeProvider.CreateDetachedScope(scopeFileSystems: true);
+
+        Assert.IsNull(scopeProvider.AmbientScope);
+
+        Assert.Throws<InvalidOperationException>(() =>
+        {
+            // even if there is no ambient scope, there's a single shadow
+            using var other = scopeProvider.CreateScope(scopeFileSystems: true);
+        });
+
+        scopeProvider.AttachScope(detached);
+        detached.Dispose();
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs
index 5febb2819b..1f03b8ea49 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopeTests.cs
@@ -2,11 +2,8 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Castle.Core.Logging;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Moq;
@@ -32,7 +29,6 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
         [SetUp]
         public void SetUp() => Assert.IsNull(ScopeProvider.AmbientScope); // gone
 
-
         protected override void ConfigureTestServices(IServiceCollection services)
         {
             // Need to have a mockable request cache for tests
@@ -44,7 +40,6 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
             services.AddUnique(appCaches);
         }
 
-
         [Test]
         public void GivenUncompletedScopeOnChildThread_WhenTheParentCompletes_TheTransactionIsRolledBack()
         {
@@ -71,7 +66,6 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
         public void GivenNonDisposedChildScope_WhenTheParentDisposes_ThenInvalidOperationExceptionThrows()
         {
             // this all runs in the same execution context so the AmbientScope reference isn't a copy
-
             ScopeProvider scopeProvider = ScopeProvider;
 
             Assert.IsNull(ScopeProvider.AmbientScope);
@@ -94,6 +88,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
             var t = Task.Run(() =>
             {
                 Console.WriteLine("Child Task start: " + scopeProvider.AmbientScope.InstanceId);
+
                 // This will push the child scope to the top of the Stack
                 IScope nested = scopeProvider.CreateScope();
                 Console.WriteLine("Child Task scope created: " + scopeProvider.AmbientScope.InstanceId);
@@ -105,8 +100,10 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
 
             // provide some time for the child thread to start so the ambient context is copied in AsyncLocal
             Thread.Sleep(2000);
+
             // now dispose the main without waiting for the child thread to join
             Console.WriteLine("Parent Task disposing: " + scopeProvider.AmbientScope.InstanceId);
+
             // This will throw because at this stage a child scope has been created which means
             // it is the Ambient (top) scope but here we're trying to dispose the non top scope.
             Assert.Throws<InvalidOperationException>(() => mainScope.Dispose());
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedNuCacheTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedNuCacheTests.cs
index 2bc3682548..89e1543b1e 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedNuCacheTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedNuCacheTests.cs
@@ -17,103 +17,101 @@ using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping;
 using Umbraco.Extensions;
 
-namespace Umbraco.Tests.Scoping
+namespace Umbraco.Tests.Scoping;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ScopedNuCacheTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class ScopedNuCacheTests : UmbracoIntegrationTest
+    private IContentService ContentService => GetRequiredService<IContentService>();
+    private Mock<IHttpContextAccessor> MockHttpContextAccessor { get; } = CreateMockHttpContextAccessor();
+    private IUmbracoContextFactory UmbracoContextFactory => GetRequiredService<IUmbracoContextFactory>();
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+    private IVariationContextAccessor VariationContextAccessor => GetRequiredService<IVariationContextAccessor>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private IContentService ContentService => GetRequiredService<IContentService>();
-        private Mock<IHttpContextAccessor> MockHttpContextAccessor { get; set; } = CreateMockHttpContextAccessor();
-        private IUmbracoContextFactory UmbracoContextFactory => GetRequiredService<IUmbracoContextFactory>();
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-        private IVariationContextAccessor VariationContextAccessor => GetRequiredService<IVariationContextAccessor>();
+        NotificationHandler.PublishedContent = notification => { };
+        builder.Services.AddUnique<IServerMessenger, ScopedRepositoryTests.LocalServerMessenger>();
+        builder.AddCoreNotifications();
+        builder.AddNotificationHandler<ContentPublishedNotification, NotificationHandler>();
+        builder.Services.AddUnique<IUmbracoContextAccessor, TestUmbracoContextAccessor>();
+        builder.Services.AddUnique(MockHttpContextAccessor.Object);
+        builder.AddNuCache();
+    }
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+    public class NotificationHandler : INotificationHandler<ContentPublishedNotification>
+    {
+        public static Action<ContentPublishedNotification> PublishedContent { get; set; }
+        public void Handle(ContentPublishedNotification notification) => PublishedContent?.Invoke(notification);
+    }
+
+    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor()
+    {
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.Scheme = "http";
+        httpContext.Request.Host = new HostString("localhost");
+
+        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(httpContext);
+        return mockHttpContextAccessor;
+    }
+
+    [TestCase(true)]
+    [TestCase(false)]
+    public void TestScope(bool complete)
+    {
+        var umbracoContext = UmbracoContextFactory.EnsureUmbracoContext().UmbracoContext;
+
+        // create document type, document
+        var contentType = new ContentType(ShortStringHelper, -1) { Alias = "CustomDocument", Name = "Custom Document" };
+        ContentTypeService.Save(contentType);
+        var item = new Content("name", -1, contentType);
+
+        using (var scope = ScopeProvider.CreateScope())
         {
-            NotificationHandler.PublishedContent = notification => { };
-            builder.Services.AddUnique<IServerMessenger, ScopedRepositoryTests.LocalServerMessenger>();
-            builder.AddCoreNotifications();
-            builder.AddNotificationHandler<ContentPublishedNotification, NotificationHandler>();
-            builder.Services.AddUnique<IUmbracoContextAccessor, TestUmbracoContextAccessor>();
-            builder.Services.AddUnique<IHttpContextAccessor>(MockHttpContextAccessor.Object);
-            builder.AddNuCache();
+            ContentService.SaveAndPublish(item);
+            scope.Complete();
         }
 
-        public class NotificationHandler : INotificationHandler<ContentPublishedNotification>
+        // event handler
+        var evented = 0;
+        NotificationHandler.PublishedContent = notification =>
         {
-            public void Handle(ContentPublishedNotification notification) => PublishedContent?.Invoke(notification);
+            evented++;
 
-            public static Action<ContentPublishedNotification> PublishedContent { get; set; }
-        }
+            var e = umbracoContext.Content.GetById(item.Id);
 
-        private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor()
+            // during events, due to LiveSnapshot, we see the changes
+            Assert.IsNotNull(e);
+            Assert.AreEqual("changed", e.Name(VariationContextAccessor));
+        };
+
+        // been created
+        var x = umbracoContext.Content.GetById(item.Id);
+        Assert.IsNotNull(x);
+        Assert.AreEqual("name", x.Name(VariationContextAccessor));
+
+        using (var scope = ScopeProvider.CreateScope())
         {
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var httpContext = new DefaultHttpContext();
-            httpContext.Request.Scheme = "http";
-            httpContext.Request.Host = new HostString("localhost");
+            item.Name = "changed";
+            ContentService.SaveAndPublish(item);
 
-            mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(httpContext);
-            return mockHttpContextAccessor;
-        }
-
-        [TestCase(true)]
-        [TestCase(false)]
-        public void TestScope(bool complete)
-        {
-            var umbracoContext = UmbracoContextFactory.EnsureUmbracoContext().UmbracoContext;
-
-            // create document type, document
-            var contentType = new ContentType(ShortStringHelper, -1) { Alias = "CustomDocument", Name = "Custom Document" };
-            ContentTypeService.Save(contentType);
-            var item = new Content("name", -1, contentType);
-
-            using (var scope = ScopeProvider.CreateScope())
+            if (complete)
             {
-                ContentService.SaveAndPublish(item);
                 scope.Complete();
             }
-
-            // event handler
-            var evented = 0;
-            NotificationHandler.PublishedContent = notification =>
-            {
-                evented++;
-
-                var e = umbracoContext.Content.GetById(item.Id);
-
-                // during events, due to LiveSnapshot, we see the changes
-                Assert.IsNotNull(e);
-                Assert.AreEqual("changed", e.Name(VariationContextAccessor));
-            };
-
-            // been created
-            var x = umbracoContext.Content.GetById(item.Id);
-            Assert.IsNotNull(x);
-            Assert.AreEqual("name", x.Name(VariationContextAccessor));
-
-            using (var scope = ScopeProvider.CreateScope())
-            {
-                item.Name = "changed";
-                ContentService.SaveAndPublish(item);
-
-                if (complete)
-                {
-                    scope.Complete();
-                }
-            }
-
-            // only 1 event occuring because we are publishing twice for the same event for
-            // the same object and the scope deduplicates the events (uses the latest)
-            Assert.AreEqual(complete ? 1 : 0, evented);
-
-            // after the scope,
-            // if completed, we see the changes
-            // else changes have been rolled back
-            x = umbracoContext.Content.GetById(item.Id);
-            Assert.IsNotNull(x);
-            Assert.AreEqual(complete ? "changed" : "name", x.Name(VariationContextAccessor));
         }
+
+        // only 1 event occuring because we are publishing twice for the same event for
+        // the same object and the scope deduplicates the events (uses the latest)
+        Assert.AreEqual(complete ? 1 : 0, evented);
+
+        // after the scope,
+        // if completed, we see the changes
+        // else changes have been rolled back
+        x = umbracoContext.Content.GetById(item.Id);
+        Assert.IsNotNull(x);
+        Assert.AreEqual(complete ? "changed" : "name", x.Name(VariationContextAccessor));
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
index b59bd1b834..dfc5ee8bb7 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/ScopedRepositoryTests.cs
@@ -7,13 +7,11 @@ using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -22,320 +20,314 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ScopedRepositoryTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class ScopedRepositoryTests : UmbracoIntegrationTest
+    private IUserService UserService => GetRequiredService<IUserService>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    protected override void ConfigureTestServices(IServiceCollection services)
     {
-        private IUserService UserService => GetRequiredService<IUserService>();
+        // this is what's created core web runtime
+        var appCaches = new AppCaches(
+            new DeepCloneAppCache(new ObjectCacheAppCache()),
+            NoAppCache.Instance,
+            new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        services.AddUnique(appCaches);
+    }
 
-        protected override void ConfigureTestServices(IServiceCollection services)
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
+    {
+        builder.AddNuCache();
+        builder.Services.AddUnique<IServerMessenger, LocalServerMessenger>();
+        builder
+            .AddNotificationHandler<DictionaryItemDeletedNotification, DistributedCacheBinder>()
+            .AddNotificationHandler<DictionaryItemSavedNotification, DistributedCacheBinder>()
+            .AddNotificationHandler<LanguageSavedNotification, DistributedCacheBinder>()
+            .AddNotificationHandler<LanguageDeletedNotification, DistributedCacheBinder>()
+            .AddNotificationHandler<UserSavedNotification, DistributedCacheBinder>()
+            .AddNotificationHandler<LanguageDeletedNotification, DistributedCacheBinder>()
+            .AddNotificationHandler<MemberGroupDeletedNotification, DistributedCacheBinder>()
+            .AddNotificationHandler<MemberGroupSavedNotification, DistributedCacheBinder>();
+        builder.AddNotificationHandler<LanguageSavedNotification, PublishedSnapshotServiceEventHandler>();
+    }
+
+    [TestCase(true)]
+    [TestCase(false)]
+    public void DefaultRepositoryCachePolicy(bool complete)
+    {
+        var scopeProvider = (ScopeProvider)ScopeProvider;
+        var service = (UserService)UserService;
+        var globalCache = AppCaches.IsolatedCaches.GetOrCreate(typeof(IUser));
+        var user = (IUser)new User(GlobalSettings, "name", "email", "username", "rawPassword");
+        service.Save(user);
+
+        // User has been saved so the cache has been cleared of it
+        var globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
+        Assert.IsNull(globalCached);
+        // Get user again to load it into the cache again, this also ensure we don't modify the one that's in the cache.
+        user = service.GetUserById(user.Id);
+
+        // global cache contains the entity
+        globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
+        Assert.IsNotNull(globalCached);
+        Assert.AreEqual(user.Id, globalCached.Id);
+        Assert.AreEqual("name", globalCached.Name);
+
+        Assert.IsNull(scopeProvider.AmbientScope);
+        using (var scope = scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
         {
-            // this is what's created core web runtime
-            var appCaches = new AppCaches(
-                new DeepCloneAppCache(new ObjectCacheAppCache()),
-                NoAppCache.Instance,
-                new IsolatedCaches(type => new DeepCloneAppCache(new ObjectCacheAppCache())));
+            Assert.IsInstanceOf<Scope>(scope);
+            Assert.IsNotNull(scopeProvider.AmbientScope);
+            Assert.AreSame(scope, scopeProvider.AmbientScope);
 
-            services.AddUnique(appCaches);
-        }
+            // scope has its own isolated cache
+            var scopedCache = scope.IsolatedCaches.GetOrCreate(typeof(IUser));
+            Assert.AreNotSame(globalCache, scopedCache);
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
-        {
-            builder.AddNuCache();
-            builder.Services.AddUnique<IServerMessenger, LocalServerMessenger>();
-            builder
-                .AddNotificationHandler<DictionaryItemDeletedNotification, DistributedCacheBinder>()
-                .AddNotificationHandler<DictionaryItemSavedNotification, DistributedCacheBinder>()
-                .AddNotificationHandler<LanguageSavedNotification, DistributedCacheBinder>()
-                .AddNotificationHandler<LanguageDeletedNotification, DistributedCacheBinder>()
-                .AddNotificationHandler<UserSavedNotification, DistributedCacheBinder>()
-                .AddNotificationHandler<LanguageDeletedNotification, DistributedCacheBinder>()
-                .AddNotificationHandler<MemberGroupDeletedNotification, DistributedCacheBinder>()
-                .AddNotificationHandler<MemberGroupSavedNotification, DistributedCacheBinder>();
-            builder.AddNotificationHandler<LanguageSavedNotification, PublishedSnapshotServiceEventHandler>();
-        }
-
-        [TestCase(true)]
-        [TestCase(false)]
-        public void DefaultRepositoryCachePolicy(bool complete)
-        {
-            var scopeProvider = (ScopeProvider)ScopeProvider;
-            var service = (UserService)UserService;
-            IAppPolicyCache globalCache = AppCaches.IsolatedCaches.GetOrCreate(typeof(IUser));
-            var user = (IUser)new User(GlobalSettings, "name", "email", "username", "rawPassword");
+            user.Name = "changed";
             service.Save(user);
 
-            // User has been saved so the cache has been cleared of it
-            var globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
-            Assert.IsNull(globalCached);
-            // Get user again to load it into the cache again, this also ensure we don't modify the one that's in the cache.
-            user = service.GetUserById(user.Id);
+            // scoped cache contains the "new" entity
+            var scopeCached = (IUser)scopedCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
+            Assert.IsNotNull(scopeCached);
+            Assert.AreEqual(user.Id, scopeCached.Id);
+            Assert.AreEqual("changed", scopeCached.Name);
 
-            // global cache contains the entity
+            // global cache is unchanged
             globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
             Assert.IsNotNull(globalCached);
             Assert.AreEqual(user.Id, globalCached.Id);
             Assert.AreEqual("name", globalCached.Name);
 
-            Assert.IsNull(scopeProvider.AmbientScope);
-            using (IScope scope = scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
-            {
-                Assert.IsInstanceOf<Scope>(scope);
-                Assert.IsNotNull(scopeProvider.AmbientScope);
-                Assert.AreSame(scope, scopeProvider.AmbientScope);
-
-                // scope has its own isolated cache
-                IAppPolicyCache scopedCache = scope.IsolatedCaches.GetOrCreate(typeof(IUser));
-                Assert.AreNotSame(globalCache, scopedCache);
-
-                user.Name = "changed";
-                service.Save(user);
-
-                // scoped cache contains the "new" entity
-                var scopeCached = (IUser)scopedCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
-                Assert.IsNotNull(scopeCached);
-                Assert.AreEqual(user.Id, scopeCached.Id);
-                Assert.AreEqual("changed", scopeCached.Name);
-
-                // global cache is unchanged
-                globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
-                Assert.IsNotNull(globalCached);
-                Assert.AreEqual(user.Id, globalCached.Id);
-                Assert.AreEqual("name", globalCached.Name);
-
-                if (complete)
-                {
-                    scope.Complete();
-                }
-            }
-
-            Assert.IsNull(scopeProvider.AmbientScope);
-
-            globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
             if (complete)
             {
-                // global cache has been cleared
-                Assert.IsNull(globalCached);
+                scope.Complete();
             }
-            else
-            {
-                // global cache has *not* been cleared
-                Assert.IsNotNull(globalCached);
-            }
-
-            // get again, updated if completed
-            user = service.GetUserById(user.Id);
-            Assert.AreEqual(complete ? "changed" : "name", user.Name);
-
-            // global cache contains the entity again
-            globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
-            Assert.IsNotNull(globalCached);
-            Assert.AreEqual(user.Id, globalCached.Id);
-            Assert.AreEqual(complete ? "changed" : "name", globalCached.Name);
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void FullDataSetRepositoryCachePolicy(bool complete)
-        {
-            var scopeProvider = (ScopeProvider)ScopeProvider;
-            ILocalizationService service = LocalizationService;
-            IAppPolicyCache globalCache = AppCaches.IsolatedCaches.GetOrCreate(typeof(ILanguage));
+        Assert.IsNull(scopeProvider.AmbientScope);
 
-            ILanguage lang = new Language("fr-FR", "French (France)");
+        globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
+        if (complete)
+        {
+            // global cache has been cleared
+            Assert.IsNull(globalCached);
+        }
+        else
+        {
+            // global cache has *not* been cleared
+            Assert.IsNotNull(globalCached);
+        }
+
+        // get again, updated if completed
+        user = service.GetUserById(user.Id);
+        Assert.AreEqual(complete ? "changed" : "name", user.Name);
+
+        // global cache contains the entity again
+        globalCached = (IUser)globalCache.Get(GetCacheIdKey<IUser>(user.Id), () => null);
+        Assert.IsNotNull(globalCached);
+        Assert.AreEqual(user.Id, globalCached.Id);
+        Assert.AreEqual(complete ? "changed" : "name", globalCached.Name);
+    }
+
+    [TestCase(true)]
+    [TestCase(false)]
+    public void FullDataSetRepositoryCachePolicy(bool complete)
+    {
+        var scopeProvider = (ScopeProvider)ScopeProvider;
+        var service = LocalizationService;
+        var globalCache = AppCaches.IsolatedCaches.GetOrCreate(typeof(ILanguage));
+
+        ILanguage lang = new Language("fr-FR", "French (France)");
+        service.Save(lang);
+
+        // global cache has been flushed, reload
+        var globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
+        Assert.IsNull(globalFullCached);
+        var reload = service.GetLanguageById(lang.Id);
+
+        // global cache contains the entity
+        globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
+        Assert.IsNotNull(globalFullCached);
+        var globalCached = globalFullCached.First(x => x.Id == lang.Id);
+        Assert.IsNotNull(globalCached);
+        Assert.AreEqual(lang.Id, globalCached.Id);
+        Assert.AreEqual("fr-FR", globalCached.IsoCode);
+
+        Assert.IsNull(scopeProvider.AmbientScope);
+        using (var scope = scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
+        {
+            Assert.IsInstanceOf<Scope>(scope);
+            Assert.IsNotNull(scopeProvider.AmbientScope);
+            Assert.AreSame(scope, scopeProvider.AmbientScope);
+
+            // scope has its own isolated cache
+            var scopedCache = scope.IsolatedCaches.GetOrCreate(typeof(ILanguage));
+            Assert.AreNotSame(globalCache, scopedCache);
+
+            // Use IsMandatory of isocode to ensure publishedContent cache is not also rebuild
+            lang.IsMandatory = true;
             service.Save(lang);
 
-            // global cache has been flushed, reload
-            var globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
-            Assert.IsNull(globalFullCached);
-            ILanguage reload = service.GetLanguageById(lang.Id);
+            // scoped cache has been flushed, reload
+            var scopeFullCached = (IEnumerable<ILanguage>)scopedCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
+            Assert.IsNull(scopeFullCached);
+            reload = service.GetLanguageById(lang.Id);
 
-            // global cache contains the entity
-            globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
-            Assert.IsNotNull(globalFullCached);
-            ILanguage globalCached = globalFullCached.First(x => x.Id == lang.Id);
-            Assert.IsNotNull(globalCached);
-            Assert.AreEqual(lang.Id, globalCached.Id);
-            Assert.AreEqual("fr-FR", globalCached.IsoCode);
+            // scoped cache contains the "new" entity
+            scopeFullCached = (IEnumerable<ILanguage>)scopedCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
+            Assert.IsNotNull(scopeFullCached);
+            var scopeCached = scopeFullCached.First(x => x.Id == lang.Id);
+            Assert.IsNotNull(scopeCached);
+            Assert.AreEqual(lang.Id, scopeCached.Id);
+            Assert.AreEqual(true, scopeCached.IsMandatory);
 
-            Assert.IsNull(scopeProvider.AmbientScope);
-            using (IScope scope = scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
-            {
-                Assert.IsInstanceOf<Scope>(scope);
-                Assert.IsNotNull(scopeProvider.AmbientScope);
-                Assert.AreSame(scope, scopeProvider.AmbientScope);
-
-                // scope has its own isolated cache
-                IAppPolicyCache scopedCache = scope.IsolatedCaches.GetOrCreate(typeof(ILanguage));
-                Assert.AreNotSame(globalCache, scopedCache);
-
-                // Use IsMandatory of isocode to ensure publishedContent cache is not also rebuild
-                lang.IsMandatory = true;
-                service.Save(lang);
-
-                // scoped cache has been flushed, reload
-                var scopeFullCached = (IEnumerable<ILanguage>)scopedCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
-                Assert.IsNull(scopeFullCached);
-                reload = service.GetLanguageById(lang.Id);
-
-                // scoped cache contains the "new" entity
-                scopeFullCached = (IEnumerable<ILanguage>)scopedCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
-                Assert.IsNotNull(scopeFullCached);
-                ILanguage scopeCached = scopeFullCached.First(x => x.Id == lang.Id);
-                Assert.IsNotNull(scopeCached);
-                Assert.AreEqual(lang.Id, scopeCached.Id);
-                Assert.AreEqual(true, scopeCached.IsMandatory);
-
-                // global cache is unchanged
-                globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
-                Assert.IsNotNull(globalFullCached);
-                globalCached = globalFullCached.First(x => x.Id == lang.Id);
-                Assert.IsNotNull(globalCached);
-                Assert.AreEqual(lang.Id, globalCached.Id);
-                Assert.AreEqual(false, globalCached.IsMandatory);
-
-                if (complete)
-                {
-                    scope.Complete();
-                }
-            }
-
-            Assert.IsNull(scopeProvider.AmbientScope);
-
-            globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
-            if (complete)
-            {
-                // global cache has been cleared
-                Assert.IsNull(globalFullCached);
-            }
-            else
-            {
-                // global cache has *not* been cleared
-                Assert.IsNotNull(globalFullCached);
-            }
-
-            // get again, updated if completed
-            lang = service.GetLanguageById(lang.Id);
-            Assert.AreEqual(complete ? true : false, lang.IsMandatory);
-
-            // global cache contains the entity again
+            // global cache is unchanged
             globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
             Assert.IsNotNull(globalFullCached);
             globalCached = globalFullCached.First(x => x.Id == lang.Id);
             Assert.IsNotNull(globalCached);
             Assert.AreEqual(lang.Id, globalCached.Id);
-            Assert.AreEqual(complete ? true : false, lang.IsMandatory);
+            Assert.AreEqual(false, globalCached.IsMandatory);
+
+            if (complete)
+            {
+                scope.Complete();
+            }
         }
 
-        [TestCase(true)]
-        [TestCase(false)]
-        public void SingleItemsOnlyRepositoryCachePolicy(bool complete)
+        Assert.IsNull(scopeProvider.AmbientScope);
+
+        globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
+        if (complete)
         {
-            var scopeProvider = (ScopeProvider)ScopeProvider;
-            ILocalizationService service = LocalizationService;
-            IAppPolicyCache globalCache = AppCaches.IsolatedCaches.GetOrCreate(typeof(IDictionaryItem));
+            // global cache has been cleared
+            Assert.IsNull(globalFullCached);
+        }
+        else
+        {
+            // global cache has *not* been cleared
+            Assert.IsNotNull(globalFullCached);
+        }
 
-            var lang = new Language("fr-FR", "French (France)");
-            service.Save(lang);
+        // get again, updated if completed
+        lang = service.GetLanguageById(lang.Id);
+        Assert.AreEqual(complete, lang.IsMandatory);
 
-            var item = (IDictionaryItem)new DictionaryItem("item-key");
-            item.Translations = new IDictionaryTranslation[]
-            {
-                new DictionaryTranslation(lang.Id, "item-value"),
-            };
+        // global cache contains the entity again
+        globalFullCached = (IEnumerable<ILanguage>)globalCache.Get(GetCacheTypeKey<ILanguage>(), () => null);
+        Assert.IsNotNull(globalFullCached);
+        globalCached = globalFullCached.First(x => x.Id == lang.Id);
+        Assert.IsNotNull(globalCached);
+        Assert.AreEqual(lang.Id, globalCached.Id);
+        Assert.AreEqual(complete, lang.IsMandatory);
+    }
+
+    [TestCase(true)]
+    [TestCase(false)]
+    public void SingleItemsOnlyRepositoryCachePolicy(bool complete)
+    {
+        var scopeProvider = (ScopeProvider)ScopeProvider;
+        var service = LocalizationService;
+        var globalCache = AppCaches.IsolatedCaches.GetOrCreate(typeof(IDictionaryItem));
+
+        var lang = new Language("fr-FR", "French (France)");
+        service.Save(lang);
+
+        var item = (IDictionaryItem)new DictionaryItem("item-key");
+        item.Translations = new IDictionaryTranslation[] { new DictionaryTranslation(lang.Id, "item-value") };
+        service.Save(item);
+
+        // Refresh the cache manually because we can't unbind
+        service.GetDictionaryItemById(item.Id);
+        service.GetLanguageById(lang.Id);
+
+        // global cache contains the entity
+        var globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
+        Assert.IsNotNull(globalCached);
+        Assert.AreEqual(item.Id, globalCached.Id);
+        Assert.AreEqual("item-key", globalCached.ItemKey);
+
+        Assert.IsNull(scopeProvider.AmbientScope);
+        using (var scope = scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
+        {
+            Assert.IsInstanceOf<Scope>(scope);
+            Assert.IsNotNull(scopeProvider.AmbientScope);
+            Assert.AreSame(scope, scopeProvider.AmbientScope);
+
+            // scope has its own isolated cache
+            var scopedCache = scope.IsolatedCaches.GetOrCreate(typeof(IDictionaryItem));
+            Assert.AreNotSame(globalCache, scopedCache);
+
+            item.ItemKey = "item-changed";
             service.Save(item);
 
-            // Refresh the cache manually because we can't unbind
-            service.GetDictionaryItemById(item.Id);
-            service.GetLanguageById(lang.Id);
+            // scoped cache contains the "new" entity
+            var scopeCached = (IDictionaryItem)scopedCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
+            Assert.IsNotNull(scopeCached);
+            Assert.AreEqual(item.Id, scopeCached.Id);
+            Assert.AreEqual("item-changed", scopeCached.ItemKey);
 
-            // global cache contains the entity
-            var globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
+            // global cache is unchanged
+            globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
             Assert.IsNotNull(globalCached);
             Assert.AreEqual(item.Id, globalCached.Id);
             Assert.AreEqual("item-key", globalCached.ItemKey);
 
-            Assert.IsNull(scopeProvider.AmbientScope);
-            using (IScope scope = scopeProvider.CreateScope(repositoryCacheMode: RepositoryCacheMode.Scoped))
-            {
-                Assert.IsInstanceOf<Scope>(scope);
-                Assert.IsNotNull(scopeProvider.AmbientScope);
-                Assert.AreSame(scope, scopeProvider.AmbientScope);
-
-                // scope has its own isolated cache
-                IAppPolicyCache scopedCache = scope.IsolatedCaches.GetOrCreate(typeof(IDictionaryItem));
-                Assert.AreNotSame(globalCache, scopedCache);
-
-                item.ItemKey = "item-changed";
-                service.Save(item);
-
-                // scoped cache contains the "new" entity
-                var scopeCached = (IDictionaryItem)scopedCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
-                Assert.IsNotNull(scopeCached);
-                Assert.AreEqual(item.Id, scopeCached.Id);
-                Assert.AreEqual("item-changed", scopeCached.ItemKey);
-
-                // global cache is unchanged
-                globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
-                Assert.IsNotNull(globalCached);
-                Assert.AreEqual(item.Id, globalCached.Id);
-                Assert.AreEqual("item-key", globalCached.ItemKey);
-
-                if (complete)
-                {
-                    scope.Complete();
-                }
-            }
-
-            Assert.IsNull(scopeProvider.AmbientScope);
-
-            globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
             if (complete)
             {
-                // global cache has been cleared
-                Assert.IsNull(globalCached);
+                scope.Complete();
             }
-            else
-            {
-                // global cache has *not* been cleared
-                Assert.IsNotNull(globalCached);
-            }
-
-            // get again, updated if completed
-            item = service.GetDictionaryItemById(item.Id);
-            Assert.AreEqual(complete ? "item-changed" : "item-key", item.ItemKey);
-
-            // global cache contains the entity again
-            globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
-            Assert.IsNotNull(globalCached);
-            Assert.AreEqual(item.Id, globalCached.Id);
-            Assert.AreEqual(complete ? "item-changed" : "item-key", globalCached.ItemKey);
         }
 
-        public static string GetCacheIdKey<T>(object id) => $"{GetCacheTypeKey<T>()}{id}";
+        Assert.IsNull(scopeProvider.AmbientScope);
 
-        public static string GetCacheTypeKey<T>() => $"uRepo_{typeof(T).Name}_";
-        
-        public class LocalServerMessenger : ServerMessengerBase
+        globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
+        if (complete)
         {
-            public LocalServerMessenger()
-                : base(false)
-            { }
+            // global cache has been cleared
+            Assert.IsNull(globalCached);
+        }
+        else
+        {
+            // global cache has *not* been cleared
+            Assert.IsNotNull(globalCached);
+        }
 
-            public override void SendMessages() { }
+        // get again, updated if completed
+        item = service.GetDictionaryItemById(item.Id);
+        Assert.AreEqual(complete ? "item-changed" : "item-key", item.ItemKey);
 
-            public override void Sync() { }
+        // global cache contains the entity again
+        globalCached = (IDictionaryItem)globalCache.Get(GetCacheIdKey<IDictionaryItem>(item.Id), () => null);
+        Assert.IsNotNull(globalCached);
+        Assert.AreEqual(item.Id, globalCached.Id);
+        Assert.AreEqual(complete ? "item-changed" : "item-key", globalCached.ItemKey);
+    }
 
-            protected override void DeliverRemote(ICacheRefresher refresher, MessageType messageType, IEnumerable<object> ids = null, string json = null)
-            {
-            }
+    public static string GetCacheIdKey<T>(object id) => $"{GetCacheTypeKey<T>()}{id}";
+
+    public static string GetCacheTypeKey<T>() => $"uRepo_{typeof(T).Name}_";
+
+    public class LocalServerMessenger : ServerMessengerBase
+    {
+        public LocalServerMessenger()
+            : base(false)
+        {
+        }
+
+        public override void SendMessages() { }
+
+        public override void Sync() { }
+
+        protected override void DeliverRemote(ICacheRefresher refresher, MessageType messageType, IEnumerable<object> ids = null, string json = null)
+        {
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs
index 3bc091de70..36c599ce1d 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Scoping/SupressNotificationsTests.cs
@@ -5,116 +5,110 @@ using System;
 using NUnit.Framework;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class SuppressNotificationsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class SuppressNotificationsTests : UmbracoIntegrationTest
+    private IContentService ContentService => GetRequiredService<IContentService>();
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private IContentService ContentService => GetRequiredService<IContentService>();
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
+        base.CustomTestSetup(builder);
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+        builder.AddNotificationHandler<ContentSavingNotification, TestContentNotificationHandler>();
+        builder.AddNotificationHandler<ContentTypeSavingNotification, TestContentTypeNotificationHandler>();
+        builder.AddNotificationHandler<MediaSavedNotification, TestMediaNotificationHandler>();
+    }
+
+    [Test]
+    public void GivenScope_WhenNotificationsSuppressed_ThenNotificationsDoNotExecute()
+    {
+        using var scope = ScopeProvider.CreateScope(autoComplete: true);
+        using var _ = scope.Notifications.Suppress();
+
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(contentType);
+        var content = ContentBuilder.CreateBasicContent(contentType);
+        ContentService.Save(content);
+    }
+
+    [Test]
+    public void GivenNestedScope_WhenOuterNotificationsSuppressed_ThenNotificationsDoNotExecute()
+    {
+        using (var parentScope = ScopeProvider.CreateScope(autoComplete: true))
         {
-            base.CustomTestSetup(builder);
+            using var _ = parentScope.Notifications.Suppress();
 
-            builder.AddNotificationHandler<ContentSavingNotification, TestContentNotificationHandler>();
-            builder.AddNotificationHandler<ContentTypeSavingNotification, TestContentTypeNotificationHandler>();
-            builder.AddNotificationHandler<MediaSavedNotification, TestMediaNotificationHandler>();
-        }
-
-        [Test]
-        public void GivenScope_WhenNotificationsSuppressed_ThenNotificationsDoNotExecute()
-        {
-            using IScope scope = ScopeProvider.CreateScope(autoComplete: true);
-            using IDisposable _ = scope.Notifications.Suppress();
-
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(contentType);
-            Content content = ContentBuilder.CreateBasicContent(contentType);
-            ContentService.Save(content);
-        }
-
-        [Test]
-        public void GivenNestedScope_WhenOuterNotificationsSuppressed_ThenNotificationsDoNotExecute()
-        {
-            using (IScope parentScope = ScopeProvider.CreateScope(autoComplete: true))
+            using (var childScope = ScopeProvider.CreateScope(autoComplete: true))
             {
-                using IDisposable _ = parentScope.Notifications.Suppress();
-
-                using (IScope childScope = ScopeProvider.CreateScope(autoComplete: true))
-                {
-                    ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-                    ContentTypeService.Save(contentType);
-                    Content content = ContentBuilder.CreateBasicContent(contentType);
-                    ContentService.Save(content);
-                }
+                var contentType = ContentTypeBuilder.CreateBasicContentType();
+                ContentTypeService.Save(contentType);
+                var content = ContentBuilder.CreateBasicContent(contentType);
+                ContentService.Save(content);
             }
         }
-
-        [Test]
-        public void GivenSuppressedNotifications_WhenDisposed_ThenNotificationsExecute()
-        {
-            int asserted = 0;
-            using (IScope scope = ScopeProvider.CreateScope(autoComplete: true))
-            {
-                using IDisposable suppressed = scope.Notifications.Suppress();
-
-                MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("test");
-                MediaTypeService.Save(mediaType);
-
-                suppressed.Dispose();
-
-                asserted = TestContext.CurrentContext.AssertCount;
-                Media media = MediaBuilder.CreateMediaImage(mediaType, -1);
-                MediaService.Save(media);
-            }   
-
-            Assert.AreEqual(asserted + 1, TestContext.CurrentContext.AssertCount);
-        }
-
-        [Test]
-        public void GivenSuppressedNotificationsOnParent_WhenChildSuppresses_ThenExceptionIsThrown()
-        {
-            using (IScope parentScope = ScopeProvider.CreateScope(autoComplete: true))
-            using (IDisposable parentSuppressed = parentScope.Notifications.Suppress())
-            {
-                using (IScope childScope = ScopeProvider.CreateScope(autoComplete: true))                
-                {
-                    Assert.Throws<InvalidOperationException>(() => childScope.Notifications.Suppress());
-                }
-            }
-        }
-
-        private class TestContentNotificationHandler : INotificationHandler<ContentSavingNotification>
-        {
-            public void Handle(ContentSavingNotification notification)
-                => Assert.Fail("Notification was sent");
-        }
-
-        private class TestMediaNotificationHandler : INotificationHandler<MediaSavedNotification>
-        {
-            public void Handle(MediaSavedNotification notification)
-                => Assert.IsNotNull(notification);
-        }
-
-        private class TestContentTypeNotificationHandler : INotificationHandler<ContentTypeSavingNotification>
-        {
-            public void Handle(ContentTypeSavingNotification notification)
-                => Assert.Fail("Notification was sent");
-        }
+    }
+
+    [Test]
+    public void GivenSuppressedNotifications_WhenDisposed_ThenNotificationsExecute()
+    {
+        var asserted = 0;
+        using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+        {
+            using var suppressed = scope.Notifications.Suppress();
+
+            var mediaType = MediaTypeBuilder.CreateImageMediaType("test");
+            MediaTypeService.Save(mediaType);
+
+            suppressed.Dispose();
+
+            asserted = TestContext.CurrentContext.AssertCount;
+            var media = MediaBuilder.CreateMediaImage(mediaType, -1);
+            MediaService.Save(media);
+        }
+
+        Assert.AreEqual(asserted + 1, TestContext.CurrentContext.AssertCount);
+    }
+
+    [Test]
+    public void GivenSuppressedNotificationsOnParent_WhenChildSuppresses_ThenExceptionIsThrown()
+    {
+        using (var parentScope = ScopeProvider.CreateScope(autoComplete: true))
+        using (var parentSuppressed = parentScope.Notifications.Suppress())
+        {
+            using (var childScope = ScopeProvider.CreateScope(autoComplete: true))
+            {
+                Assert.Throws<InvalidOperationException>(() => childScope.Notifications.Suppress());
+            }
+        }
+    }
+
+    private class TestContentNotificationHandler : INotificationHandler<ContentSavingNotification>
+    {
+        public void Handle(ContentSavingNotification notification)
+            => Assert.Fail("Notification was sent");
+    }
+
+    private class TestMediaNotificationHandler : INotificationHandler<MediaSavedNotification>
+    {
+        public void Handle(MediaSavedNotification notification)
+            => Assert.IsNotNull(notification);
+    }
+
+    private class TestContentTypeNotificationHandler : INotificationHandler<ContentTypeSavingNotification>
+    {
+        public void Handle(ContentTypeSavingNotification notification)
+            => Assert.Fail("Notification was sent");
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs
index fa52cde849..dca11b6f6f 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Security/BackOfficeUserStoreTests.cs
@@ -1,70 +1,63 @@
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models.Membership;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Security
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Security;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class BackOfficeUserStoreTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class BackOfficeUserStoreTests : UmbracoIntegrationTest
+    private IUserService UserService => GetRequiredService<IUserService>();
+    private IEntityService EntityService => GetRequiredService<IEntityService>();
+    private IExternalLoginWithKeyService ExternalLoginService => GetRequiredService<IExternalLoginWithKeyService>();
+    private IUmbracoMapper UmbracoMapper => GetRequiredService<IUmbracoMapper>();
+    private ILocalizedTextService TextService => GetRequiredService<ILocalizedTextService>();
+    private ITwoFactorLoginService TwoFactorLoginService => GetRequiredService<ITwoFactorLoginService>();
+
+    private BackOfficeUserStore GetUserStore()
+        => new(
+            ScopeProvider,
+            UserService,
+            EntityService,
+            ExternalLoginService,
+            new TestOptionsSnapshot<GlobalSettings>(GlobalSettings),
+            UmbracoMapper,
+            new BackOfficeErrorDescriber(TextService),
+            AppCaches,
+            TwoFactorLoginService
+        );
+
+    [Test]
+    public async Task Can_Persist_Is_Approved()
     {
-        private IUserService UserService => GetRequiredService<IUserService>();
-        private IEntityService EntityService => GetRequiredService<IEntityService>();
-        private IExternalLoginWithKeyService ExternalLoginService => GetRequiredService<IExternalLoginWithKeyService>();
-        private IUmbracoMapper UmbracoMapper => GetRequiredService<IUmbracoMapper>();
-        private ILocalizedTextService TextService => GetRequiredService<ILocalizedTextService>();
-        private ITwoFactorLoginService TwoFactorLoginService => GetRequiredService<ITwoFactorLoginService>();
-
-        private BackOfficeUserStore GetUserStore()
-            => new BackOfficeUserStore(
-                    ScopeProvider,
-                    UserService,
-                    EntityService,
-                    ExternalLoginService,
-                    new TestOptionsSnapshot<GlobalSettings>(GlobalSettings),
-                    UmbracoMapper,
-                    new BackOfficeErrorDescriber(TextService),
-                    AppCaches,
-                    TwoFactorLoginService
-                    );
-
-        [Test]
-        public async Task Can_Persist_Is_Approved()
+        var userStore = GetUserStore();
+        var user = new BackOfficeIdentityUser(GlobalSettings, 1, new List<IReadOnlyUserGroup>())
         {
-            var userStore = GetUserStore();
-            var user = new BackOfficeIdentityUser(GlobalSettings, 1, new List<IReadOnlyUserGroup>())
-            {
-                Name = "Test",
-                Email = "test@test.com",
-                UserName = "test@test.com"
-            };
-            IdentityResult createResult = await userStore.CreateAsync(user);
-            Assert.IsTrue(createResult.Succeeded);
-            Assert.IsFalse(user.IsApproved);
+            Name = "Test",
+            Email = "test@test.com",
+            UserName = "test@test.com"
+        };
+        var createResult = await userStore.CreateAsync(user);
+        Assert.IsTrue(createResult.Succeeded);
+        Assert.IsFalse(user.IsApproved);
 
-            // update
-            user.IsApproved = true;
-            var saveResult = await userStore.UpdateAsync(user);
-            Assert.IsTrue(saveResult.Succeeded);
-            Assert.IsTrue(user.IsApproved);
+        // update
+        user.IsApproved = true;
+        var saveResult = await userStore.UpdateAsync(user);
+        Assert.IsTrue(saveResult.Succeeded);
+        Assert.IsTrue(user.IsApproved);
 
-            // get get
-            user = await userStore.FindByIdAsync(user.Id);
-            Assert.IsTrue(user.IsApproved);
-        }
+        // get get
+        user = await userStore.FindByIdAsync(user.Id);
+        Assert.IsTrue(user.IsApproved);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs
index 6c338dd9cd..e19c8414c9 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/AuditServiceTests.cs
@@ -12,99 +12,98 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class AuditServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class AuditServiceTests : UmbracoIntegrationTest
+    [Test]
+    public void GetPage()
     {
-        [Test]
-        public void GetPage()
+        var sut = (AuditService)GetRequiredService<IAuditService>();
+        var expected = new AuditEntryBuilder().Build();
+
+        for (var i = 0; i < 10; i++)
         {
-            var sut = (AuditService)GetRequiredService<IAuditService>();
-            IAuditEntry expected = new AuditEntryBuilder().Build();
-
-            for (int i = 0; i < 10; i++)
-            {
-                sut.Write(
-                    expected.PerformingUserId + i,
-                    expected.PerformingDetails,
-                    expected.PerformingIp,
-                    expected.EventDateUtc.AddMinutes(i),
-                    expected.AffectedUserId + i,
-                    expected.AffectedDetails,
-                    expected.EventType,
-                    expected.EventDetails);
-            }
-
-            IAuditEntry[] entries = sut.GetPage(2, 2, out long count).ToArray();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(2, entries.Length);
-                Assert.AreEqual(expected.PerformingUserId + 5, entries[0].PerformingUserId);
-                Assert.AreEqual(expected.PerformingUserId + 4, entries[1].PerformingUserId);
-            });
-        }
-
-        [Test]
-        public void GetUserLogs()
-        {
-            var sut = (AuditService)Services.GetRequiredService<IAuditService>();
-
-            DateTime eventDateUtc = DateTime.UtcNow.AddDays(-1);
-
-            int numberOfEntries = 10;
-            for (int i = 0; i < numberOfEntries; i++)
-            {
-                eventDateUtc = eventDateUtc.AddMinutes(1);
-                sut.Add(AuditType.Unpublish, -1, 33, string.Empty, "blah");
-            }
-
-            sut.Add(AuditType.Publish, -1, 33, string.Empty, "blah");
-
-            IAuditItem[] logs = sut.GetUserLogs(-1, AuditType.Unpublish).ToArray();
-
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(logs);
-                CollectionAssert.AllItemsAreNotNull(logs);
-                Assert.AreEqual(numberOfEntries, logs.Length);
-                Assert.AreEqual(numberOfEntries, logs.Count(x => x.AuditType == AuditType.Unpublish));
-            });
-        }
-
-        [Test]
-        public void Write_and_GetAll()
-        {
-            var sut = (AuditService)Services.GetRequiredService<IAuditService>();
-            IAuditEntry expected = new AuditEntryBuilder().Build();
-
-            IAuditEntry actual = sut.Write(
-                expected.PerformingUserId,
+            sut.Write(
+                expected.PerformingUserId + i,
                 expected.PerformingDetails,
                 expected.PerformingIp,
-                expected.EventDateUtc,
-                expected.AffectedUserId,
+                expected.EventDateUtc.AddMinutes(i),
+                expected.AffectedUserId + i,
                 expected.AffectedDetails,
                 expected.EventType,
                 expected.EventDetails);
-
-            IAuditEntry[] entries = sut.GetAll().ToArray();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(expected.PerformingUserId, actual.PerformingUserId);
-                Assert.AreEqual(expected.PerformingDetails, actual.PerformingDetails);
-                Assert.AreEqual(expected.EventDateUtc, actual.EventDateUtc);
-                Assert.AreEqual(expected.AffectedUserId, actual.AffectedUserId);
-                Assert.AreEqual(expected.AffectedDetails, actual.AffectedDetails);
-                Assert.AreEqual(expected.EventType, actual.EventType);
-                Assert.AreEqual(expected.EventDetails, actual.EventDetails);
-                Assert.IsNotNull(entries);
-                Assert.AreEqual(1, entries.Length);
-                Assert.AreEqual(expected.PerformingUserId, entries[0].PerformingUserId);
-            });
         }
+
+        var entries = sut.GetPage(2, 2, out var count).ToArray();
+
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual(2, entries.Length);
+            Assert.AreEqual(expected.PerformingUserId + 5, entries[0].PerformingUserId);
+            Assert.AreEqual(expected.PerformingUserId + 4, entries[1].PerformingUserId);
+        });
+    }
+
+    [Test]
+    public void GetUserLogs()
+    {
+        var sut = (AuditService)Services.GetRequiredService<IAuditService>();
+
+        var eventDateUtc = DateTime.UtcNow.AddDays(-1);
+
+        var numberOfEntries = 10;
+        for (var i = 0; i < numberOfEntries; i++)
+        {
+            eventDateUtc = eventDateUtc.AddMinutes(1);
+            sut.Add(AuditType.Unpublish, -1, 33, string.Empty, "blah");
+        }
+
+        sut.Add(AuditType.Publish, -1, 33, string.Empty, "blah");
+
+        var logs = sut.GetUserLogs(-1, AuditType.Unpublish).ToArray();
+
+        Assert.Multiple(() =>
+        {
+            Assert.IsNotNull(logs);
+            CollectionAssert.AllItemsAreNotNull(logs);
+            Assert.AreEqual(numberOfEntries, logs.Length);
+            Assert.AreEqual(numberOfEntries, logs.Count(x => x.AuditType == AuditType.Unpublish));
+        });
+    }
+
+    [Test]
+    public void Write_and_GetAll()
+    {
+        var sut = (AuditService)Services.GetRequiredService<IAuditService>();
+        var expected = new AuditEntryBuilder().Build();
+
+        var actual = sut.Write(
+            expected.PerformingUserId,
+            expected.PerformingDetails,
+            expected.PerformingIp,
+            expected.EventDateUtc,
+            expected.AffectedUserId,
+            expected.AffectedDetails,
+            expected.EventType,
+            expected.EventDetails);
+
+        var entries = sut.GetAll().ToArray();
+
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual(expected.PerformingUserId, actual.PerformingUserId);
+            Assert.AreEqual(expected.PerformingDetails, actual.PerformingDetails);
+            Assert.AreEqual(expected.EventDateUtc, actual.EventDateUtc);
+            Assert.AreEqual(expected.AffectedUserId, actual.AffectedUserId);
+            Assert.AreEqual(expected.AffectedDetails, actual.AffectedDetails);
+            Assert.AreEqual(expected.EventType, actual.EventType);
+            Assert.AreEqual(expected.EventDetails, actual.EventDetails);
+            Assert.IsNotNull(entries);
+            Assert.AreEqual(1, entries.Length);
+            Assert.AreEqual(expected.PerformingUserId, entries[0].PerformingUserId);
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs
index 4024bdcf3c..ef7978f585 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CacheInstructionServiceTests.cs
@@ -5,11 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Core.Sync;
@@ -19,297 +17,306 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class CacheInstructionServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class CacheInstructionServiceTests : UmbracoIntegrationTest
+    private const string LocalIdentity = "localIdentity";
+    private const string AlternateIdentity = "alternateIdentity";
+
+    private CancellationToken CancellationToken => new();
+    private CacheRefresherCollection CacheRefreshers => GetRequiredService<CacheRefresherCollection>();
+    private IServerRoleAccessor ServerRoleAccessor => GetRequiredService<IServerRoleAccessor>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private const string LocalIdentity = "localIdentity";
-        private const string AlternateIdentity = "alternateIdentity";
+        base.CustomTestSetup(builder);
+        builder.AddNuCache();
+    }
 
-        private CancellationToken CancellationToken => new CancellationToken();
-        private CacheRefresherCollection CacheRefreshers => GetRequiredService<CacheRefresherCollection>();
-        private IServerRoleAccessor ServerRoleAccessor => GetRequiredService<IServerRoleAccessor>();
+    [Test]
+    public void Confirms_Cold_Boot_Required_When_Instructions_Exist_And_None_Have_Been_Synced()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+        var instructions = CreateInstructions();
+        sut.DeliverInstructions(instructions, LocalIdentity);
+
+        var result = sut.IsColdBootRequired(0);
+
+        Assert.IsTrue(result);
+    }
+
+    [Test]
+    public void Confirms_Cold_Boot_Required_When_Last_Synced_Instruction_Not_Found()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+
+        var instructions = CreateInstructions();
+        sut.DeliverInstructions(instructions, LocalIdentity); // will create with Id = 1
+
+        var result = sut.IsColdBootRequired(2);
+
+        Assert.IsTrue(result);
+    }
+
+    [Test]
+    public void Confirms_Cold_Boot_Not_Required_When_Last_Synced_Instruction_Found()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+
+        var instructions = CreateInstructions();
+        sut.DeliverInstructions(instructions, LocalIdentity); // will create with Id = 1
+
+        var result = sut.IsColdBootRequired(1);
+
+        Assert.IsFalse(result);
+    }
+
+    [TestCase(1, 10, false, 4)]
+    [TestCase(1, 3, true, 4)]
+    public void Confirms_Instruction_Count_Over_Limit(int lastId, int limit, bool expectedResult, int expectedCount)
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+
+        CreateAndDeliveryMultipleInstructions(sut); // 3 records, each with 2 instructions = 6.
+
+        var result = sut.IsInstructionCountOverLimit(lastId, limit, out var count);
+
+        Assert.AreEqual(expectedResult, result);
+        Assert.AreEqual(expectedCount, count);
+    }
+
+    [Test]
+    public void Can_Get_Max_Instruction_Id()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+
+        CreateAndDeliveryMultipleInstructions(sut);
+
+        var result = sut.GetMaxInstructionId();
+
+        Assert.AreEqual(3, result);
+    }
+
+    [Test]
+    public void Can_Deliver_Instructions()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+
+        var instructions = CreateInstructions();
+
+        sut.DeliverInstructions(instructions, LocalIdentity);
+
+        AssertDeliveredInstructions();
+    }
+
+    [Test]
+    public void Can_Deliver_Instructions_In_Batches()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+
+        var instructions = CreateInstructions();
+
+        sut.DeliverInstructionsInBatches(instructions, LocalIdentity);
+
+        AssertDeliveredInstructions();
+    }
+
+    private List<RefreshInstruction> CreateInstructions() => new()
+    {
+        new(UserCacheRefresher.UniqueId, RefreshMethodType.RefreshByIds, Guid.Empty, 0, "[-1]", null),
+        new(UserCacheRefresher.UniqueId, RefreshMethodType.RefreshByIds, Guid.Empty, 0, "[-1]", null)
+    };
+
+    private void AssertDeliveredInstructions()
+    {
+        List<CacheInstructionDto> cacheInstructions;
+        var sqlContext = GetRequiredService<ISqlContext>();
+        var sql = sqlContext.Sql()
+            .Select<CacheInstructionDto>()
+            .From<CacheInstructionDto>();
+        using (var scope = ScopeProvider.CreateScope())
         {
-            base.CustomTestSetup(builder);
-            builder.AddNuCache();
+            cacheInstructions = ScopeAccessor.AmbientScope.Database.Fetch<CacheInstructionDto>(sql);
+            scope.Complete();
         }
 
-        [Test]
-        public void Confirms_Cold_Boot_Required_When_Instructions_Exist_And_None_Have_Been_Synced()
+        Assert.Multiple(() =>
         {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+            Assert.AreEqual(1, cacheInstructions.Count);
 
-            List<RefreshInstruction> instructions = CreateInstructions();
-            sut.DeliverInstructions(instructions, LocalIdentity);
+            var firstInstruction = cacheInstructions.First();
+            Assert.AreEqual(2, firstInstruction.InstructionCount);
+            Assert.AreEqual(LocalIdentity, firstInstruction.OriginIdentity);
+        });
+    }
 
-            var result = sut.IsColdBootRequired(0);
+    [Test]
+    public void Can_Process_Instructions()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
 
-            Assert.IsTrue(result);
-        }
+        // Create three instruction records, each with two instructions.  First two records are for a different identity.
+        CreateAndDeliveryMultipleInstructions(sut);
 
-        [Test]
-        public void Confirms_Cold_Boot_Required_When_Last_Synced_Instruction_Not_Found()
+        var result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken,
+            LocalIdentity, DateTime.UtcNow.AddSeconds(-1), -1);
+
+        Assert.Multiple(() =>
         {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+            Assert.AreEqual(3, result.LastId); // 3 records found.
+            Assert.AreEqual(2,
+                result.NumberOfInstructionsProcessed); // 2 records processed (as one is for the same identity).
+            Assert.IsFalse(result.InstructionsWerePruned);
+        });
+    }
 
-            List<RefreshInstruction> instructions = CreateInstructions();
-            sut.DeliverInstructions(instructions, LocalIdentity); // will create with Id = 1
+    [Test]
+    public void Can_Process_And_Purge_Instructions()
+    {
+        // Purging of instructions only occurs on single or master servers, so we need to ensure this is set before running the test.
+        EnsureServerRegistered();
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
 
-            var result = sut.IsColdBootRequired(2);
+        CreateAndDeliveryMultipleInstructions(sut);
 
-            Assert.IsTrue(result);
-        }
+        var result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken,
+            LocalIdentity, DateTime.UtcNow.AddHours(-1), -1);
 
-        [Test]
-        public void Confirms_Cold_Boot_Not_Required_When_Last_Synced_Instruction_Found()
+        Assert.IsTrue(result.InstructionsWerePruned);
+    }
+
+    [Test]
+    public void Processes_No_Instructions_When_CancellationToken_is_Cancelled()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+
+        CreateAndDeliveryMultipleInstructions(sut);
+
+        var cancellationTokenSource = new CancellationTokenSource();
+        cancellationTokenSource.Cancel();
+
+        var result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole,
+            cancellationTokenSource.Token, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), -1);
+
+        Assert.Multiple(() =>
         {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+            Assert.AreEqual(0, result.LastId);
+            Assert.AreEqual(0, result.NumberOfInstructionsProcessed);
+            Assert.IsFalse(result.InstructionsWerePruned);
+        });
+    }
 
-            List<RefreshInstruction> instructions = CreateInstructions();
-            sut.DeliverInstructions(instructions, LocalIdentity); // will create with Id = 1
+    [Test]
+    public void Processes_Instructions_Only_Once()
+    {
+        // This test shows what's happening in issue #10112
+        // The DatabaseServerMessenger will run its sync operation every five seconds which calls CacheInstructionService.ProcessInstructions,
+        // which is why the CacheRefresherNotification keeps dispatching, because the cache instructions gets constantly processed.
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+        CreateAndDeliveryMultipleInstructions(sut);
 
-            var result = sut.IsColdBootRequired(1);
+        var lastId = -1;
+        // Run once
+        var result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken,
+            LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
 
-            Assert.IsFalse(result);
-        }
-
-        [TestCase(1, 10, false, 4)]
-        [TestCase(1, 3, true, 4)]
-        public void Confirms_Instruction_Count_Over_Limit(int lastId, int limit, bool expectedResult, int expectedCount)
+        Assert.Multiple(() =>
         {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+            Assert.AreEqual(3, result.LastId); // 3 records found.
+            Assert.AreEqual(2,
+                result.NumberOfInstructionsProcessed); // 2 records processed (as one is for the same identity).
+            Assert.IsFalse(result.InstructionsWerePruned);
+        });
 
-            CreateAndDeliveryMultipleInstructions(sut); // 3 records, each with 2 instructions = 6.
+        // DatabaseServerMessenger stores the LastID after ProcessInstructions has been run.
+        lastId = result.LastId;
 
-            var result = sut.IsInstructionCountOverLimit(lastId, limit, out int count);
-
-            Assert.AreEqual(expectedResult, result);
-            Assert.AreEqual(expectedCount, count);
-        }
-
-        [Test]
-        public void Can_Get_Max_Instruction_Id()
+        // The instructions has now been processed and shouldn't be processed on the next call...
+        // Run again.
+        var secondResult = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole,
+            CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
+        Assert.Multiple(() =>
         {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+            Assert.AreEqual(0,
+                secondResult
+                    .LastId); // No instructions was processed so LastId is 0, this is consistent with behavior from V8
+            Assert.AreEqual(0, secondResult.NumberOfInstructionsProcessed); // Nothing was processed.
+            Assert.IsFalse(secondResult.InstructionsWerePruned);
+        });
+    }
 
-            CreateAndDeliveryMultipleInstructions(sut);
+    [Test]
+    public void Processes_New_Instructions()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+        CreateAndDeliveryMultipleInstructions(sut);
 
-            var result = sut.GetMaxInstructionId();
+        var lastId = -1;
+        var result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken,
+            LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
 
-            Assert.AreEqual(3, result);
-        }
+        Assert.AreEqual(3, result.LastId); // Make sure LastId is 3, the rest is tested in other test.
+        lastId = result.LastId;
 
-        [Test]
-        public void Can_Deliver_Instructions()
+        // Add new instruction
+        var instructions = CreateInstructions();
+        sut.DeliverInstructions(instructions, AlternateIdentity);
+
+        var secondResult = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole,
+            CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
+
+        Assert.Multiple(() =>
         {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+            Assert.AreEqual(4, secondResult.LastId);
+            Assert.AreEqual(1, secondResult.NumberOfInstructionsProcessed);
+            Assert.IsFalse(secondResult.InstructionsWerePruned);
+        });
+    }
 
-            List<RefreshInstruction> instructions = CreateInstructions();
+    [Test]
+    public void Correct_ID_For_Instruction_With_Same_Identity()
+    {
+        var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+        CreateAndDeliveryMultipleInstructions(sut);
 
-            sut.DeliverInstructions(instructions, LocalIdentity);
+        var lastId = -1;
+        var result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken,
+            LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
 
-            AssertDeliveredInstructions();
-        }
+        Assert.AreEqual(3, result.LastId); // Make sure LastId is 3, the rest is tested in other test.
+        lastId = result.LastId;
 
-        [Test]
-        public void Can_Deliver_Instructions_In_Batches()
+        // Add new instruction
+        var instructions = CreateInstructions();
+        sut.DeliverInstructions(instructions, LocalIdentity);
+
+        var secondResult = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole,
+            CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
+
+        Assert.Multiple(() =>
         {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
+            Assert.AreEqual(4, secondResult.LastId);
+            Assert.AreEqual(0, secondResult.NumberOfInstructionsProcessed);
+            Assert.IsFalse(secondResult.InstructionsWerePruned);
+        });
+    }
 
-            List<RefreshInstruction> instructions = CreateInstructions();
-
-            sut.DeliverInstructionsInBatches(instructions, LocalIdentity);
-
-            AssertDeliveredInstructions();
-        }
-
-        private List<RefreshInstruction> CreateInstructions() => new List<RefreshInstruction>
-            {
-                new RefreshInstruction(UserCacheRefresher.UniqueId, RefreshMethodType.RefreshByIds, Guid.Empty, 0, "[-1]", null),
-                new RefreshInstruction(UserCacheRefresher.UniqueId, RefreshMethodType.RefreshByIds, Guid.Empty, 0, "[-1]", null),
-            };
-
-        private void AssertDeliveredInstructions()
+    private void CreateAndDeliveryMultipleInstructions(CacheInstructionService sut)
+    {
+        for (var i = 0; i < 3; i++)
         {
-            List<CacheInstructionDto> cacheInstructions;
-            ISqlContext sqlContext = GetRequiredService<ISqlContext>();
-            Sql<ISqlContext> sql = sqlContext.Sql()
-                .Select<CacheInstructionDto>()
-                .From<CacheInstructionDto>();
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                cacheInstructions = ScopeAccessor.AmbientScope.Database.Fetch<CacheInstructionDto>(sql);
-                scope.Complete();
-            }
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(1, cacheInstructions.Count);
-
-                CacheInstructionDto firstInstruction = cacheInstructions.First();
-                Assert.AreEqual(2, firstInstruction.InstructionCount);
-                Assert.AreEqual(LocalIdentity, firstInstruction.OriginIdentity);
-            });
-        }
-
-        [Test]
-        public void Can_Process_Instructions()
-        {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
-
-            // Create three instruction records, each with two instructions.  First two records are for a different identity.
-            CreateAndDeliveryMultipleInstructions(sut);
-
-            ProcessInstructionsResult result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), -1);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(3, result.LastId);                          // 3 records found.
-                Assert.AreEqual(2, result.NumberOfInstructionsProcessed);   // 2 records processed (as one is for the same identity).
-                Assert.IsFalse(result.InstructionsWerePruned);
-            });
-        }
-
-        [Test]
-        public void Can_Process_And_Purge_Instructions()
-        {
-            // Purging of instructions only occurs on single or master servers, so we need to ensure this is set before running the test.
-            EnsureServerRegistered();
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
-
-            CreateAndDeliveryMultipleInstructions(sut);
-
-            ProcessInstructionsResult result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddHours(-1), -1);
-
-            Assert.IsTrue(result.InstructionsWerePruned);
-        }
-
-        [Test]
-        public void Processes_No_Instructions_When_CancellationToken_is_Cancelled()
-        {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
-
-            CreateAndDeliveryMultipleInstructions(sut);
-
-            var cancellationTokenSource = new CancellationTokenSource();
-            cancellationTokenSource.Cancel();
-
-            ProcessInstructionsResult result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, cancellationTokenSource.Token, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), -1);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(0, result.LastId);
-                Assert.AreEqual(0, result.NumberOfInstructionsProcessed);
-                Assert.IsFalse(result.InstructionsWerePruned);
-            });
-        }
-
-        [Test]
-        public void Processes_Instructions_Only_Once()
-        {
-            // This test shows what's happening in issue #10112
-            // The DatabaseServerMessenger will run its sync operation every five seconds which calls CacheInstructionService.ProcessInstructions,
-            // which is why the CacheRefresherNotification keeps dispatching, because the cache instructions gets constantly processed.
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
-            CreateAndDeliveryMultipleInstructions(sut);
-
-            var lastId = -1;
-            // Run once
-            ProcessInstructionsResult result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(3, result.LastId);                          // 3 records found.
-                Assert.AreEqual(2, result.NumberOfInstructionsProcessed);   // 2 records processed (as one is for the same identity).
-                Assert.IsFalse(result.InstructionsWerePruned);
-            });
-
-            // DatabaseServerMessenger stores the LastID after ProcessInstructions has been run.
-            lastId = result.LastId;
-
-            // The instructions has now been processed and shouldn't be processed on the next call...
-            // Run again.
-            ProcessInstructionsResult secondResult = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(0, secondResult.LastId);                          // No instructions was processed so LastId is 0, this is consistent with behavior from V8
-                Assert.AreEqual(0, secondResult.NumberOfInstructionsProcessed);   // Nothing was processed.
-                Assert.IsFalse(secondResult.InstructionsWerePruned);
-            });
-        }
-
-        [Test]
-        public void Processes_New_Instructions()
-        {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
-            CreateAndDeliveryMultipleInstructions(sut);
-
-            var lastId = -1;
-            ProcessInstructionsResult result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
-
-            Assert.AreEqual(3, result.LastId); // Make sure LastId is 3, the rest is tested in other test.
-            lastId = result.LastId;
-
-            // Add new instruction
-            List<RefreshInstruction> instructions = CreateInstructions();
-            sut.DeliverInstructions(instructions, AlternateIdentity);
-
-            ProcessInstructionsResult secondResult = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(4, secondResult.LastId);
-                Assert.AreEqual(1, secondResult.NumberOfInstructionsProcessed);
-                Assert.IsFalse(secondResult.InstructionsWerePruned);
-            });
-        }
-
-        [Test]
-        public void Correct_ID_For_Instruction_With_Same_Identity()
-        {
-            var sut = (CacheInstructionService)GetRequiredService<ICacheInstructionService>();
-            CreateAndDeliveryMultipleInstructions(sut);
-
-            var lastId = -1;
-            ProcessInstructionsResult result = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
-
-            Assert.AreEqual(3, result.LastId); // Make sure LastId is 3, the rest is tested in other test.
-            lastId = result.LastId;
-
-            // Add new instruction
-            List<RefreshInstruction> instructions = CreateInstructions();
-            sut.DeliverInstructions(instructions, LocalIdentity);
-
-            ProcessInstructionsResult secondResult = sut.ProcessInstructions(CacheRefreshers, ServerRoleAccessor.CurrentServerRole, CancellationToken, LocalIdentity, DateTime.UtcNow.AddSeconds(-1), lastId);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(4, secondResult.LastId);
-                Assert.AreEqual(0, secondResult.NumberOfInstructionsProcessed);
-                Assert.IsFalse(secondResult.InstructionsWerePruned);
-            });
-        }
-
-        private void CreateAndDeliveryMultipleInstructions(CacheInstructionService sut)
-        {
-            for (int i = 0; i < 3; i++)
-            {
-                List<RefreshInstruction> instructions = CreateInstructions();
-                sut.DeliverInstructions(instructions, i == 2 ? LocalIdentity : AlternateIdentity);
-            }
-        }
-
-        private void EnsureServerRegistered()
-        {
-            IServerRegistrationService serverRegistrationService = GetRequiredService<IServerRegistrationService>();
-            serverRegistrationService.TouchServer("http://localhost", TimeSpan.FromMinutes(10));
+            var instructions = CreateInstructions();
+            sut.DeliverInstructions(instructions, i == 2 ? LocalIdentity : AlternateIdentity);
         }
     }
+
+    private void EnsureServerRegistered()
+    {
+        var serverRegistrationService = GetRequiredService<IServerRegistrationService>();
+        serverRegistrationService.TouchServer("http://localhost", TimeSpan.FromMinutes(10));
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs
index ae9e68ab17..e04d68cb58 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/CachedDataTypeServiceTests.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -11,36 +9,43 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+/// <summary>
+///     Tests covering the DataTypeService with cache enabled
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class CachedDataTypeServiceTests : UmbracoIntegrationTest
 {
+    private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer =>
+        GetRequiredService<IConfigurationEditorJsonSerializer>();
+
     /// <summary>
-    /// Tests covering the DataTypeService with cache enabled
+    ///     This tests validates that with the new scope changes that the underlying cache policies work - in this case it
+    ///     tests that the cache policy
+    ///     with Count verification works.
     /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class CachedDataTypeServiceTests : UmbracoIntegrationTest
+    [Test]
+    public void DataTypeService_Can_Get_All()
     {
-        private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
-        private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer => GetRequiredService<IConfigurationEditorJsonSerializer>();
+        IDataType dataType =
+            new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer)
+            {
+                Name = "Testing Textfield",
+                DatabaseType = ValueStorageType.Ntext
+            };
+        DataTypeService.Save(dataType);
 
-        /// <summary>
-        /// This tests validates that with the new scope changes that the underlying cache policies work - in this case it tests that the cache policy
-        /// with Count verification works.
-        /// </summary>
-        [Test]
-        public void DataTypeService_Can_Get_All()
-        {
-            IDataType dataType = new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer) { Name = "Testing Textfield", DatabaseType = ValueStorageType.Ntext };
-            DataTypeService.Save(dataType);
+        // Get all the first time (no cache)
+        var all = DataTypeService.GetAll();
 
-            // Get all the first time (no cache)
-            IEnumerable<IDataType> all = DataTypeService.GetAll();
+        // Get all a second time (with cache)
+        all = DataTypeService.GetAll();
 
-            // Get all a second time (with cache)
-            all = DataTypeService.GetAll();
-
-            Assert.Pass();
-        }
+        Assert.Pass();
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs
index 54dcd96fed..2b5508cc6b 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ConsentServiceTests.cs
@@ -10,109 +10,111 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
+public class ConsentServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
-    public class ConsentServiceTests : UmbracoIntegrationTest
+    private IConsentService ConsentService => GetRequiredService<IConsentService>();
+
+    [Test]
+    public void CanCrudConsent()
     {
-        private IConsentService ConsentService => GetRequiredService<IConsentService>();
+        // can register
+        var consent =
+            ConsentService.RegisterConsent("user/1234", "app1", "do-something", ConsentState.Granted, "no comment");
+        Assert.AreNotEqual(0, consent.Id);
 
-        [Test]
-        public void CanCrudConsent()
-        {
-            // can register
-            IConsent consent = ConsentService.RegisterConsent("user/1234", "app1", "do-something", ConsentState.Granted, "no comment");
-            Assert.AreNotEqual(0, consent.Id);
+        Assert.IsTrue(consent.Current);
+        Assert.AreEqual("user/1234", consent.Source);
+        Assert.AreEqual("app1", consent.Context);
+        Assert.AreEqual("do-something", consent.Action);
+        Assert.AreEqual(ConsentState.Granted, consent.State);
+        Assert.AreEqual("no comment", consent.Comment);
 
-            Assert.IsTrue(consent.Current);
-            Assert.AreEqual("user/1234", consent.Source);
-            Assert.AreEqual("app1", consent.Context);
-            Assert.AreEqual("do-something", consent.Action);
-            Assert.AreEqual(ConsentState.Granted, consent.State);
-            Assert.AreEqual("no comment", consent.Comment);
+        Assert.IsTrue(consent.IsGranted());
 
-            Assert.IsTrue(consent.IsGranted());
+        // can register more
+        ConsentService.RegisterConsent("user/1234", "app1", "do-something-else", ConsentState.Granted, "no comment");
+        ConsentService.RegisterConsent("user/1236", "app1", "do-something", ConsentState.Granted, "no comment");
+        ConsentService.RegisterConsent("user/1237", "app2", "do-something", ConsentState.Granted, "no comment");
 
-            // can register more
-            ConsentService.RegisterConsent("user/1234", "app1", "do-something-else", ConsentState.Granted, "no comment");
-            ConsentService.RegisterConsent("user/1236", "app1", "do-something", ConsentState.Granted, "no comment");
-            ConsentService.RegisterConsent("user/1237", "app2", "do-something", ConsentState.Granted, "no comment");
+        // can get by source
+        var consents = ConsentService.LookupConsent("user/1235").ToArray();
+        Assert.IsEmpty(consents);
 
-            // can get by source
-            IConsent[] consents = ConsentService.LookupConsent(source: "user/1235").ToArray();
-            Assert.IsEmpty(consents);
+        consents = ConsentService.LookupConsent("user/1234").ToArray();
+        Assert.AreEqual(2, consents.Length);
+        Assert.IsTrue(consents.All(x => x.Source == "user/1234"));
+        Assert.IsTrue(consents.Any(x => x.Action == "do-something"));
+        Assert.IsTrue(consents.Any(x => x.Action == "do-something-else"));
 
-            consents = ConsentService.LookupConsent(source: "user/1234").ToArray();
-            Assert.AreEqual(2, consents.Length);
-            Assert.IsTrue(consents.All(x => x.Source == "user/1234"));
-            Assert.IsTrue(consents.Any(x => x.Action == "do-something"));
-            Assert.IsTrue(consents.Any(x => x.Action == "do-something-else"));
+        // can get by context
+        consents = ConsentService.LookupConsent(context: "app3").ToArray();
+        Assert.IsEmpty(consents);
 
-            // can get by context
-            consents = ConsentService.LookupConsent(context: "app3").ToArray();
-            Assert.IsEmpty(consents);
+        consents = ConsentService.LookupConsent(context: "app2").ToArray();
+        Assert.AreEqual(1, consents.Length);
 
-            consents = ConsentService.LookupConsent(context: "app2").ToArray();
-            Assert.AreEqual(1, consents.Length);
+        consents = ConsentService.LookupConsent(context: "app1").ToArray();
+        Assert.AreEqual(3, consents.Length);
+        Assert.IsTrue(consents.Any(x => x.Action == "do-something"));
+        Assert.IsTrue(consents.Any(x => x.Action == "do-something-else"));
 
-            consents = ConsentService.LookupConsent(context: "app1").ToArray();
-            Assert.AreEqual(3, consents.Length);
-            Assert.IsTrue(consents.Any(x => x.Action == "do-something"));
-            Assert.IsTrue(consents.Any(x => x.Action == "do-something-else"));
+        // can get by action
+        consents = ConsentService.LookupConsent(action: "do-whatever").ToArray();
+        Assert.IsEmpty(consents);
 
-            // can get by action
-            consents = ConsentService.LookupConsent(action: "do-whatever").ToArray();
-            Assert.IsEmpty(consents);
+        consents = ConsentService.LookupConsent(context: "app1", action: "do-something").ToArray();
+        Assert.AreEqual(2, consents.Length);
+        Assert.IsTrue(consents.All(x => x.Action == "do-something"));
+        Assert.IsTrue(consents.Any(x => x.Source == "user/1234"));
+        Assert.IsTrue(consents.Any(x => x.Source == "user/1236"));
 
-            consents = ConsentService.LookupConsent(context: "app1", action: "do-something").ToArray();
-            Assert.AreEqual(2, consents.Length);
-            Assert.IsTrue(consents.All(x => x.Action == "do-something"));
-            Assert.IsTrue(consents.Any(x => x.Source == "user/1234"));
-            Assert.IsTrue(consents.Any(x => x.Source == "user/1236"));
+        // can revoke
+        consent = ConsentService.RegisterConsent("user/1234", "app1", "do-something", ConsentState.Revoked,
+            "no comment");
 
-            // can revoke
-            consent = ConsentService.RegisterConsent("user/1234", "app1", "do-something", ConsentState.Revoked, "no comment");
+        consents = ConsentService.LookupConsent("user/1234", "app1", "do-something").ToArray();
+        Assert.AreEqual(1, consents.Length);
+        Assert.IsTrue(consents[0].Current);
+        Assert.AreEqual(ConsentState.Revoked, consents[0].State);
 
-            consents = ConsentService.LookupConsent(source: "user/1234", context: "app1", action: "do-something").ToArray();
-            Assert.AreEqual(1, consents.Length);
-            Assert.IsTrue(consents[0].Current);
-            Assert.AreEqual(ConsentState.Revoked, consents[0].State);
+        // can filter
+        consents = ConsentService.LookupConsent(context: "app1", action: "do-", actionStartsWith: true).ToArray();
+        Assert.AreEqual(3, consents.Length);
+        Assert.IsTrue(consents.All(x => x.Context == "app1"));
+        Assert.IsTrue(consents.All(x => x.Action.StartsWith("do-")));
 
-            // can filter
-            consents = ConsentService.LookupConsent(context: "app1", action: "do-", actionStartsWith: true).ToArray();
-            Assert.AreEqual(3, consents.Length);
-            Assert.IsTrue(consents.All(x => x.Context == "app1"));
-            Assert.IsTrue(consents.All(x => x.Action.StartsWith("do-")));
+        // can get history
+        consents = ConsentService.LookupConsent("user/1234", "app1", "do-something", includeHistory: true).ToArray();
+        Assert.AreEqual(1, consents.Length);
+        Assert.IsTrue(consents[0].Current);
+        Assert.AreEqual(ConsentState.Revoked, consents[0].State);
+        Assert.IsTrue(consents[0].IsRevoked());
+        Assert.IsNotNull(consents[0].History);
+        var history = consents[0].History.ToArray();
+        Assert.AreEqual(1, history.Length);
+        Assert.IsFalse(history[0].Current);
+        Assert.AreEqual(ConsentState.Granted, history[0].State);
 
-            // can get history
-            consents = ConsentService.LookupConsent(source: "user/1234", context: "app1", action: "do-something", includeHistory: true).ToArray();
-            Assert.AreEqual(1, consents.Length);
-            Assert.IsTrue(consents[0].Current);
-            Assert.AreEqual(ConsentState.Revoked, consents[0].State);
-            Assert.IsTrue(consents[0].IsRevoked());
-            Assert.IsNotNull(consents[0].History);
-            IConsent[] history = consents[0].History.ToArray();
-            Assert.AreEqual(1, history.Length);
-            Assert.IsFalse(history[0].Current);
-            Assert.AreEqual(ConsentState.Granted, history[0].State);
+        // cannot be stupid
+        Assert.Throws<ArgumentException>(() =>
+            ConsentService.RegisterConsent("user/1234", "app1", "do-something",
+                ConsentState.Granted | ConsentState.Revoked, "no comment"));
+    }
 
-            // cannot be stupid
-            Assert.Throws<ArgumentException>(() =>
-                ConsentService.RegisterConsent("user/1234", "app1", "do-something", ConsentState.Granted | ConsentState.Revoked, "no comment"));
-        }
+    [Test]
+    public void CanRegisterConsentWithoutComment()
+    {
+        // Attept to add consent without a comment
+        ConsentService.RegisterConsent("user/1234", "app1", "consentWithoutComment", ConsentState.Granted);
 
-        [Test]
-        public void CanRegisterConsentWithoutComment()
-        {
-            // Attept to add consent without a comment
-            ConsentService.RegisterConsent("user/1234", "app1", "consentWithoutComment", ConsentState.Granted);
+        // Attempt to retrieve the consent we just added without a comment
+        var consents = ConsentService.LookupConsent("user/1234", action: "consentWithoutComment").ToArray();
 
-            // Attempt to retrieve the consent we just added without a comment
-            IConsent[] consents = ConsentService.LookupConsent(source: "user/1234", action: "consentWithoutComment").ToArray();
-
-            // Confirm we got our expected consent record
-            Assert.AreEqual(1, consents.Length);
-        }
+        // Confirm we got our expected consent record
+        Assert.AreEqual(1, consents.Length);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
index 54701a6ea0..fb25666efb 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEventsTests.cs
@@ -156,7 +156,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
                         }
                         else
                         {
-                            xstate += "=" + (x.Published ? (_documentRepository.IsPathPublished(x) ? "p" : "m") : "u");
+                            xstate += "=" + (x.Published ? _documentRepository.IsPathPublished(x) ? "p" : "m" : "u");
                         }
 
                         return $"{x.Id}.{xstate}";
@@ -345,7 +345,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
             public override string ToString() => $"{Message:000}: {Sender.Replace(" ", string.Empty)}/{Name}/{Args}";
         }
 
-        private static readonly string[] s_propertiesImpactingAllVersions = { "SortOrder", "ParentId", "Level", "Path", "Trashed" };
+        private static readonly string[] _propertiesImpactingAllVersions = { "SortOrder", "ParentId", "Level", "Path", "Trashed" };
 
         private static bool HasChangesImpactingAllVersions(IContent icontent)
         {
@@ -357,7 +357,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
             ////return content.IsEntityDirty();
 
             // have to be more precise & specify properties
-            return s_propertiesImpactingAllVersions.Any(content.IsPropertyDirty);
+            return _propertiesImpactingAllVersions.Any(content.IsPropertyDirty);
         }
 
         private void WriteEvents()
@@ -374,7 +374,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
         #region Utils
 
         private IEnumerable<IContent> Children(IContent content)
-            => ContentService.GetPagedChildren(content.Id, 0, int.MaxValue, out long total);
+            => ContentService.GetPagedChildren(content.Id, 0, int.MaxValue, out _);
 
         #endregion
 
@@ -999,7 +999,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
         [Test]
         public void EmptyRecycleBinContent()
         {
-            ContentService.EmptyRecycleBin(Constants.Security.SuperUserId);
+            ContentService.EmptyRecycleBin();
 
             IContent content = CreateContent();
             Assert.IsNotNull(content);
@@ -1007,7 +1007,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
             ContentService.MoveToRecycleBin(content);
 
             ResetEvents();
-            ContentService.EmptyRecycleBin(Constants.Security.SuperUserId);
+            ContentService.EmptyRecycleBin();
 
             Assert.AreEqual(2, _msgCount);
             Assert.AreEqual(2, _events.Count);
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs
index 49d94258e6..586eeb0873 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceNotificationTests.cs
@@ -10,443 +10,441 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(
+    Database = UmbracoTestOptions.Database.NewSchemaPerTest,
+    PublishedRepositoryEvents = true,
+    WithApplication = true,
+    Logger = UmbracoTestOptions.Logger.Console)]
+public class ContentServiceNotificationTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(
-        Database = UmbracoTestOptions.Database.NewSchemaPerTest,
-        PublishedRepositoryEvents = true,
-        WithApplication = true,
-        Logger = UmbracoTestOptions.Logger.Console)]
-    public class ContentServiceNotificationTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetupTest()
     {
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        ContentRepositoryBase.ThrowOnWarning = true;
+        _globalSettings = new GlobalSettings();
 
-        private ContentService ContentService => (ContentService)GetRequiredService<IContentService>();
+        CreateTestData();
+    }
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+    [TearDown]
+    public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
 
-        private IFileService FileService => GetRequiredService<IFileService>();
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
 
-        private GlobalSettings _globalSettings;
-        private IContentType _contentType;
+    private ContentService ContentService => (ContentService)GetRequiredService<IContentService>();
 
-        [SetUp]
-        public void SetupTest()
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private GlobalSettings _globalSettings;
+    private IContentType _contentType;
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
+        .AddNotificationHandler<ContentSavingNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentSavedNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentPublishingNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentPublishedNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentUnpublishingNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentUnpublishedNotification, ContentNotificationHandler>();
+
+    private void CreateTestData()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template); // else, FK violation on contentType!
+
+        _contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(_contentType);
+    }
+
+    [Test]
+    public void Saving_Culture()
+    {
+        LocalizationService.Save(new Language("fr-FR", "French (France)"));
+
+        _contentType.Variations = ContentVariation.Culture;
+        foreach (var propertyType in _contentType.PropertyTypes)
         {
-            ContentRepositoryBase.ThrowOnWarning = true;
-            _globalSettings = new GlobalSettings();
-
-            CreateTestData();
+            propertyType.Variations = ContentVariation.Culture;
         }
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
-            .AddNotificationHandler<ContentSavingNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentSavedNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentPublishingNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentPublishedNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentUnpublishingNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentUnpublishedNotification, ContentNotificationHandler>();
+        ContentTypeService.Save(_contentType);
 
-        private void CreateTestData()
+        IContent document = new Content("content", -1, _contentType);
+        document.SetCultureName("hello", "en-US");
+        document.SetCultureName("bonjour", "fr-FR");
+        ContentService.Save(document);
+
+        // re-get - dirty properties need resetting
+        document = ContentService.GetById(document.Id);
+
+        // properties: title, bodyText, keywords, description
+        document.SetValue("title", "title-en", "en-US");
+
+        var savingWasCalled = false;
+        var savedWasCalled = false;
+
+        ContentNotificationHandler.SavingContent = notification =>
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template); // else, FK violation on contentType!
+            var saved = notification.SavedEntities.First();
 
-            _contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(_contentType);
-        }
+            Assert.AreSame(document, saved);
 
-        [TearDown]
-        public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
+            Assert.IsTrue(notification.IsSavingCulture(saved, "en-US"));
+            Assert.IsFalse(notification.IsSavingCulture(saved, "fr-FR"));
 
-        [Test]
-        public void Saving_Culture()
+            savingWasCalled = true;
+        };
+
+        ContentNotificationHandler.SavedContent = notification =>
         {
-            LocalizationService.Save(new Language("fr-FR", "French (France)"));
+            var saved = notification.SavedEntities.First();
 
-            _contentType.Variations = ContentVariation.Culture;
-            foreach (IPropertyType propertyType in _contentType.PropertyTypes)
-            {
-                propertyType.Variations = ContentVariation.Culture;
-            }
+            Assert.AreSame(document, saved);
 
-            ContentTypeService.Save(_contentType);
+            Assert.IsTrue(notification.HasSavedCulture(saved, "en-US"));
+            Assert.IsFalse(notification.HasSavedCulture(saved, "fr-FR"));
 
-            IContent document = new Content("content", -1, _contentType);
-            document.SetCultureName("hello", "en-US");
-            document.SetCultureName("bonjour", "fr-FR");
+            savedWasCalled = true;
+        };
+
+        try
+        {
             ContentService.Save(document);
-
-            // re-get - dirty properties need resetting
-            document = ContentService.GetById(document.Id);
-
-            // properties: title, bodyText, keywords, description
-            document.SetValue("title", "title-en", "en-US");
-
-            var savingWasCalled = false;
-            var savedWasCalled = false;
-
-            ContentNotificationHandler.SavingContent = notification =>
-            {
-                IContent saved = notification.SavedEntities.First();
-
-                Assert.AreSame(document, saved);
-
-                Assert.IsTrue(notification.IsSavingCulture(saved, "en-US"));
-                Assert.IsFalse(notification.IsSavingCulture(saved, "fr-FR"));
-
-                savingWasCalled = true;
-            };
-
-            ContentNotificationHandler.SavedContent = notification =>
-            {
-                IContent saved = notification.SavedEntities.First();
-
-                Assert.AreSame(document, saved);
-
-                Assert.IsTrue(notification.HasSavedCulture(saved, "en-US"));
-                Assert.IsFalse(notification.HasSavedCulture(saved, "fr-FR"));
-
-                savedWasCalled = true;
-            };
-
-            try
-            {
-                ContentService.Save(document);
-                Assert.IsTrue(savingWasCalled);
-                Assert.IsTrue(savedWasCalled);
-            }
-            finally
-            {
-                ContentNotificationHandler.SavingContent = null;
-                ContentNotificationHandler.SavedContent = null;
-            }
+            Assert.IsTrue(savingWasCalled);
+            Assert.IsTrue(savedWasCalled);
         }
-
-        [Test]
-        public void Saving_Set_Value()
+        finally
         {
-            IContent document = new Content("content", -1, _contentType);
-
-            var savingWasCalled = false;
-            var savedWasCalled = false;
-
-            ContentNotificationHandler.SavingContent = notification =>
-            {
-                IContent saved = notification.SavedEntities.First();
-
-                Assert.IsTrue(document.GetValue<string>("title").IsNullOrWhiteSpace());
-
-                saved.SetValue("title", "title");
-
-                savingWasCalled = true;
-            };
-
-            ContentNotificationHandler.SavedContent = notification =>
-            {
-                IContent saved = notification.SavedEntities.First();
-
-                Assert.AreSame("title", document.GetValue<string>("title"));
-
-                // we're only dealing with invariant here
-                IPropertyValue propValue = saved.Properties["title"].Values.First(x => x.Culture == null && x.Segment == null);
-
-                Assert.AreEqual("title", propValue.EditedValue);
-                Assert.IsNull(propValue.PublishedValue);
-
-                savedWasCalled = true;
-            };
-
-            try
-            {
-                ContentService.Save(document);
-                Assert.IsTrue(savingWasCalled);
-                Assert.IsTrue(savedWasCalled);
-            }
-            finally
-            {
-                ContentNotificationHandler.SavingContent = null;
-                ContentNotificationHandler.SavedContent = null;
-            }
-        }
-
-        [Test]
-        public void Publishing_Culture()
-        {
-            LocalizationService.Save(new Language("fr-FR", "French (France)"));
-
-            _contentType.Variations = ContentVariation.Culture;
-            foreach (IPropertyType propertyType in _contentType.PropertyTypes)
-            {
-                propertyType.Variations = ContentVariation.Culture;
-            }
-
-            ContentTypeService.Save(_contentType);
-
-            IContent document = new Content("content", -1, _contentType);
-            document.SetCultureName("hello", "en-US");
-            document.SetCultureName("bonjour", "fr-FR");
-            ContentService.Save(document);
-
-            Assert.IsFalse(document.IsCulturePublished("fr-FR"));
-            Assert.IsFalse(document.IsCulturePublished("en-US"));
-
-            // re-get - dirty properties need resetting
-            document = ContentService.GetById(document.Id);
-
-            var publishingWasCalled = false;
-            var publishedWasCalled = false;
-
-            ContentNotificationHandler.PublishingContent += notification =>
-            {
-                IContent publishing = notification.PublishedEntities.First();
-
-                Assert.AreSame(document, publishing);
-
-                Assert.IsFalse(notification.IsPublishingCulture(publishing, "en-US"));
-                Assert.IsTrue(notification.IsPublishingCulture(publishing, "fr-FR"));
-
-                publishingWasCalled = true;
-            };
-
-            ContentNotificationHandler.PublishedContent += notification =>
-            {
-                IContent published = notification.PublishedEntities.First();
-
-                Assert.AreSame(document, published);
-
-                Assert.IsFalse(notification.HasPublishedCulture(published, "en-US"));
-                Assert.IsTrue(notification.HasPublishedCulture(published, "fr-FR"));
-
-                publishedWasCalled = true;
-            };
-
-            try
-            {
-                ContentService.SaveAndPublish(document, "fr-FR");
-                Assert.IsTrue(publishingWasCalled);
-                Assert.IsTrue(publishedWasCalled);
-            }
-            finally
-            {
-                ContentNotificationHandler.PublishingContent = null;
-                ContentNotificationHandler.PublishedContent = null;
-            }
-
-            document = ContentService.GetById(document.Id);
-
-            // ensure it works and does not throw
-            Assert.IsTrue(document.IsCulturePublished("fr-FR"));
-            Assert.IsFalse(document.IsCulturePublished("en-US"));
-        }
-
-        [Test]
-        public void Publishing_Set_Value()
-        {
-            IContent document = new Content("content", -1, _contentType);
-
-            var savingWasCalled = false;
-            var savedWasCalled = false;
-
-            ContentNotificationHandler.SavingContent = notification =>
-            {
-                IContent saved = notification.SavedEntities.First();
-
-                Assert.IsTrue(document.GetValue<string>("title").IsNullOrWhiteSpace());
-
-                saved.SetValue("title", "title");
-
-                savingWasCalled = true;
-            };
-
-            ContentNotificationHandler.SavedContent = notification =>
-            {
-                IContent saved = notification.SavedEntities.First();
-
-                Assert.AreSame("title", document.GetValue<string>("title"));
-
-                // We're only dealing with invariant here.
-                IPropertyValue propValue = saved.Properties["title"].Values.First(x => x.Culture == null && x.Segment == null);
-
-                Assert.AreEqual("title", propValue.EditedValue);
-                Assert.AreEqual("title", propValue.PublishedValue);
-
-                savedWasCalled = true;
-            };
-
-            try
-            {
-                ContentService.SaveAndPublish(document);
-                Assert.IsTrue(savingWasCalled);
-                Assert.IsTrue(savedWasCalled);
-            }
-            finally
-            {
-                ContentNotificationHandler.SavingContent = null;
-                ContentNotificationHandler.SavedContent = null;
-            }
-        }
-
-        [Test]
-        public void Publishing_Set_Mandatory_Value()
-        {
-            IPropertyType titleProperty = _contentType.PropertyTypes.First(x => x.Alias == "title");
-            titleProperty.Mandatory = true; // make this required!
-            ContentTypeService.Save(_contentType);
-
-            IContent document = new Content("content", -1, _contentType);
-
-            PublishResult result = ContentService.SaveAndPublish(document);
-            Assert.IsFalse(result.Success);
-            Assert.AreEqual("title", result.InvalidProperties.First().Alias);
-
-            // when a service operation fails, the object is dirty and should not be re-used,
-            // re-create it
-            document = new Content("content", -1, _contentType);
-
-            var savingWasCalled = false;
-
-            ContentNotificationHandler.SavingContent = notification =>
-            {
-                IContent saved = notification.SavedEntities.First();
-
-                Assert.IsTrue(document.GetValue<string>("title").IsNullOrWhiteSpace());
-
-                saved.SetValue("title", "title");
-
-                savingWasCalled = true;
-            };
-
-            try
-            {
-                result = ContentService.SaveAndPublish(document);
-                Assert.IsTrue(result.Success); // will succeed now because we were able to specify the required value in the Saving event
-                Assert.IsTrue(savingWasCalled);
-            }
-            finally
-            {
-                ContentNotificationHandler.SavingContent = null;
-            }
-        }
-
-        [Test]
-        public void Unpublishing_Culture()
-        {
-            LocalizationService.Save(new Language("fr-FR", "French (France)"));
-
-            _contentType.Variations = ContentVariation.Culture;
-            foreach (IPropertyType propertyType in _contentType.PropertyTypes)
-            {
-                propertyType.Variations = ContentVariation.Culture;
-            }
-
-            ContentTypeService.Save(_contentType);
-
-            IContent document = new Content("content", -1, _contentType);
-            document.SetCultureName("hello", "en-US");
-            document.SetCultureName("bonjour", "fr-FR");
-            ContentService.SaveAndPublish(document);
-
-            Assert.IsTrue(document.IsCulturePublished("fr-FR"));
-            Assert.IsTrue(document.IsCulturePublished("en-US"));
-
-            // re-get - dirty properties need resetting
-            document = ContentService.GetById(document.Id);
-
-            document.UnpublishCulture("fr-FR");
-
-            var publishingWasCalled = false;
-            var publishedWasCalled = false;
-
-            // TODO: revisit this - it was migrated when removing static events, but the expected result seems illogic - why does this test bind to Published and not Unpublished?
-
-            ContentNotificationHandler.PublishingContent += notification =>
-            {
-                IContent published = notification.PublishedEntities.First();
-
-                Assert.AreSame(document, published);
-
-                Assert.IsFalse(notification.IsPublishingCulture(published, "en-US"));
-                Assert.IsFalse(notification.IsPublishingCulture(published, "fr-FR"));
-
-                Assert.IsFalse(notification.IsUnpublishingCulture(published, "en-US"));
-                Assert.IsTrue(notification.IsUnpublishingCulture(published, "fr-FR"));
-
-                publishingWasCalled = true;
-            };
-
-            ContentNotificationHandler.PublishedContent += notification =>
-            {
-                IContent published = notification.PublishedEntities.First();
-
-                Assert.AreSame(document, published);
-
-                Assert.IsFalse(notification.HasPublishedCulture(published, "en-US"));
-                Assert.IsFalse(notification.HasPublishedCulture(published, "fr-FR"));
-
-                Assert.IsFalse(notification.HasUnpublishedCulture(published, "en-US"));
-                Assert.IsTrue(notification.HasUnpublishedCulture(published, "fr-FR"));
-
-                publishedWasCalled = true;
-            };
-
-            try
-            {
-                ContentService.CommitDocumentChanges(document);
-                Assert.IsTrue(publishingWasCalled);
-                Assert.IsTrue(publishedWasCalled);
-            }
-            finally
-            {
-                ContentNotificationHandler.PublishingContent = null;
-                ContentNotificationHandler.PublishedContent = null;
-            }
-
-            document = ContentService.GetById(document.Id);
-
-            Assert.IsFalse(document.IsCulturePublished("fr-FR"));
-            Assert.IsTrue(document.IsCulturePublished("en-US"));
-        }
-
-        public class ContentNotificationHandler :
-            INotificationHandler<ContentSavingNotification>,
-            INotificationHandler<ContentSavedNotification>,
-            INotificationHandler<ContentPublishingNotification>,
-            INotificationHandler<ContentPublishedNotification>,
-            INotificationHandler<ContentUnpublishingNotification>,
-            INotificationHandler<ContentUnpublishedNotification>
-        {
-            public void Handle(ContentSavingNotification notification) => SavingContent?.Invoke(notification);
-
-            public void Handle(ContentSavedNotification notification) => SavedContent?.Invoke(notification);
-
-            public void Handle(ContentPublishingNotification notification) => PublishingContent?.Invoke(notification);
-
-            public void Handle(ContentPublishedNotification notification) => PublishedContent?.Invoke(notification);
-
-            public void Handle(ContentUnpublishingNotification notification) => UnpublishingContent?.Invoke(notification);
-
-            public void Handle(ContentUnpublishedNotification notification) => UnpublishedContent?.Invoke(notification);
-
-            public static Action<ContentSavingNotification> SavingContent { get; set; }
-
-            public static Action<ContentSavedNotification> SavedContent { get; set; }
-
-            public static Action<ContentPublishingNotification> PublishingContent { get; set; }
-
-            public static Action<ContentPublishedNotification> PublishedContent { get; set; }
-
-            public static Action<ContentUnpublishingNotification> UnpublishingContent { get; set; }
-
-            public static Action<ContentUnpublishedNotification> UnpublishedContent { get; set; }
+            ContentNotificationHandler.SavingContent = null;
+            ContentNotificationHandler.SavedContent = null;
         }
     }
+
+    [Test]
+    public void Saving_Set_Value()
+    {
+        IContent document = new Content("content", -1, _contentType);
+
+        var savingWasCalled = false;
+        var savedWasCalled = false;
+
+        ContentNotificationHandler.SavingContent = notification =>
+        {
+            var saved = notification.SavedEntities.First();
+
+            Assert.IsTrue(document.GetValue<string>("title").IsNullOrWhiteSpace());
+
+            saved.SetValue("title", "title");
+
+            savingWasCalled = true;
+        };
+
+        ContentNotificationHandler.SavedContent = notification =>
+        {
+            var saved = notification.SavedEntities.First();
+
+            Assert.AreSame("title", document.GetValue<string>("title"));
+
+            // we're only dealing with invariant here
+            var propValue = saved.Properties["title"].Values.First(x => x.Culture == null && x.Segment == null);
+
+            Assert.AreEqual("title", propValue.EditedValue);
+            Assert.IsNull(propValue.PublishedValue);
+
+            savedWasCalled = true;
+        };
+
+        try
+        {
+            ContentService.Save(document);
+            Assert.IsTrue(savingWasCalled);
+            Assert.IsTrue(savedWasCalled);
+        }
+        finally
+        {
+            ContentNotificationHandler.SavingContent = null;
+            ContentNotificationHandler.SavedContent = null;
+        }
+    }
+
+    [Test]
+    public void Publishing_Culture()
+    {
+        LocalizationService.Save(new Language("fr-FR", "French (France)"));
+
+        _contentType.Variations = ContentVariation.Culture;
+        foreach (var propertyType in _contentType.PropertyTypes)
+        {
+            propertyType.Variations = ContentVariation.Culture;
+        }
+
+        ContentTypeService.Save(_contentType);
+
+        IContent document = new Content("content", -1, _contentType);
+        document.SetCultureName("hello", "en-US");
+        document.SetCultureName("bonjour", "fr-FR");
+        ContentService.Save(document);
+
+        Assert.IsFalse(document.IsCulturePublished("fr-FR"));
+        Assert.IsFalse(document.IsCulturePublished("en-US"));
+
+        // re-get - dirty properties need resetting
+        document = ContentService.GetById(document.Id);
+
+        var publishingWasCalled = false;
+        var publishedWasCalled = false;
+
+        ContentNotificationHandler.PublishingContent += notification =>
+        {
+            var publishing = notification.PublishedEntities.First();
+
+            Assert.AreSame(document, publishing);
+
+            Assert.IsFalse(notification.IsPublishingCulture(publishing, "en-US"));
+            Assert.IsTrue(notification.IsPublishingCulture(publishing, "fr-FR"));
+
+            publishingWasCalled = true;
+        };
+
+        ContentNotificationHandler.PublishedContent += notification =>
+        {
+            var published = notification.PublishedEntities.First();
+
+            Assert.AreSame(document, published);
+
+            Assert.IsFalse(notification.HasPublishedCulture(published, "en-US"));
+            Assert.IsTrue(notification.HasPublishedCulture(published, "fr-FR"));
+
+            publishedWasCalled = true;
+        };
+
+        try
+        {
+            ContentService.SaveAndPublish(document, "fr-FR");
+            Assert.IsTrue(publishingWasCalled);
+            Assert.IsTrue(publishedWasCalled);
+        }
+        finally
+        {
+            ContentNotificationHandler.PublishingContent = null;
+            ContentNotificationHandler.PublishedContent = null;
+        }
+
+        document = ContentService.GetById(document.Id);
+
+        // ensure it works and does not throw
+        Assert.IsTrue(document.IsCulturePublished("fr-FR"));
+        Assert.IsFalse(document.IsCulturePublished("en-US"));
+    }
+
+    [Test]
+    public void Publishing_Set_Value()
+    {
+        IContent document = new Content("content", -1, _contentType);
+
+        var savingWasCalled = false;
+        var savedWasCalled = false;
+
+        ContentNotificationHandler.SavingContent = notification =>
+        {
+            var saved = notification.SavedEntities.First();
+
+            Assert.IsTrue(document.GetValue<string>("title").IsNullOrWhiteSpace());
+
+            saved.SetValue("title", "title");
+
+            savingWasCalled = true;
+        };
+
+        ContentNotificationHandler.SavedContent = notification =>
+        {
+            var saved = notification.SavedEntities.First();
+
+            Assert.AreSame("title", document.GetValue<string>("title"));
+
+            // We're only dealing with invariant here.
+            var propValue = saved.Properties["title"].Values.First(x => x.Culture == null && x.Segment == null);
+
+            Assert.AreEqual("title", propValue.EditedValue);
+            Assert.AreEqual("title", propValue.PublishedValue);
+
+            savedWasCalled = true;
+        };
+
+        try
+        {
+            ContentService.SaveAndPublish(document);
+            Assert.IsTrue(savingWasCalled);
+            Assert.IsTrue(savedWasCalled);
+        }
+        finally
+        {
+            ContentNotificationHandler.SavingContent = null;
+            ContentNotificationHandler.SavedContent = null;
+        }
+    }
+
+    [Test]
+    public void Publishing_Set_Mandatory_Value()
+    {
+        var titleProperty = _contentType.PropertyTypes.First(x => x.Alias == "title");
+        titleProperty.Mandatory = true; // make this required!
+        ContentTypeService.Save(_contentType);
+
+        IContent document = new Content("content", -1, _contentType);
+
+        var result = ContentService.SaveAndPublish(document);
+        Assert.IsFalse(result.Success);
+        Assert.AreEqual("title", result.InvalidProperties.First().Alias);
+
+        // when a service operation fails, the object is dirty and should not be re-used,
+        // re-create it
+        document = new Content("content", -1, _contentType);
+
+        var savingWasCalled = false;
+
+        ContentNotificationHandler.SavingContent = notification =>
+        {
+            var saved = notification.SavedEntities.First();
+
+            Assert.IsTrue(document.GetValue<string>("title").IsNullOrWhiteSpace());
+
+            saved.SetValue("title", "title");
+
+            savingWasCalled = true;
+        };
+
+        try
+        {
+            result = ContentService.SaveAndPublish(document);
+            Assert.IsTrue(result
+                .Success); // will succeed now because we were able to specify the required value in the Saving event
+            Assert.IsTrue(savingWasCalled);
+        }
+        finally
+        {
+            ContentNotificationHandler.SavingContent = null;
+        }
+    }
+
+    [Test]
+    public void Unpublishing_Culture()
+    {
+        LocalizationService.Save(new Language("fr-FR", "French (France)"));
+
+        _contentType.Variations = ContentVariation.Culture;
+        foreach (var propertyType in _contentType.PropertyTypes)
+        {
+            propertyType.Variations = ContentVariation.Culture;
+        }
+
+        ContentTypeService.Save(_contentType);
+
+        IContent document = new Content("content", -1, _contentType);
+        document.SetCultureName("hello", "en-US");
+        document.SetCultureName("bonjour", "fr-FR");
+        ContentService.SaveAndPublish(document);
+
+        Assert.IsTrue(document.IsCulturePublished("fr-FR"));
+        Assert.IsTrue(document.IsCulturePublished("en-US"));
+
+        // re-get - dirty properties need resetting
+        document = ContentService.GetById(document.Id);
+
+        document.UnpublishCulture("fr-FR");
+
+        var publishingWasCalled = false;
+        var publishedWasCalled = false;
+
+        // TODO: revisit this - it was migrated when removing static events, but the expected result seems illogic - why does this test bind to Published and not Unpublished?
+
+        ContentNotificationHandler.PublishingContent += notification =>
+        {
+            var published = notification.PublishedEntities.First();
+
+            Assert.AreSame(document, published);
+
+            Assert.IsFalse(notification.IsPublishingCulture(published, "en-US"));
+            Assert.IsFalse(notification.IsPublishingCulture(published, "fr-FR"));
+
+            Assert.IsFalse(notification.IsUnpublishingCulture(published, "en-US"));
+            Assert.IsTrue(notification.IsUnpublishingCulture(published, "fr-FR"));
+
+            publishingWasCalled = true;
+        };
+
+        ContentNotificationHandler.PublishedContent += notification =>
+        {
+            var published = notification.PublishedEntities.First();
+
+            Assert.AreSame(document, published);
+
+            Assert.IsFalse(notification.HasPublishedCulture(published, "en-US"));
+            Assert.IsFalse(notification.HasPublishedCulture(published, "fr-FR"));
+
+            Assert.IsFalse(notification.HasUnpublishedCulture(published, "en-US"));
+            Assert.IsTrue(notification.HasUnpublishedCulture(published, "fr-FR"));
+
+            publishedWasCalled = true;
+        };
+
+        try
+        {
+            ContentService.CommitDocumentChanges(document);
+            Assert.IsTrue(publishingWasCalled);
+            Assert.IsTrue(publishedWasCalled);
+        }
+        finally
+        {
+            ContentNotificationHandler.PublishingContent = null;
+            ContentNotificationHandler.PublishedContent = null;
+        }
+
+        document = ContentService.GetById(document.Id);
+
+        Assert.IsFalse(document.IsCulturePublished("fr-FR"));
+        Assert.IsTrue(document.IsCulturePublished("en-US"));
+    }
+
+    public class ContentNotificationHandler :
+        INotificationHandler<ContentSavingNotification>,
+        INotificationHandler<ContentSavedNotification>,
+        INotificationHandler<ContentPublishingNotification>,
+        INotificationHandler<ContentPublishedNotification>,
+        INotificationHandler<ContentUnpublishingNotification>,
+        INotificationHandler<ContentUnpublishedNotification>
+    {
+        public static Action<ContentSavingNotification> SavingContent { get; set; }
+
+        public static Action<ContentSavedNotification> SavedContent { get; set; }
+
+        public static Action<ContentPublishingNotification> PublishingContent { get; set; }
+
+        public static Action<ContentPublishedNotification> PublishedContent { get; set; }
+
+        public static Action<ContentUnpublishingNotification> UnpublishingContent { get; set; }
+
+        public static Action<ContentUnpublishedNotification> UnpublishedContent { get; set; }
+
+        public void Handle(ContentPublishedNotification notification) => PublishedContent?.Invoke(notification);
+
+        public void Handle(ContentPublishingNotification notification) => PublishingContent?.Invoke(notification);
+
+        public void Handle(ContentSavedNotification notification) => SavedContent?.Invoke(notification);
+        public void Handle(ContentSavingNotification notification) => SavingContent?.Invoke(notification);
+
+        public void Handle(ContentUnpublishedNotification notification) => UnpublishedContent?.Invoke(notification);
+
+        public void Handle(ContentUnpublishingNotification notification) => UnpublishingContent?.Invoke(notification);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs
index b068ec4ac8..bafd0aa138 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePerformanceTest.cs
@@ -12,7 +12,6 @@ using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Repositories;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
@@ -20,259 +19,255 @@ using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ContentServicePerformanceTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class ContentServicePerformanceTest : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUpData() => CreateTestData();
+
+    protected DocumentRepository DocumentRepository => (DocumentRepository)GetRequiredService<IDocumentRepository>();
+
+    protected IFileService FileService => GetRequiredService<IFileService>();
+
+    protected IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    protected IContentService ContentService => GetRequiredService<IContentService>();
+
+    protected IContentType ContentType { get; set; }
+
+    [Test]
+    public void Profiler() => Assert.IsInstanceOf<TestProfiler>(GetRequiredService<IProfiler>());
+
+    private static IProfilingLogger GetTestProfilingLogger()
     {
-        protected DocumentRepository DocumentRepository => (DocumentRepository)GetRequiredService<IDocumentRepository>();
+        var profiler = new TestProfiler();
+        return new ProfilingLogger(new NullLogger<ProfilingLogger>(), profiler);
+    }
 
-        protected IFileService FileService => GetRequiredService<IFileService>();
+    [Test]
+    public void Retrieving_All_Content_In_Site()
+    {
+        // NOTE: Doing this the old 1 by 1 way and based on the results of the ContentServicePerformanceTest.Retrieving_All_Content_In_Site
+        // the old way takes 143795ms, the new above way takes:
+        // 14249ms
+        //
+        // ... NOPE, made some new changes, it is now....
+        // 5290ms  !!!!!!
+        //
+        // that is a 96% savings of processing and sql calls!
+        //
+        // ... NOPE, made even more nice changes, it is now...
+        // 4452ms !!!!!!!
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        protected IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-
-        protected IContentService ContentService => GetRequiredService<IContentService>();
-
-        protected IContentType ContentType { get; set; }
-
-        [SetUp]
-        public void SetUpData() => CreateTestData();
-
-        [Test]
-        public void Profiler() => Assert.IsInstanceOf<TestProfiler>(GetRequiredService<IProfiler>());
-
-        private static IProfilingLogger GetTestProfilingLogger()
+        var contentType1 = ContentTypeBuilder.CreateTextPageContentType("test1", "test1", template.Id);
+        var contentType2 = ContentTypeBuilder.CreateTextPageContentType("test2", "test2", template.Id);
+        var contentType3 = ContentTypeBuilder.CreateTextPageContentType("test3", "test3", template.Id);
+        ContentTypeService.Save(new[] { contentType1, contentType2, contentType3 });
+        contentType1.AllowedContentTypes = new[]
         {
-            var profiler = new TestProfiler();
-            return new ProfilingLogger(new NullLogger<ProfilingLogger>(), profiler);
+            new ContentTypeSort(new Lazy<int>(() => contentType2.Id), 0, contentType2.Alias),
+            new ContentTypeSort(new Lazy<int>(() => contentType3.Id), 1, contentType3.Alias)
+        };
+        contentType2.AllowedContentTypes = new[]
+        {
+            new ContentTypeSort(new Lazy<int>(() => contentType1.Id), 0, contentType1.Alias),
+            new ContentTypeSort(new Lazy<int>(() => contentType3.Id), 1, contentType3.Alias)
+        };
+        contentType3.AllowedContentTypes = new[]
+        {
+            new ContentTypeSort(new Lazy<int>(() => contentType1.Id), 0, contentType1.Alias),
+            new ContentTypeSort(new Lazy<int>(() => contentType2.Id), 1, contentType2.Alias)
+        };
+        ContentTypeService.Save(new[] { contentType1, contentType2, contentType3 });
+
+        var roots = ContentBuilder.CreateTextpageContent(contentType1, -1, 10);
+        ContentService.Save(roots);
+        foreach (var root in roots)
+        {
+            var item1 = ContentBuilder.CreateTextpageContent(contentType1, root.Id, 10);
+            var item2 = ContentBuilder.CreateTextpageContent(contentType2, root.Id, 10);
+            var item3 = ContentBuilder.CreateTextpageContent(contentType3, root.Id, 10);
+
+            ContentService.Save(item1.Concat(item2).Concat(item3));
         }
 
-        [Test]
-        public void Retrieving_All_Content_In_Site()
+        var total = new List<IContent>();
+
+        using (GetTestProfilingLogger().TraceDuration<ContentServicePerformanceTest>("Getting all content in site"))
         {
-            // NOTE: Doing this the old 1 by 1 way and based on the results of the ContentServicePerformanceTest.Retrieving_All_Content_In_Site
-            // the old way takes 143795ms, the new above way takes:
-            // 14249ms
-            //
-            // ... NOPE, made some new changes, it is now....
-            // 5290ms  !!!!!!
-            //
-            // that is a 96% savings of processing and sql calls!
-            //
-            // ... NOPE, made even more nice changes, it is now...
-            // 4452ms !!!!!!!
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType1 = ContentTypeBuilder.CreateTextPageContentType("test1", "test1", defaultTemplateId: template.Id);
-            ContentType contentType2 = ContentTypeBuilder.CreateTextPageContentType("test2", "test2", defaultTemplateId: template.Id);
-            ContentType contentType3 = ContentTypeBuilder.CreateTextPageContentType("test3", "test3", defaultTemplateId: template.Id);
-            ContentTypeService.Save(new[] { contentType1, contentType2, contentType3 });
-            contentType1.AllowedContentTypes = new[]
+            TestProfiler.Enable();
+            total.AddRange(ContentService.GetRootContent());
+            foreach (var content in total.ToArray())
             {
-                new ContentTypeSort(new Lazy<int>(() => contentType2.Id), 0, contentType2.Alias),
-                new ContentTypeSort(new Lazy<int>(() => contentType3.Id), 1, contentType3.Alias)
-            };
-            contentType2.AllowedContentTypes = new[]
-            {
-                new ContentTypeSort(new Lazy<int>(() => contentType1.Id), 0, contentType1.Alias),
-                new ContentTypeSort(new Lazy<int>(() => contentType3.Id), 1, contentType3.Alias)
-            };
-            contentType3.AllowedContentTypes = new[]
-            {
-                new ContentTypeSort(new Lazy<int>(() => contentType1.Id), 0, contentType1.Alias),
-                new ContentTypeSort(new Lazy<int>(() => contentType2.Id), 1, contentType2.Alias)
-            };
-            ContentTypeService.Save(new[] { contentType1, contentType2, contentType3 });
-
-            IEnumerable<Content> roots = ContentBuilder.CreateTextpageContent(contentType1, -1, 10);
-            ContentService.Save(roots);
-            foreach (Content root in roots)
-            {
-                IEnumerable<Content> item1 = ContentBuilder.CreateTextpageContent(contentType1, root.Id, 10);
-                IEnumerable<Content> item2 = ContentBuilder.CreateTextpageContent(contentType2, root.Id, 10);
-                IEnumerable<Content> item3 = ContentBuilder.CreateTextpageContent(contentType3, root.Id, 10);
-
-                ContentService.Save(item1.Concat(item2).Concat(item3));
+                total.AddRange(ContentService.GetPagedDescendants(content.Id, 0, int.MaxValue, out var _));
             }
 
-            var total = new List<IContent>();
-
-            using (GetTestProfilingLogger().TraceDuration<ContentServicePerformanceTest>("Getting all content in site"))
-            {
-                TestProfiler.Enable();
-                total.AddRange(ContentService.GetRootContent());
-                foreach (IContent content in total.ToArray())
-                {
-                    total.AddRange(ContentService.GetPagedDescendants(content.Id, 0, int.MaxValue, out long _));
-                }
-
-                TestProfiler.Disable();
-                StaticApplicationLogging.Logger.LogInformation("Returned {Total} items", total.Count);
-            }
-        }
-
-        [Test]
-        public void Creating_100_Items()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get(ContentType.Id);
-            IEnumerable<Content> pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
-
-            // Act
-            var watch = Stopwatch.StartNew();
-            ContentService.Save(pages, 0);
-            watch.Stop();
-            long elapsed = watch.ElapsedMilliseconds;
-
-            Debug.Print("100 content items saved in {0} ms", elapsed);
-
-            // Assert
-            Assert.That(pages.Any(x => x.HasIdentity == false), Is.False);
-        }
-
-        [Test]
-        public void Creating_1000_Items()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get(ContentType.Id);
-            IEnumerable<Content> pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
-
-            // Act
-            var watch = Stopwatch.StartNew();
-            ContentService.Save(pages, 0);
-            watch.Stop();
-            long elapsed = watch.ElapsedMilliseconds;
-
-            Debug.Print("100 content items saved in {0} ms", elapsed);
-
-            // Assert
-            Assert.That(pages.Any(x => x.HasIdentity == false), Is.False);
-        }
-
-        [Test]
-        public void Getting_100_Uncached_Items()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get(ContentType.Id);
-            IEnumerable<Content> pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
-            ContentService.Save(pages, 0);
-
-            IScopeProvider provider = ScopeProvider;
-            using (IScope scope = provider.CreateScope())
-            {
-                DocumentRepository repository = DocumentRepository;
-
-                // Act
-                var watch = Stopwatch.StartNew();
-                IEnumerable<IContent> contents = repository.GetMany();
-                watch.Stop();
-                long elapsed = watch.ElapsedMilliseconds;
-
-                Debug.Print("100 content items retrieved in {0} ms without caching", elapsed);
-
-                // Assert
-                Assert.That(contents.Any(x => x.HasIdentity == false), Is.False);
-                Assert.That(contents.Any(x => x == null), Is.False);
-            }
-        }
-
-        [Test]
-        public void Getting_1000_Uncached_Items()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get(ContentType.Id);
-            IEnumerable<Content> pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
-            ContentService.Save(pages, 0);
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                DocumentRepository repository = DocumentRepository;
-
-                // Act
-                var watch = Stopwatch.StartNew();
-                IEnumerable<IContent> contents = repository.GetMany();
-                watch.Stop();
-                long elapsed = watch.ElapsedMilliseconds;
-
-                Debug.Print("1000 content items retrieved in {0} ms without caching", elapsed);
-
-                // Assert
-                // Assert.That(contents.Any(x => x.HasIdentity == false), Is.False);
-                // Assert.That(contents.Any(x => x == null), Is.False);
-            }
-        }
-
-        [Test]
-        public void Getting_100_Cached_Items()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get(ContentType.Id);
-            IEnumerable<Content> pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
-            ContentService.Save(pages, 0);
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                DocumentRepository repository = DocumentRepository;
-
-                // Act
-                IEnumerable<IContent> contents = repository.GetMany();
-
-                var watch = Stopwatch.StartNew();
-                IEnumerable<IContent> contentsCached = repository.GetMany();
-                watch.Stop();
-                long elapsed = watch.ElapsedMilliseconds;
-
-                Debug.Print("100 content items retrieved in {0} ms with caching", elapsed);
-
-                // Assert
-                Assert.That(contentsCached.Any(x => x.HasIdentity == false), Is.False);
-                Assert.That(contentsCached.Any(x => x == null), Is.False);
-                Assert.That(contentsCached.Count(), Is.EqualTo(contents.Count()));
-            }
-        }
-
-        [Test]
-        public void Getting_1000_Cached_Items()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get(ContentType.Id);
-            IEnumerable<Content> pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
-            ContentService.Save(pages, 0);
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                DocumentRepository repository = DocumentRepository;
-
-                // Act
-                IEnumerable<IContent> contents = repository.GetMany();
-
-                var watch = Stopwatch.StartNew();
-                IEnumerable<IContent> contentsCached = repository.GetMany();
-                watch.Stop();
-                long elapsed = watch.ElapsedMilliseconds;
-
-                Debug.Print("1000 content items retrieved in {0} ms with caching", elapsed);
-
-                // Assert
-                // Assert.That(contentsCached.Any(x => x.HasIdentity == false), Is.False);
-                // Assert.That(contentsCached.Any(x => x == null), Is.False);
-                // Assert.That(contentsCached.Count(), Is.EqualTo(contents.Count()));
-            }
-        }
-
-        public void CreateTestData()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            // Create and Save ContentType "textpage" -> ContentType.Id
-            ContentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(ContentType);
+            TestProfiler.Disable();
+            StaticApplicationLogging.Logger.LogInformation("Returned {Total} items", total.Count);
         }
     }
+
+    [Test]
+    public void Creating_100_Items()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get(ContentType.Id);
+        var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
+
+        // Act
+        var watch = Stopwatch.StartNew();
+        ContentService.Save(pages, 0);
+        watch.Stop();
+        var elapsed = watch.ElapsedMilliseconds;
+
+        Debug.Print("100 content items saved in {0} ms", elapsed);
+
+        // Assert
+        Assert.That(pages.Any(x => x.HasIdentity == false), Is.False);
+    }
+
+    [Test]
+    public void Creating_1000_Items()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get(ContentType.Id);
+        var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
+
+        // Act
+        var watch = Stopwatch.StartNew();
+        ContentService.Save(pages, 0);
+        watch.Stop();
+        var elapsed = watch.ElapsedMilliseconds;
+
+        Debug.Print("100 content items saved in {0} ms", elapsed);
+
+        // Assert
+        Assert.That(pages.Any(x => x.HasIdentity == false), Is.False);
+    }
+
+    [Test]
+    public void Getting_100_Uncached_Items()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get(ContentType.Id);
+        var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
+        ContentService.Save(pages, 0);
+
+        var provider = ScopeProvider;
+        using (var scope = provider.CreateScope())
+        {
+            var repository = DocumentRepository;
+
+            // Act
+            var watch = Stopwatch.StartNew();
+            var contents = repository.GetMany();
+            watch.Stop();
+            var elapsed = watch.ElapsedMilliseconds;
+
+            Debug.Print("100 content items retrieved in {0} ms without caching", elapsed);
+
+            // Assert
+            Assert.That(contents.Any(x => x.HasIdentity == false), Is.False);
+            Assert.That(contents.Any(x => x == null), Is.False);
+        }
+    }
+
+    [Test]
+    public void Getting_1000_Uncached_Items()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get(ContentType.Id);
+        var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
+        ContentService.Save(pages, 0);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = DocumentRepository;
+
+            // Act
+            var watch = Stopwatch.StartNew();
+            var contents = repository.GetMany();
+            watch.Stop();
+            var elapsed = watch.ElapsedMilliseconds;
+
+            Debug.Print("1000 content items retrieved in {0} ms without caching", elapsed);
+
+            // Assert
+            // Assert.That(contents.Any(x => x.HasIdentity == false), Is.False);
+            // Assert.That(contents.Any(x => x == null), Is.False);
+        }
+    }
+
+    [Test]
+    public void Getting_100_Cached_Items()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get(ContentType.Id);
+        var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 100);
+        ContentService.Save(pages, 0);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = DocumentRepository;
+
+            // Act
+            var contents = repository.GetMany();
+
+            var watch = Stopwatch.StartNew();
+            var contentsCached = repository.GetMany();
+            watch.Stop();
+            var elapsed = watch.ElapsedMilliseconds;
+
+            Debug.Print("100 content items retrieved in {0} ms with caching", elapsed);
+
+            // Assert
+            Assert.That(contentsCached.Any(x => x.HasIdentity == false), Is.False);
+            Assert.That(contentsCached.Any(x => x == null), Is.False);
+            Assert.That(contentsCached.Count(), Is.EqualTo(contents.Count()));
+        }
+    }
+
+    [Test]
+    public void Getting_1000_Cached_Items()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get(ContentType.Id);
+        var pages = ContentBuilder.CreateTextpageContent(contentType, -1, 1000);
+        ContentService.Save(pages, 0);
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = DocumentRepository;
+
+            // Act
+            var contents = repository.GetMany();
+
+            var watch = Stopwatch.StartNew();
+            var contentsCached = repository.GetMany();
+            watch.Stop();
+            var elapsed = watch.ElapsedMilliseconds;
+
+            Debug.Print("1000 content items retrieved in {0} ms with caching", elapsed);
+
+            // Assert
+            // Assert.That(contentsCached.Any(x => x.HasIdentity == false), Is.False);
+            // Assert.That(contentsCached.Any(x => x == null), Is.False);
+            // Assert.That(contentsCached.Count(), Is.EqualTo(contents.Count()));
+        }
+    }
+
+    public void CreateTestData()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        // Create and Save ContentType "textpage" -> ContentType.Id
+        ContentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(ContentType);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs
index a52b834e93..e5ef5789db 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServicePublishBranchTests.cs
@@ -5,487 +5,494 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using Constants = Umbraco.Cms.Core.Constants;
 
 // ReSharper disable CommentTypo
 // ReSharper disable StringLiteralTypo
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true,
+    WithApplication = true)]
+public class ContentServicePublishBranchTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)]
-    public class ContentServicePublishBranchTests : UmbracoIntegrationTest
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    [TestCase(1)] // use overload w/ culture: "*"
+    [TestCase(2)] // use overload w/ cultures: new [] { "*" }
+    public void Can_Publish_Invariant_Branch(int method)
     {
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        CreateTypes(out var iContentType, out _);
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        IContent iRoot = new Content("iroot", -1, iContentType);
+        iRoot.SetValue("ip", "iroot");
+        ContentService.Save(iRoot);
+        IContent ii1 = new Content("ii1", iRoot, iContentType);
+        ii1.SetValue("ip", "vii1");
+        ContentService.Save(ii1);
+        IContent ii2 = new Content("ii2", iRoot, iContentType);
+        ii2.SetValue("ip", "vii2");
+        ContentService.Save(ii2);
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        // iroot    !published   !edited
+        //  ii1     !published   !edited
+        //  ii2     !published   !edited
 
-        [TestCase(1)] // use overload w/ culture: "*"
-        [TestCase(2)] // use overload w/ cultures: new [] { "*" }
-        public void Can_Publish_Invariant_Branch(int method)
+        // !force = publishes those that are actually published, and have changes
+        // here: root (root is always published)
+        var r = SaveAndPublishInvariantBranch(iRoot, false, method).ToArray();
+
+        // not forcing, ii1 and ii2 not published yet: only root got published
+        AssertPublishResults(r, x => x.Content.Name, "iroot");
+        AssertPublishResults(r, x => x.Result, PublishResultType.SuccessPublish);
+
+        // prepare
+        ContentService.SaveAndPublish(iRoot);
+        ContentService.SaveAndPublish(ii1);
+
+        IContent ii11 = new Content("ii11", ii1, iContentType);
+        ii11.SetValue("ip", "vii11");
+        ContentService.SaveAndPublish(ii11);
+        IContent ii12 = new Content("ii12", ii1, iContentType);
+        ii11.SetValue("ip", "vii12");
+        ContentService.Save(ii12);
+
+        ContentService.SaveAndPublish(ii2);
+        IContent ii21 = new Content("ii21", ii2, iContentType);
+        ii21.SetValue("ip", "vii21");
+        ContentService.SaveAndPublish(ii21);
+        IContent ii22 = new Content("ii22", ii2, iContentType);
+        ii22.SetValue("ip", "vii22");
+        ContentService.Save(ii22);
+        ContentService.Unpublish(ii2);
+
+        // iroot    published    !edited
+        //  ii1     published    !edited
+        //    ii11  published    !edited
+        //    ii12  !published   !edited
+        //  ii2     !published   !edited
+        //    ii21  (published)  !edited
+        //    ii22  !published   !edited
+
+        // !force = publishes those that are actually published, and have changes
+        // here: nothing
+        r = SaveAndPublishInvariantBranch(iRoot, false, method).ToArray();
+
+        // not forcing, ii12 and ii2, ii21, ii22 not published yet: only root, ii1, ii11 got published
+        AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "ii11");
+        AssertPublishResults(
+            r,
+            x => x.Result,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublishAlready);
+
+        // prepare
+        iRoot.SetValue("ip", "changed");
+        ContentService.Save(iRoot);
+        ii11.SetValue("ip", "changed");
+        ContentService.Save(ii11);
+
+        // iroot    published    edited     ***
+        //  ii1     published    !edited
+        //    ii11  published    edited     ***
+        //    ii12  !published   !edited
+        //  ii2     !published   !edited
+        //    ii21  (published)  !edited
+        //    ii22  !published   !edited
+
+        // !force = publishes those that are actually published, and have changes
+        // here: iroot and ii11
+
+        // not forcing, ii12 and ii2, ii21, ii22 not published yet: only root, ii1, ii11 got published
+        r = SaveAndPublishInvariantBranch(iRoot, false, method).ToArray();
+        AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "ii11");
+        AssertPublishResults(
+            r,
+            x => x.Result,
+            PublishResultType.SuccessPublish,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublish);
+
+        // force = publishes everything that has changes
+        // here: ii12, ii2, ii22 - ii21 was published already but masked
+        r = SaveAndPublishInvariantBranch(iRoot, true, method).ToArray();
+        AssertPublishResults(
+            r,
+            x => x.Content.Name,
+            "iroot",
+            "ii1",
+            "ii11",
+            "ii12",
+            "ii2",
+            "ii21",
+            "ii22");
+        AssertPublishResults(
+            r,
+            x => x.Result,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublish,
+            PublishResultType.SuccessPublish,
+            PublishResultType.SuccessPublishAlready, // was masked
+            PublishResultType.SuccessPublish);
+
+        ii21 = ContentService.GetById(ii21.Id);
+        Assert.IsTrue(ii21.Published);
+    }
+
+    [Test]
+    public void Can_Publish_Variant_Branch_When_No_Changes_On_Root_All_Cultures()
+    {
+        CreateTypes(out _, out var vContentType);
+
+        // create/publish root
+        IContent vRoot = new Content("vroot", -1, vContentType, "de");
+        vRoot.SetCultureName("vroot.de", "de");
+        vRoot.SetCultureName("vroot.ru", "ru");
+        vRoot.SetCultureName("vroot.es", "es");
+        vRoot.SetValue("ip", "vroot");
+        vRoot.SetValue("vp", "vroot.de", "de");
+        vRoot.SetValue("vp", "vroot.ru", "ru");
+        vRoot.SetValue("vp", "vroot.es", "es");
+        ContentService.SaveAndPublish(vRoot);
+
+        // create/publish child
+        IContent iv1 = new Content("iv1", vRoot, vContentType, "de");
+        iv1.SetCultureName("iv1.de", "de");
+        iv1.SetCultureName("iv1.ru", "ru");
+        iv1.SetCultureName("iv1.es", "es");
+        iv1.SetValue("ip", "iv1");
+        iv1.SetValue("vp", "iv1.de", "de");
+        iv1.SetValue("vp", "iv1.ru", "ru");
+        iv1.SetValue("vp", "iv1.es", "es");
+        ContentService.SaveAndPublish(iv1);
+
+        // update the child
+        iv1.SetValue("vp", "UPDATED-iv1.de", "de");
+        ContentService.Save(iv1);
+
+        var r = ContentService.SaveAndPublishBranch(vRoot, false)
+            .ToArray(); // no culture specified so "*" is used, so all cultures
+        Assert.AreEqual(PublishResultType.SuccessPublishAlready, r[0].Result);
+        Assert.AreEqual(PublishResultType.SuccessPublishCulture, r[1].Result);
+    }
+
+    [Test]
+    public void Can_Publish_Variant_Branch_When_No_Changes_On_Root_Specific_Culture()
+    {
+        CreateTypes(out _, out var vContentType);
+
+        // create/publish root
+        IContent vRoot = new Content("vroot", -1, vContentType, "de");
+        vRoot.SetCultureName("vroot.de", "de");
+        vRoot.SetCultureName("vroot.ru", "ru");
+        vRoot.SetCultureName("vroot.es", "es");
+        vRoot.SetValue("ip", "vroot");
+        vRoot.SetValue("vp", "vroot.de", "de");
+        vRoot.SetValue("vp", "vroot.ru", "ru");
+        vRoot.SetValue("vp", "vroot.es", "es");
+        ContentService.SaveAndPublish(vRoot);
+
+        // create/publish child
+        IContent iv1 = new Content("iv1", vRoot, vContentType, "de");
+        iv1.SetCultureName("iv1.de", "de");
+        iv1.SetCultureName("iv1.ru", "ru");
+        iv1.SetCultureName("iv1.es", "es");
+        iv1.SetValue("ip", "iv1");
+        iv1.SetValue("vp", "iv1.de", "de");
+        iv1.SetValue("vp", "iv1.ru", "ru");
+        iv1.SetValue("vp", "iv1.es", "es");
+        ContentService.SaveAndPublish(iv1);
+
+        // update the child
+        iv1.SetValue("vp", "UPDATED-iv1.de", "de");
+        var saveResult = ContentService.Save(iv1);
+
+        var r = ContentService.SaveAndPublishBranch(vRoot, false, "de").ToArray();
+        Assert.AreEqual(PublishResultType.SuccessPublishAlready, r[0].Result);
+        Assert.AreEqual(PublishResultType.SuccessPublishCulture, r[1].Result);
+    }
+
+    [Test]
+    public void Can_Publish_Variant_Branch()
+    {
+        CreateTypes(out _, out var vContentType);
+
+        IContent vRoot = new Content("vroot", -1, vContentType, "de");
+        vRoot.SetCultureName("vroot.de", "de");
+        vRoot.SetCultureName("vroot.ru", "ru");
+        vRoot.SetCultureName("vroot.es", "es");
+        vRoot.SetValue("ip", "vroot");
+        vRoot.SetValue("vp", "vroot.de", "de");
+        vRoot.SetValue("vp", "vroot.ru", "ru");
+        vRoot.SetValue("vp", "vroot.es", "es");
+        ContentService.Save(vRoot);
+
+        IContent iv1 = new Content("iv1", vRoot, vContentType, "de");
+        iv1.SetCultureName("iv1.de", "de");
+        iv1.SetCultureName("iv1.ru", "ru");
+        iv1.SetCultureName("iv1.es", "es");
+        iv1.SetValue("ip", "iv1");
+        iv1.SetValue("vp", "iv1.de", "de");
+        iv1.SetValue("vp", "iv1.ru", "ru");
+        iv1.SetValue("vp", "iv1.es", "es");
+        ContentService.Save(iv1);
+
+        IContent iv2 = new Content("iv2", vRoot, vContentType, "de");
+        iv2.SetCultureName("iv2.de", "de");
+        iv2.SetCultureName("iv2.ru", "ru");
+        iv2.SetCultureName("iv2.es", "es");
+        iv2.SetValue("ip", "iv2");
+        iv2.SetValue("vp", "iv2.de", "de");
+        iv2.SetValue("vp", "iv2.ru", "ru");
+        iv2.SetValue("vp", "iv2.es", "es");
+        ContentService.Save(iv2);
+
+        // vroot    !published   !edited
+        //  iv1     !published   !edited
+        //  iv2     !published   !edited
+
+        // !force = publishes those that are actually published, and have changes
+        // here: nothing
+        var r = ContentService.SaveAndPublishBranch(vRoot, false).ToArray(); // no culture specified = all cultures
+
+        // not forcing, iv1 and iv2 not published yet: only root got published
+        AssertPublishResults(r, x => x.Content.Name, "vroot.de");
+        AssertPublishResults(r, x => x.Result, PublishResultType.SuccessPublishCulture);
+
+        // prepare
+        vRoot.SetValue("ip", "changed");
+        vRoot.SetValue("vp", "changed.de", "de");
+        vRoot.SetValue("vp", "changed.ru", "ru");
+        vRoot.SetValue("vp", "changed.es", "es");
+        ContentService.Save(vRoot); // now root has drafts in all cultures
+
+        ContentService.SaveAndPublish(iv1, new[] { "de", "ru" }); // now iv1 de and ru are published
+
+        iv1.SetValue("ip", "changed");
+        iv1.SetValue("vp", "changed.de", "de");
+        iv1.SetValue("vp", "changed.ru", "ru");
+        iv1.SetValue("vp", "changed.es", "es");
+        ContentService.Save(iv1); // now iv1 has drafts in all cultures
+
+        // validate - everything published for root, because no culture was specified = all
+        Assert.IsTrue(vRoot.Published);
+        Assert.IsTrue(vRoot.IsCulturePublished("de"));
+        Assert.IsTrue(vRoot.IsCulturePublished("ru"));
+        Assert.IsTrue(vRoot.IsCulturePublished("es"));
+
+        // validate - only some cultures published for iv1
+        Assert.IsTrue(iv1.Published);
+        Assert.IsTrue(iv1.IsCulturePublished("de"));
+        Assert.IsTrue(iv1.IsCulturePublished("ru"));
+        Assert.IsFalse(iv1.IsCulturePublished("es"));
+
+        r = ContentService.SaveAndPublishBranch(vRoot, false, "de").ToArray();
+
+        // not forcing, iv2 not published yet: only root and iv1 got published
+        AssertPublishResults(r, x => x.Content.Name, "vroot.de", "iv1.de");
+        AssertPublishResults(
+            r,
+            x => x.Result,
+            PublishResultType.SuccessPublishCulture,
+            PublishResultType.SuccessPublishCulture);
+
+        // reload - SaveAndPublishBranch has modified other instances
+        Reload(ref iv1);
+        Reload(ref iv2);
+
+        // validate - root
+        Assert.IsTrue(vRoot.Published);
+        Assert.IsTrue(vRoot.IsCulturePublished("de"));
+        Assert.IsFalse(vRoot.IsCultureEdited("de")); // no drafts, this was just published
+        Assert.IsTrue(vRoot.IsCulturePublished("ru"));
+        Assert.IsTrue(vRoot.IsCultureEdited("ru")); // has draft
+        Assert.IsTrue(vRoot.IsCulturePublished("es"));
+        Assert.IsTrue(vRoot.IsCultureEdited("es")); // has draft
+
+        Assert.AreEqual("changed",
+            vRoot.GetValue("ip", published: true)); // publishing de implies publishing invariants
+        Assert.AreEqual("changed.de", vRoot.GetValue("vp", "de", published: true));
+
+        // validate - de and ru are published, es has not been published
+        Assert.IsTrue(iv1.Published);
+        Assert.IsTrue(iv1.IsCulturePublished("de"));
+        Assert.IsTrue(iv1.IsCulturePublished("ru"));
+        Assert.IsFalse(iv1.IsCulturePublished("es"));
+        Assert.AreEqual("changed", iv1.GetValue("ip", published: true));
+        Assert.AreEqual("changed.de", iv1.GetValue("vp", "de", published: true));
+        Assert.AreEqual("iv1.ru", iv1.GetValue("vp", "ru", published: true));
+    }
+
+    private void Can_Publish_Mixed_Branch(out IContent iRoot, out IContent ii1, out IContent iv11)
+    {
+        // invariant root -> variant -> invariant
+        // variant root -> variant -> invariant
+        // variant root -> invariant -> variant
+        CreateTypes(out var iContentType, out var vContentType);
+
+        // invariant root -> invariant -> variant
+        iRoot = new Content("iroot", -1, iContentType);
+        iRoot.SetValue("ip", "iroot");
+        ContentService.SaveAndPublish(iRoot);
+        ii1 = new Content("ii1", iRoot, iContentType);
+        ii1.SetValue("ip", "vii1");
+        ContentService.SaveAndPublish(ii1);
+        ii1.SetValue("ip", "changed");
+        ContentService.Save(ii1);
+        iv11 = new Content("iv11.de", ii1, vContentType, "de");
+        iv11.SetValue("ip", "iv11");
+        iv11.SetValue("vp", "iv11.de", "de");
+        iv11.SetValue("vp", "iv11.ru", "ru");
+        iv11.SetValue("vp", "iv11.es", "es");
+        ContentService.Save(iv11);
+
+        iv11.SetCultureName("iv11.ru", "ru");
+        var xxx = ContentService.SaveAndPublish(iv11, new[] { "de", "ru" });
+
+        Assert.AreEqual("iv11.de", iv11.GetValue("vp", "de", published: true));
+        Assert.AreEqual("iv11.ru", iv11.GetValue("vp", "ru", published: true));
+
+        iv11.SetValue("ip", "changed");
+        iv11.SetValue("vp", "changed.de", "de");
+        iv11.SetValue("vp", "changed.ru", "ru");
+        ContentService.Save(iv11);
+    }
+
+    [Test]
+    public void Can_Publish_Mixed_Branch_1()
+    {
+        Can_Publish_Mixed_Branch(out var iRoot, out var ii1, out var iv11);
+
+        var r = ContentService.SaveAndPublishBranch(iRoot, false, "de").ToArray();
+        AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "iv11.de");
+        AssertPublishResults(
+            r,
+            x => x.Result,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublish,
+            PublishResultType.SuccessPublishCulture);
+
+        // reload - SaveAndPublishBranch has modified other instances
+        Reload(ref ii1);
+        Reload(ref iv11);
+
+        // the invariant child has been published
+        // the variant child has been published for 'de' only
+        Assert.AreEqual("changed", ii1.GetValue("ip", published: true));
+        Assert.AreEqual("changed", iv11.GetValue("ip", published: true));
+        Assert.AreEqual("changed.de", iv11.GetValue("vp", "de", published: true));
+        Assert.AreEqual("iv11.ru", iv11.GetValue("vp", "ru", published: true));
+    }
+
+    [Test]
+    public void Can_Publish_MixedBranch_2()
+    {
+        Can_Publish_Mixed_Branch(out var iRoot, out var ii1, out var iv11);
+
+        var r = ContentService.SaveAndPublishBranch(iRoot, false, new[] { "de", "ru" }).ToArray();
+        AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "iv11.de");
+        AssertPublishResults(
+            r,
+            x => x.Result,
+            PublishResultType.SuccessPublishAlready,
+            PublishResultType.SuccessPublish,
+            PublishResultType.SuccessPublishCulture);
+
+        // reload - SaveAndPublishBranch has modified other instances
+        Reload(ref ii1);
+        Reload(ref iv11);
+
+        // the invariant child has been published
+        // the variant child has been published for 'de' and 'ru'
+        Assert.AreEqual("changed", ii1.GetValue("ip", published: true));
+        Assert.AreEqual("changed", iv11.GetValue("ip", published: true));
+        Assert.AreEqual("changed.de", iv11.GetValue("vp", "de", published: true));
+        Assert.AreEqual("changed.ru", iv11.GetValue("vp", "ru", published: true));
+    }
+
+    private void AssertPublishResults<T>(PublishResult[] values, Func<PublishResult, T> getter, params T[] expected)
+    {
+        if (expected.Length != values.Length)
         {
-            CreateTypes(out IContentType iContentType, out _);
-
-            IContent iRoot = new Content("iroot", -1, iContentType);
-            iRoot.SetValue("ip", "iroot");
-            ContentService.Save(iRoot);
-            IContent ii1 = new Content("ii1", iRoot, iContentType);
-            ii1.SetValue("ip", "vii1");
-            ContentService.Save(ii1);
-            IContent ii2 = new Content("ii2", iRoot, iContentType);
-            ii2.SetValue("ip", "vii2");
-            ContentService.Save(ii2);
-
-            // iroot    !published   !edited
-            //  ii1     !published   !edited
-            //  ii2     !published   !edited
-
-            // !force = publishes those that are actually published, and have changes
-            // here: root (root is always published)
-            PublishResult[] r = SaveAndPublishInvariantBranch(iRoot, false, method).ToArray();
-
-            // not forcing, ii1 and ii2 not published yet: only root got published
-            AssertPublishResults(r, x => x.Content.Name, "iroot");
-            AssertPublishResults(r, x => x.Result, PublishResultType.SuccessPublish);
-
-            // prepare
-            ContentService.SaveAndPublish(iRoot);
-            ContentService.SaveAndPublish(ii1);
-
-            IContent ii11 = new Content("ii11", ii1, iContentType);
-            ii11.SetValue("ip", "vii11");
-            ContentService.SaveAndPublish(ii11);
-            IContent ii12 = new Content("ii12", ii1, iContentType);
-            ii11.SetValue("ip", "vii12");
-            ContentService.Save(ii12);
-
-            ContentService.SaveAndPublish(ii2);
-            IContent ii21 = new Content("ii21", ii2, iContentType);
-            ii21.SetValue("ip", "vii21");
-            ContentService.SaveAndPublish(ii21);
-            IContent ii22 = new Content("ii22", ii2, iContentType);
-            ii22.SetValue("ip", "vii22");
-            ContentService.Save(ii22);
-            ContentService.Unpublish(ii2);
-
-            // iroot    published    !edited
-            //  ii1     published    !edited
-            //    ii11  published    !edited
-            //    ii12  !published   !edited
-            //  ii2     !published   !edited
-            //    ii21  (published)  !edited
-            //    ii22  !published   !edited
-
-            // !force = publishes those that are actually published, and have changes
-            // here: nothing
-            r = SaveAndPublishInvariantBranch(iRoot, false, method).ToArray();
-
-            // not forcing, ii12 and ii2, ii21, ii22 not published yet: only root, ii1, ii11 got published
-            AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "ii11");
-            AssertPublishResults(
-                r,
-                x => x.Result,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublishAlready);
-
-            // prepare
-            iRoot.SetValue("ip", "changed");
-            ContentService.Save(iRoot);
-            ii11.SetValue("ip", "changed");
-            ContentService.Save(ii11);
-
-            // iroot    published    edited     ***
-            //  ii1     published    !edited
-            //    ii11  published    edited     ***
-            //    ii12  !published   !edited
-            //  ii2     !published   !edited
-            //    ii21  (published)  !edited
-            //    ii22  !published   !edited
-
-            // !force = publishes those that are actually published, and have changes
-            // here: iroot and ii11
-
-            // not forcing, ii12 and ii2, ii21, ii22 not published yet: only root, ii1, ii11 got published
-            r = SaveAndPublishInvariantBranch(iRoot, false, method).ToArray();
-            AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "ii11");
-            AssertPublishResults(
-                r,
-                x => x.Result,
-                PublishResultType.SuccessPublish,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublish);
-
-            // force = publishes everything that has changes
-            // here: ii12, ii2, ii22 - ii21 was published already but masked
-            r = SaveAndPublishInvariantBranch(iRoot, true, method).ToArray();
-            AssertPublishResults(
-                r,
-                x => x.Content.Name,
-                "iroot",
-                "ii1",
-                "ii11",
-                "ii12",
-                "ii2",
-                "ii21",
-                "ii22");
-            AssertPublishResults(
-                r,
-                x => x.Result,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublish,
-                PublishResultType.SuccessPublish,
-                PublishResultType.SuccessPublishAlready, // was masked
-                PublishResultType.SuccessPublish);
-
-            ii21 = ContentService.GetById(ii21.Id);
-            Assert.IsTrue(ii21.Published);
+            Console.WriteLine(string.Join(", ", values.Select(x => getter(x).ToString())));
         }
 
-        [Test]
-        public void Can_Publish_Variant_Branch_When_No_Changes_On_Root_All_Cultures()
+        Assert.AreEqual(expected.Length, values.Length);
+
+        for (var i = 0; i < values.Length; i++)
         {
-            CreateTypes(out _, out IContentType vContentType);
-
-            // create/publish root
-            IContent vRoot = new Content("vroot", -1, vContentType, "de");
-            vRoot.SetCultureName("vroot.de", "de");
-            vRoot.SetCultureName("vroot.ru", "ru");
-            vRoot.SetCultureName("vroot.es", "es");
-            vRoot.SetValue("ip", "vroot");
-            vRoot.SetValue("vp", "vroot.de", "de");
-            vRoot.SetValue("vp", "vroot.ru", "ru");
-            vRoot.SetValue("vp", "vroot.es", "es");
-            ContentService.SaveAndPublish(vRoot);
-
-            // create/publish child
-            IContent iv1 = new Content("iv1", vRoot, vContentType, "de");
-            iv1.SetCultureName("iv1.de", "de");
-            iv1.SetCultureName("iv1.ru", "ru");
-            iv1.SetCultureName("iv1.es", "es");
-            iv1.SetValue("ip", "iv1");
-            iv1.SetValue("vp", "iv1.de", "de");
-            iv1.SetValue("vp", "iv1.ru", "ru");
-            iv1.SetValue("vp", "iv1.es", "es");
-            ContentService.SaveAndPublish(iv1);
-
-            // update the child
-            iv1.SetValue("vp", "UPDATED-iv1.de", "de");
-            ContentService.Save(iv1);
-
-            PublishResult[] r = ContentService.SaveAndPublishBranch(vRoot, false).ToArray(); // no culture specified so "*" is used, so all cultures
-            Assert.AreEqual(PublishResultType.SuccessPublishAlready, r[0].Result);
-            Assert.AreEqual(PublishResultType.SuccessPublishCulture, r[1].Result);
-        }
-
-        [Test]
-        public void Can_Publish_Variant_Branch_When_No_Changes_On_Root_Specific_Culture()
-        {
-            CreateTypes(out _, out IContentType vContentType);
-
-            // create/publish root
-            IContent vRoot = new Content("vroot", -1, vContentType, "de");
-            vRoot.SetCultureName("vroot.de", "de");
-            vRoot.SetCultureName("vroot.ru", "ru");
-            vRoot.SetCultureName("vroot.es", "es");
-            vRoot.SetValue("ip", "vroot");
-            vRoot.SetValue("vp", "vroot.de", "de");
-            vRoot.SetValue("vp", "vroot.ru", "ru");
-            vRoot.SetValue("vp", "vroot.es", "es");
-            ContentService.SaveAndPublish(vRoot);
-
-            // create/publish child
-            IContent iv1 = new Content("iv1", vRoot, vContentType, "de");
-            iv1.SetCultureName("iv1.de", "de");
-            iv1.SetCultureName("iv1.ru", "ru");
-            iv1.SetCultureName("iv1.es", "es");
-            iv1.SetValue("ip", "iv1");
-            iv1.SetValue("vp", "iv1.de", "de");
-            iv1.SetValue("vp", "iv1.ru", "ru");
-            iv1.SetValue("vp", "iv1.es", "es");
-            ContentService.SaveAndPublish(iv1);
-
-            // update the child
-            iv1.SetValue("vp", "UPDATED-iv1.de", "de");
-            OperationResult saveResult = ContentService.Save(iv1);
-
-            PublishResult[] r = ContentService.SaveAndPublishBranch(vRoot, false, "de").ToArray();
-            Assert.AreEqual(PublishResultType.SuccessPublishAlready, r[0].Result);
-            Assert.AreEqual(PublishResultType.SuccessPublishCulture, r[1].Result);
-        }
-
-        [Test]
-        public void Can_Publish_Variant_Branch()
-        {
-            CreateTypes(out _, out IContentType vContentType);
-
-            IContent vRoot = new Content("vroot", -1, vContentType, "de");
-            vRoot.SetCultureName("vroot.de", "de");
-            vRoot.SetCultureName("vroot.ru", "ru");
-            vRoot.SetCultureName("vroot.es", "es");
-            vRoot.SetValue("ip", "vroot");
-            vRoot.SetValue("vp", "vroot.de", "de");
-            vRoot.SetValue("vp", "vroot.ru", "ru");
-            vRoot.SetValue("vp", "vroot.es", "es");
-            ContentService.Save(vRoot);
-
-            IContent iv1 = new Content("iv1", vRoot, vContentType, "de");
-            iv1.SetCultureName("iv1.de", "de");
-            iv1.SetCultureName("iv1.ru", "ru");
-            iv1.SetCultureName("iv1.es", "es");
-            iv1.SetValue("ip", "iv1");
-            iv1.SetValue("vp", "iv1.de", "de");
-            iv1.SetValue("vp", "iv1.ru", "ru");
-            iv1.SetValue("vp", "iv1.es", "es");
-            ContentService.Save(iv1);
-
-            IContent iv2 = new Content("iv2", vRoot, vContentType, "de");
-            iv2.SetCultureName("iv2.de", "de");
-            iv2.SetCultureName("iv2.ru", "ru");
-            iv2.SetCultureName("iv2.es", "es");
-            iv2.SetValue("ip", "iv2");
-            iv2.SetValue("vp", "iv2.de", "de");
-            iv2.SetValue("vp", "iv2.ru", "ru");
-            iv2.SetValue("vp", "iv2.es", "es");
-            ContentService.Save(iv2);
-
-            // vroot    !published   !edited
-            //  iv1     !published   !edited
-            //  iv2     !published   !edited
-
-            // !force = publishes those that are actually published, and have changes
-            // here: nothing
-            PublishResult[] r = ContentService.SaveAndPublishBranch(vRoot, false).ToArray(); // no culture specified = all cultures
-
-            // not forcing, iv1 and iv2 not published yet: only root got published
-            AssertPublishResults(r, x => x.Content.Name, "vroot.de");
-            AssertPublishResults(r, x => x.Result, PublishResultType.SuccessPublishCulture);
-
-            // prepare
-            vRoot.SetValue("ip", "changed");
-            vRoot.SetValue("vp", "changed.de", "de");
-            vRoot.SetValue("vp", "changed.ru", "ru");
-            vRoot.SetValue("vp", "changed.es", "es");
-            ContentService.Save(vRoot); // now root has drafts in all cultures
-
-            ContentService.SaveAndPublish(iv1, new[] { "de", "ru" }); // now iv1 de and ru are published
-
-            iv1.SetValue("ip", "changed");
-            iv1.SetValue("vp", "changed.de", "de");
-            iv1.SetValue("vp", "changed.ru", "ru");
-            iv1.SetValue("vp", "changed.es", "es");
-            ContentService.Save(iv1); // now iv1 has drafts in all cultures
-
-            // validate - everything published for root, because no culture was specified = all
-            Assert.IsTrue(vRoot.Published);
-            Assert.IsTrue(vRoot.IsCulturePublished("de"));
-            Assert.IsTrue(vRoot.IsCulturePublished("ru"));
-            Assert.IsTrue(vRoot.IsCulturePublished("es"));
-
-            // validate - only some cultures published for iv1
-            Assert.IsTrue(iv1.Published);
-            Assert.IsTrue(iv1.IsCulturePublished("de"));
-            Assert.IsTrue(iv1.IsCulturePublished("ru"));
-            Assert.IsFalse(iv1.IsCulturePublished("es"));
-
-            r = ContentService.SaveAndPublishBranch(vRoot, false, "de").ToArray();
-
-            // not forcing, iv2 not published yet: only root and iv1 got published
-            AssertPublishResults(r, x => x.Content.Name, "vroot.de", "iv1.de");
-            AssertPublishResults(
-                r,
-                x => x.Result,
-                PublishResultType.SuccessPublishCulture,
-                PublishResultType.SuccessPublishCulture);
-
-            // reload - SaveAndPublishBranch has modified other instances
-            Reload(ref iv1);
-            Reload(ref iv2);
-
-            // validate - root
-            Assert.IsTrue(vRoot.Published);
-            Assert.IsTrue(vRoot.IsCulturePublished("de"));
-            Assert.IsFalse(vRoot.IsCultureEdited("de"));    // no drafts, this was just published
-            Assert.IsTrue(vRoot.IsCulturePublished("ru"));
-            Assert.IsTrue(vRoot.IsCultureEdited("ru"));     // has draft
-            Assert.IsTrue(vRoot.IsCulturePublished("es"));
-            Assert.IsTrue(vRoot.IsCultureEdited("es"));     // has draft
-
-            Assert.AreEqual("changed", vRoot.GetValue("ip", published: true)); // publishing de implies publishing invariants
-            Assert.AreEqual("changed.de", vRoot.GetValue("vp", "de", published: true));
-
-            // validate - de and ru are published, es has not been published
-            Assert.IsTrue(iv1.Published);
-            Assert.IsTrue(iv1.IsCulturePublished("de"));
-            Assert.IsTrue(iv1.IsCulturePublished("ru"));
-            Assert.IsFalse(iv1.IsCulturePublished("es"));
-            Assert.AreEqual("changed", iv1.GetValue("ip", published: true));
-            Assert.AreEqual("changed.de", iv1.GetValue("vp", "de", published: true));
-            Assert.AreEqual("iv1.ru", iv1.GetValue("vp", "ru", published: true));
-        }
-
-        private void Can_Publish_Mixed_Branch(out IContent iRoot, out IContent ii1, out IContent iv11)
-        {
-            // invariant root -> variant -> invariant
-            // variant root -> variant -> invariant
-            // variant root -> invariant -> variant
-            CreateTypes(out IContentType iContentType, out IContentType vContentType);
-
-            // invariant root -> invariant -> variant
-            iRoot = new Content("iroot", -1, iContentType);
-            iRoot.SetValue("ip", "iroot");
-            ContentService.SaveAndPublish(iRoot);
-            ii1 = new Content("ii1", iRoot, iContentType);
-            ii1.SetValue("ip", "vii1");
-            ContentService.SaveAndPublish(ii1);
-            ii1.SetValue("ip", "changed");
-            ContentService.Save(ii1);
-            iv11 = new Content("iv11.de", ii1, vContentType, "de");
-            iv11.SetValue("ip", "iv11");
-            iv11.SetValue("vp", "iv11.de", "de");
-            iv11.SetValue("vp", "iv11.ru", "ru");
-            iv11.SetValue("vp", "iv11.es", "es");
-            ContentService.Save(iv11);
-
-            iv11.SetCultureName("iv11.ru", "ru");
-            PublishResult xxx = ContentService.SaveAndPublish(iv11, new[] { "de", "ru" });
-
-            Assert.AreEqual("iv11.de", iv11.GetValue("vp", "de", published: true));
-            Assert.AreEqual("iv11.ru", iv11.GetValue("vp", "ru", published: true));
-
-            iv11.SetValue("ip", "changed");
-            iv11.SetValue("vp", "changed.de", "de");
-            iv11.SetValue("vp", "changed.ru", "ru");
-            ContentService.Save(iv11);
-        }
-
-        [Test]
-        public void Can_Publish_Mixed_Branch_1()
-        {
-            Can_Publish_Mixed_Branch(out IContent iRoot, out IContent ii1, out IContent iv11);
-
-            PublishResult[] r = ContentService.SaveAndPublishBranch(iRoot, false, "de").ToArray();
-            AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "iv11.de");
-            AssertPublishResults(
-                r,
-                x => x.Result,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublish,
-                PublishResultType.SuccessPublishCulture);
-
-            // reload - SaveAndPublishBranch has modified other instances
-            Reload(ref ii1);
-            Reload(ref iv11);
-
-            // the invariant child has been published
-            // the variant child has been published for 'de' only
-            Assert.AreEqual("changed", ii1.GetValue("ip", published: true));
-            Assert.AreEqual("changed", iv11.GetValue("ip", published: true));
-            Assert.AreEqual("changed.de", iv11.GetValue("vp", "de", published: true));
-            Assert.AreEqual("iv11.ru", iv11.GetValue("vp", "ru", published: true));
-        }
-
-        [Test]
-        public void Can_Publish_MixedBranch_2()
-        {
-            Can_Publish_Mixed_Branch(out IContent iRoot, out IContent ii1, out IContent iv11);
-
-            PublishResult[] r = ContentService.SaveAndPublishBranch(iRoot, false, new[] { "de", "ru" }).ToArray();
-            AssertPublishResults(r, x => x.Content.Name, "iroot", "ii1", "iv11.de");
-            AssertPublishResults(
-                r,
-                x => x.Result,
-                PublishResultType.SuccessPublishAlready,
-                PublishResultType.SuccessPublish,
-                PublishResultType.SuccessPublishCulture);
-
-            // reload - SaveAndPublishBranch has modified other instances
-            Reload(ref ii1);
-            Reload(ref iv11);
-
-            // the invariant child has been published
-            // the variant child has been published for 'de' and 'ru'
-            Assert.AreEqual("changed", ii1.GetValue("ip", published: true));
-            Assert.AreEqual("changed", iv11.GetValue("ip", published: true));
-            Assert.AreEqual("changed.de", iv11.GetValue("vp", "de", published: true));
-            Assert.AreEqual("changed.ru", iv11.GetValue("vp", "ru", published: true));
-        }
-
-        private void AssertPublishResults<T>(PublishResult[] values, Func<PublishResult, T> getter, params T[] expected)
-        {
-            if (expected.Length != values.Length)
-            {
-                Console.WriteLine(string.Join(", ", values.Select(x => getter(x).ToString())));
-            }
-
-            Assert.AreEqual(expected.Length, values.Length);
-
-            for (int i = 0; i < values.Length; i++)
-            {
-                T value = getter(values[i]);
-                Assert.AreEqual(expected[i], value, $"Expected {expected[i]} at {i} but got {value}.");
-            }
-        }
-
-        private void Reload(ref IContent document)
-            => document = ContentService.GetById(document.Id);
-
-        private void CreateTypes(out IContentType iContentType, out IContentType vContentType)
-        {
-            var langDe = new Language("de", "German")
-            {
-                IsDefault = true
-            };
-            LocalizationService.Save(langDe);
-            var langRu = new Language("ru", "Russian");
-            LocalizationService.Save(langRu);
-            var langEs = new Language("es", "Spanish");
-            LocalizationService.Save(langEs);
-
-            iContentType = new ContentType(ShortStringHelper, -1)
-            {
-                Alias = "ict",
-                Name = "Invariant Content Type",
-                Variations = ContentVariation.Nothing
-            };
-            iContentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar, "ip") { Variations = ContentVariation.Nothing });
-            ContentTypeService.Save(iContentType);
-
-            vContentType = new ContentType(ShortStringHelper, -1)
-            {
-                Alias = "vct",
-                Name = "Variant Content Type",
-                Variations = ContentVariation.Culture
-            };
-            vContentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar, "ip") { Variations = ContentVariation.Nothing });
-            vContentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar, "vp") { Variations = ContentVariation.Culture });
-            ContentTypeService.Save(vContentType);
-        }
-
-        private IEnumerable<PublishResult> SaveAndPublishInvariantBranch(IContent content, bool force, int method)
-        {
-            // ReSharper disable RedundantArgumentDefaultValue
-            // ReSharper disable ArgumentsStyleOther
-            switch (method)
-            {
-                case 1:
-                    return ContentService.SaveAndPublishBranch(content, force, culture: "*");
-                case 2:
-                    return ContentService.SaveAndPublishBranch(content, force, cultures: new[] { "*" });
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(method));
-            }
-
-            // ReSharper restore RedundantArgumentDefaultValue
-            // ReSharper restore ArgumentsStyleOther
+            var value = getter(values[i]);
+            Assert.AreEqual(expected[i], value, $"Expected {expected[i]} at {i} but got {value}.");
         }
     }
+
+    private void Reload(ref IContent document)
+        => document = ContentService.GetById(document.Id);
+
+    private void CreateTypes(out IContentType iContentType, out IContentType vContentType)
+    {
+        var langDe = new Language("de", "German") { IsDefault = true };
+        LocalizationService.Save(langDe);
+        var langRu = new Language("ru", "Russian");
+        LocalizationService.Save(langRu);
+        var langEs = new Language("es", "Spanish");
+        LocalizationService.Save(langEs);
+
+        iContentType = new ContentType(ShortStringHelper, -1)
+        {
+            Alias = "ict",
+            Name = "Invariant Content Type",
+            Variations = ContentVariation.Nothing
+        };
+        iContentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar,
+                "ip")
+            { Variations = ContentVariation.Nothing });
+        ContentTypeService.Save(iContentType);
+
+        vContentType = new ContentType(ShortStringHelper, -1)
+        {
+            Alias = "vct",
+            Name = "Variant Content Type",
+            Variations = ContentVariation.Culture
+        };
+        vContentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar,
+                "ip")
+            { Variations = ContentVariation.Nothing });
+        vContentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Nvarchar,
+                "vp")
+            { Variations = ContentVariation.Culture });
+        ContentTypeService.Save(vContentType);
+    }
+
+    private IEnumerable<PublishResult> SaveAndPublishInvariantBranch(IContent content, bool force, int method)
+    {
+        // ReSharper disable RedundantArgumentDefaultValue
+        // ReSharper disable ArgumentsStyleOther
+        switch (method)
+        {
+            case 1:
+                return ContentService.SaveAndPublishBranch(content, force, "*");
+            case 2:
+                return ContentService.SaveAndPublishBranch(content, force, cultures: new[] { "*" });
+            default:
+                throw new ArgumentOutOfRangeException(nameof(method));
+        }
+
+        // ReSharper restore RedundantArgumentDefaultValue
+        // ReSharper restore ArgumentsStyleOther
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs
index 2412fca3e0..25e7aa1009 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTagsTests.cs
@@ -2,12 +2,10 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
@@ -17,769 +15,824 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(
+    Database = UmbracoTestOptions.Database.NewSchemaPerTest,
+    PublishedRepositoryEvents = true,
+    WithApplication = true,
+    Logger = UmbracoTestOptions.Logger.Console)]
+public class ContentServiceTagsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(
-        Database = UmbracoTestOptions.Database.NewSchemaPerTest,
-        PublishedRepositoryEvents = true,
-        WithApplication = true,
-        Logger = UmbracoTestOptions.Logger.Console)]
-    public class ContentServiceTagsTests : UmbracoIntegrationTest
+    [SetUp]
+    public void Setup() => ContentRepositoryBase.ThrowOnWarning = true;
+
+    [TearDown]
+    public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private ITagService TagService => GetRequiredService<ITagService>();
+
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IJsonSerializer Serializer => GetRequiredService<IJsonSerializer>();
+
+    public PropertyEditorCollection PropertyEditorCollection => GetRequiredService<PropertyEditorCollection>();
+
+    [Test]
+    public void TagsCanBeInvariant()
     {
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
 
-        private ITagService TagService => GetRequiredService<ITagService>();
+        IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" });
+        ContentService.SaveAndPublish(content1);
 
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+        content1 = ContentService.GetById(content1.Id);
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        var enTags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer)
+            .ToArray();
+        Assert.AreEqual(4, enTags.Length);
+        Assert.Contains("one", enTags);
+        Assert.AreEqual(-1, enTags.IndexOf("plus"));
 
-        private IFileService FileService => GetRequiredService<IFileService>();
-
-        private IJsonSerializer Serializer => GetRequiredService<IJsonSerializer>();
-
-        public PropertyEditorCollection PropertyEditorCollection => GetRequiredService<PropertyEditorCollection>();
-
-        [SetUp]
-        public void Setup() => ContentRepositoryBase.ThrowOnWarning = true;
-
-        [TearDown]
-        public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
-
-        [Test]
-        public void TagsCanBeInvariant()
+        var tagGroups = TagService.GetAllTags().GroupBy(x => x.LanguageId);
+        foreach (var tag in TagService.GetAllTags())
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" });
-            ContentService.SaveAndPublish(content1);
-
-            content1 = ContentService.GetById(content1.Id);
-
-            string[] enTags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer).ToArray();
-            Assert.AreEqual(4, enTags.Length);
-            Assert.Contains("one", enTags);
-            Assert.AreEqual(-1, enTags.IndexOf("plus"));
-
-            IEnumerable<IGrouping<int?, ITag>> tagGroups = TagService.GetAllTags().GroupBy(x => x.LanguageId);
-            foreach (ITag tag in TagService.GetAllTags())
-            {
-                Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
-            }
-
-            Assert.AreEqual(1, tagGroups.Count());
-            IGrouping<int?, ITag> enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
-            Assert.IsNotNull(enTagGroup);
-            Assert.AreEqual(4, enTagGroup.Count());
-            Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
-            Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+            Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
         }
 
-        [Test]
-        public void TagsCanBeVariant()
+        Assert.AreEqual(1, tagGroups.Count());
+        var enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
+        Assert.IsNotNull(enTagGroup);
+        Assert.AreEqual(4, enTagGroup.Count());
+        Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
+        Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+    }
+
+    [Test]
+    public void TagsCanBeVariant()
+    {
+        var languageService = LocalizationService;
+        var language = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        LocalizationService.Save(language); // en-US is already there
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
+        ContentTypeService.Save(contentType);
+
+        IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.SetCultureName("name-fr", "fr-FR");
+        content1.SetCultureName("name-en", "en-US");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" }, culture: "en-US");
+        ContentService.SaveAndPublish(content1);
+
+        content1 = ContentService.GetById(content1.Id);
+
+        var frTags = content1.Properties["tags"]
+            .GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "fr-FR").ToArray();
+        Assert.AreEqual(5, frTags.Length);
+        Assert.Contains("plus", frTags);
+        Assert.AreEqual(-1, frTags.IndexOf("one"));
+
+        var enTags = content1.Properties["tags"]
+            .GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US").ToArray();
+        Assert.AreEqual(4, enTags.Length);
+        Assert.Contains("one", enTags);
+        Assert.AreEqual(-1, enTags.IndexOf("plus"));
+
+        var tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
+        foreach (var tag in TagService.GetAllTags())
         {
-            ILocalizationService languageService = LocalizationService;
-            ILanguage language = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            LocalizationService.Save(language); // en-US is already there
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
-            ContentTypeService.Save(contentType);
-
-            IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.SetCultureName("name-fr", "fr-FR");
-            content1.SetCultureName("name-en", "en-US");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" }, culture: "en-US");
-            ContentService.SaveAndPublish(content1);
-
-            content1 = ContentService.GetById(content1.Id);
-
-            string[] frTags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "fr-FR").ToArray();
-            Assert.AreEqual(5, frTags.Length);
-            Assert.Contains("plus", frTags);
-            Assert.AreEqual(-1, frTags.IndexOf("one"));
-
-            string[] enTags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US").ToArray();
-            Assert.AreEqual(4, enTags.Length);
-            Assert.Contains("one", enTags);
-            Assert.AreEqual(-1, enTags.IndexOf("plus"));
-
-            IEnumerable<IGrouping<int?, ITag>> tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
-            foreach (ITag tag in TagService.GetAllTags())
-            {
-                Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
-            }
-
-            Assert.AreEqual(2, tagGroups.Count());
-            IGrouping<int?, ITag> frTagGroup = tagGroups.FirstOrDefault(x => x.Key == 2);
-            Assert.IsNotNull(frTagGroup);
-            Assert.AreEqual(5, frTagGroup.Count());
-            Assert.IsTrue(frTagGroup.Any(x => x.Text == "plus"));
-            Assert.IsFalse(frTagGroup.Any(x => x.Text == "one"));
-            IGrouping<int?, ITag> enTagGroup = tagGroups.FirstOrDefault(x => x.Key == 1);
-            Assert.IsNotNull(enTagGroup);
-            Assert.AreEqual(4, enTagGroup.Count());
-            Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
-            Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+            Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
         }
 
-        [Test]
-        public void TagsCanBecomeVariant()
+        Assert.AreEqual(2, tagGroups.Count());
+        var frTagGroup = tagGroups.FirstOrDefault(x => x.Key == 2);
+        Assert.IsNotNull(frTagGroup);
+        Assert.AreEqual(5, frTagGroup.Count());
+        Assert.IsTrue(frTagGroup.Any(x => x.Text == "plus"));
+        Assert.IsFalse(frTagGroup.Any(x => x.Text == "one"));
+        var enTagGroup = tagGroups.FirstOrDefault(x => x.Key == 1);
+        Assert.IsNotNull(enTagGroup);
+        Assert.AreEqual(4, enTagGroup.Count());
+        Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
+        Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+    }
+
+    [Test]
+    public void TagsCanBecomeVariant()
+    {
+        var enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        var propertyType = CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" });
+        ContentService.SaveAndPublish(content1);
+
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        // no changes
+        content1 = ContentService.GetById(content1.Id);
+
+        var tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer)
+            .ToArray();
+        Assert.AreEqual(4, tags.Length);
+        Assert.Contains("one", tags);
+        Assert.AreEqual(-1, tags.IndexOf("plus"));
+
+        var tagGroups = TagService.GetAllTags().GroupBy(x => x.LanguageId);
+        foreach (var tag in TagService.GetAllTags())
         {
-            int enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            PropertyType propertyType = CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" });
-            ContentService.SaveAndPublish(content1);
-
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            // no changes
-            content1 = ContentService.GetById(content1.Id);
-
-            string[] tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer).ToArray();
-            Assert.AreEqual(4, tags.Length);
-            Assert.Contains("one", tags);
-            Assert.AreEqual(-1, tags.IndexOf("plus"));
-
-            IEnumerable<IGrouping<int?, ITag>> tagGroups = TagService.GetAllTags().GroupBy(x => x.LanguageId);
-            foreach (ITag tag in TagService.GetAllTags())
-            {
-                Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
-            }
-
-            Assert.AreEqual(1, tagGroups.Count());
-            IGrouping<int?, ITag> enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
-            Assert.IsNotNull(enTagGroup);
-            Assert.AreEqual(4, enTagGroup.Count());
-            Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
-            Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
-
-            propertyType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            // changes
-            content1 = ContentService.GetById(content1.Id);
-
-            // property value has been moved from invariant to en-US
-            tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer).ToArray();
-            Assert.IsEmpty(tags);
-
-            tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US").ToArray();
-            Assert.AreEqual(4, tags.Length);
-            Assert.Contains("one", tags);
-            Assert.AreEqual(-1, tags.IndexOf("plus"));
-
-            // tags have been copied from invariant to en-US
-            tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
-            foreach (ITag tag in TagService.GetAllTags("*"))
-            {
-                Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
-            }
-
-            Assert.AreEqual(1, tagGroups.Count());
-
-            enTagGroup = tagGroups.FirstOrDefault(x => x.Key == enId);
-            Assert.IsNotNull(enTagGroup);
-            Assert.AreEqual(4, enTagGroup.Count());
-            Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
-            Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+            Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
         }
 
-        [Test]
-        public void TagsCanBecomeInvariant()
+        Assert.AreEqual(1, tagGroups.Count());
+        var enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
+        Assert.IsNotNull(enTagGroup);
+        Assert.AreEqual(4, enTagGroup.Count());
+        Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
+        Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+
+        propertyType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        // changes
+        content1 = ContentService.GetById(content1.Id);
+
+        // property value has been moved from invariant to en-US
+        tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer)
+            .ToArray();
+        Assert.IsEmpty(tags);
+
+        tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US")
+            .ToArray();
+        Assert.AreEqual(4, tags.Length);
+        Assert.Contains("one", tags);
+        Assert.AreEqual(-1, tags.IndexOf("plus"));
+
+        // tags have been copied from invariant to en-US
+        tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
+        foreach (var tag in TagService.GetAllTags("*"))
         {
-            ILanguage language = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            LocalizationService.Save(language); // en-US is already there
-
-            int enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
-            ContentTypeService.Save(contentType);
-
-            IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.SetCultureName("name-fr", "fr-FR");
-            content1.SetCultureName("name-en", "en-US");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" }, culture: "en-US");
-            ContentService.SaveAndPublish(content1);
-
-            contentType.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(contentType);
-
-            // changes
-            content1 = ContentService.GetById(content1.Id);
-
-            // property value has been moved from en-US to invariant, fr-FR tags are gone
-            Assert.IsEmpty(content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "fr-FR"));
-            Assert.IsEmpty(content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US"));
-
-            string[] tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer).ToArray();
-            Assert.AreEqual(4, tags.Length);
-            Assert.Contains("one", tags);
-            Assert.AreEqual(-1, tags.IndexOf("plus"));
-
-            // tags have been copied from en-US to invariant, fr-FR tags are gone
-            IEnumerable<IGrouping<int?, ITag>> tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
-            foreach (ITag tag in TagService.GetAllTags("*"))
-            {
-                Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
-            }
-
-            Assert.AreEqual(1, tagGroups.Count());
-
-            IGrouping<int?, ITag> enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
-            Assert.IsNotNull(enTagGroup);
-            Assert.AreEqual(4, enTagGroup.Count());
-            Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
-            Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+            Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
         }
 
-        [Test]
-        public void TagsCanBecomeInvariant2()
+        Assert.AreEqual(1, tagGroups.Count());
+
+        enTagGroup = tagGroups.FirstOrDefault(x => x.Key == enId);
+        Assert.IsNotNull(enTagGroup);
+        Assert.AreEqual(4, enTagGroup.Count());
+        Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
+        Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+    }
+
+    [Test]
+    public void TagsCanBecomeInvariant()
+    {
+        var language = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        LocalizationService.Save(language); // en-US is already there
+
+        var enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
+        ContentTypeService.Save(contentType);
+
+        IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.SetCultureName("name-fr", "fr-FR");
+        content1.SetCultureName("name-en", "en-US");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" }, culture: "en-US");
+        ContentService.SaveAndPublish(content1);
+
+        contentType.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(contentType);
+
+        // changes
+        content1 = ContentService.GetById(content1.Id);
+
+        // property value has been moved from en-US to invariant, fr-FR tags are gone
+        Assert.IsEmpty(content1.Properties["tags"]
+            .GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "fr-FR"));
+        Assert.IsEmpty(content1.Properties["tags"]
+            .GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US"));
+
+        var tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer)
+            .ToArray();
+        Assert.AreEqual(4, tags.Length);
+        Assert.Contains("one", tags);
+        Assert.AreEqual(-1, tags.IndexOf("plus"));
+
+        // tags have been copied from en-US to invariant, fr-FR tags are gone
+        var tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
+        foreach (var tag in TagService.GetAllTags("*"))
         {
-            ILanguage language = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            LocalizationService.Save(language); // en-US is already there
-
-            int enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            PropertyType propertyType = CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
-            ContentTypeService.Save(contentType);
-
-            IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.SetCultureName("name-fr", "fr-FR");
-            content1.SetCultureName("name-en", "en-US");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" }, culture: "en-US");
-            ContentService.SaveAndPublish(content1);
-
-            IContent content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", -1);
-            content2.SetCultureName("name-fr", "fr-FR");
-            content2.SetCultureName("name-en", "en-US");
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" }, culture: "en-US");
-            ContentService.SaveAndPublish(content2);
-
-            //// pretend we already have invariant values
-            // using (var scope = ScopeProvider.CreateScope())
-            // {
-            //    scope.Database.Execute("INSERT INTO [cmsTags] ([tag], [group], [languageId]) SELECT DISTINCT [tag], [group], NULL FROM [cmsTags] WHERE [languageId] IS NOT NULL");
-            // }
-
-            // this should work
-            propertyType.Variations = ContentVariation.Nothing;
-            Assert.DoesNotThrow(() => ContentTypeService.Save(contentType));
+            Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
         }
 
-        [Test]
-        public void TagsCanBecomeInvariantByPropertyType()
+        Assert.AreEqual(1, tagGroups.Count());
+
+        var enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
+        Assert.IsNotNull(enTagGroup);
+        Assert.AreEqual(4, enTagGroup.Count());
+        Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
+        Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+    }
+
+    [Test]
+    public void TagsCanBecomeInvariant2()
+    {
+        var language = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        LocalizationService.Save(language); // en-US is already there
+
+        var enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        var propertyType = CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
+        ContentTypeService.Save(contentType);
+
+        IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.SetCultureName("name-fr", "fr-FR");
+        content1.SetCultureName("name-en", "en-US");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" }, culture: "en-US");
+        ContentService.SaveAndPublish(content1);
+
+        IContent content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2");
+        content2.SetCultureName("name-fr", "fr-FR");
+        content2.SetCultureName("name-en", "en-US");
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" }, culture: "en-US");
+        ContentService.SaveAndPublish(content2);
+
+        //// pretend we already have invariant values
+        // using (var scope = ScopeProvider.CreateScope())
+        // {
+        //    scope.Database.Execute("INSERT INTO [cmsTags] ([tag], [group], [languageId]) SELECT DISTINCT [tag], [group], NULL FROM [cmsTags] WHERE [languageId] IS NOT NULL");
+        // }
+
+        // this should work
+        propertyType.Variations = ContentVariation.Nothing;
+        Assert.DoesNotThrow(() => ContentTypeService.Save(contentType));
+    }
+
+    [Test]
+    public void TagsCanBecomeInvariantByPropertyType()
+    {
+        var language = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        LocalizationService.Save(language); // en-US is already there
+
+        var enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        var propertyType = CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
+        ContentTypeService.Save(contentType);
+
+        IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.SetCultureName("name-fr", "fr-FR");
+        content1.SetCultureName("name-en", "en-US");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" }, culture: "en-US");
+        ContentService.SaveAndPublish(content1);
+
+        propertyType.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(contentType);
+
+        // changes
+        content1 = ContentService.GetById(content1.Id);
+
+        // property value has been moved from en-US to invariant, fr-FR tags are gone
+        Assert.IsEmpty(content1.Properties["tags"]
+            .GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "fr-FR"));
+        Assert.IsEmpty(content1.Properties["tags"]
+            .GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US"));
+
+        var tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer)
+            .ToArray();
+        Assert.AreEqual(4, tags.Length);
+        Assert.Contains("one", tags);
+        Assert.AreEqual(-1, tags.IndexOf("plus"));
+
+        // tags have been copied from en-US to invariant, fr-FR tags are gone
+        var tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
+        foreach (var tag in TagService.GetAllTags("*"))
         {
-            ILanguage language = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            LocalizationService.Save(language); // en-US is already there
-
-            int enId = LocalizationService.GetLanguageIdByIsoCode("en-US").Value;
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            PropertyType propertyType = CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
-            ContentTypeService.Save(contentType);
-
-            IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.SetCultureName("name-fr", "fr-FR");
-            content1.SetCultureName("name-en", "en-US");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" }, culture: "en-US");
-            ContentService.SaveAndPublish(content1);
-
-            propertyType.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(contentType);
-
-            // changes
-            content1 = ContentService.GetById(content1.Id);
-
-            // property value has been moved from en-US to invariant, fr-FR tags are gone
-            Assert.IsEmpty(content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "fr-FR"));
-            Assert.IsEmpty(content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer, "en-US"));
-
-            string[] tags = content1.Properties["tags"].GetTagsValue(PropertyEditorCollection, DataTypeService, Serializer).ToArray();
-            Assert.AreEqual(4, tags.Length);
-            Assert.Contains("one", tags);
-            Assert.AreEqual(-1, tags.IndexOf("plus"));
-
-            // tags have been copied from en-US to invariant, fr-FR tags are gone
-            IEnumerable<IGrouping<int?, ITag>> tagGroups = TagService.GetAllTags(culture: "*").GroupBy(x => x.LanguageId);
-            foreach (ITag tag in TagService.GetAllTags("*"))
-            {
-                Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
-            }
-
-            Assert.AreEqual(1, tagGroups.Count());
-
-            IGrouping<int?, ITag> enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
-            Assert.IsNotNull(enTagGroup);
-            Assert.AreEqual(4, enTagGroup.Count());
-            Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
-            Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+            Console.WriteLine($"{tag.Group}:{tag.Text} {tag.LanguageId}");
         }
 
-        [Test]
-        public void TagsCanBecomeInvariantByPropertyTypeAndBackToVariant()
+        Assert.AreEqual(1, tagGroups.Count());
+
+        var enTagGroup = tagGroups.FirstOrDefault(x => x.Key == null);
+        Assert.IsNotNull(enTagGroup);
+        Assert.AreEqual(4, enTagGroup.Count());
+        Assert.IsTrue(enTagGroup.Any(x => x.Text == "one"));
+        Assert.IsFalse(enTagGroup.Any(x => x.Text == "plus"));
+    }
+
+    [Test]
+    public void TagsCanBecomeInvariantByPropertyTypeAndBackToVariant()
+    {
+        var language = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        LocalizationService.Save(language); // en-US is already there
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        var propertyType = CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
+        ContentTypeService.Save(contentType);
+
+        IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.SetCultureName("name-fr", "fr-FR");
+        content1.SetCultureName("name-en", "en-US");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "another", "one" }, culture: "en-US");
+        ContentService.SaveAndPublish(content1);
+
+        propertyType.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(contentType);
+
+        // FIXME: This throws due to index violations
+        propertyType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        // TODO: Assert results
+    }
+
+    [Test]
+    public void TagsAreUpdatedWhenContentIsTrashedAndUnTrashed_One()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        var content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" });
+        ContentService.SaveAndPublish(content1);
+
+        var content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2");
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content2);
+
+        // verify
+        var tags = TagService.GetTagsForEntity(content1.Id);
+        Assert.AreEqual(5, tags.Count());
+        var allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(5, allTags.Count());
+
+        ContentService.MoveToRecycleBin(content1);
+    }
+
+    [Test]
+    public void TagsAreUpdatedWhenContentIsTrashedAndUnTrashed_All()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        var content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "bam" });
+        ContentService.SaveAndPublish(content1);
+
+        var content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2");
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content2);
+
+        // verify
+        var tags = TagService.GetTagsForEntity(content1.Id);
+        Assert.AreEqual(5, tags.Count());
+        var allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(5, allTags.Count());
+
+        ContentService.Unpublish(content1);
+        ContentService.Unpublish(content2);
+    }
+
+    [Test]
+    [Ignore("https://github.com/umbraco/Umbraco-CMS/issues/3821 (U4-8442), will need to be fixed.")]
+    public void TagsAreUpdatedWhenContentIsTrashedAndUnTrashed_Tree()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        var content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "plus" });
+        ContentService.SaveAndPublish(content1);
+
+        var content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", content1.Id);
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content2);
+
+        // verify
+        var tags = TagService.GetTagsForEntity(content1.Id);
+        Assert.AreEqual(5, tags.Count());
+        var allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(5, allTags.Count());
+
+        ContentService.MoveToRecycleBin(content1);
+
+        // no more tags
+        tags = TagService.GetTagsForEntity(content1.Id);
+        Assert.AreEqual(0, tags.Count());
+        tags = TagService.GetTagsForEntity(content2.Id);
+        Assert.AreEqual(0, tags.Count());
+
+        // no more tags
+        allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(0, allTags.Count());
+
+        ContentService.Move(content1, -1);
+
+        Assert.IsFalse(content1.Published);
+
+        // no more tags
+        tags = TagService.GetTagsForEntity(content1.Id);
+        Assert.AreEqual(0, tags.Count());
+        tags = TagService.GetTagsForEntity(content2.Id);
+        Assert.AreEqual(0, tags.Count());
+
+        // no more tags
+        allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(0, allTags.Count());
+
+        content1.PublishCulture(CultureImpact.Invariant);
+        ContentService.SaveAndPublish(content1);
+
+        Assert.IsTrue(content1.Published);
+
+        // tags are back
+        tags = TagService.GetTagsForEntity(content1.Id);
+        Assert.AreEqual(5, tags.Count());
+
+        // FIXME: tag & tree issue
+        // when we publish, we 'just' publish the top one and not the ones below = fails
+        // what we should do is... NOT clear tags when unpublishing or trashing or...
+        // and just update the tag service to NOT return anything related to trashed or
+        // unpublished entities (since trashed is set on ALL entities in the trashed branch)
+        tags = TagService.GetTagsForEntity(content2.Id); // including that one!
+        Assert.AreEqual(4, tags.Count());
+
+        // tags are back
+        allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(5, allTags.Count());
+    }
+
+    [Test]
+    public void TagsAreUpdatedWhenContentIsUnpublishedAndRePublished()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        var content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "bam" });
+        ContentService.SaveAndPublish(content1);
+
+        var content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2");
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content2);
+
+        ContentService.Unpublish(content1);
+        ContentService.Unpublish(content2);
+    }
+
+    [Test]
+    [Ignore("https://github.com/umbraco/Umbraco-CMS/issues/3821 (U4-8442), will need to be fixed.")]
+    public void TagsAreUpdatedWhenContentIsUnpublishedAndRePublished_Tree()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        var content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags", "bam" });
+        ContentService.SaveAndPublish(content1);
+
+        var content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", content1);
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content2);
+
+        ContentService.Unpublish(content1);
+
+        var tags = TagService.GetTagsForEntity(content1.Id);
+        Assert.AreEqual(0, tags.Count());
+
+        // FIXME: tag & tree issue
+        // when we (un)publish, we 'just' publish the top one and not the ones below = fails
+        // see similar note above
+        tags = TagService.GetTagsForEntity(content2.Id);
+        Assert.AreEqual(0, tags.Count());
+        var allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(0, allTags.Count());
+
+        content1.PublishCulture(CultureImpact.Invariant);
+        ContentService.SaveAndPublish(content1);
+
+        tags = TagService.GetTagsForEntity(content2.Id);
+        Assert.AreEqual(4, tags.Count());
+        allTags = TagService.GetAllContentTags();
+        Assert.AreEqual(5, allTags.Count());
+    }
+
+    [Test]
+    public void Create_Tag_Data_Bulk_Publish_Operation()
+    {
+        // Arrange
+        // set configuration
+        var dataType = DataTypeService.GetDataType(1041);
+        dataType.Configuration = new TagConfiguration { Group = "test", StorageType = TagsStorageType.Csv };
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+        contentType.AllowedContentTypes =
+            new[] { new ContentTypeSort(new Lazy<int>(() => contentType.Id), 0, contentType.Alias) };
+
+        var content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content");
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.Save(content);
+
+        var child1 = ContentBuilder.CreateSimpleContent(contentType, "child 1 content", content.Id);
+        child1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello1", "world1", "some1" });
+        ContentService.Save(child1);
+
+        var child2 = ContentBuilder.CreateSimpleContent(contentType, "child 2 content", content.Id);
+        child2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello2", "world2" });
+        ContentService.Save(child2);
+
+        // Act
+        ContentService.SaveAndPublishBranch(content, true);
+
+        // Assert
+        var propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
+
+        using (var scope = ScopeProvider.CreateScope())
         {
-            ILanguage language = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            LocalizationService.Save(language); // en-US is already there
+            Assert.AreEqual(4, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = content.Id, propTypeId = propertyTypeId }));
 
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
+            Assert.AreEqual(3, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = child1.Id, propTypeId = propertyTypeId }));
 
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            PropertyType propertyType = CreateAndAddTagsPropertyType(contentType, ContentVariation.Culture);
-            ContentTypeService.Save(contentType);
+            Assert.AreEqual(2, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = child2.Id, propTypeId = propertyTypeId }));
 
-            IContent content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.SetCultureName("name-fr", "fr-FR");
-            content1.SetCultureName("name-en", "en-US");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" }, culture: "fr-FR");
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "another", "one" }, culture: "en-US");
-            ContentService.SaveAndPublish(content1);
-
-            propertyType.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(contentType);
-
-            // FIXME: This throws due to index violations
-            propertyType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            // TODO: Assert results
-        }
-
-        [Test]
-        public void TagsAreUpdatedWhenContentIsTrashedAndUnTrashed_One()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            Content content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" });
-            ContentService.SaveAndPublish(content1);
-
-            Content content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", -1);
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content2);
-
-            // verify
-            IEnumerable<ITag> tags = TagService.GetTagsForEntity(content1.Id);
-            Assert.AreEqual(5, tags.Count());
-            IEnumerable<ITag> allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(5, allTags.Count());
-
-            ContentService.MoveToRecycleBin(content1);
-        }
-
-        [Test]
-        public void TagsAreUpdatedWhenContentIsTrashedAndUnTrashed_All()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            Content content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "bam" });
-            ContentService.SaveAndPublish(content1);
-
-            Content content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", -1);
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content2);
-
-            // verify
-            IEnumerable<ITag> tags = TagService.GetTagsForEntity(content1.Id);
-            Assert.AreEqual(5, tags.Count());
-            IEnumerable<ITag> allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(5, allTags.Count());
-
-            ContentService.Unpublish(content1);
-            ContentService.Unpublish(content2);
-        }
-
-        [Test]
-        [Ignore("https://github.com/umbraco/Umbraco-CMS/issues/3821 (U4-8442), will need to be fixed.")]
-        public void TagsAreUpdatedWhenContentIsTrashedAndUnTrashed_Tree()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            Content content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "plus" });
-            ContentService.SaveAndPublish(content1);
-
-            Content content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", content1.Id);
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content2);
-
-            // verify
-            IEnumerable<ITag> tags = TagService.GetTagsForEntity(content1.Id);
-            Assert.AreEqual(5, tags.Count());
-            IEnumerable<ITag> allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(5, allTags.Count());
-
-            ContentService.MoveToRecycleBin(content1);
-
-            // no more tags
-            tags = TagService.GetTagsForEntity(content1.Id);
-            Assert.AreEqual(0, tags.Count());
-            tags = TagService.GetTagsForEntity(content2.Id);
-            Assert.AreEqual(0, tags.Count());
-
-            // no more tags
-            allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(0, allTags.Count());
-
-            ContentService.Move(content1, -1);
-
-            Assert.IsFalse(content1.Published);
-
-            // no more tags
-            tags = TagService.GetTagsForEntity(content1.Id);
-            Assert.AreEqual(0, tags.Count());
-            tags = TagService.GetTagsForEntity(content2.Id);
-            Assert.AreEqual(0, tags.Count());
-
-            // no more tags
-            allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(0, allTags.Count());
-
-            content1.PublishCulture(CultureImpact.Invariant);
-            ContentService.SaveAndPublish(content1);
-
-            Assert.IsTrue(content1.Published);
-
-            // tags are back
-            tags = TagService.GetTagsForEntity(content1.Id);
-            Assert.AreEqual(5, tags.Count());
-
-            // FIXME: tag & tree issue
-            // when we publish, we 'just' publish the top one and not the ones below = fails
-            // what we should do is... NOT clear tags when unpublishing or trashing or...
-            // and just update the tag service to NOT return anything related to trashed or
-            // unpublished entities (since trashed is set on ALL entities in the trashed branch)
-            tags = TagService.GetTagsForEntity(content2.Id); // including that one!
-            Assert.AreEqual(4, tags.Count());
-
-            // tags are back
-            allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(5, allTags.Count());
-        }
-
-        [Test]
-        public void TagsAreUpdatedWhenContentIsUnpublishedAndRePublished()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            Content content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "bam" });
-            ContentService.SaveAndPublish(content1);
-
-            Content content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", -1);
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content2);
-
-            ContentService.Unpublish(content1);
-            ContentService.Unpublish(content2);
-        }
-
-        [Test]
-        [Ignore("https://github.com/umbraco/Umbraco-CMS/issues/3821 (U4-8442), will need to be fixed.")]
-        public void TagsAreUpdatedWhenContentIsUnpublishedAndRePublished_Tree()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            Content content1 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags", "bam" });
-            ContentService.SaveAndPublish(content1);
-
-            Content content2 = ContentBuilder.CreateSimpleContent(contentType, "Tagged content 2", content1);
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content2);
-
-            ContentService.Unpublish(content1);
-
-            IEnumerable<ITag> tags = TagService.GetTagsForEntity(content1.Id);
-            Assert.AreEqual(0, tags.Count());
-
-            // FIXME: tag & tree issue
-            // when we (un)publish, we 'just' publish the top one and not the ones below = fails
-            // see similar note above
-            tags = TagService.GetTagsForEntity(content2.Id);
-            Assert.AreEqual(0, tags.Count());
-            IEnumerable<ITag> allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(0, allTags.Count());
-
-            content1.PublishCulture(CultureImpact.Invariant);
-            ContentService.SaveAndPublish(content1);
-
-            tags = TagService.GetTagsForEntity(content2.Id);
-            Assert.AreEqual(4, tags.Count());
-            allTags = TagService.GetAllContentTags();
-            Assert.AreEqual(5, allTags.Count());
-        }
-
-        [Test]
-        public void Create_Tag_Data_Bulk_Publish_Operation()
-        {
-            // Arrange
-            // set configuration
-            IDataType dataType = DataTypeService.GetDataType(1041);
-            dataType.Configuration = new TagConfiguration
-            {
-                Group = "test",
-                StorageType = TagsStorageType.Csv
-            };
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-            contentType.AllowedContentTypes = new[] { new ContentTypeSort(new Lazy<int>(() => contentType.Id), 0, contentType.Alias) };
-
-            Content content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content", -1);
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.Save(content);
-
-            Content child1 = ContentBuilder.CreateSimpleContent(contentType, "child 1 content", content.Id);
-            child1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello1", "world1", "some1" });
-            ContentService.Save(child1);
-
-            Content child2 = ContentBuilder.CreateSimpleContent(contentType, "child 2 content", content.Id);
-            child2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello2", "world2" });
-            ContentService.Save(child2);
-
-            // Act
-            ContentService.SaveAndPublishBranch(content, true);
-
-            // Assert
-            int propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                Assert.AreEqual(4, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = content.Id, propTypeId = propertyTypeId }));
-
-                Assert.AreEqual(3, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = child1.Id, propTypeId = propertyTypeId }));
-
-                Assert.AreEqual(2, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = child2.Id, propTypeId = propertyTypeId }));
-
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void Does_Not_Create_Tag_Data_For_Non_Published_Version()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            // create content type with a tag property
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            // create a content with tags and publish
-            Content content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content", -1);
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content);
-
-            // edit tags and save
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "another", "world" }, merge: true);
-            ContentService.Save(content);
-
-            // the (edit) property does contain all tags
-            Assert.AreEqual(5, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
-
-            // but the database still contains the initial two tags
-            int propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                Assert.AreEqual(4, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = content.Id, propTypeId = propertyTypeId }));
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void Can_Replace_Tag_Data_To_Published_Content()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-
-            Content content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content", -1);
-
-            // Act
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content);
-
-            // Assert
-            Assert.AreEqual(4, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
-            int propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                Assert.AreEqual(4, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = content.Id, propTypeId = propertyTypeId }));
-
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void Can_Append_Tag_Data_To_Published_Content()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-            Content content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content", -1);
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content);
-
-            // Act
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "another", "world" }, merge: true);
-            ContentService.SaveAndPublish(content);
-
-            // Assert
-            Assert.AreEqual(5, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
-            int propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                Assert.AreEqual(5, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = content.Id, propTypeId = propertyTypeId }));
-
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void Can_Remove_Tag_Data_To_Published_Content()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", mandatoryProperties: true, defaultTemplateId: template.Id);
-            CreateAndAddTagsPropertyType(contentType);
-            ContentTypeService.Save(contentType);
-            Content content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content", -1);
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "hello", "world", "some", "tags" });
-            ContentService.SaveAndPublish(content);
-
-            // Act
-            content.RemoveTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "some", "world" });
-            ContentService.SaveAndPublish(content);
-
-            // Assert
-            Assert.AreEqual(2, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
-            int propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                Assert.AreEqual(2, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
-                    "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
-                    new { nodeId = content.Id, propTypeId = propertyTypeId }));
-
-                scope.Complete();
-            }
-        }
-
-        private PropertyType CreateAndAddTagsPropertyType(ContentType contentType, ContentVariation variations = ContentVariation.Nothing)
-        {
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithPropertyEditorAlias("test")
-                .WithAlias("tags")
-                .WithDataTypeId(1041)
-                .WithVariations(variations)
-                .Build();
-            contentType.PropertyGroups.First().PropertyTypes.Add(propertyType);
-            contentType.Variations = variations;
-            return propertyType;
+            scope.Complete();
         }
     }
+
+    [Test]
+    public void Does_Not_Create_Tag_Data_For_Non_Published_Version()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        // create content type with a tag property
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        // create a content with tags and publish
+        var content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content");
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content);
+
+        // edit tags and save
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "another", "world" },
+            true);
+        ContentService.Save(content);
+
+        // the (edit) property does contain all tags
+        Assert.AreEqual(5, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
+
+        // but the database still contains the initial two tags
+        var propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            Assert.AreEqual(4, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = content.Id, propTypeId = propertyTypeId }));
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void Can_Replace_Tag_Data_To_Published_Content()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content");
+
+        // Act
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content);
+
+        // Assert
+        Assert.AreEqual(4, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
+        var propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            Assert.AreEqual(4, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = content.Id, propTypeId = propertyTypeId }));
+
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void Can_Append_Tag_Data_To_Published_Content()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+        var content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content");
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content);
+
+        // Act
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "another", "world" },
+            true);
+        ContentService.SaveAndPublish(content);
+
+        // Assert
+        Assert.AreEqual(5, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
+        var propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            Assert.AreEqual(5, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = content.Id, propTypeId = propertyTypeId }));
+
+            scope.Complete();
+        }
+    }
+
+    [Test]
+    public void Can_Remove_Tag_Data_To_Published_Content()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        CreateAndAddTagsPropertyType(contentType);
+        ContentTypeService.Save(contentType);
+        var content = ContentBuilder.CreateSimpleContent(contentType, "Tagged content");
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "hello", "world", "some", "tags" });
+        ContentService.SaveAndPublish(content);
+
+        // Act
+        content.RemoveTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "some", "world" });
+        ContentService.SaveAndPublish(content);
+
+        // Assert
+        Assert.AreEqual(2, content.Properties["tags"].GetValue().ToString().Split(',').Distinct().Count());
+        var propertyTypeId = contentType.PropertyTypes.Single(x => x.Alias == "tags").Id;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            Assert.AreEqual(2, ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT COUNT(*) FROM cmsTagRelationship WHERE nodeId=@nodeId AND propertyTypeId=@propTypeId",
+                new { nodeId = content.Id, propTypeId = propertyTypeId }));
+
+            scope.Complete();
+        }
+    }
+
+    private PropertyType CreateAndAddTagsPropertyType(ContentType contentType,
+        ContentVariation variations = ContentVariation.Nothing)
+    {
+        var propertyType = new PropertyTypeBuilder()
+            .WithPropertyEditorAlias("test")
+            .WithAlias("tags")
+            .WithDataTypeId(1041)
+            .WithVariations(variations)
+            .Build();
+        contentType.PropertyGroups.First().PropertyTypes.Add(propertyType);
+        contentType.Variations = variations;
+        return propertyType;
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
index f3bc25c9c8..d489e6a26c 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentServiceTests.cs
@@ -13,14 +13,11 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
@@ -30,73 +27,120 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+/// <summary>
+///     Tests covering all methods in the ContentService class.
+/// </summary>
+[TestFixture]
+[UmbracoTest(
+    Database = UmbracoTestOptions.Database.NewSchemaPerTest,
+    PublishedRepositoryEvents = true,
+    WithApplication = true)]
+public class ContentServiceTests : UmbracoIntegrationTestWithContent
 {
-    /// <summary>
-    ///     Tests covering all methods in the ContentService class.
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(
-        Database = UmbracoTestOptions.Database.NewSchemaPerTest,
-        PublishedRepositoryEvents = true,
-        WithApplication = true)]
-    public class ContentServiceTests : UmbracoIntegrationTestWithContent
+    [SetUp]
+    public void Setup() => ContentRepositoryBase.ThrowOnWarning = true;
+
+    [TearDown]
+    public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
+    // TODO: Add test to verify there is only ONE newest document/content in {Constants.DatabaseSchema.Tables.Document} table after updating.
+    // TODO: Add test to delete specific version (with and without deleting prior versions) and versions by date.
+
+
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IAuditService AuditService => GetRequiredService<IAuditService>();
+
+    private IUserService UserService => GetRequiredService<IUserService>();
+
+    private IRelationService RelationService => GetRequiredService<IRelationService>();
+
+    private ILocalizedTextService TextService => GetRequiredService<ILocalizedTextService>();
+
+    private ITagService TagService => GetRequiredService<ITagService>();
+
+    private IPublicAccessService PublicAccessService => GetRequiredService<IPublicAccessService>();
+
+    private IDomainService DomainService => GetRequiredService<IDomainService>();
+
+    private INotificationService NotificationService => GetRequiredService<INotificationService>();
+
+    private PropertyEditorCollection PropertyEditorCollection => GetRequiredService<PropertyEditorCollection>();
+
+    private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
+
+    private IJsonSerializer Serializer => GetRequiredService<IJsonSerializer>();
+
+    private IValueEditorCache ValueEditorCache => GetRequiredService<IValueEditorCache>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
+        .AddNotificationHandler<ContentPublishingNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentCopyingNotification, ContentNotificationHandler>()
+        .AddNotificationHandler<ContentCopiedNotification, ContentNotificationHandler>();
+
+    [Test]
+    public void Create_Blueprint()
     {
-        [SetUp]
-        public void Setup() => ContentRepositoryBase.ThrowOnWarning = true;
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        [TearDown]
-        public void Teardown() => ContentRepositoryBase.ThrowOnWarning = false;
-        // TODO: Add test to verify there is only ONE newest document/content in {Constants.DatabaseSchema.Tables.Document} table after updating.
-        // TODO: Add test to delete specific version (with and without deleting prior versions) and versions by date.
+        var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
 
+        var blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
+        blueprint.SetValue("title", "blueprint 1");
+        blueprint.SetValue("bodyText", "blueprint 2");
+        blueprint.SetValue("keywords", "blueprint 3");
+        blueprint.SetValue("description", "blueprint 4");
 
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+        ContentService.SaveBlueprint(blueprint);
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        var found = ContentService.GetBlueprintsForContentTypes().ToArray();
+        Assert.AreEqual(1, found.Length);
 
-        private IAuditService AuditService => GetRequiredService<IAuditService>();
+        // ensures it's not found by normal content
+        var contentFound = ContentService.GetById(found[0].Id);
+        Assert.IsNull(contentFound);
+    }
 
-        private IUserService UserService => GetRequiredService<IUserService>();
+    [Test]
+    public void Delete_Blueprint()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        private IRelationService RelationService => GetRequiredService<IRelationService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
 
-        private ILocalizedTextService TextService => GetRequiredService<ILocalizedTextService>();
+        var blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
+        blueprint.SetValue("title", "blueprint 1");
+        blueprint.SetValue("bodyText", "blueprint 2");
+        blueprint.SetValue("keywords", "blueprint 3");
+        blueprint.SetValue("description", "blueprint 4");
 
-        private ITagService TagService => GetRequiredService<ITagService>();
+        ContentService.SaveBlueprint(blueprint);
 
-        private IPublicAccessService PublicAccessService => GetRequiredService<IPublicAccessService>();
+        ContentService.DeleteBlueprint(blueprint);
 
-        private IDomainService DomainService => GetRequiredService<IDomainService>();
+        var found = ContentService.GetBlueprintsForContentTypes().ToArray();
+        Assert.AreEqual(0, found.Length);
+    }
 
-        private INotificationService NotificationService => GetRequiredService<INotificationService>();
-
-        private PropertyEditorCollection PropertyEditorCollection => GetRequiredService<PropertyEditorCollection>();
-
-        private IDocumentRepository DocumentRepository => GetRequiredService<IDocumentRepository>();
-
-        private IJsonSerializer Serializer => GetRequiredService<IJsonSerializer>();
-
-        private IValueEditorCache ValueEditorCache => GetRequiredService<IValueEditorCache>();
-
-        protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
-            .AddNotificationHandler<ContentPublishingNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentCopyingNotification, ContentNotificationHandler>()
-            .AddNotificationHandler<ContentCopiedNotification, ContentNotificationHandler>();
-
-        [Test]
-        public void Create_Blueprint()
+    [Test]
+    public void Create_Content_From_Blueprint()
+    {
+        using (var scope = ScopeProvider.CreateScope(autoComplete: true))
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
+            var template = TemplateBuilder.CreateTextPageTemplate();
             FileService.SaveTemplate(template);
 
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+            var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
             ContentTypeService.Save(contentType);
 
-            Content blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
+            var blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
             blueprint.SetValue("title", "blueprint 1");
             blueprint.SetValue("bodyText", "blueprint 2");
             blueprint.SetValue("keywords", "blueprint 3");
@@ -104,3419 +148,3378 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
 
             ContentService.SaveBlueprint(blueprint);
 
-            IContent[] found = ContentService.GetBlueprintsForContentTypes().ToArray();
-            Assert.AreEqual(1, found.Length);
+            var fromBlueprint = ContentService.CreateContentFromBlueprint(blueprint, "hello world");
+            ContentService.Save(fromBlueprint);
 
-            // ensures it's not found by normal content
-            IContent contentFound = ContentService.GetById(found[0].Id);
-            Assert.IsNull(contentFound);
+            Assert.IsTrue(fromBlueprint.HasIdentity);
+            Assert.AreEqual("blueprint 1", fromBlueprint.Properties["title"].GetValue());
+            Assert.AreEqual("blueprint 2", fromBlueprint.Properties["bodyText"].GetValue());
+            Assert.AreEqual("blueprint 3", fromBlueprint.Properties["keywords"].GetValue());
+            Assert.AreEqual("blueprint 4", fromBlueprint.Properties["description"].GetValue());
         }
+    }
 
-        [Test]
-        public void Delete_Blueprint()
+    [Test]
+    public void Get_All_Blueprints()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var ct1 = ContentTypeBuilder.CreateTextPageContentType("ct1", defaultTemplateId: template.Id);
+        FileService.SaveTemplate(ct1.DefaultTemplate);
+        ContentTypeService.Save(ct1);
+        var ct2 = ContentTypeBuilder.CreateTextPageContentType("ct2", defaultTemplateId: template.Id);
+        FileService.SaveTemplate(ct2.DefaultTemplate);
+        ContentTypeService.Save(ct2);
+
+        for (var i = 0; i < 10; i++)
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            Content blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
-            blueprint.SetValue("title", "blueprint 1");
-            blueprint.SetValue("bodyText", "blueprint 2");
-            blueprint.SetValue("keywords", "blueprint 3");
-            blueprint.SetValue("description", "blueprint 4");
-
+            var blueprint =
+                ContentBuilder.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, Constants.System.Root);
             ContentService.SaveBlueprint(blueprint);
-
-            ContentService.DeleteBlueprint(blueprint);
-
-            IContent[] found = ContentService.GetBlueprintsForContentTypes().ToArray();
-            Assert.AreEqual(0, found.Length);
         }
 
-        [Test]
-        public void Create_Content_From_Blueprint()
+        var found = ContentService.GetBlueprintsForContentTypes().ToArray();
+        Assert.AreEqual(10, found.Length);
+
+        found = ContentService.GetBlueprintsForContentTypes(ct1.Id).ToArray();
+        Assert.AreEqual(5, found.Length);
+
+        found = ContentService.GetBlueprintsForContentTypes(ct2.Id).ToArray();
+        Assert.AreEqual(5, found.Length);
+    }
+
+    [Test]
+    public void Perform_Scheduled_Publishing()
+    {
+        var langUk = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+
+        LocalizationService.Save(langFr);
+        LocalizationService.Save(langUk);
+
+        var ctInvariant = ContentTypeBuilder.CreateBasicContentType("invariantPage");
+        ContentTypeService.Save(ctInvariant);
+
+        var ctVariant = ContentTypeBuilder.CreateBasicContentType("variantPage");
+        ctVariant.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(ctVariant);
+
+        var now = DateTime.Now;
+
+        // 10x invariant content, half is scheduled to be published in 5 seconds, the other half is scheduled to be unpublished in 5 seconds
+        var invariant = new List<IContent>();
+        for (var i = 0; i < 10; i++)
         {
-            using (IScope scope = ScopeProvider.CreateScope(autoComplete: true))
+            var c = ContentBuilder.CreateBasicContent(ctInvariant);
+            c.Name = "name" + i;
+            if (i % 2 == 0)
             {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-                ContentTypeService.Save(contentType);
-
-                Content blueprint = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
-                blueprint.SetValue("title", "blueprint 1");
-                blueprint.SetValue("bodyText", "blueprint 2");
-                blueprint.SetValue("keywords", "blueprint 3");
-                blueprint.SetValue("description", "blueprint 4");
-
-                ContentService.SaveBlueprint(blueprint);
-
-                IContent fromBlueprint = ContentService.CreateContentFromBlueprint(blueprint, "hello world");
-                ContentService.Save(fromBlueprint);
-
-                Assert.IsTrue(fromBlueprint.HasIdentity);
-                Assert.AreEqual("blueprint 1", fromBlueprint.Properties["title"].GetValue());
-                Assert.AreEqual("blueprint 2", fromBlueprint.Properties["bodyText"].GetValue());
-                Assert.AreEqual("blueprint 3", fromBlueprint.Properties["keywords"].GetValue());
-                Assert.AreEqual("blueprint 4", fromBlueprint.Properties["description"].GetValue());
+                var contentSchedule =
+                    ContentScheduleCollection.CreateWithEntry(now.AddSeconds(5), null); // release in 5 seconds
+                var r = ContentService.Save(c, contentSchedule: contentSchedule);
+                Assert.IsTrue(r.Success, r.Result.ToString());
             }
-        }
-
-        [Test]
-        public void Get_All_Blueprints()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType ct1 = ContentTypeBuilder.CreateTextPageContentType("ct1", defaultTemplateId: template.Id);
-            FileService.SaveTemplate(ct1.DefaultTemplate);
-            ContentTypeService.Save(ct1);
-            ContentType ct2 = ContentTypeBuilder.CreateTextPageContentType("ct2", defaultTemplateId: template.Id);
-            FileService.SaveTemplate(ct2.DefaultTemplate);
-            ContentTypeService.Save(ct2);
-
-            for (var i = 0; i < 10; i++)
+            else
             {
-                Content blueprint =
-                    ContentBuilder.CreateTextpageContent(i % 2 == 0 ? ct1 : ct2, "hello" + i, Constants.System.Root);
-                ContentService.SaveBlueprint(blueprint);
+                var r = ContentService.SaveAndPublish(c);
+
+                var contentSchedule =
+                    ContentScheduleCollection.CreateWithEntry(null, now.AddSeconds(5)); // expire in 5 seconds
+                ContentService.PersistContentSchedule(c, contentSchedule);
+
+                Assert.IsTrue(r.Success, r.Result.ToString());
             }
 
-            IContent[] found = ContentService.GetBlueprintsForContentTypes().ToArray();
-            Assert.AreEqual(10, found.Length);
-
-            found = ContentService.GetBlueprintsForContentTypes(ct1.Id).ToArray();
-            Assert.AreEqual(5, found.Length);
-
-            found = ContentService.GetBlueprintsForContentTypes(ct2.Id).ToArray();
-            Assert.AreEqual(5, found.Length);
+            invariant.Add(c);
         }
 
-        [Test]
-        public void Perform_Scheduled_Publishing()
+        // 10x variant content, half is scheduled to be published in 5 seconds, the other half is scheduled to be unpublished in 5 seconds
+        var variant = new List<IContent>();
+        var alternatingCulture = langFr.IsoCode;
+        for (var i = 0; i < 10; i++)
         {
-            ILanguage langUk = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
+            var c = ContentBuilder.CreateBasicContent(ctVariant);
+            c.SetCultureName("name-uk" + i, langUk.IsoCode);
+            c.SetCultureName("name-fr" + i, langFr.IsoCode);
 
-            LocalizationService.Save(langFr);
-            LocalizationService.Save(langUk);
-
-            ContentType ctInvariant = ContentTypeBuilder.CreateBasicContentType("invariantPage");
-            ContentTypeService.Save(ctInvariant);
-
-            ContentType ctVariant = ContentTypeBuilder.CreateBasicContentType("variantPage");
-            ctVariant.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(ctVariant);
-
-            DateTime now = DateTime.Now;
-
-            // 10x invariant content, half is scheduled to be published in 5 seconds, the other half is scheduled to be unpublished in 5 seconds
-            var invariant = new List<IContent>();
-            for (var i = 0; i < 10; i++)
+            if (i % 2 == 0)
             {
-                Content c = ContentBuilder.CreateBasicContent(ctInvariant);
-                c.Name = "name" + i;
-                if (i % 2 == 0)
-                {
-                    var contentSchedule = ContentScheduleCollection.CreateWithEntry(now.AddSeconds(5), null); // release in 5 seconds
-                    OperationResult r = ContentService.Save(c, contentSchedule: contentSchedule);
-                    Assert.IsTrue(r.Success, r.Result.ToString());
-                }
-                else
-                {
-                    PublishResult r = ContentService.SaveAndPublish(c);
+                var contentSchedule =
+                    ContentScheduleCollection.CreateWithEntry(alternatingCulture, now.AddSeconds(5),
+                        null); // release in 5 seconds
+                var r = ContentService.Save(c, contentSchedule: contentSchedule);
+                Assert.IsTrue(r.Success, r.Result.ToString());
 
-                    var contentSchedule = ContentScheduleCollection.CreateWithEntry(null, now.AddSeconds(5)); // expire in 5 seconds
-                    ContentService.PersistContentSchedule(c, contentSchedule);
+                alternatingCulture = alternatingCulture == langFr.IsoCode ? langUk.IsoCode : langFr.IsoCode;
+            }
+            else
+            {
+                var r = ContentService.SaveAndPublish(c);
 
-                    Assert.IsTrue(r.Success, r.Result.ToString());
-                }
+                var contentSchedule =
+                    ContentScheduleCollection.CreateWithEntry(alternatingCulture, null,
+                        now.AddSeconds(5)); // expire in 5 seconds
+                ContentService.PersistContentSchedule(c, contentSchedule);
 
-                invariant.Add(c);
+                Assert.IsTrue(r.Success, r.Result.ToString());
             }
 
-            // 10x variant content, half is scheduled to be published in 5 seconds, the other half is scheduled to be unpublished in 5 seconds
-            var variant = new List<IContent>();
-            var alternatingCulture = langFr.IsoCode;
-            for (var i = 0; i < 10; i++)
-            {
-                Content c = ContentBuilder.CreateBasicContent(ctVariant);
-                c.SetCultureName("name-uk" + i, langUk.IsoCode);
-                c.SetCultureName("name-fr" + i, langFr.IsoCode);
-
-                if (i % 2 == 0)
-                {
-                    var contentSchedule = ContentScheduleCollection.CreateWithEntry(alternatingCulture, now.AddSeconds(5), null); // release in 5 seconds
-                    OperationResult r = ContentService.Save(c, contentSchedule: contentSchedule);
-                    Assert.IsTrue(r.Success, r.Result.ToString());
-
-                    alternatingCulture = alternatingCulture == langFr.IsoCode ? langUk.IsoCode : langFr.IsoCode;
-                }
-                else
-                {
-                    PublishResult r = ContentService.SaveAndPublish(c);
-
-                    var contentSchedule = ContentScheduleCollection.CreateWithEntry(alternatingCulture, null, now.AddSeconds(5)); // expire in 5 seconds
-                    ContentService.PersistContentSchedule(c, contentSchedule);
-
-                    Assert.IsTrue(r.Success, r.Result.ToString());
-                }
-
-                variant.Add(c);
-            }
-
-            var runSched = ContentService.PerformScheduledPublish(
-                now.AddMinutes(1)).ToList(); // process anything scheduled before a minute from now
-
-            // this is 21 because the test data installed before this test runs has a scheduled item!
-            Assert.AreEqual(21, runSched.Count);
-            Assert.AreEqual(
-                20,
-                runSched.Count(x => x.Success),
-                string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
-
-            Assert.AreEqual(
-                5,
-                runSched.Count(x => x.Result == PublishResultType.SuccessPublish),
-                string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
-            Assert.AreEqual(
-                5,
-                runSched.Count(x => x.Result == PublishResultType.SuccessUnpublish),
-                string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
-            Assert.AreEqual(
-                5,
-                runSched.Count(x => x.Result == PublishResultType.SuccessPublishCulture),
-                string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
-            Assert.AreEqual(
-                5,
-                runSched.Count(x => x.Result == PublishResultType.SuccessUnpublishCulture),
-                string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
-
-            // re-run the scheduled publishing, there should be no results
-            runSched = ContentService.PerformScheduledPublish(
-                now.AddMinutes(1)).ToList();
-
-            Assert.AreEqual(0, runSched.Count);
+            variant.Add(c);
         }
 
-        [Test]
-        public void Remove_Scheduled_Publishing_Date()
+        var runSched = ContentService.PerformScheduledPublish(
+            now.AddMinutes(1)).ToList(); // process anything scheduled before a minute from now
+
+        // this is 21 because the test data installed before this test runs has a scheduled item!
+        Assert.AreEqual(21, runSched.Count);
+        Assert.AreEqual(
+            20,
+            runSched.Count(x => x.Success),
+            string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
+
+        Assert.AreEqual(
+            5,
+            runSched.Count(x => x.Result == PublishResultType.SuccessPublish),
+            string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
+        Assert.AreEqual(
+            5,
+            runSched.Count(x => x.Result == PublishResultType.SuccessUnpublish),
+            string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
+        Assert.AreEqual(
+            5,
+            runSched.Count(x => x.Result == PublishResultType.SuccessPublishCulture),
+            string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
+        Assert.AreEqual(
+            5,
+            runSched.Count(x => x.Result == PublishResultType.SuccessUnpublishCulture),
+            string.Join(Environment.NewLine, runSched.Select(x => $"{x.Entity.Name} - {x.Result}")));
+
+        // re-run the scheduled publishing, there should be no results
+        runSched = ContentService.PerformScheduledPublish(
+            now.AddMinutes(1)).ToList();
+
+        Assert.AreEqual(0, runSched.Count);
+    }
+
+    [Test]
+    public void Remove_Scheduled_Publishing_Date()
+    {
+        // Arrange
+
+        // Act
+        var content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage");
+
+        var contentSchedule = ContentScheduleCollection.CreateWithEntry(null, DateTime.Now.AddHours(2));
+        ContentService.Save(content, Constants.Security.SuperUserId, contentSchedule);
+        Assert.AreEqual(1, contentSchedule.FullSchedule.Count);
+
+        contentSchedule = ContentService.GetContentScheduleByContentId(content.Id);
+        var sched = contentSchedule.FullSchedule;
+        Assert.AreEqual(1, sched.Count);
+        Assert.AreEqual(1, sched.Count(x => x.Culture == string.Empty));
+        contentSchedule.Clear(ContentScheduleAction.Expire);
+        ContentService.Save(content, Constants.Security.SuperUserId, contentSchedule);
+
+        // Assert
+        contentSchedule = ContentService.GetContentScheduleByContentId(content.Id);
+        sched = contentSchedule.FullSchedule;
+        Assert.AreEqual(0, sched.Count);
+        Assert.IsTrue(ContentService.SaveAndPublish(content).Success);
+    }
+
+    [Test]
+    public void Get_Top_Version_Ids()
+    {
+        // Arrange
+        // Act
+        var content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage");
+        for (var i = 0; i < 20; i++)
         {
-            // Arrange
-
-            // Act
-            IContent content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage");
-
-            var contentSchedule = ContentScheduleCollection.CreateWithEntry(null, DateTime.Now.AddHours(2));
-            ContentService.Save(content, Constants.Security.SuperUserId, contentSchedule);
-            Assert.AreEqual(1, contentSchedule.FullSchedule.Count);
-
-            contentSchedule = ContentService.GetContentScheduleByContentId(content.Id);
-            IReadOnlyList<ContentSchedule> sched = contentSchedule.FullSchedule;
-            Assert.AreEqual(1, sched.Count);
-            Assert.AreEqual(1, sched.Count(x => x.Culture == string.Empty));
-            contentSchedule.Clear(ContentScheduleAction.Expire);
-            ContentService.Save(content, Constants.Security.SuperUserId, contentSchedule);
-
-            // Assert
-            contentSchedule = ContentService.GetContentScheduleByContentId(content.Id);
-            sched = contentSchedule.FullSchedule;
-            Assert.AreEqual(0, sched.Count);
-            Assert.IsTrue(ContentService.SaveAndPublish(content).Success);
-        }
-
-        [Test]
-        public void Get_Top_Version_Ids()
-        {
-            // Arrange
-            // Act
-            IContent content = ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage");
-            for (var i = 0; i < 20; i++)
-            {
-                content.SetValue("bodyText", "hello world " + Guid.NewGuid());
-                ContentService.SaveAndPublish(content);
-            }
-
-            // Assert
-            IEnumerable<int> allVersions = ContentService.GetVersionIds(content.Id, int.MaxValue);
-            Assert.AreEqual(21, allVersions.Count());
-
-            IEnumerable<int> topVersions = ContentService.GetVersionIds(content.Id, 4);
-            Assert.AreEqual(4, topVersions.Count());
-        }
-
-        [Test]
-        public void Get_By_Ids_Sorted()
-        {
-            // Arrange
-            // Act
-            var results = new List<IContent>();
-            for (var i = 0; i < 20; i++)
-            {
-                results.Add(ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", 0));
-            }
-
-            IContent[] sortedGet = ContentService.GetByIds(new[] { results[10].Id, results[5].Id, results[12].Id })
-                .ToArray();
-
-            // Assert
-            Assert.AreEqual(sortedGet[0].Id, results[10].Id);
-            Assert.AreEqual(sortedGet[1].Id, results[5].Id);
-            Assert.AreEqual(sortedGet[2].Id, results[12].Id);
-        }
-
-        [Test]
-        public void Count_All()
-        {
-            // Arrange
-            // Act
-            for (var i = 0; i < 20; i++)
-            {
-                ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage");
-            }
-
-            // Assert
-            Assert.AreEqual(25, ContentService.Count());
-        }
-
-        [Test]
-        public void Count_By_Content_Type()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType =
-                ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            // Act
-            for (var i = 0; i < 20; i++)
-            {
-                ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah");
-            }
-
-            // Assert
-            Assert.AreEqual(20, ContentService.Count("umbBlah"));
-        }
-
-        [Test]
-        public void Count_Children()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType =
-                ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-            IContent parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah");
-
-            // Act
-            for (var i = 0; i < 20; i++)
-            {
-                ContentService.CreateAndSave("Test", parent, "umbBlah");
-            }
-
-            // Assert
-            Assert.AreEqual(20, ContentService.CountChildren(parent.Id));
-        }
-
-        [Test]
-        public void Count_Descendants()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType =
-                ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-            IContent parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah");
-
-            // Act
-            IContent current = parent;
-            for (var i = 0; i < 20; i++)
-            {
-                current = ContentService.CreateAndSave("Test", current, "umbBlah");
-            }
-
-            // Assert
-            Assert.AreEqual(20, ContentService.CountDescendants(parent.Id));
-        }
-
-        [Test]
-        public void GetAncestors_Returns_Empty_List_When_Path_Is_Null()
-        {
-            // Arrange
-            // Act
-            var current = new Mock<IContent>();
-            IEnumerable<IContent> res = ContentService.GetAncestors(current.Object);
-
-            // Assert
-            Assert.IsEmpty(res);
-        }
-
-        [Test]
-        public void Can_Remove_Property_Type()
-        {
-            // Arrange
-            // Act
-            IContent content = ContentService.Create("Test", Constants.System.Root, "umbTextpage");
-
-            // Assert
-            Assert.That(content, Is.Not.Null);
-            Assert.That(content.HasIdentity, Is.False);
-        }
-
-        [Test]
-        public void Can_Create_Content()
-        {
-            // Arrange
-            // Act
-            IContent content = ContentService.Create("Test", Constants.System.Root, "umbTextpage");
-
-            // Assert
-            Assert.That(content, Is.Not.Null);
-            Assert.That(content.HasIdentity, Is.False);
-        }
-
-        public void Can_Create_Content_Without_Explicitly_Set_User()
-        {
-            // Arrange
-            // Act
-            IContent content = ContentService.Create("Test", Constants.System.Root, "umbTextpage");
-
-            // Assert
-            Assert.That(content, Is.Not.Null);
-            Assert.That(content.HasIdentity, Is.False);
-            Assert.That(content.CreatorId,
-                Is.EqualTo(Constants.Security
-                    .SuperUserId)); // Default to -1 aka SuperUser (unknown) since we didn't explicitly set this in the Create call
-        }
-
-        [Test]
-        public void Can_Save_New_Content_With_Explicit_User()
-        {
-            User user = new UserBuilder().Build();
-            UserService.Save(user);
-            var content = new Content("Test", Constants.System.Root, ContentTypeService.Get("umbTextpage"));
-
-            // Act
-            ContentService.Save(content, user.Id);
-
-            // Assert
-            Assert.That(content.CreatorId, Is.EqualTo(user.Id));
-            Assert.That(content.WriterId, Is.EqualTo(user.Id));
-        }
-
-        [Test]
-        public void Cannot_Create_Content_With_Non_Existing_ContentType_Alias() =>
-            Assert.Throws<Exception>(() => ContentService.Create("Test", Constants.System.Root, "umbAliasDoesntExist"));
-
-        [Test]
-        public void Cannot_Save_Content_With_Empty_Name()
-        {
-            // Arrange
-            var content = new Content(string.Empty, Constants.System.Root, ContentTypeService.Get("umbTextpage"));
-
-            // Act & Assert
-            Assert.Throws<InvalidOperationException>(() => ContentService.Save(content));
-        }
-
-        [Test]
-        public void Can_Get_Content_By_Id()
-        {
-            // Arrange
-            // Act
-            IContent content = ContentService.GetById(Textpage.Id);
-
-            // Assert
-            Assert.That(content, Is.Not.Null);
-            Assert.That(content.Id, Is.EqualTo(Textpage.Id));
-        }
-
-        [Test]
-        public void Can_Get_Content_By_Guid_Key()
-        {
-            // Arrange
-            // Act
-            IContent content = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
-
-            // Assert
-            Assert.That(content, Is.Not.Null);
-            Assert.That(content.Id, Is.EqualTo(Textpage.Id));
-        }
-
-        [Test]
-        public void Can_Get_Content_By_Level()
-        {
-            // Arrange
-            // Act
-            var contents = ContentService.GetByLevel(2).ToList();
-
-            // Assert
-            Assert.That(contents, Is.Not.Null);
-            Assert.That(contents.Any(), Is.True);
-            Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(2));
-        }
-
-        [Test]
-        public void Can_Get_All_Versions_Of_Content()
-        {
-            IContent parent = ContentService.GetById(Textpage.Id);
-            Assert.IsFalse(parent.Published);
-            ContentService.SaveAndPublish(parent); // publishing parent, so Text Page 2 can be updated.
-
-            IContent content = ContentService.GetById(Subpage.Id);
-            Assert.IsFalse(content.Published);
-            var versions = ContentService.GetVersions(Subpage.Id).ToList();
-            Assert.AreEqual(1, versions.Count);
-
-            var version1 = content.VersionId;
-            Console.WriteLine($"1 e={content.VersionId} p={content.PublishedVersionId}");
-
-            content.Name = "Text Page 2 Updated";
-            content.SetValue("author", "Jane Doe");
-            ContentService.SaveAndPublish(content); // publishes the current version, creates a version
-
-            var version2 = content.VersionId;
-            Console.WriteLine($"2 e={content.VersionId} p={content.PublishedVersionId}");
-
-            content.Name = "Text Page 2 ReUpdated";
-            content.SetValue("author", "Bob Hope");
-            ContentService.SaveAndPublish(content); // publishes again, creates a version
-
-            var version3 = content.VersionId;
-            Console.WriteLine($"3 e={content.VersionId} p={content.PublishedVersionId}");
-
-            IContent content1 = ContentService.GetById(content.Id);
-            Assert.AreEqual("Bob Hope", content1.GetValue("author"));
-            Assert.AreEqual("Bob Hope", content1.GetValue("author", published: true));
-
-            content.Name = "Text Page 2 ReReUpdated";
-            content.SetValue("author", "John Farr");
-            ContentService.Save(content); // no new version
-
-            content1 = ContentService.GetById(content.Id);
-            Assert.AreEqual("John Farr", content1.GetValue("author"));
-            Assert.AreEqual("Bob Hope", content1.GetValue("author", published: true));
-
-            versions = ContentService.GetVersions(Subpage.Id).ToList();
-            Assert.AreEqual(3, versions.Count);
-
-            // versions come with most recent first
-            Assert.AreEqual(version3, versions[0].VersionId); // the edited version
-            Assert.AreEqual(version2, versions[1].VersionId); // the published version
-            Assert.AreEqual(version1, versions[2].VersionId); // the previously published version
-
-            // p is always the same, published version
-            // e is changing, actual version we're loading
-            Console.WriteLine();
-            foreach (IContent version in ((IEnumerable<IContent>)versions).Reverse())
-            {
-                Console.WriteLine($"+ e={((Content)version).VersionId} p={((Content)version).PublishedVersionId}");
-            }
-
-            // and proper values
-            // first, the current (edited) version, with edited and published versions
-            Assert.AreEqual("John Farr", versions[0].GetValue("author")); // current version has the edited value
-            Assert.AreEqual("Bob Hope",
-                versions[0].GetValue("author", published: true)); // and the published published value
-
-            // then, the current (published) version, with edited == published
-            Assert.AreEqual("Bob Hope", versions[1].GetValue("author")); // own edited version
-            Assert.AreEqual("Bob Hope", versions[1].GetValue("author", published: true)); // and published
-
-            // then, the first published version - with values as 'edited'
-            Assert.AreEqual("Jane Doe", versions[2].GetValue("author")); // own edited version
-            Assert.AreEqual("Bob Hope", versions[2].GetValue("author", published: true)); // and published
-        }
-
-        [Test]
-        public void Can_Get_Root_Content()
-        {
-            // Arrange
-            // Act
-            var contents = ContentService.GetRootContent().ToList();
-
-            // Assert
-            Assert.That(contents, Is.Not.Null);
-            Assert.That(contents.Any(), Is.True);
-            Assert.That(contents.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Can_Get_Content_For_Expiration()
-        {
-            // Arrange
-            IContent root = ContentService.GetById(Textpage.Id);
-            ContentService.SaveAndPublish(root);
-            IContent content = ContentService.GetById(Subpage.Id);
-            var contentSchedule = ContentScheduleCollection.CreateWithEntry(null, DateTime.Now.AddSeconds(1));
-            ContentService.PersistContentSchedule(content, contentSchedule);
+            content.SetValue("bodyText", "hello world " + Guid.NewGuid());
             ContentService.SaveAndPublish(content);
-
-            // Act
-            Thread.Sleep(new TimeSpan(0, 0, 0, 2));
-            var contents = ContentService.GetContentForExpiration(DateTime.Now).ToList();
-
-            // Assert
-            Assert.That(contents, Is.Not.Null);
-            Assert.That(contents.Any(), Is.True);
-            Assert.That(contents.Count(), Is.EqualTo(1));
         }
 
-        [Test]
-        public void Can_Get_Content_For_Release()
-        {
-            // Arrange
-            // Act
-            var contents = ContentService.GetContentForRelease(DateTime.Now).ToList();
+        // Assert
+        var allVersions = ContentService.GetVersionIds(content.Id, int.MaxValue);
+        Assert.AreEqual(21, allVersions.Count());
 
-            // Assert
-            Assert.That(DateTime.Now.AddMinutes(-5) <= DateTime.Now);
-            Assert.That(contents, Is.Not.Null);
-            Assert.That(contents.Any(), Is.True);
-            Assert.That(contents.Count(), Is.EqualTo(1));
+        var topVersions = ContentService.GetVersionIds(content.Id, 4);
+        Assert.AreEqual(4, topVersions.Count());
+    }
+
+    [Test]
+    public void Get_By_Ids_Sorted()
+    {
+        // Arrange
+        // Act
+        var results = new List<IContent>();
+        for (var i = 0; i < 20; i++)
+        {
+            results.Add(ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage", 0));
         }
 
-        [Test]
-        public void Can_Get_Content_In_RecycleBin()
-        {
-            // Arrange
-            // Act
-            var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
+        var sortedGet = ContentService.GetByIds(new[] { results[10].Id, results[5].Id, results[12].Id })
+            .ToArray();
 
-            // Assert
-            Assert.That(contents, Is.Not.Null);
-            Assert.That(contents.Any(), Is.True);
-            Assert.That(contents.Count(), Is.EqualTo(1));
+        // Assert
+        Assert.AreEqual(sortedGet[0].Id, results[10].Id);
+        Assert.AreEqual(sortedGet[1].Id, results[5].Id);
+        Assert.AreEqual(sortedGet[2].Id, results[12].Id);
+    }
+
+    [Test]
+    public void Count_All()
+    {
+        // Arrange
+        // Act
+        for (var i = 0; i < 20; i++)
+        {
+            ContentService.CreateAndSave("Test", Constants.System.Root, "umbTextpage");
         }
 
-        [Test]
-        public void Can_Unpublish_Content()
+        // Assert
+        Assert.AreEqual(25, ContentService.Count());
+    }
+
+    [Test]
+    public void Count_By_Content_Type()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        // Act
+        for (var i = 0; i < 20; i++)
         {
-            // Arrange
-            IContent content = ContentService.GetById(Textpage.Id);
-            PublishResult published = ContentService.SaveAndPublish(content, userId: 0);
-
-            // Act
-            PublishResult unpublished = ContentService.Unpublish(content, userId: 0);
-
-            // Assert
-            Assert.That(published.Success, Is.True);
-            Assert.That(unpublished.Success, Is.True);
-            Assert.That(content.Published, Is.False);
-            Assert.AreEqual(PublishResultType.SuccessUnpublish, unpublished.Result);
+            ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah");
         }
 
-        [Test]
-        public void Can_Unpublish_Content_Variation()
+        // Assert
+        Assert.AreEqual(20, ContentService.Count("umbBlah"));
+    }
+
+    [Test]
+    public void Count_Children()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+        var parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah");
+
+        // Act
+        for (var i = 0; i < 20; i++)
         {
-            IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr,
-                out ContentType contentType);
-
-            content.PublishCulture(CultureImpact.Explicit(langFr.IsoCode, langFr.IsDefault));
-            content.PublishCulture(CultureImpact.Explicit(langUk.IsoCode, langUk.IsDefault));
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-
-            PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.IsTrue(published.Success);
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-
-            PublishResult unpublished = ContentService.Unpublish(content, langFr.IsoCode);
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+            ContentService.CreateAndSave("Test", parent, "umbBlah");
         }
 
-        [Test]
-        public void Can_Publish_Culture_After_Last_Culture_Unpublished()
+        // Assert
+        Assert.AreEqual(20, ContentService.CountChildren(parent.Id));
+    }
+
+    [Test]
+    public void Count_Descendants()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbBlah", "test Doc Type", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+        var parent = ContentService.CreateAndSave("Test", Constants.System.Root, "umbBlah");
+
+        // Act
+        var current = parent;
+        for (var i = 0; i < 20; i++)
         {
-            IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr,
-                out ContentType contentType);
-
-            PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-
-            PublishResult unpublished = ContentService.Unpublish(content, langUk.IsoCode); // first culture
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-
-            content = ContentService.GetById(content.Id);
-
-            unpublished = ContentService.Unpublish(content, langFr.IsoCode); // last culture
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
-
-            content = ContentService.GetById(content.Id);
-
-            published = ContentService.SaveAndPublish(content, langUk.IsoCode);
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-
-            content = ContentService.GetById(content.Id); // reget
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+            current = ContentService.CreateAndSave("Test", current, "umbBlah");
         }
 
-        [Test]
-        public void Unpublish_All_Cultures_Has_Unpublished_State()
+        // Assert
+        Assert.AreEqual(20, ContentService.CountDescendants(parent.Id));
+    }
+
+    [Test]
+    public void GetAncestors_Returns_Empty_List_When_Path_Is_Null()
+    {
+        // Arrange
+        // Act
+        var current = new Mock<IContent>();
+        var res = ContentService.GetAncestors(current.Object);
+
+        // Assert
+        Assert.IsEmpty(res);
+    }
+
+    [Test]
+    public void Can_Remove_Property_Type()
+    {
+        // Arrange
+        // Act
+        var content = ContentService.Create("Test", Constants.System.Root, "umbTextpage");
+
+        // Assert
+        Assert.That(content, Is.Not.Null);
+        Assert.That(content.HasIdentity, Is.False);
+    }
+
+    [Test]
+    public void Can_Create_Content()
+    {
+        // Arrange
+        // Act
+        var content = ContentService.Create("Test", Constants.System.Root, "umbTextpage");
+
+        // Assert
+        Assert.That(content, Is.Not.Null);
+        Assert.That(content.HasIdentity, Is.False);
+    }
+
+    public void Can_Create_Content_Without_Explicitly_Set_User()
+    {
+        // Arrange
+        // Act
+        var content = ContentService.Create("Test", Constants.System.Root, "umbTextpage");
+
+        // Assert
+        Assert.That(content, Is.Not.Null);
+        Assert.That(content.HasIdentity, Is.False);
+        Assert.That(content.CreatorId,
+            Is.EqualTo(Constants.Security
+                .SuperUserId)); // Default to -1 aka SuperUser (unknown) since we didn't explicitly set this in the Create call
+    }
+
+    [Test]
+    public void Can_Save_New_Content_With_Explicit_User()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
+        var content = new Content("Test", Constants.System.Root, ContentTypeService.Get("umbTextpage"));
+
+        // Act
+        ContentService.Save(content, user.Id);
+
+        // Assert
+        Assert.That(content.CreatorId, Is.EqualTo(user.Id));
+        Assert.That(content.WriterId, Is.EqualTo(user.Id));
+    }
+
+    [Test]
+    public void Cannot_Create_Content_With_Non_Existing_ContentType_Alias() =>
+        Assert.Throws<Exception>(() => ContentService.Create("Test", Constants.System.Root, "umbAliasDoesntExist"));
+
+    [Test]
+    public void Cannot_Save_Content_With_Empty_Name()
+    {
+        // Arrange
+        var content = new Content(string.Empty, Constants.System.Root, ContentTypeService.Get("umbTextpage"));
+
+        // Act & Assert
+        Assert.Throws<InvalidOperationException>(() => ContentService.Save(content));
+    }
+
+    [Test]
+    public void Can_Get_Content_By_Id()
+    {
+        // Arrange
+        // Act
+        var content = ContentService.GetById(Textpage.Id);
+
+        // Assert
+        Assert.That(content, Is.Not.Null);
+        Assert.That(content.Id, Is.EqualTo(Textpage.Id));
+    }
+
+    [Test]
+    public void Can_Get_Content_By_Guid_Key()
+    {
+        // Arrange
+        // Act
+        var content = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
+
+        // Assert
+        Assert.That(content, Is.Not.Null);
+        Assert.That(content.Id, Is.EqualTo(Textpage.Id));
+    }
+
+    [Test]
+    public void Can_Get_Content_By_Level()
+    {
+        // Arrange
+        // Act
+        var contents = ContentService.GetByLevel(2).ToList();
+
+        // Assert
+        Assert.That(contents, Is.Not.Null);
+        Assert.That(contents.Any(), Is.True);
+        Assert.That(contents.Count(), Is.GreaterThanOrEqualTo(2));
+    }
+
+    [Test]
+    public void Can_Get_All_Versions_Of_Content()
+    {
+        var parent = ContentService.GetById(Textpage.Id);
+        Assert.IsFalse(parent.Published);
+        ContentService.SaveAndPublish(parent); // publishing parent, so Text Page 2 can be updated.
+
+        var content = ContentService.GetById(Subpage.Id);
+        Assert.IsFalse(content.Published);
+        var versions = ContentService.GetVersions(Subpage.Id).ToList();
+        Assert.AreEqual(1, versions.Count);
+
+        var version1 = content.VersionId;
+        Console.WriteLine($"1 e={content.VersionId} p={content.PublishedVersionId}");
+
+        content.Name = "Text Page 2 Updated";
+        content.SetValue("author", "Jane Doe");
+        ContentService.SaveAndPublish(content); // publishes the current version, creates a version
+
+        var version2 = content.VersionId;
+        Console.WriteLine($"2 e={content.VersionId} p={content.PublishedVersionId}");
+
+        content.Name = "Text Page 2 ReUpdated";
+        content.SetValue("author", "Bob Hope");
+        ContentService.SaveAndPublish(content); // publishes again, creates a version
+
+        var version3 = content.VersionId;
+        Console.WriteLine($"3 e={content.VersionId} p={content.PublishedVersionId}");
+
+        var content1 = ContentService.GetById(content.Id);
+        Assert.AreEqual("Bob Hope", content1.GetValue("author"));
+        Assert.AreEqual("Bob Hope", content1.GetValue("author", published: true));
+
+        content.Name = "Text Page 2 ReReUpdated";
+        content.SetValue("author", "John Farr");
+        ContentService.Save(content); // no new version
+
+        content1 = ContentService.GetById(content.Id);
+        Assert.AreEqual("John Farr", content1.GetValue("author"));
+        Assert.AreEqual("Bob Hope", content1.GetValue("author", published: true));
+
+        versions = ContentService.GetVersions(Subpage.Id).ToList();
+        Assert.AreEqual(3, versions.Count);
+
+        // versions come with most recent first
+        Assert.AreEqual(version3, versions[0].VersionId); // the edited version
+        Assert.AreEqual(version2, versions[1].VersionId); // the published version
+        Assert.AreEqual(version1, versions[2].VersionId); // the previously published version
+
+        // p is always the same, published version
+        // e is changing, actual version we're loading
+        Console.WriteLine();
+        foreach (var version in ((IEnumerable<IContent>)versions).Reverse())
         {
-            IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr,
-                out ContentType contentType);
-
-            PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(published.Success);
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-
-            PublishResult unpublished = ContentService.Unpublish(content, langFr.IsoCode); // first culture
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.AreEqual(PublishedState.Published, content.PublishedState); // still published
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-
-            unpublished = ContentService.Unpublish(content, langUk.IsoCode); // last culture
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
-            Assert.AreEqual(PublishedState.Unpublished,
-                content.PublishedState); // the last culture was unpublished so the document should also reflect this
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); // just double checking
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+            Console.WriteLine($"+ e={((Content)version).VersionId} p={((Content)version).PublishedVersionId}");
         }
 
-        [Test]
-        public void Unpublishing_Mandatory_Language_Unpublishes_Document()
+        // and proper values
+        // first, the current (edited) version, with edited and published versions
+        Assert.AreEqual("John Farr", versions[0].GetValue("author")); // current version has the edited value
+        Assert.AreEqual("Bob Hope",
+            versions[0].GetValue("author", published: true)); // and the published published value
+
+        // then, the current (published) version, with edited == published
+        Assert.AreEqual("Bob Hope", versions[1].GetValue("author")); // own edited version
+        Assert.AreEqual("Bob Hope", versions[1].GetValue("author", published: true)); // and published
+
+        // then, the first published version - with values as 'edited'
+        Assert.AreEqual("Jane Doe", versions[2].GetValue("author")); // own edited version
+        Assert.AreEqual("Bob Hope", versions[2].GetValue("author", published: true)); // and published
+    }
+
+    [Test]
+    public void Can_Get_Root_Content()
+    {
+        // Arrange
+        // Act
+        var contents = ContentService.GetRootContent().ToList();
+
+        // Assert
+        Assert.That(contents, Is.Not.Null);
+        Assert.That(contents.Any(), Is.True);
+        Assert.That(contents.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void Can_Get_Content_For_Expiration()
+    {
+        // Arrange
+        var root = ContentService.GetById(Textpage.Id);
+        ContentService.SaveAndPublish(root);
+        var content = ContentService.GetById(Subpage.Id);
+        var contentSchedule = ContentScheduleCollection.CreateWithEntry(null, DateTime.Now.AddSeconds(1));
+        ContentService.PersistContentSchedule(content, contentSchedule);
+        ContentService.SaveAndPublish(content);
+
+        // Act
+        Thread.Sleep(new TimeSpan(0, 0, 0, 2));
+        var contents = ContentService.GetContentForExpiration(DateTime.Now).ToList();
+
+        // Assert
+        Assert.That(contents, Is.Not.Null);
+        Assert.That(contents.Any(), Is.True);
+        Assert.That(contents.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void Can_Get_Content_For_Release()
+    {
+        // Arrange
+        // Act
+        var contents = ContentService.GetContentForRelease(DateTime.Now).ToList();
+
+        // Assert
+        Assert.That(DateTime.Now.AddMinutes(-5) <= DateTime.Now);
+        Assert.That(contents, Is.Not.Null);
+        Assert.That(contents.Any(), Is.True);
+        Assert.That(contents.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void Can_Get_Content_In_RecycleBin()
+    {
+        // Arrange
+        // Act
+        var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
+
+        // Assert
+        Assert.That(contents, Is.Not.Null);
+        Assert.That(contents.Any(), Is.True);
+        Assert.That(contents.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void Can_Unpublish_Content()
+    {
+        // Arrange
+        var content = ContentService.GetById(Textpage.Id);
+        var published = ContentService.SaveAndPublish(content, userId: 0);
+
+        // Act
+        var unpublished = ContentService.Unpublish(content, userId: 0);
+
+        // Assert
+        Assert.That(published.Success, Is.True);
+        Assert.That(unpublished.Success, Is.True);
+        Assert.That(content.Published, Is.False);
+        Assert.AreEqual(PublishResultType.SuccessUnpublish, unpublished.Result);
+    }
+
+    [Test]
+    public void Can_Unpublish_Content_Variation()
+    {
+        var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr,
+            out var contentType);
+
+        content.PublishCulture(CultureImpact.Explicit(langFr.IsoCode, langFr.IsDefault));
+        content.PublishCulture(CultureImpact.Explicit(langUk.IsoCode, langUk.IsDefault));
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
+        var published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.IsTrue(published.Success);
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
+        var unpublished = ContentService.Unpublish(content, langFr.IsoCode);
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+    }
+
+    [Test]
+    public void Can_Publish_Culture_After_Last_Culture_Unpublished()
+    {
+        var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr,
+            out var contentType);
+
+        var published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+
+        var unpublished = ContentService.Unpublish(content, langUk.IsoCode); // first culture
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+
+        content = ContentService.GetById(content.Id);
+
+        unpublished = ContentService.Unpublish(content, langFr.IsoCode); // last culture
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+
+        content = ContentService.GetById(content.Id);
+
+        published = ContentService.SaveAndPublish(content, langUk.IsoCode);
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+
+        content = ContentService.GetById(content.Id); // reget
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+    }
+
+    [Test]
+    public void Unpublish_All_Cultures_Has_Unpublished_State()
+    {
+        var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr,
+            out var contentType);
+
+        var published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsTrue(published.Success);
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+        var unpublished = ContentService.Unpublish(content, langFr.IsoCode); // first culture
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.AreEqual(PublishedState.Published, content.PublishedState); // still published
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
+        unpublished = ContentService.Unpublish(content, langUk.IsoCode); // last culture
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishLastCulture, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+        Assert.AreEqual(PublishedState.Unpublished,
+            content.PublishedState); // the last culture was unpublished so the document should also reflect this
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.AreEqual(PublishedState.Unpublished, content.PublishedState); // just double checking
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+    }
+
+    [Test]
+    public void Unpublishing_Mandatory_Language_Unpublishes_Document()
+    {
+        var langUk = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .WithIsMandatory(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+
+        LocalizationService.Save(langFr);
+        LocalizationService.Save(langUk);
+
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        IContent content = new Content("content", Constants.System.Root, contentType);
+        content.SetCultureName("content-fr", langFr.IsoCode);
+        content.SetCultureName("content-en", langUk.IsoCode);
+
+        var published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsTrue(published.Success);
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+
+        var unpublished = ContentService.Unpublish(content, langUk.IsoCode); // unpublish mandatory lang
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishMandatoryCulture, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode)); // remains published
+        Assert.AreEqual(PublishedState.Unpublished, content.PublishedState);
+    }
+
+    [Test]
+    public void Unpublishing_Already_Unpublished_Culture()
+    {
+        var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr,
+            out var contentType);
+
+        var published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsTrue(published.Success);
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+
+        var unpublished = ContentService.Unpublish(content, langUk.IsoCode);
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+
+        content = ContentService.GetById(content.Id);
+
+        // Change some data since Unpublish should always Save
+        content.SetCultureName("content-en-updated", langUk.IsoCode);
+
+        unpublished = ContentService.Unpublish(content, langUk.IsoCode); // unpublish again
+        Assert.IsTrue(unpublished.Success);
+        Assert.AreEqual(PublishResultType.SuccessUnpublishAlready, unpublished.Result);
+        Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
+
+        content = ContentService.GetById(content.Id);
+
+        // ensure that even though the culture was already unpublished that the data was still persisted
+        Assert.AreEqual("content-en-updated", content.GetCultureName(langUk.IsoCode));
+    }
+
+    [Test]
+    public void Publishing_No_Cultures_Still_Saves()
+    {
+        var content = CreateEnglishAndFrenchDocument(out var langUk, out var langFr,
+            out var contentType);
+
+        var published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+        Assert.IsTrue(published.Success);
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+
+        // Change some data since SaveAndPublish should always Save
+        content.SetCultureName("content-en-updated", langUk.IsoCode);
+
+        var saved = ContentService.SaveAndPublish(content, new string[] { }); // save without cultures
+        Assert.AreEqual(PublishResultType.FailedPublishNothingToPublish, saved.Result);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+
+        // ensure that even though nothing was published that the data was still persisted
+        Assert.AreEqual("content-en-updated", content.GetCultureName(langUk.IsoCode));
+    }
+
+    [Test]
+    public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_State()
+    {
+        // Arrange
+        var langGb = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+
+        LocalizationService.Save(langFr);
+        LocalizationService.Save(langGb);
+
+        var contentType = ContentTypeBuilder.CreateMetaContentType();
+        contentType.Variations = ContentVariation.Culture;
+        foreach (var prop in contentType.PropertyTypes)
         {
-            ILanguage langUk = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .WithIsMandatory(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-
-            LocalizationService.Save(langFr);
-            LocalizationService.Save(langUk);
-
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            content.SetCultureName("content-en", langUk.IsoCode);
-
-            PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(published.Success);
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-
-            PublishResult unpublished = ContentService.Unpublish(content, langUk.IsoCode); // unpublish mandatory lang
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishMandatoryCulture, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode)); // remains published
-            Assert.AreEqual(PublishedState.Unpublished, content.PublishedState);
+            prop.Variations = ContentVariation.Culture;
         }
 
-        [Test]
-        public void Unpublishing_Already_Unpublished_Culture()
+        var keywordsProp = contentType.PropertyTypes.Single(x => x.Alias == "metakeywords");
+        keywordsProp.Variations = ContentVariation.Nothing; // this one is invariant
+
+        ContentTypeService.Save(contentType);
+
+        IContent content = new Content("content", Constants.System.Root, contentType);
+        content.SetCultureName("content-en", langGb.IsoCode);
+        content.SetCultureName("content-fr", langFr.IsoCode);
+
+        Assert.IsTrue(ContentService.SaveAndPublish(content, new[] { langGb.IsoCode, langFr.IsoCode }).Success);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+        Assert.IsTrue(content.IsCulturePublished(langGb.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsFalse(content.IsCultureEdited(langGb.IsoCode));
+        Assert.IsFalse(content.IsCultureEdited(langFr.IsoCode));
+
+        // update the invariant property and save a pending version
+        content.SetValue("metakeywords", "hello");
+        ContentService.Save(content);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+        Assert.IsTrue(content.IsCulturePublished(langGb.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCultureEdited(langGb.IsoCode));
+        Assert.IsFalse(content.IsCultureEdited(langFr.IsoCode));
+    }
+
+    [Test]
+    public void Can_Publish_Content_Variation_And_Detect_Changed_Cultures()
+    {
+        CreateEnglishAndFrenchDocumentType(out var langUk, out var langFr, out var contentType);
+
+        IContent content = new Content("content", Constants.System.Root, contentType);
+        content.SetCultureName("content-fr", langFr.IsoCode);
+        var published = ContentService.SaveAndPublish(content, langFr.IsoCode);
+
+        // audit log will only show that french was published
+        var lastLog = AuditService.GetLogs(content.Id).Last();
+        Assert.AreEqual("Published languages: French (France)", lastLog.Comment);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        content.SetCultureName("content-en", langUk.IsoCode);
+        published = ContentService.SaveAndPublish(content, langUk.IsoCode);
+
+        // audit log will only show that english was published
+        lastLog = AuditService.GetLogs(content.Id).Last();
+        Assert.AreEqual("Published languages: English (United Kingdom)", lastLog.Comment);
+    }
+
+    [Test]
+    public void Can_Unpublish_Content_Variation_And_Detect_Changed_Cultures()
+    {
+        // Arrange
+        var langGb = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .WithIsMandatory(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+
+        LocalizationService.Save(langFr);
+        LocalizationService.Save(langGb);
+
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        IContent content = new Content("content", Constants.System.Root, contentType);
+        content.SetCultureName("content-fr", langFr.IsoCode);
+        content.SetCultureName("content-gb", langGb.IsoCode);
+        var published = ContentService.SaveAndPublish(content, new[] { langGb.IsoCode, langFr.IsoCode });
+        Assert.IsTrue(published.Success);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        var unpublished = ContentService.Unpublish(content, langFr.IsoCode);
+
+        // audit log will only show that french was unpublished
+        var lastLog = AuditService.GetLogs(content.Id).Last();
+        Assert.AreEqual("Unpublished languages: French (France)", lastLog.Comment);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        content.SetCultureName("content-en", langGb.IsoCode);
+        unpublished = ContentService.Unpublish(content, langGb.IsoCode);
+
+        // audit log will only show that english was published
+        var logs = AuditService.GetLogs(content.Id).ToList();
+        Assert.AreEqual("Unpublished languages: English (United Kingdom)", logs[^2].Comment);
+        Assert.AreEqual("Unpublished (mandatory language unpublished)", logs[^1].Comment);
+    }
+
+    [Test]
+    public void Can_Publish_Content_1()
+    {
+        // Arrange
+        var content = ContentService.GetById(Textpage.Id);
+
+        // Act
+        var published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
+
+        // Assert
+        Assert.That(published.Success, Is.True);
+        Assert.That(content.Published, Is.True);
+    }
+
+    [Test]
+    public void Can_Publish_Content_2()
+    {
+        // Arrange
+        var content = ContentService.GetById(Textpage.Id);
+
+        // Act
+        var published = ContentService.SaveAndPublish(content, userId: 0);
+
+        // Assert
+        Assert.That(published.Success, Is.True);
+        Assert.That(content.Published, Is.True);
+    }
+
+    [Test]
+    public void IsPublishable()
+    {
+        // Arrange
+        var parent = ContentService.Create("parent", Constants.System.Root, "umbTextpage");
+
+        ContentService.SaveAndPublish(parent);
+        var content = ContentService.Create("child", parent, "umbTextpage");
+        ContentService.Save(content);
+
+        Assert.IsTrue(ContentService.IsPathPublishable(content));
+        ContentService.Unpublish(parent);
+        Assert.IsFalse(ContentService.IsPathPublishable(content));
+    }
+
+    [Test]
+    public void Can_Publish_Content_WithEvents()
+    {
+        var publishingWasCalled = false;
+
+        ContentNotificationHandler.PublishingContent = notification =>
         {
-            IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr,
-                out ContentType contentType);
+            Assert.AreEqual(1, notification.PublishedEntities.Count());
+            var entity = notification.PublishedEntities.First();
+            Assert.AreEqual("foo", entity.Name);
 
-            PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(published.Success);
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+            var e = ContentService.GetById(entity.Id);
+            Assert.AreEqual("Home", e.Name);
 
-            // re-get
-            content = ContentService.GetById(content.Id);
+            publishingWasCalled = true;
+        };
 
-            PublishResult unpublished = ContentService.Unpublish(content, langUk.IsoCode);
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishCulture, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
-
-            content = ContentService.GetById(content.Id);
-
-            // Change some data since Unpublish should always Save
-            content.SetCultureName("content-en-updated", langUk.IsoCode);
-
-            unpublished = ContentService.Unpublish(content, langUk.IsoCode); // unpublish again
-            Assert.IsTrue(unpublished.Success);
-            Assert.AreEqual(PublishResultType.SuccessUnpublishAlready, unpublished.Result);
-            Assert.IsFalse(content.IsCulturePublished(langUk.IsoCode));
-
-            content = ContentService.GetById(content.Id);
-
-            // ensure that even though the culture was already unpublished that the data was still persisted
-            Assert.AreEqual("content-en-updated", content.GetCultureName(langUk.IsoCode));
-        }
-
-        [Test]
-        public void Publishing_No_Cultures_Still_Saves()
+        // tests that during 'publishing' event, what we get from the repo is the 'old' content,
+        // because 'publishing' fires before the 'saved' event ie before the content is actually
+        // saved
+        try
         {
-            IContent content = CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr,
-                out ContentType contentType);
+            var content = ContentService.GetById(Textpage.Id);
+            Assert.AreEqual("Home", content.Name);
 
-            PublishResult published = ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-            Assert.IsTrue(published.Success);
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
+            content.Name = "foo";
+            var published =
+                ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
-            // re-get
-            content = ContentService.GetById(content.Id);
-
-            // Change some data since SaveAndPublish should always Save
-            content.SetCultureName("content-en-updated", langUk.IsoCode);
-
-            PublishResult saved = ContentService.SaveAndPublish(content, new string[] { }); // save without cultures
-            Assert.AreEqual(PublishResultType.FailedPublishNothingToPublish, saved.Result);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-
-            // ensure that even though nothing was published that the data was still persisted
-            Assert.AreEqual("content-en-updated", content.GetCultureName(langUk.IsoCode));
-        }
-
-        [Test]
-        public void Pending_Invariant_Property_Changes_Affect_Default_Language_Edited_State()
-        {
-            // Arrange
-            ILanguage langGb = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-
-            LocalizationService.Save(langFr);
-            LocalizationService.Save(langGb);
-
-            ContentType contentType = ContentTypeBuilder.CreateMetaContentType();
-            contentType.Variations = ContentVariation.Culture;
-            foreach (IPropertyType prop in contentType.PropertyTypes)
-            {
-                prop.Variations = ContentVariation.Culture;
-            }
-
-            IPropertyType keywordsProp = contentType.PropertyTypes.Single(x => x.Alias == "metakeywords");
-            keywordsProp.Variations = ContentVariation.Nothing; // this one is invariant
-
-            ContentTypeService.Save(contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-en", langGb.IsoCode);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-
-            Assert.IsTrue(ContentService.SaveAndPublish(content, new[] { langGb.IsoCode, langFr.IsoCode }).Success);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-            Assert.IsTrue(content.IsCulturePublished(langGb.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsFalse(content.IsCultureEdited(langGb.IsoCode));
-            Assert.IsFalse(content.IsCultureEdited(langFr.IsoCode));
-
-            // update the invariant property and save a pending version
-            content.SetValue("metakeywords", "hello");
-            ContentService.Save(content);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-            Assert.IsTrue(content.IsCulturePublished(langGb.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCultureEdited(langGb.IsoCode));
-            Assert.IsFalse(content.IsCultureEdited(langFr.IsoCode));
-        }
-
-        [Test]
-        public void Can_Publish_Content_Variation_And_Detect_Changed_Cultures()
-        {
-            CreateEnglishAndFrenchDocumentType(out Language langUk, out Language langFr, out ContentType contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            PublishResult published = ContentService.SaveAndPublish(content, langFr.IsoCode);
-
-            // audit log will only show that french was published
-            IAuditItem lastLog = AuditService.GetLogs(content.Id).Last();
-            Assert.AreEqual("Published languages: French (France)", lastLog.Comment);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            content.SetCultureName("content-en", langUk.IsoCode);
-            published = ContentService.SaveAndPublish(content, langUk.IsoCode);
-
-            // audit log will only show that english was published
-            lastLog = AuditService.GetLogs(content.Id).Last();
-            Assert.AreEqual("Published languages: English (United Kingdom)", lastLog.Comment);
-        }
-
-        [Test]
-        public void Can_Unpublish_Content_Variation_And_Detect_Changed_Cultures()
-        {
-            // Arrange
-            ILanguage langGb = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .WithIsMandatory(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-
-            LocalizationService.Save(langFr);
-            LocalizationService.Save(langGb);
-
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            content.SetCultureName("content-gb", langGb.IsoCode);
-            PublishResult published = ContentService.SaveAndPublish(content, new[] { langGb.IsoCode, langFr.IsoCode });
-            Assert.IsTrue(published.Success);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            PublishResult unpublished = ContentService.Unpublish(content, langFr.IsoCode);
-
-            // audit log will only show that french was unpublished
-            IAuditItem lastLog = AuditService.GetLogs(content.Id).Last();
-            Assert.AreEqual("Unpublished languages: French (France)", lastLog.Comment);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            content.SetCultureName("content-en", langGb.IsoCode);
-            unpublished = ContentService.Unpublish(content, langGb.IsoCode);
-
-            // audit log will only show that english was published
-            var logs = AuditService.GetLogs(content.Id).ToList();
-            Assert.AreEqual("Unpublished languages: English (United Kingdom)", logs[^2].Comment);
-            Assert.AreEqual("Unpublished (mandatory language unpublished)", logs[^1].Comment);
-        }
-
-        [Test]
-        public void Can_Publish_Content_1()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Textpage.Id);
-
-            // Act
-            PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-            // Assert
             Assert.That(published.Success, Is.True);
             Assert.That(content.Published, Is.True);
+
+            var e = ContentService.GetById(content.Id);
+            Assert.AreEqual("foo", e.Name);
+
+            Assert.IsTrue(publishingWasCalled);
         }
-
-        [Test]
-        public void Can_Publish_Content_2()
+        finally
         {
-            // Arrange
-            IContent content = ContentService.GetById(Textpage.Id);
-
-            // Act
-            PublishResult published = ContentService.SaveAndPublish(content, userId: 0);
-
-            // Assert
-            Assert.That(published.Success, Is.True);
-            Assert.That(content.Published, Is.True);
+            ContentNotificationHandler.PublishingContent = null;
         }
+    }
 
-        [Test]
-        public void IsPublishable()
+    [Test]
+    public void Can_Not_Publish_Invalid_Cultures()
+    {
+        var content = new ContentBuilder()
+            .AddContentType()
+            .WithContentVariation(ContentVariation.Culture)
+            .Done()
+            .Build();
+
+        Assert.Throws<InvalidOperationException>(() => ContentService.SaveAndPublish(content, new[] { "*" }));
+        Assert.Throws<InvalidOperationException>(
+            () => ContentService.SaveAndPublish(content, new string[] { null }));
+        Assert.Throws<InvalidOperationException>(() => ContentService.SaveAndPublish(content, new[] { "*", null }));
+        Assert.Throws<InvalidOperationException>(() =>
+            ContentService.SaveAndPublish(content, new[] { "en-US", "*", "es-ES" }));
+    }
+
+    [Test]
+    public void Can_Publish_Only_Valid_Content()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+            mandatoryProperties: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var parentId = Textpage.Id;
+
+        var parent = ContentService.GetById(parentId);
+
+        var parentPublished = ContentService.SaveAndPublish(parent);
+
+        // parent can publish values
+        // and therefore can be published
+        Assert.IsTrue(parentPublished.Success);
+        Assert.IsTrue(parent.Published);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType, "Invalid Content", parentId);
+        content.SetValue("author", string.Empty);
+        Assert.IsFalse(content.HasIdentity);
+
+        // content cannot publish values because they are invalid
+        var propertyValidationService = new PropertyValidationService(PropertyEditorCollection, DataTypeService,
+            TextService, ValueEditorCache);
+        var isValid = propertyValidationService.IsPropertyDataValid(content, out var invalidProperties,
+            CultureImpact.Invariant);
+        Assert.IsFalse(isValid);
+        Assert.IsNotEmpty(invalidProperties);
+
+        // and therefore cannot be published,
+        // because it did not have a published version at all
+        var contentPublished = ContentService.SaveAndPublish(content);
+        Assert.IsFalse(contentPublished.Success);
+        Assert.AreEqual(PublishResultType.FailedPublishContentInvalid, contentPublished.Result);
+        Assert.IsFalse(content.Published);
+
+        // Ensure it saved though
+        Assert.Greater(content.Id, 0);
+        Assert.IsTrue(content.HasIdentity);
+    }
+
+    [Test]
+    public void Can_Publish_And_Unpublish_Cultures_In_Single_Operation()
+    {
+        // TODO: This is using an internal API - we aren't exposing this publicly (at least for now) but we'll keep the test around
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr")
+            .Build();
+        var langDa = new LanguageBuilder()
+            .WithCultureInfo("da")
+            .Build();
+        LocalizationService.Save(langFr);
+        LocalizationService.Save(langDa);
+
+        var ct = ContentTypeBuilder.CreateBasicContentType();
+        ct.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(ct);
+
+        IContent content = ContentBuilder.CreateBasicContent(ct);
+        content.SetCultureName("name-fr", langFr.IsoCode);
+        content.SetCultureName("name-da", langDa.IsoCode);
+
+        content.PublishCulture(CultureImpact.Explicit(langFr.IsoCode, langFr.IsDefault));
+        var result = ContentService.CommitDocumentChanges(content);
+        Assert.IsTrue(result.Success);
+        content = ContentService.GetById(content.Id);
+        Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsFalse(content.IsCulturePublished(langDa.IsoCode));
+
+        content.UnpublishCulture(langFr.IsoCode);
+        content.PublishCulture(CultureImpact.Explicit(langDa.IsoCode, langDa.IsDefault));
+
+        result = ContentService.CommitDocumentChanges(content);
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(PublishResultType.SuccessMixedCulture, result.Result);
+
+        content = ContentService.GetById(content.Id);
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langDa.IsoCode));
+    }
+
+    // documents: an enumeration of documents, in tree order
+    // map: applies (if needed) PublishValue, returns a value indicating whether to proceed with the branch
+    private IEnumerable<IContent> MapPublishValues(IEnumerable<IContent> documents, Func<IContent, bool> map)
+    {
+        var exclude = new HashSet<int>();
+        foreach (var document in documents)
         {
-            // Arrange
-            IContent parent = ContentService.Create("parent", Constants.System.Root, "umbTextpage");
-
-            ContentService.SaveAndPublish(parent);
-            IContent content = ContentService.Create("child", parent, "umbTextpage");
-            ContentService.Save(content);
-
-            Assert.IsTrue(ContentService.IsPathPublishable(content));
-            ContentService.Unpublish(parent);
-            Assert.IsFalse(ContentService.IsPathPublishable(content));
-        }
-
-        [Test]
-        public void Can_Publish_Content_WithEvents()
-        {
-            var publishingWasCalled = false;
-
-            ContentNotificationHandler.PublishingContent = notification =>
+            if (exclude.Contains(document.ParentId))
             {
-                Assert.AreEqual(1, notification.PublishedEntities.Count());
-                IContent entity = notification.PublishedEntities.First();
-                Assert.AreEqual("foo", entity.Name);
-
-                IContent e = ContentService.GetById(entity.Id);
-                Assert.AreEqual("Home", e.Name);
-
-                publishingWasCalled = true;
-            };
-
-            // tests that during 'publishing' event, what we get from the repo is the 'old' content,
-            // because 'publishing' fires before the 'saved' event ie before the content is actually
-            // saved
-            try
-            {
-                IContent content = ContentService.GetById(Textpage.Id);
-                Assert.AreEqual("Home", content.Name);
-
-                content.Name = "foo";
-                PublishResult published =
-                    ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-                Assert.That(published.Success, Is.True);
-                Assert.That(content.Published, Is.True);
-
-                IContent e = ContentService.GetById(content.Id);
-                Assert.AreEqual("foo", e.Name);
-
-                Assert.IsTrue(publishingWasCalled);
+                exclude.Add(document.Id);
+                continue;
             }
-            finally
+
+            if (!map(document))
             {
-                ContentNotificationHandler.PublishingContent = null;
+                exclude.Add(document.Id);
+                continue;
+            }
+
+            yield return document;
+        }
+    }
+
+    [Test]
+    public void Can_Publish_Content_Children()
+    {
+        var parentId = Textpage.Id;
+
+        var parent = ContentService.GetById(parentId);
+
+        Console.WriteLine(" " + parent.Id);
+        const int pageSize = 500;
+        var page = 0;
+        var total = long.MaxValue;
+        while (page * pageSize < total)
+        {
+            var descendants =
+                ContentService.GetPagedDescendants(parent.Id, page++, pageSize, out total);
+            foreach (var x in descendants)
+            {
+                Console.WriteLine("          "[..x.Level] + x.Id);
             }
         }
 
-        [Test]
-        public void Can_Not_Publish_Invalid_Cultures()
-        {
-            Content content = new ContentBuilder()
-                .AddContentType()
-                .WithContentVariation(ContentVariation.Culture)
-                .Done()
-                .Build();
+        Console.WriteLine();
 
-            Assert.Throws<InvalidOperationException>(() => ContentService.SaveAndPublish(content, new[] { "*" }));
-            Assert.Throws<InvalidOperationException>(
-                () => ContentService.SaveAndPublish(content, new string[] { null }));
-            Assert.Throws<InvalidOperationException>(() => ContentService.SaveAndPublish(content, new[] { "*", null }));
-            Assert.Throws<InvalidOperationException>(() =>
-                ContentService.SaveAndPublish(content, new[] { "en-US", "*", "es-ES" }));
+        // publish parent & its branch
+        // only those that are not already published
+        // only invariant/neutral values
+        var parentPublished = ContentService.SaveAndPublishBranch(parent, true);
+
+        foreach (var result in parentPublished)
+        {
+            Console.WriteLine("          "[..result.Content.Level] +
+                              $"{result.Content.Id}: {result.Result}");
         }
 
-        [Test]
-        public void Can_Publish_Only_Valid_Content()
+        // everything should be successful
+        Assert.IsTrue(parentPublished.All(x => x.Success));
+        Assert.IsTrue(parent.Published);
+
+        var
+            children = ContentService.GetPagedChildren(parentId, 0, 500,
+                out var totalChildren); // we only want the first so page size, etc.. is abitrary
+
+        // children are published including ... that was released 5 mins ago
+        Assert.IsTrue(children.First(x => x.Id == Subpage.Id).Published);
+    }
+
+    [Test]
+    public void Cannot_Publish_Expired_Content()
+    {
+        // Arrange
+        var content = ContentService.GetById(Subpage.Id); // This Content expired 5min ago
+        var contentSchedule = ContentScheduleCollection.CreateWithEntry(null, DateTime.Now.AddMinutes(-5));
+        ContentService.Save(content, contentSchedule: contentSchedule);
+
+        var parent = ContentService.GetById(Textpage.Id);
+        var parentPublished =
+            ContentService.SaveAndPublish(parent,
+                userId: Constants.Security
+                    .SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id'
+
+        // Act
+        var published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
+
+        // Assert
+        Assert.That(parentPublished.Success, Is.True);
+        Assert.That(published.Success, Is.False);
+        Assert.That(content.Published, Is.False);
+        Assert.AreEqual(PublishResultType.FailedPublishHasExpired, published.Result);
+    }
+
+    [Test]
+    public void Cannot_Publish_Expired_Culture()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateBasicContent(contentType);
+        content.SetCultureName("Hello", "en-US");
+        var contentSchedule = ContentScheduleCollection.CreateWithEntry("en-US", null, DateTime.Now.AddMinutes(-5));
+        ContentService.Save(content, contentSchedule: contentSchedule);
+
+        var published = ContentService.SaveAndPublish(content, "en-US");
+
+        Assert.IsFalse(published.Success);
+        Assert.AreEqual(PublishResultType.FailedPublishCultureHasExpired, published.Result);
+        Assert.That(content.Published, Is.False);
+    }
+
+    [Test]
+    public void Cannot_Publish_Content_Awaiting_Release()
+    {
+        // Arrange
+        var content = ContentService.GetById(Subpage.Id);
+        var contentSchedule = ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddHours(2), null);
+        ContentService.Save(content, Constants.Security.SuperUserId, contentSchedule);
+
+        var parent = ContentService.GetById(Textpage.Id);
+        var parentPublished =
+            ContentService.SaveAndPublish(parent,
+                userId: Constants.Security
+                    .SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id'
+
+        // Act
+        var published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
+
+        // Assert
+        Assert.That(parentPublished.Success, Is.True);
+        Assert.That(published.Success, Is.False);
+        Assert.That(content.Published, Is.False);
+        Assert.AreEqual(PublishResultType.FailedPublishAwaitingRelease, published.Result);
+    }
+
+    [Test]
+    public void Failed_Publish_Should_Not_Update_Edited_State_When_Edited_True()
+    {
+        // Arrange
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("header")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("header")
+            .Done()
+            .WithContentVariation(ContentVariation.Nothing)
+            .Build();
+
+        contentTypeService.Save(contentType);
+
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithName("Home")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("header", "Cool header")
+            .Done()
+            .Build();
+
+        contentService.SaveAndPublish(content);
+
+        content.Properties[0].SetValue("Foo", string.Empty);
+        contentService.Save(content);
+        contentService.PersistContentSchedule(content,
+            ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddHours(2), null));
+
+        // Act
+        var result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
+
+        // Assert
+        Assert.Multiple(() =>
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
+            Assert.IsFalse(result.Success);
+            Assert.IsTrue(result.Content.Published);
+            Assert.AreEqual(PublishResultType.FailedPublishAwaitingRelease, result.Result);
 
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
-                mandatoryProperties: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
+            // We changed property data
+            Assert.IsTrue(result.Content.Edited, "result.Content.Edited");
+        });
+    }
 
-            var parentId = Textpage.Id;
+    // V9 - Tests.Integration
+    [Test]
+    public void Failed_Publish_Should_Not_Update_Edited_State_When_Edited_False()
+    {
+        // Arrange
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
 
-            IContent parent = ContentService.GetById(parentId);
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("header")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("header")
+            .Done()
+            .WithContentVariation(ContentVariation.Nothing)
+            .Build();
 
-            PublishResult parentPublished = ContentService.SaveAndPublish(parent);
+        contentTypeService.Save(contentType);
 
-            // parent can publish values
-            // and therefore can be published
-            Assert.IsTrue(parentPublished.Success);
-            Assert.IsTrue(parent.Published);
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithName("Home")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("header", "Cool header")
+            .Done()
+            .Build();
 
-            Content content = ContentBuilder.CreateSimpleContent(contentType, "Invalid Content", parentId);
-            content.SetValue("author", string.Empty);
-            Assert.IsFalse(content.HasIdentity);
+        contentService.SaveAndPublish(content);
 
-            // content cannot publish values because they are invalid
-            var propertyValidationService = new PropertyValidationService(PropertyEditorCollection, DataTypeService,
-                TextService, ValueEditorCache);
-            var isValid = propertyValidationService.IsPropertyDataValid(content, out IProperty[] invalidProperties,
-                CultureImpact.Invariant);
-            Assert.IsFalse(isValid);
-            Assert.IsNotEmpty(invalidProperties);
+        contentService.PersistContentSchedule(content,
+            ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddHours(2), null));
+        contentService.Save(content);
 
-            // and therefore cannot be published,
-            // because it did not have a published version at all
-            PublishResult contentPublished = ContentService.SaveAndPublish(content);
-            Assert.IsFalse(contentPublished.Success);
-            Assert.AreEqual(PublishResultType.FailedPublishContentInvalid, contentPublished.Result);
-            Assert.IsFalse(content.Published);
+        // Act
+        var result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
 
-            // Ensure it saved though
-            Assert.Greater(content.Id, 0);
-            Assert.IsTrue(content.HasIdentity);
+        // Assert
+        Assert.Multiple(() =>
+        {
+            Assert.IsFalse(result.Success);
+            Assert.IsTrue(result.Content.Published);
+            Assert.AreEqual(PublishResultType.FailedPublishAwaitingRelease, result.Result);
+
+            // We didn't change any property data
+            Assert.IsFalse(result.Content.Edited, "result.Content.Edited");
+        });
+    }
+
+
+    [Test]
+    public void Cannot_Publish_Culture_Awaiting_Release()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateBasicContent(contentType);
+        content.SetCultureName("Hello", "en-US");
+        var contentSchedule = ContentScheduleCollection.CreateWithEntry("en-US", DateTime.Now.AddHours(2), null);
+        ContentService.Save(content, contentSchedule: contentSchedule);
+
+        var published = ContentService.SaveAndPublish(content, "en-US");
+
+        Assert.IsFalse(published.Success);
+        Assert.AreEqual(PublishResultType.FailedPublishCultureAwaitingRelease, published.Result);
+        Assert.That(content.Published, Is.False);
+    }
+
+    [Test]
+    public void Cannot_Publish_Content_Where_Parent_Is_Unpublished()
+    {
+        // Arrange
+        var content = ContentService.Create("Subpage with Unpublished Parent", Textpage.Id, "umbTextpage");
+        ContentService.Save(content);
+
+        // Act
+        var published = ContentService.SaveAndPublishBranch(content, true);
+
+        // Assert
+        Assert.That(published.All(x => x.Success), Is.False);
+        Assert.That(content.Published, Is.False);
+    }
+
+    [Test]
+    public void Cannot_Publish_Trashed_Content()
+    {
+        // Arrange
+        var content = ContentService.GetById(Trashed.Id);
+
+        // Act
+        var published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
+
+        // Assert
+        Assert.That(published.Success, Is.False);
+        Assert.That(content.Published, Is.False);
+        Assert.That(content.Trashed, Is.True);
+    }
+
+    [Test]
+    public void Can_Save_And_Publish_Content()
+    {
+        // Arrange
+        var content = ContentService.Create("Home US", -1, "umbTextpage");
+        content.SetValue("author", "Barack Obama");
+
+        // Act
+        var published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
+
+        // Assert
+        Assert.That(content.HasIdentity, Is.True);
+        Assert.That(content.Published, Is.True);
+        Assert.IsTrue(published.Success);
+    }
+
+    /// <summary>
+    ///     Try to immitate a new child content item being created through the UI.
+    ///     This content item will have no Id, Path or Identity.
+    ///     It seems like this is wiped somewhere in the process when creating an item through the UI
+    ///     and we need to make sure we handle nullchecks for these properties when creating content.
+    ///     This is unfortunately not caught by the normal ContentService tests.
+    /// </summary>
+    [Test]
+    public void Can_Save_And_Publish_Content_And_Child_Without_Identity()
+    {
+        // Arrange
+        var content = ContentService.Create("Home US", Constants.System.Root, "umbTextpage");
+        content.SetValue("author", "Barack Obama");
+
+        // Act
+        var published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
+        var childContent = ContentService.Create("Child", content.Id, "umbTextpage");
+
+        // Reset all identity properties
+        childContent.Id = 0;
+        childContent.Path = null;
+        ((Content)childContent).ResetIdentity();
+        var childPublished =
+            ContentService.SaveAndPublish(childContent, userId: Constants.Security.SuperUserId);
+
+        // Assert
+        Assert.That(content.HasIdentity, Is.True);
+        Assert.That(content.Published, Is.True);
+        Assert.That(childContent.HasIdentity, Is.True);
+        Assert.That(childContent.Published, Is.True);
+        Assert.That(published.Success, Is.True);
+        Assert.That(childPublished.Success, Is.True);
+    }
+
+    [Test]
+    public void Can_Get_Published_Descendant_Versions()
+    {
+        // Arrange
+        var root = ContentService.GetById(Textpage.Id);
+        var rootPublished = ContentService.SaveAndPublish(root);
+
+        var content = ContentService.GetById(Subpage.Id);
+        content.Properties["title"].SetValue(content.Properties["title"].GetValue() + " Published");
+        var contentPublished = ContentService.SaveAndPublish(content);
+        var publishedVersion = content.VersionId;
+
+        content.Properties["title"].SetValue(content.Properties["title"].GetValue() + " Saved");
+        ContentService.Save(content);
+        Assert.AreEqual(publishedVersion, content.VersionId);
+
+        // Act
+        var publishedDescendants = ContentService.GetPublishedDescendants(root).ToList();
+        Assert.AreNotEqual(0, publishedDescendants.Count);
+
+        // Assert
+        Assert.IsTrue(rootPublished.Success);
+        Assert.IsTrue(contentPublished.Success);
+
+        // Console.WriteLine(publishedVersion);
+        // foreach (var d in publishedDescendants) Console.WriteLine(d.Version);
+        Assert.IsTrue(publishedDescendants.Any(x => x.VersionId == publishedVersion));
+
+        // Ensure that the published content version has the correct property value and is marked as published
+        var publishedContentVersion = publishedDescendants.First(x => x.VersionId == publishedVersion);
+        Assert.That(publishedContentVersion.Published, Is.True);
+        Assert.That(publishedContentVersion.Properties["title"].GetValue(published: true),
+            Contains.Substring("Published"));
+
+        // and has the correct draft properties
+        Assert.That(publishedContentVersion.Properties["title"].GetValue(), Contains.Substring("Saved"));
+
+        // Ensure that the latest version of the content is ok
+        var currentContent = ContentService.GetById(Subpage.Id);
+        Assert.That(currentContent.Published, Is.True);
+        Assert.That(currentContent.Properties["title"].GetValue(published: true), Contains.Substring("Published"));
+        Assert.That(currentContent.Properties["title"].GetValue(), Contains.Substring("Saved"));
+        Assert.That(currentContent.VersionId, Is.EqualTo(publishedContentVersion.VersionId));
+    }
+
+    [Test]
+    public void Can_Save_Content()
+    {
+        // Arrange
+        var content = ContentService.Create("Home US", -1, "umbTextpage");
+        content.SetValue("author", "Barack Obama");
+
+        // Act
+        ContentService.Save(content);
+
+        // Assert
+        Assert.That(content.HasIdentity, Is.True);
+    }
+
+    [Test]
+    public void Can_Update_Content_Property_Values()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        IContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+        IContent content = ContentBuilder.CreateSimpleContent(contentType, "hello");
+        content.SetValue("title", "title of mine");
+        content.SetValue("bodyText", "hello world");
+        ContentService.SaveAndPublish(content);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        content.SetValue("title", "another title of mine"); // Change a value
+        content.SetValue("bodyText", null); // Clear a value
+        content.SetValue("author", "new author"); // Add a value
+        ContentService.SaveAndPublish(content);
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.AreEqual("another title of mine", content.GetValue("title"));
+        Assert.IsNull(content.GetValue("bodyText"));
+        Assert.AreEqual("new author", content.GetValue("author"));
+
+        content.SetValue("title", "new title");
+        content.SetValue("bodyText", "new body text");
+        content.SetValue("author", "new author text");
+        ContentService.Save(content); // new non-published version
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        content.SetValue("title", null); // Clear a value
+        content.SetValue("bodyText", null); // Clear a value
+        ContentService.Save(content); // saving non-published version
+
+        // re-get
+        content = ContentService.GetById(content.Id);
+        Assert.IsNull(content.GetValue("title")); // Test clearing the value worked with the non-published version
+        Assert.IsNull(content.GetValue("bodyText"));
+        Assert.AreEqual("new author text", content.GetValue("author"));
+
+        // make sure that the published version remained the same
+        var publishedContent = ContentService.GetVersion(content.PublishedVersionId);
+        Assert.AreEqual("another title of mine", publishedContent.GetValue("title"));
+        Assert.IsNull(publishedContent.GetValue("bodyText"));
+        Assert.AreEqual("new author", publishedContent.GetValue("author"));
+    }
+
+    [Test]
+    public void Can_Bulk_Save_Content()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get("umbTextpage");
+        var subpage = ContentBuilder.CreateSimpleContent(contentType, "Text Subpage 1", Textpage.Id);
+        var subpage2 = ContentBuilder.CreateSimpleContent(contentType, "Text Subpage 2", Textpage.Id);
+        var list = new List<IContent> { subpage, subpage2 };
+
+        // Act
+        ContentService.Save(list);
+
+        // Assert
+        Assert.That(list.Any(x => !x.HasIdentity), Is.False);
+    }
+
+    [Test]
+    public void Can_Bulk_Save_New_Hierarchy_Content()
+    {
+        // Arrange
+        var hierarchy = CreateContentHierarchy().ToList();
+
+        // Act
+        ContentService.Save(hierarchy);
+
+        Assert.That(hierarchy.Any(), Is.True);
+        Assert.That(hierarchy.Any(x => x.HasIdentity == false), Is.False);
+
+        // all parent id's should be ok, they are lazy and if they equal zero an exception will be thrown
+        Assert.DoesNotThrow(() => hierarchy.Any(x => x.ParentId != 0));
+    }
+
+    [Test]
+    public void Can_Delete_Content_Of_Specific_ContentType()
+    {
+        // Arrange
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        // Act
+        ContentService.DeleteOfType(contentType.Id);
+        var rootContent = ContentService.GetRootContent();
+        var contents = ContentService.GetPagedOfType(contentType.Id, 0, int.MaxValue, out var _);
+
+        // Assert
+        Assert.That(rootContent.Any(), Is.False);
+        Assert.That(contents.Any(x => !x.Trashed), Is.False);
+    }
+
+    [Test]
+    public void Can_Delete_Content()
+    {
+        // Arrange
+        var content = ContentService.GetById(Textpage.Id);
+
+        // Act
+        ContentService.Delete(content);
+        var deleted = ContentService.GetById(Textpage.Id);
+
+        // Assert
+        Assert.That(deleted, Is.Null);
+    }
+
+    [Test]
+    public void Can_Move_Content_To_RecycleBin()
+    {
+        // Arrange
+        var content = ContentService.GetById(Textpage.Id);
+
+        // Act
+        ContentService.MoveToRecycleBin(content);
+
+        // Assert
+        Assert.That(content.ParentId, Is.EqualTo(-20));
+        Assert.That(content.Trashed, Is.True);
+    }
+
+    [Test]
+    public void Can_Move_Content_Structure_To_RecycleBin_And_Empty_RecycleBin()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        var subsubpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 3", Subpage.Id);
+        ContentService.Save(subsubpage);
+
+        var content = ContentService.GetById(Textpage.Id);
+        const int pageSize = 500;
+        var page = 0;
+        var total = long.MaxValue;
+        var descendants = new List<IContent>();
+        while (page * pageSize < total)
+        {
+            descendants.AddRange(ContentService.GetPagedDescendants(content.Id, page++, pageSize, out total));
         }
 
-        [Test]
-        public void Can_Publish_And_Unpublish_Cultures_In_Single_Operation()
+        Assert.AreNotEqual(-20, content.ParentId);
+        Assert.IsFalse(content.Trashed);
+        Assert.AreEqual(4, descendants.Count);
+        Assert.IsFalse(descendants.Any(x => x.Path.StartsWith("-1,-20,")));
+        Assert.IsFalse(descendants.Any(x => x.Trashed));
+
+        ContentService.MoveToRecycleBin(content);
+
+        descendants.Clear();
+        page = 0;
+        while (page * pageSize < total)
         {
-            // TODO: This is using an internal API - we aren't exposing this publicly (at least for now) but we'll keep the test around
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr")
-                .Build();
-            ILanguage langDa = new LanguageBuilder()
-                .WithCultureInfo("da")
-                .Build();
-            LocalizationService.Save(langFr);
-            LocalizationService.Save(langDa);
-
-            ContentType ct = ContentTypeBuilder.CreateBasicContentType();
-            ct.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(ct);
-
-            IContent content = ContentBuilder.CreateBasicContent(ct);
-            content.SetCultureName("name-fr", langFr.IsoCode);
-            content.SetCultureName("name-da", langDa.IsoCode);
-
-            content.PublishCulture(CultureImpact.Explicit(langFr.IsoCode, langFr.IsDefault));
-            PublishResult result = ContentService.CommitDocumentChanges(content);
-            Assert.IsTrue(result.Success);
-            content = ContentService.GetById(content.Id);
-            Assert.IsTrue(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsFalse(content.IsCulturePublished(langDa.IsoCode));
-
-            content.UnpublishCulture(langFr.IsoCode);
-            content.PublishCulture(CultureImpact.Explicit(langDa.IsoCode, langDa.IsDefault));
-
-            result = ContentService.CommitDocumentChanges(content);
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(PublishResultType.SuccessMixedCulture, result.Result);
-
-            content = ContentService.GetById(content.Id);
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langDa.IsoCode));
+            descendants.AddRange(ContentService.GetPagedDescendants(content.Id, page++, pageSize, out total));
         }
 
-        // documents: an enumeration of documents, in tree order
-        // map: applies (if needed) PublishValue, returns a value indicating whether to proceed with the branch
-        private IEnumerable<IContent> MapPublishValues(IEnumerable<IContent> documents, Func<IContent, bool> map)
+        Assert.AreEqual(-20, content.ParentId);
+        Assert.IsTrue(content.Trashed);
+        Assert.AreEqual(4, descendants.Count);
+        Assert.IsTrue(descendants.All(x => x.Path.StartsWith("-1,-20,")));
+        Assert.True(descendants.All(x => x.Trashed));
+
+        ContentService.EmptyRecycleBin();
+        var trashed = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
+        Assert.IsEmpty(trashed);
+    }
+
+    [Test]
+    public void Can_Empty_RecycleBin()
+    {
+        // Arrange
+        // Act
+        ContentService.EmptyRecycleBin();
+        var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
+
+        // Assert
+        Assert.That(contents.Any(), Is.False);
+    }
+
+    [Test]
+    public void Ensures_Permissions_Are_Retained_For_Copied_Descendants_With_Explicit_Permissions()
+    {
+        // Arrange
+        var userGroup = UserGroupBuilder.CreateUserGroup("1");
+        UserService.Save(userGroup);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
+        contentType.AllowedContentTypes = new List<ContentTypeSort>
         {
-            var exclude = new HashSet<int>();
-            foreach (IContent document in documents)
-            {
-                if (exclude.Contains(document.ParentId))
-                {
-                    exclude.Add(document.Id);
-                    continue;
-                }
+            new(new Lazy<int>(() => contentType.Id), 0, contentType.Alias)
+        };
+        ContentTypeService.Save(contentType);
 
-                if (!map(document))
-                {
-                    exclude.Add(document.Id);
-                    continue;
-                }
+        var parentPage = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(parentPage);
 
-                yield return document;
-            }
+        var childPage = ContentBuilder.CreateSimpleContent(contentType, "child", parentPage);
+        ContentService.Save(childPage);
+
+        // assign explicit permissions to the child
+        ContentService.SetPermission(childPage, 'A', new[] { userGroup.Id });
+
+        // Ok, now copy, what should happen is the childPage will retain it's own permissions
+        var parentPage2 = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(parentPage2);
+
+        var copy = ContentService.Copy(childPage, parentPage2.Id, false, true);
+
+        // get the permissions and verify
+        var permissions = UserService.GetPermissionsForPath(userGroup, copy.Path, true);
+        var allPermissions = permissions.GetAllPermissions().ToArray();
+        Assert.AreEqual(1, allPermissions.Length);
+        Assert.AreEqual("A", allPermissions[0]);
+    }
+
+    [Test]
+    public void Ensures_Permissions_Are_Inherited_For_Copied_Descendants()
+    {
+        // Arrange
+        var userGroup = UserGroupBuilder.CreateUserGroup("1");
+        UserService.Save(userGroup);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
+        contentType.AllowedContentTypes = new List<ContentTypeSort>
+        {
+            new(new Lazy<int>(() => contentType.Id), 0, contentType.Alias)
+        };
+        ContentTypeService.Save(contentType);
+
+        var parentPage = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(parentPage);
+        ContentService.SetPermission(parentPage, 'A', new[] { userGroup.Id });
+
+        var childPage1 = ContentBuilder.CreateSimpleContent(contentType, "child1", parentPage);
+        ContentService.Save(childPage1);
+        var childPage2 = ContentBuilder.CreateSimpleContent(contentType, "child2", childPage1);
+        ContentService.Save(childPage2);
+        var childPage3 = ContentBuilder.CreateSimpleContent(contentType, "child3", childPage2);
+        ContentService.Save(childPage3);
+
+        // Verify that the children have the inherited permissions
+        var descendants = new List<IContent>();
+        const int pageSize = 500;
+        var page = 0;
+        var total = long.MaxValue;
+        while (page * pageSize < total)
+        {
+            descendants.AddRange(ContentService.GetPagedDescendants(parentPage.Id, page++, pageSize, out total));
         }
 
-        [Test]
-        public void Can_Publish_Content_Children()
+        Assert.AreEqual(3, descendants.Count);
+
+        foreach (var descendant in descendants)
         {
-            var parentId = Textpage.Id;
-
-            IContent parent = ContentService.GetById(parentId);
-
-            Console.WriteLine(" " + parent.Id);
-            const int pageSize = 500;
-            var page = 0;
-            var total = long.MaxValue;
-            while (page * pageSize < total)
-            {
-                IEnumerable<IContent> descendants =
-                    ContentService.GetPagedDescendants(parent.Id, page++, pageSize, out total);
-                foreach (IContent x in descendants)
-                {
-                    Console.WriteLine("          ".Substring(0, x.Level) + x.Id);
-                }
-            }
-
-            Console.WriteLine();
-
-            // publish parent & its branch
-            // only those that are not already published
-            // only invariant/neutral values
-            IEnumerable<PublishResult> parentPublished = ContentService.SaveAndPublishBranch(parent, true);
-
-            foreach (PublishResult result in parentPublished)
-            {
-                Console.WriteLine("          ".Substring(0, result.Content.Level) +
-                                  $"{result.Content.Id}: {result.Result}");
-            }
-
-            // everything should be successful
-            Assert.IsTrue(parentPublished.All(x => x.Success));
-            Assert.IsTrue(parent.Published);
-
-            IEnumerable<IContent>
-                children = ContentService.GetPagedChildren(parentId, 0, 500,
-                    out var totalChildren); // we only want the first so page size, etc.. is abitrary
-
-            // children are published including ... that was released 5 mins ago
-            Assert.IsTrue(children.First(x => x.Id == Subpage.Id).Published);
-        }
-
-        [Test]
-        public void Cannot_Publish_Expired_Content()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Subpage.Id); // This Content expired 5min ago
-            var contentSchedule = ContentScheduleCollection.CreateWithEntry(null, DateTime.Now.AddMinutes(-5));
-            ContentService.Save(content, contentSchedule: contentSchedule);
-
-            IContent parent = ContentService.GetById(Textpage.Id);
-            PublishResult parentPublished =
-                ContentService.SaveAndPublish(parent,
-                    userId: Constants.Security
-                        .SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id'
-
-            // Act
-            PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-            // Assert
-            Assert.That(parentPublished.Success, Is.True);
-            Assert.That(published.Success, Is.False);
-            Assert.That(content.Published, Is.False);
-            Assert.AreEqual(PublishResultType.FailedPublishHasExpired, published.Result);
-        }
-
-        [Test]
-        public void Cannot_Publish_Expired_Culture()
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            Content content = ContentBuilder.CreateBasicContent(contentType);
-            content.SetCultureName("Hello", "en-US");
-            var contentSchedule = ContentScheduleCollection.CreateWithEntry("en-US", null, DateTime.Now.AddMinutes(-5));
-            ContentService.Save(content, contentSchedule: contentSchedule);
-
-            PublishResult published = ContentService.SaveAndPublish(content, "en-US");
-
-            Assert.IsFalse(published.Success);
-            Assert.AreEqual(PublishResultType.FailedPublishCultureHasExpired, published.Result);
-            Assert.That(content.Published, Is.False);
-        }
-
-        [Test]
-        public void Cannot_Publish_Content_Awaiting_Release()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Subpage.Id);
-            var contentSchedule = ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddHours(2), null);
-            ContentService.Save(content, Constants.Security.SuperUserId, contentSchedule);
-
-            IContent parent = ContentService.GetById(Textpage.Id);
-            PublishResult parentPublished =
-                ContentService.SaveAndPublish(parent,
-                    userId: Constants.Security
-                        .SuperUserId); // Publish root Home node to enable publishing of 'Subpage.Id'
-
-            // Act
-            PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-            // Assert
-            Assert.That(parentPublished.Success, Is.True);
-            Assert.That(published.Success, Is.False);
-            Assert.That(content.Published, Is.False);
-            Assert.AreEqual(PublishResultType.FailedPublishAwaitingRelease, published.Result);
-        }
-
-        [Test]
-        public void Failed_Publish_Should_Not_Update_Edited_State_When_Edited_True()
-        {
-            // Arrange
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("header")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("header")
-                .Done()
-                .WithContentVariation(ContentVariation.Nothing)
-                .Build();
-
-            contentTypeService.Save(contentType);
-
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithName("Home")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("header", "Cool header")
-                .Done()
-                .Build();
-
-            contentService.SaveAndPublish(content);
-
-            content.Properties[0].SetValue("Foo", string.Empty);
-            contentService.Save(content);
-            contentService.PersistContentSchedule(content, ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddHours(2), null));
-
-            // Act
-            PublishResult result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.IsFalse(result.Success);
-                Assert.IsTrue(result.Content.Published);
-                Assert.AreEqual(PublishResultType.FailedPublishAwaitingRelease, result.Result);
-
-                // We changed property data
-                Assert.IsTrue(result.Content.Edited, "result.Content.Edited");
-            });
-        }
-
-        // V9 - Tests.Integration
-        [Test]
-        public void Failed_Publish_Should_Not_Update_Edited_State_When_Edited_False()
-        {
-            // Arrange
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("header")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("header")
-                .Done()
-                .WithContentVariation(ContentVariation.Nothing)
-                .Build();
-
-            contentTypeService.Save(contentType);
-
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithName("Home")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("header", "Cool header")
-                .Done()
-                .Build();
-
-            contentService.SaveAndPublish(content);
-
-            contentService.PersistContentSchedule(content, ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddHours(2), null));
-            contentService.Save(content);
-
-            // Act
-            PublishResult result = contentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.IsFalse(result.Success);
-                Assert.IsTrue(result.Content.Published);
-                Assert.AreEqual(PublishResultType.FailedPublishAwaitingRelease, result.Result);
-
-                // We didn't change any property data
-                Assert.IsFalse(result.Content.Edited, "result.Content.Edited");
-            });
-        }
-
-
-        [Test]
-        public void Cannot_Publish_Culture_Awaiting_Release()
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            Content content = ContentBuilder.CreateBasicContent(contentType);
-            content.SetCultureName("Hello", "en-US");
-            var contentSchedule = ContentScheduleCollection.CreateWithEntry("en-US", DateTime.Now.AddHours(2), null);
-            ContentService.Save(content, contentSchedule: contentSchedule);
-
-            PublishResult published = ContentService.SaveAndPublish(content, "en-US");
-
-            Assert.IsFalse(published.Success);
-            Assert.AreEqual(PublishResultType.FailedPublishCultureAwaitingRelease, published.Result);
-            Assert.That(content.Published, Is.False);
-        }
-
-        [Test]
-        public void Cannot_Publish_Content_Where_Parent_Is_Unpublished()
-        {
-            // Arrange
-            IContent content = ContentService.Create("Subpage with Unpublished Parent", Textpage.Id, "umbTextpage");
-            ContentService.Save(content);
-
-            // Act
-            IEnumerable<PublishResult> published = ContentService.SaveAndPublishBranch(content, true);
-
-            // Assert
-            Assert.That(published.All(x => x.Success), Is.False);
-            Assert.That(content.Published, Is.False);
-        }
-
-        [Test]
-        public void Cannot_Publish_Trashed_Content()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Trashed.Id);
-
-            // Act
-            PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-            // Assert
-            Assert.That(published.Success, Is.False);
-            Assert.That(content.Published, Is.False);
-            Assert.That(content.Trashed, Is.True);
-        }
-
-        [Test]
-        public void Can_Save_And_Publish_Content()
-        {
-            // Arrange
-            IContent content = ContentService.Create("Home US", -1, "umbTextpage");
-            content.SetValue("author", "Barack Obama");
-
-            // Act
-            PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-
-            // Assert
-            Assert.That(content.HasIdentity, Is.True);
-            Assert.That(content.Published, Is.True);
-            Assert.IsTrue(published.Success);
-        }
-
-        /// <summary>
-        ///     Try to immitate a new child content item being created through the UI.
-        ///     This content item will have no Id, Path or Identity.
-        ///     It seems like this is wiped somewhere in the process when creating an item through the UI
-        ///     and we need to make sure we handle nullchecks for these properties when creating content.
-        ///     This is unfortunately not caught by the normal ContentService tests.
-        /// </summary>
-        [Test]
-        public void Can_Save_And_Publish_Content_And_Child_Without_Identity()
-        {
-            // Arrange
-            IContent content = ContentService.Create("Home US", Constants.System.Root, "umbTextpage");
-            content.SetValue("author", "Barack Obama");
-
-            // Act
-            PublishResult published = ContentService.SaveAndPublish(content, userId: Constants.Security.SuperUserId);
-            IContent childContent = ContentService.Create("Child", content.Id, "umbTextpage");
-
-            // Reset all identity properties
-            childContent.Id = 0;
-            childContent.Path = null;
-            ((Content)childContent).ResetIdentity();
-            PublishResult childPublished =
-                ContentService.SaveAndPublish(childContent, userId: Constants.Security.SuperUserId);
-
-            // Assert
-            Assert.That(content.HasIdentity, Is.True);
-            Assert.That(content.Published, Is.True);
-            Assert.That(childContent.HasIdentity, Is.True);
-            Assert.That(childContent.Published, Is.True);
-            Assert.That(published.Success, Is.True);
-            Assert.That(childPublished.Success, Is.True);
-        }
-
-        [Test]
-        public void Can_Get_Published_Descendant_Versions()
-        {
-            // Arrange
-            IContent root = ContentService.GetById(Textpage.Id);
-            PublishResult rootPublished = ContentService.SaveAndPublish(root);
-
-            IContent content = ContentService.GetById(Subpage.Id);
-            content.Properties["title"].SetValue(content.Properties["title"].GetValue() + " Published");
-            PublishResult contentPublished = ContentService.SaveAndPublish(content);
-            var publishedVersion = content.VersionId;
-
-            content.Properties["title"].SetValue(content.Properties["title"].GetValue() + " Saved");
-            ContentService.Save(content);
-            Assert.AreEqual(publishedVersion, content.VersionId);
-
-            // Act
-            var publishedDescendants = ContentService.GetPublishedDescendants(root).ToList();
-            Assert.AreNotEqual(0, publishedDescendants.Count);
-
-            // Assert
-            Assert.IsTrue(rootPublished.Success);
-            Assert.IsTrue(contentPublished.Success);
-
-            // Console.WriteLine(publishedVersion);
-            // foreach (var d in publishedDescendants) Console.WriteLine(d.Version);
-            Assert.IsTrue(publishedDescendants.Any(x => x.VersionId == publishedVersion));
-
-            // Ensure that the published content version has the correct property value and is marked as published
-            IContent publishedContentVersion = publishedDescendants.First(x => x.VersionId == publishedVersion);
-            Assert.That(publishedContentVersion.Published, Is.True);
-            Assert.That(publishedContentVersion.Properties["title"].GetValue(published: true),
-                Contains.Substring("Published"));
-
-            // and has the correct draft properties
-            Assert.That(publishedContentVersion.Properties["title"].GetValue(), Contains.Substring("Saved"));
-
-            // Ensure that the latest version of the content is ok
-            IContent currentContent = ContentService.GetById(Subpage.Id);
-            Assert.That(currentContent.Published, Is.True);
-            Assert.That(currentContent.Properties["title"].GetValue(published: true), Contains.Substring("Published"));
-            Assert.That(currentContent.Properties["title"].GetValue(), Contains.Substring("Saved"));
-            Assert.That(currentContent.VersionId, Is.EqualTo(publishedContentVersion.VersionId));
-        }
-
-        [Test]
-        public void Can_Save_Content()
-        {
-            // Arrange
-            IContent content = ContentService.Create("Home US", -1, "umbTextpage");
-            content.SetValue("author", "Barack Obama");
-
-            // Act
-            ContentService.Save(content);
-
-            // Assert
-            Assert.That(content.HasIdentity, Is.True);
-        }
-
-        [Test]
-        public void Can_Update_Content_Property_Values()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            IContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-            IContent content = ContentBuilder.CreateSimpleContent(contentType, "hello");
-            content.SetValue("title", "title of mine");
-            content.SetValue("bodyText", "hello world");
-            ContentService.SaveAndPublish(content);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            content.SetValue("title", "another title of mine"); // Change a value
-            content.SetValue("bodyText", null); // Clear a value
-            content.SetValue("author", "new author"); // Add a value
-            ContentService.SaveAndPublish(content);
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.AreEqual("another title of mine", content.GetValue("title"));
-            Assert.IsNull(content.GetValue("bodyText"));
-            Assert.AreEqual("new author", content.GetValue("author"));
-
-            content.SetValue("title", "new title");
-            content.SetValue("bodyText", "new body text");
-            content.SetValue("author", "new author text");
-            ContentService.Save(content); // new non-published version
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            content.SetValue("title", null); // Clear a value
-            content.SetValue("bodyText", null); // Clear a value
-            ContentService.Save(content); // saving non-published version
-
-            // re-get
-            content = ContentService.GetById(content.Id);
-            Assert.IsNull(content.GetValue("title")); // Test clearing the value worked with the non-published version
-            Assert.IsNull(content.GetValue("bodyText"));
-            Assert.AreEqual("new author text", content.GetValue("author"));
-
-            // make sure that the published version remained the same
-            IContent publishedContent = ContentService.GetVersion(content.PublishedVersionId);
-            Assert.AreEqual("another title of mine", publishedContent.GetValue("title"));
-            Assert.IsNull(publishedContent.GetValue("bodyText"));
-            Assert.AreEqual("new author", publishedContent.GetValue("author"));
-        }
-
-        [Test]
-        public void Can_Bulk_Save_Content()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-            Content subpage = ContentBuilder.CreateSimpleContent(contentType, "Text Subpage 1", Textpage.Id);
-            Content subpage2 = ContentBuilder.CreateSimpleContent(contentType, "Text Subpage 2", Textpage.Id);
-            var list = new List<IContent> { subpage, subpage2 };
-
-            // Act
-            ContentService.Save(list);
-
-            // Assert
-            Assert.That(list.Any(x => !x.HasIdentity), Is.False);
-        }
-
-        [Test]
-        public void Can_Bulk_Save_New_Hierarchy_Content()
-        {
-            // Arrange
-            var hierarchy = CreateContentHierarchy().ToList();
-
-            // Act
-            ContentService.Save(hierarchy);
-
-            Assert.That(hierarchy.Any(), Is.True);
-            Assert.That(hierarchy.Any(x => x.HasIdentity == false), Is.False);
-
-            // all parent id's should be ok, they are lazy and if they equal zero an exception will be thrown
-            Assert.DoesNotThrow(() => hierarchy.Any(x => x.ParentId != 0));
-        }
-
-        [Test]
-        public void Can_Delete_Content_Of_Specific_ContentType()
-        {
-            // Arrange
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-
-            // Act
-            ContentService.DeleteOfType(contentType.Id);
-            IEnumerable<IContent> rootContent = ContentService.GetRootContent();
-            IEnumerable<IContent> contents = ContentService.GetPagedOfType(contentType.Id, 0, int.MaxValue, out var _);
-
-            // Assert
-            Assert.That(rootContent.Any(), Is.False);
-            Assert.That(contents.Any(x => !x.Trashed), Is.False);
-        }
-
-        [Test]
-        public void Can_Delete_Content()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Textpage.Id);
-
-            // Act
-            ContentService.Delete(content);
-            IContent deleted = ContentService.GetById(Textpage.Id);
-
-            // Assert
-            Assert.That(deleted, Is.Null);
-        }
-
-        [Test]
-        public void Can_Move_Content_To_RecycleBin()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Textpage.Id);
-
-            // Act
-            ContentService.MoveToRecycleBin(content);
-
-            // Assert
-            Assert.That(content.ParentId, Is.EqualTo(-20));
-            Assert.That(content.Trashed, Is.True);
-        }
-
-        [Test]
-        public void Can_Move_Content_Structure_To_RecycleBin_And_Empty_RecycleBin()
-        {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-
-            Content subsubpage = ContentBuilder.CreateSimpleContent(contentType, "Text Page 3", Subpage.Id);
-            ContentService.Save(subsubpage);
-
-            IContent content = ContentService.GetById(Textpage.Id);
-            const int pageSize = 500;
-            var page = 0;
-            var total = long.MaxValue;
-            var descendants = new List<IContent>();
-            while (page * pageSize < total)
-            {
-                descendants.AddRange(ContentService.GetPagedDescendants(content.Id, page++, pageSize, out total));
-            }
-
-            Assert.AreNotEqual(-20, content.ParentId);
-            Assert.IsFalse(content.Trashed);
-            Assert.AreEqual(4, descendants.Count);
-            Assert.IsFalse(descendants.Any(x => x.Path.StartsWith("-1,-20,")));
-            Assert.IsFalse(descendants.Any(x => x.Trashed));
-
-            ContentService.MoveToRecycleBin(content);
-
-            descendants.Clear();
-            page = 0;
-            while (page * pageSize < total)
-            {
-                descendants.AddRange(ContentService.GetPagedDescendants(content.Id, page++, pageSize, out total));
-            }
-
-            Assert.AreEqual(-20, content.ParentId);
-            Assert.IsTrue(content.Trashed);
-            Assert.AreEqual(4, descendants.Count);
-            Assert.IsTrue(descendants.All(x => x.Path.StartsWith("-1,-20,")));
-            Assert.True(descendants.All(x => x.Trashed));
-
-            ContentService.EmptyRecycleBin();
-            var trashed = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
-            Assert.IsEmpty(trashed);
-        }
-
-        [Test]
-        public void Can_Empty_RecycleBin()
-        {
-            // Arrange
-            // Act
-            ContentService.EmptyRecycleBin();
-            var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
-
-            // Assert
-            Assert.That(contents.Any(), Is.False);
-        }
-
-        [Test]
-        public void Ensures_Permissions_Are_Retained_For_Copied_Descendants_With_Explicit_Permissions()
-        {
-            // Arrange
-            UserGroup userGroup = UserGroupBuilder.CreateUserGroup("1");
-            UserService.Save(userGroup);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType =
-                ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
-            contentType.AllowedContentTypes = new List<ContentTypeSort>
-            {
-                new(new Lazy<int>(() => contentType.Id), 0, contentType.Alias)
-            };
-            ContentTypeService.Save(contentType);
-
-            Content parentPage = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(parentPage);
-
-            Content childPage = ContentBuilder.CreateSimpleContent(contentType, "child", parentPage);
-            ContentService.Save(childPage);
-
-            // assign explicit permissions to the child
-            ContentService.SetPermission(childPage, 'A', new[] { userGroup.Id });
-
-            // Ok, now copy, what should happen is the childPage will retain it's own permissions
-            Content parentPage2 = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(parentPage2);
-
-            IContent copy = ContentService.Copy(childPage, parentPage2.Id, false, true);
-
-            // get the permissions and verify
-            EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, copy.Path, true);
+            var permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, true);
             var allPermissions = permissions.GetAllPermissions().ToArray();
             Assert.AreEqual(1, allPermissions.Length);
             Assert.AreEqual("A", allPermissions[0]);
         }
 
-        [Test]
-        public void Ensures_Permissions_Are_Inherited_For_Copied_Descendants()
+        // create a new parent with a new permission structure
+        var parentPage2 = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(parentPage2);
+        ContentService.SetPermission(parentPage2, 'B', new[] { userGroup.Id });
+
+        // Now copy, what should happen is the child pages will now have permissions inherited from the new parent
+        var copy = ContentService.Copy(childPage1, parentPage2.Id, false, true);
+
+        descendants.Clear();
+        page = 0;
+        while (page * pageSize < total)
         {
-            // Arrange
-            UserGroup userGroup = UserGroupBuilder.CreateUserGroup("1");
-            UserService.Save(userGroup);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType =
-                ContentTypeBuilder.CreateSimpleContentType("umbTextpage1", "Textpage", defaultTemplateId: template.Id);
-            contentType.AllowedContentTypes = new List<ContentTypeSort>
-            {
-                new(new Lazy<int>(() => contentType.Id), 0, contentType.Alias)
-            };
-            ContentTypeService.Save(contentType);
-
-            Content parentPage = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(parentPage);
-            ContentService.SetPermission(parentPage, 'A', new[] { userGroup.Id });
-
-            Content childPage1 = ContentBuilder.CreateSimpleContent(contentType, "child1", parentPage);
-            ContentService.Save(childPage1);
-            Content childPage2 = ContentBuilder.CreateSimpleContent(contentType, "child2", childPage1);
-            ContentService.Save(childPage2);
-            Content childPage3 = ContentBuilder.CreateSimpleContent(contentType, "child3", childPage2);
-            ContentService.Save(childPage3);
-
-            // Verify that the children have the inherited permissions
-            var descendants = new List<IContent>();
-            const int pageSize = 500;
-            var page = 0;
-            var total = long.MaxValue;
-            while (page * pageSize < total)
-            {
-                descendants.AddRange(ContentService.GetPagedDescendants(parentPage.Id, page++, pageSize, out total));
-            }
-
-            Assert.AreEqual(3, descendants.Count);
-
-            foreach (IContent descendant in descendants)
-            {
-                EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, true);
-                var allPermissions = permissions.GetAllPermissions().ToArray();
-                Assert.AreEqual(1, allPermissions.Length);
-                Assert.AreEqual("A", allPermissions[0]);
-            }
-
-            // create a new parent with a new permission structure
-            Content parentPage2 = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(parentPage2);
-            ContentService.SetPermission(parentPage2, 'B', new[] { userGroup.Id });
-
-            // Now copy, what should happen is the child pages will now have permissions inherited from the new parent
-            IContent copy = ContentService.Copy(childPage1, parentPage2.Id, false, true);
-
-            descendants.Clear();
-            page = 0;
-            while (page * pageSize < total)
-            {
-                descendants.AddRange(ContentService.GetPagedDescendants(parentPage2.Id, page++, pageSize, out total));
-            }
-
-            Assert.AreEqual(3, descendants.Count);
-
-            foreach (IContent descendant in descendants)
-            {
-                EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, true);
-                var allPermissions = permissions.GetAllPermissions().ToArray();
-                Assert.AreEqual(1, allPermissions.Length);
-                Assert.AreEqual("B", allPermissions[0]);
-            }
+            descendants.AddRange(ContentService.GetPagedDescendants(parentPage2.Id, page++, pageSize, out total));
         }
 
-        [Test]
-        public void Can_Empty_RecycleBin_With_Content_That_Has_All_Related_Data()
+        Assert.AreEqual(3, descendants.Count);
+
+        foreach (var descendant in descendants)
         {
-            // Arrange
-            // need to:
-            // * add relations
-            // * add permissions
-            // * add notifications
-            // * public access
-            // * tags
-            // * domain
-            // * published & preview data
-            // * multiple versions
-            ContentType contentType = ContentTypeBuilder.CreateAllTypesContentType("test", "test");
-            ContentTypeService.Save(contentType);
-
-            object obj =
-                new { tags = "[\"Hello\",\"World\"]" };
-            Content content1 = ContentBuilder.CreateBasicContent(contentType);
-            content1.PropertyValues(obj);
-            content1.ResetDirtyProperties(false);
-            ContentService.Save(content1);
-            Assert.IsTrue(ContentService.SaveAndPublish(content1, userId: 0).Success);
-            Content content2 = ContentBuilder.CreateBasicContent(contentType);
-            content2.PropertyValues(obj);
-            content2.ResetDirtyProperties(false);
-            ContentService.Save(content2);
-            Assert.IsTrue(ContentService.SaveAndPublish(content2, userId: 0).Success);
-
-            IUserGroup editorGroup = UserService.GetUserGroupByAlias(Constants.Security.EditorGroupAlias);
-            editorGroup.StartContentId = content1.Id;
-            UserService.Save(editorGroup);
-
-            IUser admin = UserService.GetUserById(Constants.Security.SuperUserId);
-            admin.StartContentIds = new[] { content1.Id };
-            UserService.Save(admin);
-
-            RelationService.Save(new RelationType("test", "test", false, Constants.ObjectTypes.Document,
-                Constants.ObjectTypes.Document, false));
-            Assert.IsNotNull(RelationService.Relate(content1, content2, "test"));
-
-            PublicAccessService.Save(new PublicAccessEntry(content1, content2, content2,
-                new List<PublicAccessRule> { new() { RuleType = "test", RuleValue = "test" } }));
-            Assert.IsTrue(PublicAccessService.AddRule(content1, "test2", "test2").Success);
-
-            IUser user = UserService.GetUserById(Constants.Security.SuperUserId);
-            IUserGroup userGroup = UserService.GetUserGroupByAlias(user.Groups.First().Alias);
-            Assert.IsNotNull(NotificationService.CreateNotification(user, content1, "X"));
-
-            ContentService.SetPermission(content1, 'A', new[] { userGroup.Id });
-
-            Assert.IsTrue(DomainService.Save(new UmbracoDomain("www.test.com", "en-AU") { RootContentId = content1.Id })
-                .Success);
-
-            // Act
-            ContentService.MoveToRecycleBin(content1);
-            ContentService.EmptyRecycleBin();
-            var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
-
-            // Assert
-            Assert.That(contents.Any(), Is.False);
-        }
-
-        [Test]
-        public void Can_Move_Content()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Trashed.Id);
-
-            // Act - moving out of recycle bin
-            ContentService.Move(content, Textpage.Id);
-
-            // Assert
-            Assert.That(content.ParentId, Is.EqualTo(Textpage.Id));
-            Assert.That(content.Trashed, Is.False);
-            Assert.That(content.Published, Is.False);
-        }
-
-        [Test]
-        public void Can_Copy_Content()
-        {
-            // Arrange
-            IContent temp = ContentService.GetById(Subpage.Id);
-
-            // Act
-            IContent copy = ContentService.Copy(temp, temp.ParentId, false);
-            IContent content = ContentService.GetById(Subpage.Id);
-
-            // Assert
-            Assert.That(copy, Is.Not.Null);
-            Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
-            Assert.AreNotSame(content, copy);
-            foreach (IProperty property in copy.Properties)
-            {
-                Assert.AreEqual(property.GetValue(), content.Properties[property.Alias].GetValue());
-            }
-
-            // Assert.AreNotEqual(content.Name, copy.Name);
-        }
-
-        [Test]
-        public void Can_Copy_And_Modify_Content_With_Events()
-        {
-            // see https://github.com/umbraco/Umbraco-CMS/issues/5513
-
-            var copyingWasCalled = false;
-            var copiedWasCalled = false;
-
-            ContentNotificationHandler.CopyingContent = notification =>
-            {
-                notification.Copy.SetValue("title", "1");
-                notification.Original.SetValue("title", "2");
-
-                copyingWasCalled = true;
-            };
-
-            ContentNotificationHandler.CopiedContent = notification =>
-            {
-                var copyVal = notification.Copy.GetValue<string>("title");
-                var origVal = notification.Original.GetValue<string>("title");
-
-                Assert.AreEqual("1", copyVal);
-                Assert.AreEqual("2", origVal);
-
-                copiedWasCalled = true;
-            };
-
-            try
-            {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-                ContentTypeService.Save(contentType);
-                Content content = ContentBuilder.CreateSimpleContent(contentType);
-                content.SetValue("title", "New Value");
-                ContentService.Save(content);
-
-                IContent copy = ContentService.Copy(content, content.ParentId, false);
-                Assert.AreEqual("1", copy.GetValue("title"));
-
-                Assert.IsTrue(copyingWasCalled);
-                Assert.IsTrue(copiedWasCalled);
-            }
-            finally
-            {
-                ContentNotificationHandler.CopyingContent = null;
-                ContentNotificationHandler.CopiedContent = null;
-            }
-        }
-
-        [Test]
-        public void Can_Copy_Recursive()
-        {
-            // Arrange
-            IContent temp = ContentService.GetById(Textpage.Id);
-            Assert.AreEqual("Home", temp.Name);
-            Assert.AreEqual(3, ContentService.CountChildren(temp.Id));
-
-            // Act
-            IContent copy = ContentService.Copy(temp, temp.ParentId, false, true);
-            IContent content = ContentService.GetById(Textpage.Id);
-
-            // Assert
-            Assert.That(copy, Is.Not.Null);
-            Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
-            Assert.AreNotSame(content, copy);
-            Assert.AreEqual(3, ContentService.CountChildren(copy.Id));
-
-            IContent child = ContentService.GetById(Subpage.Id);
-            IContent childCopy = ContentService.GetPagedChildren(copy.Id, 0, 500, out var total).First();
-            Assert.AreEqual(childCopy.Name, child.Name);
-            Assert.AreNotEqual(childCopy.Id, child.Id);
-            Assert.AreNotEqual(childCopy.Key, child.Key);
-        }
-
-        [Test]
-        public void Can_Copy_NonRecursive()
-        {
-            // Arrange
-            IContent temp = ContentService.GetById(Textpage.Id);
-            Assert.AreEqual("Home", temp.Name);
-            Assert.AreEqual(3, ContentService.CountChildren(temp.Id));
-
-            // Act
-            IContent copy = ContentService.Copy(temp, temp.ParentId, false, false);
-            IContent content = ContentService.GetById(Textpage.Id);
-
-            // Assert
-            Assert.That(copy, Is.Not.Null);
-            Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
-            Assert.AreNotSame(content, copy);
-            Assert.AreEqual(0, ContentService.CountChildren(copy.Id));
-        }
-
-        [Test]
-        public void Can_Copy_Content_With_Tags()
-        {
-            const string propAlias = "tags";
-
-            // create a content type that has a 'tags' property
-            // the property needs to support tags, else nothing works of course!
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType =
-                ContentTypeBuilder.CreateSimpleTagsContentType("umbTagsPage", "TagsPage",
-                    defaultTemplateId: template.Id);
-            contentType.Key = new Guid("78D96D30-1354-4A1E-8450-377764200C58");
-            ContentTypeService.Save(contentType);
-
-            Content content = ContentBuilder.CreateSimpleContent(contentType, "Simple Tags Page");
-            content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, propAlias,
-                new[] { "hello", "world" });
-            ContentService.Save(content);
-
-            // value has been set but no tags have been created (not published)
-            Assert.AreEqual("[\"hello\",\"world\"]", content.GetValue(propAlias));
-            ITag[] contentTags = TagService.GetTagsForEntity(content.Id).ToArray();
-            Assert.AreEqual(0, contentTags.Length);
-
-            // reloading the content yields the same result
-            content = (Content)ContentService.GetById(content.Id);
-            Assert.AreEqual("[\"hello\",\"world\"]", content.GetValue(propAlias));
-            contentTags = TagService.GetTagsForEntity(content.Id).ToArray();
-            Assert.AreEqual(0, contentTags.Length);
-
-            // publish
-            ContentService.SaveAndPublish(content);
-
-            // now tags have been set (published)
-            Assert.AreEqual("[\"hello\",\"world\"]", content.GetValue(propAlias));
-            contentTags = TagService.GetTagsForEntity(content.Id).ToArray();
-            Assert.AreEqual(2, contentTags.Length);
-
-            // copy
-            IContent copy = ContentService.Copy(content, content.ParentId, false);
-
-            // copy is not published, so property has value, but no tags have been created
-            Assert.AreEqual("[\"hello\",\"world\"]", copy.GetValue(propAlias));
-            ITag[] copiedTags = TagService.GetTagsForEntity(copy.Id).ToArray();
-            Assert.AreEqual(0, copiedTags.Length);
-
-            // publish
-            ContentService.SaveAndPublish(copy);
-
-            // now tags have been set (published)
-            copiedTags = TagService.GetTagsForEntity(copy.Id).ToArray();
-
-            Assert.AreEqual(2, copiedTags.Length);
-            Assert.AreEqual("hello", copiedTags[0].Text);
-            Assert.AreEqual("world", copiedTags[1].Text);
-        }
-
-        [Test]
-        public void Can_Rollback_Version_On_Content()
-        {
-            // Arrange
-            IContent parent = ContentService.GetById(Textpage.Id);
-            Assert.IsFalse(parent.Published);
-            ContentService.SaveAndPublish(parent); // publishing parent, so Text Page 2 can be updated.
-
-            IContent content = ContentService.GetById(Subpage.Id);
-            Assert.IsFalse(content.Published);
-
-            var versions = ContentService.GetVersions(Subpage.Id).ToList();
-            Assert.AreEqual(1, versions.Count);
-
-            var version1 = content.VersionId;
-
-            content.Name = "Text Page 2 Updated";
-            content.SetValue("author", "Francis Doe");
-
-            // non published = edited
-            Assert.IsTrue(content.Edited);
-
-            ContentService.SaveAndPublish(content); // new version
-            var version2 = content.VersionId;
-            Assert.AreNotEqual(version1, version2);
-
-            Assert.IsTrue(content.Published);
-            Assert.IsFalse(content.Edited);
-            Assert.AreEqual("Francis Doe",
-                ContentService.GetById(content.Id).GetValue<string>("author")); // version2 author is Francis
-
-            Assert.AreEqual("Text Page 2 Updated", content.Name);
-            Assert.AreEqual("Text Page 2 Updated", content.PublishName);
-
-            content.Name = "Text Page 2 ReUpdated";
-            content.SetValue("author", "Jane Doe");
-
-            // is not actually 'edited' until changes have been saved
-            Assert.IsFalse(content.Edited);
-            ContentService.Save(content); // just save changes
-            Assert.IsTrue(content.Edited);
-
-            Assert.AreEqual("Text Page 2 ReUpdated", content.Name);
-            Assert.AreEqual("Text Page 2 Updated", content.PublishName);
-
-            content.Name = "Text Page 2 ReReUpdated";
-
-            ContentService.SaveAndPublish(content); // new version
-            var version3 = content.VersionId;
-            Assert.AreNotEqual(version2, version3);
-
-            Assert.IsTrue(content.Published);
-            Assert.IsFalse(content.Edited);
-            Assert.AreEqual("Jane Doe",
-                ContentService.GetById(content.Id).GetValue<string>("author")); // version3 author is Jane
-
-            Assert.AreEqual("Text Page 2 ReReUpdated", content.Name);
-            Assert.AreEqual("Text Page 2 ReReUpdated", content.PublishName);
-
-            // here we have
-            // version1, first published version
-            // version2, second published version
-            // version3, third and current published version
-
-            // rollback all values to version1
-            IContent rollback = ContentService.GetById(Subpage.Id);
-            IContent rollto = ContentService.GetVersion(version1);
-            rollback.CopyFrom(rollto);
-            rollback.Name = rollto.Name; // must do it explicitly
-            ContentService.Save(rollback);
-
-            Assert.IsNotNull(rollback);
-            Assert.IsTrue(rollback.Published);
-            Assert.IsTrue(rollback.Edited);
-            Assert.AreEqual("Francis Doe",
-                ContentService.GetById(content.Id).GetValue<string>("author")); // author is now Francis again
-            Assert.AreEqual(version3, rollback.VersionId); // same version but with edits
-
-            // props and name have rolled back
-            Assert.AreEqual("Francis Doe", rollback.GetValue<string>("author"));
-            Assert.AreEqual("Text Page 2 Updated", rollback.Name);
-
-            // published props and name are still there
-            Assert.AreEqual("Jane Doe", rollback.GetValue<string>("author", published: true));
-            Assert.AreEqual("Text Page 2 ReReUpdated", rollback.PublishName);
-
-            // rollback all values to current version
-            // special because... current has edits... this really is equivalent to rolling back to version2
-            IContent rollback2 = ContentService.GetById(Subpage.Id);
-            IContent rollto2 = ContentService.GetVersion(version3);
-            rollback2.CopyFrom(rollto2);
-            rollback2.Name = rollto2.PublishName; // must do it explicitely AND must pick the publish one!
-            ContentService.Save(rollback2);
-
-            Assert.IsTrue(rollback2.Published);
-            Assert.IsTrue(rollback2.Edited); // Still edited, change of behaviour
-
-            Assert.AreEqual("Jane Doe", rollback2.GetValue<string>("author"));
-            Assert.AreEqual("Text Page 2 ReReUpdated", rollback2.Name);
-
-            // test rollback to self, again
-            content = ContentService.GetById(content.Id);
-            Assert.AreEqual("Text Page 2 ReReUpdated", content.Name);
-            Assert.AreEqual("Jane Doe", content.GetValue<string>("author"));
-            ContentService.SaveAndPublish(content);
-            Assert.IsFalse(content.Edited);
-            content.Name = "Xxx";
-            content.SetValue("author", "Bob Doe");
-            ContentService.Save(content);
-            Assert.IsTrue(content.Edited);
-            rollto = ContentService.GetVersion(content.VersionId);
-            content.CopyFrom(rollto);
-            content.Name = rollto.PublishName; // must do it explicitely AND must pick the publish one!
-            ContentService.Save(content);
-            Assert.IsTrue(content.Edited); //Still edited, change of behaviour
-            Assert.AreEqual("Text Page 2 ReReUpdated", content.Name);
-            Assert.AreEqual("Jane Doe", content.GetValue("author"));
-        }
-
-        [Test]
-        public void Can_Rollback_Version_On_Multilingual()
-        {
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr")
-                .Build();
-            ILanguage langDa = new LanguageBuilder()
-                .WithCultureInfo("da")
-                .Build();
-            LocalizationService.Save(langFr);
-            LocalizationService.Save(langDa);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType =
-                ContentTypeBuilder.CreateSimpleContentType("multi", "Multi", defaultTemplateId: template.Id);
-            contentType.Key = new Guid("45FF9A70-9C5F-448D-A476-DCD23566BBF8");
-            contentType.Variations = ContentVariation.Culture;
-            IPropertyType p1 = contentType.PropertyTypes.First();
-            p1.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            var page = new Content("Page", Constants.System.Root, contentType)
-            {
-                Level = 1,
-                SortOrder = 1,
-                CreatorId = 0,
-                WriterId = 0,
-                Key = new Guid("D7B84CC9-14AE-4D92-A042-023767AD3304")
-            };
-
-            page.SetCultureName("fr1", langFr.IsoCode);
-            page.SetCultureName("da1", langDa.IsoCode);
-            Thread.Sleep(1);
-            ContentService.Save(page);
-            var versionId0 = page.VersionId;
-
-            page.SetValue(p1.Alias, "v1fr", langFr.IsoCode);
-            page.SetValue(p1.Alias, "v1da", langDa.IsoCode);
-            Thread.Sleep(1);
-            ContentService.SaveAndPublish(page);
-            var versionId1 = page.VersionId;
-
-            Thread.Sleep(10);
-
-            page.SetCultureName("fr2", langFr.IsoCode);
-            page.SetValue(p1.Alias, "v2fr", langFr.IsoCode);
-            Thread.Sleep(1);
-            ContentService.SaveAndPublish(page, langFr.IsoCode);
-            var versionId2 = page.VersionId;
-
-            Thread.Sleep(10);
-
-            page.SetCultureName("da2", langDa.IsoCode);
-            page.SetValue(p1.Alias, "v2da", langDa.IsoCode);
-            Thread.Sleep(1);
-            ContentService.SaveAndPublish(page, langDa.IsoCode);
-            var versionId3 = page.VersionId;
-
-            Thread.Sleep(10);
-
-            page.SetCultureName("fr3", langFr.IsoCode);
-            page.SetCultureName("da3", langDa.IsoCode);
-            page.SetValue(p1.Alias, "v3fr", langFr.IsoCode);
-            page.SetValue(p1.Alias, "v3da", langDa.IsoCode);
-            Thread.Sleep(1);
-            ContentService.SaveAndPublish(page);
-            var versionId4 = page.VersionId;
-
-            // now get all versions
-            IContent[] versions = ContentService.GetVersions(page.Id).ToArray();
-
-            Assert.AreEqual(5, versions.Length);
-
-            // current version
-            Assert.AreEqual(versionId4, versions[0].VersionId);
-            Assert.AreEqual(versionId3, versions[0].PublishedVersionId);
-
-            // published version
-            Assert.AreEqual(versionId3, versions[1].VersionId);
-            Assert.AreEqual(versionId3, versions[1].PublishedVersionId);
-
-            // previous version
-            Assert.AreEqual(versionId2, versions[2].VersionId);
-            Assert.AreEqual(versionId3, versions[2].PublishedVersionId);
-
-            // previous version
-            Assert.AreEqual(versionId1, versions[3].VersionId);
-            Assert.AreEqual(versionId3, versions[3].PublishedVersionId);
-
-            // previous version
-            Assert.AreEqual(versionId0, versions[4].VersionId);
-            Assert.AreEqual(versionId3, versions[4].PublishedVersionId);
-
-            Assert.AreEqual("fr3", versions[4].GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("fr3", versions[3].GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("fr3", versions[2].GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("fr3", versions[1].GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("fr3", versions[0].GetPublishName(langFr.IsoCode));
-
-            Assert.AreEqual("fr1", versions[4].GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("fr2", versions[3].GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("fr2", versions[2].GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("fr3", versions[1].GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("fr3", versions[0].GetCultureName(langFr.IsoCode));
-
-            Assert.AreEqual("da3", versions[4].GetPublishName(langDa.IsoCode));
-            Assert.AreEqual("da3", versions[3].GetPublishName(langDa.IsoCode));
-            Assert.AreEqual("da3", versions[2].GetPublishName(langDa.IsoCode));
-            Assert.AreEqual("da3", versions[1].GetPublishName(langDa.IsoCode));
-            Assert.AreEqual("da3", versions[0].GetPublishName(langDa.IsoCode));
-
-            Assert.AreEqual("da1", versions[4].GetCultureName(langDa.IsoCode));
-            Assert.AreEqual("da1", versions[3].GetCultureName(langDa.IsoCode));
-            Assert.AreEqual("da2", versions[2].GetCultureName(langDa.IsoCode));
-            Assert.AreEqual("da3", versions[1].GetCultureName(langDa.IsoCode));
-            Assert.AreEqual("da3", versions[0].GetCultureName(langDa.IsoCode));
-
-            // all versions have the same publish infos
-            for (var i = 0; i < 5; i++)
-            {
-                Assert.AreEqual(versions[0].PublishDate, versions[i].PublishDate);
-                Assert.AreEqual(versions[0].GetPublishDate(langFr.IsoCode), versions[i].GetPublishDate(langFr.IsoCode));
-                Assert.AreEqual(versions[0].GetPublishDate(langDa.IsoCode), versions[i].GetPublishDate(langDa.IsoCode));
-            }
-
-            for (var i = 0; i < 5; i++)
-            {
-                Console.Write("[{0}] ", i);
-                Console.WriteLine(versions[i].UpdateDate.ToString("O")[11..]);
-                Console.WriteLine("    fr: {0}", versions[i].GetUpdateDate(langFr.IsoCode)?.ToString("O")[11..]);
-                Console.WriteLine("    da: {0}", versions[i].GetUpdateDate(langDa.IsoCode)?.ToString("O")[11..]);
-            }
-
-            Console.WriteLine("-");
-
-            // for all previous versions, UpdateDate is the published date
-            Assert.AreEqual(versions[4].UpdateDate, versions[4].GetUpdateDate(langFr.IsoCode));
-            Assert.AreEqual(versions[4].UpdateDate, versions[4].GetUpdateDate(langDa.IsoCode));
-
-            Assert.AreEqual(versions[3].UpdateDate, versions[3].GetUpdateDate(langFr.IsoCode));
-            Assert.AreEqual(versions[4].UpdateDate, versions[3].GetUpdateDate(langDa.IsoCode));
-
-            Assert.AreEqual(versions[3].UpdateDate, versions[2].GetUpdateDate(langFr.IsoCode));
-            Assert.AreEqual(versions[2].UpdateDate, versions[2].GetUpdateDate(langDa.IsoCode));
-
-            // for the published version, UpdateDate is the published date
-            Assert.AreEqual(versions[1].UpdateDate, versions[1].GetUpdateDate(langFr.IsoCode));
-            Assert.AreEqual(versions[1].UpdateDate, versions[1].GetUpdateDate(langDa.IsoCode));
-            Assert.AreEqual(versions[1].PublishDate, versions[1].UpdateDate);
-
-            // for the current version, things are different
-            // UpdateDate is the date it was last saved
-            Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langFr.IsoCode));
-            Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langDa.IsoCode));
-
-            // so if we save again...
-            page.SetCultureName("fr4", langFr.IsoCode);
-
-            // page.SetCultureName("da4", langDa.IsoCode);
-            page.SetValue(p1.Alias, "v4fr", langFr.IsoCode);
-            page.SetValue(p1.Alias, "v4da", langDa.IsoCode);
-
-            // This sleep ensures the save is called on later ticks then the SetValue and SetCultureName. Therefore
-            // we showcase the currect lack of handling dirty on variants on save. When this is implemented the sleep
-            // helps showcase the functionality is actually working
-            Thread.Sleep(5);
-            ContentService.Save(page);
-            var versionId5 = page.VersionId;
-
-            versions = ContentService.GetVersions(page.Id).ToArray();
-
-            // we just update the current version
-            Assert.AreEqual(5, versions.Length);
-            Assert.AreEqual(versionId4, versionId5);
-
-            for (var i = 0; i < 5; i++)
-            {
-                Console.Write("[{0}] ", i);
-                Console.WriteLine(versions[i].UpdateDate.ToString("O")[11..]);
-                Console.WriteLine("    fr: {0}", versions[i].GetUpdateDate(langFr.IsoCode)?.ToString("O")[11..]);
-                Console.WriteLine("    da: {0}", versions[i].GetUpdateDate(langDa.IsoCode)?.ToString("O")[11..]);
-            }
-
-            Console.WriteLine("-");
-
-            IContent[] versionsSlim = ContentService.GetVersionsSlim(page.Id, 0, 50).ToArray();
-            Assert.AreEqual(5, versionsSlim.Length);
-
-            for (var i = 0; i < 5; i++)
-            {
-                Console.Write("[{0}]     ", i);
-                Console.WriteLine(versionsSlim[i].UpdateDate.Ticks);
-                Console.WriteLine("    fr: {0}", versionsSlim[i].GetUpdateDate(langFr.IsoCode)?.Ticks);
-                Console.WriteLine("    da: {0}", versionsSlim[i].GetUpdateDate(langDa.IsoCode)?.Ticks);
-            }
-
-            Console.WriteLine("-");
-
-            // what we do in the controller to get rollback versions
-            IContent[] versionsSlimFr =
-                versionsSlim.Where(x => x.UpdateDate == x.GetUpdateDate(langFr.IsoCode)).ToArray();
-
-            Assert.AreEqual(4, versionsSlimFr.Length);
-
-            // alas, at the moment we do *not* properly track 'dirty' for cultures, meaning
-            // that we cannot synchronize dates the way we do with publish dates - and so this
-            // would fail - the version UpdateDate is greater than the cultures'.
-            Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langFr.IsoCode));
-            Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langDa.IsoCode));
-
-            // now roll french back to its very first version
-            page.CopyFrom(versions[4], langFr.IsoCode); // only the pure FR values
-            page.CopyFrom(versions[4], null); // so, must explicitly do the INVARIANT values too
-            page.SetCultureName(versions[4].GetPublishName(langFr.IsoCode), langFr.IsoCode);
-            ContentService.Save(page);
-
-            // and voila, rolled back!
-            Assert.AreEqual(versions[4].GetPublishName(langFr.IsoCode), page.GetCultureName(langFr.IsoCode));
-            Assert.AreEqual(versions[4].GetValue(p1.Alias, langFr.IsoCode), page.GetValue(p1.Alias, langFr.IsoCode));
-
-            // note that rolling back invariant values means we also rolled back... DA... at least partially
-            // bah?
-        }
-
-        [Test]
-        public void Can_Save_Lazy_Content()
-        {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-            IContent root = ContentService.GetById(Textpage.Id);
-
-            var c = new Lazy<IContent>(() =>
-                ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page", root.Id));
-            var c2 = new Lazy<IContent>(() =>
-                ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage", c.Value.Id));
-            var list = new List<Lazy<IContent>> { c, c2 };
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                IDocumentRepository repository = DocumentRepository;
-
-                foreach (Lazy<IContent> content in list)
-                {
-                    repository.Save(content.Value);
-                }
-
-                Assert.That(c.Value.HasIdentity, Is.True);
-                Assert.That(c2.Value.HasIdentity, Is.True);
-
-                Assert.That(c.Value.Id > 0, Is.True);
-                Assert.That(c2.Value.Id > 0, Is.True);
-
-                Assert.That(c.Value.ParentId > 0, Is.True);
-                Assert.That(c2.Value.ParentId > 0, Is.True);
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Property_Types_On_Content()
-        {
-            // Arrange
-            IContentTypeService contentTypeService = ContentTypeService;
-            ContentType contentType = ContentTypeBuilder.CreateAllTypesContentType("allDataTypes", "All DataTypes");
-            ContentTypeService.Save(contentType);
-            Content content =
-                ContentBuilder.CreateAllTypesContent(contentType, "Random Content", Constants.System.Root);
-            ContentService.Save(content);
-            var id = content.Id;
-
-            // Act
-            IContent sut = ContentService.GetById(id);
-
-            // Arrange
-            Assert.That(sut.GetValue<bool>("isTrue"), Is.True);
-            Assert.That(sut.GetValue<int>("number"), Is.EqualTo(42));
-            Assert.That(sut.GetValue<string>("bodyText"), Is.EqualTo("Lorem Ipsum Body Text Test"));
-            Assert.That(sut.GetValue<string>("singleLineText"), Is.EqualTo("Single Line Text Test"));
-            Assert.That(sut.GetValue<string>("multilineText"), Is.EqualTo("Multiple lines \n in one box"));
-            Assert.That(sut.GetValue<string>("upload"), Is.EqualTo("/media/1234/koala.jpg"));
-            Assert.That(sut.GetValue<string>("label"), Is.EqualTo("Non-editable label"));
-
-            // SD: This is failing because the 'content' call to GetValue<DateTime> always has empty milliseconds
-            // MCH: I'm guessing this is an issue because of the format the date is actually stored as, right? Cause we don't do any formatting when saving or loading
-            Assert.That(sut.GetValue<DateTime>("dateTime").ToString("G"),
-                Is.EqualTo(content.GetValue<DateTime>("dateTime").ToString("G")));
-            Assert.That(sut.GetValue<string>("colorPicker"), Is.EqualTo("black"));
-            Assert.That(sut.GetValue<string>("ddlMultiple"), Is.EqualTo("1234,1235"));
-            Assert.That(sut.GetValue<string>("rbList"), Is.EqualTo("random"));
-            Assert.That(sut.GetValue<DateTime>("date").ToString("G"),
-                Is.EqualTo(content.GetValue<DateTime>("date").ToString("G")));
-            Assert.That(sut.GetValue<string>("ddl"), Is.EqualTo("1234"));
-            Assert.That(sut.GetValue<string>("chklist"), Is.EqualTo("randomc"));
-            Assert.That(sut.GetValue<Udi>("contentPicker"),
-                Is.EqualTo(Udi.Create(Constants.UdiEntityType.Document,
-                    new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C"))));
-            Assert.That(sut.GetValue<Udi>("mediaPicker"),
-                Is.EqualTo(Udi.Create(Constants.UdiEntityType.Media,
-                    new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691"))));
-            Assert.That(sut.GetValue<Udi>("memberPicker"),
-                Is.EqualTo(Udi.Create(Constants.UdiEntityType.Member,
-                    new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D"))));
-            Assert.That(sut.GetValue<string>("multiUrlPicker"),
-                Is.EqualTo("[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]"));
-            Assert.That(sut.GetValue<string>("tags"), Is.EqualTo("this,is,tags"));
-        }
-
-        [Test]
-        public void Can_Delete_Previous_Versions_Not_Latest()
-        {
-            // Arrange
-            IContent content = ContentService.GetById(Trashed.Id);
-            var version = content.VersionId;
-
-            // Act
-            ContentService.DeleteVersion(Trashed.Id, version, true);
-            IContent sut = ContentService.GetById(Trashed.Id);
-
-            // Assert
-            Assert.That(sut.VersionId, Is.EqualTo(version));
-        }
-
-        [Test]
-        public void Can_Get_Paged_Children()
-        {
-            // Start by cleaning the "db"
-            IContent umbTextPage = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
-            ContentService.Delete(umbTextPage);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-            for (var i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType);
-                ContentService.Save(c1);
-            }
-
-            IContent[] entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out var total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = ContentService.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-        }
-
-        [Test]
-        public void Can_Get_Paged_Children_Dont_Get_Descendants()
-        {
-            // Start by cleaning the "db"
-            IContent umbTextPage = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
-            ContentService.Delete(umbTextPage);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            // Only add 9 as we also add a content with children
-            for (var i = 0; i < 9; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType);
-                ContentService.Save(c1);
-            }
-
-            Content willHaveChildren = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(willHaveChildren);
-            for (var i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, "Content" + i, willHaveChildren.Id);
-                ContentService.Save(c1);
-            }
-
-            // children in root including the folder - not the descendants in the folder
-            IContent[] entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out var total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = ContentService.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-
-            // children in folder
-            entities = ContentService.GetPagedChildren(willHaveChildren.Id, 0, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = ContentService.GetPagedChildren(willHaveChildren.Id, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-        }
-
-        [Test]
-        public void PublishingTest()
-        {
-            var contentType = new ContentType(ShortStringHelper, Constants.System.Root) { Alias = "foo", Name = "Foo" };
-
-            var properties = new PropertyTypeCollection(true)
-            {
-                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext)
-                {
-                    Alias = "title", Name = "Title", Mandatory = false, DataTypeId = -88
-                }
-            };
-
-            contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "content" });
-
-            contentType.SetDefaultTemplate(new Template(ShortStringHelper, "Textpage", "textpage"));
-            FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
-            ContentTypeService.Save(contentType);
-
-            IContent content = ContentService.Create("foo", Constants.System.Root, "foo");
-            ContentService.Save(content);
-
-            Assert.IsFalse(content.Published);
-            Assert.IsTrue(content.Edited);
-
-            content = ContentService.GetById(content.Id);
-            Assert.IsFalse(content.Published);
-            Assert.IsTrue(content.Edited);
-
-            content.SetValue("title", "foo");
-            Assert.IsTrue(content.Edited);
-
-            ContentService.Save(content);
-
-            Assert.IsFalse(content.Published);
-            Assert.IsTrue(content.Edited);
-
-            content = ContentService.GetById(content.Id);
-            Assert.IsFalse(content.Published);
-            Assert.IsTrue(content.Edited);
-
-            IEnumerable<IContent> versions = ContentService.GetVersions(content.Id);
-            Assert.AreEqual(1, versions.Count());
-
-            // publish content
-            // becomes Published, !Edited
-            // creates a new version
-            // can get published property values
-            ContentService.SaveAndPublish(content);
-
-            Assert.IsTrue(content.Published);
-            Assert.IsFalse(content.Edited);
-
-            content = ContentService.GetById(content.Id);
-            Assert.IsTrue(content.Published);
-            Assert.IsFalse(content.Edited);
-
-            versions = ContentService.GetVersions(content.Id);
-            Assert.AreEqual(2, versions.Count());
-
-            Assert.AreEqual("foo", content.GetValue("title", published: true));
-            Assert.AreEqual("foo", content.GetValue("title"));
-
-            // unpublish content
-            // becomes !Published, Edited
-            ContentService.Unpublish(content);
-
-            Assert.IsFalse(content.Published);
-            Assert.IsTrue(content.Edited);
-
-            Assert.AreEqual("foo", content.GetValue("title", published: true));
-            Assert.AreEqual("foo", content.GetValue("title"));
-
-            var vpk = ((Content)content).VersionId;
-            var ppk = ((Content)content).PublishedVersionId;
-
-            content = ContentService.GetById(content.Id);
-            Assert.IsFalse(content.Published);
-            Assert.IsTrue(content.Edited);
-
-            // FIXME: depending on 1 line in ContentBaseFactory.BuildEntity
-            // the published infos can be gone or not
-            // if gone, it's not consistent with above
-            Assert.AreEqual(vpk, ((Content)content).VersionId);
-            Assert.AreEqual(ppk, ((Content)content).PublishedVersionId); // still there
-
-            // FIXME: depending on 1 line in ContentRepository.MapDtoToContent
-            // the published values can be null or not
-            // if null, it's not consistent with above
-            // Assert.IsNull(content.GetValue("title", published:  true));
-            Assert.AreEqual("foo", content.GetValue("title", published: true)); // still there
-            Assert.AreEqual("foo", content.GetValue("title"));
-
-            versions = ContentService.GetVersions(content.Id);
-            Assert.AreEqual(2, versions.Count());
-
-            // ah - we have a problem here - since we're not published we don't have published values
-            // and therefore we cannot "just" republish the content - we need to publish some values
-            // so... that's not really an option
-            //
-            // ContentService.SaveAndPublish(content);
-
-            // FIXME: what shall we do of all this?
-            /*
-            // this basically republishes a content
-            // what if it never was published?
-            // what if it has changes?
-            // do we want to "publish" only some variants, or the entire content?
-            ContentService.Publish(content);
-
-            Assert.IsTrue(content.Published);
-            Assert.IsFalse(content.Edited);
-
-            // FIXME: should it be 2 or 3
-            versions = ContentService.GetVersions(content.Id);
-            Assert.AreEqual(2, versions.Count());
-
-            // FIXME: now test rollbacks
-            var version = ContentService.GetByVersion(content.Id); // test that it gets a version - should be GetVersion
-            var previousVersion = ContentService.GetVersions(content.Id).Skip(1).FirstOrDefault(); // need an optimized way to do this
-            content.CopyValues(version); // copies the edited value - always
-            content.Template = version.Template;
-            content.Name = version.Name;
-            ContentService.Save(content); // this is effectively a rollback?
-            ContentService.Rollback(content); // just kill the method and offer options on values + template + name...
-            */
-        }
-
-        [Test]
-        public void Ensure_Invariant_Name()
-        {
-            ILocalizationService languageService = LocalizationService;
-
-            ILanguage langUk = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-
-            languageService.Save(langFr);
-            languageService.Save(langUk);
-
-            IContentTypeService contentTypeService = ContentTypeService;
-
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-            contentType.Variations = ContentVariation.Culture;
-            contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox,
-                ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture });
-            ContentTypeService.Save(contentType);
-
-            var content = new Content(null, Constants.System.Root, contentType);
-
-            content.SetCultureName("name-us", langUk.IsoCode);
-            content.SetCultureName("name-fr", langFr.IsoCode);
-            ContentService.Save(content);
-
-            // the name will be set to the default culture variant name
-            Assert.AreEqual("name-us", content.Name);
-
-            // FIXME: should we always sync the invariant name even on update? see EnsureInvariantNameValues
-            ////updating the default culture variant name should also update the invariant name so they stay in sync
-            // content.SetName("name-us-2", langUk.IsoCode);
-            // ContentService.Save(content);
-            // Assert.AreEqual("name-us-2", content.Name);
-        }
-
-        [Test]
-        public void Ensure_Unique_Culture_Names()
-        {
-            ILocalizationService languageService = LocalizationService;
-
-            ILanguage langUk = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-
-            languageService.Save(langFr);
-            languageService.Save(langUk);
-
-            IContentTypeService contentTypeService = ContentTypeService;
-
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            var content = new Content(null, Constants.System.Root, contentType);
-            content.SetCultureName("root", langUk.IsoCode);
-            ContentService.Save(content);
-
-            for (var i = 0; i < 5; i++)
-            {
-                var child = new Content(null, content, contentType);
-                child.SetCultureName("child", langUk.IsoCode);
-                ContentService.Save(child);
-
-                Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"),
-                    child.GetCultureName(langUk.IsoCode));
-
-                // Save it again to ensure that the unique check is not performed again against it's own name
-                ContentService.Save(child);
-                Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"),
-                    child.GetCultureName(langUk.IsoCode));
-            }
-        }
-
-        [Test]
-        public void Can_Get_Paged_Children_WithFilterAndOrder()
-        {
-            ILocalizationService languageService = LocalizationService;
-
-            ILanguage langUk = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .WithIsMandatory(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            ILanguage langDa = new LanguageBuilder()
-                .WithCultureInfo("da-DK")
-                .Build();
-
-            languageService.Save(langFr);
-            languageService.Save(langUk);
-            languageService.Save(langDa);
-
-            IContentTypeService contentTypeService = ContentTypeService;
-
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            int[] o = { 2, 1, 3, 0, 4 }; // randomly different
-            for (var i = 0; i < 5; i++)
-            {
-                var contentA = new Content(null, Constants.System.Root, contentType);
-                contentA.SetCultureName("contentA" + i + "uk", langUk.IsoCode);
-                contentA.SetCultureName("contentA" + o[i] + "fr", langFr.IsoCode);
-                contentA.SetCultureName("contentX" + i + "da", langDa.IsoCode);
-                ContentService.Save(contentA);
-
-                var contentB = new Content(null, Constants.System.Root, contentType);
-                contentB.SetCultureName("contentB" + i + "uk", langUk.IsoCode);
-                contentB.SetCultureName("contentB" + o[i] + "fr", langFr.IsoCode);
-                contentB.SetCultureName("contentX" + i + "da", langDa.IsoCode);
-                ContentService.Save(contentB);
-            }
-
-            // get all
-            var list = ContentService.GetPagedChildren(Constants.System.Root, 0, 100, out var total).ToList();
-
-            Console.WriteLine("ALL");
-            WriteList(list);
-
-            // 10 items (there's already a Home content in there...)
-            Assert.AreEqual(11, total);
-            Assert.AreEqual(11, list.Count);
-
-            ISqlContext sqlContext = GetRequiredService<ISqlContext>();
-
-            // filter
-            list = ContentService.GetPagedChildren(
-                Constants.System.Root,
-                0,
-                100,
-                out total,
-                sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
-                Ordering.By("name", culture: langFr.IsoCode)).ToList();
-
-            Assert.AreEqual(0, total);
-            Assert.AreEqual(0, list.Count);
-
-            // filter
-            list = ContentService.GetPagedChildren(
-                Constants.System.Root,
-                0,
-                100,
-                out total,
-                sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
-                Ordering.By("name", culture: langDa.IsoCode)).ToList();
-
-            Console.WriteLine("FILTER BY NAME da:'contentX'");
-            WriteList(list);
-
-            Assert.AreEqual(10, total);
-            Assert.AreEqual(10, list.Count);
-
-            // filter
-            list = ContentService.GetPagedChildren(
-                Constants.System.Root,
-                0,
-                100,
-                out total,
-                sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
-                Ordering.By("name", culture: langFr.IsoCode)).ToList();
-
-            Console.WriteLine("FILTER BY NAME fr:'contentA', ORDER ASC");
-            WriteList(list);
-
-            Assert.AreEqual(5, total);
-            Assert.AreEqual(5, list.Count);
-
-            for (var i = 0; i < 5; i++)
-            {
-                Assert.AreEqual("contentA" + i + "fr", list[i].GetCultureName(langFr.IsoCode));
-            }
-
-            list = ContentService.GetPagedChildren(
-                Constants.System.Root,
-                0,
-                100,
-                out total,
-                sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
-                Ordering.By("name", Direction.Descending, langFr.IsoCode)).ToList();
-
-            Console.WriteLine("FILTER BY NAME fr:'contentA', ORDER DESC");
-            WriteList(list);
-
-            Assert.AreEqual(5, total);
-            Assert.AreEqual(5, list.Count);
-
-            for (var i = 0; i < 5; i++)
-            {
-                Assert.AreEqual("contentA" + (4 - i) + "fr", list[i].GetCultureName(langFr.IsoCode));
-            }
-        }
-
-        private void WriteList(List<IContent> list)
-        {
-            foreach (IContent content in list)
-            {
-                Console.WriteLine("[{0}] {1} {2} {3} {4}", content.Id, content.Name, content.GetCultureName("en-GB"),
-                    content.GetCultureName("fr-FR"), content.GetCultureName("da-DK"));
-            }
-
-            Console.WriteLine("-");
-        }
-
-        [Test]
-        public void Can_SaveRead_Variations()
-        {
-            ILocalizationService languageService = LocalizationService;
-            ILanguage langPt = new LanguageBuilder()
-                .WithCultureInfo("pt-PT")
-                .WithIsDefault(true)
-                .Build();
-            ILanguage langFr = new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            ILanguage langUk = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .Build();
-            ILanguage langDe = new LanguageBuilder()
-                .WithCultureInfo("de-DE")
-                .Build();
-
-            languageService.Save(langFr);
-            languageService.Save(langUk);
-            languageService.Save(langDe);
-
-            IContentTypeService contentTypeService = ContentTypeService;
-
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-            contentType.Variations = ContentVariation.Culture;
-            contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox,
-                ValueStorageType.Nvarchar, "prop") { Variations = ContentVariation.Culture });
-
-            // FIXME: add test w/ an invariant prop
-            ContentTypeService.Save(contentType);
-
-            IContent content = ContentService.Create("Home US", Constants.System.Root, "umbTextpage");
-
-            // creating content with a name but no culture - will set the invariant name
-            // but, because that content is variant, as soon as we save, we'll need to
-            // replace the invariant name with whatever we have in cultures - always
-            //
-            // in fact, that would throw, because there is no name
-            // ContentService.Save(content);
-
-            // Act
-            content.SetValue("author", "Barack Obama");
-            content.SetValue("prop", "value-fr1", langFr.IsoCode);
-            content.SetValue("prop", "value-uk1", langUk.IsoCode);
-            content.SetCultureName("name-fr", langFr.IsoCode); // and then we can save
-            content.SetCultureName("name-uk", langUk.IsoCode);
-            ContentService.Save(content);
-
-            // content has been saved,
-            // it has names, but no publishNames, and no published cultures
-            IContent content2 = ContentService.GetById(content.Id);
-
-            Assert.AreEqual("name-fr", content2.Name); // got the default culture name when saved
-            Assert.AreEqual("name-fr", content2.GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("name-uk", content2.GetCultureName(langUk.IsoCode));
-
-            Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode));
-            Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode));
-            Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
-            Assert.IsNull(content2.GetValue("prop", langUk.IsoCode, published: true));
-
-            Assert.IsNull(content2.PublishName);
-            Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
-            Assert.IsNull(content2.GetPublishName(langUk.IsoCode));
-
-            // only fr and uk have a name, and are available
-            AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // nothing has been published yet
-            AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false),
-                (langDe, false));
-
-            // not published => must be edited, if available
-            AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-
-            // Act
-            ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
-
-            // both FR and UK have been published,
-            // and content has been published,
-            // it has names, publishNames, and published cultures
-            content2 = ContentService.GetById(content.Id);
-
-            Assert.AreEqual("name-fr", content2.Name); // got the default culture name when saved
-            Assert.AreEqual("name-fr", content2.GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("name-uk", content2.GetCultureName(langUk.IsoCode));
-
-            // we haven't published InvariantNeutral, but a document cannot be published without an invariant name,
-            // so when we tried and published for the first time above the french culture, the french name was used
-            // to populate the invariant name
-            Assert.AreEqual("name-fr", content2.PublishName);
-
-            Assert.AreEqual("name-fr", content2.GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
-
-            Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode));
-            Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode));
-            Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode, published: true));
-            Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // fr and uk have been published now
-            AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // fr and uk, published without changes, not edited
-            AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false),
-                (langDe, false));
-
-            AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
-                (langUk, false)); // DE would throw
-            AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
-                (langUk, false)); // DE would throw
-
-            // note that content and content2 culture published dates might be slightly different due to roundtrip to database
-
-            // Act
-            ContentService.SaveAndPublish(content);
-
-            // now it has publish name for invariant neutral
-            content2 = ContentService.GetById(content.Id);
-
-            Assert.AreEqual("name-fr", content2.PublishName);
-
-            content.SetCultureName("Home US2", null);
-            content.SetCultureName("name-fr2", langFr.IsoCode);
-            content.SetCultureName("name-uk2", langUk.IsoCode);
-            content.SetValue("author", "Barack Obama2");
-            content.SetValue("prop", "value-fr2", langFr.IsoCode);
-            content.SetValue("prop", "value-uk2", langUk.IsoCode);
-            ContentService.Save(content);
-
-            // content has been saved,
-            // it has updated names, unchanged publishNames, and published cultures
-            content2 = ContentService.GetById(content.Id);
-
-            Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
-            Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
-
-            Assert.AreEqual("name-fr", content2.PublishName);
-            Assert.AreEqual("name-fr", content2.GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
-
-            Assert.AreEqual("Barack Obama2", content2.GetValue("author"));
-            Assert.AreEqual("Barack Obama", content2.GetValue("author", published: true));
-
-            Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
-            Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
-            Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode, published: true));
-            Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // we have changed values so now fr and uk are edited
-            AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-
-            AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
-                (langUk, false)); // DE would throw
-            AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
-                (langUk, false)); // DE would throw
-
-            // Act
-            // cannot just 'save' since we are changing what's published!
-            ContentService.Unpublish(content, langFr.IsoCode);
-
-            // content has been published,
-            // the french culture is gone
-            // (only if french is not mandatory, else everything would be gone!)
-            content2 = ContentService.GetById(content.Id);
-
-            Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
-            Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
-
-            Assert.AreEqual("name-fr2", content2.PublishName);
-            Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
-
-            Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
-            Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
-            Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
-            Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
-
-            Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
-            Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // fr is not published anymore
-            AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-
-            // and so, fr has to be edited
-            AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-
-            AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-            AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-
-            // Act
-            ContentService.Unpublish(content);
-
-            // content has been unpublished,
-            // but properties, names, etc. retain their 'published' values so the content
-            // can be re-published in its exact original state (before being unpublished)
-            //
-            // BEWARE!
-            // in order for a content to be unpublished as a whole, and then republished in
-            // its exact previous state, properties and names etc. retain their published
-            // values even though the content is not published - hence many things being
-            // non-null or true below - always check against content.Published to be sure
-            content2 = ContentService.GetById(content.Id);
-
-            Assert.IsFalse(content2.Published);
-
-            Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
-            Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
-
-            Assert.AreEqual("name-fr2", content2.PublishName); // not null, see note above
-            Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode)); // not null, see note above
-
-            Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
-            Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
-            Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
-            Assert.AreEqual("value-uk1",
-                content2.GetValue("prop", langUk.IsoCode, published: true)); // has value, see note above
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // fr is not published anymore - uk still is, see note above
-            AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-
-            // and so, fr has to be edited - uk still is
-            AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-
-            AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-            AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-
-            // Act
-
-            // that HAS to be SavePublishing, because SaveAndPublish would just republish everything!
-            // TODO: This is using an internal API - the test can't pass without this but we want to keep the test here
-            // will need stephane to have a look at this test at some stage since there is a lot of logic here that we
-            // want to keep on testing but don't need the public API to do these more complicated things.
-            ContentService.CommitDocumentChanges(content);
-
-            // content has been re-published,
-            // everything is back to what it was before being unpublished
-            content2 = ContentService.GetById(content.Id);
-
-            Assert.IsTrue(content2.Published);
-
-            Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
-            Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
-            Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
-
-            Assert.AreEqual("name-fr2", content2.PublishName);
-            Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
-            Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
-
-            Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
-            Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
-            Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
-            Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // no change, back to published
-            AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-
-            // no change, back to published
-            AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
-
-            AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-            AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-
-            // Act
-            ContentService.SaveAndPublish(content, langUk.IsoCode);
-
-            content2 = ContentService.GetById(content.Id);
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
-                (langDe, false));
-
-            // no change
-            AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
-                (langDe, false));
-
-            // now, uk is no more edited
-            AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, false), (langDe, false));
-            AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, false),
-                (langDe, false));
-
-            AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-            AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
-                (langUk, false)); // FR, DE would throw
-
-            // Act
-            content.SetCultureName("name-uk3", langUk.IsoCode);
-            ContentService.Save(content);
-
-            content2 = ContentService.GetById(content.Id);
-
-            // note that the 'edited' flags only change once saved - not immediately
-            // but they change, on what's being saved, and when getting it back
-
-            // changing the name = edited!
-            Assert.IsTrue(content.IsCultureEdited(langUk.IsoCode));
-            Assert.IsTrue(content2.IsCultureEdited(langUk.IsoCode));
-        }
-
-        private void AssertPerCulture<T>(IContent item, Func<IContent, string, T> getter,
-            params (ILanguage Language, bool Result)[] testCases)
-        {
-            foreach ((ILanguage Language, bool Result) testCase in testCases)
-            {
-                T value = getter(item, testCase.Language.IsoCode);
-                Assert.AreEqual(testCase.Result, value,
-                    $"Expected {testCase.Result} and got {value} for culture {testCase.Language.IsoCode}.");
-            }
-        }
-
-        private IEnumerable<IContent> CreateContentHierarchy()
-        {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-            IContent root = ContentService.GetById(Textpage.Id);
-
-            var list = new List<IContent>();
-
-            for (var i = 0; i < 10; i++)
-            {
-                Content content =
-                    ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page " + i, root);
-
-                list.Add(content);
-                list.AddRange(CreateChildrenOf(contentType, content, 4));
-
-                Debug.Print("Created: 'Hierarchy Simple Text Page {0}'", i);
-            }
-
-            return list;
-        }
-
-        private IEnumerable<IContent> CreateChildrenOf(IContentType contentType, IContent content, int depth)
-        {
-            var list = new List<IContent>();
-            for (var i = 0; i < depth; i++)
-            {
-                Content c = ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage " + i,
-                    content);
-                list.Add(c);
-
-                Debug.Print("Created: 'Hierarchy Simple Text Subpage {0}' - Depth: {1}", i, depth);
-            }
-
-            return list;
-        }
-
-        private void CreateEnglishAndFrenchDocumentType(out Language langUk, out Language langFr,
-            out ContentType contentType)
-        {
-            langUk = (Language)new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .WithIsDefault(true)
-                .Build();
-            langFr = (Language)new LanguageBuilder()
-                .WithCultureInfo("fr-FR")
-                .Build();
-            LocalizationService.Save(langFr);
-            LocalizationService.Save(langUk);
-
-            contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-        }
-
-        private IContent CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr,
-            out ContentType contentType)
-        {
-            CreateEnglishAndFrenchDocumentType(out langUk, out langFr, out contentType);
-
-            IContent content = new Content("content", Constants.System.Root, contentType);
-            content.SetCultureName("content-fr", langFr.IsoCode);
-            content.SetCultureName("content-en", langUk.IsoCode);
-
-            return content;
-        }
-
-        public class ContentNotificationHandler :
-            INotificationHandler<ContentCopyingNotification>,
-            INotificationHandler<ContentCopiedNotification>,
-            INotificationHandler<ContentPublishingNotification>
-        {
-            public static Action<ContentPublishingNotification> PublishingContent { get; set; }
-
-            public static Action<ContentCopyingNotification> CopyingContent { get; set; }
-
-            public static Action<ContentCopiedNotification> CopiedContent { get; set; }
-
-            public void Handle(ContentCopiedNotification notification) => CopiedContent?.Invoke(notification);
-
-            public void Handle(ContentCopyingNotification notification) => CopyingContent?.Invoke(notification);
-            public void Handle(ContentPublishingNotification notification) => PublishingContent?.Invoke(notification);
+            var permissions = UserService.GetPermissionsForPath(userGroup, descendant.Path, true);
+            var allPermissions = permissions.GetAllPermissions().ToArray();
+            Assert.AreEqual(1, allPermissions.Length);
+            Assert.AreEqual("B", allPermissions[0]);
         }
     }
+
+    [Test]
+    public void Can_Empty_RecycleBin_With_Content_That_Has_All_Related_Data()
+    {
+        // Arrange
+        // need to:
+        // * add relations
+        // * add permissions
+        // * add notifications
+        // * public access
+        // * tags
+        // * domain
+        // * published & preview data
+        // * multiple versions
+        var contentType = ContentTypeBuilder.CreateAllTypesContentType("test", "test");
+        ContentTypeService.Save(contentType);
+
+        object obj =
+            new { tags = "[\"Hello\",\"World\"]" };
+        var content1 = ContentBuilder.CreateBasicContent(contentType);
+        content1.PropertyValues(obj);
+        content1.ResetDirtyProperties(false);
+        ContentService.Save(content1);
+        Assert.IsTrue(ContentService.SaveAndPublish(content1, userId: 0).Success);
+        var content2 = ContentBuilder.CreateBasicContent(contentType);
+        content2.PropertyValues(obj);
+        content2.ResetDirtyProperties(false);
+        ContentService.Save(content2);
+        Assert.IsTrue(ContentService.SaveAndPublish(content2, userId: 0).Success);
+
+        var editorGroup = UserService.GetUserGroupByAlias(Constants.Security.EditorGroupAlias);
+        editorGroup.StartContentId = content1.Id;
+        UserService.Save(editorGroup);
+
+        var admin = UserService.GetUserById(Constants.Security.SuperUserId);
+        admin.StartContentIds = new[] { content1.Id };
+        UserService.Save(admin);
+
+        RelationService.Save(new RelationType("test", "test", false, Constants.ObjectTypes.Document,
+            Constants.ObjectTypes.Document, false));
+        Assert.IsNotNull(RelationService.Relate(content1, content2, "test"));
+
+        PublicAccessService.Save(new PublicAccessEntry(content1, content2, content2,
+            new List<PublicAccessRule> { new() { RuleType = "test", RuleValue = "test" } }));
+        Assert.IsTrue(PublicAccessService.AddRule(content1, "test2", "test2").Success);
+
+        var user = UserService.GetUserById(Constants.Security.SuperUserId);
+        var userGroup = UserService.GetUserGroupByAlias(user.Groups.First().Alias);
+        Assert.IsNotNull(NotificationService.CreateNotification(user, content1, "X"));
+
+        ContentService.SetPermission(content1, 'A', new[] { userGroup.Id });
+
+        Assert.IsTrue(DomainService.Save(new UmbracoDomain("www.test.com", "en-AU") { RootContentId = content1.Id })
+            .Success);
+
+        // Act
+        ContentService.MoveToRecycleBin(content1);
+        ContentService.EmptyRecycleBin();
+        var contents = ContentService.GetPagedContentInRecycleBin(0, int.MaxValue, out var _).ToList();
+
+        // Assert
+        Assert.That(contents.Any(), Is.False);
+    }
+
+    [Test]
+    public void Can_Move_Content()
+    {
+        // Arrange
+        var content = ContentService.GetById(Trashed.Id);
+
+        // Act - moving out of recycle bin
+        ContentService.Move(content, Textpage.Id);
+
+        // Assert
+        Assert.That(content.ParentId, Is.EqualTo(Textpage.Id));
+        Assert.That(content.Trashed, Is.False);
+        Assert.That(content.Published, Is.False);
+    }
+
+    [Test]
+    public void Can_Copy_Content()
+    {
+        // Arrange
+        var temp = ContentService.GetById(Subpage.Id);
+
+        // Act
+        var copy = ContentService.Copy(temp, temp.ParentId, false);
+        var content = ContentService.GetById(Subpage.Id);
+
+        // Assert
+        Assert.That(copy, Is.Not.Null);
+        Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
+        Assert.AreNotSame(content, copy);
+        foreach (var property in copy.Properties)
+        {
+            Assert.AreEqual(property.GetValue(), content.Properties[property.Alias].GetValue());
+        }
+
+        // Assert.AreNotEqual(content.Name, copy.Name);
+    }
+
+    [Test]
+    public void Can_Copy_And_Modify_Content_With_Events()
+    {
+        // see https://github.com/umbraco/Umbraco-CMS/issues/5513
+
+        var copyingWasCalled = false;
+        var copiedWasCalled = false;
+
+        ContentNotificationHandler.CopyingContent = notification =>
+        {
+            notification.Copy.SetValue("title", "1");
+            notification.Original.SetValue("title", "2");
+
+            copyingWasCalled = true;
+        };
+
+        ContentNotificationHandler.CopiedContent = notification =>
+        {
+            var copyVal = notification.Copy.GetValue<string>("title");
+            var origVal = notification.Original.GetValue<string>("title");
+
+            Assert.AreEqual("1", copyVal);
+            Assert.AreEqual("2", origVal);
+
+            copiedWasCalled = true;
+        };
+
+        try
+        {
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+            ContentTypeService.Save(contentType);
+            var content = ContentBuilder.CreateSimpleContent(contentType);
+            content.SetValue("title", "New Value");
+            ContentService.Save(content);
+
+            var copy = ContentService.Copy(content, content.ParentId, false);
+            Assert.AreEqual("1", copy.GetValue("title"));
+
+            Assert.IsTrue(copyingWasCalled);
+            Assert.IsTrue(copiedWasCalled);
+        }
+        finally
+        {
+            ContentNotificationHandler.CopyingContent = null;
+            ContentNotificationHandler.CopiedContent = null;
+        }
+    }
+
+    [Test]
+    public void Can_Copy_Recursive()
+    {
+        // Arrange
+        var temp = ContentService.GetById(Textpage.Id);
+        Assert.AreEqual("Home", temp.Name);
+        Assert.AreEqual(3, ContentService.CountChildren(temp.Id));
+
+        // Act
+        var copy = ContentService.Copy(temp, temp.ParentId, false, true);
+        var content = ContentService.GetById(Textpage.Id);
+
+        // Assert
+        Assert.That(copy, Is.Not.Null);
+        Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
+        Assert.AreNotSame(content, copy);
+        Assert.AreEqual(3, ContentService.CountChildren(copy.Id));
+
+        var child = ContentService.GetById(Subpage.Id);
+        var childCopy = ContentService.GetPagedChildren(copy.Id, 0, 500, out var total).First();
+        Assert.AreEqual(childCopy.Name, child.Name);
+        Assert.AreNotEqual(childCopy.Id, child.Id);
+        Assert.AreNotEqual(childCopy.Key, child.Key);
+    }
+
+    [Test]
+    public void Can_Copy_NonRecursive()
+    {
+        // Arrange
+        var temp = ContentService.GetById(Textpage.Id);
+        Assert.AreEqual("Home", temp.Name);
+        Assert.AreEqual(3, ContentService.CountChildren(temp.Id));
+
+        // Act
+        var copy = ContentService.Copy(temp, temp.ParentId, false, false);
+        var content = ContentService.GetById(Textpage.Id);
+
+        // Assert
+        Assert.That(copy, Is.Not.Null);
+        Assert.That(copy.Id, Is.Not.EqualTo(content.Id));
+        Assert.AreNotSame(content, copy);
+        Assert.AreEqual(0, ContentService.CountChildren(copy.Id));
+    }
+
+    [Test]
+    public void Can_Copy_Content_With_Tags()
+    {
+        const string propAlias = "tags";
+
+        // create a content type that has a 'tags' property
+        // the property needs to support tags, else nothing works of course!
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType =
+            ContentTypeBuilder.CreateSimpleTagsContentType("umbTagsPage", "TagsPage",
+                defaultTemplateId: template.Id);
+        contentType.Key = new Guid("78D96D30-1354-4A1E-8450-377764200C58");
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType, "Simple Tags Page");
+        content.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, propAlias,
+            new[] { "hello", "world" });
+        ContentService.Save(content);
+
+        // value has been set but no tags have been created (not published)
+        Assert.AreEqual("[\"hello\",\"world\"]", content.GetValue(propAlias));
+        var contentTags = TagService.GetTagsForEntity(content.Id).ToArray();
+        Assert.AreEqual(0, contentTags.Length);
+
+        // reloading the content yields the same result
+        content = (Content)ContentService.GetById(content.Id);
+        Assert.AreEqual("[\"hello\",\"world\"]", content.GetValue(propAlias));
+        contentTags = TagService.GetTagsForEntity(content.Id).ToArray();
+        Assert.AreEqual(0, contentTags.Length);
+
+        // publish
+        ContentService.SaveAndPublish(content);
+
+        // now tags have been set (published)
+        Assert.AreEqual("[\"hello\",\"world\"]", content.GetValue(propAlias));
+        contentTags = TagService.GetTagsForEntity(content.Id).ToArray();
+        Assert.AreEqual(2, contentTags.Length);
+
+        // copy
+        var copy = ContentService.Copy(content, content.ParentId, false);
+
+        // copy is not published, so property has value, but no tags have been created
+        Assert.AreEqual("[\"hello\",\"world\"]", copy.GetValue(propAlias));
+        var copiedTags = TagService.GetTagsForEntity(copy.Id).ToArray();
+        Assert.AreEqual(0, copiedTags.Length);
+
+        // publish
+        ContentService.SaveAndPublish(copy);
+
+        // now tags have been set (published)
+        copiedTags = TagService.GetTagsForEntity(copy.Id).ToArray();
+
+        Assert.AreEqual(2, copiedTags.Length);
+        Assert.AreEqual("hello", copiedTags[0].Text);
+        Assert.AreEqual("world", copiedTags[1].Text);
+    }
+
+    [Test]
+    public void Can_Rollback_Version_On_Content()
+    {
+        // Arrange
+        var parent = ContentService.GetById(Textpage.Id);
+        Assert.IsFalse(parent.Published);
+        ContentService.SaveAndPublish(parent); // publishing parent, so Text Page 2 can be updated.
+
+        var content = ContentService.GetById(Subpage.Id);
+        Assert.IsFalse(content.Published);
+
+        var versions = ContentService.GetVersions(Subpage.Id).ToList();
+        Assert.AreEqual(1, versions.Count);
+
+        var version1 = content.VersionId;
+
+        content.Name = "Text Page 2 Updated";
+        content.SetValue("author", "Francis Doe");
+
+        // non published = edited
+        Assert.IsTrue(content.Edited);
+
+        ContentService.SaveAndPublish(content); // new version
+        var version2 = content.VersionId;
+        Assert.AreNotEqual(version1, version2);
+
+        Assert.IsTrue(content.Published);
+        Assert.IsFalse(content.Edited);
+        Assert.AreEqual("Francis Doe",
+            ContentService.GetById(content.Id).GetValue<string>("author")); // version2 author is Francis
+
+        Assert.AreEqual("Text Page 2 Updated", content.Name);
+        Assert.AreEqual("Text Page 2 Updated", content.PublishName);
+
+        content.Name = "Text Page 2 ReUpdated";
+        content.SetValue("author", "Jane Doe");
+
+        // is not actually 'edited' until changes have been saved
+        Assert.IsFalse(content.Edited);
+        ContentService.Save(content); // just save changes
+        Assert.IsTrue(content.Edited);
+
+        Assert.AreEqual("Text Page 2 ReUpdated", content.Name);
+        Assert.AreEqual("Text Page 2 Updated", content.PublishName);
+
+        content.Name = "Text Page 2 ReReUpdated";
+
+        ContentService.SaveAndPublish(content); // new version
+        var version3 = content.VersionId;
+        Assert.AreNotEqual(version2, version3);
+
+        Assert.IsTrue(content.Published);
+        Assert.IsFalse(content.Edited);
+        Assert.AreEqual("Jane Doe",
+            ContentService.GetById(content.Id).GetValue<string>("author")); // version3 author is Jane
+
+        Assert.AreEqual("Text Page 2 ReReUpdated", content.Name);
+        Assert.AreEqual("Text Page 2 ReReUpdated", content.PublishName);
+
+        // here we have
+        // version1, first published version
+        // version2, second published version
+        // version3, third and current published version
+
+        // rollback all values to version1
+        var rollback = ContentService.GetById(Subpage.Id);
+        var rollto = ContentService.GetVersion(version1);
+        rollback.CopyFrom(rollto);
+        rollback.Name = rollto.Name; // must do it explicitly
+        ContentService.Save(rollback);
+
+        Assert.IsNotNull(rollback);
+        Assert.IsTrue(rollback.Published);
+        Assert.IsTrue(rollback.Edited);
+        Assert.AreEqual("Francis Doe",
+            ContentService.GetById(content.Id).GetValue<string>("author")); // author is now Francis again
+        Assert.AreEqual(version3, rollback.VersionId); // same version but with edits
+
+        // props and name have rolled back
+        Assert.AreEqual("Francis Doe", rollback.GetValue<string>("author"));
+        Assert.AreEqual("Text Page 2 Updated", rollback.Name);
+
+        // published props and name are still there
+        Assert.AreEqual("Jane Doe", rollback.GetValue<string>("author", published: true));
+        Assert.AreEqual("Text Page 2 ReReUpdated", rollback.PublishName);
+
+        // rollback all values to current version
+        // special because... current has edits... this really is equivalent to rolling back to version2
+        var rollback2 = ContentService.GetById(Subpage.Id);
+        var rollto2 = ContentService.GetVersion(version3);
+        rollback2.CopyFrom(rollto2);
+        rollback2.Name = rollto2.PublishName; // must do it explicitely AND must pick the publish one!
+        ContentService.Save(rollback2);
+
+        Assert.IsTrue(rollback2.Published);
+        Assert.IsTrue(rollback2.Edited); // Still edited, change of behaviour
+
+        Assert.AreEqual("Jane Doe", rollback2.GetValue<string>("author"));
+        Assert.AreEqual("Text Page 2 ReReUpdated", rollback2.Name);
+
+        // test rollback to self, again
+        content = ContentService.GetById(content.Id);
+        Assert.AreEqual("Text Page 2 ReReUpdated", content.Name);
+        Assert.AreEqual("Jane Doe", content.GetValue<string>("author"));
+        ContentService.SaveAndPublish(content);
+        Assert.IsFalse(content.Edited);
+        content.Name = "Xxx";
+        content.SetValue("author", "Bob Doe");
+        ContentService.Save(content);
+        Assert.IsTrue(content.Edited);
+        rollto = ContentService.GetVersion(content.VersionId);
+        content.CopyFrom(rollto);
+        content.Name = rollto.PublishName; // must do it explicitely AND must pick the publish one!
+        ContentService.Save(content);
+        Assert.IsTrue(content.Edited); //Still edited, change of behaviour
+        Assert.AreEqual("Text Page 2 ReReUpdated", content.Name);
+        Assert.AreEqual("Jane Doe", content.GetValue("author"));
+    }
+
+    [Test]
+    public void Can_Rollback_Version_On_Multilingual()
+    {
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr")
+            .Build();
+        var langDa = new LanguageBuilder()
+            .WithCultureInfo("da")
+            .Build();
+        LocalizationService.Save(langFr);
+        LocalizationService.Save(langDa);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType =
+            ContentTypeBuilder.CreateSimpleContentType("multi", "Multi", defaultTemplateId: template.Id);
+        contentType.Key = new Guid("45FF9A70-9C5F-448D-A476-DCD23566BBF8");
+        contentType.Variations = ContentVariation.Culture;
+        var p1 = contentType.PropertyTypes.First();
+        p1.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        var page = new Content("Page", Constants.System.Root, contentType)
+        {
+            Level = 1,
+            SortOrder = 1,
+            CreatorId = 0,
+            WriterId = 0,
+            Key = new Guid("D7B84CC9-14AE-4D92-A042-023767AD3304")
+        };
+
+        page.SetCultureName("fr1", langFr.IsoCode);
+        page.SetCultureName("da1", langDa.IsoCode);
+        Thread.Sleep(1);
+        ContentService.Save(page);
+        var versionId0 = page.VersionId;
+
+        page.SetValue(p1.Alias, "v1fr", langFr.IsoCode);
+        page.SetValue(p1.Alias, "v1da", langDa.IsoCode);
+        Thread.Sleep(1);
+        ContentService.SaveAndPublish(page);
+        var versionId1 = page.VersionId;
+
+        Thread.Sleep(10);
+
+        page.SetCultureName("fr2", langFr.IsoCode);
+        page.SetValue(p1.Alias, "v2fr", langFr.IsoCode);
+        Thread.Sleep(1);
+        ContentService.SaveAndPublish(page, langFr.IsoCode);
+        var versionId2 = page.VersionId;
+
+        Thread.Sleep(10);
+
+        page.SetCultureName("da2", langDa.IsoCode);
+        page.SetValue(p1.Alias, "v2da", langDa.IsoCode);
+        Thread.Sleep(1);
+        ContentService.SaveAndPublish(page, langDa.IsoCode);
+        var versionId3 = page.VersionId;
+
+        Thread.Sleep(10);
+
+        page.SetCultureName("fr3", langFr.IsoCode);
+        page.SetCultureName("da3", langDa.IsoCode);
+        page.SetValue(p1.Alias, "v3fr", langFr.IsoCode);
+        page.SetValue(p1.Alias, "v3da", langDa.IsoCode);
+        Thread.Sleep(1);
+        ContentService.SaveAndPublish(page);
+        var versionId4 = page.VersionId;
+
+        // now get all versions
+        var versions = ContentService.GetVersions(page.Id).ToArray();
+
+        Assert.AreEqual(5, versions.Length);
+
+        // current version
+        Assert.AreEqual(versionId4, versions[0].VersionId);
+        Assert.AreEqual(versionId3, versions[0].PublishedVersionId);
+
+        // published version
+        Assert.AreEqual(versionId3, versions[1].VersionId);
+        Assert.AreEqual(versionId3, versions[1].PublishedVersionId);
+
+        // previous version
+        Assert.AreEqual(versionId2, versions[2].VersionId);
+        Assert.AreEqual(versionId3, versions[2].PublishedVersionId);
+
+        // previous version
+        Assert.AreEqual(versionId1, versions[3].VersionId);
+        Assert.AreEqual(versionId3, versions[3].PublishedVersionId);
+
+        // previous version
+        Assert.AreEqual(versionId0, versions[4].VersionId);
+        Assert.AreEqual(versionId3, versions[4].PublishedVersionId);
+
+        Assert.AreEqual("fr3", versions[4].GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("fr3", versions[3].GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("fr3", versions[2].GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("fr3", versions[1].GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("fr3", versions[0].GetPublishName(langFr.IsoCode));
+
+        Assert.AreEqual("fr1", versions[4].GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("fr2", versions[3].GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("fr2", versions[2].GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("fr3", versions[1].GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("fr3", versions[0].GetCultureName(langFr.IsoCode));
+
+        Assert.AreEqual("da3", versions[4].GetPublishName(langDa.IsoCode));
+        Assert.AreEqual("da3", versions[3].GetPublishName(langDa.IsoCode));
+        Assert.AreEqual("da3", versions[2].GetPublishName(langDa.IsoCode));
+        Assert.AreEqual("da3", versions[1].GetPublishName(langDa.IsoCode));
+        Assert.AreEqual("da3", versions[0].GetPublishName(langDa.IsoCode));
+
+        Assert.AreEqual("da1", versions[4].GetCultureName(langDa.IsoCode));
+        Assert.AreEqual("da1", versions[3].GetCultureName(langDa.IsoCode));
+        Assert.AreEqual("da2", versions[2].GetCultureName(langDa.IsoCode));
+        Assert.AreEqual("da3", versions[1].GetCultureName(langDa.IsoCode));
+        Assert.AreEqual("da3", versions[0].GetCultureName(langDa.IsoCode));
+
+        // all versions have the same publish infos
+        for (var i = 0; i < 5; i++)
+        {
+            Assert.AreEqual(versions[0].PublishDate, versions[i].PublishDate);
+            Assert.AreEqual(versions[0].GetPublishDate(langFr.IsoCode), versions[i].GetPublishDate(langFr.IsoCode));
+            Assert.AreEqual(versions[0].GetPublishDate(langDa.IsoCode), versions[i].GetPublishDate(langDa.IsoCode));
+        }
+
+        for (var i = 0; i < 5; i++)
+        {
+            Console.Write("[{0}] ", i);
+            Console.WriteLine(versions[i].UpdateDate.ToString("O")[11..]);
+            Console.WriteLine("    fr: {0}", versions[i].GetUpdateDate(langFr.IsoCode)?.ToString("O")[11..]);
+            Console.WriteLine("    da: {0}", versions[i].GetUpdateDate(langDa.IsoCode)?.ToString("O")[11..]);
+        }
+
+        Console.WriteLine("-");
+
+        // for all previous versions, UpdateDate is the published date
+        Assert.AreEqual(versions[4].UpdateDate, versions[4].GetUpdateDate(langFr.IsoCode));
+        Assert.AreEqual(versions[4].UpdateDate, versions[4].GetUpdateDate(langDa.IsoCode));
+
+        Assert.AreEqual(versions[3].UpdateDate, versions[3].GetUpdateDate(langFr.IsoCode));
+        Assert.AreEqual(versions[4].UpdateDate, versions[3].GetUpdateDate(langDa.IsoCode));
+
+        Assert.AreEqual(versions[3].UpdateDate, versions[2].GetUpdateDate(langFr.IsoCode));
+        Assert.AreEqual(versions[2].UpdateDate, versions[2].GetUpdateDate(langDa.IsoCode));
+
+        // for the published version, UpdateDate is the published date
+        Assert.AreEqual(versions[1].UpdateDate, versions[1].GetUpdateDate(langFr.IsoCode));
+        Assert.AreEqual(versions[1].UpdateDate, versions[1].GetUpdateDate(langDa.IsoCode));
+        Assert.AreEqual(versions[1].PublishDate, versions[1].UpdateDate);
+
+        // for the current version, things are different
+        // UpdateDate is the date it was last saved
+        Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langFr.IsoCode));
+        Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langDa.IsoCode));
+
+        // so if we save again...
+        page.SetCultureName("fr4", langFr.IsoCode);
+
+        // page.SetCultureName("da4", langDa.IsoCode);
+        page.SetValue(p1.Alias, "v4fr", langFr.IsoCode);
+        page.SetValue(p1.Alias, "v4da", langDa.IsoCode);
+
+        // This sleep ensures the save is called on later ticks then the SetValue and SetCultureName. Therefore
+        // we showcase the currect lack of handling dirty on variants on save. When this is implemented the sleep
+        // helps showcase the functionality is actually working
+        Thread.Sleep(5);
+        ContentService.Save(page);
+        var versionId5 = page.VersionId;
+
+        versions = ContentService.GetVersions(page.Id).ToArray();
+
+        // we just update the current version
+        Assert.AreEqual(5, versions.Length);
+        Assert.AreEqual(versionId4, versionId5);
+
+        for (var i = 0; i < 5; i++)
+        {
+            Console.Write("[{0}] ", i);
+            Console.WriteLine(versions[i].UpdateDate.ToString("O")[11..]);
+            Console.WriteLine("    fr: {0}", versions[i].GetUpdateDate(langFr.IsoCode)?.ToString("O")[11..]);
+            Console.WriteLine("    da: {0}", versions[i].GetUpdateDate(langDa.IsoCode)?.ToString("O")[11..]);
+        }
+
+        Console.WriteLine("-");
+
+        var versionsSlim = ContentService.GetVersionsSlim(page.Id, 0, 50).ToArray();
+        Assert.AreEqual(5, versionsSlim.Length);
+
+        for (var i = 0; i < 5; i++)
+        {
+            Console.Write("[{0}]     ", i);
+            Console.WriteLine(versionsSlim[i].UpdateDate.Ticks);
+            Console.WriteLine("    fr: {0}", versionsSlim[i].GetUpdateDate(langFr.IsoCode)?.Ticks);
+            Console.WriteLine("    da: {0}", versionsSlim[i].GetUpdateDate(langDa.IsoCode)?.Ticks);
+        }
+
+        Console.WriteLine("-");
+
+        // what we do in the controller to get rollback versions
+        var versionsSlimFr =
+            versionsSlim.Where(x => x.UpdateDate == x.GetUpdateDate(langFr.IsoCode)).ToArray();
+
+        Assert.AreEqual(4, versionsSlimFr.Length);
+
+        // alas, at the moment we do *not* properly track 'dirty' for cultures, meaning
+        // that we cannot synchronize dates the way we do with publish dates - and so this
+        // would fail - the version UpdateDate is greater than the cultures'.
+        Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langFr.IsoCode));
+        Assert.AreEqual(versions[0].UpdateDate, versions[0].GetUpdateDate(langDa.IsoCode));
+
+        // now roll french back to its very first version
+        page.CopyFrom(versions[4], langFr.IsoCode); // only the pure FR values
+        page.CopyFrom(versions[4], null); // so, must explicitly do the INVARIANT values too
+        page.SetCultureName(versions[4].GetPublishName(langFr.IsoCode), langFr.IsoCode);
+        ContentService.Save(page);
+
+        // and voila, rolled back!
+        Assert.AreEqual(versions[4].GetPublishName(langFr.IsoCode), page.GetCultureName(langFr.IsoCode));
+        Assert.AreEqual(versions[4].GetValue(p1.Alias, langFr.IsoCode), page.GetValue(p1.Alias, langFr.IsoCode));
+
+        // note that rolling back invariant values means we also rolled back... DA... at least partially
+        // bah?
+    }
+
+    [Test]
+    public void Can_Save_Lazy_Content()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+        var root = ContentService.GetById(Textpage.Id);
+
+        var c = new Lazy<IContent>(() =>
+            ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page", root.Id));
+        var c2 = new Lazy<IContent>(() =>
+            ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage", c.Value.Id));
+        var list = new List<Lazy<IContent>> { c, c2 };
+
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var repository = DocumentRepository;
+
+            foreach (var content in list)
+            {
+                repository.Save(content.Value);
+            }
+
+            Assert.That(c.Value.HasIdentity, Is.True);
+            Assert.That(c2.Value.HasIdentity, Is.True);
+
+            Assert.That(c.Value.Id > 0, Is.True);
+            Assert.That(c2.Value.Id > 0, Is.True);
+
+            Assert.That(c.Value.ParentId > 0, Is.True);
+            Assert.That(c2.Value.ParentId > 0, Is.True);
+        }
+    }
+
+    [Test]
+    public void Can_Verify_Property_Types_On_Content()
+    {
+        // Arrange
+        var contentTypeService = ContentTypeService;
+        var contentType = ContentTypeBuilder.CreateAllTypesContentType("allDataTypes", "All DataTypes");
+        ContentTypeService.Save(contentType);
+        var content =
+            ContentBuilder.CreateAllTypesContent(contentType, "Random Content", Constants.System.Root);
+        ContentService.Save(content);
+        var id = content.Id;
+
+        // Act
+        var sut = ContentService.GetById(id);
+
+        // Arrange
+        Assert.That(sut.GetValue<bool>("isTrue"), Is.True);
+        Assert.That(sut.GetValue<int>("number"), Is.EqualTo(42));
+        Assert.That(sut.GetValue<string>("bodyText"), Is.EqualTo("Lorem Ipsum Body Text Test"));
+        Assert.That(sut.GetValue<string>("singleLineText"), Is.EqualTo("Single Line Text Test"));
+        Assert.That(sut.GetValue<string>("multilineText"), Is.EqualTo("Multiple lines \n in one box"));
+        Assert.That(sut.GetValue<string>("upload"), Is.EqualTo("/media/1234/koala.jpg"));
+        Assert.That(sut.GetValue<string>("label"), Is.EqualTo("Non-editable label"));
+
+        // SD: This is failing because the 'content' call to GetValue<DateTime> always has empty milliseconds
+        // MCH: I'm guessing this is an issue because of the format the date is actually stored as, right? Cause we don't do any formatting when saving or loading
+        Assert.That(sut.GetValue<DateTime>("dateTime").ToString("G"),
+            Is.EqualTo(content.GetValue<DateTime>("dateTime").ToString("G")));
+        Assert.That(sut.GetValue<string>("colorPicker"), Is.EqualTo("black"));
+        Assert.That(sut.GetValue<string>("ddlMultiple"), Is.EqualTo("1234,1235"));
+        Assert.That(sut.GetValue<string>("rbList"), Is.EqualTo("random"));
+        Assert.That(sut.GetValue<DateTime>("date").ToString("G"),
+            Is.EqualTo(content.GetValue<DateTime>("date").ToString("G")));
+        Assert.That(sut.GetValue<string>("ddl"), Is.EqualTo("1234"));
+        Assert.That(sut.GetValue<string>("chklist"), Is.EqualTo("randomc"));
+        Assert.That(sut.GetValue<Udi>("contentPicker"),
+            Is.EqualTo(Udi.Create(Constants.UdiEntityType.Document,
+                new Guid("74ECA1D4-934E-436A-A7C7-36CC16D4095C"))));
+        Assert.That(sut.GetValue<Udi>("mediaPicker"),
+            Is.EqualTo(Udi.Create(Constants.UdiEntityType.Media,
+                new Guid("44CB39C8-01E5-45EB-9CF8-E70AAF2D1691"))));
+        Assert.That(sut.GetValue<Udi>("memberPicker"),
+            Is.EqualTo(Udi.Create(Constants.UdiEntityType.Member,
+                new Guid("9A50A448-59C0-4D42-8F93-4F1D55B0F47D"))));
+        Assert.That(sut.GetValue<string>("multiUrlPicker"),
+            Is.EqualTo("[{\"name\":\"https://test.com\",\"url\":\"https://test.com\"}]"));
+        Assert.That(sut.GetValue<string>("tags"), Is.EqualTo("this,is,tags"));
+    }
+
+    [Test]
+    public void Can_Delete_Previous_Versions_Not_Latest()
+    {
+        // Arrange
+        var content = ContentService.GetById(Trashed.Id);
+        var version = content.VersionId;
+
+        // Act
+        ContentService.DeleteVersion(Trashed.Id, version, true);
+        var sut = ContentService.GetById(Trashed.Id);
+
+        // Assert
+        Assert.That(sut.VersionId, Is.EqualTo(version));
+    }
+
+    [Test]
+    public void Can_Get_Paged_Children()
+    {
+        // Start by cleaning the "db"
+        var umbTextPage = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
+        ContentService.Delete(umbTextPage);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = ContentBuilder.CreateSimpleContent(contentType);
+            ContentService.Save(c1);
+        }
+
+        var entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out var total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        entities = ContentService.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+    }
+
+    [Test]
+    public void Can_Get_Paged_Children_Dont_Get_Descendants()
+    {
+        // Start by cleaning the "db"
+        var umbTextPage = ContentService.GetById(new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0"));
+        ContentService.Delete(umbTextPage);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        // Only add 9 as we also add a content with children
+        for (var i = 0; i < 9; i++)
+        {
+            var c1 = ContentBuilder.CreateSimpleContent(contentType);
+            ContentService.Save(c1);
+        }
+
+        var willHaveChildren = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(willHaveChildren);
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, "Content" + i, willHaveChildren.Id);
+            ContentService.Save(c1);
+        }
+
+        // children in root including the folder - not the descendants in the folder
+        var entities = ContentService.GetPagedChildren(Constants.System.Root, 0, 6, out var total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        entities = ContentService.GetPagedChildren(Constants.System.Root, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+
+        // children in folder
+        entities = ContentService.GetPagedChildren(willHaveChildren.Id, 0, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        entities = ContentService.GetPagedChildren(willHaveChildren.Id, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+    }
+
+    [Test]
+    public void PublishingTest()
+    {
+        var contentType = new ContentType(ShortStringHelper, Constants.System.Root) { Alias = "foo", Name = "Foo" };
+
+        var properties = new PropertyTypeCollection(true)
+        {
+            new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext)
+            {
+                Alias = "title", Name = "Title", Mandatory = false, DataTypeId = -88
+            }
+        };
+
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "content" });
+
+        contentType.SetDefaultTemplate(new Template(ShortStringHelper, "Textpage", "textpage"));
+        FileService.SaveTemplate(contentType.DefaultTemplate); // else, FK violation on contentType!
+        ContentTypeService.Save(contentType);
+
+        var content = ContentService.Create("foo", Constants.System.Root, "foo");
+        ContentService.Save(content);
+
+        Assert.IsFalse(content.Published);
+        Assert.IsTrue(content.Edited);
+
+        content = ContentService.GetById(content.Id);
+        Assert.IsFalse(content.Published);
+        Assert.IsTrue(content.Edited);
+
+        content.SetValue("title", "foo");
+        Assert.IsTrue(content.Edited);
+
+        ContentService.Save(content);
+
+        Assert.IsFalse(content.Published);
+        Assert.IsTrue(content.Edited);
+
+        content = ContentService.GetById(content.Id);
+        Assert.IsFalse(content.Published);
+        Assert.IsTrue(content.Edited);
+
+        var versions = ContentService.GetVersions(content.Id);
+        Assert.AreEqual(1, versions.Count());
+
+        // publish content
+        // becomes Published, !Edited
+        // creates a new version
+        // can get published property values
+        ContentService.SaveAndPublish(content);
+
+        Assert.IsTrue(content.Published);
+        Assert.IsFalse(content.Edited);
+
+        content = ContentService.GetById(content.Id);
+        Assert.IsTrue(content.Published);
+        Assert.IsFalse(content.Edited);
+
+        versions = ContentService.GetVersions(content.Id);
+        Assert.AreEqual(2, versions.Count());
+
+        Assert.AreEqual("foo", content.GetValue("title", published: true));
+        Assert.AreEqual("foo", content.GetValue("title"));
+
+        // unpublish content
+        // becomes !Published, Edited
+        ContentService.Unpublish(content);
+
+        Assert.IsFalse(content.Published);
+        Assert.IsTrue(content.Edited);
+
+        Assert.AreEqual("foo", content.GetValue("title", published: true));
+        Assert.AreEqual("foo", content.GetValue("title"));
+
+        var vpk = ((Content)content).VersionId;
+        var ppk = ((Content)content).PublishedVersionId;
+
+        content = ContentService.GetById(content.Id);
+        Assert.IsFalse(content.Published);
+        Assert.IsTrue(content.Edited);
+
+        // FIXME: depending on 1 line in ContentBaseFactory.BuildEntity
+        // the published infos can be gone or not
+        // if gone, it's not consistent with above
+        Assert.AreEqual(vpk, ((Content)content).VersionId);
+        Assert.AreEqual(ppk, ((Content)content).PublishedVersionId); // still there
+
+        // FIXME: depending on 1 line in ContentRepository.MapDtoToContent
+        // the published values can be null or not
+        // if null, it's not consistent with above
+        // Assert.IsNull(content.GetValue("title", published:  true));
+        Assert.AreEqual("foo", content.GetValue("title", published: true)); // still there
+        Assert.AreEqual("foo", content.GetValue("title"));
+
+        versions = ContentService.GetVersions(content.Id);
+        Assert.AreEqual(2, versions.Count());
+
+        // ah - we have a problem here - since we're not published we don't have published values
+        // and therefore we cannot "just" republish the content - we need to publish some values
+        // so... that's not really an option
+        //
+        // ContentService.SaveAndPublish(content);
+
+        // FIXME: what shall we do of all this?
+        /*
+        // this basically republishes a content
+        // what if it never was published?
+        // what if it has changes?
+        // do we want to "publish" only some variants, or the entire content?
+        ContentService.Publish(content);
+
+        Assert.IsTrue(content.Published);
+        Assert.IsFalse(content.Edited);
+
+        // FIXME: should it be 2 or 3
+        versions = ContentService.GetVersions(content.Id);
+        Assert.AreEqual(2, versions.Count());
+
+        // FIXME: now test rollbacks
+        var version = ContentService.GetByVersion(content.Id); // test that it gets a version - should be GetVersion
+        var previousVersion = ContentService.GetVersions(content.Id).Skip(1).FirstOrDefault(); // need an optimized way to do this
+        content.CopyValues(version); // copies the edited value - always
+        content.Template = version.Template;
+        content.Name = version.Name;
+        ContentService.Save(content); // this is effectively a rollback?
+        ContentService.Rollback(content); // just kill the method and offer options on values + template + name...
+        */
+    }
+
+    [Test]
+    public void Ensure_Invariant_Name()
+    {
+        var languageService = LocalizationService;
+
+        var langUk = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+
+        languageService.Save(langFr);
+        languageService.Save(langUk);
+
+        var contentTypeService = ContentTypeService;
+
+        var contentType = ContentTypeService.Get("umbTextpage");
+        contentType.Variations = ContentVariation.Culture;
+        contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox,
+            ValueStorageType.Nvarchar, "prop")
+        { Variations = ContentVariation.Culture });
+        ContentTypeService.Save(contentType);
+
+        var content = new Content(null, Constants.System.Root, contentType);
+
+        content.SetCultureName("name-us", langUk.IsoCode);
+        content.SetCultureName("name-fr", langFr.IsoCode);
+        ContentService.Save(content);
+
+        // the name will be set to the default culture variant name
+        Assert.AreEqual("name-us", content.Name);
+
+        // FIXME: should we always sync the invariant name even on update? see EnsureInvariantNameValues
+        ////updating the default culture variant name should also update the invariant name so they stay in sync
+        // content.SetName("name-us-2", langUk.IsoCode);
+        // ContentService.Save(content);
+        // Assert.AreEqual("name-us-2", content.Name);
+    }
+
+    [Test]
+    public void Ensure_Unique_Culture_Names()
+    {
+        var languageService = LocalizationService;
+
+        var langUk = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+
+        languageService.Save(langFr);
+        languageService.Save(langUk);
+
+        var contentTypeService = ContentTypeService;
+
+        var contentType = ContentTypeService.Get("umbTextpage");
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        var content = new Content(null, Constants.System.Root, contentType);
+        content.SetCultureName("root", langUk.IsoCode);
+        ContentService.Save(content);
+
+        for (var i = 0; i < 5; i++)
+        {
+            var child = new Content(null, content, contentType);
+            child.SetCultureName("child", langUk.IsoCode);
+            ContentService.Save(child);
+
+            Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"),
+                child.GetCultureName(langUk.IsoCode));
+
+            // Save it again to ensure that the unique check is not performed again against it's own name
+            ContentService.Save(child);
+            Assert.AreEqual("child" + (i == 0 ? string.Empty : " (" + i + ")"),
+                child.GetCultureName(langUk.IsoCode));
+        }
+    }
+
+    [Test]
+    public void Can_Get_Paged_Children_WithFilterAndOrder()
+    {
+        var languageService = LocalizationService;
+
+        var langUk = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .WithIsMandatory(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        var langDa = new LanguageBuilder()
+            .WithCultureInfo("da-DK")
+            .Build();
+
+        languageService.Save(langFr);
+        languageService.Save(langUk);
+        languageService.Save(langDa);
+
+        var contentTypeService = ContentTypeService;
+
+        var contentType = ContentTypeService.Get("umbTextpage");
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        int[] o = { 2, 1, 3, 0, 4 }; // randomly different
+        for (var i = 0; i < 5; i++)
+        {
+            var contentA = new Content(null, Constants.System.Root, contentType);
+            contentA.SetCultureName("contentA" + i + "uk", langUk.IsoCode);
+            contentA.SetCultureName("contentA" + o[i] + "fr", langFr.IsoCode);
+            contentA.SetCultureName("contentX" + i + "da", langDa.IsoCode);
+            ContentService.Save(contentA);
+
+            var contentB = new Content(null, Constants.System.Root, contentType);
+            contentB.SetCultureName("contentB" + i + "uk", langUk.IsoCode);
+            contentB.SetCultureName("contentB" + o[i] + "fr", langFr.IsoCode);
+            contentB.SetCultureName("contentX" + i + "da", langDa.IsoCode);
+            ContentService.Save(contentB);
+        }
+
+        // get all
+        var list = ContentService.GetPagedChildren(Constants.System.Root, 0, 100, out var total).ToList();
+
+        Console.WriteLine("ALL");
+        WriteList(list);
+
+        // 10 items (there's already a Home content in there...)
+        Assert.AreEqual(11, total);
+        Assert.AreEqual(11, list.Count);
+
+        var sqlContext = GetRequiredService<ISqlContext>();
+
+        // filter
+        list = ContentService.GetPagedChildren(
+            Constants.System.Root,
+            0,
+            100,
+            out total,
+            sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
+            Ordering.By("name", culture: langFr.IsoCode)).ToList();
+
+        Assert.AreEqual(0, total);
+        Assert.AreEqual(0, list.Count);
+
+        // filter
+        list = ContentService.GetPagedChildren(
+            Constants.System.Root,
+            0,
+            100,
+            out total,
+            sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentX")),
+            Ordering.By("name", culture: langDa.IsoCode)).ToList();
+
+        Console.WriteLine("FILTER BY NAME da:'contentX'");
+        WriteList(list);
+
+        Assert.AreEqual(10, total);
+        Assert.AreEqual(10, list.Count);
+
+        // filter
+        list = ContentService.GetPagedChildren(
+            Constants.System.Root,
+            0,
+            100,
+            out total,
+            sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
+            Ordering.By("name", culture: langFr.IsoCode)).ToList();
+
+        Console.WriteLine("FILTER BY NAME fr:'contentA', ORDER ASC");
+        WriteList(list);
+
+        Assert.AreEqual(5, total);
+        Assert.AreEqual(5, list.Count);
+
+        for (var i = 0; i < 5; i++)
+        {
+            Assert.AreEqual("contentA" + i + "fr", list[i].GetCultureName(langFr.IsoCode));
+        }
+
+        list = ContentService.GetPagedChildren(
+            Constants.System.Root,
+            0,
+            100,
+            out total,
+            sqlContext.Query<IContent>().Where(x => x.Name.Contains("contentA")),
+            Ordering.By("name", Direction.Descending, langFr.IsoCode)).ToList();
+
+        Console.WriteLine("FILTER BY NAME fr:'contentA', ORDER DESC");
+        WriteList(list);
+
+        Assert.AreEqual(5, total);
+        Assert.AreEqual(5, list.Count);
+
+        for (var i = 0; i < 5; i++)
+        {
+            Assert.AreEqual("contentA" + (4 - i) + "fr", list[i].GetCultureName(langFr.IsoCode));
+        }
+    }
+
+    private void WriteList(List<IContent> list)
+    {
+        foreach (var content in list)
+        {
+            Console.WriteLine("[{0}] {1} {2} {3} {4}", content.Id, content.Name, content.GetCultureName("en-GB"),
+                content.GetCultureName("fr-FR"), content.GetCultureName("da-DK"));
+        }
+
+        Console.WriteLine("-");
+    }
+
+    [Test]
+    public void Can_SaveRead_Variations()
+    {
+        var languageService = LocalizationService;
+        var langPt = new LanguageBuilder()
+            .WithCultureInfo("pt-PT")
+            .WithIsDefault(true)
+            .Build();
+        var langFr = new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        var langUk = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .Build();
+        var langDe = new LanguageBuilder()
+            .WithCultureInfo("de-DE")
+            .Build();
+
+        languageService.Save(langFr);
+        languageService.Save(langUk);
+        languageService.Save(langDe);
+
+        var contentTypeService = ContentTypeService;
+
+        var contentType = ContentTypeService.Get("umbTextpage");
+        contentType.Variations = ContentVariation.Culture;
+        contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox,
+            ValueStorageType.Nvarchar, "prop")
+        { Variations = ContentVariation.Culture });
+
+        // FIXME: add test w/ an invariant prop
+        ContentTypeService.Save(contentType);
+
+        var content = ContentService.Create("Home US", Constants.System.Root, "umbTextpage");
+
+        // creating content with a name but no culture - will set the invariant name
+        // but, because that content is variant, as soon as we save, we'll need to
+        // replace the invariant name with whatever we have in cultures - always
+        //
+        // in fact, that would throw, because there is no name
+        // ContentService.Save(content);
+
+        // Act
+        content.SetValue("author", "Barack Obama");
+        content.SetValue("prop", "value-fr1", langFr.IsoCode);
+        content.SetValue("prop", "value-uk1", langUk.IsoCode);
+        content.SetCultureName("name-fr", langFr.IsoCode); // and then we can save
+        content.SetCultureName("name-uk", langUk.IsoCode);
+        ContentService.Save(content);
+
+        // content has been saved,
+        // it has names, but no publishNames, and no published cultures
+        var content2 = ContentService.GetById(content.Id);
+
+        Assert.AreEqual("name-fr", content2.Name); // got the default culture name when saved
+        Assert.AreEqual("name-fr", content2.GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("name-uk", content2.GetCultureName(langUk.IsoCode));
+
+        Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode));
+        Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode));
+        Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
+        Assert.IsNull(content2.GetValue("prop", langUk.IsoCode, published: true));
+
+        Assert.IsNull(content2.PublishName);
+        Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
+        Assert.IsNull(content2.GetPublishName(langUk.IsoCode));
+
+        // only fr and uk have a name, and are available
+        AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // nothing has been published yet
+        AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, false),
+            (langDe, false));
+
+        // not published => must be edited, if available
+        AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+
+        // Act
+        ContentService.SaveAndPublish(content, new[] { langFr.IsoCode, langUk.IsoCode });
+
+        // both FR and UK have been published,
+        // and content has been published,
+        // it has names, publishNames, and published cultures
+        content2 = ContentService.GetById(content.Id);
+
+        Assert.AreEqual("name-fr", content2.Name); // got the default culture name when saved
+        Assert.AreEqual("name-fr", content2.GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("name-uk", content2.GetCultureName(langUk.IsoCode));
+
+        // we haven't published InvariantNeutral, but a document cannot be published without an invariant name,
+        // so when we tried and published for the first time above the french culture, the french name was used
+        // to populate the invariant name
+        Assert.AreEqual("name-fr", content2.PublishName);
+
+        Assert.AreEqual("name-fr", content2.GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
+
+        Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode));
+        Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode));
+        Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode, published: true));
+        Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // fr and uk have been published now
+        AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // fr and uk, published without changes, not edited
+        AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, false), (langUk, false),
+            (langDe, false));
+
+        AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
+            (langUk, false)); // DE would throw
+        AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
+            (langUk, false)); // DE would throw
+
+        // note that content and content2 culture published dates might be slightly different due to roundtrip to database
+
+        // Act
+        ContentService.SaveAndPublish(content);
+
+        // now it has publish name for invariant neutral
+        content2 = ContentService.GetById(content.Id);
+
+        Assert.AreEqual("name-fr", content2.PublishName);
+
+        content.SetCultureName("Home US2", null);
+        content.SetCultureName("name-fr2", langFr.IsoCode);
+        content.SetCultureName("name-uk2", langUk.IsoCode);
+        content.SetValue("author", "Barack Obama2");
+        content.SetValue("prop", "value-fr2", langFr.IsoCode);
+        content.SetValue("prop", "value-uk2", langUk.IsoCode);
+        ContentService.Save(content);
+
+        // content has been saved,
+        // it has updated names, unchanged publishNames, and published cultures
+        content2 = ContentService.GetById(content.Id);
+
+        Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
+        Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
+
+        Assert.AreEqual("name-fr", content2.PublishName);
+        Assert.AreEqual("name-fr", content2.GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
+
+        Assert.AreEqual("Barack Obama2", content2.GetValue("author"));
+        Assert.AreEqual("Barack Obama", content2.GetValue("author", published: true));
+
+        Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
+        Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
+        Assert.AreEqual("value-fr1", content2.GetValue("prop", langFr.IsoCode, published: true));
+        Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // we have changed values so now fr and uk are edited
+        AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+
+        AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
+            (langUk, false)); // DE would throw
+        AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue, (langFr, false),
+            (langUk, false)); // DE would throw
+
+        // Act
+        // cannot just 'save' since we are changing what's published!
+        ContentService.Unpublish(content, langFr.IsoCode);
+
+        // content has been published,
+        // the french culture is gone
+        // (only if french is not mandatory, else everything would be gone!)
+        content2 = ContentService.GetById(content.Id);
+
+        Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
+        Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
+
+        Assert.AreEqual("name-fr2", content2.PublishName);
+        Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
+
+        Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
+        Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
+        Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
+        Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
+
+        Assert.IsFalse(content.IsCulturePublished(langFr.IsoCode));
+        Assert.IsTrue(content.IsCulturePublished(langUk.IsoCode));
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // fr is not published anymore
+        AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+
+        // and so, fr has to be edited
+        AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+
+        AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+        AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+
+        // Act
+        ContentService.Unpublish(content);
+
+        // content has been unpublished,
+        // but properties, names, etc. retain their 'published' values so the content
+        // can be re-published in its exact original state (before being unpublished)
+        //
+        // BEWARE!
+        // in order for a content to be unpublished as a whole, and then republished in
+        // its exact previous state, properties and names etc. retain their published
+        // values even though the content is not published - hence many things being
+        // non-null or true below - always check against content.Published to be sure
+        content2 = ContentService.GetById(content.Id);
+
+        Assert.IsFalse(content2.Published);
+
+        Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
+        Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
+
+        Assert.AreEqual("name-fr2", content2.PublishName); // not null, see note above
+        Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode)); // not null, see note above
+
+        Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
+        Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
+        Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
+        Assert.AreEqual("value-uk1",
+            content2.GetValue("prop", langUk.IsoCode, published: true)); // has value, see note above
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // fr is not published anymore - uk still is, see note above
+        AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+
+        // and so, fr has to be edited - uk still is
+        AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+
+        AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+        AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+
+        // Act
+
+        // that HAS to be SavePublishing, because SaveAndPublish would just republish everything!
+        // TODO: This is using an internal API - the test can't pass without this but we want to keep the test here
+        // will need stephane to have a look at this test at some stage since there is a lot of logic here that we
+        // want to keep on testing but don't need the public API to do these more complicated things.
+        ContentService.CommitDocumentChanges(content);
+
+        // content has been re-published,
+        // everything is back to what it was before being unpublished
+        content2 = ContentService.GetById(content.Id);
+
+        Assert.IsTrue(content2.Published);
+
+        Assert.AreEqual("name-fr2", content2.Name); // got the default culture name when saved
+        Assert.AreEqual("name-fr2", content2.GetCultureName(langFr.IsoCode));
+        Assert.AreEqual("name-uk2", content2.GetCultureName(langUk.IsoCode));
+
+        Assert.AreEqual("name-fr2", content2.PublishName);
+        Assert.IsNull(content2.GetPublishName(langFr.IsoCode));
+        Assert.AreEqual("name-uk", content2.GetPublishName(langUk.IsoCode));
+
+        Assert.AreEqual("value-fr2", content2.GetValue("prop", langFr.IsoCode));
+        Assert.AreEqual("value-uk2", content2.GetValue("prop", langUk.IsoCode));
+        Assert.IsNull(content2.GetValue("prop", langFr.IsoCode, published: true));
+        Assert.AreEqual("value-uk1", content2.GetValue("prop", langUk.IsoCode, published: true));
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // no change, back to published
+        AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+
+        // no change, back to published
+        AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, true), (langDe, false));
+
+        AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+        AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+
+        // Act
+        ContentService.SaveAndPublish(content, langUk.IsoCode);
+
+        content2 = ContentService.GetById(content.Id);
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureAvailable(c), (langFr, true), (langUk, true),
+            (langDe, false));
+
+        // no change
+        AssertPerCulture(content, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCulturePublished(c), (langFr, false), (langUk, true),
+            (langDe, false));
+
+        // now, uk is no more edited
+        AssertPerCulture(content, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, false), (langDe, false));
+        AssertPerCulture(content2, (x, c) => x.IsCultureEdited(c), (langFr, true), (langUk, false),
+            (langDe, false));
+
+        AssertPerCulture(content, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+        AssertPerCulture(content2, (x, c) => x.GetPublishDate(c) == DateTime.MinValue,
+            (langUk, false)); // FR, DE would throw
+
+        // Act
+        content.SetCultureName("name-uk3", langUk.IsoCode);
+        ContentService.Save(content);
+
+        content2 = ContentService.GetById(content.Id);
+
+        // note that the 'edited' flags only change once saved - not immediately
+        // but they change, on what's being saved, and when getting it back
+
+        // changing the name = edited!
+        Assert.IsTrue(content.IsCultureEdited(langUk.IsoCode));
+        Assert.IsTrue(content2.IsCultureEdited(langUk.IsoCode));
+    }
+
+    private void AssertPerCulture<T>(IContent item, Func<IContent, string, T> getter,
+        params (ILanguage Language, bool Result)[] testCases)
+    {
+        foreach (var testCase in testCases)
+        {
+            var value = getter(item, testCase.Language.IsoCode);
+            Assert.AreEqual(testCase.Result, value,
+                $"Expected {testCase.Result} and got {value} for culture {testCase.Language.IsoCode}.");
+        }
+    }
+
+    private IEnumerable<IContent> CreateContentHierarchy()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+        var root = ContentService.GetById(Textpage.Id);
+
+        var list = new List<IContent>();
+
+        for (var i = 0; i < 10; i++)
+        {
+            var content =
+                ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Page " + i, root);
+
+            list.Add(content);
+            list.AddRange(CreateChildrenOf(contentType, content, 4));
+
+            Debug.Print("Created: 'Hierarchy Simple Text Page {0}'", i);
+        }
+
+        return list;
+    }
+
+    private IEnumerable<IContent> CreateChildrenOf(IContentType contentType, IContent content, int depth)
+    {
+        var list = new List<IContent>();
+        for (var i = 0; i < depth; i++)
+        {
+            var c = ContentBuilder.CreateSimpleContent(contentType, "Hierarchy Simple Text Subpage " + i,
+                content);
+            list.Add(c);
+
+            Debug.Print("Created: 'Hierarchy Simple Text Subpage {0}' - Depth: {1}", i, depth);
+        }
+
+        return list;
+    }
+
+    private void CreateEnglishAndFrenchDocumentType(out Language langUk, out Language langFr,
+        out ContentType contentType)
+    {
+        langUk = (Language)new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .WithIsDefault(true)
+            .Build();
+        langFr = (Language)new LanguageBuilder()
+            .WithCultureInfo("fr-FR")
+            .Build();
+        LocalizationService.Save(langFr);
+        LocalizationService.Save(langUk);
+
+        contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+    }
+
+    private IContent CreateEnglishAndFrenchDocument(out Language langUk, out Language langFr,
+        out ContentType contentType)
+    {
+        CreateEnglishAndFrenchDocumentType(out langUk, out langFr, out contentType);
+
+        IContent content = new Content("content", Constants.System.Root, contentType);
+        content.SetCultureName("content-fr", langFr.IsoCode);
+        content.SetCultureName("content-en", langUk.IsoCode);
+
+        return content;
+    }
+
+    public class ContentNotificationHandler :
+        INotificationHandler<ContentCopyingNotification>,
+        INotificationHandler<ContentCopiedNotification>,
+        INotificationHandler<ContentPublishingNotification>
+    {
+        public static Action<ContentPublishingNotification> PublishingContent { get; set; }
+
+        public static Action<ContentCopyingNotification> CopyingContent { get; set; }
+
+        public static Action<ContentCopiedNotification> CopiedContent { get; set; }
+
+        public void Handle(ContentCopiedNotification notification) => CopiedContent?.Invoke(notification);
+
+        public void Handle(ContentCopyingNotification notification) => CopyingContent?.Invoke(notification);
+        public void Handle(ContentPublishingNotification notification) => PublishingContent?.Invoke(notification);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs
index 1a514a401a..9e6c17f6ad 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceTests.cs
@@ -12,1497 +12,813 @@ using Umbraco.Cms.Core.Exceptions;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
+public class ContentTypeServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
-    public class ContentTypeServiceTests : UmbracoIntegrationTest
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private ContentService ContentService => (ContentService)GetRequiredService<IContentService>();
+
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private ContentTypeService ContentTypeService => (ContentTypeService)GetRequiredService<IContentTypeService>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private IFileService FileService => GetRequiredService<IFileService>();
+        builder.AddNotificationHandler<ContentMovedToRecycleBinNotification, ContentNotificationHandler>();
+        builder.AddNotificationHandler<ContentTypeDeletedNotification, ContentTypeNotificationHandler>();
+    }
 
-        private ContentService ContentService => (ContentService)GetRequiredService<IContentService>();
-
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
-
-        private ContentTypeService ContentTypeService => (ContentTypeService)GetRequiredService<IContentTypeService>();
-
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+    [Test]
+    public void CanSaveAndGetIsElement()
+    {
+        // create content type with a property type that varies by culture
+        IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = ContentVariation.Nothing;
+        var contentCollection = new PropertyTypeCollection(true)
         {
-            builder.AddNotificationHandler<ContentMovedToRecycleBinNotification, ContentNotificationHandler>();
-            builder.AddNotificationHandler<ContentTypeDeletedNotification, ContentTypeNotificationHandler>();
-        }
-
-        [Test]
-        public void CanSaveAndGetIsElement()
-        {
-            // create content type with a property type that varies by culture
-            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = ContentVariation.Nothing;
-            var contentCollection = new PropertyTypeCollection(true)
+            new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext)
             {
-                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext)
-                {
-                    Alias = "title",
-                    Name = "Title",
-                    Description = string.Empty,
-                    Mandatory = false,
-                    SortOrder = 1,
-                    DataTypeId = -88,
-                    Variations = ContentVariation.Nothing
-                }
-            };
-            contentType.PropertyGroups.Add(new PropertyGroup(contentCollection)
-            {
-                Alias = "content",
-                Name = "Content",
-                SortOrder = 1
-            });
-            ContentTypeService.Save(contentType);
-
-            contentType = ContentTypeService.Get(contentType.Id);
-            Assert.IsFalse(contentType.IsElement);
-
-            contentType.IsElement = true;
-            ContentTypeService.Save(contentType);
-
-            contentType = ContentTypeService.Get(contentType.Id);
-            Assert.IsTrue(contentType.IsElement);
-        }
-
-        [Test]
-        public void Deleting_Content_Type_With_Hierarchy_Of_Content_Items_Moves_Orphaned_Content_To_Recycle_Bin()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            IContentType contentType1 = ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
-            FileService.SaveTemplate(contentType1.DefaultTemplate);
-            ContentTypeService.Save(contentType1);
-            IContentType contentType2 = ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
-            FileService.SaveTemplate(contentType2.DefaultTemplate);
-            ContentTypeService.Save(contentType2);
-            IContentType contentType3 = ContentTypeBuilder.CreateSimpleContentType("test3", "Test3", defaultTemplateId: template.Id);
-            FileService.SaveTemplate(contentType3.DefaultTemplate);
-            ContentTypeService.Save(contentType3);
-
-            IContentType[] contentTypes = new[] { contentType1, contentType2, contentType3 };
-            int parentId = -1;
-
-            var ids = new List<int>();
-
-            for (int i = 0; i < 2; i++)
-            {
-                for (int index = 0; index < contentTypes.Length; index++)
-                {
-                    IContentType contentType = contentTypes[index];
-                    Content contentItem = ContentBuilder.CreateSimpleContent(contentType, "MyName_" + index + "_" + i, parentId);
-                    ContentService.Save(contentItem);
-                    ContentService.SaveAndPublish(contentItem);
-                    parentId = contentItem.Id;
-
-                    ids.Add(contentItem.Id);
-                }
-            }
-
-            // delete the first content type, all other content of different content types should be in the recycle bin
-            ContentTypeService.Delete(contentTypes[0]);
-
-            IEnumerable<IContent> found = ContentService.GetByIds(ids);
-
-            Assert.AreEqual(4, found.Count());
-            foreach (IContent content in found)
-            {
-                Assert.IsTrue(content.Trashed);
-            }
-        }
-
-        [Test]
-        public void Deleting_Content_Types_With_Hierarchy_Of_Content_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items_1()
-        {
-            ContentNotificationHandler.MovedContentToRecycleBin = MovedContentToRecycleBin;
-
-            try
-            {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                IContentType contentType1 = ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
-                FileService.SaveTemplate(contentType1.DefaultTemplate);
-                ContentTypeService.Save(contentType1);
-                IContentType contentType2 = ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
-                FileService.SaveTemplate(contentType2.DefaultTemplate);
-                ContentTypeService.Save(contentType2);
-                IContentType contentType3 = ContentTypeBuilder.CreateSimpleContentType("test3", "Test3", defaultTemplateId: template.Id);
-                FileService.SaveTemplate(contentType3.DefaultTemplate);
-                ContentTypeService.Save(contentType3);
-
-                IContentType[] contentTypes = new[] { contentType1, contentType2, contentType3 };
-                int parentId = -1;
-
-                for (int i = 0; i < 2; i++)
-                {
-                    for (int index = 0; index < contentTypes.Length; index++)
-                    {
-                        IContentType contentType = contentTypes[index];
-                        Content contentItem = ContentBuilder.CreateSimpleContent(contentType, "MyName_" + index + "_" + i, parentId);
-                        ContentService.Save(contentItem);
-                        ContentService.SaveAndPublish(contentItem);
-                        parentId = contentItem.Id;
-                    }
-                }
-
-                foreach (IContentType contentType in contentTypes.Reverse())
-                {
-                    ContentTypeService.Delete(contentType);
-                }
-            }
-            finally
-            {
-                ContentNotificationHandler.MovedContentToRecycleBin = null;
-            }
-        }
-
-        [Test]
-        public void Deleting_Content_Types_With_Hierarchy_Of_Content_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items_2()
-        {
-            ContentNotificationHandler.MovedContentToRecycleBin = MovedContentToRecycleBin;
-
-            try
-            {
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template);
-
-                IContentType contentType1 = ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
-                FileService.SaveTemplate(contentType1.DefaultTemplate);
-                ContentTypeService.Save(contentType1);
-                IContentType contentType2 = ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
-                FileService.SaveTemplate(contentType2.DefaultTemplate);
-                ContentTypeService.Save(contentType2);
-                IContentType contentType3 = ContentTypeBuilder.CreateSimpleContentType("test3", "Test3", defaultTemplateId: template.Id);
-                FileService.SaveTemplate(contentType3.DefaultTemplate);
-                ContentTypeService.Save(contentType3);
-
-                Content root = ContentBuilder.CreateSimpleContent(contentType1, "Root", -1);
-                ContentService.Save(root);
-                ContentService.SaveAndPublish(root);
-
-                Content level1 = ContentBuilder.CreateSimpleContent(contentType2, "L1", root.Id);
-                ContentService.Save(level1);
-                ContentService.SaveAndPublish(level1);
-
-                for (int i = 0; i < 2; i++)
-                {
-                    Content level3 = ContentBuilder.CreateSimpleContent(contentType3, "L2" + i, level1.Id);
-                    ContentService.Save(level3);
-                    ContentService.SaveAndPublish(level3);
-                }
-
-                ContentTypeService.Delete(contentType1);
-            }
-            finally
-            {
-                ContentNotificationHandler.MovedContentToRecycleBin = null;
-            }
-        }
-
-        private void MovedContentToRecycleBin(ContentMovedToRecycleBinNotification notification)
-        {
-            foreach (MoveEventInfo<IContent> item in notification.MoveInfoCollection)
-            {
-                // if this item doesn't exist then Fail!
-                IContent exists = ContentService.GetById(item.Entity.Id);
-                if (exists == null)
-                {
-                    Assert.Fail("The item doesn't exist");
-                }
-            }
-        }
-
-        [Test]
-        public void Deleting_PropertyType_Removes_The_Property_From_Content()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            IContentType contentType1 = ContentTypeBuilder.CreateTextPageContentType("test1", "Test1", defaultTemplateId: template.Id);
-            FileService.SaveTemplate(contentType1.DefaultTemplate);
-            ContentTypeService.Save(contentType1);
-            IContent contentItem = ContentBuilder.CreateTextpageContent(contentType1, "Testing", -1);
-            ContentService.SaveAndPublish(contentItem);
-            int initProps = contentItem.Properties.Count;
-
-            // remove a property
-            contentType1.RemovePropertyType(contentType1.PropertyTypes.First().Alias);
-            ContentTypeService.Save(contentType1);
-
-            // re-load it from the db
-            contentItem = ContentService.GetById(contentItem.Id);
-
-            Assert.AreEqual(initProps - 1, contentItem.Properties.Count);
-        }
-
-        [Test]
-        public void Get_Descendants()
-        {
-            // Arrange
-            ContentTypeService contentTypeService = ContentTypeService;
-            IContentType[] hierarchy = CreateContentTypeHierarchy();
-            contentTypeService.Save(hierarchy, 0); // ensure they are saved!
-            IContentType master = hierarchy.First();
-
-            // Act
-            IEnumerable<IContentType> descendants = contentTypeService.GetDescendants(master.Id, false);
-
-            // Assert
-            Assert.AreEqual(10, descendants.Count());
-        }
-
-        [Test]
-        public void Get_Descendants_And_Self()
-        {
-            // Arrange
-            ContentTypeService contentTypeService = ContentTypeService;
-            IContentType[] hierarchy = CreateContentTypeHierarchy();
-            contentTypeService.Save(hierarchy, 0); // ensure they are saved!
-            IContentType master = hierarchy.First();
-
-            // Act
-            IEnumerable<IContentType> descendants = contentTypeService.GetDescendants(master.Id, true);
-
-            // Assert
-            Assert.AreEqual(11, descendants.Count());
-        }
-
-        [Test]
-        public void Can_Bulk_Save_New_Hierarchy_Content_Types()
-        {
-            // Arrange
-            ContentTypeService contentTypeService = ContentTypeService;
-            IContentType[] hierarchy = CreateContentTypeHierarchy();
-
-            // Act
-            contentTypeService.Save(hierarchy, 0);
-
-            Assert.That(hierarchy.Any(), Is.True);
-            Assert.That(hierarchy.Any(x => x.HasIdentity == false), Is.False);
-
-            // all parent ids should be ok, they are lazy and if they equal zero an exception will be thrown
-            Assert.DoesNotThrow(() => hierarchy.Any(x => x.ParentId != 0));
-            for (int i = 0; i < hierarchy.Count(); i++)
-            {
-                if (i == 0)
-                {
-                    continue;
-                }
-
-                Assert.AreEqual(hierarchy.ElementAt(i).ParentId, hierarchy.ElementAt(i - 1).Id);
-            }
-        }
-
-        [Test]
-        public void Can_Save_ContentType_Structure_And_Create_Content_Based_On_It()
-        {
-            // Arrange
-            ContentService cs = ContentService;
-            ContentTypeService cts = ContentTypeService;
-            IDataType dtdYesNo = DataTypeService.GetDataType(-49);
-            var ctBase = new ContentType(ShortStringHelper, -1) { Name = "Base", Alias = "Base", Icon = "folder.gif", Thumbnail = "folder.png" };
-            ctBase.AddPropertyType(new PropertyType(ShortStringHelper, dtdYesNo, Constants.Conventions.Content.NaviHide)
-            {
-                Name = "Hide From Navigation",
-            });
-                /*,"Navigation"*/            cts.Save(ctBase);
-
-            const string contentTypeAlias = "HomePage";
-            var ctHomePage = new ContentType(ShortStringHelper, ctBase, contentTypeAlias)
-            {
-                Name = "Home Page",
-                Alias = contentTypeAlias,
-                Icon = "settingDomain.gif",
-                Thumbnail = "folder.png",
-                AllowedAsRoot = true
-            };
-            ctHomePage.AddPropertyType(new PropertyType(ShortStringHelper, dtdYesNo, "someProperty") { Name = "Some property" });
-                /*,"Navigation"*/            cts.Save(ctHomePage);
-
-            // Act
-            IContent homeDoc = cs.Create("Home Page", -1, contentTypeAlias);
-            cs.SaveAndPublish(homeDoc);
-
-            // Assert
-            Assert.That(ctBase.HasIdentity, Is.True);
-            Assert.That(ctHomePage.HasIdentity, Is.True);
-            Assert.That(homeDoc.HasIdentity, Is.True);
-            Assert.That(homeDoc.ContentTypeId, Is.EqualTo(ctHomePage.Id));
-        }
-
-        [Test]
-        public void Create_Content_Type_Ensures_Sort_Orders()
-        {
-            var contentType = new ContentType(ShortStringHelper, -1)
-            {
-                Alias = "test",
-                Name = "Test",
-                Description = "ContentType used for simple text pages",
-                Icon = ".sprTreeDoc3",
-                Thumbnail = "doc2.png",
-                SortOrder = 1,
-                CreatorId = 0,
-                Trashed = false
-            };
-
-            contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title") { Name = "Title", Description = string.Empty, Mandatory = false, DataTypeId = -88 });
-            contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TinyMce, ValueStorageType.Ntext, "bodyText") { Name = "Body Text", Description = string.Empty, Mandatory = false, DataTypeId = -87 });
-            contentType.AddPropertyType(new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author") { Name = "Author", Description = "Name of the author", Mandatory = false, DataTypeId = -88 });
-
-            ContentTypeService.Save(contentType);
-
-            int[] sortOrders = contentType.PropertyTypes.Select(x => x.SortOrder).ToArray();
-
-            Assert.AreEqual(1, sortOrders.Count(x => x == 0));
-            Assert.AreEqual(1, sortOrders.Count(x => x == 1));
-            Assert.AreEqual(1, sortOrders.Count(x => x == 2));
-        }
-
-        [Test]
-        public void Can_Create_And_Save_ContentType_Composition()
-        {
-            /*
-             * Global
-             * - Components
-             * - Category
-             */
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType global = ContentTypeBuilder.CreateSimpleContentType("global", "Global", defaultTemplateId: template.Id);
-            ContentTypeService.Save(global);
-
-            ContentType components = ContentTypeBuilder.CreateSimpleContentType("components", "Components", global, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(components);
-
-            ContentType component = ContentTypeBuilder.CreateSimpleContentType("component", "Component", components, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(component);
-
-            ContentType category = ContentTypeBuilder.CreateSimpleContentType("category", "Category", global, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(category);
-
-            bool success = category.AddContentType(component);
-
-            Assert.That(success, Is.False);
-        }
-
-        [Test]
-        public void Can_Delete_Parent_ContentType_When_Child_Has_Content()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            ContentType childContentType = ContentTypeBuilder.CreateSimpleContentType("childPage", "Child Page", contentType, randomizeAliases: true, propertyGroupAlias: "childContent", propertyGroupName: "Child Content", defaultTemplateId: template.Id);
-            ContentTypeService.Save(childContentType);
-            IContent content = ContentService.Create("Page 1", -1, childContentType.Alias);
-            ContentService.Save(content);
-
-            ContentTypeService.Delete(contentType);
-
-            Assert.IsNotNull(content.Id);
-            Assert.AreNotEqual(0, content.Id);
-            Assert.IsNotNull(childContentType.Id);
-            Assert.AreNotEqual(0, childContentType.Id);
-            Assert.IsNotNull(contentType.Id);
-            Assert.AreNotEqual(0, contentType.Id);
-            IContent deletedContent = ContentService.GetById(content.Id);
-            IContentType deletedChildContentType = ContentTypeService.Get(childContentType.Id);
-            IContentType deletedContentType = ContentTypeService.Get(contentType.Id);
-
-            Assert.IsNull(deletedChildContentType);
-            Assert.IsNull(deletedContent);
-            Assert.IsNull(deletedContentType);
-        }
-
-        [Test]
-        public void Can_Create_Container()
-        {
-            // Arrange
-            ContentTypeService cts = ContentTypeService;
-
-            // Act
-            var container = new EntityContainer(Constants.ObjectTypes.DocumentType)
-            {
-                Name = "container1"
-            };
-            cts.SaveContainer(container);
-
-            // Assert
-            EntityContainer createdContainer = cts.GetContainer(container.Id);
-            Assert.IsNotNull(createdContainer);
-        }
-
-        [Test]
-        public void Can_Get_All_Containers()
-        {
-            // Arrange
-            ContentTypeService cts = ContentTypeService;
-
-            // Act
-            var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType)
-            {
-                Name = "container1"
-            };
-            cts.SaveContainer(container1);
-
-            var container2 = new EntityContainer(Constants.ObjectTypes.DocumentType)
-            {
-                Name = "container2"
-            };
-            cts.SaveContainer(container2);
-
-            // Assert
-            IEnumerable<EntityContainer> containers = cts.GetContainers(new int[0]);
-            Assert.AreEqual(2, containers.Count());
-        }
-
-        [Test]
-        public void Deleting_ContentType_Sends_Correct_Number_Of_DeletedEntities_In_Events()
-        {
-            int deletedEntities = 0;
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            ContentTypeNotificationHandler.Deleted += (notification) =>  deletedEntities += notification.DeletedEntities.Count();
-
-            ContentTypeService.Delete(contentType);
-
-            Assert.AreEqual(deletedEntities, 1);
-        }
-
-        [Test]
-        public void Deleting_Multiple_ContentTypes_Sends_Correct_Number_Of_DeletedEntities_In_Events()
-        {
-            int deletedEntities = 0;
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-            ContentType contentType2 = ContentTypeBuilder.CreateSimpleContentType("otherPage", "Other page", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType2);
-
-            ContentTypeNotificationHandler.Deleted += (notification) => deletedEntities += notification.DeletedEntities.Count();
-
-            ContentTypeService.Delete(contentType);
-            ContentTypeService.Delete(contentType2);
-
-            Assert.AreEqual(2, deletedEntities);
-        }
-
-        [Test]
-        public void Deleting_ContentType_With_Child_Sends_Correct_Number_Of_DeletedEntities_In_Events()
-        {
-            int deletedEntities = 0;
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-            ContentType contentType2 = ContentTypeBuilder.CreateSimpleContentType("subPage", "Sub page", defaultTemplateId: template.Id);
-            contentType2.ParentId = contentType.Id;
-            ContentTypeService.Save(contentType2);
-
-            ContentTypeNotificationHandler.Deleted += (notification) => deletedEntities += notification.DeletedEntities.Count();
-
-            ContentTypeService.Delete(contentType);
-
-            Assert.AreEqual(2, deletedEntities);
-        }
-
-        [Test]
-        public void Can_Remove_ContentType_Composition_From_ContentType()
-        {
-            // Test for U4-2234
-            ContentTypeService cts = ContentTypeService;
-
-            // Arrange
-            ContentType component = CreateComponent();
-            cts.Save(component);
-            ContentType banner = CreateBannerComponent(component);
-            cts.Save(banner);
-            ContentType site = CreateSite();
-            cts.Save(site);
-            ContentType homepage = CreateHomepage(site);
-            cts.Save(homepage);
-
-            // Add banner to homepage
-            bool added = homepage.AddContentType(banner);
-            cts.Save(homepage);
-
-            // Assert composition
-            bool bannerExists = homepage.ContentTypeCompositionExists(banner.Alias);
-            bool bannerPropertyExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
-            Assert.That(added, Is.True);
-            Assert.That(bannerExists, Is.True);
-            Assert.That(bannerPropertyExists, Is.True);
-            Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(6));
-
-            // Remove banner from homepage
-            bool removed = homepage.RemoveContentType(banner.Alias);
-            cts.Save(homepage);
-
-            // Assert composition
-            bool bannerStillExists = homepage.ContentTypeCompositionExists(banner.Alias);
-            bool bannerPropertyStillExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
-            Assert.That(removed, Is.True);
-            Assert.That(bannerStillExists, Is.False);
-            Assert.That(bannerPropertyStillExists, Is.False);
-            Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(4));
-        }
-
-        [Test]
-        public void Can_Copy_ContentType_By_Performing_Clone()
-        {
-            // Arrange
-            ContentType metaContentType = ContentTypeBuilder.CreateMetaContentType();
-            ContentTypeService.Save(metaContentType);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            var simpleContentType = ContentTypeBuilder.CreateSimpleContentType("category", "Category", metaContentType, defaultTemplateId: template.Id) as IContentType;
-            ContentTypeService.Save(simpleContentType);
-            int categoryId = simpleContentType.Id;
-
-            // Act
-            IContentType sut = simpleContentType.DeepCloneWithResetIdentities("newcategory");
-            Assert.IsNotNull(sut);
-            ContentTypeService.Save(sut);
-
-            // Assert
-            Assert.That(sut.HasIdentity, Is.True);
-
-            IContentType contentType = ContentTypeService.Get(sut.Id);
-            IContentType category = ContentTypeService.Get(categoryId);
-
-            Assert.That(contentType.CompositionAliases().Any(x => x.Equals("meta")), Is.True);
-            Assert.AreEqual(contentType.ParentId, category.ParentId);
-            Assert.AreEqual(contentType.Level, category.Level);
-            Assert.AreEqual(contentType.PropertyTypes.Count(), category.PropertyTypes.Count());
-            Assert.AreNotEqual(contentType.Id, category.Id);
-            Assert.AreNotEqual(contentType.Key, category.Key);
-            Assert.AreNotEqual(contentType.Path, category.Path);
-            Assert.AreNotEqual(contentType.SortOrder, category.SortOrder);
-            Assert.AreNotEqual(contentType.PropertyTypes.First(x => x.Alias.Equals("title")).Id, category.PropertyTypes.First(x => x.Alias.Equals("title")).Id);
-            Assert.AreNotEqual(contentType.PropertyGroups.First(x => x.Name.Equals("Content")).Id, category.PropertyGroups.First(x => x.Name.Equals("Content")).Id);
-        }
-
-        [Test]
-        public void Can_Copy_ContentType_To_New_Parent_By_Performing_Clone()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType parentContentType1 = ContentTypeBuilder.CreateSimpleContentType("parent1", "Parent1", defaultTemplateId: template.Id);
-            ContentTypeService.Save(parentContentType1);
-            ContentType parentContentType2 = ContentTypeBuilder.CreateSimpleContentType("parent2", "Parent2", randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(parentContentType2);
-
-            var simpleContentType = ContentTypeBuilder.CreateSimpleContentType("category", "Category", parentContentType1, randomizeAliases: true, defaultTemplateId: template.Id) as IContentType;
-            ContentTypeService.Save(simpleContentType);
-
-            // Act
-            IContentType clone = simpleContentType.DeepCloneWithResetIdentities("newcategory");
-            Assert.IsNotNull(clone);
-            clone.RemoveContentType("parent1");
-            clone.AddContentType(parentContentType2);
-            clone.ParentId = parentContentType2.Id;
-            ContentTypeService.Save(clone);
-
-            // Assert
-            Assert.That(clone.HasIdentity, Is.True);
-
-            IContentType clonedContentType = ContentTypeService.Get(clone.Id);
-            IContentType originalContentType = ContentTypeService.Get(simpleContentType.Id);
-
-            Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent2")), Is.True);
-            Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent1")), Is.False);
-
-            Assert.AreEqual(clonedContentType.Path, "-1," + parentContentType2.Id + "," + clonedContentType.Id);
-            Assert.AreEqual(clonedContentType.PropertyTypes.Count(), originalContentType.PropertyTypes.Count());
-
-            Assert.AreNotEqual(clonedContentType.ParentId, originalContentType.ParentId);
-            Assert.AreEqual(clonedContentType.ParentId, parentContentType2.Id);
-
-            Assert.AreNotEqual(clonedContentType.Id, originalContentType.Id);
-            Assert.AreNotEqual(clonedContentType.Key, originalContentType.Key);
-            Assert.AreNotEqual(clonedContentType.Path, originalContentType.Path);
-
-            Assert.AreNotEqual(clonedContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id, originalContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id);
-            Assert.AreNotEqual(clonedContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id, originalContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id);
-        }
-
-        [Test]
-        public void Can_Copy_ContentType_With_Service_To_Root()
-        {
-            // Arrange
-            ContentType metaContentType = ContentTypeBuilder.CreateMetaContentType();
-            ContentTypeService.Save(metaContentType);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType simpleContentType = ContentTypeBuilder.CreateSimpleContentType("category", "Category", metaContentType, defaultTemplateId: template.Id);
-            ContentTypeService.Save(simpleContentType);
-            int categoryId = simpleContentType.Id;
-
-            // Act
-            IContentType clone = ContentTypeService.Copy(simpleContentType, "newcategory", "new category");
-
-            // Assert
-            Assert.That(clone.HasIdentity, Is.True);
-
-            IContentType cloned = ContentTypeService.Get(clone.Id);
-            IContentType original = ContentTypeService.Get(categoryId);
-
-            Assert.That(cloned.CompositionAliases().Any(x => x.Equals("meta")), Is.False); // it's been copied to root
-            Assert.AreEqual(cloned.ParentId, -1);
-            Assert.AreEqual(cloned.Level, 1);
-            Assert.AreEqual(cloned.PropertyTypes.Count(), original.PropertyTypes.Count());
-            Assert.AreEqual(cloned.PropertyGroups.Count(), original.PropertyGroups.Count());
-
-            for (int i = 0; i < cloned.PropertyGroups.Count; i++)
-            {
-                Assert.AreEqual(cloned.PropertyGroups[i].PropertyTypes.Count, original.PropertyGroups[i].PropertyTypes.Count);
-                foreach (IPropertyType propertyType in cloned.PropertyGroups[i].PropertyTypes)
-                {
-                    Assert.IsTrue(propertyType.HasIdentity);
-                }
-            }
-
-            foreach (IPropertyType propertyType in cloned.PropertyTypes)
-            {
-                Assert.IsTrue(propertyType.HasIdentity);
-            }
-
-            Assert.AreNotEqual(cloned.Id, original.Id);
-            Assert.AreNotEqual(cloned.Key, original.Key);
-            Assert.AreNotEqual(cloned.Path, original.Path);
-            Assert.AreNotEqual(cloned.SortOrder, original.SortOrder);
-            Assert.AreNotEqual(cloned.PropertyTypes.First(x => x.Alias.Equals("title")).Id, original.PropertyTypes.First(x => x.Alias.Equals("title")).Id);
-            Assert.AreNotEqual(cloned.PropertyGroups.First(x => x.Name.Equals("Content")).Id, original.PropertyGroups.First(x => x.Name.Equals("Content")).Id);
-        }
-
-        [Test]
-        public void Can_Copy_ContentType_To_New_Parent_With_Service()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType parentContentType1 = ContentTypeBuilder.CreateSimpleContentType("parent1", "Parent1", defaultTemplateId: template.Id);
-            ContentTypeService.Save(parentContentType1);
-            ContentType parentContentType2 = ContentTypeBuilder.CreateSimpleContentType("parent2", "Parent2", randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(parentContentType2);
-
-            ContentType simpleContentType = ContentTypeBuilder.CreateSimpleContentType("category", "Category", parentContentType1, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(simpleContentType);
-
-            // Act
-            IContentType clone = ContentTypeService.Copy(simpleContentType, "newAlias", "new alias", parentContentType2);
-
-            // Assert
-            Assert.That(clone.HasIdentity, Is.True);
-
-            IContentType clonedContentType = ContentTypeService.Get(clone.Id);
-            IContentType originalContentType = ContentTypeService.Get(simpleContentType.Id);
-
-            Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent2")), Is.True);
-            Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent1")), Is.False);
-
-            Assert.AreEqual(clonedContentType.Path, "-1," + parentContentType2.Id + "," + clonedContentType.Id);
-            Assert.AreEqual(clonedContentType.PropertyTypes.Count(), originalContentType.PropertyTypes.Count());
-
-            Assert.AreNotEqual(clonedContentType.ParentId, originalContentType.ParentId);
-            Assert.AreEqual(clonedContentType.ParentId, parentContentType2.Id);
-
-            Assert.AreNotEqual(clonedContentType.Id, originalContentType.Id);
-            Assert.AreNotEqual(clonedContentType.Key, originalContentType.Key);
-            Assert.AreNotEqual(clonedContentType.Path, originalContentType.Path);
-
-            Assert.AreNotEqual(clonedContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id, originalContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id);
-            Assert.AreNotEqual(clonedContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id, originalContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id);
-        }
-
-        [Test]
-        public void Cannot_Add_Duplicate_PropertyType_Alias_To_Referenced_Composition()
-        {
-            // Related the second issue in screencast from this post http://issues.umbraco.org/issue/U4-5986
-
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType parent = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(parent);
-            ContentType child = ContentTypeBuilder.CreateSimpleContentType("simpleChildPage", "Simple Child Page", parent, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(child);
-            ContentType composition = ContentTypeBuilder.CreateMetaContentType();
-            ContentTypeService.Save(composition);
-
-            // Adding Meta-composition to child doc type
-            child.AddContentType(composition);
-            ContentTypeService.Save(child);
-
-            // Act
-            var duplicatePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
-            {
-                 Name = "Title", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool added = composition.AddPropertyType(duplicatePropertyType, "meta", "Meta");
-
-            // Assert
-            Assert.That(added, Is.True);
-            Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(composition));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("simpleChildPage"));
-        }
-
-        [Test]
-        public void Cannot_Add_Duplicate_PropertyType_Alias_In_Composition_Graph()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType basePage = ContentTypeBuilder.CreateSimpleContentType("basePage", "Base Page", randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(basePage);
-            ContentType contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", basePage, defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(advancedPage);
-
-            ContentType metaComposition = ContentTypeBuilder.CreateMetaContentType();
-            ContentTypeService.Save(metaComposition);
-            ContentType seoComposition = ContentTypeBuilder.CreateMetaContentType("seo", "SEO");
-            ContentTypeService.Save(seoComposition);
-
-            bool metaAdded = contentPage.AddContentType(metaComposition);
-            ContentTypeService.Save(contentPage);
-            bool seoAdded = advancedPage.AddContentType(seoComposition);
-            ContentTypeService.Save(advancedPage);
-
-            // Act
-            var duplicatePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
-            {
-                 Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool addedToBasePage = basePage.AddPropertyType(duplicatePropertyType, "content", "Content");
-            bool addedToAdvancedPage = advancedPage.AddPropertyType(duplicatePropertyType, "content", "Content");
-            bool addedToMeta = metaComposition.AddPropertyType(duplicatePropertyType, "meta", "Meta");
-            bool addedToSeo = seoComposition.AddPropertyType(duplicatePropertyType, "seo", "Seo");
-
-            // Assert
-            Assert.That(metaAdded, Is.True);
-            Assert.That(seoAdded, Is.True);
-
-            Assert.That(addedToBasePage, Is.True);
-            Assert.That(addedToAdvancedPage, Is.False);
-            Assert.That(addedToMeta, Is.True);
-            Assert.That(addedToSeo, Is.True);
-
-            Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(basePage));
-            Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(metaComposition));
-            Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(seoComposition));
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("meta"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("seo"));
-        }
-
-        [Test]
-        public void Cannot_Add_Duplicate_PropertyType_Alias_At_Root_Which_Conflicts_With_Third_Levels_Composition()
-        {
-            /*
-             * BasePage, gets 'Title' added but should not be allowed
-             * -- Content Page
-             * ---- Advanced Page -> Content Meta
-             * Content Meta :: Composition, has 'Title'
-             *
-             * Content Meta has 'Title' PropertyType
-             * Adding 'Title' to BasePage should fail
-            */
-
-            // Arrange
-            ContentType basePage = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(basePage);
-            ContentType contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
-            ContentTypeService.Save(advancedPage);
-
-            ContentType contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
-            ContentTypeService.Save(contentMetaComposition);
-
-            // Act
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
-            ContentTypeService.Save(basePage);
-
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
-            ContentTypeService.Save(contentPage);
-
-            bool compositionAdded = advancedPage.AddContentType(contentMetaComposition);
-            ContentTypeService.Save(advancedPage);
-
-            // NOTE: It should not be possible to Save 'BasePage' with the Title PropertyType added
-            var titlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
-            {
-                 Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool titleAdded = basePage.AddPropertyType(titlePropertyType, "content", "Content");
-
-            // Assert
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-            Assert.That(titleAdded, Is.True);
-            Assert.That(compositionAdded, Is.True);
-
-            Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(basePage));
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-        }
-
-        [Test]
-        public void Cannot_Save_ContentType_With_Empty_Name()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("contentType", string.Empty);
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => ContentTypeService.Save(contentType));
-        }
-
-        [Test]
-        public void Cannot_Rename_PropertyType_Alias_On_Composition_Which_Would_Cause_Conflict_In_Other_Composition()
-        {
-            /*
-             * Meta renames alias to 'title'
-             * Seo has 'Title'
-             * BasePage
-             * -- ContentPage
-             * ---- AdvancedPage -> Seo
-             * ------ MoreAdvanedPage -> Meta
-             */
-
-            // Arrange
-            ContentType basePage = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(basePage);
-            ContentType contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
-            ContentTypeService.Save(advancedPage);
-            ContentType moreAdvancedPage = ContentTypeBuilder.CreateBasicContentType("moreAdvancedPage", "More Advanced Page", advancedPage);
-            ContentTypeService.Save(moreAdvancedPage);
-
-            ContentType seoComposition = ContentTypeBuilder.CreateMetaContentType("seo", "SEO");
-            ContentTypeService.Save(seoComposition);
-            ContentType metaComposition = ContentTypeBuilder.CreateMetaContentType();
-            ContentTypeService.Save(metaComposition);
-
-            // Act
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
-            ContentTypeService.Save(basePage);
-
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
-            ContentTypeService.Save(contentPage);
-
-            var subtitlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "subtitle")
-            {
-                 Name = "Subtitle", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool subtitleAdded = advancedPage.AddPropertyType(subtitlePropertyType, "content", "Content");
-            ContentTypeService.Save(advancedPage);
-
-            var titlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
-            {
-                 Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool titleAdded = seoComposition.AddPropertyType(titlePropertyType, "content", "Content");
-            ContentTypeService.Save(seoComposition);
-
-            bool seoCompositionAdded = advancedPage.AddContentType(seoComposition);
-            bool metaCompositionAdded = moreAdvancedPage.AddContentType(metaComposition);
-            ContentTypeService.Save(advancedPage);
-            ContentTypeService.Save(moreAdvancedPage);
-
-            IPropertyType keywordsPropertyType = metaComposition.PropertyTypes.First(x => x.Alias.Equals("metakeywords"));
-            keywordsPropertyType.Alias = "title";
-
-            // Assert
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(subtitleAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-            Assert.That(titleAdded, Is.True);
-            Assert.That(seoCompositionAdded, Is.True);
-            Assert.That(metaCompositionAdded, Is.True);
-
-            Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(metaComposition));
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("moreAdvancedPage"));
-        }
-
-        [Test]
-        public void Can_Add_Additional_Properties_On_Composition_Once_Composition_Has_Been_Saved()
-        {
-            /*
-             * Meta renames alias to 'title'
-             * Seo has 'Title'
-             * BasePage
-             * -- ContentPage
-             * ---- AdvancedPage -> Seo
-             * ------ MoreAdvancedPage -> Meta
-             */
-
-            // Arrange
-            ContentType basePage = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(basePage);
-            ContentType contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
-            ContentTypeService.Save(advancedPage);
-            ContentType moreAdvancedPage = ContentTypeBuilder.CreateBasicContentType("moreAdvancedPage", "More Advanced Page", advancedPage);
-            ContentTypeService.Save(moreAdvancedPage);
-
-            ContentType seoComposition = ContentTypeBuilder.CreateMetaContentType("seo", "SEO");
-            ContentTypeService.Save(seoComposition);
-            ContentType metaComposition = ContentTypeBuilder.CreateMetaContentType();
-            ContentTypeService.Save(metaComposition);
-
-            // Act
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
-            ContentTypeService.Save(basePage);
-
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
-            ContentTypeService.Save(contentPage);
-
-            var subtitlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "subtitle")
-            {
-                 Name = "Subtitle", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool subtitleAdded = advancedPage.AddPropertyType(subtitlePropertyType, "content", "Content");
-            ContentTypeService.Save(advancedPage);
-
-            var titlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
-            {
-                 Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool titleAdded = seoComposition.AddPropertyType(titlePropertyType, "content", "Content");
-            ContentTypeService.Save(seoComposition);
-
-            bool seoCompositionAdded = advancedPage.AddContentType(seoComposition);
-            bool metaCompositionAdded = moreAdvancedPage.AddContentType(metaComposition);
-            ContentTypeService.Save(advancedPage);
-            ContentTypeService.Save(moreAdvancedPage);
-
-            // Assert
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(subtitleAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-            Assert.That(titleAdded, Is.True);
-            Assert.That(seoCompositionAdded, Is.True);
-            Assert.That(metaCompositionAdded, Is.True);
-
-            var testPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "test")
-            {
-                 Name = "Test", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool testAdded = seoComposition.AddPropertyType(testPropertyType, "content", "Content");
-            ContentTypeService.Save(seoComposition);
-
-            Assert.That(testAdded, Is.True);
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("moreAdvancedPage"));
-        }
-
-        [Test]
-        public void Cannot_Rename_PropertyGroup_On_Child_Avoiding_Conflict_With_Parent_PropertyGroup()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(page);
-            ContentType contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page, randomizeAliases: true, propertyGroupAlias: "content2", propertyGroupName: "Content_", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage, randomizeAliases: true, propertyGroupAlias: "details", propertyGroupName: "Details", defaultTemplateId: template.Id);
-            ContentTypeService.Save(advancedPage);
-
-            ContentType contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
-            ContentTypeService.Save(contentMetaComposition);
-
-            // Act
-            var subtitlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "subtitle")
-            {
-                 Name = "Subtitle", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool subtitleAdded = contentPage.AddPropertyType(subtitlePropertyType, "content", "Content");
-            bool authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
-            ContentTypeService.Save(contentPage);
-
-            bool compositionAdded = contentPage.AddContentType(contentMetaComposition);
-            ContentTypeService.Save(contentPage);
-
-            // Change the name of the tab on the "root" content type 'page'.
-            PropertyGroup propertyGroup = contentPage.PropertyGroups["content2"];
-            Assert.Throws<ArgumentException>(() => contentPage.PropertyGroups.Add(new PropertyGroup(true)
-            {
-                Id = propertyGroup.Id,
-                Alias = "content",
-                Name = "Content",
-                SortOrder = 0
-            }));
-
-            // Assert
-            Assert.That(compositionAdded, Is.True);
-            Assert.That(subtitleAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-        }
-
-        [Test]
-        public void Cannot_Rename_PropertyType_Alias_Causing_Conflicts_With_Parents()
-        {
-            // Arrange
-            ContentType basePage = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(basePage);
-            ContentType contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
-            ContentTypeService.Save(advancedPage);
-
-            // Act
-            var titlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
-            {
-                 Name = "Title", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool titleAdded = basePage.AddPropertyType(titlePropertyType, "content", "Content");
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = contentPage.AddPropertyType(bodyTextPropertyType, "content", "Content");
-            var subtitlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "subtitle")
-            {
-                 Name = "Subtitle", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool subtitleAdded = contentPage.AddPropertyType(subtitlePropertyType, "content", "Content");
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool authorAdded = advancedPage.AddPropertyType(authorPropertyType, "content", "Content");
-            ContentTypeService.Save(basePage);
-            ContentTypeService.Save(contentPage);
-            ContentTypeService.Save(advancedPage);
-
-            // Rename the PropertyType to something that already exists in the Composition - NOTE this should not be allowed and Saving should throw an exception
-            IPropertyType authorPropertyTypeToRename = advancedPage.PropertyTypes.First(x => x.Alias.Equals("author"));
-            authorPropertyTypeToRename.Alias = "title";
-
-            // Assert
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-            Assert.That(titleAdded, Is.True);
-            Assert.That(subtitleAdded, Is.True);
-
-            Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(advancedPage));
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-        }
-
-        [Test]
-        public void Can_Add_PropertyType_Alias_Which_Exists_In_Composition_Outside_Graph()
-        {
-            /*
-             * Meta (Composition)
-             * Content Meta (Composition) has 'Title' -> Meta
-             * BasePage
-             * -- ContentPage gets 'Title' added -> Meta
-             * ---- Advanced Page
-             */
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType basePage = ContentTypeBuilder.CreateSimpleContentType("basePage", "Base Page", randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(basePage);
-            ContentType contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", basePage, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage, randomizeAliases: true, defaultTemplateId: template.Id);
-            ContentTypeService.Save(advancedPage);
-
-            ContentType metaComposition = ContentTypeBuilder.CreateMetaContentType();
-            ContentTypeService.Save(metaComposition);
-
-            ContentType contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
-            ContentTypeService.Save(contentMetaComposition);
-
-            bool metaAdded = contentPage.AddContentType(metaComposition);
-            ContentTypeService.Save(contentPage);
-
-            bool metaAddedToComposition = contentMetaComposition.AddContentType(metaComposition);
-            ContentTypeService.Save(contentMetaComposition);
-
-            // Act
-            var propertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
-            {
-                 Name = "Title", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool addedToContentPage = contentPage.AddPropertyType(propertyType, "content", "Content");
-
-            // Assert
-            Assert.That(metaAdded, Is.True);
-            Assert.That(metaAddedToComposition, Is.True);
-
-            Assert.That(addedToContentPage, Is.True);
-            Assert.DoesNotThrow(() => ContentTypeService.Save(contentPage));
-        }
-
-        [Test]
-        public void Can_Rename_PropertyGroup_With_Inherited_PropertyGroups()
-        {
-            // Related the first issue in screencast from this post http://issues.umbraco.org/issue/U4-5986
-
-            // Arrange
-            // create 'page' content type with a 'Content_' group
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", propertyGroupAlias: "content2", propertyGroupName: "Content_", defaultTemplateId: template.Id);
-            Assert.AreEqual(1, page.PropertyGroups.Count);
-            Assert.AreEqual("Content_", page.PropertyGroups.First().Name);
-            Assert.AreEqual(3, page.PropertyTypes.Count());
-            Assert.AreEqual("Title", page.PropertyTypes.First().Name);
-            Assert.AreEqual("Body text", page.PropertyTypes.Skip(1).First().Name);
-            Assert.AreEqual("Author", page.PropertyTypes.Skip(2).First().Name);
-            ContentTypeService.Save(page);
-
-            // create 'contentPage' content type as a child of 'page'
-            ContentType contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page, randomizeAliases: true, defaultTemplateId: template.Id);
-            Assert.AreEqual(1, page.PropertyGroups.Count);
-            Assert.AreEqual("Content_", page.PropertyGroups.First().Name);
-            Assert.AreEqual(3, contentPage.PropertyTypes.Count());
-            Assert.AreEqual("Title", contentPage.PropertyTypes.First().Name);
-            Assert.AreEqual("Body text", contentPage.PropertyTypes.Skip(1).First().Name);
-            Assert.AreEqual("Author", contentPage.PropertyTypes.Skip(2).First().Name);
-            ContentTypeService.Save(contentPage);
-
-            // add 'Content' group to 'meta' content type
-            ContentType meta = ContentTypeBuilder.CreateMetaContentType();
-            Assert.AreEqual(1, meta.PropertyGroups.Count);
-            Assert.AreEqual("Meta", meta.PropertyGroups.First().Name);
-            Assert.AreEqual(2, meta.PropertyTypes.Count());
-            Assert.AreEqual("Meta Keywords", meta.PropertyTypes.First().Name);
-            Assert.AreEqual("Meta Description", meta.PropertyTypes.Skip(1).First().Name);
-            meta.AddPropertyGroup("content", "Content");
-            Assert.AreEqual(2, meta.PropertyTypes.Count());
-            ContentTypeService.Save(meta);
-
-            // add 'meta' content type to 'contentPage' composition
-            contentPage.AddContentType(meta);
-            ContentTypeService.Save(contentPage);
-
-            // add property 'prop1' to 'contentPage' group 'Content_'
-            var prop1 = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "testTextbox")
-            {
-                 Name = "Test Textbox", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool prop1Added = contentPage.AddPropertyType(prop1, "content2", "Content_");
-            Assert.IsTrue(prop1Added);
-
-            // add property 'prop2' to 'contentPage' group 'Content'
-            var prop2 = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "anotherTextbox")
-            {
-                 Name = "Another Test Textbox", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool prop2Added = contentPage.AddPropertyType(prop2, "content", "Content");
-            Assert.IsTrue(prop2Added);
-
-            // save 'contentPage' content type
-            ContentTypeService.Save(contentPage);
-
-            PropertyGroup group = page.PropertyGroups["content2"];
-            group.Name = "ContentTab"; // rename the group
-            ContentTypeService.Save(page);
-            Assert.AreEqual(3, page.PropertyTypes.Count());
-
-            // get 'contentPage' content type again
-            IContentType contentPageAgain = ContentTypeService.Get("contentPage");
-            Assert.IsNotNull(contentPageAgain);
-
-            // assert that 'Content_' group is still there because we don't propagate renames
-            PropertyGroup findGroup = contentPageAgain.CompositionPropertyGroups.FirstOrDefault(x => x.Name == "Content_");
-            Assert.IsNotNull(findGroup);
-
-            // count all property types (local and composed)
-            int propertyTypeCount = contentPageAgain.PropertyTypes.Count();
-            Assert.That(propertyTypeCount, Is.EqualTo(5));
-
-            // count composed property types
-            int compPropertyTypeCount = contentPageAgain.CompositionPropertyTypes.Count();
-            Assert.That(compPropertyTypeCount, Is.EqualTo(10));
-        }
-
-        [Test]
-        public void Can_Rename_PropertyGroup_On_Parent_Without_Causing_Duplicate_PropertyGroups()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true, propertyGroupAlias: "content2", propertyGroupName: "Content_", defaultTemplateId: template.Id);
-            ContentTypeService.Save(page);
-            ContentType contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page, randomizeAliases: true, propertyGroupAlias: "contentx", propertyGroupName: "Contentx", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentPage);
-            ContentType advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage, randomizeAliases: true, propertyGroupAlias: "contenty", propertyGroupName: "Contenty", defaultTemplateId: template.Id);
-            ContentTypeService.Save(advancedPage);
-
-            ContentType contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
-            ContentTypeService.Save(contentMetaComposition);
-            bool compositionAdded = contentPage.AddContentType(contentMetaComposition);
-            ContentTypeService.Save(contentPage);
-
-            // Act
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            var subtitlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "subtitle")
-            {
-                 Name = "Subtitle", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = contentPage.AddPropertyType(bodyTextPropertyType, "content2", "Content_"); // Will be added to the parent tab
-            bool subtitleAdded = contentPage.AddPropertyType(subtitlePropertyType, "content", "Content"); // Will be added to the "Content Meta" composition
-            ContentTypeService.Save(contentPage);
-
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            var descriptionPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "description")
-            {
-                 Name = "Description", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            var keywordsPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "keywords")
-            {
-                 Name = "Keywords", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool authorAdded = advancedPage.AddPropertyType(authorPropertyType, "content2", "Content_"); // Will be added to an ancestor tab
-            bool descriptionAdded = advancedPage.AddPropertyType(descriptionPropertyType, "contentx", "Contentx"); // Will be added to a parent tab
-            bool keywordsAdded = advancedPage.AddPropertyType(keywordsPropertyType, "content", "Content"); // Will be added to the "Content Meta" composition
-            ContentTypeService.Save(advancedPage);
-
-            // Change the name of the tab on the "root" content type 'page'.
-            PropertyGroup propertyGroup = page.PropertyGroups["content2"];
-            page.PropertyGroups.Add(new PropertyGroup(true) {
-                Id = propertyGroup.Id,
-                Name = "Content",
-                Alias = "content",
-                SortOrder = 0
-            });
-            ContentTypeService.Save(page);
-
-            // Assert
-            Assert.That(compositionAdded, Is.True);
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(subtitleAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-            Assert.That(descriptionAdded, Is.True);
-            Assert.That(keywordsAdded, Is.True);
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-
-            IContentType advancedPageReloaded = ContentTypeService.Get("advancedPage");
-            bool contentUnderscoreTabExists = advancedPageReloaded.CompositionPropertyGroups.Any(x => x.Name.Equals("Content_"));
-
-            // now is true, because we don't propagate renames anymore
-            Assert.That(contentUnderscoreTabExists, Is.True);
-
-            int numberOfContentTabs = advancedPageReloaded.CompositionPropertyGroups.Count(x => x.Name.Equals("Content"));
-            Assert.That(numberOfContentTabs, Is.EqualTo(4));
-        }
-
-        [Test]
-        public void Can_Rename_PropertyGroup_On_Parent_Without_Causing_Duplicate_PropertyGroups_v2()
-        {
-            // Arrange
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true, propertyGroupAlias: "content2", propertyGroupName: "Content_", defaultTemplateId: template.Id);
-            ContentTypeService.Save(page);
-            ContentType contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page, randomizeAliases: true, propertyGroupAlias: "content", propertyGroupName: "Content", defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentPage);
-
-            ContentType contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
-            ContentTypeService.Save(contentMetaComposition);
-
-            // Act
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            var subtitlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "subtitle")
-            {
-                 Name = "Subtitle", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = page.AddPropertyType(bodyTextPropertyType, "content2", "Content_");
-            bool subtitleAdded = contentPage.AddPropertyType(subtitlePropertyType, "content", "Content");
-            bool authorAdded = contentPage.AddPropertyType(authorPropertyType, "content2", "Content_");
-            ContentTypeService.Save(page);
-            ContentTypeService.Save(contentPage);
-
-            bool compositionAdded = contentPage.AddContentType(contentMetaComposition);
-            ContentTypeService.Save(contentPage);
-
-            // Change the alias/name of the tab on the "root" content type 'page'.
-            PropertyGroup propertyGroup = page.PropertyGroups["content2"];
-            page.PropertyGroups.Add(new PropertyGroup(true)
-            {
-                Id = propertyGroup.Id,
-                Alias = "content",
-                Name = "Content",
-                SortOrder = 0
-            });
-            ContentTypeService.Save(page);
-
-            // Assert
-            Assert.That(compositionAdded, Is.True);
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(subtitleAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-        }
-
-        [Test]
-        public void Can_Remove_PropertyGroup_On_Parent_Without_Causing_Duplicate_PropertyGroups()
-        {
-            // Arrange
-            ContentType basePage = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(basePage);
-
-            ContentType contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
-            ContentTypeService.Save(contentPage);
-
-            ContentType advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
-            ContentTypeService.Save(advancedPage);
-
-            ContentType contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
-            ContentTypeService.Save(contentMetaComposition);
-
-            // Act
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
-            ContentTypeService.Save(basePage);
-
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
-            ContentTypeService.Save(contentPage);
-
-            bool compositionAdded = contentPage.AddContentType(contentMetaComposition);
-            ContentTypeService.Save(contentPage);
-
-            basePage.RemovePropertyGroup("content");
-            ContentTypeService.Save(basePage);
-
-            // Assert
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-            Assert.That(compositionAdded, Is.True);
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-
-            IContentType contentType = ContentTypeService.Get("contentPage");
-            PropertyGroup propertyGroup = contentType.PropertyGroups["content"];
-        }
-
-        [Test]
-        public void Can_Remove_PropertyGroup_Without_Removing_Property_Types()
-        {
-            var basePage = (IContentType)ContentTypeBuilder.CreateBasicContentType();
-            basePage.AddPropertyGroup("content", "Content");
-            basePage.AddPropertyGroup("meta", "Meta");
-            ContentTypeService.Save(basePage);
-
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
-            {
-                Name = "Author",
+                Alias = "title",
+                Name = "Title",
                 Description = string.Empty,
                 Mandatory = false,
                 SortOrder = 1,
-                DataTypeId = -88
-            };
-            Assert.IsTrue(basePage.AddPropertyType(authorPropertyType, "content", "Content"));
+                DataTypeId = -88,
+                Variations = ContentVariation.Nothing
+            }
+        };
+        contentType.PropertyGroups.Add(new PropertyGroup(contentCollection)
+        {
+            Alias = "content",
+            Name = "Content",
+            SortOrder = 1
+        });
+        ContentTypeService.Save(contentType);
 
-            var titlePropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "title")
+        contentType = ContentTypeService.Get(contentType.Id);
+        Assert.IsFalse(contentType.IsElement);
+
+        contentType.IsElement = true;
+        ContentTypeService.Save(contentType);
+
+        contentType = ContentTypeService.Get(contentType.Id);
+        Assert.IsTrue(contentType.IsElement);
+    }
+
+    [Test]
+    public void Deleting_Content_Type_With_Hierarchy_Of_Content_Items_Moves_Orphaned_Content_To_Recycle_Bin()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        IContentType contentType1 =
+            ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
+        FileService.SaveTemplate(contentType1.DefaultTemplate);
+        ContentTypeService.Save(contentType1);
+        IContentType contentType2 =
+            ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
+        FileService.SaveTemplate(contentType2.DefaultTemplate);
+        ContentTypeService.Save(contentType2);
+        IContentType contentType3 =
+            ContentTypeBuilder.CreateSimpleContentType("test3", "Test3", defaultTemplateId: template.Id);
+        FileService.SaveTemplate(contentType3.DefaultTemplate);
+        ContentTypeService.Save(contentType3);
+
+        IContentType[] contentTypes = { contentType1, contentType2, contentType3 };
+        var parentId = -1;
+
+        var ids = new List<int>();
+
+        for (var i = 0; i < 2; i++)
+        {
+            for (var index = 0; index < contentTypes.Length; index++)
+            {
+                var contentType = contentTypes[index];
+                var contentItem =
+                    ContentBuilder.CreateSimpleContent(contentType, "MyName_" + index + "_" + i, parentId);
+                ContentService.Save(contentItem);
+                ContentService.SaveAndPublish(contentItem);
+                parentId = contentItem.Id;
+
+                ids.Add(contentItem.Id);
+            }
+        }
+
+        // delete the first content type, all other content of different content types should be in the recycle bin
+        ContentTypeService.Delete(contentTypes[0]);
+
+        var found = ContentService.GetByIds(ids);
+
+        Assert.AreEqual(4, found.Count());
+        foreach (var content in found)
+        {
+            Assert.IsTrue(content.Trashed);
+        }
+    }
+
+    [Test]
+    public void Deleting_Content_Types_With_Hierarchy_Of_Content_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items_1()
+    {
+        ContentNotificationHandler.MovedContentToRecycleBin = MovedContentToRecycleBin;
+
+        try
+        {
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            IContentType contentType1 =
+                ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
+            FileService.SaveTemplate(contentType1.DefaultTemplate);
+            ContentTypeService.Save(contentType1);
+            IContentType contentType2 =
+                ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
+            FileService.SaveTemplate(contentType2.DefaultTemplate);
+            ContentTypeService.Save(contentType2);
+            IContentType contentType3 =
+                ContentTypeBuilder.CreateSimpleContentType("test3", "Test3", defaultTemplateId: template.Id);
+            FileService.SaveTemplate(contentType3.DefaultTemplate);
+            ContentTypeService.Save(contentType3);
+
+            IContentType[] contentTypes = { contentType1, contentType2, contentType3 };
+            var parentId = -1;
+
+            for (var i = 0; i < 2; i++)
+            {
+                for (var index = 0; index < contentTypes.Length; index++)
+                {
+                    var contentType = contentTypes[index];
+                    var contentItem =
+                        ContentBuilder.CreateSimpleContent(contentType, "MyName_" + index + "_" + i, parentId);
+                    ContentService.Save(contentItem);
+                    ContentService.SaveAndPublish(contentItem);
+                    parentId = contentItem.Id;
+                }
+            }
+
+            foreach (var contentType in contentTypes.Reverse())
+            {
+                ContentTypeService.Delete(contentType);
+            }
+        }
+        finally
+        {
+            ContentNotificationHandler.MovedContentToRecycleBin = null;
+        }
+    }
+
+    [Test]
+    public void Deleting_Content_Types_With_Hierarchy_Of_Content_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items_2()
+    {
+        ContentNotificationHandler.MovedContentToRecycleBin = MovedContentToRecycleBin;
+
+        try
+        {
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template);
+
+            IContentType contentType1 =
+                ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
+            FileService.SaveTemplate(contentType1.DefaultTemplate);
+            ContentTypeService.Save(contentType1);
+            IContentType contentType2 =
+                ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
+            FileService.SaveTemplate(contentType2.DefaultTemplate);
+            ContentTypeService.Save(contentType2);
+            IContentType contentType3 =
+                ContentTypeBuilder.CreateSimpleContentType("test3", "Test3", defaultTemplateId: template.Id);
+            FileService.SaveTemplate(contentType3.DefaultTemplate);
+            ContentTypeService.Save(contentType3);
+
+            var root = ContentBuilder.CreateSimpleContent(contentType1, "Root");
+            ContentService.Save(root);
+            ContentService.SaveAndPublish(root);
+
+            var level1 = ContentBuilder.CreateSimpleContent(contentType2, "L1", root.Id);
+            ContentService.Save(level1);
+            ContentService.SaveAndPublish(level1);
+
+            for (var i = 0; i < 2; i++)
+            {
+                var level3 = ContentBuilder.CreateSimpleContent(contentType3, "L2" + i, level1.Id);
+                ContentService.Save(level3);
+                ContentService.SaveAndPublish(level3);
+            }
+
+            ContentTypeService.Delete(contentType1);
+        }
+        finally
+        {
+            ContentNotificationHandler.MovedContentToRecycleBin = null;
+        }
+    }
+
+    private void MovedContentToRecycleBin(ContentMovedToRecycleBinNotification notification)
+    {
+        foreach (var item in notification.MoveInfoCollection)
+        {
+            // if this item doesn't exist then Fail!
+            var exists = ContentService.GetById(item.Entity.Id);
+            if (exists == null)
+            {
+                Assert.Fail("The item doesn't exist");
+            }
+        }
+    }
+
+    [Test]
+    public void Deleting_PropertyType_Removes_The_Property_From_Content()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        IContentType contentType1 = ContentTypeBuilder.CreateTextPageContentType("test1", "Test1", template.Id);
+        FileService.SaveTemplate(contentType1.DefaultTemplate);
+        ContentTypeService.Save(contentType1);
+        IContent contentItem = ContentBuilder.CreateTextpageContent(contentType1, "Testing", -1);
+        ContentService.SaveAndPublish(contentItem);
+        var initProps = contentItem.Properties.Count;
+
+        // remove a property
+        contentType1.RemovePropertyType(contentType1.PropertyTypes.First().Alias);
+        ContentTypeService.Save(contentType1);
+
+        // re-load it from the db
+        contentItem = ContentService.GetById(contentItem.Id);
+
+        Assert.AreEqual(initProps - 1, contentItem.Properties.Count);
+    }
+
+    [Test]
+    public void Get_Descendants()
+    {
+        // Arrange
+        var contentTypeService = ContentTypeService;
+        var hierarchy = CreateContentTypeHierarchy();
+        contentTypeService.Save(hierarchy, 0); // ensure they are saved!
+        var master = hierarchy.First();
+
+        // Act
+        var descendants = contentTypeService.GetDescendants(master.Id, false);
+
+        // Assert
+        Assert.AreEqual(10, descendants.Count());
+    }
+
+    [Test]
+    public void Get_Descendants_And_Self()
+    {
+        // Arrange
+        var contentTypeService = ContentTypeService;
+        var hierarchy = CreateContentTypeHierarchy();
+        contentTypeService.Save(hierarchy, 0); // ensure they are saved!
+        var master = hierarchy.First();
+
+        // Act
+        var descendants = contentTypeService.GetDescendants(master.Id, true);
+
+        // Assert
+        Assert.AreEqual(11, descendants.Count());
+    }
+
+    [Test]
+    public void Can_Bulk_Save_New_Hierarchy_Content_Types()
+    {
+        // Arrange
+        var contentTypeService = ContentTypeService;
+        var hierarchy = CreateContentTypeHierarchy();
+
+        // Act
+        contentTypeService.Save(hierarchy, 0);
+
+        Assert.That(hierarchy.Any(), Is.True);
+        Assert.That(hierarchy.Any(x => x.HasIdentity == false), Is.False);
+
+        // all parent ids should be ok, they are lazy and if they equal zero an exception will be thrown
+        Assert.DoesNotThrow(() => hierarchy.Any(x => x.ParentId != 0));
+        for (var i = 0; i < hierarchy.Count(); i++)
+        {
+            if (i == 0)
+            {
+                continue;
+            }
+
+            Assert.AreEqual(hierarchy.ElementAt(i).ParentId, hierarchy.ElementAt(i - 1).Id);
+        }
+    }
+
+    [Test]
+    public void Can_Save_ContentType_Structure_And_Create_Content_Based_On_It()
+    {
+        // Arrange
+        var cs = ContentService;
+        var cts = ContentTypeService;
+        var dtdYesNo = DataTypeService.GetDataType(-49);
+        var ctBase = new ContentType(ShortStringHelper, -1)
+        {
+            Name = "Base",
+            Alias = "Base",
+            Icon = "folder.gif",
+            Thumbnail = "folder.png"
+        };
+        ctBase.AddPropertyType(new PropertyType(ShortStringHelper, dtdYesNo, Constants.Conventions.Content.NaviHide)
+        {
+            Name = "Hide From Navigation"
+        });
+        /*,"Navigation"*/
+        cts.Save(ctBase);
+
+        const string contentTypeAlias = "HomePage";
+        var ctHomePage = new ContentType(ShortStringHelper, ctBase, contentTypeAlias)
+        {
+            Name = "Home Page",
+            Alias = contentTypeAlias,
+            Icon = "settingDomain.gif",
+            Thumbnail = "folder.png",
+            AllowedAsRoot = true
+        };
+        ctHomePage.AddPropertyType(
+            new PropertyType(ShortStringHelper, dtdYesNo, "someProperty") { Name = "Some property" });
+        /*,"Navigation"*/
+        cts.Save(ctHomePage);
+
+        // Act
+        var homeDoc = cs.Create("Home Page", -1, contentTypeAlias);
+        cs.SaveAndPublish(homeDoc);
+
+        // Assert
+        Assert.That(ctBase.HasIdentity, Is.True);
+        Assert.That(ctHomePage.HasIdentity, Is.True);
+        Assert.That(homeDoc.HasIdentity, Is.True);
+        Assert.That(homeDoc.ContentTypeId, Is.EqualTo(ctHomePage.Id));
+    }
+
+    [Test]
+    public void Create_Content_Type_Ensures_Sort_Orders()
+    {
+        var contentType = new ContentType(ShortStringHelper, -1)
+        {
+            Alias = "test",
+            Name = "Test",
+            Description = "ContentType used for simple text pages",
+            Icon = ".sprTreeDoc3",
+            Thumbnail = "doc2.png",
+            SortOrder = 1,
+            CreatorId = 0,
+            Trashed = false
+        };
+
+        contentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
+            { Name = "Title", Description = string.Empty, Mandatory = false, DataTypeId = -88 });
+        contentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TinyMce, ValueStorageType.Ntext,
+                "bodyText")
+            { Name = "Body Text", Description = string.Empty, Mandatory = false, DataTypeId = -87 });
+        contentType.AddPropertyType(
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            { Name = "Author", Description = "Name of the author", Mandatory = false, DataTypeId = -88 });
+
+        ContentTypeService.Save(contentType);
+
+        var sortOrders = contentType.PropertyTypes.Select(x => x.SortOrder).ToArray();
+
+        Assert.AreEqual(1, sortOrders.Count(x => x == 0));
+        Assert.AreEqual(1, sortOrders.Count(x => x == 1));
+        Assert.AreEqual(1, sortOrders.Count(x => x == 2));
+    }
+
+    [Test]
+    public void Can_Create_And_Save_ContentType_Composition()
+    {
+        /*
+         * Global
+         * - Components
+         * - Category
+         */
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var global = ContentTypeBuilder.CreateSimpleContentType("global", "Global", defaultTemplateId: template.Id);
+        ContentTypeService.Save(global);
+
+        var components = ContentTypeBuilder.CreateSimpleContentType("components", "Components", global,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(components);
+
+        var component = ContentTypeBuilder.CreateSimpleContentType("component", "Component", components,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(component);
+
+        var category = ContentTypeBuilder.CreateSimpleContentType("category", "Category", global,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(category);
+
+        var success = category.AddContentType(component);
+
+        Assert.That(success, Is.False);
+    }
+
+    [Test]
+    public void Can_Delete_Parent_ContentType_When_Child_Has_Content()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true,
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var childContentType = ContentTypeBuilder.CreateSimpleContentType("childPage", "Child Page", contentType,
+            randomizeAliases: true, propertyGroupAlias: "childContent", propertyGroupName: "Child Content",
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(childContentType);
+        var content = ContentService.Create("Page 1", -1, childContentType.Alias);
+        ContentService.Save(content);
+
+        ContentTypeService.Delete(contentType);
+
+        Assert.IsNotNull(content.Id);
+        Assert.AreNotEqual(0, content.Id);
+        Assert.IsNotNull(childContentType.Id);
+        Assert.AreNotEqual(0, childContentType.Id);
+        Assert.IsNotNull(contentType.Id);
+        Assert.AreNotEqual(0, contentType.Id);
+        var deletedContent = ContentService.GetById(content.Id);
+        var deletedChildContentType = ContentTypeService.Get(childContentType.Id);
+        var deletedContentType = ContentTypeService.Get(contentType.Id);
+
+        Assert.IsNull(deletedChildContentType);
+        Assert.IsNull(deletedContent);
+        Assert.IsNull(deletedContentType);
+    }
+
+    [Test]
+    public void Can_Create_Container()
+    {
+        // Arrange
+        var cts = ContentTypeService;
+
+        // Act
+        var container = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container1" };
+        cts.SaveContainer(container);
+
+        // Assert
+        var createdContainer = cts.GetContainer(container.Id);
+        Assert.IsNotNull(createdContainer);
+    }
+
+    [Test]
+    public void Can_Get_All_Containers()
+    {
+        // Arrange
+        var cts = ContentTypeService;
+
+        // Act
+        var container1 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container1" };
+        cts.SaveContainer(container1);
+
+        var container2 = new EntityContainer(Constants.ObjectTypes.DocumentType) { Name = "container2" };
+        cts.SaveContainer(container2);
+
+        // Assert
+        var containers = cts.GetContainers(new int[0]);
+        Assert.AreEqual(2, containers.Count());
+    }
+
+    [Test]
+    public void Deleting_ContentType_Sends_Correct_Number_Of_DeletedEntities_In_Events()
+    {
+        var deletedEntities = 0;
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        ContentTypeNotificationHandler.Deleted +=
+            notification => deletedEntities += notification.DeletedEntities.Count();
+
+        ContentTypeService.Delete(contentType);
+
+        Assert.AreEqual(deletedEntities, 1);
+    }
+
+    [Test]
+    public void Deleting_Multiple_ContentTypes_Sends_Correct_Number_Of_DeletedEntities_In_Events()
+    {
+        var deletedEntities = 0;
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+        var contentType2 =
+            ContentTypeBuilder.CreateSimpleContentType("otherPage", "Other page", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType2);
+
+        ContentTypeNotificationHandler.Deleted +=
+            notification => deletedEntities += notification.DeletedEntities.Count();
+
+        ContentTypeService.Delete(contentType);
+        ContentTypeService.Delete(contentType2);
+
+        Assert.AreEqual(2, deletedEntities);
+    }
+
+    [Test]
+    public void Deleting_ContentType_With_Child_Sends_Correct_Number_Of_DeletedEntities_In_Events()
+    {
+        var deletedEntities = 0;
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("page", "Page", defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+        var contentType2 =
+            ContentTypeBuilder.CreateSimpleContentType("subPage", "Sub page", defaultTemplateId: template.Id);
+        contentType2.ParentId = contentType.Id;
+        ContentTypeService.Save(contentType2);
+
+        ContentTypeNotificationHandler.Deleted +=
+            notification => deletedEntities += notification.DeletedEntities.Count();
+
+        ContentTypeService.Delete(contentType);
+
+        Assert.AreEqual(2, deletedEntities);
+    }
+
+    [Test]
+    public void Can_Remove_ContentType_Composition_From_ContentType()
+    {
+        // Test for U4-2234
+        var cts = ContentTypeService;
+
+        // Arrange
+        var component = CreateComponent();
+        cts.Save(component);
+        var banner = CreateBannerComponent(component);
+        cts.Save(banner);
+        var site = CreateSite();
+        cts.Save(site);
+        var homepage = CreateHomepage(site);
+        cts.Save(homepage);
+
+        // Add banner to homepage
+        var added = homepage.AddContentType(banner);
+        cts.Save(homepage);
+
+        // Assert composition
+        var bannerExists = homepage.ContentTypeCompositionExists(banner.Alias);
+        var bannerPropertyExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
+        Assert.That(added, Is.True);
+        Assert.That(bannerExists, Is.True);
+        Assert.That(bannerPropertyExists, Is.True);
+        Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(6));
+
+        // Remove banner from homepage
+        var removed = homepage.RemoveContentType(banner.Alias);
+        cts.Save(homepage);
+
+        // Assert composition
+        var bannerStillExists = homepage.ContentTypeCompositionExists(banner.Alias);
+        var bannerPropertyStillExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
+        Assert.That(removed, Is.True);
+        Assert.That(bannerStillExists, Is.False);
+        Assert.That(bannerPropertyStillExists, Is.False);
+        Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(4));
+    }
+
+    [Test]
+    public void Can_Copy_ContentType_By_Performing_Clone()
+    {
+        // Arrange
+        var metaContentType = ContentTypeBuilder.CreateMetaContentType();
+        ContentTypeService.Save(metaContentType);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var simpleContentType =
+            ContentTypeBuilder.CreateSimpleContentType("category", "Category", metaContentType,
+                defaultTemplateId: template.Id) as IContentType;
+        ContentTypeService.Save(simpleContentType);
+        var categoryId = simpleContentType.Id;
+
+        // Act
+        var sut = simpleContentType.DeepCloneWithResetIdentities("newcategory");
+        Assert.IsNotNull(sut);
+        ContentTypeService.Save(sut);
+
+        // Assert
+        Assert.That(sut.HasIdentity, Is.True);
+
+        var contentType = ContentTypeService.Get(sut.Id);
+        var category = ContentTypeService.Get(categoryId);
+
+        Assert.That(contentType.CompositionAliases().Any(x => x.Equals("meta")), Is.True);
+        Assert.AreEqual(contentType.ParentId, category.ParentId);
+        Assert.AreEqual(contentType.Level, category.Level);
+        Assert.AreEqual(contentType.PropertyTypes.Count(), category.PropertyTypes.Count());
+        Assert.AreNotEqual(contentType.Id, category.Id);
+        Assert.AreNotEqual(contentType.Key, category.Key);
+        Assert.AreNotEqual(contentType.Path, category.Path);
+        Assert.AreNotEqual(contentType.SortOrder, category.SortOrder);
+        Assert.AreNotEqual(contentType.PropertyTypes.First(x => x.Alias.Equals("title")).Id,
+            category.PropertyTypes.First(x => x.Alias.Equals("title")).Id);
+        Assert.AreNotEqual(contentType.PropertyGroups.First(x => x.Name.Equals("Content")).Id,
+            category.PropertyGroups.First(x => x.Name.Equals("Content")).Id);
+    }
+
+    [Test]
+    public void Can_Copy_ContentType_To_New_Parent_By_Performing_Clone()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var parentContentType1 =
+            ContentTypeBuilder.CreateSimpleContentType("parent1", "Parent1", defaultTemplateId: template.Id);
+        ContentTypeService.Save(parentContentType1);
+        var parentContentType2 = ContentTypeBuilder.CreateSimpleContentType("parent2", "Parent2",
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(parentContentType2);
+
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType("category", "Category", parentContentType1,
+            randomizeAliases: true, defaultTemplateId: template.Id) as IContentType;
+        ContentTypeService.Save(simpleContentType);
+
+        // Act
+        var clone = simpleContentType.DeepCloneWithResetIdentities("newcategory");
+        Assert.IsNotNull(clone);
+        clone.RemoveContentType("parent1");
+        clone.AddContentType(parentContentType2);
+        clone.ParentId = parentContentType2.Id;
+        ContentTypeService.Save(clone);
+
+        // Assert
+        Assert.That(clone.HasIdentity, Is.True);
+
+        var clonedContentType = ContentTypeService.Get(clone.Id);
+        var originalContentType = ContentTypeService.Get(simpleContentType.Id);
+
+        Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent2")), Is.True);
+        Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent1")), Is.False);
+
+        Assert.AreEqual(clonedContentType.Path, "-1," + parentContentType2.Id + "," + clonedContentType.Id);
+        Assert.AreEqual(clonedContentType.PropertyTypes.Count(), originalContentType.PropertyTypes.Count());
+
+        Assert.AreNotEqual(clonedContentType.ParentId, originalContentType.ParentId);
+        Assert.AreEqual(clonedContentType.ParentId, parentContentType2.Id);
+
+        Assert.AreNotEqual(clonedContentType.Id, originalContentType.Id);
+        Assert.AreNotEqual(clonedContentType.Key, originalContentType.Key);
+        Assert.AreNotEqual(clonedContentType.Path, originalContentType.Path);
+
+        Assert.AreNotEqual(clonedContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id,
+            originalContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id);
+        Assert.AreNotEqual(clonedContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id,
+            originalContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id);
+    }
+
+    [Test]
+    public void Can_Copy_ContentType_With_Service_To_Root()
+    {
+        // Arrange
+        var metaContentType = ContentTypeBuilder.CreateMetaContentType();
+        ContentTypeService.Save(metaContentType);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType("category", "Category", metaContentType,
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(simpleContentType);
+        var categoryId = simpleContentType.Id;
+
+        // Act
+        var clone = ContentTypeService.Copy(simpleContentType, "newcategory", "new category");
+
+        // Assert
+        Assert.That(clone.HasIdentity, Is.True);
+
+        var cloned = ContentTypeService.Get(clone.Id);
+        var original = ContentTypeService.Get(categoryId);
+
+        Assert.That(cloned.CompositionAliases().Any(x => x.Equals("meta")), Is.False); // it's been copied to root
+        Assert.AreEqual(cloned.ParentId, -1);
+        Assert.AreEqual(cloned.Level, 1);
+        Assert.AreEqual(cloned.PropertyTypes.Count(), original.PropertyTypes.Count());
+        Assert.AreEqual(cloned.PropertyGroups.Count(), original.PropertyGroups.Count());
+
+        for (var i = 0; i < cloned.PropertyGroups.Count; i++)
+        {
+            Assert.AreEqual(cloned.PropertyGroups[i].PropertyTypes.Count,
+                original.PropertyGroups[i].PropertyTypes.Count);
+            foreach (var propertyType in cloned.PropertyGroups[i].PropertyTypes)
+            {
+                Assert.IsTrue(propertyType.HasIdentity);
+            }
+        }
+
+        foreach (var propertyType in cloned.PropertyTypes)
+        {
+            Assert.IsTrue(propertyType.HasIdentity);
+        }
+
+        Assert.AreNotEqual(cloned.Id, original.Id);
+        Assert.AreNotEqual(cloned.Key, original.Key);
+        Assert.AreNotEqual(cloned.Path, original.Path);
+        Assert.AreNotEqual(cloned.SortOrder, original.SortOrder);
+        Assert.AreNotEqual(cloned.PropertyTypes.First(x => x.Alias.Equals("title")).Id,
+            original.PropertyTypes.First(x => x.Alias.Equals("title")).Id);
+        Assert.AreNotEqual(cloned.PropertyGroups.First(x => x.Name.Equals("Content")).Id,
+            original.PropertyGroups.First(x => x.Name.Equals("Content")).Id);
+    }
+
+    [Test]
+    public void Can_Copy_ContentType_To_New_Parent_With_Service()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var parentContentType1 =
+            ContentTypeBuilder.CreateSimpleContentType("parent1", "Parent1", defaultTemplateId: template.Id);
+        ContentTypeService.Save(parentContentType1);
+        var parentContentType2 = ContentTypeBuilder.CreateSimpleContentType("parent2", "Parent2",
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(parentContentType2);
+
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType("category", "Category", parentContentType1,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(simpleContentType);
+
+        // Act
+        var clone = ContentTypeService.Copy(simpleContentType, "newAlias", "new alias", parentContentType2);
+
+        // Assert
+        Assert.That(clone.HasIdentity, Is.True);
+
+        var clonedContentType = ContentTypeService.Get(clone.Id);
+        var originalContentType = ContentTypeService.Get(simpleContentType.Id);
+
+        Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent2")), Is.True);
+        Assert.That(clonedContentType.CompositionAliases().Any(x => x.Equals("parent1")), Is.False);
+
+        Assert.AreEqual(clonedContentType.Path, "-1," + parentContentType2.Id + "," + clonedContentType.Id);
+        Assert.AreEqual(clonedContentType.PropertyTypes.Count(), originalContentType.PropertyTypes.Count());
+
+        Assert.AreNotEqual(clonedContentType.ParentId, originalContentType.ParentId);
+        Assert.AreEqual(clonedContentType.ParentId, parentContentType2.Id);
+
+        Assert.AreNotEqual(clonedContentType.Id, originalContentType.Id);
+        Assert.AreNotEqual(clonedContentType.Key, originalContentType.Key);
+        Assert.AreNotEqual(clonedContentType.Path, originalContentType.Path);
+
+        Assert.AreNotEqual(clonedContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id,
+            originalContentType.PropertyTypes.First(x => x.Alias.StartsWith("title")).Id);
+        Assert.AreNotEqual(clonedContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id,
+            originalContentType.PropertyGroups.First(x => x.Name.StartsWith("Content")).Id);
+    }
+
+    [Test]
+    public void Cannot_Add_Duplicate_PropertyType_Alias_To_Referenced_Composition()
+    {
+        // Related the second issue in screencast from this post http://issues.umbraco.org/issue/U4-5986
+
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var parent = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(parent);
+        var child = ContentTypeBuilder.CreateSimpleContentType("simpleChildPage", "Simple Child Page", parent,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(child);
+        var composition = ContentTypeBuilder.CreateMetaContentType();
+        ContentTypeService.Save(composition);
+
+        // Adding Meta-composition to child doc type
+        child.AddContentType(composition);
+        ContentTypeService.Save(child);
+
+        // Act
+        var duplicatePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
             {
                 Name = "Title",
                 Description = string.Empty,
@@ -1510,267 +826,1285 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
                 SortOrder = 1,
                 DataTypeId = -88
             };
-            Assert.IsTrue(basePage.AddPropertyType(titlePropertyType, "meta", "Meta"));
+        var added = composition.AddPropertyType(duplicatePropertyType, "meta", "Meta");
 
-            ContentTypeService.Save(basePage);
-            basePage = ContentTypeService.Get(basePage.Id);
+        // Assert
+        Assert.That(added, Is.True);
+        Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(composition));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("simpleChildPage"));
+    }
 
-            int count = basePage.PropertyTypes.Count();
-            Assert.AreEqual(2, count);
+    [Test]
+    public void Cannot_Add_Duplicate_PropertyType_Alias_In_Composition_Graph()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-            basePage.RemovePropertyGroup("content");
+        var basePage = ContentTypeBuilder.CreateSimpleContentType("basePage", "Base Page", randomizeAliases: true,
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(basePage);
+        var contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", basePage,
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(advancedPage);
 
-            ContentTypeService.Save(basePage);
-            basePage = ContentTypeService.Get(basePage.Id);
+        var metaComposition = ContentTypeBuilder.CreateMetaContentType();
+        ContentTypeService.Save(metaComposition);
+        var seoComposition = ContentTypeBuilder.CreateMetaContentType("seo", "SEO");
+        ContentTypeService.Save(seoComposition);
 
-            Assert.AreEqual(count, basePage.PropertyTypes.Count());
-        }
+        var metaAdded = contentPage.AddContentType(metaComposition);
+        ContentTypeService.Save(contentPage);
+        var seoAdded = advancedPage.AddContentType(seoComposition);
+        ContentTypeService.Save(advancedPage);
 
-        [Test]
-        public void Can_Add_PropertyGroup_With_Same_Name_On_Parent_and_Child()
-        {
-            /*
-             * BasePage
-             * - Content Page
-             * -- Advanced Page
-             * Content Meta :: Composition
-            */
-
-            // Arrange
-            ContentType basePage = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(basePage);
-
-            ContentType contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
-            ContentTypeService.Save(contentPage);
-
-            ContentType advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
-            ContentTypeService.Save(advancedPage);
-
-            ContentType contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
-            ContentTypeService.Save(contentMetaComposition);
-
-            // Act
-            var authorPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "author")
+        // Act
+        var duplicatePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
             {
-                 Name = "Author", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
-            ContentTypeService.Save(contentPage);
-
-            var bodyTextPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext, "bodyText")
-            {
-                 Name = "Body Text", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
-            ContentTypeService.Save(basePage);
-
-            bool compositionAdded = contentPage.AddContentType(contentMetaComposition);
-            ContentTypeService.Save(contentPage);
-
-            // Assert
-            Assert.That(bodyTextAdded, Is.True);
-            Assert.That(authorAdded, Is.True);
-            Assert.That(compositionAdded, Is.True);
-
-            Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
-            Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
-
-            IContentType contentType = ContentTypeService.Get("contentPage");
-            PropertyGroup propertyGroup = contentType.PropertyGroups["content"];
-
-            int numberOfContentTabs = contentType.CompositionPropertyGroups.Count(x => x.Name.Equals("Content"));
-            Assert.That(numberOfContentTabs, Is.EqualTo(3));
-
-            // Ensure that adding a new PropertyType to the "Content"-tab also adds it to the right group
-            var descriptionPropertyType = new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
-            {
-                Alias = "description", Name = "Description", Description = string.Empty,  Mandatory = false, SortOrder = 1, DataTypeId = -88
-            };
-            bool descriptionAdded = contentType.AddPropertyType(descriptionPropertyType, "content", "Content");
-            ContentTypeService.Save(contentType);
-            Assert.That(descriptionAdded, Is.True);
-
-            IContentType contentPageReloaded = ContentTypeService.Get("contentPage");
-            PropertyGroup propertyGroupReloaded = contentPageReloaded.PropertyGroups["content"];
-            bool hasDescriptionPropertyType = propertyGroupReloaded.PropertyTypes.Contains("description");
-            Assert.That(hasDescriptionPropertyType, Is.True);
-
-            IPropertyType descriptionPropertyTypeReloaded = propertyGroupReloaded.PropertyTypes["description"];
-            Assert.That(descriptionPropertyTypeReloaded.PropertyGroupId.IsValueCreated, Is.False);
-        }
-
-        [Test]
-        public void Empty_Description_Is_Always_Null_After_Saving_Content_Type()
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Description = null;
-            ContentTypeService.Save(contentType);
-
-            ContentType contentType2 = ContentTypeBuilder.CreateBasicContentType("basePage2", "Base Page 2");
-            contentType2.Description = string.Empty;
-            ContentTypeService.Save(contentType2);
-
-            Assert.IsNull(contentType.Description);
-            Assert.IsNull(contentType2.Description);
-        }
-
-        [Test]
-        public void Variations_In_Compositions()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType typeA = ContentTypeBuilder.CreateSimpleContentType("a", "A", defaultTemplateId: template.Id);
-            typeA.Variations = ContentVariation.Culture; // make it variant
-            typeA.PropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations = ContentVariation.Culture; // with a variant property
-            ContentTypeService.Save(typeA);
-
-            ContentType typeB = ContentTypeBuilder.CreateSimpleContentType("b", "B", typeA, randomizeAliases: true, defaultTemplateId: template.Id);
-            typeB.Variations = ContentVariation.Nothing; // make it invariant
-            ContentTypeService.Save(typeB);
-
-            ContentType typeC = ContentTypeBuilder.CreateSimpleContentType("c", "C", typeA, randomizeAliases: true, defaultTemplateId: template.Id);
-            typeC.Variations = ContentVariation.Culture; // make it variant
-            ContentTypeService.Save(typeC);
-
-            // property is variant on A
-            IContentType test = ContentTypeService.Get(typeA.Id);
-            Assert.AreEqual(ContentVariation.Culture, test.CompositionPropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
-            Assert.AreEqual(ContentVariation.Culture, test.CompositionPropertyGroups.Last().PropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
-
-            // but not on B
-            test = ContentTypeService.Get(typeB.Id);
-            Assert.AreEqual(ContentVariation.Nothing, test.CompositionPropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
-            Assert.AreEqual(ContentVariation.Nothing, test.CompositionPropertyGroups.Last().PropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
-
-            // but on C
-            test = ContentTypeService.Get(typeC.Id);
-            Assert.AreEqual(ContentVariation.Culture, test.CompositionPropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
-            Assert.AreEqual(ContentVariation.Culture, test.CompositionPropertyGroups.Last().PropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
-        }
-
-        private ContentType CreateComponent()
-        {
-            var component = new ContentType(ShortStringHelper, -1)
-            {
-                Alias = "component",
-                Name = "Component",
-                Description = "ContentType used for Component grouping",
-                Icon = ".sprTreeDoc3",
-                Thumbnail = "doc.png",
-                SortOrder = 1,
-                CreatorId = 0,
-                Trashed = false
-            };
-
-            var contentCollection = new PropertyTypeCollection(true)
-            {
-                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "componentGroup") { Name = "Component Group", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88 }
-            };
-
-            component.PropertyGroups.Add(new PropertyGroup(contentCollection) 
-            {
-                Alias= "component", 
-                Name = "Component",
-                SortOrder = 1 
-            });
-
-            return component;
-        }
-
-        private ContentType CreateBannerComponent(ContentType parent)
-        {
-            const string contentTypeAlias = "banner";
-            var banner = new ContentType(ShortStringHelper, parent, contentTypeAlias)
-            {
-                Alias = contentTypeAlias,
-                Name = "Banner Component",
-                Description = "ContentType used for Banner Component",
-                Icon = ".sprTreeDoc3",
-                Thumbnail = "doc.png",
-                SortOrder = 1,
-                CreatorId = 0,
-                Trashed = false
-            };
-
-            var propertyType = new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "bannerName")
-            {
-                Name = "Banner Name",
+                Name = "Title",
                 Description = string.Empty,
                 Mandatory = false,
-                SortOrder = 2,
+                SortOrder = 1,
                 DataTypeId = -88
             };
-            banner.AddPropertyType(propertyType, "component", "Component");
-            return banner;
-        }
+        var addedToBasePage = basePage.AddPropertyType(duplicatePropertyType, "content", "Content");
+        var addedToAdvancedPage = advancedPage.AddPropertyType(duplicatePropertyType, "content", "Content");
+        var addedToMeta = metaComposition.AddPropertyType(duplicatePropertyType, "meta", "Meta");
+        var addedToSeo = seoComposition.AddPropertyType(duplicatePropertyType, "seo", "Seo");
 
-        private ContentType CreateSite()
-        {
-            var site = new ContentType(ShortStringHelper, -1)
+        // Assert
+        Assert.That(metaAdded, Is.True);
+        Assert.That(seoAdded, Is.True);
+
+        Assert.That(addedToBasePage, Is.True);
+        Assert.That(addedToAdvancedPage, Is.False);
+        Assert.That(addedToMeta, Is.True);
+        Assert.That(addedToSeo, Is.True);
+
+        Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(basePage));
+        Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(metaComposition));
+        Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(seoComposition));
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("meta"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("seo"));
+    }
+
+    [Test]
+    public void Cannot_Add_Duplicate_PropertyType_Alias_At_Root_Which_Conflicts_With_Third_Levels_Composition()
+    {
+        /*
+         * BasePage, gets 'Title' added but should not be allowed
+         * -- Content Page
+         * ---- Advanced Page -> Content Meta
+         * Content Meta :: Composition, has 'Title'
+         *
+         * Content Meta has 'Title' PropertyType
+         * Adding 'Title' to BasePage should fail
+        */
+
+        // Arrange
+        var basePage = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(basePage);
+        var contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
+        ContentTypeService.Save(advancedPage);
+
+        var contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
+        ContentTypeService.Save(contentMetaComposition);
+
+        // Act
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
             {
-                Alias = "site",
-                Name = "Site",
-                Description = "ContentType used for Site inheritence",
-                Icon = ".sprTreeDoc3",
-                Thumbnail = "doc.png",
-                SortOrder = 2,
-                CreatorId = 0,
-                Trashed = false
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
             };
+        var bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
+        ContentTypeService.Save(basePage);
 
-            var contentCollection = new PropertyTypeCollection(true)
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
             {
-                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "hostname") { Name = "Hostname", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88 }
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
             };
-            site.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Site Settings", Alias = "siteSettings", SortOrder = 1 });
+        var authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
+        ContentTypeService.Save(contentPage);
 
-            return site;
-        }
+        var compositionAdded = advancedPage.AddContentType(contentMetaComposition);
+        ContentTypeService.Save(advancedPage);
 
-        private ContentType CreateHomepage(ContentType parent)
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            return ContentTypeBuilder.CreateSimpleContentType("homepage", "Homepage", parent, defaultTemplateId: template.Id);
-        }
-
-        private IContentType[] CreateContentTypeHierarchy()
-        {
-            // create the master type
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType masterContentType = ContentTypeBuilder.CreateSimpleContentType("masterContentType", "MasterContentType", defaultTemplateId: template.Id);
-            masterContentType.Key = new Guid("C00CA18E-5A9D-483B-A371-EECE0D89B4AE");
-            ContentTypeService.Save(masterContentType);
-
-            // add the one we just created
-            var list = new List<IContentType> { masterContentType };
-
-            for (int i = 0; i < 10; i++)
+        // NOTE: It should not be possible to Save 'BasePage' with the Title PropertyType added
+        var titlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
             {
-                ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(
-                    "childType" + i,
-                    "ChildType" + i,
-                    list.Last(),    // make the last entry in the list, this one's parent
-                    randomizeAliases: true,
-                    defaultTemplateId: template.Id);
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var titleAdded = basePage.AddPropertyType(titlePropertyType, "content", "Content");
 
-                list.Add(contentType);
+        // Assert
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+        Assert.That(titleAdded, Is.True);
+        Assert.That(compositionAdded, Is.True);
+
+        Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(basePage));
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+    }
+
+    [Test]
+    public void Cannot_Save_ContentType_With_Empty_Name()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("contentType", string.Empty);
+
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => ContentTypeService.Save(contentType));
+    }
+
+    [Test]
+    public void Cannot_Rename_PropertyType_Alias_On_Composition_Which_Would_Cause_Conflict_In_Other_Composition()
+    {
+        /*
+         * Meta renames alias to 'title'
+         * Seo has 'Title'
+         * BasePage
+         * -- ContentPage
+         * ---- AdvancedPage -> Seo
+         * ------ MoreAdvanedPage -> Meta
+         */
+
+        // Arrange
+        var basePage = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(basePage);
+        var contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
+        ContentTypeService.Save(advancedPage);
+        var moreAdvancedPage =
+            ContentTypeBuilder.CreateBasicContentType("moreAdvancedPage", "More Advanced Page", advancedPage);
+        ContentTypeService.Save(moreAdvancedPage);
+
+        var seoComposition = ContentTypeBuilder.CreateMetaContentType("seo", "SEO");
+        ContentTypeService.Save(seoComposition);
+        var metaComposition = ContentTypeBuilder.CreateMetaContentType();
+        ContentTypeService.Save(metaComposition);
+
+        // Act
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
+            {
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
+        ContentTypeService.Save(basePage);
+
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
+        ContentTypeService.Save(contentPage);
+
+        var subtitlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "subtitle")
+            {
+                Name = "Subtitle",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var subtitleAdded = advancedPage.AddPropertyType(subtitlePropertyType, "content", "Content");
+        ContentTypeService.Save(advancedPage);
+
+        var titlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
+            {
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var titleAdded = seoComposition.AddPropertyType(titlePropertyType, "content", "Content");
+        ContentTypeService.Save(seoComposition);
+
+        var seoCompositionAdded = advancedPage.AddContentType(seoComposition);
+        var metaCompositionAdded = moreAdvancedPage.AddContentType(metaComposition);
+        ContentTypeService.Save(advancedPage);
+        ContentTypeService.Save(moreAdvancedPage);
+
+        var keywordsPropertyType = metaComposition.PropertyTypes.First(x => x.Alias.Equals("metakeywords"));
+        keywordsPropertyType.Alias = "title";
+
+        // Assert
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(subtitleAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+        Assert.That(titleAdded, Is.True);
+        Assert.That(seoCompositionAdded, Is.True);
+        Assert.That(metaCompositionAdded, Is.True);
+
+        Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(metaComposition));
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("moreAdvancedPage"));
+    }
+
+    [Test]
+    public void Can_Add_Additional_Properties_On_Composition_Once_Composition_Has_Been_Saved()
+    {
+        /*
+         * Meta renames alias to 'title'
+         * Seo has 'Title'
+         * BasePage
+         * -- ContentPage
+         * ---- AdvancedPage -> Seo
+         * ------ MoreAdvancedPage -> Meta
+         */
+
+        // Arrange
+        var basePage = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(basePage);
+        var contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
+        ContentTypeService.Save(advancedPage);
+        var moreAdvancedPage =
+            ContentTypeBuilder.CreateBasicContentType("moreAdvancedPage", "More Advanced Page", advancedPage);
+        ContentTypeService.Save(moreAdvancedPage);
+
+        var seoComposition = ContentTypeBuilder.CreateMetaContentType("seo", "SEO");
+        ContentTypeService.Save(seoComposition);
+        var metaComposition = ContentTypeBuilder.CreateMetaContentType();
+        ContentTypeService.Save(metaComposition);
+
+        // Act
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
+            {
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
+        ContentTypeService.Save(basePage);
+
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
+        ContentTypeService.Save(contentPage);
+
+        var subtitlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "subtitle")
+            {
+                Name = "Subtitle",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var subtitleAdded = advancedPage.AddPropertyType(subtitlePropertyType, "content", "Content");
+        ContentTypeService.Save(advancedPage);
+
+        var titlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
+            {
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var titleAdded = seoComposition.AddPropertyType(titlePropertyType, "content", "Content");
+        ContentTypeService.Save(seoComposition);
+
+        var seoCompositionAdded = advancedPage.AddContentType(seoComposition);
+        var metaCompositionAdded = moreAdvancedPage.AddContentType(metaComposition);
+        ContentTypeService.Save(advancedPage);
+        ContentTypeService.Save(moreAdvancedPage);
+
+        // Assert
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(subtitleAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+        Assert.That(titleAdded, Is.True);
+        Assert.That(seoCompositionAdded, Is.True);
+        Assert.That(metaCompositionAdded, Is.True);
+
+        var testPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "test")
+            {
+                Name = "Test",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var testAdded = seoComposition.AddPropertyType(testPropertyType, "content", "Content");
+        ContentTypeService.Save(seoComposition);
+
+        Assert.That(testAdded, Is.True);
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("moreAdvancedPage"));
+    }
+
+    [Test]
+    public void Cannot_Rename_PropertyGroup_On_Child_Avoiding_Conflict_With_Parent_PropertyGroup()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+
+        var page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true,
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(page);
+        var contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page,
+            randomizeAliases: true, propertyGroupAlias: "content2", propertyGroupName: "Content_",
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage,
+            randomizeAliases: true, propertyGroupAlias: "details", propertyGroupName: "Details",
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(advancedPage);
+
+        var contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
+        ContentTypeService.Save(contentMetaComposition);
+
+        // Act
+        var subtitlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "subtitle")
+            {
+                Name = "Subtitle",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var subtitleAdded = contentPage.AddPropertyType(subtitlePropertyType, "content", "Content");
+        var authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
+        ContentTypeService.Save(contentPage);
+
+        var compositionAdded = contentPage.AddContentType(contentMetaComposition);
+        ContentTypeService.Save(contentPage);
+
+        // Change the name of the tab on the "root" content type 'page'.
+        var propertyGroup = contentPage.PropertyGroups["content2"];
+        Assert.Throws<ArgumentException>(() => contentPage.PropertyGroups.Add(new PropertyGroup(true)
+        {
+            Id = propertyGroup.Id,
+            Alias = "content",
+            Name = "Content",
+            SortOrder = 0
+        }));
+
+        // Assert
+        Assert.That(compositionAdded, Is.True);
+        Assert.That(subtitleAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+    }
+
+    [Test]
+    public void Cannot_Rename_PropertyType_Alias_Causing_Conflicts_With_Parents()
+    {
+        // Arrange
+        var basePage = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(basePage);
+        var contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
+        ContentTypeService.Save(advancedPage);
+
+        // Act
+        var titlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
+            {
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var titleAdded = basePage.AddPropertyType(titlePropertyType, "content", "Content");
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
+            {
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var bodyTextAdded = contentPage.AddPropertyType(bodyTextPropertyType, "content", "Content");
+        var subtitlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "subtitle")
+            {
+                Name = "Subtitle",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var subtitleAdded = contentPage.AddPropertyType(subtitlePropertyType, "content", "Content");
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorAdded = advancedPage.AddPropertyType(authorPropertyType, "content", "Content");
+        ContentTypeService.Save(basePage);
+        ContentTypeService.Save(contentPage);
+        ContentTypeService.Save(advancedPage);
+
+        // Rename the PropertyType to something that already exists in the Composition - NOTE this should not be allowed and Saving should throw an exception
+        var authorPropertyTypeToRename = advancedPage.PropertyTypes.First(x => x.Alias.Equals("author"));
+        authorPropertyTypeToRename.Alias = "title";
+
+        // Assert
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+        Assert.That(titleAdded, Is.True);
+        Assert.That(subtitleAdded, Is.True);
+
+        Assert.Throws<InvalidCompositionException>(() => ContentTypeService.Save(advancedPage));
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+    }
+
+    [Test]
+    public void Can_Add_PropertyType_Alias_Which_Exists_In_Composition_Outside_Graph()
+    {
+        /*
+         * Meta (Composition)
+         * Content Meta (Composition) has 'Title' -> Meta
+         * BasePage
+         * -- ContentPage gets 'Title' added -> Meta
+         * ---- Advanced Page
+         */
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var basePage = ContentTypeBuilder.CreateSimpleContentType("basePage", "Base Page", randomizeAliases: true,
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(basePage);
+        var contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", basePage,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        ContentTypeService.Save(advancedPage);
+
+        var metaComposition = ContentTypeBuilder.CreateMetaContentType();
+        ContentTypeService.Save(metaComposition);
+
+        var contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
+        ContentTypeService.Save(contentMetaComposition);
+
+        var metaAdded = contentPage.AddContentType(metaComposition);
+        ContentTypeService.Save(contentPage);
+
+        var metaAddedToComposition = contentMetaComposition.AddContentType(metaComposition);
+        ContentTypeService.Save(contentMetaComposition);
+
+        // Act
+        var propertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
+            {
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var addedToContentPage = contentPage.AddPropertyType(propertyType, "content", "Content");
+
+        // Assert
+        Assert.That(metaAdded, Is.True);
+        Assert.That(metaAddedToComposition, Is.True);
+
+        Assert.That(addedToContentPage, Is.True);
+        Assert.DoesNotThrow(() => ContentTypeService.Save(contentPage));
+    }
+
+    [Test]
+    public void Can_Rename_PropertyGroup_With_Inherited_PropertyGroups()
+    {
+        // Related the first issue in screencast from this post http://issues.umbraco.org/issue/U4-5986
+
+        // Arrange
+        // create 'page' content type with a 'Content_' group
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", propertyGroupAlias: "content2",
+            propertyGroupName: "Content_", defaultTemplateId: template.Id);
+        Assert.AreEqual(1, page.PropertyGroups.Count);
+        Assert.AreEqual("Content_", page.PropertyGroups.First().Name);
+        Assert.AreEqual(3, page.PropertyTypes.Count());
+        Assert.AreEqual("Title", page.PropertyTypes.First().Name);
+        Assert.AreEqual("Body text", page.PropertyTypes.Skip(1).First().Name);
+        Assert.AreEqual("Author", page.PropertyTypes.Skip(2).First().Name);
+        ContentTypeService.Save(page);
+
+        // create 'contentPage' content type as a child of 'page'
+        var contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page,
+            randomizeAliases: true, defaultTemplateId: template.Id);
+        Assert.AreEqual(1, page.PropertyGroups.Count);
+        Assert.AreEqual("Content_", page.PropertyGroups.First().Name);
+        Assert.AreEqual(3, contentPage.PropertyTypes.Count());
+        Assert.AreEqual("Title", contentPage.PropertyTypes.First().Name);
+        Assert.AreEqual("Body text", contentPage.PropertyTypes.Skip(1).First().Name);
+        Assert.AreEqual("Author", contentPage.PropertyTypes.Skip(2).First().Name);
+        ContentTypeService.Save(contentPage);
+
+        // add 'Content' group to 'meta' content type
+        var meta = ContentTypeBuilder.CreateMetaContentType();
+        Assert.AreEqual(1, meta.PropertyGroups.Count);
+        Assert.AreEqual("Meta", meta.PropertyGroups.First().Name);
+        Assert.AreEqual(2, meta.PropertyTypes.Count());
+        Assert.AreEqual("Meta Keywords", meta.PropertyTypes.First().Name);
+        Assert.AreEqual("Meta Description", meta.PropertyTypes.Skip(1).First().Name);
+        meta.AddPropertyGroup("content", "Content");
+        Assert.AreEqual(2, meta.PropertyTypes.Count());
+        ContentTypeService.Save(meta);
+
+        // add 'meta' content type to 'contentPage' composition
+        contentPage.AddContentType(meta);
+        ContentTypeService.Save(contentPage);
+
+        // add property 'prop1' to 'contentPage' group 'Content_'
+        var prop1 =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "testTextbox")
+            {
+                Name = "Test Textbox",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var prop1Added = contentPage.AddPropertyType(prop1, "content2", "Content_");
+        Assert.IsTrue(prop1Added);
+
+        // add property 'prop2' to 'contentPage' group 'Content'
+        var prop2 =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "anotherTextbox")
+            {
+                Name = "Another Test Textbox",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var prop2Added = contentPage.AddPropertyType(prop2, "content", "Content");
+        Assert.IsTrue(prop2Added);
+
+        // save 'contentPage' content type
+        ContentTypeService.Save(contentPage);
+
+        var group = page.PropertyGroups["content2"];
+        group.Name = "ContentTab"; // rename the group
+        ContentTypeService.Save(page);
+        Assert.AreEqual(3, page.PropertyTypes.Count());
+
+        // get 'contentPage' content type again
+        var contentPageAgain = ContentTypeService.Get("contentPage");
+        Assert.IsNotNull(contentPageAgain);
+
+        // assert that 'Content_' group is still there because we don't propagate renames
+        var findGroup = contentPageAgain.CompositionPropertyGroups.FirstOrDefault(x => x.Name == "Content_");
+        Assert.IsNotNull(findGroup);
+
+        // count all property types (local and composed)
+        var propertyTypeCount = contentPageAgain.PropertyTypes.Count();
+        Assert.That(propertyTypeCount, Is.EqualTo(5));
+
+        // count composed property types
+        var compPropertyTypeCount = contentPageAgain.CompositionPropertyTypes.Count();
+        Assert.That(compPropertyTypeCount, Is.EqualTo(10));
+    }
+
+    [Test]
+    public void Can_Rename_PropertyGroup_On_Parent_Without_Causing_Duplicate_PropertyGroups()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true,
+            propertyGroupAlias: "content2", propertyGroupName: "Content_", defaultTemplateId: template.Id);
+        ContentTypeService.Save(page);
+        var contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page,
+            randomizeAliases: true, propertyGroupAlias: "contentx", propertyGroupName: "Contentx",
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentPage);
+        var advancedPage = ContentTypeBuilder.CreateSimpleContentType("advancedPage", "Advanced Page", contentPage,
+            randomizeAliases: true, propertyGroupAlias: "contenty", propertyGroupName: "Contenty",
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(advancedPage);
+
+        var contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
+        ContentTypeService.Save(contentMetaComposition);
+        var compositionAdded = contentPage.AddContentType(contentMetaComposition);
+        ContentTypeService.Save(contentPage);
+
+        // Act
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
+            {
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var subtitlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "subtitle")
+            {
+                Name = "Subtitle",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var bodyTextAdded =
+            contentPage.AddPropertyType(bodyTextPropertyType, "content2",
+                "Content_"); // Will be added to the parent tab
+        var subtitleAdded =
+            contentPage.AddPropertyType(subtitlePropertyType, "content",
+                "Content"); // Will be added to the "Content Meta" composition
+        ContentTypeService.Save(contentPage);
+
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var descriptionPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "description")
+            {
+                Name = "Description",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var keywordsPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "keywords")
+            {
+                Name = "Keywords",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorAdded =
+            advancedPage.AddPropertyType(authorPropertyType, "content2",
+                "Content_"); // Will be added to an ancestor tab
+        var descriptionAdded =
+            advancedPage.AddPropertyType(descriptionPropertyType, "contentx",
+                "Contentx"); // Will be added to a parent tab
+        var keywordsAdded =
+            advancedPage.AddPropertyType(keywordsPropertyType, "content",
+                "Content"); // Will be added to the "Content Meta" composition
+        ContentTypeService.Save(advancedPage);
+
+        // Change the name of the tab on the "root" content type 'page'.
+        var propertyGroup = page.PropertyGroups["content2"];
+        page.PropertyGroups.Add(new PropertyGroup(true)
+        {
+            Id = propertyGroup.Id,
+            Name = "Content",
+            Alias = "content",
+            SortOrder = 0
+        });
+        ContentTypeService.Save(page);
+
+        // Assert
+        Assert.That(compositionAdded, Is.True);
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(subtitleAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+        Assert.That(descriptionAdded, Is.True);
+        Assert.That(keywordsAdded, Is.True);
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+
+        var advancedPageReloaded = ContentTypeService.Get("advancedPage");
+        var contentUnderscoreTabExists =
+            advancedPageReloaded.CompositionPropertyGroups.Any(x => x.Name.Equals("Content_"));
+
+        // now is true, because we don't propagate renames anymore
+        Assert.That(contentUnderscoreTabExists, Is.True);
+
+        var numberOfContentTabs = advancedPageReloaded.CompositionPropertyGroups.Count(x => x.Name.Equals("Content"));
+        Assert.That(numberOfContentTabs, Is.EqualTo(4));
+    }
+
+    [Test]
+    public void Can_Rename_PropertyGroup_On_Parent_Without_Causing_Duplicate_PropertyGroups_v2()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var page = ContentTypeBuilder.CreateSimpleContentType("page", "Page", randomizeAliases: true,
+            propertyGroupAlias: "content2", propertyGroupName: "Content_", defaultTemplateId: template.Id);
+        ContentTypeService.Save(page);
+        var contentPage = ContentTypeBuilder.CreateSimpleContentType("contentPage", "Content Page", page,
+            randomizeAliases: true, propertyGroupAlias: "content", propertyGroupName: "Content",
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentPage);
+
+        var contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
+        ContentTypeService.Save(contentMetaComposition);
+
+        // Act
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
+            {
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var subtitlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "subtitle")
+            {
+                Name = "Subtitle",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var bodyTextAdded = page.AddPropertyType(bodyTextPropertyType, "content2", "Content_");
+        var subtitleAdded = contentPage.AddPropertyType(subtitlePropertyType, "content", "Content");
+        var authorAdded = contentPage.AddPropertyType(authorPropertyType, "content2", "Content_");
+        ContentTypeService.Save(page);
+        ContentTypeService.Save(contentPage);
+
+        var compositionAdded = contentPage.AddContentType(contentMetaComposition);
+        ContentTypeService.Save(contentPage);
+
+        // Change the alias/name of the tab on the "root" content type 'page'.
+        var propertyGroup = page.PropertyGroups["content2"];
+        page.PropertyGroups.Add(new PropertyGroup(true)
+        {
+            Id = propertyGroup.Id,
+            Alias = "content",
+            Name = "Content",
+            SortOrder = 0
+        });
+        ContentTypeService.Save(page);
+
+        // Assert
+        Assert.That(compositionAdded, Is.True);
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(subtitleAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+    }
+
+    [Test]
+    public void Can_Remove_PropertyGroup_On_Parent_Without_Causing_Duplicate_PropertyGroups()
+    {
+        // Arrange
+        var basePage = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(basePage);
+
+        var contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
+        ContentTypeService.Save(contentPage);
+
+        var advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
+        ContentTypeService.Save(advancedPage);
+
+        var contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
+        ContentTypeService.Save(contentMetaComposition);
+
+        // Act
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
+            {
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
+        ContentTypeService.Save(basePage);
+
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
+        ContentTypeService.Save(contentPage);
+
+        var compositionAdded = contentPage.AddContentType(contentMetaComposition);
+        ContentTypeService.Save(contentPage);
+
+        basePage.RemovePropertyGroup("content");
+        ContentTypeService.Save(basePage);
+
+        // Assert
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+        Assert.That(compositionAdded, Is.True);
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+
+        var contentType = ContentTypeService.Get("contentPage");
+        var propertyGroup = contentType.PropertyGroups["content"];
+    }
+
+    [Test]
+    public void Can_Remove_PropertyGroup_Without_Removing_Property_Types()
+    {
+        var basePage = (IContentType)ContentTypeBuilder.CreateBasicContentType();
+        basePage.AddPropertyGroup("content", "Content");
+        basePage.AddPropertyGroup("meta", "Meta");
+        ContentTypeService.Save(basePage);
+
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        Assert.IsTrue(basePage.AddPropertyType(authorPropertyType, "content", "Content"));
+
+        var titlePropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "title")
+            {
+                Name = "Title",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        Assert.IsTrue(basePage.AddPropertyType(titlePropertyType, "meta", "Meta"));
+
+        ContentTypeService.Save(basePage);
+        basePage = ContentTypeService.Get(basePage.Id);
+
+        var count = basePage.PropertyTypes.Count();
+        Assert.AreEqual(2, count);
+
+        basePage.RemovePropertyGroup("content");
+
+        ContentTypeService.Save(basePage);
+        basePage = ContentTypeService.Get(basePage.Id);
+
+        Assert.AreEqual(count, basePage.PropertyTypes.Count());
+    }
+
+    [Test]
+    public void Can_Add_PropertyGroup_With_Same_Name_On_Parent_and_Child()
+    {
+        /*
+         * BasePage
+         * - Content Page
+         * -- Advanced Page
+         * Content Meta :: Composition
+        */
+
+        // Arrange
+        var basePage = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(basePage);
+
+        var contentPage = ContentTypeBuilder.CreateBasicContentType("contentPage", "Content Page", basePage);
+        ContentTypeService.Save(contentPage);
+
+        var advancedPage = ContentTypeBuilder.CreateBasicContentType("advancedPage", "Advanced Page", contentPage);
+        ContentTypeService.Save(advancedPage);
+
+        var contentMetaComposition = ContentTypeBuilder.CreateContentMetaContentType();
+        ContentTypeService.Save(contentMetaComposition);
+
+        // Act
+        var authorPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "author")
+            {
+                Name = "Author",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var authorAdded = contentPage.AddPropertyType(authorPropertyType, "content", "Content");
+        ContentTypeService.Save(contentPage);
+
+        var bodyTextPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext,
+                "bodyText")
+            {
+                Name = "Body Text",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var bodyTextAdded = basePage.AddPropertyType(bodyTextPropertyType, "content", "Content");
+        ContentTypeService.Save(basePage);
+
+        var compositionAdded = contentPage.AddContentType(contentMetaComposition);
+        ContentTypeService.Save(contentPage);
+
+        // Assert
+        Assert.That(bodyTextAdded, Is.True);
+        Assert.That(authorAdded, Is.True);
+        Assert.That(compositionAdded, Is.True);
+
+        Assert.DoesNotThrow(() => ContentTypeService.Get("contentPage"));
+        Assert.DoesNotThrow(() => ContentTypeService.Get("advancedPage"));
+
+        var contentType = ContentTypeService.Get("contentPage");
+        var propertyGroup = contentType.PropertyGroups["content"];
+
+        var numberOfContentTabs = contentType.CompositionPropertyGroups.Count(x => x.Name.Equals("Content"));
+        Assert.That(numberOfContentTabs, Is.EqualTo(3));
+
+        // Ensure that adding a new PropertyType to the "Content"-tab also adds it to the right group
+        var descriptionPropertyType =
+            new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+            {
+                Alias = "description",
+                Name = "Description",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            };
+        var descriptionAdded = contentType.AddPropertyType(descriptionPropertyType, "content", "Content");
+        ContentTypeService.Save(contentType);
+        Assert.That(descriptionAdded, Is.True);
+
+        var contentPageReloaded = ContentTypeService.Get("contentPage");
+        var propertyGroupReloaded = contentPageReloaded.PropertyGroups["content"];
+        var hasDescriptionPropertyType = propertyGroupReloaded.PropertyTypes.Contains("description");
+        Assert.That(hasDescriptionPropertyType, Is.True);
+
+        var descriptionPropertyTypeReloaded = propertyGroupReloaded.PropertyTypes["description"];
+        Assert.That(descriptionPropertyTypeReloaded.PropertyGroupId.IsValueCreated, Is.False);
+    }
+
+    [Test]
+    public void Empty_Description_Is_Always_Null_After_Saving_Content_Type()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Description = null;
+        ContentTypeService.Save(contentType);
+
+        var contentType2 = ContentTypeBuilder.CreateBasicContentType("basePage2", "Base Page 2");
+        contentType2.Description = string.Empty;
+        ContentTypeService.Save(contentType2);
+
+        Assert.IsNull(contentType.Description);
+        Assert.IsNull(contentType2.Description);
+    }
+
+    [Test]
+    public void Variations_In_Compositions()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var typeA = ContentTypeBuilder.CreateSimpleContentType("a", "A", defaultTemplateId: template.Id);
+        typeA.Variations = ContentVariation.Culture; // make it variant
+        typeA.PropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations =
+            ContentVariation.Culture; // with a variant property
+        ContentTypeService.Save(typeA);
+
+        var typeB = ContentTypeBuilder.CreateSimpleContentType("b", "B", typeA, randomizeAliases: true,
+            defaultTemplateId: template.Id);
+        typeB.Variations = ContentVariation.Nothing; // make it invariant
+        ContentTypeService.Save(typeB);
+
+        var typeC = ContentTypeBuilder.CreateSimpleContentType("c", "C", typeA, randomizeAliases: true,
+            defaultTemplateId: template.Id);
+        typeC.Variations = ContentVariation.Culture; // make it variant
+        ContentTypeService.Save(typeC);
+
+        // property is variant on A
+        var test = ContentTypeService.Get(typeA.Id);
+        Assert.AreEqual(ContentVariation.Culture,
+            test.CompositionPropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
+        Assert.AreEqual(ContentVariation.Culture,
+            test.CompositionPropertyGroups.Last().PropertyTypes.First(x => x.Alias.InvariantEquals("title"))
+                .Variations);
+
+        // but not on B
+        test = ContentTypeService.Get(typeB.Id);
+        Assert.AreEqual(ContentVariation.Nothing,
+            test.CompositionPropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
+        Assert.AreEqual(ContentVariation.Nothing,
+            test.CompositionPropertyGroups.Last().PropertyTypes.First(x => x.Alias.InvariantEquals("title"))
+                .Variations);
+
+        // but on C
+        test = ContentTypeService.Get(typeC.Id);
+        Assert.AreEqual(ContentVariation.Culture,
+            test.CompositionPropertyTypes.First(x => x.Alias.InvariantEquals("title")).Variations);
+        Assert.AreEqual(ContentVariation.Culture,
+            test.CompositionPropertyGroups.Last().PropertyTypes.First(x => x.Alias.InvariantEquals("title"))
+                .Variations);
+    }
+
+    private ContentType CreateComponent()
+    {
+        var component = new ContentType(ShortStringHelper, -1)
+        {
+            Alias = "component",
+            Name = "Component",
+            Description = "ContentType used for Component grouping",
+            Icon = ".sprTreeDoc3",
+            Thumbnail = "doc.png",
+            SortOrder = 1,
+            CreatorId = 0,
+            Trashed = false
+        };
+
+        var contentCollection = new PropertyTypeCollection(true)
+        {
+            new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "componentGroup")
+            {
+                Name = "Component Group",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
             }
+        };
 
-            return list.ToArray();
-        }
-
-        public class ContentNotificationHandler : INotificationHandler<ContentMovedToRecycleBinNotification>
+        component.PropertyGroups.Add(new PropertyGroup(contentCollection)
         {
-            public void Handle(ContentMovedToRecycleBinNotification notification) => MovedContentToRecycleBin?.Invoke(notification);
-            public static Action<ContentMovedToRecycleBinNotification> MovedContentToRecycleBin { get; set; }
+            Alias = "component",
+            Name = "Component",
+            SortOrder = 1
+        });
+
+        return component;
+    }
+
+    private ContentType CreateBannerComponent(ContentType parent)
+    {
+        const string contentTypeAlias = "banner";
+        var banner = new ContentType(ShortStringHelper, parent, contentTypeAlias)
+        {
+            Alias = contentTypeAlias,
+            Name = "Banner Component",
+            Description = "ContentType used for Banner Component",
+            Icon = ".sprTreeDoc3",
+            Thumbnail = "doc.png",
+            SortOrder = 1,
+            CreatorId = 0,
+            Trashed = false
+        };
+
+        var propertyType = new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "bannerName")
+        {
+            Name = "Banner Name",
+            Description = string.Empty,
+            Mandatory = false,
+            SortOrder = 2,
+            DataTypeId = -88
+        };
+        banner.AddPropertyType(propertyType, "component", "Component");
+        return banner;
+    }
+
+    private ContentType CreateSite()
+    {
+        var site = new ContentType(ShortStringHelper, -1)
+        {
+            Alias = "site",
+            Name = "Site",
+            Description = "ContentType used for Site inheritence",
+            Icon = ".sprTreeDoc3",
+            Thumbnail = "doc.png",
+            SortOrder = 2,
+            CreatorId = 0,
+            Trashed = false
+        };
+
+        var contentCollection = new PropertyTypeCollection(true)
+        {
+            new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "hostname")
+            {
+                Name = "Hostname",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = -88
+            }
+        };
+        site.PropertyGroups.Add(
+            new PropertyGroup(contentCollection) { Name = "Site Settings", Alias = "siteSettings", SortOrder = 1 });
+
+        return site;
+    }
+
+    private ContentType CreateHomepage(ContentType parent)
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        return ContentTypeBuilder.CreateSimpleContentType("homepage", "Homepage", parent,
+            defaultTemplateId: template.Id);
+    }
+
+    private IContentType[] CreateContentTypeHierarchy()
+    {
+        // create the master type
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var masterContentType = ContentTypeBuilder.CreateSimpleContentType("masterContentType", "MasterContentType",
+            defaultTemplateId: template.Id);
+        masterContentType.Key = new Guid("C00CA18E-5A9D-483B-A371-EECE0D89B4AE");
+        ContentTypeService.Save(masterContentType);
+
+        // add the one we just created
+        var list = new List<IContentType> { masterContentType };
+
+        for (var i = 0; i < 10; i++)
+        {
+            var contentType = ContentTypeBuilder.CreateSimpleContentType(
+                "childType" + i,
+                "ChildType" + i,
+                list.Last(), // make the last entry in the list, this one's parent
+                randomizeAliases: true,
+                defaultTemplateId: template.Id);
+
+            list.Add(contentType);
         }
 
-        public class ContentTypeNotificationHandler : INotificationHandler<ContentTypeDeletedNotification>
-        {
-            public void Handle(ContentTypeDeletedNotification notification) => Deleted?.Invoke(notification);
-            public static Action<ContentTypeDeletedNotification> Deleted { get; set; }
-        }
+        return list.ToArray();
+    }
+
+    public class ContentNotificationHandler : INotificationHandler<ContentMovedToRecycleBinNotification>
+    {
+        public static Action<ContentMovedToRecycleBinNotification> MovedContentToRecycleBin { get; set; }
+
+        public void Handle(ContentMovedToRecycleBinNotification notification) =>
+            MovedContentToRecycleBin?.Invoke(notification);
+    }
+
+    public class ContentTypeNotificationHandler : INotificationHandler<ContentTypeDeletedNotification>
+    {
+        public static Action<ContentTypeDeletedNotification> Deleted { get; set; }
+        public void Handle(ContentTypeDeletedNotification notification) => Deleted?.Invoke(notification);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
index eb4e22e43a..d4b9279487 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentTypeServiceVariantsTests.cs
@@ -4,12 +4,10 @@
 using System;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.Persistence;
@@ -19,1335 +17,1290 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Scoping;
 using Umbraco.Extensions;
-using Language = Umbraco.Cms.Core.Models.Language;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
+public class ContentTypeServiceVariantsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
-    public class ContentTypeServiceVariantsTests : UmbracoIntegrationTest
+    private ISqlContext SqlContext => GetRequiredService<ISqlContext>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IRedirectUrlService RedirectUrlService => GetRequiredService<IRedirectUrlService>();
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private ISqlContext SqlContext => GetRequiredService<ISqlContext>();
-
-        private IContentService ContentService => GetRequiredService<IContentService>();
-
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-
-        private IRedirectUrlService RedirectUrlService => GetRequiredService<IRedirectUrlService>();
-
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
-
-
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+        builder.AddNuCache();
+        builder.Services.AddUnique<IServerMessenger, ScopedRepositoryTests.LocalServerMessenger>();
+        builder.Services.PostConfigure<NuCacheSettings>(options =>
         {
-            builder.AddNuCache();
-            builder.Services.AddUnique<IServerMessenger, ScopedRepositoryTests.LocalServerMessenger>();
-            builder.Services.PostConfigure<NuCacheSettings>(options =>
-            {
-                options.NuCacheSerializerType = NuCacheSerializerType.JSON;
-            });
+            options.NuCacheSerializerType = NuCacheSerializerType.JSON;
+        });
+    }
+
+    private void AssertJsonStartsWith(int id, string expected)
+    {
+        var json = GetJson(id).Replace('"', '\'');
+        var pos = json.IndexOf("'cd':", StringComparison.InvariantCultureIgnoreCase);
+        json = json.Substring(0, pos + "'cd':".Length);
+        Assert.AreEqual(expected, json);
+    }
+
+    private string GetJson(int id)
+    {
+        using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+        {
+            var selectJson = SqlContext.Sql().Select<ContentNuDto>().From<ContentNuDto>()
+                .Where<ContentNuDto>(x => x.NodeId == id && !x.Published);
+            var dto = ScopeAccessor.AmbientScope.Database.Fetch<ContentNuDto>(selectJson).FirstOrDefault();
+            Assert.IsNotNull(dto);
+            var json = dto.Data;
+            return json;
+        }
+    }
+
+    [TestCase(ContentVariation.Nothing, ContentVariation.Nothing, false)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.Culture, true)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment, true)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.Segment, true)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing, true)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Culture, false)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment, true)]
+    [TestCase(ContentVariation.Culture, ContentVariation.CultureAndSegment, true)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Nothing, true)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Culture, true)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Segment, false)]
+    [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment, true)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing, true)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Culture, true)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment, true)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.CultureAndSegment, false)]
+    public void Change_Content_Type_Variation_Clears_Redirects(ContentVariation startingContentTypeVariation,
+        ContentVariation changedContentTypeVariation, bool shouldUrlRedirectsBeCleared)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = startingContentTypeVariation;
+        ContentTypeService.Save(contentType);
+        var contentType2 = ContentTypeBuilder.CreateBasicContentType("test");
+        ContentTypeService.Save(contentType2);
+
+        // create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+        doc.Name = "Hello1";
+        if (startingContentTypeVariation.HasFlag(ContentVariation.Culture))
+        {
+            doc.SetCultureName(doc.Name, "en-US");
         }
 
-        private void AssertJsonStartsWith(int id, string expected)
-        {
+        ContentService.Save(doc);
 
-            string json = GetJson(id).Replace('"', '\'');
-            int pos = json.IndexOf("'cd':", StringComparison.InvariantCultureIgnoreCase);
-            json = json.Substring(0, pos + "'cd':".Length);
-            Assert.AreEqual(expected, json);
+        IContent doc2 = ContentBuilder.CreateBasicContent(contentType2);
+        ContentService.Save(doc2);
+
+        RedirectUrlService.Register("hello/world", doc.Key);
+        RedirectUrlService.Register("hello2/world2", doc2.Key);
+
+        // These 2 assertions should probably be moved to a test for the Register() method?
+        Assert.AreEqual(1, RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
+        Assert.AreEqual(1, RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
+
+        // change variation
+        contentType.Variations = changedContentTypeVariation;
+        ContentTypeService.Save(contentType);
+        var expectedRedirectUrlCount = shouldUrlRedirectsBeCleared ? 0 : 1;
+        Assert.AreEqual(expectedRedirectUrlCount, RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
+        Assert.AreEqual(1, RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
+    }
+
+    [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
+    public void Change_Content_Type_From_No_Culture_To_Culture(ContentVariation from, ContentVariation to)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = from;
+        var properties = CreatePropertyCollection(("title", from));
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        // create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+        doc.Name = "Hello1";
+        doc.SetValue("title", "hello world");
+        ContentService.Save(doc);
+
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("Hello1", doc.Name);
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+        Assert.IsTrue(doc.Edited);
+        Assert.IsFalse(doc.IsCultureEdited("en-US"));
+
+        // change the content type to be variant, we will also update the name here to detect the copy changes
+        doc.Name = "Hello2";
+        ContentService.Save(doc);
+        contentType.Variations = to;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("Hello2", doc.GetCultureName("en-US"));
+        Assert.AreEqual("hello world",
+            doc.GetValue("title")); // We are not checking against en-US here because properties will remain invariant
+        Assert.IsTrue(doc.Edited);
+        Assert.IsTrue(doc.IsCultureEdited("en-US"));
+
+        // change back property type to be invariant, we will also update the name here to detect the copy changes
+        doc.SetCultureName("Hello3", "en-US");
+        ContentService.Save(doc);
+        contentType.Variations = from;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("Hello3", doc.Name);
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+        Assert.IsTrue(doc.Edited);
+        Assert.IsFalse(doc.IsCultureEdited("en-US"));
+    }
+
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
+    public void Change_Content_Type_From_Culture_To_No_Culture(ContentVariation startingContentTypeVariation,
+        ContentVariation changeContentTypeVariationTo)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = startingContentTypeVariation;
+        var properties = CreatePropertyCollection(("title", startingContentTypeVariation));
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        // create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+        doc.SetCultureName("Hello1", "en-US");
+        doc.SetValue("title", "hello world", "en-US");
+        ContentService.Save(doc);
+
+        doc = ContentService.GetById(doc.Id); // re-get
+        Assert.AreEqual("Hello1", doc.GetCultureName("en-US"));
+        Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+        Assert.IsTrue(doc.Edited);
+        Assert.IsTrue(doc.IsCultureEdited("en-US"));
+
+        // change the content type to be invariant, we will also update the name here to detect the copy changes
+        doc.SetCultureName("Hello2", "en-US");
+        ContentService.Save(doc);
+        contentType.Variations = changeContentTypeVariationTo;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("Hello2", doc.Name);
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+        Assert.IsTrue(doc.Edited);
+        Assert.IsFalse(doc.IsCultureEdited("en-US"));
+
+        // change back property type to be variant, we will also update the name here to detect the copy changes
+        doc.Name = "Hello3";
+        ContentService.Save(doc);
+        contentType.Variations = startingContentTypeVariation;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        // at this stage all property types were switched to invariant so even though the variant value
+        // exists it will not be returned because the property type is invariant,
+        // so this check proves that null will be returned
+        Assert.AreEqual("Hello3", doc.Name);
+        Assert.IsNull(doc.GetValue("title", "en-US"));
+        Assert.IsTrue(doc.Edited);
+        Assert.IsTrue(
+            doc.IsCultureEdited("en-US")); // this is true because the name change is copied to the default language
+
+        // we can now switch the property type to be variant and the value can be returned again
+        contentType.PropertyTypes.First().Variations = startingContentTypeVariation;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("Hello3", doc.GetCultureName("en-US"));
+        Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+        Assert.IsTrue(doc.Edited);
+        Assert.IsTrue(doc.IsCultureEdited("en-US"));
+    }
+
+    [TestCase(ContentVariation.Nothing, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.Segment)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
+    [TestCase(ContentVariation.Culture, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Segment)]
+    [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Culture)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.CultureAndSegment)]
+    public void Preserve_Content_Name_After_Content_Type_Variation_Change(ContentVariation contentTypeVariationFrom,
+        ContentVariation contentTypeVariationTo)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = contentTypeVariationFrom;
+        ContentTypeService.Save(contentType);
+
+        var invariantContentName = "Content Invariant";
+
+        var defaultCultureContentName = "Content en-US";
+        var defaultCulture = "en-US";
+
+        var nlContentName = "Content nl-NL";
+        var nlCulture = "nl-NL";
+
+        LocalizationService.Save(new Language(nlCulture, "Dutch (Netherlands)"));
+
+        var includeCultureNames = contentType.Variations.HasFlag(ContentVariation.Culture);
+
+        // Create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+
+        doc.Name = invariantContentName;
+        if (includeCultureNames)
+        {
+            Assert.DoesNotThrow(() => doc.SetCultureName(defaultCultureContentName, defaultCulture));
+            Assert.DoesNotThrow(() => doc.SetCultureName(nlContentName, nlCulture));
+        }
+        else
+        {
+            Assert.Throws<NotSupportedException>(() => doc.SetCultureName(defaultCultureContentName, defaultCulture));
+            Assert.Throws<NotSupportedException>(() => doc.SetCultureName(nlContentName, nlCulture));
         }
 
-        private string GetJson(int id)
+        ContentService.Save(doc);
+        doc = ContentService.GetById(doc.Id);
+
+        AssertAll();
+
+        // Change variation
+        contentType.Variations = contentTypeVariationTo;
+        ContentService.Save(doc);
+        doc = ContentService.GetById(doc.Id);
+
+        AssertAll();
+
+        void AssertAll()
         {
-            using (IScope scope = ScopeProvider.CreateScope(autoComplete: true))
-            {
-                Sql<ISqlContext> selectJson = SqlContext.Sql().Select<ContentNuDto>().From<ContentNuDto>().Where<ContentNuDto>(x => x.NodeId == id && !x.Published);
-                ContentNuDto dto = ScopeAccessor.AmbientScope.Database.Fetch<ContentNuDto>(selectJson).FirstOrDefault();
-                Assert.IsNotNull(dto);
-                string json = dto.Data;
-                return json;
-            }
-        }
-
-        [TestCase(ContentVariation.Nothing, ContentVariation.Nothing, false)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.Culture, true)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment, true)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.Segment, true)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing, true)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Culture, false)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment, true)]
-        [TestCase(ContentVariation.Culture, ContentVariation.CultureAndSegment, true)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Nothing, true)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Culture, true)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Segment, false)]
-        [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment, true)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing, true)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Culture, true)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment, true)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.CultureAndSegment, false)]
-        public void Change_Content_Type_Variation_Clears_Redirects(ContentVariation startingContentTypeVariation, ContentVariation changedContentTypeVariation, bool shouldUrlRedirectsBeCleared)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = startingContentTypeVariation;
-            ContentTypeService.Save(contentType);
-            ContentType contentType2 = ContentTypeBuilder.CreateBasicContentType("test");
-            ContentTypeService.Save(contentType2);
-
-            // create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-            doc.Name = "Hello1";
-            if (startingContentTypeVariation.HasFlag(ContentVariation.Culture))
-            {
-                doc.SetCultureName(doc.Name, "en-US");
-            }
-
-            ContentService.Save(doc);
-
-            IContent doc2 = ContentBuilder.CreateBasicContent(contentType2);
-            ContentService.Save(doc2);
-
-            RedirectUrlService.Register("hello/world", doc.Key);
-            RedirectUrlService.Register("hello2/world2", doc2.Key);
-
-            // These 2 assertions should probably be moved to a test for the Register() method?
-            Assert.AreEqual(1, RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
-            Assert.AreEqual(1, RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
-
-            // change variation
-            contentType.Variations = changedContentTypeVariation;
-            ContentTypeService.Save(contentType);
-            int expectedRedirectUrlCount = shouldUrlRedirectsBeCleared ? 0 : 1;
-            Assert.AreEqual(expectedRedirectUrlCount, RedirectUrlService.GetContentRedirectUrls(doc.Key).Count());
-            Assert.AreEqual(1, RedirectUrlService.GetContentRedirectUrls(doc2.Key).Count());
-        }
-
-        [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
-        public void Change_Content_Type_From_No_Culture_To_Culture(ContentVariation from, ContentVariation to)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = from;
-            PropertyTypeCollection properties = CreatePropertyCollection(("title", from));
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            // create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-            doc.Name = "Hello1";
-            doc.SetValue("title", "hello world");
-            ContentService.Save(doc);
-
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("Hello1", doc.Name);
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.IsTrue(doc.Edited);
-            Assert.IsFalse(doc.IsCultureEdited("en-US"));
-
-            // change the content type to be variant, we will also update the name here to detect the copy changes
-            doc.Name = "Hello2";
-            ContentService.Save(doc);
-            contentType.Variations = to;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("Hello2", doc.GetCultureName("en-US"));
-            Assert.AreEqual("hello world", doc.GetValue("title")); // We are not checking against en-US here because properties will remain invariant
-            Assert.IsTrue(doc.Edited);
-            Assert.IsTrue(doc.IsCultureEdited("en-US"));
-
-            // change back property type to be invariant, we will also update the name here to detect the copy changes
-            doc.SetCultureName("Hello3", "en-US");
-            ContentService.Save(doc);
-            contentType.Variations = from;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("Hello3", doc.Name);
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.IsTrue(doc.Edited);
-            Assert.IsFalse(doc.IsCultureEdited("en-US"));
-        }
-
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
-        public void Change_Content_Type_From_Culture_To_No_Culture(ContentVariation startingContentTypeVariation, ContentVariation changeContentTypeVariationTo)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = startingContentTypeVariation;
-            PropertyTypeCollection properties = CreatePropertyCollection(("title", startingContentTypeVariation));
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            // create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-            doc.SetCultureName("Hello1", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ContentService.Save(doc);
-
-            doc = ContentService.GetById(doc.Id); // re-get
-            Assert.AreEqual("Hello1", doc.GetCultureName("en-US"));
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-            Assert.IsTrue(doc.Edited);
-            Assert.IsTrue(doc.IsCultureEdited("en-US"));
-
-            // change the content type to be invariant, we will also update the name here to detect the copy changes
-            doc.SetCultureName("Hello2", "en-US");
-            ContentService.Save(doc);
-            contentType.Variations = changeContentTypeVariationTo;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("Hello2", doc.Name);
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.IsTrue(doc.Edited);
-            Assert.IsFalse(doc.IsCultureEdited("en-US"));
-
-            // change back property type to be variant, we will also update the name here to detect the copy changes
-            doc.Name = "Hello3";
-            ContentService.Save(doc);
-            contentType.Variations = startingContentTypeVariation;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            // at this stage all property types were switched to invariant so even though the variant value
-            // exists it will not be returned because the property type is invariant,
-            // so this check proves that null will be returned
-            Assert.AreEqual("Hello3", doc.Name);
-            Assert.IsNull(doc.GetValue("title", "en-US"));
-            Assert.IsTrue(doc.Edited);
-            Assert.IsTrue(doc.IsCultureEdited("en-US")); // this is true because the name change is copied to the default language
-
-            // we can now switch the property type to be variant and the value can be returned again
-            contentType.PropertyTypes.First().Variations = startingContentTypeVariation;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("Hello3", doc.GetCultureName("en-US"));
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-            Assert.IsTrue(doc.Edited);
-            Assert.IsTrue(doc.IsCultureEdited("en-US"));
-        }
-
-        [TestCase(ContentVariation.Nothing, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.Segment)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
-        [TestCase(ContentVariation.Culture, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Segment)]
-        [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Culture)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.CultureAndSegment)]
-        public void Preserve_Content_Name_After_Content_Type_Variation_Change(ContentVariation contentTypeVariationFrom, ContentVariation contentTypeVariationTo)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = contentTypeVariationFrom;
-            ContentTypeService.Save(contentType);
-
-            string invariantContentName = "Content Invariant";
-
-            string defaultCultureContentName = "Content en-US";
-            string defaultCulture = "en-US";
-
-            string nlContentName = "Content nl-NL";
-            string nlCulture = "nl-NL";
-
-            LocalizationService.Save(new Language(nlCulture, "Dutch (Netherlands)"));
-
-            bool includeCultureNames = contentType.Variations.HasFlag(ContentVariation.Culture);
-
-            // Create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-
-            doc.Name = invariantContentName;
             if (includeCultureNames)
             {
-                Assert.DoesNotThrow(() => doc.SetCultureName(defaultCultureContentName, defaultCulture));
-                Assert.DoesNotThrow(() => doc.SetCultureName(nlContentName, nlCulture));
+                // Invariant content name is not preserved when content type is set to culture
+                Assert.AreEqual(defaultCultureContentName, doc.Name);
+                Assert.AreEqual(doc.Name, doc.GetCultureName(defaultCulture));
+                Assert.AreEqual(nlContentName, doc.GetCultureName(nlCulture));
             }
             else
             {
-                Assert.Throws<NotSupportedException>(() => doc.SetCultureName(defaultCultureContentName, defaultCulture));
-                Assert.Throws<NotSupportedException>(() => doc.SetCultureName(nlContentName, nlCulture));
+                Assert.AreEqual(invariantContentName, doc.Name);
+                Assert.AreEqual(null, doc.GetCultureName(defaultCulture));
+                Assert.AreEqual(null, doc.GetCultureName(nlCulture));
             }
-
-            ContentService.Save(doc);
-            doc = ContentService.GetById(doc.Id);
-
-            AssertAll();
-
-            // Change variation
-            contentType.Variations = contentTypeVariationTo;
-            ContentService.Save(doc);
-            doc = ContentService.GetById(doc.Id);
-
-            AssertAll();
-
-            void AssertAll()
-            {
-                if (includeCultureNames)
-                {
-                    // Invariant content name is not preserved when content type is set to culture
-                    Assert.AreEqual(defaultCultureContentName, doc.Name);
-                    Assert.AreEqual(doc.Name, doc.GetCultureName(defaultCulture));
-                    Assert.AreEqual(nlContentName, doc.GetCultureName(nlCulture));
-                }
-                else
-                {
-                    Assert.AreEqual(invariantContentName, doc.Name);
-                    Assert.AreEqual(null, doc.GetCultureName(defaultCulture));
-                    Assert.AreEqual(null, doc.GetCultureName(nlCulture));
-                }
-            }
-        }
-
-        [TestCase(ContentVariation.Nothing, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.Segment)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
-        [TestCase(ContentVariation.Culture, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Segment)]
-        [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Culture)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.CultureAndSegment)]
-        public void Verify_If_Property_Type_Variation_Is_Correctly_Corrected_When_Content_Type_Is_Updated(ContentVariation contentTypeVariation, ContentVariation propertyTypeVariation)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-
-            // We test an updated content type so it has to be saved first.
-            ContentTypeService.Save(contentType);
-
-            // Update it
-            contentType.Variations = contentTypeVariation;
-            PropertyTypeCollection properties = CreatePropertyCollection(("title", propertyTypeVariation));
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            // Check if property type variations have been updated correctly
-            Assert.AreEqual(properties.First().Variations, contentTypeVariation & propertyTypeVariation);
-        }
-
-        [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
-        public void Change_Property_Type_From_Invariant_Variant(ContentVariation invariant, ContentVariation variant)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-
-            // content type supports all variations
-            contentType.Variations = ContentVariation.Culture | ContentVariation.Segment;
-            PropertyTypeCollection properties = CreatePropertyCollection(("title", invariant));
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            // create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-            doc.SetCultureName("Home", "en-US");
-            doc.SetValue("title", "hello world");
-            ContentService.Save(doc);
-
-            doc = ContentService.GetById(doc.Id); // re-get
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.IsTrue(doc.IsCultureEdited("en-US")); // invariant prop changes show up on default lang
-            Assert.IsTrue(doc.Edited);
-
-            // change the property type to be variant
-            contentType.PropertyTypes.First().Variations = variant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-            Assert.IsTrue(doc.IsCultureEdited("en-US"));
-            Assert.IsTrue(doc.Edited);
-
-            // change back property type to be invariant
-            contentType.PropertyTypes.First().Variations = invariant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.IsTrue(doc.IsCultureEdited("en-US"));  // invariant prop changes show up on default lang
-            Assert.IsTrue(doc.Edited);
-        }
-
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
-        public void Change_Property_Type_From_Variant_Invariant(ContentVariation variant, ContentVariation invariant)
-        {
-            // create content type with a property type that varies by culture
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-
-            // content type supports all variations
-            contentType.Variations = ContentVariation.Culture | ContentVariation.Segment;
-            PropertyTypeCollection properties = CreatePropertyCollection(("title", variant));
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            // create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-            doc.SetCultureName("Home", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ContentService.Save(doc);
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-
-            // change the property type to be invariant
-            contentType.PropertyTypes.First().Variations = invariant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-
-            // change back property type to be variant
-            contentType.PropertyTypes.First().Variations = variant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-        }
-
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
-        public void Change_Property_Type_From_Variant_Invariant_On_A_Composition(ContentVariation variant, ContentVariation invariant)
-        {
-            // create content type with a property type that varies by culture
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-
-            // content type supports all variations
-            contentType.Variations = ContentVariation.Culture | ContentVariation.Segment;
-            PropertyTypeCollection properties = CreatePropertyCollection(("title", variant));
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            // compose this from the other one
-            ContentType contentType2 = ContentTypeBuilder.CreateBasicContentType("test");
-            contentType2.Variations = contentType.Variations;
-            contentType2.AddContentType(contentType);
-            ContentTypeService.Save(contentType2);
-
-            // create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-            doc.SetCultureName("Home", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ContentService.Save(doc);
-
-            IContent doc2 = ContentBuilder.CreateBasicContent(contentType2);
-            doc2.SetCultureName("Home", "en-US");
-            doc2.SetValue("title", "hello world", "en-US");
-            ContentService.Save(doc2);
-
-            // change the property type to be invariant
-            contentType.PropertyTypes.First().Variations = invariant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-            doc2 = ContentService.GetById(doc2.Id); // re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.AreEqual("hello world", doc2.GetValue("title"));
-
-            // change back property type to be variant
-            contentType.PropertyTypes.First().Variations = variant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-            doc2 = ContentService.GetById(doc2.Id); // re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
-            Assert.AreEqual("hello world", doc2.GetValue("title", "en-US"));
-        }
-
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
-        public void Change_Content_Type_From_Variant_Invariant_On_A_Composition(ContentVariation variant, ContentVariation invariant)
-        {
-            // create content type with a property type that varies by culture
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            contentType.Variations = variant;
-            PropertyTypeCollection properties = CreatePropertyCollection(("title", ContentVariation.Culture));
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            // compose this from the other one
-            ContentType contentType2 = ContentTypeBuilder.CreateBasicContentType("test");
-            contentType2.Variations = contentType.Variations;
-            contentType2.AddContentType(contentType);
-            ContentTypeService.Save(contentType2);
-
-            // create some content of this content type
-            IContent doc = ContentBuilder.CreateBasicContent(contentType);
-            doc.SetCultureName("Home", "en-US");
-            doc.SetValue("title", "hello world", "en-US");
-            ContentService.Save(doc);
-
-            IContent doc2 = ContentBuilder.CreateBasicContent(contentType2);
-            doc2.SetCultureName("Home", "en-US");
-            doc2.SetValue("title", "hello world", "en-US");
-            ContentService.Save(doc2);
-
-            // change the content type to be invariant
-            contentType.Variations = invariant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-            doc2 = ContentService.GetById(doc2.Id); // re-get
-
-            Assert.AreEqual("hello world", doc.GetValue("title"));
-            Assert.AreEqual("hello world", doc2.GetValue("title"));
-
-            // change back content type to be variant
-            contentType.Variations = variant;
-            ContentTypeService.Save(contentType);
-            doc = ContentService.GetById(doc.Id); // re-get
-            doc2 = ContentService.GetById(doc2.Id); // re-get
-
-            // this will be null because the doc type was changed back to variant but it's property types don't get changed back
-            Assert.IsNull(doc.GetValue("title", "en-US"));
-            Assert.IsNull(doc2.GetValue("title", "en-US"));
-        }
-
-        [Test]
-        public void Change_Variations_SimpleContentType_VariantToInvariantAndBack()
-        {
-            // one simple content type, variant, with both variant and invariant properties
-            // can change it to invariant and back
-            CreateFrenchAndEnglishLangs();
-
-            IContentType contentType = CreateContentType(ContentVariation.Culture);
-
-            PropertyTypeCollection properties = CreatePropertyCollection(
-                ("value1", ContentVariation.Culture),
-                ("value2", ContentVariation.Nothing));
-
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            var document = (IContent)new Content("document", -1, contentType);
-            document.SetCultureName("doc1en", "en");
-            document.SetCultureName("doc1fr", "fr");
-            document.SetValue("value1", "v1en", "en");
-            document.SetValue("value1", "v1fr", "fr");
-            document.SetValue("value2", "v2");
-            ContentService.Save(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch content type to Nothing
-            contentType.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.IsNull(document.GetCultureName("en"));
-            Assert.IsNull(document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1", "en"));
-            Assert.IsNull(document.GetValue("value1", "fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch content back to Culture
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1", "en"));
-            Assert.IsNull(document.GetValue("value1", "fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch property back to Culture
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
-        }
-
-        [Test]
-        public void Change_Variations_SimpleContentType_InvariantToVariantAndBack()
-        {
-            // one simple content type, invariant
-            // can change it to variant and back
-            // can then switch one property to variant
-            var globalSettings = new GlobalSettings();
-
-            var languageEn = new Language("en", "English") 
-            {
-                IsDefault = true
-            };
-            LocalizationService.Save(languageEn);
-            var languageFr = new Language("fr", "French");
-            LocalizationService.Save(languageFr);
-
-            IContentType contentType = CreateContentType(ContentVariation.Nothing);
-
-            PropertyTypeCollection properties = CreatePropertyCollection(
-                ("value1", ContentVariation.Nothing),
-                ("value2", ContentVariation.Nothing));
-
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            var document = (IContent)new Content("document", -1, contentType);
-            document.Name = "doc1";
-            document.SetValue("value1", "v1");
-            document.SetValue("value2", "v2");
-            ContentService.Save(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1", document.Name);
-            Assert.IsNull(document.GetCultureName("en"));
-            Assert.IsNull(document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1", "en"));
-            Assert.IsNull(document.GetValue("value1", "fr"));
-            Assert.AreEqual("v1", document.GetValue("value1"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch content type to Culture
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1", document.GetCultureName("en"));
-            Assert.IsNull(document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1", "en"));
-            Assert.IsNull(document.GetValue("value1", "fr"));
-            Assert.AreEqual("v1", document.GetValue("value1"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch property to Culture
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1", document.GetCultureName("en"));
-            Assert.IsNull(document.GetCultureName("fr"));
-            Assert.AreEqual("v1", document.GetValue("value1", "en"));
-            Assert.IsNull(document.GetValue("value1", "fr"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'c':'en','v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch content back to Nothing
-            contentType.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1", document.Name);
-            Assert.IsNull(document.GetCultureName("en"));
-            Assert.IsNull(document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1", "en"));
-            Assert.IsNull(document.GetValue("value1", "fr"));
-            Assert.AreEqual("v1", document.GetValue("value1"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
-        }
-
-        [Test]
-        public void Change_Variations_SimpleContentType_VariantPropertyToInvariantAndBack()
-        {
-            // one simple content type, variant, with both variant and invariant properties
-            // can change an invariant property to variant and back
-            CreateFrenchAndEnglishLangs();
-
-            IContentType contentType = CreateContentType(ContentVariation.Culture);
-
-            PropertyTypeCollection properties = CreatePropertyCollection(
-                ("value1", ContentVariation.Culture),
-                ("value2", ContentVariation.Nothing));
-
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            var document = (IContent)new Content("document", -1, contentType);
-            document.SetCultureName("doc1en", "en");
-            document.SetCultureName("doc1fr", "fr");
-            document.SetValue("value1", "v1en", "en");
-            document.SetValue("value1", "v1fr", "fr");
-            document.SetValue("value2", "v2");
-            ContentService.Save(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch property type to Nothing
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1", "en"));
-            Assert.IsNull(document.GetValue("value1", "fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch property back to Culture
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
-            Assert.AreEqual("v2", document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
-
-            // switch other property to Culture
-            contentType.PropertyTypes.First(x => x.Alias == "value2").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
-            Assert.AreEqual("v2", document.GetValue("value2", "en"));
-            Assert.IsNull(document.GetValue("value2", "fr"));
-            Assert.IsNull(document.GetValue("value2"));
-
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'c':'en','v':'v2'}]},'cd':");
-        }
-
-        [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
-        [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
-        public void Change_Property_Variations_From_Variant_To_Invariant_And_Ensure_Edited_Values_Are_Renormalized(ContentVariation variant, ContentVariation invariant)
-        {
-            // one simple content type, variant, with both variant and invariant properties
-            // can change an invariant property to variant and back
-            CreateFrenchAndEnglishLangs();
-
-            IContentType contentType = CreateContentType(ContentVariation.Culture | ContentVariation.Segment);
-
-            PropertyTypeCollection properties = CreatePropertyCollection(("value1", variant));
-
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            IContent document = new Content("document", -1, contentType);
-            document.SetCultureName("doc1en", "en");
-            document.SetCultureName("doc1fr", "fr");
-            document.SetValue("value1", "v1en-init", "en");
-            document.SetValue("value1", "v1fr-init", "fr");
-            ContentService.SaveAndPublish(document); // all values are published which means the document is not 'edited'
-
-            document = ContentService.GetById(document.Id);
-            Assert.IsFalse(document.IsCultureEdited("en"));
-            Assert.IsFalse(document.IsCultureEdited("fr"));
-            Assert.IsFalse(document.Edited);
-
-            document.SetValue("value1", "v1en", "en"); // change the property culture value, so now this culture will be edited
-            document.SetValue("value1", "v1fr", "fr"); // change the property culture value, so now this culture will be edited
-            ContentService.Save(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1en-init", document.GetValue("value1", "en", published: true));
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
-            Assert.AreEqual("v1fr-init", document.GetValue("value1", "fr", published: true));
-            Assert.IsTrue(document.IsCultureEdited("en")); // This will be true because the edited value isn't the same as the published value
-            Assert.IsTrue(document.IsCultureEdited("fr")); // This will be true because the edited value isn't the same as the published value
-            Assert.IsTrue(document.Edited);
-
-            // switch property type to Invariant
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = invariant;
-            ContentTypeService.Save(contentType); // This is going to have to re-normalize the "Edited" flag
-
-            document = ContentService.GetById(document.Id);
-            Assert.IsTrue(document.IsCultureEdited("en")); // This will remain true because there is now a pending change for the invariant property data which is flagged under the default lang
-            Assert.IsFalse(document.IsCultureEdited("fr")); // This will be false because nothing has changed for this culture and the property no longer reflects variant changes
-            Assert.IsTrue(document.Edited);
-
-            // update the invariant value and publish
-            document.SetValue("value1", "v1inv");
-            ContentService.SaveAndPublish(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1", "en")); // The values are there but the business logic returns null
-            Assert.IsNull(document.GetValue("value1", "fr")); // The values are there but the business logic returns null
-            Assert.IsNull(document.GetValue("value1", "en", published: true)); // The values are there but the business logic returns null
-            Assert.IsNull(document.GetValue("value1", "fr", published: true)); // The values are there but the business logic returns null
-            Assert.AreEqual("v1inv", document.GetValue("value1"));
-            Assert.AreEqual("v1inv", document.GetValue("value1", published: true));
-            Assert.IsFalse(document.IsCultureEdited("en")); // This returns false, everything is published
-            Assert.IsFalse(document.IsCultureEdited("fr")); // This will be false because nothing has changed for this culture and the property no longer reflects variant changes
-            Assert.IsFalse(document.Edited);
-
-            // switch property back to Culture
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = variant;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("v1inv", document.GetValue("value1", "en")); // The invariant property value gets copied over to the default language
-            Assert.AreEqual("v1inv", document.GetValue("value1", "en", published: true));
-            Assert.AreEqual("v1fr", document.GetValue("value1", "fr")); // values are still retained
-            Assert.AreEqual("v1fr-init", document.GetValue("value1", "fr", published: true)); // values are still retained
-            Assert.IsFalse(document.IsCultureEdited("en")); // The invariant published AND edited values are copied over to the default language
-            Assert.IsTrue(document.IsCultureEdited("fr"));  // The previously existing french values are there and there is no published value
-            Assert.IsTrue(document.Edited); // Will be flagged edited again because the french culture had pending changes
-
-            // publish again
-            document.SetValue("value1", "v1en2", "en"); // update the value now that it's variant again
-            document.SetValue("value1", "v1fr2", "fr"); // update the value now that it's variant again
-            ContentService.SaveAndPublish(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en2", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1fr2", document.GetValue("value1", "fr"));
-            Assert.IsNull(document.GetValue("value1")); // The value is there but the business logic returns null
-            Assert.IsFalse(document.IsCultureEdited("en")); // This returns false, the variant property value has been published
-            Assert.IsFalse(document.IsCultureEdited("fr")); // This returns false, the variant property value has been published
-            Assert.IsFalse(document.Edited);
-        }
-
-        [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
-        [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
-        [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
-        public void Change_Property_Variations_From_Invariant_To_Variant_And_Ensure_Edited_Values_Are_Renormalized(ContentVariation invariant, ContentVariation variant)
-        {
-            // one simple content type, variant, with both variant and invariant properties
-            // can change an invariant property to variant and back
-            CreateFrenchAndEnglishLangs();
-
-            IContentType contentType = CreateContentType(ContentVariation.Culture | ContentVariation.Segment);
-
-            PropertyTypeCollection properties = CreatePropertyCollection(("value1", invariant));
-
-            contentType.PropertyGroups.Add(new PropertyGroup(properties)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(contentType);
-
-            var document = (IContent)new Content("document", -1, contentType);
-            document.SetCultureName("doc1en", "en");
-            document.SetCultureName("doc1fr", "fr");
-            document.SetValue("value1", "v1en-init");
-            ContentService.SaveAndPublish(document); // all values are published which means the document is not 'edited'
-
-            document = ContentService.GetById(document.Id);
-            Assert.IsFalse(document.IsCultureEdited("en"));
-            Assert.IsFalse(document.IsCultureEdited("fr"));
-            Assert.IsFalse(document.Edited);
-
-            document.SetValue("value1", "v1en"); // change the property value, so now the invariant (default) culture will be edited
-            ContentService.Save(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.AreEqual("v1en", document.GetValue("value1"));
-            Assert.AreEqual("v1en-init", document.GetValue("value1", published: true));
-            Assert.IsTrue(document.IsCultureEdited("en")); // This is true because the invariant property reflects changes on the default lang
-            Assert.IsFalse(document.IsCultureEdited("fr"));
-            Assert.IsTrue(document.Edited);
-
-            // switch property type to Culture
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = variant;
-            ContentTypeService.Save(contentType); // This is going to have to re-normalize the "Edited" flag
-
-            document = ContentService.GetById(document.Id);
-            Assert.IsTrue(document.IsCultureEdited("en")); // Remains true
-            Assert.IsFalse(document.IsCultureEdited("fr")); // False because no french property has ever been edited
-            Assert.IsTrue(document.Edited);
-
-            // update the culture value and publish
-            document.SetValue("value1", "v1en2", "en");
-            ContentService.SaveAndPublish(document);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("doc1en", document.Name);
-            Assert.AreEqual("doc1en", document.GetCultureName("en"));
-            Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
-            Assert.IsNull(document.GetValue("value1")); // The values are there but the business logic returns null
-            Assert.IsNull(document.GetValue("value1", published: true)); // The values are there but the business logic returns null
-            Assert.AreEqual("v1en2", document.GetValue("value1", "en"));
-            Assert.AreEqual("v1en2", document.GetValue("value1", "en", published: true));
-            Assert.IsFalse(document.IsCultureEdited("en")); // This returns false, everything is published
-            Assert.IsFalse(document.IsCultureEdited("fr")); // False because no french property has ever been edited
-            Assert.IsFalse(document.Edited);
-
-            // switch property back to Invariant
-            contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = invariant;
-            ContentTypeService.Save(contentType);
-
-            document = ContentService.GetById(document.Id);
-            Assert.AreEqual("v1en2", document.GetValue("value1")); // The variant property value gets copied over to the invariant
-            Assert.AreEqual("v1en2", document.GetValue("value1", published: true));
-            Assert.IsNull(document.GetValue("value1", "fr"));  // The values are there but the business logic returns null
-            Assert.IsNull(document.GetValue("value1", "fr", published: true));  // The values are there but the business logic returns null
-            Assert.IsFalse(document.IsCultureEdited("en")); // The variant published AND edited values are copied over to the invariant
-            Assert.IsFalse(document.IsCultureEdited("fr"));
-            Assert.IsFalse(document.Edited);
-        }
-
-        [Test]
-        public void Change_Variations_ComposedContentType_1()
-        {
-            // one composing content type, variant, with both variant and invariant properties
-            // one composed content type, variant, with both variant and invariant properties
-            // can change the composing content type to invariant and back
-            // can change the composed content type to invariant and back
-            CreateFrenchAndEnglishLangs();
-
-            IContentType composing = CreateContentType(ContentVariation.Culture, "composing");
-
-            PropertyTypeCollection properties1 = CreatePropertyCollection(
-                ("value11", ContentVariation.Culture),
-                ("value12", ContentVariation.Nothing));
-
-            composing.PropertyGroups.Add(new PropertyGroup(properties1)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(composing);
-
-            IContentType composed = CreateContentType(ContentVariation.Culture, "composed");
-
-            PropertyTypeCollection properties2 = CreatePropertyCollection(
-                ("value21", ContentVariation.Culture),
-                ("value22", ContentVariation.Nothing));
-
-            composed.PropertyGroups.Add(new PropertyGroup(properties2)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            composed.AddContentType(composing);
-            ContentTypeService.Save(composed);
-
-            var document = (IContent)new Content("document", -1, composed);
-            document.SetCultureName("doc1en", "en");
-            document.SetCultureName("doc1fr", "fr");
-            document.SetValue("value11", "v11en", "en");
-            document.SetValue("value11", "v11fr", "fr");
-            document.SetValue("value12", "v12");
-            document.SetValue("value21", "v21en", "en");
-            document.SetValue("value21", "v21fr", "fr");
-            document.SetValue("value22", "v22");
-            ContentService.Save(document);
-
-            // both value11 and value21 are variant
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            composed.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(composed);
-
-            // both value11 and value21 are invariant
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
-
-            composed.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composed);
-
-            // value11 is variant again, but value21 is still invariant
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
-
-            composed.PropertyTypes.First(x => x.Alias == "value21").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composed);
-
-            // we can make it variant again
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            composing.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(composing);
-
-            // value11 is invariant
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            composing.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composing);
-
-            // value11 is still invariant
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            composing.PropertyTypes.First(x => x.Alias == "value11").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composing);
-
-            // we can make it variant again
-            Console.WriteLine(GetJson(document.Id));
-            AssertJsonStartsWith(
-                document.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-        }
-
-        [Test]
-        public void Change_Variations_ComposedContentType_2()
-        {
-            // one composing content type, variant, with both variant and invariant properties
-            // one composed content type, variant, with both variant and invariant properties
-            // one composed content type, invariant
-            // can change the composing content type to invariant and back
-            // can change the variant composed content type to invariant and back
-            CreateFrenchAndEnglishLangs();
-
-            IContentType composing = CreateContentType(ContentVariation.Culture, "composing");
-
-            PropertyTypeCollection properties1 = CreatePropertyCollection(
-                ("value11", ContentVariation.Culture),
-                ("value12", ContentVariation.Nothing));
-
-            composing.PropertyGroups.Add(new PropertyGroup(properties1)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            ContentTypeService.Save(composing);
-
-            IContentType composed1 = CreateContentType(ContentVariation.Culture, "composed1");
-
-            PropertyTypeCollection properties2 = CreatePropertyCollection(
-                ("value21", ContentVariation.Culture),
-                ("value22", ContentVariation.Nothing));
-
-            composed1.PropertyGroups.Add(new PropertyGroup(properties2)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            composed1.AddContentType(composing);
-            ContentTypeService.Save(composed1);
-
-            IContentType composed2 = CreateContentType(ContentVariation.Nothing, "composed2");
-
-            PropertyTypeCollection properties3 = CreatePropertyCollection(
-                ("value31", ContentVariation.Nothing),
-                ("value32", ContentVariation.Nothing));
-
-            composed2.PropertyGroups.Add(new PropertyGroup(properties3)
-            {
-                Alias = "content",
-                Name = "Content"
-            });
-            composed2.AddContentType(composing);
-            ContentTypeService.Save(composed2);
-
-            var document1 = (IContent)new Content("document1", -1, composed1);
-            document1.SetCultureName("doc1en", "en");
-            document1.SetCultureName("doc1fr", "fr");
-            document1.SetValue("value11", "v11en", "en");
-            document1.SetValue("value11", "v11fr", "fr");
-            document1.SetValue("value12", "v12");
-            document1.SetValue("value21", "v21en", "en");
-            document1.SetValue("value21", "v21fr", "fr");
-            document1.SetValue("value22", "v22");
-            ContentService.Save(document1);
-
-            var document2 = (IContent)new Content("document2", -1, composed2);
-            document2.Name = "doc2";
-            document2.SetValue("value11", "v11");
-            document2.SetValue("value12", "v12");
-            document2.SetValue("value31", "v31");
-            document2.SetValue("value32", "v32");
-            ContentService.Save(document2);
-
-            // both value11 and value21 are variant
-            Console.WriteLine(GetJson(document1.Id));
-            AssertJsonStartsWith(
-                document1.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            Console.WriteLine(GetJson(document2.Id));
-            AssertJsonStartsWith(
-                document2.Id,
-                "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
-
-            composed1.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(composed1);
-
-            // both value11 and value21 are invariant
-            Console.WriteLine(GetJson(document1.Id));
-            AssertJsonStartsWith(
-                document1.Id,
-                "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
-
-            Console.WriteLine(GetJson(document2.Id));
-            AssertJsonStartsWith(
-                document2.Id,
-                "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
-
-            composed1.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composed1);
-
-            // value11 is variant again, but value21 is still invariant
-            Console.WriteLine(GetJson(document1.Id));
-            AssertJsonStartsWith(
-                document1.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
-
-            Console.WriteLine(GetJson(document2.Id));
-            AssertJsonStartsWith(
-                document2.Id,
-                "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
-
-            composed1.PropertyTypes.First(x => x.Alias == "value21").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composed1);
-
-            // we can make it variant again
-            Console.WriteLine(GetJson(document1.Id));
-            AssertJsonStartsWith(
-                document1.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            Console.WriteLine(GetJson(document2.Id));
-            AssertJsonStartsWith(
-                document2.Id,
-                "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
-
-            composing.Variations = ContentVariation.Nothing;
-            ContentTypeService.Save(composing);
-
-            // value11 is invariant
-            Console.WriteLine(GetJson(document1.Id));
-            AssertJsonStartsWith(
-                document1.Id,
-                "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            Console.WriteLine(GetJson(document2.Id));
-            AssertJsonStartsWith(
-                document2.Id,
-                "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
-
-            composing.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composing);
-
-            // value11 is still invariant
-            Console.WriteLine(GetJson(document1.Id));
-            AssertJsonStartsWith(
-                document1.Id,
-                "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            Console.WriteLine(GetJson(document2.Id));
-            AssertJsonStartsWith(
-                document2.Id,
-                "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
-
-            composing.PropertyTypes.First(x => x.Alias == "value11").Variations = ContentVariation.Culture;
-            ContentTypeService.Save(composing);
-
-            // we can make it variant again
-            Console.WriteLine(GetJson(document1.Id));
-            AssertJsonStartsWith(
-                document1.Id,
-                "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
-
-            Console.WriteLine(GetJson(document2.Id));
-            AssertJsonStartsWith(
-                document2.Id,
-                "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
-        }
-
-        private void CreateFrenchAndEnglishLangs()
-        {
-            var languageEn = new Language("en", "English")
-            {
-                IsDefault = true 
-            };
-            LocalizationService.Save(languageEn);
-            var languageFr = new Language("fr", "French");
-            LocalizationService.Save(languageFr);
-        }
-
-        private IContentType CreateContentType(ContentVariation variance, string alias = "contentType") => new ContentType(ShortStringHelper, -1)
-        {
-            Alias = alias,
-            Name = alias,
-            Variations = variance,
-        };
-
-        private PropertyTypeCollection CreatePropertyCollection(params (string alias, ContentVariation variance)[] props)
-        {
-            var propertyCollection = new PropertyTypeCollection(true);
-
-            foreach ((string alias, ContentVariation variance) in props)
-            {
-                propertyCollection.Add(new PropertyType(ShortStringHelper, alias, ValueStorageType.Ntext)
-                {
-                    Alias = alias,
-                    DataTypeId = -88,
-                    Variations = variance
-                });
-            }
-
-            return propertyCollection;
         }
     }
+
+    [TestCase(ContentVariation.Nothing, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.Segment)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
+    [TestCase(ContentVariation.Culture, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Segment)]
+    [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Culture)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.CultureAndSegment)]
+    public void Verify_If_Property_Type_Variation_Is_Correctly_Corrected_When_Content_Type_Is_Updated(
+        ContentVariation contentTypeVariation, ContentVariation propertyTypeVariation)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        // We test an updated content type so it has to be saved first.
+        ContentTypeService.Save(contentType);
+
+        // Update it
+        contentType.Variations = contentTypeVariation;
+        var properties = CreatePropertyCollection(("title", propertyTypeVariation));
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        // Check if property type variations have been updated correctly
+        Assert.AreEqual(properties.First().Variations, contentTypeVariation & propertyTypeVariation);
+    }
+
+    [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
+    public void Change_Property_Type_From_Invariant_Variant(ContentVariation invariant, ContentVariation variant)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        // content type supports all variations
+        contentType.Variations = ContentVariation.Culture | ContentVariation.Segment;
+        var properties = CreatePropertyCollection(("title", invariant));
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        // create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+        doc.SetCultureName("Home", "en-US");
+        doc.SetValue("title", "hello world");
+        ContentService.Save(doc);
+
+        doc = ContentService.GetById(doc.Id); // re-get
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+        Assert.IsTrue(doc.IsCultureEdited("en-US")); // invariant prop changes show up on default lang
+        Assert.IsTrue(doc.Edited);
+
+        // change the property type to be variant
+        contentType.PropertyTypes.First().Variations = variant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+        Assert.IsTrue(doc.IsCultureEdited("en-US"));
+        Assert.IsTrue(doc.Edited);
+
+        // change back property type to be invariant
+        contentType.PropertyTypes.First().Variations = invariant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+        Assert.IsTrue(doc.IsCultureEdited("en-US")); // invariant prop changes show up on default lang
+        Assert.IsTrue(doc.Edited);
+    }
+
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
+    public void Change_Property_Type_From_Variant_Invariant(ContentVariation variant, ContentVariation invariant)
+    {
+        // create content type with a property type that varies by culture
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        // content type supports all variations
+        contentType.Variations = ContentVariation.Culture | ContentVariation.Segment;
+        var properties = CreatePropertyCollection(("title", variant));
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        // create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+        doc.SetCultureName("Home", "en-US");
+        doc.SetValue("title", "hello world", "en-US");
+        ContentService.Save(doc);
+
+        Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+
+        // change the property type to be invariant
+        contentType.PropertyTypes.First().Variations = invariant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+
+        // change back property type to be variant
+        contentType.PropertyTypes.First().Variations = variant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+
+        Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+    }
+
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
+    public void Change_Property_Type_From_Variant_Invariant_On_A_Composition(ContentVariation variant,
+        ContentVariation invariant)
+    {
+        // create content type with a property type that varies by culture
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        // content type supports all variations
+        contentType.Variations = ContentVariation.Culture | ContentVariation.Segment;
+        var properties = CreatePropertyCollection(("title", variant));
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        // compose this from the other one
+        var contentType2 = ContentTypeBuilder.CreateBasicContentType("test");
+        contentType2.Variations = contentType.Variations;
+        contentType2.AddContentType(contentType);
+        ContentTypeService.Save(contentType2);
+
+        // create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+        doc.SetCultureName("Home", "en-US");
+        doc.SetValue("title", "hello world", "en-US");
+        ContentService.Save(doc);
+
+        IContent doc2 = ContentBuilder.CreateBasicContent(contentType2);
+        doc2.SetCultureName("Home", "en-US");
+        doc2.SetValue("title", "hello world", "en-US");
+        ContentService.Save(doc2);
+
+        // change the property type to be invariant
+        contentType.PropertyTypes.First().Variations = invariant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+        doc2 = ContentService.GetById(doc2.Id); // re-get
+
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+        Assert.AreEqual("hello world", doc2.GetValue("title"));
+
+        // change back property type to be variant
+        contentType.PropertyTypes.First().Variations = variant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+        doc2 = ContentService.GetById(doc2.Id); // re-get
+
+        Assert.AreEqual("hello world", doc.GetValue("title", "en-US"));
+        Assert.AreEqual("hello world", doc2.GetValue("title", "en-US"));
+    }
+
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
+    public void Change_Content_Type_From_Variant_Invariant_On_A_Composition(ContentVariation variant,
+        ContentVariation invariant)
+    {
+        // create content type with a property type that varies by culture
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        contentType.Variations = variant;
+        var properties = CreatePropertyCollection(("title", ContentVariation.Culture));
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        // compose this from the other one
+        var contentType2 = ContentTypeBuilder.CreateBasicContentType("test");
+        contentType2.Variations = contentType.Variations;
+        contentType2.AddContentType(contentType);
+        ContentTypeService.Save(contentType2);
+
+        // create some content of this content type
+        IContent doc = ContentBuilder.CreateBasicContent(contentType);
+        doc.SetCultureName("Home", "en-US");
+        doc.SetValue("title", "hello world", "en-US");
+        ContentService.Save(doc);
+
+        IContent doc2 = ContentBuilder.CreateBasicContent(contentType2);
+        doc2.SetCultureName("Home", "en-US");
+        doc2.SetValue("title", "hello world", "en-US");
+        ContentService.Save(doc2);
+
+        // change the content type to be invariant
+        contentType.Variations = invariant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+        doc2 = ContentService.GetById(doc2.Id); // re-get
+
+        Assert.AreEqual("hello world", doc.GetValue("title"));
+        Assert.AreEqual("hello world", doc2.GetValue("title"));
+
+        // change back content type to be variant
+        contentType.Variations = variant;
+        ContentTypeService.Save(contentType);
+        doc = ContentService.GetById(doc.Id); // re-get
+        doc2 = ContentService.GetById(doc2.Id); // re-get
+
+        // this will be null because the doc type was changed back to variant but it's property types don't get changed back
+        Assert.IsNull(doc.GetValue("title", "en-US"));
+        Assert.IsNull(doc2.GetValue("title", "en-US"));
+    }
+
+    [Test]
+    public void Change_Variations_SimpleContentType_VariantToInvariantAndBack()
+    {
+        // one simple content type, variant, with both variant and invariant properties
+        // can change it to invariant and back
+        CreateFrenchAndEnglishLangs();
+
+        var contentType = CreateContentType(ContentVariation.Culture);
+
+        var properties = CreatePropertyCollection(
+            ("value1", ContentVariation.Culture),
+            ("value2", ContentVariation.Nothing));
+
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        var document = (IContent)new Content("document", -1, contentType);
+        document.SetCultureName("doc1en", "en");
+        document.SetCultureName("doc1fr", "fr");
+        document.SetValue("value1", "v1en", "en");
+        document.SetValue("value1", "v1fr", "fr");
+        document.SetValue("value2", "v2");
+        ContentService.Save(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch content type to Nothing
+        contentType.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.IsNull(document.GetCultureName("en"));
+        Assert.IsNull(document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1", "en"));
+        Assert.IsNull(document.GetValue("value1", "fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch content back to Culture
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1", "en"));
+        Assert.IsNull(document.GetValue("value1", "fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch property back to Culture
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
+    }
+
+    [Test]
+    public void Change_Variations_SimpleContentType_InvariantToVariantAndBack()
+    {
+        // one simple content type, invariant
+        // can change it to variant and back
+        // can then switch one property to variant
+        var globalSettings = new GlobalSettings();
+
+        var languageEn = new Language("en", "English") { IsDefault = true };
+        LocalizationService.Save(languageEn);
+        var languageFr = new Language("fr", "French");
+        LocalizationService.Save(languageFr);
+
+        var contentType = CreateContentType(ContentVariation.Nothing);
+
+        var properties = CreatePropertyCollection(
+            ("value1", ContentVariation.Nothing),
+            ("value2", ContentVariation.Nothing));
+
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        var document = (IContent)new Content("document", -1, contentType);
+        document.Name = "doc1";
+        document.SetValue("value1", "v1");
+        document.SetValue("value2", "v2");
+        ContentService.Save(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1", document.Name);
+        Assert.IsNull(document.GetCultureName("en"));
+        Assert.IsNull(document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1", "en"));
+        Assert.IsNull(document.GetValue("value1", "fr"));
+        Assert.AreEqual("v1", document.GetValue("value1"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch content type to Culture
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1", document.GetCultureName("en"));
+        Assert.IsNull(document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1", "en"));
+        Assert.IsNull(document.GetValue("value1", "fr"));
+        Assert.AreEqual("v1", document.GetValue("value1"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch property to Culture
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1", document.GetCultureName("en"));
+        Assert.IsNull(document.GetCultureName("fr"));
+        Assert.AreEqual("v1", document.GetValue("value1", "en"));
+        Assert.IsNull(document.GetValue("value1", "fr"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'c':'en','v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch content back to Nothing
+        contentType.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1", document.Name);
+        Assert.IsNull(document.GetCultureName("en"));
+        Assert.IsNull(document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1", "en"));
+        Assert.IsNull(document.GetValue("value1", "fr"));
+        Assert.AreEqual("v1", document.GetValue("value1"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'v':'v1'}],'value2':[{'v':'v2'}]},'cd':");
+    }
+
+    [Test]
+    public void Change_Variations_SimpleContentType_VariantPropertyToInvariantAndBack()
+    {
+        // one simple content type, variant, with both variant and invariant properties
+        // can change an invariant property to variant and back
+        CreateFrenchAndEnglishLangs();
+
+        var contentType = CreateContentType(ContentVariation.Culture);
+
+        var properties = CreatePropertyCollection(
+            ("value1", ContentVariation.Culture),
+            ("value2", ContentVariation.Nothing));
+
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        var document = (IContent)new Content("document", -1, contentType);
+        document.SetCultureName("doc1en", "en");
+        document.SetCultureName("doc1fr", "fr");
+        document.SetValue("value1", "v1en", "en");
+        document.SetValue("value1", "v1fr", "fr");
+        document.SetValue("value2", "v2");
+        ContentService.Save(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch property type to Nothing
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1", "en"));
+        Assert.IsNull(document.GetValue("value1", "fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'v':'v1en'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch property back to Culture
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+        Assert.AreEqual("v2", document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'v':'v2'}]},'cd':");
+
+        // switch other property to Culture
+        contentType.PropertyTypes.First(x => x.Alias == "value2").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+        Assert.AreEqual("v2", document.GetValue("value2", "en"));
+        Assert.IsNull(document.GetValue("value2", "fr"));
+        Assert.IsNull(document.GetValue("value2"));
+
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value1':[{'c':'en','v':'v1en'},{'c':'fr','v':'v1fr'}],'value2':[{'c':'en','v':'v2'}]},'cd':");
+    }
+
+    [TestCase(ContentVariation.Culture, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.Culture, ContentVariation.Segment)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Nothing)]
+    [TestCase(ContentVariation.CultureAndSegment, ContentVariation.Segment)]
+    public void Change_Property_Variations_From_Variant_To_Invariant_And_Ensure_Edited_Values_Are_Renormalized(
+        ContentVariation variant, ContentVariation invariant)
+    {
+        // one simple content type, variant, with both variant and invariant properties
+        // can change an invariant property to variant and back
+        CreateFrenchAndEnglishLangs();
+
+        var contentType = CreateContentType(ContentVariation.Culture | ContentVariation.Segment);
+
+        var properties = CreatePropertyCollection(("value1", variant));
+
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        IContent document = new Content("document", -1, contentType);
+        document.SetCultureName("doc1en", "en");
+        document.SetCultureName("doc1fr", "fr");
+        document.SetValue("value1", "v1en-init", "en");
+        document.SetValue("value1", "v1fr-init", "fr");
+        ContentService.SaveAndPublish(document); // all values are published which means the document is not 'edited'
+
+        document = ContentService.GetById(document.Id);
+        Assert.IsFalse(document.IsCultureEdited("en"));
+        Assert.IsFalse(document.IsCultureEdited("fr"));
+        Assert.IsFalse(document.Edited);
+
+        document.SetValue("value1", "v1en",
+            "en"); // change the property culture value, so now this culture will be edited
+        document.SetValue("value1", "v1fr",
+            "fr"); // change the property culture value, so now this culture will be edited
+        ContentService.Save(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1en-init", document.GetValue("value1", "en", published: true));
+        Assert.AreEqual("v1fr", document.GetValue("value1", "fr"));
+        Assert.AreEqual("v1fr-init", document.GetValue("value1", "fr", published: true));
+        Assert.IsTrue(
+            document.IsCultureEdited(
+                "en")); // This will be true because the edited value isn't the same as the published value
+        Assert.IsTrue(
+            document.IsCultureEdited(
+                "fr")); // This will be true because the edited value isn't the same as the published value
+        Assert.IsTrue(document.Edited);
+
+        // switch property type to Invariant
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = invariant;
+        ContentTypeService.Save(contentType); // This is going to have to re-normalize the "Edited" flag
+
+        document = ContentService.GetById(document.Id);
+        Assert.IsTrue(
+            document.IsCultureEdited(
+                "en")); // This will remain true because there is now a pending change for the invariant property data which is flagged under the default lang
+        Assert.IsFalse(
+            document.IsCultureEdited(
+                "fr")); // This will be false because nothing has changed for this culture and the property no longer reflects variant changes
+        Assert.IsTrue(document.Edited);
+
+        // update the invariant value and publish
+        document.SetValue("value1", "v1inv");
+        ContentService.SaveAndPublish(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1", "en")); // The values are there but the business logic returns null
+        Assert.IsNull(document.GetValue("value1", "fr")); // The values are there but the business logic returns null
+        Assert.IsNull(document.GetValue("value1", "en",
+            published: true)); // The values are there but the business logic returns null
+        Assert.IsNull(document.GetValue("value1", "fr",
+            published: true)); // The values are there but the business logic returns null
+        Assert.AreEqual("v1inv", document.GetValue("value1"));
+        Assert.AreEqual("v1inv", document.GetValue("value1", published: true));
+        Assert.IsFalse(document.IsCultureEdited("en")); // This returns false, everything is published
+        Assert.IsFalse(
+            document.IsCultureEdited(
+                "fr")); // This will be false because nothing has changed for this culture and the property no longer reflects variant changes
+        Assert.IsFalse(document.Edited);
+
+        // switch property back to Culture
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = variant;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("v1inv",
+            document.GetValue("value1", "en")); // The invariant property value gets copied over to the default language
+        Assert.AreEqual("v1inv", document.GetValue("value1", "en", published: true));
+        Assert.AreEqual("v1fr", document.GetValue("value1", "fr")); // values are still retained
+        Assert.AreEqual("v1fr-init", document.GetValue("value1", "fr", published: true)); // values are still retained
+        Assert.IsFalse(
+            document.IsCultureEdited(
+                "en")); // The invariant published AND edited values are copied over to the default language
+        Assert.IsTrue(
+            document.IsCultureEdited(
+                "fr")); // The previously existing french values are there and there is no published value
+        Assert.IsTrue(document.Edited); // Will be flagged edited again because the french culture had pending changes
+
+        // publish again
+        document.SetValue("value1", "v1en2", "en"); // update the value now that it's variant again
+        document.SetValue("value1", "v1fr2", "fr"); // update the value now that it's variant again
+        ContentService.SaveAndPublish(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en2", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1fr2", document.GetValue("value1", "fr"));
+        Assert.IsNull(document.GetValue("value1")); // The value is there but the business logic returns null
+        Assert.IsFalse(
+            document.IsCultureEdited("en")); // This returns false, the variant property value has been published
+        Assert.IsFalse(
+            document.IsCultureEdited("fr")); // This returns false, the variant property value has been published
+        Assert.IsFalse(document.Edited);
+    }
+
+    [TestCase(ContentVariation.Nothing, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Nothing, ContentVariation.CultureAndSegment)]
+    [TestCase(ContentVariation.Segment, ContentVariation.Culture)]
+    [TestCase(ContentVariation.Segment, ContentVariation.CultureAndSegment)]
+    public void Change_Property_Variations_From_Invariant_To_Variant_And_Ensure_Edited_Values_Are_Renormalized(
+        ContentVariation invariant, ContentVariation variant)
+    {
+        // one simple content type, variant, with both variant and invariant properties
+        // can change an invariant property to variant and back
+        CreateFrenchAndEnglishLangs();
+
+        var contentType = CreateContentType(ContentVariation.Culture | ContentVariation.Segment);
+
+        var properties = CreatePropertyCollection(("value1", invariant));
+
+        contentType.PropertyGroups.Add(new PropertyGroup(properties) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(contentType);
+
+        var document = (IContent)new Content("document", -1, contentType);
+        document.SetCultureName("doc1en", "en");
+        document.SetCultureName("doc1fr", "fr");
+        document.SetValue("value1", "v1en-init");
+        ContentService.SaveAndPublish(document); // all values are published which means the document is not 'edited'
+
+        document = ContentService.GetById(document.Id);
+        Assert.IsFalse(document.IsCultureEdited("en"));
+        Assert.IsFalse(document.IsCultureEdited("fr"));
+        Assert.IsFalse(document.Edited);
+
+        document.SetValue("value1",
+            "v1en"); // change the property value, so now the invariant (default) culture will be edited
+        ContentService.Save(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.AreEqual("v1en", document.GetValue("value1"));
+        Assert.AreEqual("v1en-init", document.GetValue("value1", published: true));
+        Assert.IsTrue(
+            document.IsCultureEdited(
+                "en")); // This is true because the invariant property reflects changes on the default lang
+        Assert.IsFalse(document.IsCultureEdited("fr"));
+        Assert.IsTrue(document.Edited);
+
+        // switch property type to Culture
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = variant;
+        ContentTypeService.Save(contentType); // This is going to have to re-normalize the "Edited" flag
+
+        document = ContentService.GetById(document.Id);
+        Assert.IsTrue(document.IsCultureEdited("en")); // Remains true
+        Assert.IsFalse(document.IsCultureEdited("fr")); // False because no french property has ever been edited
+        Assert.IsTrue(document.Edited);
+
+        // update the culture value and publish
+        document.SetValue("value1", "v1en2", "en");
+        ContentService.SaveAndPublish(document);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("doc1en", document.Name);
+        Assert.AreEqual("doc1en", document.GetCultureName("en"));
+        Assert.AreEqual("doc1fr", document.GetCultureName("fr"));
+        Assert.IsNull(document.GetValue("value1")); // The values are there but the business logic returns null
+        Assert.IsNull(document.GetValue("value1",
+            published: true)); // The values are there but the business logic returns null
+        Assert.AreEqual("v1en2", document.GetValue("value1", "en"));
+        Assert.AreEqual("v1en2", document.GetValue("value1", "en", published: true));
+        Assert.IsFalse(document.IsCultureEdited("en")); // This returns false, everything is published
+        Assert.IsFalse(document.IsCultureEdited("fr")); // False because no french property has ever been edited
+        Assert.IsFalse(document.Edited);
+
+        // switch property back to Invariant
+        contentType.PropertyTypes.First(x => x.Alias == "value1").Variations = invariant;
+        ContentTypeService.Save(contentType);
+
+        document = ContentService.GetById(document.Id);
+        Assert.AreEqual("v1en2",
+            document.GetValue("value1")); // The variant property value gets copied over to the invariant
+        Assert.AreEqual("v1en2", document.GetValue("value1", published: true));
+        Assert.IsNull(document.GetValue("value1", "fr")); // The values are there but the business logic returns null
+        Assert.IsNull(document.GetValue("value1", "fr",
+            published: true)); // The values are there but the business logic returns null
+        Assert.IsFalse(
+            document.IsCultureEdited("en")); // The variant published AND edited values are copied over to the invariant
+        Assert.IsFalse(document.IsCultureEdited("fr"));
+        Assert.IsFalse(document.Edited);
+    }
+
+    [Test]
+    public void Change_Variations_ComposedContentType_1()
+    {
+        // one composing content type, variant, with both variant and invariant properties
+        // one composed content type, variant, with both variant and invariant properties
+        // can change the composing content type to invariant and back
+        // can change the composed content type to invariant and back
+        CreateFrenchAndEnglishLangs();
+
+        var composing = CreateContentType(ContentVariation.Culture, "composing");
+
+        var properties1 = CreatePropertyCollection(
+            ("value11", ContentVariation.Culture),
+            ("value12", ContentVariation.Nothing));
+
+        composing.PropertyGroups.Add(new PropertyGroup(properties1) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(composing);
+
+        var composed = CreateContentType(ContentVariation.Culture, "composed");
+
+        var properties2 = CreatePropertyCollection(
+            ("value21", ContentVariation.Culture),
+            ("value22", ContentVariation.Nothing));
+
+        composed.PropertyGroups.Add(new PropertyGroup(properties2) { Alias = "content", Name = "Content" });
+        composed.AddContentType(composing);
+        ContentTypeService.Save(composed);
+
+        var document = (IContent)new Content("document", -1, composed);
+        document.SetCultureName("doc1en", "en");
+        document.SetCultureName("doc1fr", "fr");
+        document.SetValue("value11", "v11en", "en");
+        document.SetValue("value11", "v11fr", "fr");
+        document.SetValue("value12", "v12");
+        document.SetValue("value21", "v21en", "en");
+        document.SetValue("value21", "v21fr", "fr");
+        document.SetValue("value22", "v22");
+        ContentService.Save(document);
+
+        // both value11 and value21 are variant
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        composed.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(composed);
+
+        // both value11 and value21 are invariant
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
+
+        composed.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composed);
+
+        // value11 is variant again, but value21 is still invariant
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
+
+        composed.PropertyTypes.First(x => x.Alias == "value21").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composed);
+
+        // we can make it variant again
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        composing.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(composing);
+
+        // value11 is invariant
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        composing.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composing);
+
+        // value11 is still invariant
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        composing.PropertyTypes.First(x => x.Alias == "value11").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composing);
+
+        // we can make it variant again
+        Console.WriteLine(GetJson(document.Id));
+        AssertJsonStartsWith(
+            document.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+    }
+
+    [Test]
+    public void Change_Variations_ComposedContentType_2()
+    {
+        // one composing content type, variant, with both variant and invariant properties
+        // one composed content type, variant, with both variant and invariant properties
+        // one composed content type, invariant
+        // can change the composing content type to invariant and back
+        // can change the variant composed content type to invariant and back
+        CreateFrenchAndEnglishLangs();
+
+        var composing = CreateContentType(ContentVariation.Culture, "composing");
+
+        var properties1 = CreatePropertyCollection(
+            ("value11", ContentVariation.Culture),
+            ("value12", ContentVariation.Nothing));
+
+        composing.PropertyGroups.Add(new PropertyGroup(properties1) { Alias = "content", Name = "Content" });
+        ContentTypeService.Save(composing);
+
+        var composed1 = CreateContentType(ContentVariation.Culture, "composed1");
+
+        var properties2 = CreatePropertyCollection(
+            ("value21", ContentVariation.Culture),
+            ("value22", ContentVariation.Nothing));
+
+        composed1.PropertyGroups.Add(new PropertyGroup(properties2) { Alias = "content", Name = "Content" });
+        composed1.AddContentType(composing);
+        ContentTypeService.Save(composed1);
+
+        var composed2 = CreateContentType(ContentVariation.Nothing, "composed2");
+
+        var properties3 = CreatePropertyCollection(
+            ("value31", ContentVariation.Nothing),
+            ("value32", ContentVariation.Nothing));
+
+        composed2.PropertyGroups.Add(new PropertyGroup(properties3) { Alias = "content", Name = "Content" });
+        composed2.AddContentType(composing);
+        ContentTypeService.Save(composed2);
+
+        var document1 = (IContent)new Content("document1", -1, composed1);
+        document1.SetCultureName("doc1en", "en");
+        document1.SetCultureName("doc1fr", "fr");
+        document1.SetValue("value11", "v11en", "en");
+        document1.SetValue("value11", "v11fr", "fr");
+        document1.SetValue("value12", "v12");
+        document1.SetValue("value21", "v21en", "en");
+        document1.SetValue("value21", "v21fr", "fr");
+        document1.SetValue("value22", "v22");
+        ContentService.Save(document1);
+
+        var document2 = (IContent)new Content("document2", -1, composed2);
+        document2.Name = "doc2";
+        document2.SetValue("value11", "v11");
+        document2.SetValue("value12", "v12");
+        document2.SetValue("value31", "v31");
+        document2.SetValue("value32", "v32");
+        ContentService.Save(document2);
+
+        // both value11 and value21 are variant
+        Console.WriteLine(GetJson(document1.Id));
+        AssertJsonStartsWith(
+            document1.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        Console.WriteLine(GetJson(document2.Id));
+        AssertJsonStartsWith(
+            document2.Id,
+            "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
+
+        composed1.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(composed1);
+
+        // both value11 and value21 are invariant
+        Console.WriteLine(GetJson(document1.Id));
+        AssertJsonStartsWith(
+            document1.Id,
+            "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
+
+        Console.WriteLine(GetJson(document2.Id));
+        AssertJsonStartsWith(
+            document2.Id,
+            "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
+
+        composed1.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composed1);
+
+        // value11 is variant again, but value21 is still invariant
+        Console.WriteLine(GetJson(document1.Id));
+        AssertJsonStartsWith(
+            document1.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'v':'v21en'}],'value22':[{'v':'v22'}]},'cd':");
+
+        Console.WriteLine(GetJson(document2.Id));
+        AssertJsonStartsWith(
+            document2.Id,
+            "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
+
+        composed1.PropertyTypes.First(x => x.Alias == "value21").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composed1);
+
+        // we can make it variant again
+        Console.WriteLine(GetJson(document1.Id));
+        AssertJsonStartsWith(
+            document1.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        Console.WriteLine(GetJson(document2.Id));
+        AssertJsonStartsWith(
+            document2.Id,
+            "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
+
+        composing.Variations = ContentVariation.Nothing;
+        ContentTypeService.Save(composing);
+
+        // value11 is invariant
+        Console.WriteLine(GetJson(document1.Id));
+        AssertJsonStartsWith(
+            document1.Id,
+            "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        Console.WriteLine(GetJson(document2.Id));
+        AssertJsonStartsWith(
+            document2.Id,
+            "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
+
+        composing.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composing);
+
+        // value11 is still invariant
+        Console.WriteLine(GetJson(document1.Id));
+        AssertJsonStartsWith(
+            document1.Id,
+            "{'pd':{'value11':[{'v':'v11en'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        Console.WriteLine(GetJson(document2.Id));
+        AssertJsonStartsWith(
+            document2.Id,
+            "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
+
+        composing.PropertyTypes.First(x => x.Alias == "value11").Variations = ContentVariation.Culture;
+        ContentTypeService.Save(composing);
+
+        // we can make it variant again
+        Console.WriteLine(GetJson(document1.Id));
+        AssertJsonStartsWith(
+            document1.Id,
+            "{'pd':{'value11':[{'c':'en','v':'v11en'},{'c':'fr','v':'v11fr'}],'value12':[{'v':'v12'}],'value21':[{'c':'en','v':'v21en'},{'c':'fr','v':'v21fr'}],'value22':[{'v':'v22'}]},'cd':");
+
+        Console.WriteLine(GetJson(document2.Id));
+        AssertJsonStartsWith(
+            document2.Id,
+            "{'pd':{'value11':[{'v':'v11'}],'value12':[{'v':'v12'}],'value31':[{'v':'v31'}],'value32':[{'v':'v32'}]},'cd':");
+    }
+
+    private void CreateFrenchAndEnglishLangs()
+    {
+        var languageEn = new Language("en", "English") { IsDefault = true };
+        LocalizationService.Save(languageEn);
+        var languageFr = new Language("fr", "French");
+        LocalizationService.Save(languageFr);
+    }
+
+    private IContentType CreateContentType(ContentVariation variance, string alias = "contentType") =>
+        new ContentType(ShortStringHelper, -1) { Alias = alias, Name = alias, Variations = variance };
+
+    private PropertyTypeCollection CreatePropertyCollection(params (string alias, ContentVariation variance)[] props)
+    {
+        var propertyCollection = new PropertyTypeCollection(true);
+
+        foreach ((var alias, var variance) in props)
+        {
+            propertyCollection.Add(new PropertyType(ShortStringHelper, alias, ValueStorageType.Ntext)
+            {
+                Alias = alias,
+                DataTypeId = -88,
+                Variations = variance
+            });
+        }
+
+        return propertyCollection;
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentVersionCleanupServiceTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentVersionCleanupServiceTest.cs
index 23bcd6ded2..3e58ca9030 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentVersionCleanupServiceTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentVersionCleanupServiceTest.cs
@@ -2,121 +2,121 @@ using System;
 using System.Diagnostics;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+internal class ContentVersionCleanupServiceTest : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    internal class ContentVersionCleanupServiceTest : UmbracoIntegrationTest
+    public IFileService FileService => GetRequiredService<IFileService>();
+
+    public IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    public IContentService ContentService => GetRequiredService<IContentService>();
+
+    public IContentVersionService ContentVersionService => GetRequiredService<IContentVersionService>();
+
+    /// <remarks>
+    ///     This is covered by the unit tests, but nice to know it deletes on infra.
+    ///     And proves implementation is compatible with SQL CE.
+    /// </remarks>
+    [Test]
+    public void PerformContentVersionCleanup_WithNoKeepPeriods_DeletesEverythingExceptActive()
     {
-        public IFileService FileService => GetRequiredService<IFileService>();
+        // For reference, Our currently has
+        // 5000 Documents
+        // With 200K Versions
+        // With 11M Property data
 
-        public IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        public IContentService ContentService => GetRequiredService<IContentService>();
+        var contentTypeA =
+            ContentTypeBuilder.CreateSimpleContentType("contentTypeA", "contentTypeA", defaultTemplateId: template.Id);
 
-        public IContentVersionService ContentVersionService => GetRequiredService<IContentVersionService>();
+        // Kill all historic
+        contentTypeA.HistoryCleanup.PreventCleanup = false;
+        contentTypeA.HistoryCleanup.KeepAllVersionsNewerThanDays = 0;
+        contentTypeA.HistoryCleanup.KeepLatestVersionPerDayForDays = 0;
 
-        /// <remarks>
-        ///     This is covered by the unit tests, but nice to know it deletes on infra.
-        ///     And proves implementation is compatible with SQL CE.
-        /// </remarks>
-        [Test]
-        public void PerformContentVersionCleanup_WithNoKeepPeriods_DeletesEverythingExceptActive()
+        ContentTypeService.Save(contentTypeA);
+
+        var content = ContentBuilder.CreateSimpleContent(contentTypeA);
+        ContentService.SaveAndPublish(content);
+
+        for (var i = 0; i < 10; i++)
         {
-            // For reference, Our currently has
-            // 5000 Documents
-            // With 200K Versions
-            // With 11M Property data
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-
-            ContentType contentTypeA = ContentTypeBuilder.CreateSimpleContentType("contentTypeA", "contentTypeA", defaultTemplateId: template.Id);
-
-            // Kill all historic
-            contentTypeA.HistoryCleanup.PreventCleanup = false;
-            contentTypeA.HistoryCleanup.KeepAllVersionsNewerThanDays = 0;
-            contentTypeA.HistoryCleanup.KeepLatestVersionPerDayForDays = 0;
-
-            ContentTypeService.Save(contentTypeA);
-
-            Content content = ContentBuilder.CreateSimpleContent(contentTypeA);
             ContentService.SaveAndPublish(content);
-
-            for (var i = 0; i < 10; i++)
-            {
-                ContentService.SaveAndPublish(content);
-            }
-
-            Report before = GetReport();
-
-            Debug.Assert(before.ContentVersions == 12); // 10 historic + current draft + current published
-            Debug.Assert(before.PropertyData == 12 * 3); // CreateSimpleContentType = 3 props
-
-            ContentVersionService.PerformContentVersionCleanup(DateTime.Now.AddHours(1));
-
-            Report after = GetReport();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(2, after.ContentVersions); // current draft, current published
-                Assert.AreEqual(2, after.DocumentVersions);
-                Assert.AreEqual(6, after.PropertyData); // CreateSimpleContentType = 3 props
-            });
         }
 
-        private Report GetReport()
+        var before = GetReport();
+
+        Debug.Assert(before.ContentVersions == 12); // 10 historic + current draft + current published
+        Debug.Assert(before.PropertyData == 12 * 3); // CreateSimpleContentType = 3 props
+
+        ContentVersionService.PerformContentVersionCleanup(DateTime.Now.AddHours(1));
+
+        var after = GetReport();
+
+        Assert.Multiple(() =>
         {
-            using (IScope scope = ScopeProvider.CreateScope(autoComplete: true))
+            Assert.AreEqual(2, after.ContentVersions); // current draft, current published
+            Assert.AreEqual(2, after.DocumentVersions);
+            Assert.AreEqual(6, after.PropertyData); // CreateSimpleContentType = 3 props
+        });
+    }
+
+    private Report GetReport()
+    {
+        using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+        {
+            // SQL CE is fun!
+            var contentVersions =
+                ScopeAccessor.AmbientScope.Database.Single<int>(@"select count(1) from umbracoContentVersion");
+            var documentVersions =
+                ScopeAccessor.AmbientScope.Database.Single<int>(@"select count(1) from umbracoDocumentVersion");
+            var propertyData =
+                ScopeAccessor.AmbientScope.Database.Single<int>(@"select count(1) from umbracoPropertyData");
+
+            return new Report
             {
-                // SQL CE is fun!
-                var contentVersions = ScopeAccessor.AmbientScope.Database.Single<int>(@"select count(1) from umbracoContentVersion");
-                var documentVersions = ScopeAccessor.AmbientScope.Database.Single<int>(@"select count(1) from umbracoDocumentVersion");
-                var propertyData = ScopeAccessor.AmbientScope.Database.Single<int>(@"select count(1) from umbracoPropertyData");
-
-                return new Report
-                {
-                    ContentVersions = contentVersions,
-                    DocumentVersions = documentVersions,
-                    PropertyData = propertyData
-                };
-            }
-        }
-
-        private void InsertCleanupPolicy(IContentType contentType, int daysToKeepAll, int daysToRollupAll, bool preventCleanup = false)
-        {
-            using (IScope scope = ScopeProvider.CreateScope(autoComplete: true))
-            {
-                var entity = new ContentVersionCleanupPolicyDto
-                {
-                    ContentTypeId = contentType.Id,
-                    KeepAllVersionsNewerThanDays = daysToKeepAll,
-                    KeepLatestVersionPerDayForDays = daysToRollupAll,
-                    PreventCleanup = preventCleanup,
-                    Updated = DateTime.Today
-                };
-
-                ScopeAccessor.AmbientScope.Database.Insert(entity);
-            }
-        }
-
-        private class Report
-        {
-            public int ContentVersions { get; set; }
-
-            public int DocumentVersions { get; set; }
-
-            public int PropertyData { get; set; }
+                ContentVersions = contentVersions,
+                DocumentVersions = documentVersions,
+                PropertyData = propertyData
+            };
         }
     }
+
+    private void InsertCleanupPolicy(IContentType contentType, int daysToKeepAll, int daysToRollupAll,
+        bool preventCleanup = false)
+    {
+        using (var scope = ScopeProvider.CreateScope(autoComplete: true))
+        {
+            var entity = new ContentVersionCleanupPolicyDto
+            {
+                ContentTypeId = contentType.Id,
+                KeepAllVersionsNewerThanDays = daysToKeepAll,
+                KeepLatestVersionPerDayForDays = daysToRollupAll,
+                PreventCleanup = preventCleanup,
+                Updated = DateTime.Today
+            };
+
+            ScopeAccessor.AmbientScope.Database.Insert(entity);
+        }
+    }
+
+    private class Report
+    {
+        public int ContentVersions { get; set; }
+
+        public int DocumentVersions { get; set; }
+
+        public int PropertyData { get; set; }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs
index 68b5119b02..21b9c0a68a 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/DataTypeServiceTests.cs
@@ -2,9 +2,7 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -14,74 +12,85 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+/// <summary>
+///     Tests covering the DataTypeService
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class DataTypeServiceTests : UmbracoIntegrationTest
 {
-    /// <summary>
-    /// Tests covering the DataTypeService
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class DataTypeServiceTests : UmbracoIntegrationTest
+    private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer =>
+        GetRequiredService<IConfigurationEditorJsonSerializer>();
+
+    [Test]
+    public void DataTypeService_Can_Persist_New_DataTypeDefinition()
     {
-        private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+        // Act
+        IDataType dataType =
+            new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer)
+            {
+                Name = "Testing Textfield",
+                DatabaseType = ValueStorageType.Ntext
+            };
+        DataTypeService.Save(dataType);
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        // Assert
+        Assert.That(dataType, Is.Not.Null);
+        Assert.That(dataType.HasIdentity, Is.True);
 
-        private IFileService FileService => GetRequiredService<IFileService>();
+        dataType = DataTypeService.GetDataType(dataType.Id);
+        Assert.That(dataType, Is.Not.Null);
+    }
 
-        private IConfigurationEditorJsonSerializer ConfigurationEditorJsonSerializer => GetRequiredService<IConfigurationEditorJsonSerializer>();
+    [Test]
+    public void DataTypeService_Can_Delete_Textfield_DataType_And_Clear_Usages()
+    {
+        // Arrange
+        var textfieldId = "Umbraco.Textbox";
+        var dataTypeDefinitions = DataTypeService.GetByEditorAlias(textfieldId);
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var doctype =
+            ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+        ContentTypeService.Save(doctype);
 
-        [Test]
-        public void DataTypeService_Can_Persist_New_DataTypeDefinition()
-        {
-            // Act
-            IDataType dataType = new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer) { Name = "Testing Textfield", DatabaseType = ValueStorageType.Ntext };
-            DataTypeService.Save(dataType);
+        // Act
+        var definition = dataTypeDefinitions.First();
+        var definitionId = definition.Id;
+        DataTypeService.Delete(definition);
 
-            // Assert
-            Assert.That(dataType, Is.Not.Null);
-            Assert.That(dataType.HasIdentity, Is.True);
+        var deletedDefinition = DataTypeService.GetDataType(definitionId);
 
-            dataType = DataTypeService.GetDataType(dataType.Id);
-            Assert.That(dataType, Is.Not.Null);
-        }
+        // Assert
+        Assert.That(deletedDefinition, Is.Null);
 
-        [Test]
-        public void DataTypeService_Can_Delete_Textfield_DataType_And_Clear_Usages()
-        {
-            // Arrange
-            string textfieldId = "Umbraco.Textbox";
-            IEnumerable<IDataType> dataTypeDefinitions = DataTypeService.GetByEditorAlias(textfieldId);
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType doctype = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-            ContentTypeService.Save(doctype);
+        // Further assertions against the ContentType that contains PropertyTypes based on the TextField
+        var contentType = ContentTypeService.Get(doctype.Id);
+        Assert.That(contentType.Alias, Is.EqualTo("umbTextpage"));
+        Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(1));
+    }
 
-            // Act
-            IDataType definition = dataTypeDefinitions.First();
-            int definitionId = definition.Id;
-            DataTypeService.Delete(definition);
+    [Test]
+    public void Cannot_Save_DataType_With_Empty_Name()
+    {
+        // Act
+        var dataTypeDefinition =
+            new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer)
+            {
+                Name = string.Empty,
+                DatabaseType = ValueStorageType.Ntext
+            };
 
-            IDataType deletedDefinition = DataTypeService.GetDataType(definitionId);
-
-            // Assert
-            Assert.That(deletedDefinition, Is.Null);
-
-            // Further assertions against the ContentType that contains PropertyTypes based on the TextField
-            IContentType contentType = ContentTypeService.Get(doctype.Id);
-            Assert.That(contentType.Alias, Is.EqualTo("umbTextpage"));
-            Assert.That(contentType.PropertyTypes.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void Cannot_Save_DataType_With_Empty_Name()
-        {
-            // Act
-            var dataTypeDefinition = new DataType(new LabelPropertyEditor(DataValueEditorFactory, IOHelper), ConfigurationEditorJsonSerializer) { Name = string.Empty, DatabaseType = ValueStorageType.Ntext };
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => DataTypeService.Save(dataTypeDefinition));
-        }
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => DataTypeService.Save(dataTypeDefinition));
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs
index a7fc3ca0e5..642cafcd49 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityServiceTests.cs
@@ -4,10 +4,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Services;
@@ -16,834 +14,843 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+/// <summary>
+///     Tests covering the EntityService
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
+public class EntityServiceTests : UmbracoIntegrationTest
 {
-    /// <summary>
-    /// Tests covering the EntityService
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)]
-    public class EntityServiceTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetupTestData()
     {
-        private Language _langFr;
-        private Language _langEs;
-
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
-
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-
-        private IContentService ContentService => GetRequiredService<IContentService>();
-
-        private IEntityService EntityService => GetRequiredService<IEntityService>();
-
-        private ISqlContext SqlContext => GetRequiredService<ISqlContext>();
-
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
-
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
-
-        private IFileService FileService => GetRequiredService<IFileService>();
-
-        [SetUp]
-        public void SetupTestData()
+        if (_langFr == null && _langEs == null)
         {
-            if (_langFr == null && _langEs == null)
-            {
-                _langFr = new Language("fr-FR", "French (France)");
-                _langEs = new Language("es-ES", "Spanish (Spain)");
-                LocalizationService.Save(_langFr);
-                LocalizationService.Save(_langEs);
-            }
-
-            CreateTestData();
+            _langFr = new Language("fr-FR", "French (France)");
+            _langEs = new Language("es-ES", "Spanish (Spain)");
+            LocalizationService.Save(_langFr);
+            LocalizationService.Save(_langEs);
         }
 
-        [Test]
-        public void EntityService_Can_Get_Paged_Descendants_Ordering_Path()
+        CreateTestData();
+    }
+
+    private Language _langFr;
+    private Language _langEs;
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private IEntityService EntityService => GetRequiredService<IEntityService>();
+
+    private ISqlContext SqlContext => GetRequiredService<ISqlContext>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Descendants_Ordering_Path()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        var root = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(root);
+        var rootId = root.Id;
+        var ids = new List<int>();
+        for (var i = 0; i < 10; i++)
         {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-
-            Content root = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(root);
-            int rootId = root.Id;
-            var ids = new List<int>();
-            for (int i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ContentService.Save(c1);
-                ids.Add(c1.Id);
-                root = c1; // make a hierarchy
-            }
-
-            IEntitySlim[] entities = EntityService.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 0, 6, out long total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[0], entities[0].Id);
-
-            entities = EntityService.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[6], entities[0].Id);
-
-            // Test ordering direction
-            entities = EntityService.GetPagedDescendants(
-                rootId,
-                UmbracoObjectTypes.Document,
-                0,
-                6,
-                out total,
-                ordering: Ordering.By("Path", Direction.Descending)).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[^1], entities[0].Id);
-
-            entities = EntityService.GetPagedDescendants(
-                rootId,
-                UmbracoObjectTypes.Document,
-                1,
-                6,
-                out total,
-                ordering: Ordering.By("Path", Direction.Descending)).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[ids.Count - 1 - 6], entities[0].Id);
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+            ContentService.Save(c1);
+            ids.Add(c1.Id);
+            root = c1; // make a hierarchy
         }
 
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Children()
+        var entities = EntityService.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 0, 6, out var total)
+            .ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[0], entities[0].Id);
+
+        entities = EntityService.GetPagedDescendants(rootId, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[6], entities[0].Id);
+
+        // Test ordering direction
+        entities = EntityService.GetPagedDescendants(
+            rootId,
+            UmbracoObjectTypes.Document,
+            0,
+            6,
+            out total,
+            ordering: Ordering.By("Path", Direction.Descending)).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[^1], entities[0].Id);
+
+        entities = EntityService.GetPagedDescendants(
+            rootId,
+            UmbracoObjectTypes.Document,
+            1,
+            6,
+            out total,
+            ordering: Ordering.By("Path", Direction.Descending)).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[ids.Count - 1 - 6], entities[0].Id);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Content_Children()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        var root = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(root);
+        var ids = new List<int>();
+        for (var i = 0; i < 10; i++)
         {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-
-            Content root = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(root);
-            var ids = new List<int>();
-            for (int i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ContentService.Save(c1);
-                ids.Add(c1.Id);
-            }
-
-            IEntitySlim[] entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out long total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[0], entities[0].Id);
-
-            entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[6], entities[0].Id);
-
-            // Test ordering direction
-            entities = EntityService.GetPagedChildren(
-                root.Id,
-                UmbracoObjectTypes.Document,
-                0,
-                6,
-                out total,
-                ordering: Ordering.By("SortOrder", Direction.Descending)).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[^1], entities[0].Id);
-
-            entities = EntityService.GetPagedChildren(
-                root.Id,
-                UmbracoObjectTypes.Document,
-                1,
-                6,
-                out total,
-                ordering: Ordering.By("SortOrder", Direction.Descending)).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-            Assert.AreEqual(ids[ids.Count - 1 - 6], entities[0].Id);
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+            ContentService.Save(c1);
+            ids.Add(c1.Id);
         }
 
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants()
-        {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
+        var entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 0, 6, out var total)
+            .ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[0], entities[0].Id);
 
-            Content root = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(root);
-            int count = 0;
-            for (int i = 0; i < 10; i++)
+        entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Document, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[6], entities[0].Id);
+
+        // Test ordering direction
+        entities = EntityService.GetPagedChildren(
+            root.Id,
+            UmbracoObjectTypes.Document,
+            0,
+            6,
+            out total,
+            ordering: Ordering.By("SortOrder", Direction.Descending)).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[^1], entities[0].Id);
+
+        entities = EntityService.GetPagedChildren(
+            root.Id,
+            UmbracoObjectTypes.Document,
+            1,
+            6,
+            out total,
+            ordering: Ordering.By("SortOrder", Direction.Descending)).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+        Assert.AreEqual(ids[ids.Count - 1 - 6], entities[0].Id);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Content_Descendants()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        var root = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(root);
+        var count = 0;
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+            ContentService.Save(c1);
+            count++;
+
+            for (var j = 0; j < 5; j++)
             {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ContentService.Save(c1);
+                var c2 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
+                ContentService.Save(c2);
                 count++;
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Content c2 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
-                    ContentService.Save(c2);
-                    count++;
-                }
-            }
-
-            IEntitySlim[] entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 31, out long total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(31));
-            Assert.That(total, Is.EqualTo(60));
-            entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 1, 31, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(29));
-            Assert.That(total, Is.EqualTo(60));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants_Including_Recycled()
-        {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-
-            Content root = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(root);
-            var toDelete = new List<IContent>();
-            for (int i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ContentService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Content c2 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
-                    ContentService.Save(c2);
-                }
-            }
-
-            foreach (IContent content in toDelete)
-            {
-                ContentService.MoveToRecycleBin(content);
-            }
-
-            // search at root to see if it returns recycled
-            int[] entities = EntityService.GetPagedDescendants(-1, UmbracoObjectTypes.Document, 0, 1000, out long total)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (IContent c in toDelete)
-            {
-                Assert.True(entities.Contains(c.Id));
             }
         }
 
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants_Without_Recycled()
+        var entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 0, 31, out var total)
+            .ToArray();
+        Assert.That(entities.Length, Is.EqualTo(31));
+        Assert.That(total, Is.EqualTo(60));
+        entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Document, 1, 31, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(29));
+        Assert.That(total, Is.EqualTo(60));
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Content_Descendants_Including_Recycled()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        var root = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(root);
+        var toDelete = new List<IContent>();
+        for (var i = 0; i < 10; i++)
         {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-
-            Content root = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(root);
-            var toDelete = new List<IContent>();
-            for (int i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                ContentService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Content c2 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
-                    ContentService.Save(c2);
-                }
-            }
-
-            foreach (IContent content in toDelete)
-            {
-                ContentService.MoveToRecycleBin(content);
-            }
-
-            // search at root to see if it returns recycled
-            int[] entities = EntityService.GetPagedDescendants(UmbracoObjectTypes.Document, 0, 1000, out long total, includeTrashed: false)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (IContent c in toDelete)
-            {
-                Assert.IsFalse(entities.Contains(c.Id));
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Content_Descendants_With_Search()
-        {
-            IContentType contentType = ContentTypeService.Get("umbTextpage");
-
-            Content root = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(root);
-
-            for (int i = 0; i < 10; i++)
-            {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, "ssss" + Guid.NewGuid(), root);
-                ContentService.Save(c1);
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Content c2 = ContentBuilder.CreateSimpleContent(contentType, "tttt" + Guid.NewGuid(), c1);
-                    ContentService.Save(c2);
-                }
-            }
-
-            IEntitySlim[] entities = EntityService.GetPagedDescendants(
-                root.Id,
-                UmbracoObjectTypes.Document,
-                0,
-                10,
-                out long total,
-                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("ssss"))).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(10));
-            Assert.That(total, Is.EqualTo(10));
-            entities = EntityService.GetPagedDescendants(
-                root.Id,
-                UmbracoObjectTypes.Document,
-                0,
-                50,
-                out total,
-                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("tttt"))).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(50));
-            Assert.That(total, Is.EqualTo(50));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Children()
-        {
-            IMediaType folderType = MediaTypeService.Get(1031);
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-
-            Media root = MediaBuilder.CreateMediaFolder(folderType, -1);
-            MediaService.Save(root);
-            for (int i = 0; i < 10; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
-                MediaService.Save(c1);
-            }
-
-            IEntitySlim[] entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 0, 6, out long total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants()
-        {
-            IMediaType folderType = MediaTypeService.Get(1031);
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-
-            Media root = MediaBuilder.CreateMediaFolder(folderType, -1);
-            MediaService.Save(root);
-            int count = 0;
-            for (int i = 0; i < 10; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
-                MediaService.Save(c1);
-                count++;
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Media c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
-                    MediaService.Save(c2);
-                    count++;
-                }
-            }
-
-            IEntitySlim[] entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 31, out long total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(31));
-            Assert.That(total, Is.EqualTo(60));
-            entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 1, 31, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(29));
-            Assert.That(total, Is.EqualTo(60));
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants_Including_Recycled()
-        {
-            IMediaType folderType = MediaTypeService.Get(1031);
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-
-            Media root = MediaBuilder.CreateMediaFolder(folderType, -1);
-            MediaService.Save(root);
-            var toDelete = new List<IMedia>();
-            for (int i = 0; i < 10; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
-                MediaService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Media c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
-                    MediaService.Save(c2);
-                }
-            }
-
-            foreach (IMedia content in toDelete)
-            {
-                MediaService.MoveToRecycleBin(content);
-            }
-
-            // search at root to see if it returns recycled
-            int[] entities = EntityService.GetPagedDescendants(-1, UmbracoObjectTypes.Media, 0, 1000, out long total)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (IMedia media in toDelete)
-            {
-                Assert.IsTrue(entities.Contains(media.Id));
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants_Without_Recycled()
-        {
-            IMediaType folderType = MediaTypeService.Get(1031);
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-
-            Media root = MediaBuilder.CreateMediaFolder(folderType, -1);
-            MediaService.Save(root);
-            var toDelete = new List<IMedia>();
-            for (int i = 0; i < 10; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
-                MediaService.Save(c1);
-
-                if (i % 2 == 0)
-                {
-                    toDelete.Add(c1);
-                }
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Media c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
-                    MediaService.Save(c2);
-                }
-            }
-
-            foreach (IMedia content in toDelete)
-            {
-                MediaService.MoveToRecycleBin(content);
-            }
-
-            // search at root to see if it returns recycled
-            int[] entities = EntityService.GetPagedDescendants(UmbracoObjectTypes.Media, 0, 1000, out long total, includeTrashed: false)
-                .Select(x => x.Id)
-                .ToArray();
-
-            foreach (IMedia media in toDelete)
-            {
-                Assert.IsFalse(entities.Contains(media.Id));
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Paged_Media_Descendants_With_Search()
-        {
-            IMediaType folderType = MediaTypeService.Get(1031);
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-
-            Media root = MediaBuilder.CreateMediaFolder(folderType, -1);
-            MediaService.Save(root);
-
-            for (int i = 0; i < 10; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
-                c1.Name = "ssss" + Guid.NewGuid();
-                MediaService.Save(c1);
-
-                for (int j = 0; j < 5; j++)
-                {
-                    Media c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
-                    c2.Name = "tttt" + Guid.NewGuid();
-                    MediaService.Save(c2);
-                }
-            }
-
-            IEntitySlim[] entities = EntityService.GetPagedDescendants(
-                root.Id,
-                UmbracoObjectTypes.Media,
-                0,
-                10,
-                out long total,
-                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("ssss"))).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(10));
-            Assert.That(total, Is.EqualTo(10));
-            entities = EntityService.GetPagedDescendants(
-                root.Id,
-                UmbracoObjectTypes.Media,
-                0,
-                50,
-                out total,
-                filter: SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("tttt"))).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(50));
-            Assert.That(total, Is.EqualTo(50));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Content_By_UmbracoObjectTypes()
-        {
-            IEntitySlim[] entities = EntityService.GetAll(UmbracoObjectTypes.Document).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.True);
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Content_By_UmbracoObjectType_Id()
-        {
-            Guid objectTypeId = Constants.ObjectTypes.Document;
-            IEntitySlim[] entities = EntityService.GetAll(objectTypeId).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.True);
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Content_By_Type()
-        {
-            IEntitySlim[] entities = EntityService.GetAll<IContent>().ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.True);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Child_Content_By_ParentId_And_UmbracoObjectType()
-        {
-            IEntitySlim[] entities = EntityService.GetChildren(-1, UmbracoObjectTypes.Document).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(1));
-            Assert.That(entities.Any(x => x.Trashed), Is.False);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Content_By_UmbracoObjectType_With_Variant_Names()
-        {
-            string alias = "test" + Guid.NewGuid();
-            Template template = TemplateBuilder.CreateTextPageTemplate(alias);
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            Content c1 = ContentBuilder.CreateSimpleContent(contentType, "Test", -1);
-            c1.SetCultureName("Test - FR", _langFr.IsoCode);
-            c1.SetCultureName("Test - ES", _langEs.IsoCode);
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
             ContentService.Save(c1);
 
-            IEntitySlim result = EntityService.Get(c1.Id, UmbracoObjectTypes.Document);
-            Assert.AreEqual("Test - FR", result.Name); // got name from default culture
-            Assert.IsNotNull(result as IDocumentEntitySlim);
-            var doc = (IDocumentEntitySlim)result;
-            IReadOnlyDictionary<string, string> cultureNames = doc.CultureNames;
-            Assert.AreEqual("Test - FR", cultureNames[_langFr.IsoCode]);
-            Assert.AreEqual("Test - ES", cultureNames[_langEs.IsoCode]);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Child_Content_By_ParentId_And_UmbracoObjectType_With_Variant_Names()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
-            contentType.Variations = ContentVariation.Culture;
-            ContentTypeService.Save(contentType);
-
-            Content root = ContentBuilder.CreateSimpleContent(contentType);
-            root.SetCultureName("Root", _langFr.IsoCode); // else cannot save
-            ContentService.Save(root);
-
-            for (int i = 0; i < 10; i++)
+            if (i % 2 == 0)
             {
-                Content c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
-                if (i % 2 == 0)
-                {
-                    c1.SetCultureName("Test " + i + " - FR", _langFr.IsoCode);
-                    c1.SetCultureName("Test " + i + " - ES", _langEs.IsoCode);
-                }
-                else
-                {
-                    c1.SetCultureName("Test", _langFr.IsoCode); // else cannot save
-                }
-
-                ContentService.Save(c1);
+                toDelete.Add(c1);
             }
 
-            IEntitySlim[] entities = EntityService.GetChildren(root.Id, UmbracoObjectTypes.Document).ToArray();
+            for (var j = 0; j < 5; j++)
+            {
+                var c2 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
+                ContentService.Save(c2);
+            }
+        }
 
-            Assert.AreEqual(10, entities.Length);
+        foreach (var content in toDelete)
+        {
+            ContentService.MoveToRecycleBin(content);
+        }
 
-            for (int i = 0; i < entities.Length; i++)
+        // search at root to see if it returns recycled
+        var entities = EntityService.GetPagedDescendants(-1, UmbracoObjectTypes.Document, 0, 1000, out var total)
+            .Select(x => x.Id)
+            .ToArray();
+
+        foreach (var c in toDelete)
+        {
+            Assert.True(entities.Contains(c.Id));
+        }
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Content_Descendants_Without_Recycled()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        var root = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(root);
+        var toDelete = new List<IContent>();
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+            ContentService.Save(c1);
+
+            if (i % 2 == 0)
+            {
+                toDelete.Add(c1);
+            }
+
+            for (var j = 0; j < 5; j++)
+            {
+                var c2 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), c1);
+                ContentService.Save(c2);
+            }
+        }
+
+        foreach (var content in toDelete)
+        {
+            ContentService.MoveToRecycleBin(content);
+        }
+
+        // search at root to see if it returns recycled
+        var entities = EntityService
+            .GetPagedDescendants(UmbracoObjectTypes.Document, 0, 1000, out var total, includeTrashed: false)
+            .Select(x => x.Id)
+            .ToArray();
+
+        foreach (var c in toDelete)
+        {
+            Assert.IsFalse(entities.Contains(c.Id));
+        }
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Content_Descendants_With_Search()
+    {
+        var contentType = ContentTypeService.Get("umbTextpage");
+
+        var root = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(root);
+
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, "ssss" + Guid.NewGuid(), root);
+            ContentService.Save(c1);
+
+            for (var j = 0; j < 5; j++)
+            {
+                var c2 = ContentBuilder.CreateSimpleContent(contentType, "tttt" + Guid.NewGuid(), c1);
+                ContentService.Save(c2);
+            }
+        }
+
+        var entities = EntityService.GetPagedDescendants(
+            root.Id,
+            UmbracoObjectTypes.Document,
+            0,
+            10,
+            out var total,
+            SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("ssss"))).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(10));
+        Assert.That(total, Is.EqualTo(10));
+        entities = EntityService.GetPagedDescendants(
+            root.Id,
+            UmbracoObjectTypes.Document,
+            0,
+            50,
+            out total,
+            SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("tttt"))).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(50));
+        Assert.That(total, Is.EqualTo(50));
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Media_Children()
+    {
+        var folderType = MediaTypeService.Get(1031);
+        var imageMediaType = MediaTypeService.Get(1032);
+
+        var root = MediaBuilder.CreateMediaFolder(folderType, -1);
+        MediaService.Save(root);
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
+            MediaService.Save(c1);
+        }
+
+        var entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 0, 6, out var total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        entities = EntityService.GetPagedChildren(root.Id, UmbracoObjectTypes.Media, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Media_Descendants()
+    {
+        var folderType = MediaTypeService.Get(1031);
+        var imageMediaType = MediaTypeService.Get(1032);
+
+        var root = MediaBuilder.CreateMediaFolder(folderType, -1);
+        MediaService.Save(root);
+        var count = 0;
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
+            MediaService.Save(c1);
+            count++;
+
+            for (var j = 0; j < 5; j++)
+            {
+                var c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
+                MediaService.Save(c2);
+                count++;
+            }
+        }
+
+        var entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 0, 31, out var total)
+            .ToArray();
+        Assert.That(entities.Length, Is.EqualTo(31));
+        Assert.That(total, Is.EqualTo(60));
+        entities = EntityService.GetPagedDescendants(root.Id, UmbracoObjectTypes.Media, 1, 31, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(29));
+        Assert.That(total, Is.EqualTo(60));
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Media_Descendants_Including_Recycled()
+    {
+        var folderType = MediaTypeService.Get(1031);
+        var imageMediaType = MediaTypeService.Get(1032);
+
+        var root = MediaBuilder.CreateMediaFolder(folderType, -1);
+        MediaService.Save(root);
+        var toDelete = new List<IMedia>();
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
+            MediaService.Save(c1);
+
+            if (i % 2 == 0)
+            {
+                toDelete.Add(c1);
+            }
+
+            for (var j = 0; j < 5; j++)
+            {
+                var c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
+                MediaService.Save(c2);
+            }
+        }
+
+        foreach (var content in toDelete)
+        {
+            MediaService.MoveToRecycleBin(content);
+        }
+
+        // search at root to see if it returns recycled
+        var entities = EntityService.GetPagedDescendants(-1, UmbracoObjectTypes.Media, 0, 1000, out var total)
+            .Select(x => x.Id)
+            .ToArray();
+
+        foreach (var media in toDelete)
+        {
+            Assert.IsTrue(entities.Contains(media.Id));
+        }
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Media_Descendants_Without_Recycled()
+    {
+        var folderType = MediaTypeService.Get(1031);
+        var imageMediaType = MediaTypeService.Get(1032);
+
+        var root = MediaBuilder.CreateMediaFolder(folderType, -1);
+        MediaService.Save(root);
+        var toDelete = new List<IMedia>();
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
+            MediaService.Save(c1);
+
+            if (i % 2 == 0)
+            {
+                toDelete.Add(c1);
+            }
+
+            for (var j = 0; j < 5; j++)
+            {
+                var c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
+                MediaService.Save(c2);
+            }
+        }
+
+        foreach (var content in toDelete)
+        {
+            MediaService.MoveToRecycleBin(content);
+        }
+
+        // search at root to see if it returns recycled
+        var entities = EntityService
+            .GetPagedDescendants(UmbracoObjectTypes.Media, 0, 1000, out var total, includeTrashed: false)
+            .Select(x => x.Id)
+            .ToArray();
+
+        foreach (var media in toDelete)
+        {
+            Assert.IsFalse(entities.Contains(media.Id));
+        }
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Paged_Media_Descendants_With_Search()
+    {
+        var folderType = MediaTypeService.Get(1031);
+        var imageMediaType = MediaTypeService.Get(1032);
+
+        var root = MediaBuilder.CreateMediaFolder(folderType, -1);
+        MediaService.Save(root);
+
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(imageMediaType, root.Id);
+            c1.Name = "ssss" + Guid.NewGuid();
+            MediaService.Save(c1);
+
+            for (var j = 0; j < 5; j++)
+            {
+                var c2 = MediaBuilder.CreateMediaImage(imageMediaType, c1.Id);
+                c2.Name = "tttt" + Guid.NewGuid();
+                MediaService.Save(c2);
+            }
+        }
+
+        var entities = EntityService.GetPagedDescendants(
+            root.Id,
+            UmbracoObjectTypes.Media,
+            0,
+            10,
+            out var total,
+            SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("ssss"))).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(10));
+        Assert.That(total, Is.EqualTo(10));
+        entities = EntityService.GetPagedDescendants(
+            root.Id,
+            UmbracoObjectTypes.Media,
+            0,
+            50,
+            out total,
+            SqlContext.Query<IUmbracoEntity>().Where(x => x.Name.Contains("tttt"))).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(50));
+        Assert.That(total, Is.EqualTo(50));
+    }
+
+    [Test]
+    public void EntityService_Can_Find_All_Content_By_UmbracoObjectTypes()
+    {
+        var entities = EntityService.GetAll(UmbracoObjectTypes.Document).ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(entities.Any(x => x.Trashed), Is.True);
+    }
+
+    [Test]
+    public void EntityService_Can_Find_All_Content_By_UmbracoObjectType_Id()
+    {
+        var objectTypeId = Constants.ObjectTypes.Document;
+        var entities = EntityService.GetAll(objectTypeId).ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(entities.Any(x => x.Trashed), Is.True);
+    }
+
+    [Test]
+    public void EntityService_Can_Find_All_Content_By_Type()
+    {
+        var entities = EntityService.GetAll<IContent>().ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(entities.Any(x => x.Trashed), Is.True);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Child_Content_By_ParentId_And_UmbracoObjectType()
+    {
+        var entities = EntityService.GetChildren(-1, UmbracoObjectTypes.Document).ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Length, Is.EqualTo(1));
+        Assert.That(entities.Any(x => x.Trashed), Is.False);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Content_By_UmbracoObjectType_With_Variant_Names()
+    {
+        var alias = "test" + Guid.NewGuid();
+        var template = TemplateBuilder.CreateTextPageTemplate(alias);
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("test2", "Test2", defaultTemplateId: template.Id);
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        var c1 = ContentBuilder.CreateSimpleContent(contentType, "Test");
+        c1.SetCultureName("Test - FR", _langFr.IsoCode);
+        c1.SetCultureName("Test - ES", _langEs.IsoCode);
+        ContentService.Save(c1);
+
+        var result = EntityService.Get(c1.Id, UmbracoObjectTypes.Document);
+        Assert.AreEqual("Test - FR", result.Name); // got name from default culture
+        Assert.IsNotNull(result as IDocumentEntitySlim);
+        var doc = (IDocumentEntitySlim)result;
+        var cultureNames = doc.CultureNames;
+        Assert.AreEqual("Test - FR", cultureNames[_langFr.IsoCode]);
+        Assert.AreEqual("Test - ES", cultureNames[_langEs.IsoCode]);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Child_Content_By_ParentId_And_UmbracoObjectType_With_Variant_Names()
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType("test1", "Test1", defaultTemplateId: template.Id);
+        contentType.Variations = ContentVariation.Culture;
+        ContentTypeService.Save(contentType);
+
+        var root = ContentBuilder.CreateSimpleContent(contentType);
+        root.SetCultureName("Root", _langFr.IsoCode); // else cannot save
+        ContentService.Save(root);
+
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = ContentBuilder.CreateSimpleContent(contentType, Guid.NewGuid().ToString(), root);
+            if (i % 2 == 0)
+            {
+                c1.SetCultureName("Test " + i + " - FR", _langFr.IsoCode);
+                c1.SetCultureName("Test " + i + " - ES", _langEs.IsoCode);
+            }
+            else
+            {
+                c1.SetCultureName("Test", _langFr.IsoCode); // else cannot save
+            }
+
+            ContentService.Save(c1);
+        }
+
+        var entities = EntityService.GetChildren(root.Id, UmbracoObjectTypes.Document).ToArray();
+
+        Assert.AreEqual(10, entities.Length);
+
+        for (var i = 0; i < entities.Length; i++)
+        {
+            Assert.AreEqual(0, entities[i].AdditionalData.Count);
+
+            if (i % 2 == 0)
+            {
+                var doc = (IDocumentEntitySlim)entities[i];
+                var keys = doc.CultureNames.Keys.ToList();
+                var vals = doc.CultureNames.Values.ToList();
+                Assert.AreEqual(_langFr.IsoCode.ToLowerInvariant(), keys[0].ToLowerInvariant());
+                Assert.AreEqual("Test " + i + " - FR", vals[0]);
+                Assert.AreEqual(_langEs.IsoCode.ToLowerInvariant(), keys[1].ToLowerInvariant());
+                Assert.AreEqual("Test " + i + " - ES", vals[1]);
+            }
+            else
             {
                 Assert.AreEqual(0, entities[i].AdditionalData.Count);
-
-                if (i % 2 == 0)
-                {
-                    var doc = (IDocumentEntitySlim)entities[i];
-                    var keys = doc.CultureNames.Keys.ToList();
-                    var vals = doc.CultureNames.Values.ToList();
-                    Assert.AreEqual(_langFr.IsoCode.ToLowerInvariant(), keys[0].ToLowerInvariant());
-                    Assert.AreEqual("Test " + i + " - FR", vals[0]);
-                    Assert.AreEqual(_langEs.IsoCode.ToLowerInvariant(), keys[1].ToLowerInvariant());
-                    Assert.AreEqual("Test " + i + " - ES", vals[1]);
-                }
-                else
-                {
-                    Assert.AreEqual(0, entities[i].AdditionalData.Count);
-                }
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Children_By_ParentId()
-        {
-            IEnumerable<IEntitySlim> entities = EntityService.GetChildren(_folderId);
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(3));
-            Assert.That(entities.Any(x => x.Trashed), Is.False);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Descendants_By_ParentId()
-        {
-            IEnumerable<IEntitySlim> entities = EntityService.GetDescendants(_folderId);
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(4));
-            Assert.That(entities.Any(x => x.Trashed), Is.False);
-        }
-
-        [Test]
-        public void EntityService_Throws_When_Getting_All_With_Invalid_Type()
-        {
-            Guid objectTypeId = Constants.ObjectTypes.ContentItem;
-
-            Assert.Throws<NotSupportedException>(() => EntityService.GetAll<IContentBase>());
-            Assert.Throws<NotSupportedException>(() => EntityService.GetAll(objectTypeId));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectTypes()
-        {
-            IEntitySlim[] entities = EntityService.GetAll(UmbracoObjectTypes.DocumentType).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectType_Id()
-        {
-            Guid objectTypeId = Constants.ObjectTypes.DocumentType;
-            IEntitySlim[] entities = EntityService.GetAll(objectTypeId).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_ContentTypes_By_Type()
-        {
-            IEntitySlim[] entities = EntityService.GetAll<IContentType>().ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Count(), Is.EqualTo(1));
-        }
-
-        [Test]
-        public void EntityService_Can_Find_All_Media_By_UmbracoObjectTypes()
-        {
-            IEntitySlim[] entities = EntityService.GetAll(UmbracoObjectTypes.Media).ToArray();
-
-            Assert.That(entities.Any(), Is.True);
-            Assert.That(entities.Length, Is.EqualTo(5));
-
-            foreach (IEntitySlim entity in entities)
-            {
-                Assert.IsTrue(entity.GetType().Implements<IMediaEntitySlim>());
-                Console.WriteLine(((IMediaEntitySlim)entity).MediaPath);
-                Assert.IsNotEmpty(((IMediaEntitySlim)entity).MediaPath);
-            }
-        }
-
-        [Test]
-        public void EntityService_Can_Get_ObjectType()
-        {
-            UmbracoObjectTypes mediaObjectType = EntityService.GetObjectType(1031);
-
-            Assert.NotNull(mediaObjectType);
-            Assert.AreEqual(mediaObjectType, UmbracoObjectTypes.MediaType);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Key_For_Id_With_Unknown_Type()
-        {
-            Attempt<Guid> result = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.Unknown);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Key_For_Id()
-        {
-            Attempt<Guid> result = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.DocumentType);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
-        }
-
-        [Test]
-        public void EntityService_Cannot_Get_Key_For_Id_With_Incorrect_Object_Type()
-        {
-            Attempt<Guid> result1 = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.DocumentType);
-            Attempt<Guid> result2 = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.MediaType);
-
-            Assert.IsTrue(result1.Success);
-            Assert.IsFalse(result2.Success);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Id_For_Key_With_Unknown_Type()
-        {
-            Attempt<int> result = EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.Unknown);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(_contentType.Id, result.Result);
-        }
-
-        [Test]
-        public void EntityService_Can_Get_Id_For_Key()
-        {
-            Attempt<int> result = EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(_contentType.Id, result.Result);
-        }
-
-        [Test]
-        public void EntityService_Cannot_Get_Id_For_Key_With_Incorrect_Object_Type()
-        {
-            Attempt<int> result1 = EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.DocumentType);
-            Attempt<int> result2 = EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.MediaType);
-
-            Assert.IsTrue(result1.Success);
-            Assert.IsFalse(result2.Success);
-        }
-
-        [Test]
-        public void ReserveId()
-        {
-            var guid = Guid.NewGuid();
-
-            // can reserve
-            int reservedId = EntityService.ReserveId(guid);
-            Assert.IsTrue(reservedId > 0);
-
-            // can get it back
-            Attempt<int> id = EntityService.GetId(guid, UmbracoObjectTypes.DocumentType);
-            Assert.IsTrue(id.Success);
-            Assert.AreEqual(reservedId, id.Result);
-
-            // anything goes
-            id = EntityService.GetId(guid, UmbracoObjectTypes.Media);
-            Assert.IsTrue(id.Success);
-            Assert.AreEqual(reservedId, id.Result);
-
-            // a random guid won't work
-            Assert.IsFalse(EntityService.GetId(Guid.NewGuid(), UmbracoObjectTypes.DocumentType).Success);
-        }
-
-        private static bool s_isSetup = false;
-
-        private int _folderId;
-        private ContentType _contentType;
-        private Content _textpage;
-        private Content _subpage;
-        private Content _subpage2;
-        private Content _trashed;
-        private IMediaType _folderMediaType;
-        private Media _folder;
-        private IMediaType _imageMediaType;
-        private Media _image;
-        private Media _subfolder;
-        private Media _subfolder2;
-
-        public void CreateTestData()
-        {
-            if (s_isSetup == false)
-            {
-                s_isSetup = true;
-
-                Template template = TemplateBuilder.CreateTextPageTemplate();
-                FileService.SaveTemplate(template); // else, FK violation on contentType!
-
-                // Create and Save ContentType "umbTextpage" -> _contentType.Id
-                _contentType = ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
-                _contentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
-                ContentTypeService.Save(_contentType);
-
-                // Create and Save Content "Homepage" based on "umbTextpage" -> 1053
-                _textpage = ContentBuilder.CreateSimpleContent(_contentType);
-                _textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0");
-                ContentService.Save(_textpage, 0);
-
-                // Create and Save Content "Text Page 1" based on "umbTextpage" -> 1054
-                _subpage = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 1", _textpage.Id);
-                var contentSchedule = ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddMinutes(-5), null);
-                ContentService.Save(_subpage, 0, contentSchedule);
-
-                // Create and Save Content "Text Page 2" based on "umbTextpage" -> 1055
-                _subpage2 = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 2", _textpage.Id);
-                ContentService.Save(_subpage2, 0);
-
-                // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1056
-                _trashed = ContentBuilder.CreateSimpleContent(_contentType, "Text Page Deleted", -20);
-                _trashed.Trashed = true;
-                ContentService.Save(_trashed, 0);
-
-                // Create and Save folder-Media -> 1057
-                _folderMediaType = MediaTypeService.Get(1031);
-                _folder = MediaBuilder.CreateMediaFolder(_folderMediaType, -1);
-                MediaService.Save(_folder, 0);
-                _folderId = _folder.Id;
-
-                // Create and Save image-Media -> 1058
-                _imageMediaType = MediaTypeService.Get(1032);
-                _image = MediaBuilder.CreateMediaImage(_imageMediaType, _folder.Id);
-                MediaService.Save(_image, 0);
-
-                // Create and Save file-Media -> 1059
-                IMediaType fileMediaType = MediaTypeService.Get(1033);
-                Media file = MediaBuilder.CreateMediaFile(fileMediaType, _folder.Id);
-                MediaService.Save(file, 0);
-
-                // Create and save sub folder -> 1060
-                _subfolder = MediaBuilder.CreateMediaFolder(_folderMediaType, _folder.Id);
-                MediaService.Save(_subfolder, 0);
-
-                // Create and save sub folder -> 1061
-                _subfolder2 = MediaBuilder.CreateMediaFolder(_folderMediaType, _subfolder.Id);
-                MediaService.Save(_subfolder2, 0);
             }
         }
     }
+
+    [Test]
+    public void EntityService_Can_Get_Children_By_ParentId()
+    {
+        var entities = EntityService.GetChildren(_folderId);
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Count(), Is.EqualTo(3));
+        Assert.That(entities.Any(x => x.Trashed), Is.False);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Descendants_By_ParentId()
+    {
+        var entities = EntityService.GetDescendants(_folderId);
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Count(), Is.EqualTo(4));
+        Assert.That(entities.Any(x => x.Trashed), Is.False);
+    }
+
+    [Test]
+    public void EntityService_Throws_When_Getting_All_With_Invalid_Type()
+    {
+        var objectTypeId = Constants.ObjectTypes.ContentItem;
+
+        Assert.Throws<NotSupportedException>(() => EntityService.GetAll<IContentBase>());
+        Assert.Throws<NotSupportedException>(() => EntityService.GetAll(objectTypeId));
+    }
+
+    [Test]
+    public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectTypes()
+    {
+        var entities = EntityService.GetAll(UmbracoObjectTypes.DocumentType).ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void EntityService_Can_Find_All_ContentTypes_By_UmbracoObjectType_Id()
+    {
+        var objectTypeId = Constants.ObjectTypes.DocumentType;
+        var entities = EntityService.GetAll(objectTypeId).ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void EntityService_Can_Find_All_ContentTypes_By_Type()
+    {
+        var entities = EntityService.GetAll<IContentType>().ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Count(), Is.EqualTo(1));
+    }
+
+    [Test]
+    public void EntityService_Can_Find_All_Media_By_UmbracoObjectTypes()
+    {
+        var entities = EntityService.GetAll(UmbracoObjectTypes.Media).ToArray();
+
+        Assert.That(entities.Any(), Is.True);
+        Assert.That(entities.Length, Is.EqualTo(5));
+
+        foreach (var entity in entities)
+        {
+            Assert.IsTrue(entity.GetType().Implements<IMediaEntitySlim>());
+            Console.WriteLine(((IMediaEntitySlim)entity).MediaPath);
+            Assert.IsNotEmpty(((IMediaEntitySlim)entity).MediaPath);
+        }
+    }
+
+    [Test]
+    public void EntityService_Can_Get_ObjectType()
+    {
+        var mediaObjectType = EntityService.GetObjectType(1031);
+
+        Assert.NotNull(mediaObjectType);
+        Assert.AreEqual(mediaObjectType, UmbracoObjectTypes.MediaType);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Key_For_Id_With_Unknown_Type()
+    {
+        var result = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.Unknown);
+
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Key_For_Id()
+    {
+        var result = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.DocumentType);
+
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), result.Result);
+    }
+
+    [Test]
+    public void EntityService_Cannot_Get_Key_For_Id_With_Incorrect_Object_Type()
+    {
+        var result1 = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.DocumentType);
+        var result2 = EntityService.GetKey(_contentType.Id, UmbracoObjectTypes.MediaType);
+
+        Assert.IsTrue(result1.Success);
+        Assert.IsFalse(result2.Success);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Id_For_Key_With_Unknown_Type()
+    {
+        var result =
+            EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"), UmbracoObjectTypes.Unknown);
+
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(_contentType.Id, result.Result);
+    }
+
+    [Test]
+    public void EntityService_Can_Get_Id_For_Key()
+    {
+        var result = EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"),
+            UmbracoObjectTypes.DocumentType);
+
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(_contentType.Id, result.Result);
+    }
+
+    [Test]
+    public void EntityService_Cannot_Get_Id_For_Key_With_Incorrect_Object_Type()
+    {
+        var result1 = EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"),
+            UmbracoObjectTypes.DocumentType);
+        var result2 = EntityService.GetId(Guid.Parse("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522"),
+            UmbracoObjectTypes.MediaType);
+
+        Assert.IsTrue(result1.Success);
+        Assert.IsFalse(result2.Success);
+    }
+
+    [Test]
+    public void ReserveId()
+    {
+        var guid = Guid.NewGuid();
+
+        // can reserve
+        var reservedId = EntityService.ReserveId(guid);
+        Assert.IsTrue(reservedId > 0);
+
+        // can get it back
+        var id = EntityService.GetId(guid, UmbracoObjectTypes.DocumentType);
+        Assert.IsTrue(id.Success);
+        Assert.AreEqual(reservedId, id.Result);
+
+        // anything goes
+        id = EntityService.GetId(guid, UmbracoObjectTypes.Media);
+        Assert.IsTrue(id.Success);
+        Assert.AreEqual(reservedId, id.Result);
+
+        // a random guid won't work
+        Assert.IsFalse(EntityService.GetId(Guid.NewGuid(), UmbracoObjectTypes.DocumentType).Success);
+    }
+
+    private static bool s_isSetup;
+
+    private int _folderId;
+    private ContentType _contentType;
+    private Content _textpage;
+    private Content _subpage;
+    private Content _subpage2;
+    private Content _trashed;
+    private IMediaType _folderMediaType;
+    private Media _folder;
+    private IMediaType _imageMediaType;
+    private Media _image;
+    private Media _subfolder;
+    private Media _subfolder2;
+
+    public void CreateTestData()
+    {
+        if (s_isSetup == false)
+        {
+            s_isSetup = true;
+
+            var template = TemplateBuilder.CreateTextPageTemplate();
+            FileService.SaveTemplate(template); // else, FK violation on contentType!
+
+            // Create and Save ContentType "umbTextpage" -> _contentType.Id
+            _contentType =
+                ContentTypeBuilder.CreateSimpleContentType("umbTextpage", "Textpage", defaultTemplateId: template.Id);
+            _contentType.Key = new Guid("1D3A8E6E-2EA9-4CC1-B229-1AEE19821522");
+            ContentTypeService.Save(_contentType);
+
+            // Create and Save Content "Homepage" based on "umbTextpage" -> 1053
+            _textpage = ContentBuilder.CreateSimpleContent(_contentType);
+            _textpage.Key = new Guid("B58B3AD4-62C2-4E27-B1BE-837BD7C533E0");
+            ContentService.Save(_textpage, 0);
+
+            // Create and Save Content "Text Page 1" based on "umbTextpage" -> 1054
+            _subpage = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 1", _textpage.Id);
+            var contentSchedule = ContentScheduleCollection.CreateWithEntry(DateTime.Now.AddMinutes(-5), null);
+            ContentService.Save(_subpage, 0, contentSchedule);
+
+            // Create and Save Content "Text Page 2" based on "umbTextpage" -> 1055
+            _subpage2 = ContentBuilder.CreateSimpleContent(_contentType, "Text Page 2", _textpage.Id);
+            ContentService.Save(_subpage2, 0);
+
+            // Create and Save Content "Text Page Deleted" based on "umbTextpage" -> 1056
+            _trashed = ContentBuilder.CreateSimpleContent(_contentType, "Text Page Deleted", -20);
+            _trashed.Trashed = true;
+            ContentService.Save(_trashed, 0);
+
+            // Create and Save folder-Media -> 1057
+            _folderMediaType = MediaTypeService.Get(1031);
+            _folder = MediaBuilder.CreateMediaFolder(_folderMediaType, -1);
+            MediaService.Save(_folder, 0);
+            _folderId = _folder.Id;
+
+            // Create and Save image-Media -> 1058
+            _imageMediaType = MediaTypeService.Get(1032);
+            _image = MediaBuilder.CreateMediaImage(_imageMediaType, _folder.Id);
+            MediaService.Save(_image, 0);
+
+            // Create and Save file-Media -> 1059
+            var fileMediaType = MediaTypeService.Get(1033);
+            var file = MediaBuilder.CreateMediaFile(fileMediaType, _folder.Id);
+            MediaService.Save(file, 0);
+
+            // Create and save sub folder -> 1060
+            _subfolder = MediaBuilder.CreateMediaFolder(_folderMediaType, _folder.Id);
+            MediaService.Save(_subfolder, 0);
+
+            // Create and save sub folder -> 1061
+            _subfolder2 = MediaBuilder.CreateMediaFolder(_folderMediaType, _subfolder.Id);
+            MediaService.Save(_subfolder2, 0);
+        }
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs
index 7c8330d428..6ba1356acd 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/EntityXmlSerializerTests.cs
@@ -6,311 +6,323 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Xml.Linq;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Extensions;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.IO;
+using Umbraco.Cms.Core.Media;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Models.ContentEditing;
+using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services.Importing;
-using Microsoft.Extensions.Logging;
-using Umbraco.Cms.Core.PropertyEditors;
-using Microsoft.Extensions.Options;
-using Microsoft.Extensions.DependencyInjection;
-using Umbraco.Cms.Core.Media;
-using Umbraco.Cms.Core.Models.ContentEditing;
-using Umbraco.Cms.Core.Strings;
+using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class EntityXmlSerializerTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class EntityXmlSerializerTests : UmbracoIntegrationTest
+    private IEntityXmlSerializer Serializer => GetRequiredService<IEntityXmlSerializer>();
+    private IContentService ContentService => GetRequiredService<IContentService>();
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+    private IUserService UserService => GetRequiredService<IUserService>();
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+    private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
+    private ILocalizedTextService TextService => GetRequiredService<ILocalizedTextService>();
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    [Test]
+    public void Can_Export_Macro()
     {
-        private IEntityXmlSerializer Serializer => GetRequiredService<IEntityXmlSerializer>();
-        private IContentService ContentService => GetRequiredService<IContentService>();
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
-        private IUserService UserService => GetRequiredService<IUserService>();
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-        private IDataValueEditorFactory DataValueEditorFactory => GetRequiredService<IDataValueEditorFactory>();
-        private ILocalizedTextService TextService => GetRequiredService<ILocalizedTextService>();
-        private IFileService FileService => GetRequiredService<IFileService>();
+        // Arrange
+        var macroService = GetRequiredService<IMacroService>();
+        var macro = new MacroBuilder()
+            .WithAlias("test1")
+            .WithName("Test")
+            .Build();
+        macroService.Save(macro);
 
-        [Test]
-        public void Can_Export_Macro()
+        // Act
+        var element = Serializer.Serialize(macro);
+
+        // Assert
+        Assert.That(element, Is.Not.Null);
+        Assert.That(element.Element("name").Value, Is.EqualTo("Test"));
+        Assert.That(element.Element("alias").Value, Is.EqualTo("test1"));
+        Debug.Print(element.ToString());
+    }
+
+    [Test]
+    public void Can_Export_DictionaryItems()
+    {
+        // Arrange
+        CreateDictionaryData();
+        var localizationService = GetRequiredService<ILocalizationService>();
+        var dictionaryItem = localizationService.GetDictionaryItemByKey("Parent");
+
+        var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
+        var dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
+
+        // Act
+        var xml = Serializer.Serialize(new[] { dictionaryItem });
+
+        // Assert
+        Assert.That(xml.ToString(), Is.EqualTo(dictionaryItemsElement.ToString()));
+    }
+
+    [Test]
+    public void Can_Export_Languages()
+    {
+        // Arrange
+        var localizationService = GetRequiredService<ILocalizationService>();
+
+        var languageNbNo = new LanguageBuilder()
+            .WithCultureInfo("nb-NO")
+            .WithCultureName("Norwegian Bokmål (Norway)")
+            .Build();
+        localizationService.Save(languageNbNo);
+
+        var languageEnGb = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .Build();
+        localizationService.Save(languageEnGb);
+
+        var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
+        var languageItemsElement = newPackageXml.Elements("Languages").First();
+
+        // Act
+        var xml = Serializer.Serialize(new[] { languageNbNo, languageEnGb });
+
+        // Assert
+        Assert.That(xml.ToString(), Is.EqualTo(languageItemsElement.ToString()));
+    }
+
+    [Test]
+    public void Can_Generate_Xml_Representation_Of_Content()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template); // else, FK violation on contentType!
+        var contentType = ContentTypeBuilder.CreateTextPageContentType(
+            defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Root Home", -1);
+        ContentService.Save(content, Constants.Security.SuperUserId);
+
+        var nodeName = content.ContentType.Alias.ToSafeAlias(ShortStringHelper);
+        var urlName =
+            content.GetUrlSegment(ShortStringHelper, new[] { new DefaultUrlSegmentProvider(ShortStringHelper) });
+
+        // Act
+        var element = content.ToXml(Serializer);
+
+        // Assert
+        Assert.That(element, Is.Not.Null);
+        Assert.That(element.Name.LocalName, Is.EqualTo(nodeName));
+        Assert.AreEqual(content.Id.ToString(), (string)element.Attribute("id"));
+        Assert.AreEqual(content.ParentId.ToString(), (string)element.Attribute("parentID"));
+        Assert.AreEqual(content.Level.ToString(), (string)element.Attribute("level"));
+        Assert.AreEqual(content.CreatorId.ToString(), (string)element.Attribute("creatorID"));
+        Assert.AreEqual(content.SortOrder.ToString(), (string)element.Attribute("sortOrder"));
+        Assert.AreEqual(content.CreateDate.ToString("s"), (string)element.Attribute("createDate"));
+        Assert.AreEqual(content.UpdateDate.ToString("s"), (string)element.Attribute("updateDate"));
+        Assert.AreEqual(content.Name, (string)element.Attribute("nodeName"));
+        Assert.AreEqual(urlName, (string)element.Attribute("urlName"));
+        Assert.AreEqual(content.Path, (string)element.Attribute("path"));
+        Assert.AreEqual("", (string)element.Attribute("isDoc"));
+        Assert.AreEqual(content.ContentType.Id.ToString(), (string)element.Attribute("nodeType"));
+        Assert.AreEqual(content.GetCreatorProfile(UserService).Name, (string)element.Attribute("creatorName"));
+        Assert.AreEqual(content.GetWriterProfile(UserService).Name, (string)element.Attribute("writerName"));
+        Assert.AreEqual(content.WriterId.ToString(), (string)element.Attribute("writerID"));
+        Assert.AreEqual(content.TemplateId.ToString(), (string)element.Attribute("template"));
+
+        Assert.AreEqual(content.Properties["title"].GetValue().ToString(), element.Elements("title").Single().Value);
+        Assert.AreEqual(content.Properties["bodyText"].GetValue().ToString(),
+            element.Elements("bodyText").Single().Value);
+        Assert.AreEqual(content.Properties["keywords"].GetValue().ToString(),
+            element.Elements("keywords").Single().Value);
+        Assert.AreEqual(content.Properties["description"].GetValue().ToString(),
+            element.Elements("description").Single().Value);
+    }
+
+    [Test]
+    public void Can_Generate_Xml_Representation_Of_Media()
+    {
+        // Arrange
+        var mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
+
+        MediaTypeService.Save(mediaType);
+
+        // reference, so static ctor runs, so event handlers register
+        // and then, this will reset the width, height... because the file does not exist, of course ;-(
+        var loggerFactory = NullLoggerFactory.Instance;
+        var scheme = Mock.Of<IMediaPathScheme>();
+        var contentSettings = new ContentSettings();
+
+        var mediaFileManager = new MediaFileManager(
+            Mock.Of<IFileSystem>(),
+            scheme,
+            loggerFactory.CreateLogger<MediaFileManager>(),
+            ShortStringHelper,
+            Services,
+            Options.Create(new ContentSettings()));
+
+        var ignored = new FileUploadPropertyEditor(
+            DataValueEditorFactory,
+            mediaFileManager,
+            Mock.Of<IOptionsMonitor<ContentSettings>>(x => x.CurrentValue == contentSettings),
+            TextService,
+            Services.GetRequiredService<UploadAutoFillProperties>(),
+            ContentService,
+            IOHelper);
+
+        var media = MediaBuilder.CreateMediaImage(mediaType, -1);
+        media.WriterId = -1; // else it's zero and that's not a user and it breaks the tests
+        MediaService.Save(media);
+
+        // so we have to force-reset these values because the property editor has cleared them
+        media.SetValue(Constants.Conventions.Media.Width, "200");
+        media.SetValue(Constants.Conventions.Media.Height, "200");
+        media.SetValue(Constants.Conventions.Media.Bytes, "100");
+        media.SetValue(Constants.Conventions.Media.Extension, "png");
+
+        var nodeName = media.ContentType.Alias.ToSafeAlias(ShortStringHelper);
+        var urlName = media.GetUrlSegment(ShortStringHelper, new[] { new DefaultUrlSegmentProvider(ShortStringHelper) });
+
+        // Act
+        var element = media.ToXml(Serializer);
+
+        // Assert
+        Assert.That(element, Is.Not.Null);
+        Assert.That(element.Name.LocalName, Is.EqualTo(nodeName));
+        Assert.AreEqual(media.Id.ToString(), (string)element.Attribute("id"));
+        Assert.AreEqual(media.ParentId.ToString(), (string)element.Attribute("parentID"));
+        Assert.AreEqual(media.Level.ToString(), (string)element.Attribute("level"));
+        Assert.AreEqual(media.SortOrder.ToString(), (string)element.Attribute("sortOrder"));
+        Assert.AreEqual(media.CreateDate.ToString("s"), (string)element.Attribute("createDate"));
+        Assert.AreEqual(media.UpdateDate.ToString("s"), (string)element.Attribute("updateDate"));
+        Assert.AreEqual(media.Name, (string)element.Attribute("nodeName"));
+        Assert.AreEqual(urlName, (string)element.Attribute("urlName"));
+        Assert.AreEqual(media.Path, (string)element.Attribute("path"));
+        Assert.AreEqual("", (string)element.Attribute("isDoc"));
+        Assert.AreEqual(media.ContentType.Id.ToString(), (string)element.Attribute("nodeType"));
+        Assert.AreEqual(media.GetCreatorProfile(UserService).Name, (string)element.Attribute("writerName"));
+        Assert.AreEqual(media.CreatorId.ToString(), (string)element.Attribute("writerID"));
+        Assert.IsNull(element.Attribute("template"));
+
+        Assert.AreEqual(media.Properties[Constants.Conventions.Media.File].GetValue().ToString(),
+            element.Elements(Constants.Conventions.Media.File).Single().Value);
+        Assert.AreEqual(media.Properties[Constants.Conventions.Media.Width].GetValue().ToString(),
+            element.Elements(Constants.Conventions.Media.Width).Single().Value);
+        Assert.AreEqual(media.Properties[Constants.Conventions.Media.Height].GetValue().ToString(),
+            element.Elements(Constants.Conventions.Media.Height).Single().Value);
+        Assert.AreEqual(media.Properties[Constants.Conventions.Media.Bytes].GetValue().ToString(),
+            element.Elements(Constants.Conventions.Media.Bytes).Single().Value);
+        Assert.AreEqual(media.Properties[Constants.Conventions.Media.Extension].GetValue().ToString(),
+            element.Elements(Constants.Conventions.Media.Extension).Single().Value);
+    }
+
+    [Test]
+    public void Serialize_ForContentTypeWithHistoryCleanupPolicy_OutputsSerializedHistoryCleanupPolicy()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template); // else, FK violation on contentType!
+
+        var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+
+        contentType.HistoryCleanup = new HistoryCleanup
         {
-            // Arrange
-            IMacroService macroService = GetRequiredService<IMacroService>();
-            Macro macro = new MacroBuilder()
-                .WithAlias("test1")
-                .WithName("Test")
-                .Build();
-            macroService.Save(macro);
+            PreventCleanup = true,
+            KeepAllVersionsNewerThanDays = 1,
+            KeepLatestVersionPerDayForDays = 2
+        };
 
-            // Act
-            XElement element = Serializer.Serialize(macro);
+        ContentTypeService.Save(contentType);
 
-            // Assert
-            Assert.That(element, Is.Not.Null);
-            Assert.That(element.Element("name").Value, Is.EqualTo("Test"));
-            Assert.That(element.Element("alias").Value, Is.EqualTo("test1"));
-            Debug.Print(element.ToString());
-        }
+        // Act
+        var element = Serializer.Serialize(contentType);
 
-        [Test]
-        public void Can_Export_DictionaryItems()
+        // Assert
+        Assert.Multiple(() =>
         {
-            // Arrange
-            CreateDictionaryData();
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            IDictionaryItem dictionaryItem = localizationService.GetDictionaryItemByKey("Parent");
+            Assert.That(element.Element("HistoryCleanupPolicy")!.Attribute("preventCleanup")!.Value,
+                Is.EqualTo("true"));
+            Assert.That(element.Element("HistoryCleanupPolicy")!.Attribute("keepAllVersionsNewerThanDays")!.Value,
+                Is.EqualTo("1"));
+            Assert.That(element.Element("HistoryCleanupPolicy")!.Attribute("keepLatestVersionPerDayForDays")!.Value,
+                Is.EqualTo("2"));
+        });
+    }
 
-            var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
-            XElement dictionaryItemsElement = newPackageXml.Elements("DictionaryItems").First();
+    [Test]
+    public void Serialize_ForContentTypeWithNullHistoryCleanupPolicy_DoesNotOutputSerializedDefaultPolicy()
+    {
+        // Arrange
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template); // else, FK violation on contentType!
 
-            // Act
-            XElement xml = Serializer.Serialize(new[] { dictionaryItem });
+        var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
 
-            // Assert
-            Assert.That(xml.ToString(), Is.EqualTo(dictionaryItemsElement.ToString()));
-        }
+        contentType.HistoryCleanup = null;
 
-        [Test]
-        public void Can_Export_Languages()
+        ContentTypeService.Save(contentType);
+
+        var element = Serializer.Serialize(contentType);
+
+        // Assert
+        Assert.Multiple(() =>
         {
-            // Arrange
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
+            Assert.That(element.Element("HistoryCleanupPolicy"), Is.Null);
+        });
+    }
 
-            ILanguage languageNbNo = new LanguageBuilder()
-                .WithCultureInfo("nb-NO")
-                .WithCultureName("Norwegian Bokmål (Norway)")
-                .Build();
-            localizationService.Save(languageNbNo);
+    private void CreateDictionaryData()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
 
-            ILanguage languageEnGb = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .Build();
-            localizationService.Save(languageEnGb);
+        var languageNbNo = new LanguageBuilder()
+            .WithCultureInfo("nb-NO")
+            .WithCultureName("Norwegian")
+            .Build();
+        localizationService.Save(languageNbNo);
 
-            var newPackageXml = XElement.Parse(ImportResources.Dictionary_Package);
-            XElement languageItemsElement = newPackageXml.Elements("Languages").First();
+        var languageEnGb = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .Build();
+        localizationService.Save(languageEnGb);
 
-            // Act
-            XElement xml = Serializer.Serialize(new[] { languageNbNo, languageEnGb });
-
-            // Assert
-            Assert.That(xml.ToString(), Is.EqualTo(languageItemsElement.ToString()));
-        }
-
-        [Test]
-        public void Can_Generate_Xml_Representation_Of_Content()
+        var parentItem = new DictionaryItem("Parent") { Key = Guid.Parse("28f2e02a-8c66-4fcd-85e3-8524d551c0d3") };
+        var parentTranslations = new List<IDictionaryTranslation>
         {
-            // Arrange
-            var template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template); // else, FK violation on contentType!
-            var contentType = ContentTypeBuilder.CreateTextPageContentType(
-                defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
+            new DictionaryTranslation(languageNbNo, "ForelderVerdi"),
+            new DictionaryTranslation(languageEnGb, "ParentValue")
+        };
+        parentItem.Translations = parentTranslations;
+        localizationService.Save(parentItem);
 
-            var content = ContentBuilder.CreateTextpageContent(contentType, "Root Home", -1);
-            ContentService.Save(content, Constants.Security.SuperUserId);
-
-            var nodeName = content.ContentType.Alias.ToSafeAlias(ShortStringHelper);
-            var urlName = content.GetUrlSegment(ShortStringHelper, new[] { new DefaultUrlSegmentProvider(ShortStringHelper) });
-
-            // Act
-            XElement element = content.ToXml(Serializer);
-
-            // Assert
-            Assert.That(element, Is.Not.Null);
-            Assert.That(element.Name.LocalName, Is.EqualTo(nodeName));
-            Assert.AreEqual(content.Id.ToString(), (string)element.Attribute("id"));
-            Assert.AreEqual(content.ParentId.ToString(), (string)element.Attribute("parentID"));
-            Assert.AreEqual(content.Level.ToString(), (string)element.Attribute("level"));
-            Assert.AreEqual(content.CreatorId.ToString(), (string)element.Attribute("creatorID"));
-            Assert.AreEqual(content.SortOrder.ToString(), (string)element.Attribute("sortOrder"));
-            Assert.AreEqual(content.CreateDate.ToString("s"), (string)element.Attribute("createDate"));
-            Assert.AreEqual(content.UpdateDate.ToString("s"), (string)element.Attribute("updateDate"));
-            Assert.AreEqual(content.Name, (string)element.Attribute("nodeName"));
-            Assert.AreEqual(urlName, (string)element.Attribute("urlName"));
-            Assert.AreEqual(content.Path, (string)element.Attribute("path"));
-            Assert.AreEqual("", (string)element.Attribute("isDoc"));
-            Assert.AreEqual(content.ContentType.Id.ToString(), (string)element.Attribute("nodeType"));
-            Assert.AreEqual(content.GetCreatorProfile(UserService).Name, (string)element.Attribute("creatorName"));
-            Assert.AreEqual(content.GetWriterProfile(UserService).Name, (string)element.Attribute("writerName"));
-            Assert.AreEqual(content.WriterId.ToString(), (string)element.Attribute("writerID"));
-            Assert.AreEqual(content.TemplateId.ToString(), (string)element.Attribute("template"));
-
-            Assert.AreEqual(content.Properties["title"].GetValue().ToString(), element.Elements("title").Single().Value);
-            Assert.AreEqual(content.Properties["bodyText"].GetValue().ToString(), element.Elements("bodyText").Single().Value);
-            Assert.AreEqual(content.Properties["keywords"].GetValue().ToString(), element.Elements("keywords").Single().Value);
-            Assert.AreEqual(content.Properties["description"].GetValue().ToString(), element.Elements("description").Single().Value);
-        }
-
-        [Test]
-        public void Can_Generate_Xml_Representation_Of_Media()
+        var childItem =
+            new DictionaryItem(parentItem.Key, "Child") { Key = Guid.Parse("e7dba0a9-d517-4ba4-8e18-2764d392c611") };
+        var childTranslations = new List<IDictionaryTranslation>
         {
-            // Arrange
-            var mediaType = MediaTypeBuilder.CreateImageMediaType("image2");
-
-            MediaTypeService.Save(mediaType);
-
-            // reference, so static ctor runs, so event handlers register
-            // and then, this will reset the width, height... because the file does not exist, of course ;-(
-            var loggerFactory = NullLoggerFactory.Instance;
-            var scheme = Mock.Of<IMediaPathScheme>();
-            var contentSettings = new ContentSettings();
-
-            var mediaFileManager = new MediaFileManager(
-                Mock.Of<IFileSystem>(),
-                scheme,
-                loggerFactory.CreateLogger<MediaFileManager>(),
-                ShortStringHelper,
-                Services,
-                Options.Create(new ContentSettings()));
-
-            var ignored = new FileUploadPropertyEditor(
-                DataValueEditorFactory,
-                mediaFileManager,
-                Mock.Of<IOptionsMonitor<ContentSettings>>(x=>x.CurrentValue == contentSettings),
-                TextService,
-                Services.GetRequiredService<UploadAutoFillProperties>(),
-                ContentService,
-                IOHelper);
-
-            var media = MediaBuilder.CreateMediaImage(mediaType, -1);
-            media.WriterId = -1; // else it's zero and that's not a user and it breaks the tests
-            MediaService.Save(media, Constants.Security.SuperUserId);
-
-            // so we have to force-reset these values because the property editor has cleared them
-            media.SetValue(Constants.Conventions.Media.Width, "200");
-            media.SetValue(Constants.Conventions.Media.Height, "200");
-            media.SetValue(Constants.Conventions.Media.Bytes, "100");
-            media.SetValue(Constants.Conventions.Media.Extension, "png");
-
-            var nodeName = media.ContentType.Alias.ToSafeAlias(ShortStringHelper);
-            var urlName = media.GetUrlSegment(ShortStringHelper, new[] { new DefaultUrlSegmentProvider(ShortStringHelper) });
-
-            // Act
-            XElement element = media.ToXml(Serializer);
-
-            // Assert
-            Assert.That(element, Is.Not.Null);
-            Assert.That(element.Name.LocalName, Is.EqualTo(nodeName));
-            Assert.AreEqual(media.Id.ToString(), (string)element.Attribute("id"));
-            Assert.AreEqual(media.ParentId.ToString(), (string)element.Attribute("parentID"));
-            Assert.AreEqual(media.Level.ToString(), (string)element.Attribute("level"));
-            Assert.AreEqual(media.SortOrder.ToString(), (string)element.Attribute("sortOrder"));
-            Assert.AreEqual(media.CreateDate.ToString("s"), (string)element.Attribute("createDate"));
-            Assert.AreEqual(media.UpdateDate.ToString("s"), (string)element.Attribute("updateDate"));
-            Assert.AreEqual(media.Name, (string)element.Attribute("nodeName"));
-            Assert.AreEqual(urlName, (string)element.Attribute("urlName"));
-            Assert.AreEqual(media.Path, (string)element.Attribute("path"));
-            Assert.AreEqual("", (string)element.Attribute("isDoc"));
-            Assert.AreEqual(media.ContentType.Id.ToString(), (string)element.Attribute("nodeType"));
-            Assert.AreEqual(media.GetCreatorProfile(UserService).Name, (string)element.Attribute("writerName"));
-            Assert.AreEqual(media.CreatorId.ToString(), (string)element.Attribute("writerID"));
-            Assert.IsNull(element.Attribute("template"));
-
-            Assert.AreEqual(media.Properties[Constants.Conventions.Media.File].GetValue().ToString(), element.Elements(Constants.Conventions.Media.File).Single().Value);
-            Assert.AreEqual(media.Properties[Constants.Conventions.Media.Width].GetValue().ToString(), element.Elements(Constants.Conventions.Media.Width).Single().Value);
-            Assert.AreEqual(media.Properties[Constants.Conventions.Media.Height].GetValue().ToString(), element.Elements(Constants.Conventions.Media.Height).Single().Value);
-            Assert.AreEqual(media.Properties[Constants.Conventions.Media.Bytes].GetValue().ToString(), element.Elements(Constants.Conventions.Media.Bytes).Single().Value);
-            Assert.AreEqual(media.Properties[Constants.Conventions.Media.Extension].GetValue().ToString(), element.Elements(Constants.Conventions.Media.Extension).Single().Value);
-        }
-        
-        [Test]
-        public void Serialize_ForContentTypeWithHistoryCleanupPolicy_OutputsSerializedHistoryCleanupPolicy()
-        {
-            // Arrange
-            var template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template); // else, FK violation on contentType!
-
-            var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-
-            contentType.HistoryCleanup = new HistoryCleanup
-            {
-                PreventCleanup = true,
-                KeepAllVersionsNewerThanDays = 1,
-                KeepLatestVersionPerDayForDays = 2
-            };
-
-            ContentTypeService.Save(contentType);
-
-            // Act
-            var element = Serializer.Serialize(contentType);
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.That(element.Element("HistoryCleanupPolicy")!.Attribute("preventCleanup")!.Value, Is.EqualTo("true"));
-                Assert.That(element.Element("HistoryCleanupPolicy")!.Attribute("keepAllVersionsNewerThanDays")!.Value, Is.EqualTo("1"));
-                Assert.That(element.Element("HistoryCleanupPolicy")!.Attribute("keepLatestVersionPerDayForDays")!.Value, Is.EqualTo("2"));
-            });
-        }
-
-        [Test]
-        public void Serialize_ForContentTypeWithNullHistoryCleanupPolicy_DoesNotOutputSerializedDefaultPolicy()
-        {
-            // Arrange
-            var template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template); // else, FK violation on contentType!
-
-            var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-
-            contentType.HistoryCleanup = null;
-
-            ContentTypeService.Save(contentType);
-
-            var element = Serializer.Serialize(contentType);
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.That(element.Element("HistoryCleanupPolicy"), Is.Null);
-            });
-        }
-
-        private void CreateDictionaryData()
-        {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-
-            ILanguage languageNbNo = new LanguageBuilder()
-                .WithCultureInfo("nb-NO")
-                .WithCultureName("Norwegian")
-                .Build();
-            localizationService.Save(languageNbNo);
-
-            ILanguage languageEnGb = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .Build();
-            localizationService.Save(languageEnGb);
-
-            var parentItem = new DictionaryItem("Parent") { Key = Guid.Parse("28f2e02a-8c66-4fcd-85e3-8524d551c0d3") };
-            var parentTranslations = new List<IDictionaryTranslation>
-            {
-                new DictionaryTranslation(languageNbNo, "ForelderVerdi"),
-                new DictionaryTranslation(languageEnGb, "ParentValue")
-            };
-            parentItem.Translations = parentTranslations;
-            localizationService.Save(parentItem);
-
-            var childItem = new DictionaryItem(parentItem.Key, "Child") { Key = Guid.Parse("e7dba0a9-d517-4ba4-8e18-2764d392c611") };
-            var childTranslations = new List<IDictionaryTranslation>
-            {
-                new DictionaryTranslation(languageNbNo, "BarnVerdi"),
-                new DictionaryTranslation(languageEnGb, "ChildValue")
-            };
-            childItem.Translations = childTranslations;
-            localizationService.Save(childItem);
-        }
+            new DictionaryTranslation(languageNbNo, "BarnVerdi"),
+            new DictionaryTranslation(languageEnGb, "ChildValue")
+        };
+        childItem.Translations = childTranslations;
+        localizationService.Save(childItem);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs
index f322ea01ca..f9990fbedf 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ExternalLoginServiceTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
@@ -12,277 +11,266 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class ExternalLoginServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class ExternalLoginServiceTests : UmbracoIntegrationTest
+    private IUserService UserService => GetRequiredService<IUserService>();
+
+    private IExternalLoginWithKeyService ExternalLoginService => GetRequiredService<IExternalLoginWithKeyService>();
+
+    [Test]
+    [Ignore(
+        "We don't support duplicates anymore, this removing on save was a breaking change work around, this needs to be ported to a migration")]
+    public void Removes_Existing_Duplicates_On_Save()
     {
-        private IUserService UserService => GetRequiredService<IUserService>();
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
 
-        private IExternalLoginWithKeyService ExternalLoginService => GetRequiredService<IExternalLoginWithKeyService>();
+        var providerKey = Guid.NewGuid().ToString("N");
+        var latest = DateTime.Now.AddDays(-1);
+        var oldest = DateTime.Now.AddDays(-10);
 
-        [Test]
-        [Ignore("We don't support duplicates anymore, this removing on save was a breaking change work around, this needs to be ported to a migration")]
-        public void Removes_Existing_Duplicates_On_Save()
+        using (var scope = ScopeProvider.CreateScope())
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
-
-            string providerKey = Guid.NewGuid().ToString("N");
-            DateTime latest = DateTime.Now.AddDays(-1);
-            DateTime oldest = DateTime.Now.AddDays(-10);
-
-            using (IScope scope = ScopeProvider.CreateScope())
+            // insert duplicates manuall
+            ScopeAccessor.AmbientScope.Database.Insert(new ExternalLoginDto
             {
-                // insert duplicates manuall
-                ScopeAccessor.AmbientScope.Database.Insert(new ExternalLoginDto
-                {
-                    UserOrMemberKey = user.Key,
-                    LoginProvider = "test1",
-                    ProviderKey = providerKey,
-                    CreateDate = latest
-                });
-                ScopeAccessor.AmbientScope.Database.Insert(new ExternalLoginDto
-                {
-                    UserOrMemberKey = user.Key,
-                    LoginProvider = "test1",
-                    ProviderKey = providerKey,
-                    CreateDate = oldest
-                });
-            }
-
-            // try to save 2 other duplicates
-            ExternalLogin[] externalLogins = new[]
+                UserOrMemberKey = user.Key,
+                LoginProvider = "test1",
+                ProviderKey = providerKey,
+                CreateDate = latest
+            });
+            ScopeAccessor.AmbientScope.Database.Insert(new ExternalLoginDto
             {
-                new ExternalLogin("test2", providerKey),
-                new ExternalLogin("test2", providerKey),
-                new ExternalLogin("test1", providerKey)
-            };
-
-            ExternalLoginService.Save(user.Key, externalLogins);
-
-            var logins = ExternalLoginService.GetExternalLogins(user.Key).ToList();
-
-            // duplicates will be removed, keeping the latest entries
-            Assert.AreEqual(2, logins.Count);
-
-            IIdentityUserLogin test1 = logins.Single(x => x.LoginProvider == "test1");
-            Assert.Greater(test1.CreateDate, latest);
+                UserOrMemberKey = user.Key,
+                LoginProvider = "test1",
+                ProviderKey = providerKey,
+                CreateDate = oldest
+            });
         }
 
-        [Test]
-        public void Does_Not_Persist_Duplicates()
+        // try to save 2 other duplicates
+        ExternalLogin[] externalLogins =
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
+            new ExternalLogin("test2", providerKey), new ExternalLogin("test2", providerKey),
+            new ExternalLogin("test1", providerKey)
+        };
 
-            string providerKey = Guid.NewGuid().ToString("N");
-            ExternalLogin[] externalLogins = new[]
-            {
-                new ExternalLogin("test1", providerKey),
-                new ExternalLogin("test1", providerKey)
-            };
+        ExternalLoginService.Save(user.Key, externalLogins);
 
-            ExternalLoginService.Save(user.Key, externalLogins);
+        var logins = ExternalLoginService.GetExternalLogins(user.Key).ToList();
 
-            var logins = ExternalLoginService.GetExternalLogins(user.Key).ToList();
-            Assert.AreEqual(1, logins.Count);
-        }
+        // duplicates will be removed, keeping the latest entries
+        Assert.AreEqual(2, logins.Count);
 
-        [Test]
-        public void Multiple_Update()
+        var test1 = logins.Single(x => x.LoginProvider == "test1");
+        Assert.Greater(test1.CreateDate, latest);
+    }
+
+    [Test]
+    public void Does_Not_Persist_Duplicates()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
+
+        var providerKey = Guid.NewGuid().ToString("N");
+        ExternalLogin[] externalLogins =
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
+            new ExternalLogin("test1", providerKey), new ExternalLogin("test1", providerKey)
+        };
 
-            string providerKey1 = Guid.NewGuid().ToString("N");
-            string providerKey2 = Guid.NewGuid().ToString("N");
-            ExternalLogin[] extLogins = new[]
-            {
-                new ExternalLogin("test1", providerKey1, "hello"),
-                new ExternalLogin("test2", providerKey2, "world")
-            };
-            ExternalLoginService.Save(user.Key, extLogins);
+        ExternalLoginService.Save(user.Key, externalLogins);
 
-            extLogins = new[]
-            {
-                new ExternalLogin("test1", providerKey1, "123456"),
-                new ExternalLogin("test2", providerKey2, "987654")
-            };
-            ExternalLoginService.Save(user.Key, extLogins);
+        var logins = ExternalLoginService.GetExternalLogins(user.Key).ToList();
+        Assert.AreEqual(1, logins.Count);
+    }
 
-            var found = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
-            Assert.AreEqual(2, found.Count);
-            Assert.AreEqual("123456", found[0].UserData);
-            Assert.AreEqual("987654", found[1].UserData);
-        }
+    [Test]
+    public void Multiple_Update()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
 
-        [Test]
-        public void Can_Find_As_Extended_Type()
+        var providerKey1 = Guid.NewGuid().ToString("N");
+        var providerKey2 = Guid.NewGuid().ToString("N");
+        ExternalLogin[] extLogins =
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
+            new ExternalLogin("test1", providerKey1, "hello"), new ExternalLogin("test2", providerKey2, "world")
+        };
+        ExternalLoginService.Save(user.Key, extLogins);
 
-            string providerKey1 = Guid.NewGuid().ToString("N");
-            string providerKey2 = Guid.NewGuid().ToString("N");
-            ExternalLogin[] extLogins = new[]
-            {
-                new ExternalLogin("test1", providerKey1, "hello"),
-                new ExternalLogin("test2", providerKey2, "world")
-            };
-            ExternalLoginService.Save(user.Key, extLogins);
-
-            var found = ExternalLoginService.Find("test2", providerKey2).ToList();
-            Assert.AreEqual(1, found.Count);
-            var asExtended = found.ToList();
-            Assert.AreEqual(1, found.Count);
-        }
-
-        [Test]
-        public void Add_Logins()
+        extLogins = new[]
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
+            new ExternalLogin("test1", providerKey1, "123456"), new ExternalLogin("test2", providerKey2, "987654")
+        };
+        ExternalLoginService.Save(user.Key, extLogins);
 
-            ExternalLogin[] externalLogins = new[]
-            {
-                new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
-                new ExternalLogin("test2", Guid.NewGuid().ToString("N"))
-            };
+        var found = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
+        Assert.AreEqual(2, found.Count);
+        Assert.AreEqual("123456", found[0].UserData);
+        Assert.AreEqual("987654", found[1].UserData);
+    }
 
-            ExternalLoginService.Save(user.Key, externalLogins);
+    [Test]
+    public void Can_Find_As_Extended_Type()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
 
-            var logins = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
-            Assert.AreEqual(2, logins.Count);
-            for (int i = 0; i < logins.Count; i++)
-            {
-                Assert.AreEqual(logins[i].ProviderKey, externalLogins[i].ProviderKey);
-                Assert.AreEqual(logins[i].LoginProvider, externalLogins[i].LoginProvider);
-            }
-        }
-
-        [Test]
-        public void Add_Tokens()
+        var providerKey1 = Guid.NewGuid().ToString("N");
+        var providerKey2 = Guid.NewGuid().ToString("N");
+        ExternalLogin[] extLogins =
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
+            new ExternalLogin("test1", providerKey1, "hello"), new ExternalLogin("test2", providerKey2, "world")
+        };
+        ExternalLoginService.Save(user.Key, extLogins);
 
-            ExternalLogin[] externalLogins = new[]
-            {
-                new ExternalLogin("test1", Guid.NewGuid().ToString("N"))
-            };
+        var found = ExternalLoginService.Find("test2", providerKey2).ToList();
+        Assert.AreEqual(1, found.Count);
+        var asExtended = found.ToList();
+        Assert.AreEqual(1, found.Count);
+    }
 
-            ExternalLoginService.Save(user.Key, externalLogins);
+    [Test]
+    public void Add_Logins()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
 
-            ExternalLoginToken[] externalTokens = new[]
-            {
-                new ExternalLoginToken(externalLogins[0].LoginProvider, "hello1", "world1"),
-                new ExternalLoginToken(externalLogins[0].LoginProvider, "hello2", "world2")
-            };
-
-            ExternalLoginService.Save(user.Key, externalTokens);
-
-            var tokens = ExternalLoginService.GetExternalLoginTokens(user.Key).ToList();
-            Assert.AreEqual(2, tokens.Count);
-        }
-
-        [Test]
-        public void Add_Update_Delete_Logins()
+        ExternalLogin[] externalLogins =
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
+            new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
+            new ExternalLogin("test2", Guid.NewGuid().ToString("N"))
+        };
 
-            ExternalLogin[] externalLogins = new[]
-            {
-                new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
-                new ExternalLogin("test2", Guid.NewGuid().ToString("N")),
-                new ExternalLogin("test3", Guid.NewGuid().ToString("N")),
-                new ExternalLogin("test4", Guid.NewGuid().ToString("N"))
-            };
+        ExternalLoginService.Save(user.Key, externalLogins);
 
-            ExternalLoginService.Save(user.Key, externalLogins);
-
-            var logins = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
-
-            logins.RemoveAt(0); // remove the first one
-            logins.Add(new IdentityUserLogin("test5", Guid.NewGuid().ToString("N"), user.Id.ToString())); // add a new one
-            logins[0].ProviderKey = "abcd123"; // update
-
-            // save new list
-            ExternalLoginService.Save(user.Key, logins.Select(x => new ExternalLogin(x.LoginProvider, x.ProviderKey)));
-
-            var updatedLogins = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
-            Assert.AreEqual(4, updatedLogins.Count);
-            for (int i = 0; i < updatedLogins.Count; i++)
-            {
-                Assert.AreEqual(logins[i].LoginProvider, updatedLogins[i].LoginProvider);
-                Assert.AreEqual(logins[i].ProviderKey, updatedLogins[i].ProviderKey);
-            }
-        }
-
-        [Test]
-        public void Add_Update_Delete_Tokens()
+        var logins = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
+        Assert.AreEqual(2, logins.Count);
+        for (var i = 0; i < logins.Count; i++)
         {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
-
-            ExternalLogin[] externalLogins = new[]
-            {
-                new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
-                new ExternalLogin("test2", Guid.NewGuid().ToString("N"))
-            };
-
-            ExternalLoginService.Save(user.Key, externalLogins);
-
-            ExternalLoginToken[] externalTokens = new[]
-            {
-                new ExternalLoginToken(externalLogins[0].LoginProvider, "hello1", "world1"),
-                new ExternalLoginToken(externalLogins[0].LoginProvider, "hello1a", "world1a"),
-                new ExternalLoginToken(externalLogins[1].LoginProvider, "hello2", "world2"),
-                new ExternalLoginToken(externalLogins[1].LoginProvider, "hello2a", "world2a")
-            };
-
-            ExternalLoginService.Save(user.Key, externalTokens);
-
-            var tokens = ExternalLoginService.GetExternalLoginTokens(user.Key).OrderBy(x => x.LoginProvider).ToList();
-
-            tokens.RemoveAt(0); // remove the first one
-            tokens.Add(new IdentityUserToken(externalLogins[1].LoginProvider, "hello2b", "world2b", user.Id.ToString())); // add a new one
-            tokens[0].Value = "abcd123"; // update
-
-            // save new list
-            ExternalLoginService.Save(user.Key, tokens.Select(x => new ExternalLoginToken(x.LoginProvider, x.Name, x.Value)));
-
-            var updatedTokens = ExternalLoginService.GetExternalLoginTokens(user.Key).OrderBy(x => x.LoginProvider).ToList();
-            Assert.AreEqual(4, updatedTokens.Count);
-            for (int i = 0; i < updatedTokens.Count; i++)
-            {
-                Assert.AreEqual(tokens[i].LoginProvider, updatedTokens[i].LoginProvider);
-                Assert.AreEqual(tokens[i].Name, updatedTokens[i].Name);
-                Assert.AreEqual(tokens[i].Value, updatedTokens[i].Value);
-            }
-        }
-
-        [Test]
-        public void Add_Retrieve_User_Data()
-        {
-            var user = new UserBuilder().Build();
-            UserService.Save(user);
-
-            ExternalLogin[] externalLogins = new[]
-            {
-                new ExternalLogin("test1", Guid.NewGuid().ToString("N"), "hello world")
-            };
-
-            ExternalLoginService.Save(user.Key, externalLogins);
-
-            var logins = ExternalLoginService.GetExternalLogins(user.Key).ToList();
-
-            Assert.AreEqual("hello world", logins[0].UserData);
+            Assert.AreEqual(logins[i].ProviderKey, externalLogins[i].ProviderKey);
+            Assert.AreEqual(logins[i].LoginProvider, externalLogins[i].LoginProvider);
         }
     }
+
+    [Test]
+    public void Add_Tokens()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
+
+        ExternalLogin[] externalLogins = { new ExternalLogin("test1", Guid.NewGuid().ToString("N")) };
+
+        ExternalLoginService.Save(user.Key, externalLogins);
+
+        ExternalLoginToken[] externalTokens =
+        {
+            new ExternalLoginToken(externalLogins[0].LoginProvider, "hello1", "world1"),
+            new ExternalLoginToken(externalLogins[0].LoginProvider, "hello2", "world2")
+        };
+
+        ExternalLoginService.Save(user.Key, externalTokens);
+
+        var tokens = ExternalLoginService.GetExternalLoginTokens(user.Key).ToList();
+        Assert.AreEqual(2, tokens.Count);
+    }
+
+    [Test]
+    public void Add_Update_Delete_Logins()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
+
+        ExternalLogin[] externalLogins =
+        {
+            new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
+            new ExternalLogin("test2", Guid.NewGuid().ToString("N")),
+            new ExternalLogin("test3", Guid.NewGuid().ToString("N")),
+            new ExternalLogin("test4", Guid.NewGuid().ToString("N"))
+        };
+
+        ExternalLoginService.Save(user.Key, externalLogins);
+
+        var logins = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
+
+        logins.RemoveAt(0); // remove the first one
+        logins.Add(new IdentityUserLogin("test5", Guid.NewGuid().ToString("N"), user.Id.ToString())); // add a new one
+        logins[0].ProviderKey = "abcd123"; // update
+
+        // save new list
+        ExternalLoginService.Save(user.Key, logins.Select(x => new ExternalLogin(x.LoginProvider, x.ProviderKey)));
+
+        var updatedLogins = ExternalLoginService.GetExternalLogins(user.Key).OrderBy(x => x.LoginProvider).ToList();
+        Assert.AreEqual(4, updatedLogins.Count);
+        for (var i = 0; i < updatedLogins.Count; i++)
+        {
+            Assert.AreEqual(logins[i].LoginProvider, updatedLogins[i].LoginProvider);
+            Assert.AreEqual(logins[i].ProviderKey, updatedLogins[i].ProviderKey);
+        }
+    }
+
+    [Test]
+    public void Add_Update_Delete_Tokens()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
+
+        ExternalLogin[] externalLogins =
+        {
+            new ExternalLogin("test1", Guid.NewGuid().ToString("N")),
+            new ExternalLogin("test2", Guid.NewGuid().ToString("N"))
+        };
+
+        ExternalLoginService.Save(user.Key, externalLogins);
+
+        ExternalLoginToken[] externalTokens =
+        {
+            new ExternalLoginToken(externalLogins[0].LoginProvider, "hello1", "world1"),
+            new ExternalLoginToken(externalLogins[0].LoginProvider, "hello1a", "world1a"),
+            new ExternalLoginToken(externalLogins[1].LoginProvider, "hello2", "world2"),
+            new ExternalLoginToken(externalLogins[1].LoginProvider, "hello2a", "world2a")
+        };
+
+        ExternalLoginService.Save(user.Key, externalTokens);
+
+        var tokens = ExternalLoginService.GetExternalLoginTokens(user.Key).OrderBy(x => x.LoginProvider).ToList();
+
+        tokens.RemoveAt(0); // remove the first one
+        tokens.Add(new IdentityUserToken(externalLogins[1].LoginProvider, "hello2b", "world2b",
+            user.Id.ToString())); // add a new one
+        tokens[0].Value = "abcd123"; // update
+
+        // save new list
+        ExternalLoginService.Save(user.Key,
+            tokens.Select(x => new ExternalLoginToken(x.LoginProvider, x.Name, x.Value)));
+
+        var updatedTokens = ExternalLoginService.GetExternalLoginTokens(user.Key).OrderBy(x => x.LoginProvider)
+            .ToList();
+        Assert.AreEqual(4, updatedTokens.Count);
+        for (var i = 0; i < updatedTokens.Count; i++)
+        {
+            Assert.AreEqual(tokens[i].LoginProvider, updatedTokens[i].LoginProvider);
+            Assert.AreEqual(tokens[i].Name, updatedTokens[i].Name);
+            Assert.AreEqual(tokens[i].Value, updatedTokens[i].Value);
+        }
+    }
+
+    [Test]
+    public void Add_Retrieve_User_Data()
+    {
+        var user = new UserBuilder().Build();
+        UserService.Save(user);
+
+        ExternalLogin[] externalLogins = { new ExternalLogin("test1", Guid.NewGuid().ToString("N"), "hello world") };
+
+        ExternalLoginService.Save(user.Key, externalLogins);
+
+        var logins = ExternalLoginService.GetExternalLogins(user.Key).ToList();
+
+        Assert.AreEqual("hello world", logins[0].UserData);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs
index 3a7c656d45..2491cdf3c6 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/FileServiceTests.cs
@@ -2,73 +2,70 @@
 // See LICENSE for more details.
 
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class FileServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class FileServiceTests : UmbracoIntegrationTest
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    [Test]
+    public void Create_Template_Then_Assign_Child()
     {
-        private IFileService FileService => GetRequiredService<IFileService>();
+        var child = FileService.CreateTemplateWithIdentity("Child", "child", "test");
+        var parent = FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
 
-        [Test]
-        public void Create_Template_Then_Assign_Child()
-        {
-            ITemplate child = FileService.CreateTemplateWithIdentity("Child", "child", "test");
-            ITemplate parent = FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
+        child.SetMasterTemplate(parent);
+        FileService.SaveTemplate(child);
 
-            child.SetMasterTemplate(parent);
-            FileService.SaveTemplate(child);
+        child = FileService.GetTemplate(child.Id);
 
-            child = FileService.GetTemplate(child.Id);
+        Assert.AreEqual(parent.Alias, child.MasterTemplateAlias);
+    }
 
-            Assert.AreEqual(parent.Alias, child.MasterTemplateAlias);
-        }
+    [Test]
+    public void Create_Template_With_Child_Then_Unassign()
+    {
+        var parent = FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
+        var child = FileService.CreateTemplateWithIdentity("Child", "child", "test", parent);
 
-        [Test]
-        public void Create_Template_With_Child_Then_Unassign()
-        {
-            ITemplate parent = FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
-            ITemplate child = FileService.CreateTemplateWithIdentity("Child", "child", "test", parent);
+        child.SetMasterTemplate(null);
+        FileService.SaveTemplate(child);
 
-            child.SetMasterTemplate(null);
-            FileService.SaveTemplate(child);
+        child = FileService.GetTemplate(child.Id);
 
-            child = FileService.GetTemplate(child.Id);
+        Assert.AreEqual(null, child.MasterTemplateAlias);
+    }
 
-            Assert.AreEqual(null, child.MasterTemplateAlias);
-        }
+    [Test]
+    public void Can_Query_Template_Children()
+    {
+        var parent = FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
+        var child1 = FileService.CreateTemplateWithIdentity("Child1", "child1", "test", parent);
+        var child2 = FileService.CreateTemplateWithIdentity("Child2", "child2", "test", parent);
 
-        [Test]
-        public void Can_Query_Template_Children()
-        {
-            ITemplate parent = FileService.CreateTemplateWithIdentity("Parent", "parent", "test");
-            ITemplate child1 = FileService.CreateTemplateWithIdentity("Child1", "child1", "test", parent);
-            ITemplate child2 = FileService.CreateTemplateWithIdentity("Child2", "child2", "test", parent);
+        var children = FileService.GetTemplates(parent.Id).Select(x => x.Id).ToArray();
 
-            int[] children = FileService.GetTemplates(parent.Id).Select(x => x.Id).ToArray();
+        Assert.IsTrue(children.Contains(child1.Id));
+        Assert.IsTrue(children.Contains(child2.Id));
+    }
 
-            Assert.IsTrue(children.Contains(child1.Id));
-            Assert.IsTrue(children.Contains(child2.Id));
-        }
+    [Test]
+    public void Create_Template_With_Custom_Alias()
+    {
+        var template = FileService.CreateTemplateWithIdentity("Test template", "customTemplateAlias", "test");
 
-        [Test]
-        public void Create_Template_With_Custom_Alias()
-        {
-            ITemplate template = FileService.CreateTemplateWithIdentity("Test template", "customTemplateAlias", "test");
+        FileService.SaveTemplate(template);
 
-            FileService.SaveTemplate(template);
+        template = FileService.GetTemplate(template.Id);
 
-            template = FileService.GetTemplate(template.Id);
-
-            Assert.AreEqual("Test template", template.Name);
-            Assert.AreEqual("customTemplateAlias", template.Alias);
-        }
+        Assert.AreEqual("Test template", template.Name);
+        Assert.AreEqual("customTemplateAlias", template.Alias);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs
index cd637ed557..b82eccc49e 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/KeyValueServiceTests.cs
@@ -1,106 +1,103 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+/// <summary>
+///     Tests covering methods in the KeyValueService class.
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class KeyValueServiceTests : UmbracoIntegrationTest
 {
-    /// <summary>
-    /// Tests covering methods in the KeyValueService class.
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class KeyValueServiceTests : UmbracoIntegrationTest
+    private IKeyValueService KeyValueService => GetRequiredService<IKeyValueService>();
+
+    [Test]
+    public void Can_Query_For_Key_Prefix()
     {
-        private IKeyValueService KeyValueService => GetRequiredService<IKeyValueService>();
+        // Arrange
+        KeyValueService.SetValue("test1", "hello1");
+        KeyValueService.SetValue("test2", "hello2");
+        KeyValueService.SetValue("test3", "hello3");
+        KeyValueService.SetValue("test4", "hello4");
+        KeyValueService.SetValue("someotherprefix1", "helloagain1");
+        // Act
+        var value = KeyValueService.FindByKeyPrefix("test");
 
-        [Test]
-        public void Can_Query_For_Key_Prefix()
-        {
-            // Arrange
-            KeyValueService.SetValue("test1", "hello1");
-            KeyValueService.SetValue("test2", "hello2");
-            KeyValueService.SetValue("test3", "hello3");
-            KeyValueService.SetValue("test4", "hello4");
-            KeyValueService.SetValue("someotherprefix1", "helloagain1");
-            // Act
-            IReadOnlyDictionary<string, string> value = KeyValueService.FindByKeyPrefix("test");
+        // Assert
 
-            // Assert
+        Assert.AreEqual(4, value.Count);
+        Assert.AreEqual("hello1", value["test1"]);
+        Assert.AreEqual("hello2", value["test2"]);
+        Assert.AreEqual("hello3", value["test3"]);
+        Assert.AreEqual("hello4", value["test4"]);
+    }
 
-            Assert.AreEqual(4, value.Count);
-            Assert.AreEqual("hello1", value["test1"]);
-            Assert.AreEqual("hello2", value["test2"]);
-            Assert.AreEqual("hello3", value["test3"]);
-            Assert.AreEqual("hello4", value["test4"]);
-        }
+    [Test]
+    public void GetValue_ForMissingKey_ReturnsNull()
+    {
+        // Act
+        var value = KeyValueService.GetValue("foo");
 
-        [Test]
-        public void GetValue_ForMissingKey_ReturnsNull()
-        {
-            // Act
-            string value = KeyValueService.GetValue("foo");
+        // Assert
+        Assert.IsNull(value);
+    }
 
-            // Assert
-            Assert.IsNull(value);
-        }
+    [Test]
+    public void GetValue_ForExistingKey_ReturnsValue()
+    {
+        KeyValueService.SetValue("foo", "bar");
 
-        [Test]
-        public void GetValue_ForExistingKey_ReturnsValue()
-        {
-            KeyValueService.SetValue("foo", "bar");
+        // Act
+        var value = KeyValueService.GetValue("foo");
 
-            // Act
-            string value = KeyValueService.GetValue("foo");
+        // Assert
+        Assert.AreEqual("bar", value);
+    }
 
-            // Assert
-            Assert.AreEqual("bar", value);
-        }
+    [Test]
+    public void SetValue_ForExistingKey_SavesValue()
+    {
+        KeyValueService.SetValue("foo", "bar");
 
-        [Test]
-        public void SetValue_ForExistingKey_SavesValue()
-        {
-            KeyValueService.SetValue("foo", "bar");
+        // Act
+        KeyValueService.SetValue("foo", "buzz");
+        var value = KeyValueService.GetValue("foo");
 
-            // Act
-            KeyValueService.SetValue("foo", "buzz");
-            string value = KeyValueService.GetValue("foo");
+        // Assert
+        Assert.AreEqual("buzz", value);
+    }
 
-            // Assert
-            Assert.AreEqual("buzz", value);
-        }
+    [Test]
+    public void TrySetValue_ForExistingKeyWithProvidedValue_ReturnsTrueAndSetsValue()
+    {
+        KeyValueService.SetValue("foo", "bar");
 
-        [Test]
-        public void TrySetValue_ForExistingKeyWithProvidedValue_ReturnsTrueAndSetsValue()
-        {
-            KeyValueService.SetValue("foo", "bar");
+        // Act
+        var result = KeyValueService.TrySetValue("foo", "bar", "buzz");
+        var value = KeyValueService.GetValue("foo");
 
-            // Act
-            bool result = KeyValueService.TrySetValue("foo", "bar", "buzz");
-            string value = KeyValueService.GetValue("foo");
+        // Assert
+        Assert.IsTrue(result);
+        Assert.AreEqual("buzz", value);
+    }
 
-            // Assert
-            Assert.IsTrue(result);
-            Assert.AreEqual("buzz", value);
-        }
+    [Test]
+    public void TrySetValue_ForExistingKeyWithoutProvidedValue_ReturnsFalseAndDoesNotSetValue()
+    {
+        KeyValueService.SetValue("foo", "bar");
 
-        [Test]
-        public void TrySetValue_ForExistingKeyWithoutProvidedValue_ReturnsFalseAndDoesNotSetValue()
-        {
-            KeyValueService.SetValue("foo", "bar");
+        // Act
+        var result = KeyValueService.TrySetValue("foo", "bang", "buzz");
+        var value = KeyValueService.GetValue("foo");
 
-            // Act
-            bool result = KeyValueService.TrySetValue("foo", "bang", "buzz");
-            string value = KeyValueService.GetValue("foo");
-
-            // Assert
-            Assert.IsFalse(result);
-            Assert.AreEqual("bar", value);
-        }
+        // Assert
+        Assert.IsFalse(result);
+        Assert.AreEqual("bar", value);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs
index 370c0ffd95..4621b9b63a 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/LocalizationServiceTests.cs
@@ -5,10 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Tests.Common.Builders;
@@ -16,456 +14,447 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+/// <summary>
+///     Tests covering all methods in the LocalizationService class.
+///     This is more of an integration test as it involves multiple layers
+///     as well as configuration.
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class LocalizationServiceTests : UmbracoIntegrationTest
 {
-    /// <summary>
-    /// Tests covering all methods in the LocalizationService class.
-    /// This is more of an integration test as it involves multiple layers
-    /// as well as configuration.
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class LocalizationServiceTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp() => CreateTestData();
+
+    private Guid _parentItemGuidId;
+    private int _parentItemIntId;
+    private Guid _childItemGuidId;
+    private int _childItemIntId;
+    private int _danishLangId;
+    private int _englishLangId;
+
+    private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+
+    [Test]
+    public void Can_Get_Root_Dictionary_Items()
     {
-        private Guid _parentItemGuidId;
-        private int _parentItemIntId;
-        private Guid _childItemGuidId;
-        private int _childItemIntId;
-        private int _danishLangId;
-        private int _englishLangId;
+        var rootItems = LocalizationService.GetRootDictionaryItems();
 
-        private ILocalizationService LocalizationService => GetRequiredService<ILocalizationService>();
+        Assert.NotNull(rootItems);
+        Assert.IsTrue(rootItems.Any());
+    }
 
-        [SetUp]
-        public void SetUp() => CreateTestData();
+    [Test]
+    public void Can_Determint_If_DictionaryItem_Exists()
+    {
+        var exists = LocalizationService.DictionaryItemExists("Parent");
+        Assert.IsTrue(exists);
+    }
 
-        [Test]
-        public void Can_Get_Root_Dictionary_Items()
+    [Test]
+    public void Can_Get_All_Languages()
+    {
+        var languages = LocalizationService.GetAllLanguages();
+        Assert.NotNull(languages);
+        Assert.IsTrue(languages.Any());
+        Assert.That(languages.Count(), Is.EqualTo(3));
+    }
+
+    [Test]
+    public void Can_Get_Dictionary_Item_By_Int_Id()
+    {
+        var parentItem = LocalizationService.GetDictionaryItemById(_parentItemIntId);
+        Assert.NotNull(parentItem);
+
+        var childItem = LocalizationService.GetDictionaryItemById(_childItemIntId);
+        Assert.NotNull(childItem);
+    }
+
+    [Test]
+    public void Can_Get_Dictionary_Item_By_Guid_Id()
+    {
+        var parentItem = LocalizationService.GetDictionaryItemById(_parentItemGuidId);
+        Assert.NotNull(parentItem);
+
+        var childItem = LocalizationService.GetDictionaryItemById(_childItemGuidId);
+        Assert.NotNull(childItem);
+    }
+
+    [Test]
+    public void Can_Get_Dictionary_Item_By_Key()
+    {
+        var parentItem = LocalizationService.GetDictionaryItemByKey("Parent");
+        Assert.NotNull(parentItem);
+
+        var childItem = LocalizationService.GetDictionaryItemByKey("Child");
+        Assert.NotNull(childItem);
+    }
+
+    [Test]
+    public void Can_Get_Dictionary_Item_Children()
+    {
+        var item = LocalizationService.GetDictionaryItemChildren(_parentItemGuidId);
+        Assert.NotNull(item);
+        Assert.That(item.Count(), Is.EqualTo(1));
+
+        foreach (var dictionaryItem in item)
         {
-            IEnumerable<IDictionaryItem> rootItems = LocalizationService.GetRootDictionaryItems();
-
-            Assert.NotNull(rootItems);
-            Assert.IsTrue(rootItems.Any());
-        }
-
-        [Test]
-        public void Can_Determint_If_DictionaryItem_Exists()
-        {
-            bool exists = LocalizationService.DictionaryItemExists("Parent");
-            Assert.IsTrue(exists);
-        }
-
-        [Test]
-        public void Can_Get_All_Languages()
-        {
-            IEnumerable<ILanguage> languages = LocalizationService.GetAllLanguages();
-            Assert.NotNull(languages);
-            Assert.IsTrue(languages.Any());
-            Assert.That(languages.Count(), Is.EqualTo(3));
-        }
-
-        [Test]
-        public void Can_Get_Dictionary_Item_By_Int_Id()
-        {
-            IDictionaryItem parentItem = LocalizationService.GetDictionaryItemById(_parentItemIntId);
-            Assert.NotNull(parentItem);
-
-            IDictionaryItem childItem = LocalizationService.GetDictionaryItemById(_childItemIntId);
-            Assert.NotNull(childItem);
-        }
-
-        [Test]
-        public void Can_Get_Dictionary_Item_By_Guid_Id()
-        {
-            IDictionaryItem parentItem = LocalizationService.GetDictionaryItemById(_parentItemGuidId);
-            Assert.NotNull(parentItem);
-
-            IDictionaryItem childItem = LocalizationService.GetDictionaryItemById(_childItemGuidId);
-            Assert.NotNull(childItem);
-        }
-
-        [Test]
-        public void Can_Get_Dictionary_Item_By_Key()
-        {
-            IDictionaryItem parentItem = LocalizationService.GetDictionaryItemByKey("Parent");
-            Assert.NotNull(parentItem);
-
-            IDictionaryItem childItem = LocalizationService.GetDictionaryItemByKey("Child");
-            Assert.NotNull(childItem);
-        }
-
-        [Test]
-        public void Can_Get_Dictionary_Item_Children()
-        {
-            IEnumerable<IDictionaryItem> item = LocalizationService.GetDictionaryItemChildren(_parentItemGuidId);
-            Assert.NotNull(item);
-            Assert.That(item.Count(), Is.EqualTo(1));
-
-            foreach (IDictionaryItem dictionaryItem in item)
-            {
-                Assert.AreEqual(_parentItemGuidId, dictionaryItem.ParentId);
-                Assert.IsFalse(string.IsNullOrEmpty(dictionaryItem.ItemKey));
-            }
-        }
-
-        [Test]
-        public void Can_Get_Dictionary_Item_Descendants()
-        {
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                ILanguage en = LocalizationService.GetLanguageById(_englishLangId);
-                ILanguage dk = LocalizationService.GetLanguageById(_danishLangId);
-
-                Guid currParentId = _childItemGuidId;
-                for (int i = 0; i < 25; i++)
-                {
-                    // Create 2 per level
-                    var desc1 = new DictionaryItem(currParentId, "D1" + i)
-                    {
-                        Translations = new List<IDictionaryTranslation>
-                        {
-                            new DictionaryTranslation(en, "ChildValue1 " + i),
-                            new DictionaryTranslation(dk, "BørnVærdi1 " + i)
-                        }
-                    };
-                    var desc2 = new DictionaryItem(currParentId, "D2" + i)
-                    {
-                        Translations = new List<IDictionaryTranslation>
-                        {
-                            new DictionaryTranslation(en, "ChildValue2 " + i),
-                            new DictionaryTranslation(dk, "BørnVærdi2 " + i)
-                        }
-                    };
-                    LocalizationService.Save(desc1);
-                    LocalizationService.Save(desc2);
-
-                    currParentId = desc1.Key;
-                }
-
-                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
-                ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
-
-                IDictionaryItem[] items = LocalizationService.GetDictionaryItemDescendants(_parentItemGuidId).ToArray();
-
-                Debug.WriteLine("SQL CALLS: " + ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().SqlCount);
-
-                Assert.AreEqual(51, items.Length);
-
-                // There's a call or two to get languages, so apart from that there should only be one call per level.
-                Assert.Less(ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().SqlCount, 30);
-            }
-        }
-
-        [Test]
-        public void Can_GetLanguageById()
-        {
-            ILanguage danish = LocalizationService.GetLanguageById(_danishLangId);
-            ILanguage english = LocalizationService.GetLanguageById(_englishLangId);
-            Assert.NotNull(danish);
-            Assert.NotNull(english);
-        }
-
-        [Test]
-        public void Can_GetLanguageByIsoCode()
-        {
-            ILanguage danish = LocalizationService.GetLanguageByIsoCode("da-DK");
-            ILanguage english = LocalizationService.GetLanguageByIsoCode("en-GB");
-            Assert.NotNull(danish);
-            Assert.NotNull(english);
-        }
-
-        [Test]
-        public void Does_Not_Fail_When_Language_Doesnt_Exist()
-        {
-            ILanguage language = LocalizationService.GetLanguageByIsoCode("sv-SE");
-            Assert.Null(language);
-        }
-
-        [Test]
-        public void Does_Not_Fail_When_DictionaryItem_Doesnt_Exist()
-        {
-            IDictionaryItem item = LocalizationService.GetDictionaryItemByKey("RandomKey");
-            Assert.Null(item);
-        }
-
-        [Test]
-        public void Can_Delete_Language()
-        {
-            ILanguage languageNbNo = new LanguageBuilder()
-                .WithCultureInfo("nb-NO")
-                .Build();
-            LocalizationService.Save(languageNbNo, 0);
-            Assert.That(languageNbNo.HasIdentity, Is.True);
-            int languageId = languageNbNo.Id;
-
-            LocalizationService.Delete(languageNbNo);
-
-            ILanguage language = LocalizationService.GetLanguageById(languageId);
-            Assert.Null(language);
-        }
-
-        [Test]
-        public void Can_Delete_Language_Used_As_Fallback()
-        {
-            ILanguage languageDaDk = LocalizationService.GetLanguageByIsoCode("da-DK");
-            ILanguage languageNbNo = new LanguageBuilder()
-                .WithCultureInfo("nb-NO")
-                .WithFallbackLanguageId(languageDaDk.Id)
-                .Build();
-            LocalizationService.Save(languageNbNo, 0);
-            int languageId = languageDaDk.Id;
-
-            LocalizationService.Delete(languageDaDk);
-
-            ILanguage language = LocalizationService.GetLanguageById(languageId);
-            Assert.Null(language);
-        }
-
-        [Test]
-        public void Can_Create_DictionaryItem_At_Root()
-        {
-            ILanguage english = LocalizationService.GetLanguageByIsoCode("en-US");
-
-            var item = (IDictionaryItem)new DictionaryItem("Testing123")
-            {
-                Translations = new List<IDictionaryTranslation>
-                               {
-                                   new DictionaryTranslation(english, "Hello world")
-                               }
-            };
-            LocalizationService.Save(item);
-
-            // re-get
-            item = LocalizationService.GetDictionaryItemById(item.Id);
-
-            Assert.Greater(item.Id, 0);
-            Assert.IsTrue(item.HasIdentity);
-            Assert.IsFalse(item.ParentId.HasValue);
-            Assert.AreEqual("Testing123", item.ItemKey);
-            Assert.AreEqual(1, item.Translations.Count());
-        }
-
-        [Test]
-        public void Can_Create_DictionaryItem_At_Root_With_Identity()
-        {
-            IDictionaryItem item = LocalizationService.CreateDictionaryItemWithIdentity(
-                "Testing12345", null, "Hellooooo");
-
-            // re-get
-            item = LocalizationService.GetDictionaryItemById(item.Id);
-
-            Assert.IsNotNull(item);
-            Assert.Greater(item.Id, 0);
-            Assert.IsTrue(item.HasIdentity);
-            Assert.IsFalse(item.ParentId.HasValue);
-            Assert.AreEqual("Testing12345", item.ItemKey);
-            IEnumerable<ILanguage> allLangs = LocalizationService.GetAllLanguages();
-            Assert.Greater(allLangs.Count(), 0);
-            foreach (ILanguage language in allLangs)
-            {
-                Assert.AreEqual("Hellooooo", item.Translations.Single(x => x.Language.CultureName == language.CultureName).Value);
-            }
-        }
-
-        [Test]
-        public void Can_Add_Translation_To_Existing_Dictionary_Item()
-        {
-            ILanguage english = LocalizationService.GetLanguageByIsoCode("en-US");
-
-            var item = (IDictionaryItem)new DictionaryItem("Testing123");
-            LocalizationService.Save(item);
-
-            // re-get
-            item = LocalizationService.GetDictionaryItemById(item.Id);
-
-            item.Translations = new List<IDictionaryTranslation>
-            {
-                new DictionaryTranslation(english, "Hello world")
-            };
-
-            LocalizationService.Save(item);
-
-            Assert.AreEqual(1, item.Translations.Count());
-            foreach (IDictionaryTranslation translation in item.Translations)
-            {
-                Assert.AreEqual("Hello world", translation.Value);
-            }
-
-            item.Translations = new List<IDictionaryTranslation>(item.Translations)
-            {
-                new DictionaryTranslation(
-                    LocalizationService.GetLanguageByIsoCode("en-GB"),
-                    "My new value")
-            };
-
-            LocalizationService.Save(item);
-
-            // re-get
-            item = LocalizationService.GetDictionaryItemById(item.Id);
-
-            Assert.AreEqual(2, item.Translations.Count());
-            Assert.AreEqual("Hello world", item.Translations.First().Value);
-            Assert.AreEqual("My new value", item.Translations.Last().Value);
-        }
-
-        [Test]
-        public void Can_Delete_DictionaryItem()
-        {
-            IDictionaryItem item = LocalizationService.GetDictionaryItemByKey("Child");
-            Assert.NotNull(item);
-
-            LocalizationService.Delete(item);
-
-            IDictionaryItem deletedItem = LocalizationService.GetDictionaryItemByKey("Child");
-            Assert.Null(deletedItem);
-        }
-
-        [Test]
-        public void Can_Update_Existing_DictionaryItem()
-        {
-            IDictionaryItem item = LocalizationService.GetDictionaryItemByKey("Child");
-            foreach (IDictionaryTranslation translation in item.Translations)
-            {
-                translation.Value += "UPDATED";
-            }
-
-            LocalizationService.Save(item);
-
-            IDictionaryItem updatedItem = LocalizationService.GetDictionaryItemByKey("Child");
-            Assert.NotNull(updatedItem);
-
-            foreach (IDictionaryTranslation translation in updatedItem.Translations)
-            {
-                Assert.That(translation.Value.EndsWith("UPDATED"), Is.True);
-            }
-        }
-
-        [Test]
-        public void Find_BaseData_Language()
-        {
-            // Act
-            IEnumerable<ILanguage> languages = LocalizationService.GetAllLanguages();
-
-            // Assert
-            Assert.That(3, Is.EqualTo(languages.Count()));
-        }
-
-        [Test]
-        public void Save_Language_And_GetLanguageByIsoCode()
-        {
-            // Arrange
-            string isoCode = "en-AU";
-            ILanguage languageEnAu = new LanguageBuilder()
-                .WithCultureInfo(isoCode)
-                .Build();
-
-            // Act
-            LocalizationService.Save(languageEnAu);
-            ILanguage result = LocalizationService.GetLanguageByIsoCode(isoCode);
-
-            // Assert
-            Assert.NotNull(result);
-        }
-
-        [Test]
-        public void Save_Language_And_GetLanguageById()
-        {
-            // Arrange
-            ILanguage languageEnAu = new LanguageBuilder()
-                .WithCultureInfo("en-AU")
-                .Build();
-
-            // Act
-            LocalizationService.Save(languageEnAu);
-            ILanguage result = LocalizationService.GetLanguageById(languageEnAu.Id);
-
-            // Assert
-            Assert.NotNull(result);
-        }
-
-        [Test]
-        public void Set_Default_Language()
-        {
-            ILanguage languageEnAu = new LanguageBuilder()
-                .WithCultureInfo("en-AU")
-                .WithIsDefault(true)
-                .Build();
-            LocalizationService.Save(languageEnAu);
-            ILanguage result = LocalizationService.GetLanguageById(languageEnAu.Id);
-
-            Assert.IsTrue(result.IsDefault);
-
-            ILanguage languageEnNz = new LanguageBuilder()
-                .WithCultureInfo("en-NZ")
-                .WithIsDefault(true)
-                .Build();
-            LocalizationService.Save(languageEnNz);
-            ILanguage result2 = LocalizationService.GetLanguageById(languageEnNz.Id);
-
-            // re-get
-            result = LocalizationService.GetLanguageById(languageEnAu.Id);
-
-            Assert.IsTrue(result2.IsDefault);
-            Assert.IsFalse(result.IsDefault);
-        }
-
-        [Test]
-        public void Deleted_Language_Should_Not_Exist()
-        {
-            string isoCode = "en-AU";
-            ILanguage languageEnAu = new LanguageBuilder()
-                .WithCultureInfo(isoCode)
-                .Build();
-            LocalizationService.Save(languageEnAu);
-
-            // Act
-            LocalizationService.Delete(languageEnAu);
-            ILanguage result = LocalizationService.GetLanguageByIsoCode(isoCode);
-
-            // Assert
-            Assert.Null(result);
-        }
-
-        public void CreateTestData()
-        {
-            ILanguage languageDaDk = new LanguageBuilder()
-                .WithCultureInfo("da-DK")
-                .Build();
-            ILanguage languageEnGb = new LanguageBuilder()
-                .WithCultureInfo("en-GB")
-                .Build();
-
-            LocalizationService.Save(languageDaDk, 0);
-            LocalizationService.Save(languageEnGb, 0);
-            _danishLangId = languageDaDk.Id;
-            _englishLangId = languageEnGb.Id;
-
-            var parentItem = new DictionaryItem("Parent")
-            {
-                Translations = new List<IDictionaryTranslation>
-                    {
-                        new DictionaryTranslation(languageEnGb, "ParentValue"),
-                        new DictionaryTranslation(languageDaDk, "ForældreVærdi")
-                    }
-            };
-            LocalizationService.Save(parentItem);
-            _parentItemGuidId = parentItem.Key;
-            _parentItemIntId = parentItem.Id;
-
-            var childItem = new DictionaryItem(parentItem.Key, "Child")
-            {
-                Translations = new List<IDictionaryTranslation>
-                    {
-                        new DictionaryTranslation(languageEnGb, "ChildValue"),
-                        new DictionaryTranslation(languageDaDk, "BørnVærdi")
-                    }
-            };
-            LocalizationService.Save(childItem);
-            _childItemGuidId = childItem.Key;
-            _childItemIntId = childItem.Id;
+            Assert.AreEqual(_parentItemGuidId, dictionaryItem.ParentId);
+            Assert.IsFalse(string.IsNullOrEmpty(dictionaryItem.ItemKey));
         }
     }
+
+    [Test]
+    public void Can_Get_Dictionary_Item_Descendants()
+    {
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            var en = LocalizationService.GetLanguageById(_englishLangId);
+            var dk = LocalizationService.GetLanguageById(_danishLangId);
+
+            var currParentId = _childItemGuidId;
+            for (var i = 0; i < 25; i++)
+            {
+                // Create 2 per level
+                var desc1 = new DictionaryItem(currParentId, "D1" + i)
+                {
+                    Translations = new List<IDictionaryTranslation>
+                    {
+                        new DictionaryTranslation(en, "ChildValue1 " + i),
+                        new DictionaryTranslation(dk, "BørnVærdi1 " + i)
+                    }
+                };
+                var desc2 = new DictionaryItem(currParentId, "D2" + i)
+                {
+                    Translations = new List<IDictionaryTranslation>
+                    {
+                        new DictionaryTranslation(en, "ChildValue2 " + i),
+                        new DictionaryTranslation(dk, "BørnVærdi2 " + i)
+                    }
+                };
+                LocalizationService.Save(desc1);
+                LocalizationService.Save(desc2);
+
+                currParentId = desc1.Key;
+            }
+
+            ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlTrace = true;
+            ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().EnableSqlCount = true;
+
+            var items = LocalizationService.GetDictionaryItemDescendants(_parentItemGuidId).ToArray();
+
+            Debug.WriteLine("SQL CALLS: " + ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().SqlCount);
+
+            Assert.AreEqual(51, items.Length);
+
+            // There's a call or two to get languages, so apart from that there should only be one call per level.
+            Assert.Less(ScopeAccessor.AmbientScope.Database.AsUmbracoDatabase().SqlCount, 30);
+        }
+    }
+
+    [Test]
+    public void Can_GetLanguageById()
+    {
+        var danish = LocalizationService.GetLanguageById(_danishLangId);
+        var english = LocalizationService.GetLanguageById(_englishLangId);
+        Assert.NotNull(danish);
+        Assert.NotNull(english);
+    }
+
+    [Test]
+    public void Can_GetLanguageByIsoCode()
+    {
+        var danish = LocalizationService.GetLanguageByIsoCode("da-DK");
+        var english = LocalizationService.GetLanguageByIsoCode("en-GB");
+        Assert.NotNull(danish);
+        Assert.NotNull(english);
+    }
+
+    [Test]
+    public void Does_Not_Fail_When_Language_Doesnt_Exist()
+    {
+        var language = LocalizationService.GetLanguageByIsoCode("sv-SE");
+        Assert.Null(language);
+    }
+
+    [Test]
+    public void Does_Not_Fail_When_DictionaryItem_Doesnt_Exist()
+    {
+        var item = LocalizationService.GetDictionaryItemByKey("RandomKey");
+        Assert.Null(item);
+    }
+
+    [Test]
+    public void Can_Delete_Language()
+    {
+        var languageNbNo = new LanguageBuilder()
+            .WithCultureInfo("nb-NO")
+            .Build();
+        LocalizationService.Save(languageNbNo, 0);
+        Assert.That(languageNbNo.HasIdentity, Is.True);
+        var languageId = languageNbNo.Id;
+
+        LocalizationService.Delete(languageNbNo);
+
+        var language = LocalizationService.GetLanguageById(languageId);
+        Assert.Null(language);
+    }
+
+    [Test]
+    public void Can_Delete_Language_Used_As_Fallback()
+    {
+        var languageDaDk = LocalizationService.GetLanguageByIsoCode("da-DK");
+        var languageNbNo = new LanguageBuilder()
+            .WithCultureInfo("nb-NO")
+            .WithFallbackLanguageId(languageDaDk.Id)
+            .Build();
+        LocalizationService.Save(languageNbNo, 0);
+        var languageId = languageDaDk.Id;
+
+        LocalizationService.Delete(languageDaDk);
+
+        var language = LocalizationService.GetLanguageById(languageId);
+        Assert.Null(language);
+    }
+
+    [Test]
+    public void Can_Create_DictionaryItem_At_Root()
+    {
+        var english = LocalizationService.GetLanguageByIsoCode("en-US");
+
+        var item = (IDictionaryItem)new DictionaryItem("Testing123")
+        {
+            Translations = new List<IDictionaryTranslation> { new DictionaryTranslation(english, "Hello world") }
+        };
+        LocalizationService.Save(item);
+
+        // re-get
+        item = LocalizationService.GetDictionaryItemById(item.Id);
+
+        Assert.Greater(item.Id, 0);
+        Assert.IsTrue(item.HasIdentity);
+        Assert.IsFalse(item.ParentId.HasValue);
+        Assert.AreEqual("Testing123", item.ItemKey);
+        Assert.AreEqual(1, item.Translations.Count());
+    }
+
+    [Test]
+    public void Can_Create_DictionaryItem_At_Root_With_Identity()
+    {
+        var item = LocalizationService.CreateDictionaryItemWithIdentity(
+            "Testing12345", null, "Hellooooo");
+
+        // re-get
+        item = LocalizationService.GetDictionaryItemById(item.Id);
+
+        Assert.IsNotNull(item);
+        Assert.Greater(item.Id, 0);
+        Assert.IsTrue(item.HasIdentity);
+        Assert.IsFalse(item.ParentId.HasValue);
+        Assert.AreEqual("Testing12345", item.ItemKey);
+        var allLangs = LocalizationService.GetAllLanguages();
+        Assert.Greater(allLangs.Count(), 0);
+        foreach (var language in allLangs)
+        {
+            Assert.AreEqual("Hellooooo",
+                item.Translations.Single(x => x.Language.CultureName == language.CultureName).Value);
+        }
+    }
+
+    [Test]
+    public void Can_Add_Translation_To_Existing_Dictionary_Item()
+    {
+        var english = LocalizationService.GetLanguageByIsoCode("en-US");
+
+        var item = (IDictionaryItem)new DictionaryItem("Testing123");
+        LocalizationService.Save(item);
+
+        // re-get
+        item = LocalizationService.GetDictionaryItemById(item.Id);
+
+        item.Translations = new List<IDictionaryTranslation> { new DictionaryTranslation(english, "Hello world") };
+
+        LocalizationService.Save(item);
+
+        Assert.AreEqual(1, item.Translations.Count());
+        foreach (var translation in item.Translations)
+        {
+            Assert.AreEqual("Hello world", translation.Value);
+        }
+
+        item.Translations = new List<IDictionaryTranslation>(item.Translations)
+        {
+            new DictionaryTranslation(
+                LocalizationService.GetLanguageByIsoCode("en-GB"),
+                "My new value")
+        };
+
+        LocalizationService.Save(item);
+
+        // re-get
+        item = LocalizationService.GetDictionaryItemById(item.Id);
+
+        Assert.AreEqual(2, item.Translations.Count());
+        Assert.AreEqual("Hello world", item.Translations.First().Value);
+        Assert.AreEqual("My new value", item.Translations.Last().Value);
+    }
+
+    [Test]
+    public void Can_Delete_DictionaryItem()
+    {
+        var item = LocalizationService.GetDictionaryItemByKey("Child");
+        Assert.NotNull(item);
+
+        LocalizationService.Delete(item);
+
+        var deletedItem = LocalizationService.GetDictionaryItemByKey("Child");
+        Assert.Null(deletedItem);
+    }
+
+    [Test]
+    public void Can_Update_Existing_DictionaryItem()
+    {
+        var item = LocalizationService.GetDictionaryItemByKey("Child");
+        foreach (var translation in item.Translations)
+        {
+            translation.Value += "UPDATED";
+        }
+
+        LocalizationService.Save(item);
+
+        var updatedItem = LocalizationService.GetDictionaryItemByKey("Child");
+        Assert.NotNull(updatedItem);
+
+        foreach (var translation in updatedItem.Translations)
+        {
+            Assert.That(translation.Value.EndsWith("UPDATED"), Is.True);
+        }
+    }
+
+    [Test]
+    public void Find_BaseData_Language()
+    {
+        // Act
+        var languages = LocalizationService.GetAllLanguages();
+
+        // Assert
+        Assert.That(3, Is.EqualTo(languages.Count()));
+    }
+
+    [Test]
+    public void Save_Language_And_GetLanguageByIsoCode()
+    {
+        // Arrange
+        var isoCode = "en-AU";
+        var languageEnAu = new LanguageBuilder()
+            .WithCultureInfo(isoCode)
+            .Build();
+
+        // Act
+        LocalizationService.Save(languageEnAu);
+        var result = LocalizationService.GetLanguageByIsoCode(isoCode);
+
+        // Assert
+        Assert.NotNull(result);
+    }
+
+    [Test]
+    public void Save_Language_And_GetLanguageById()
+    {
+        // Arrange
+        var languageEnAu = new LanguageBuilder()
+            .WithCultureInfo("en-AU")
+            .Build();
+
+        // Act
+        LocalizationService.Save(languageEnAu);
+        var result = LocalizationService.GetLanguageById(languageEnAu.Id);
+
+        // Assert
+        Assert.NotNull(result);
+    }
+
+    [Test]
+    public void Set_Default_Language()
+    {
+        var languageEnAu = new LanguageBuilder()
+            .WithCultureInfo("en-AU")
+            .WithIsDefault(true)
+            .Build();
+        LocalizationService.Save(languageEnAu);
+        var result = LocalizationService.GetLanguageById(languageEnAu.Id);
+
+        Assert.IsTrue(result.IsDefault);
+
+        var languageEnNz = new LanguageBuilder()
+            .WithCultureInfo("en-NZ")
+            .WithIsDefault(true)
+            .Build();
+        LocalizationService.Save(languageEnNz);
+        var result2 = LocalizationService.GetLanguageById(languageEnNz.Id);
+
+        // re-get
+        result = LocalizationService.GetLanguageById(languageEnAu.Id);
+
+        Assert.IsTrue(result2.IsDefault);
+        Assert.IsFalse(result.IsDefault);
+    }
+
+    [Test]
+    public void Deleted_Language_Should_Not_Exist()
+    {
+        var isoCode = "en-AU";
+        var languageEnAu = new LanguageBuilder()
+            .WithCultureInfo(isoCode)
+            .Build();
+        LocalizationService.Save(languageEnAu);
+
+        // Act
+        LocalizationService.Delete(languageEnAu);
+        var result = LocalizationService.GetLanguageByIsoCode(isoCode);
+
+        // Assert
+        Assert.Null(result);
+    }
+
+    public void CreateTestData()
+    {
+        var languageDaDk = new LanguageBuilder()
+            .WithCultureInfo("da-DK")
+            .Build();
+        var languageEnGb = new LanguageBuilder()
+            .WithCultureInfo("en-GB")
+            .Build();
+
+        LocalizationService.Save(languageDaDk, 0);
+        LocalizationService.Save(languageEnGb, 0);
+        _danishLangId = languageDaDk.Id;
+        _englishLangId = languageEnGb.Id;
+
+        var parentItem = new DictionaryItem("Parent")
+        {
+            Translations = new List<IDictionaryTranslation>
+            {
+                new DictionaryTranslation(languageEnGb, "ParentValue"),
+                new DictionaryTranslation(languageDaDk, "ForældreVærdi")
+            }
+        };
+        LocalizationService.Save(parentItem);
+        _parentItemGuidId = parentItem.Key;
+        _parentItemIntId = parentItem.Id;
+
+        var childItem = new DictionaryItem(parentItem.Key, "Child")
+        {
+            Translations = new List<IDictionaryTranslation>
+            {
+                new DictionaryTranslation(languageEnGb, "ChildValue"),
+                new DictionaryTranslation(languageDaDk, "BørnVærdi")
+            }
+        };
+        LocalizationService.Save(childItem);
+        _childItemGuidId = childItem.Key;
+        _childItemIntId = childItem.Id;
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs
index bd233e5243..da6f40d9ac 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MacroServiceTests.cs
@@ -2,14 +2,12 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
@@ -18,250 +16,249 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class MacroServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class MacroServiceTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetupTest()
     {
-        [Obsolete("After merging IMacroWithAliasService interface with IMacroService in Umbraco 11, this should go back to just being GetRequiredService<IMacroService>()")]
-        private IMacroWithAliasService MacroService => GetRequiredService<IMacroService>() as IMacroWithAliasService;
-
-        [SetUp]
-        public void SetupTest()
+        var scopeProvider = ScopeProvider;
+        using (var scope = scopeProvider.CreateScope())
         {
-            IScopeProvider scopeProvider = ScopeProvider;
-            using (IScope scope = scopeProvider.CreateScope())
-            {
-                var repository = new MacroRepository((IScopeAccessor)scopeProvider, AppCaches.Disabled, Mock.Of<ILogger<MacroRepository>>(), ShortStringHelper);
+            var repository = new MacroRepository((IScopeAccessor)scopeProvider, AppCaches.Disabled,
+                Mock.Of<ILogger<MacroRepository>>(), ShortStringHelper);
 
-                repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
-                repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
-                repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
-                scope.Complete();
-            }
+            repository.Save(new Macro(ShortStringHelper, "test1", "Test1", "~/views/macropartials/test1.cshtml"));
+            repository.Save(new Macro(ShortStringHelper, "test2", "Test2", "~/views/macropartials/test2.cshtml"));
+            repository.Save(new Macro(ShortStringHelper, "test3", "Tet3", "~/views/macropartials/test3.cshtml"));
+            scope.Complete();
         }
-
-        [Test]
-        public void Can_Get_By_Alias()
-        {
-            // Act
-            IMacro macro = MacroService.GetByAlias("test1");
-
-            // Assert
-            Assert.IsNotNull(macro);
-            Assert.AreEqual("Test1", macro.Name);
-        }
-
-        [Test]
-        public void Can_Get_By_Aliases()
-        {
-            // Act
-            IEnumerable<IMacro> macros = MacroService.GetAll("test1", "test2");
-
-            // Assert
-            Assert.IsNotNull(macros);
-            Assert.AreEqual(2, macros.Count());
-            Assert.AreEqual("Test1", macros.ToArray()[0].Name);
-            Assert.AreEqual("Test2", macros.ToArray()[1].Name);
-        }
-
-        [Test]
-        public void Can_Get_All()
-        {
-            // Act
-            IEnumerable<IMacro> result = MacroService.GetAll();
-
-            // Assert
-            Assert.AreEqual(3, result.Count());
-        }
-
-        [Test]
-        public void Can_Create()
-        {
-            // Act
-            IMacro macro = CreateMacro();
-            MacroService.Save(macro);
-
-            // Assert
-            Assert.IsTrue(macro.HasIdentity);
-            Assert.Greater(macro.Id, 0);
-            Assert.AreNotEqual(Guid.Empty, macro.Key);
-            IMacro result = MacroService.GetById(macro.Id);
-            Assert.AreEqual("test", result.Alias);
-            Assert.AreEqual("Test", result.Name);
-            Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
-            Assert.AreEqual(1234, result.CacheDuration);
-
-            result = MacroService.GetById(macro.Key);
-            Assert.AreEqual("test", result.Alias);
-            Assert.AreEqual("Test", result.Name);
-            Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
-            Assert.AreEqual(1234, result.CacheDuration);
-        }
-
-        [Test]
-        public void Can_Delete()
-        {
-            // Arrange
-            var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml", cacheDuration: 1234);
-            MacroService.Save(macro);
-
-            // Act
-            MacroService.Delete(macro);
-
-            // Assert
-            IMacro result = MacroService.GetById(macro.Id);
-            Assert.IsNull(result);
-
-            result = MacroService.GetById(macro.Key);
-            Assert.IsNull(result);
-        }
-
-        [Test]
-        public void Can_Update()
-        {
-            // Arrange
-            IMacro macro = CreateMacro();
-            MacroService.Save(macro);
-
-            // Act
-            Guid currKey = macro.Key;
-            macro.Name = "New name";
-            macro.Alias = "NewAlias";
-            MacroService.Save(macro);
-
-            macro = MacroService.GetById(macro.Id);
-
-            // Assert
-            Assert.AreEqual("New name", macro.Name);
-            Assert.AreEqual("NewAlias", macro.Alias);
-            Assert.AreEqual(currKey, macro.Key);
-        }
-
-        [Test]
-        public void Can_Update_Property()
-        {
-            // Arrange
-            IMacro macro = CreateMacro();
-            macro.Properties.Add(new MacroProperty("blah", "Blah", 0, "blah"));
-            MacroService.Save(macro);
-
-            Assert.AreNotEqual(Guid.Empty, macro.Properties[0].Key);
-
-            // Act
-            Guid currPropKey = macro.Properties[0].Key;
-            macro.Properties[0].Alias = "new Alias";
-            macro.Properties[0].Name = "new Name";
-            macro.Properties[0].SortOrder = 1;
-            macro.Properties[0].EditorAlias = "new";
-            MacroService.Save(macro);
-
-            macro = MacroService.GetById(macro.Id);
-
-            // Assert
-            Assert.AreEqual(1, macro.Properties.Count);
-            Assert.AreEqual(currPropKey, macro.Properties[0].Key);
-            Assert.AreEqual("new Alias", macro.Properties[0].Alias);
-            Assert.AreEqual("new Name", macro.Properties[0].Name);
-            Assert.AreEqual(1, macro.Properties[0].SortOrder);
-            Assert.AreEqual("new", macro.Properties[0].EditorAlias);
-            Assert.AreEqual(currPropKey, macro.Properties[0].Key);
-        }
-
-        [Test]
-        public void Can_Update_Remove_Property()
-        {
-            // Arrange
-            IMacro macro = CreateMacro();
-            macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
-            macro.Properties.Add(new MacroProperty("blah2", "Blah2", 1, "blah2"));
-            macro.Properties.Add(new MacroProperty("blah3", "Blah3", 2, "blah3"));
-            MacroService.Save(macro);
-
-            Guid lastKey = macro.Properties[0].Key;
-            for (int i = 1; i < macro.Properties.Count; i++)
-            {
-                Assert.AreNotEqual(Guid.Empty, macro.Properties[i].Key);
-                Assert.AreNotEqual(lastKey, macro.Properties[i].Key);
-                lastKey = macro.Properties[i].Key;
-            }
-
-            // Act
-            macro.Properties["blah1"].Alias = "newAlias";
-            macro.Properties["blah1"].Name = "new Name";
-            macro.Properties["blah1"].SortOrder = 1;
-            macro.Properties["blah1"].EditorAlias = "new";
-            macro.Properties.Remove("blah3");
-
-            var allPropKeys = macro.Properties.Values.Select(x => new { x.Alias, x.Key }).ToArray();
-
-            MacroService.Save(macro);
-
-            macro = MacroService.GetById(macro.Id);
-
-            // Assert
-            Assert.AreEqual(2, macro.Properties.Count);
-            Assert.AreEqual("newAlias", macro.Properties["newAlias"].Alias);
-            Assert.AreEqual("new Name", macro.Properties["newAlias"].Name);
-            Assert.AreEqual(1, macro.Properties["newAlias"].SortOrder);
-            Assert.AreEqual("new", macro.Properties["newAlias"].EditorAlias);
-            foreach (var propKey in allPropKeys)
-            {
-                Assert.AreEqual(propKey.Key, macro.Properties[propKey.Alias].Key);
-            }
-        }
-
-        [Test]
-        public void Can_Add_And_Remove_Properties()
-        {
-            IMacro macro = CreateMacro();
-
-            // Adds some properties
-            macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
-            macro.Properties.Add(new MacroProperty("blah2", "Blah2", 0, "blah2"));
-            macro.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
-            macro.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
-            MacroService.Save(macro);
-
-            IMacro result1 = MacroService.GetById(macro.Id);
-            Assert.AreEqual(4, result1.Properties.Values.Count());
-
-            // Simulate clearing the sections
-            foreach (IMacroProperty s in result1.Properties.Values.ToArray())
-            {
-                result1.Properties.Remove(s.Alias);
-            }
-
-            // Now just re-add a couple
-            result1.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
-            result1.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
-            MacroService.Save(result1);
-
-            // Assert
-            result1 = MacroService.GetById(result1.Id);
-            Assert.AreEqual(2, result1.Properties.Values.Count());
-        }
-
-        [Test]
-        public void Cannot_Save_Macro_With_Empty_Name()
-        {
-            // Arrange
-            IMacro macro = CreateMacro(name: string.Empty);
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => MacroService.Save(macro));
-        }
-
-        private static IMacro CreateMacro(string name = "Test") =>
-            new MacroBuilder()
-                .WithAlias("test")
-                .WithName(name)
-                .WithSource("~/Views/MacroPartials/Test.cshtml")
-                .WithCacheDuration(1234)
-                .Build();
     }
+
+    [Obsolete(
+        "After merging IMacroWithAliasService interface with IMacroService in Umbraco 11, this should go back to just being GetRequiredService<IMacroService>()")]
+    private IMacroWithAliasService MacroService => GetRequiredService<IMacroService>() as IMacroWithAliasService;
+
+    [Test]
+    public void Can_Get_By_Alias()
+    {
+        // Act
+        var macro = MacroService.GetByAlias("test1");
+
+        // Assert
+        Assert.IsNotNull(macro);
+        Assert.AreEqual("Test1", macro.Name);
+    }
+
+    [Test]
+    public void Can_Get_By_Aliases()
+    {
+        // Act
+        var macros = MacroService.GetAll("test1", "test2");
+
+        // Assert
+        Assert.IsNotNull(macros);
+        Assert.AreEqual(2, macros.Count());
+        Assert.AreEqual("Test1", macros.ToArray()[0].Name);
+        Assert.AreEqual("Test2", macros.ToArray()[1].Name);
+    }
+
+    [Test]
+    public void Can_Get_All()
+    {
+        // Act
+        var result = MacroService.GetAll();
+
+        // Assert
+        Assert.AreEqual(3, result.Count());
+    }
+
+    [Test]
+    public void Can_Create()
+    {
+        // Act
+        var macro = CreateMacro();
+        MacroService.Save(macro);
+
+        // Assert
+        Assert.IsTrue(macro.HasIdentity);
+        Assert.Greater(macro.Id, 0);
+        Assert.AreNotEqual(Guid.Empty, macro.Key);
+        var result = MacroService.GetById(macro.Id);
+        Assert.AreEqual("test", result.Alias);
+        Assert.AreEqual("Test", result.Name);
+        Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
+        Assert.AreEqual(1234, result.CacheDuration);
+
+        result = MacroService.GetById(macro.Key);
+        Assert.AreEqual("test", result.Alias);
+        Assert.AreEqual("Test", result.Name);
+        Assert.AreEqual("~/Views/MacroPartials/Test.cshtml", result.MacroSource);
+        Assert.AreEqual(1234, result.CacheDuration);
+    }
+
+    [Test]
+    public void Can_Delete()
+    {
+        // Arrange
+        var macro = new Macro(ShortStringHelper, "test", "Test", "~/Views/MacroPartials/Test.cshtml",
+            cacheDuration: 1234);
+        MacroService.Save(macro);
+
+        // Act
+        MacroService.Delete(macro);
+
+        // Assert
+        var result = MacroService.GetById(macro.Id);
+        Assert.IsNull(result);
+
+        result = MacroService.GetById(macro.Key);
+        Assert.IsNull(result);
+    }
+
+    [Test]
+    public void Can_Update()
+    {
+        // Arrange
+        var macro = CreateMacro();
+        MacroService.Save(macro);
+
+        // Act
+        var currKey = macro.Key;
+        macro.Name = "New name";
+        macro.Alias = "NewAlias";
+        MacroService.Save(macro);
+
+        macro = MacroService.GetById(macro.Id);
+
+        // Assert
+        Assert.AreEqual("New name", macro.Name);
+        Assert.AreEqual("NewAlias", macro.Alias);
+        Assert.AreEqual(currKey, macro.Key);
+    }
+
+    [Test]
+    public void Can_Update_Property()
+    {
+        // Arrange
+        var macro = CreateMacro();
+        macro.Properties.Add(new MacroProperty("blah", "Blah", 0, "blah"));
+        MacroService.Save(macro);
+
+        Assert.AreNotEqual(Guid.Empty, macro.Properties[0].Key);
+
+        // Act
+        var currPropKey = macro.Properties[0].Key;
+        macro.Properties[0].Alias = "new Alias";
+        macro.Properties[0].Name = "new Name";
+        macro.Properties[0].SortOrder = 1;
+        macro.Properties[0].EditorAlias = "new";
+        MacroService.Save(macro);
+
+        macro = MacroService.GetById(macro.Id);
+
+        // Assert
+        Assert.AreEqual(1, macro.Properties.Count);
+        Assert.AreEqual(currPropKey, macro.Properties[0].Key);
+        Assert.AreEqual("new Alias", macro.Properties[0].Alias);
+        Assert.AreEqual("new Name", macro.Properties[0].Name);
+        Assert.AreEqual(1, macro.Properties[0].SortOrder);
+        Assert.AreEqual("new", macro.Properties[0].EditorAlias);
+        Assert.AreEqual(currPropKey, macro.Properties[0].Key);
+    }
+
+    [Test]
+    public void Can_Update_Remove_Property()
+    {
+        // Arrange
+        var macro = CreateMacro();
+        macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
+        macro.Properties.Add(new MacroProperty("blah2", "Blah2", 1, "blah2"));
+        macro.Properties.Add(new MacroProperty("blah3", "Blah3", 2, "blah3"));
+        MacroService.Save(macro);
+
+        var lastKey = macro.Properties[0].Key;
+        for (var i = 1; i < macro.Properties.Count; i++)
+        {
+            Assert.AreNotEqual(Guid.Empty, macro.Properties[i].Key);
+            Assert.AreNotEqual(lastKey, macro.Properties[i].Key);
+            lastKey = macro.Properties[i].Key;
+        }
+
+        // Act
+        macro.Properties["blah1"].Alias = "newAlias";
+        macro.Properties["blah1"].Name = "new Name";
+        macro.Properties["blah1"].SortOrder = 1;
+        macro.Properties["blah1"].EditorAlias = "new";
+        macro.Properties.Remove("blah3");
+
+        var allPropKeys = macro.Properties.Values.Select(x => new { x.Alias, x.Key }).ToArray();
+
+        MacroService.Save(macro);
+
+        macro = MacroService.GetById(macro.Id);
+
+        // Assert
+        Assert.AreEqual(2, macro.Properties.Count);
+        Assert.AreEqual("newAlias", macro.Properties["newAlias"].Alias);
+        Assert.AreEqual("new Name", macro.Properties["newAlias"].Name);
+        Assert.AreEqual(1, macro.Properties["newAlias"].SortOrder);
+        Assert.AreEqual("new", macro.Properties["newAlias"].EditorAlias);
+        foreach (var propKey in allPropKeys)
+        {
+            Assert.AreEqual(propKey.Key, macro.Properties[propKey.Alias].Key);
+        }
+    }
+
+    [Test]
+    public void Can_Add_And_Remove_Properties()
+    {
+        var macro = CreateMacro();
+
+        // Adds some properties
+        macro.Properties.Add(new MacroProperty("blah1", "Blah1", 0, "blah1"));
+        macro.Properties.Add(new MacroProperty("blah2", "Blah2", 0, "blah2"));
+        macro.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
+        macro.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
+        MacroService.Save(macro);
+
+        var result1 = MacroService.GetById(macro.Id);
+        Assert.AreEqual(4, result1.Properties.Values.Count());
+
+        // Simulate clearing the sections
+        foreach (var s in result1.Properties.Values.ToArray())
+        {
+            result1.Properties.Remove(s.Alias);
+        }
+
+        // Now just re-add a couple
+        result1.Properties.Add(new MacroProperty("blah3", "Blah3", 0, "blah3"));
+        result1.Properties.Add(new MacroProperty("blah4", "Blah4", 0, "blah4"));
+        MacroService.Save(result1);
+
+        // Assert
+        result1 = MacroService.GetById(result1.Id);
+        Assert.AreEqual(2, result1.Properties.Values.Count());
+    }
+
+    [Test]
+    public void Cannot_Save_Macro_With_Empty_Name()
+    {
+        // Arrange
+        var macro = CreateMacro(string.Empty);
+
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => MacroService.Save(macro));
+    }
+
+    private static IMacro CreateMacro(string name = "Test") =>
+        new MacroBuilder()
+            .WithAlias("test")
+            .WithName(name)
+            .WithSource("~/Views/MacroPartials/Test.cshtml")
+            .WithCacheDuration(1234)
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs
index 115a37e7af..b17bc2c4fe 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaServiceTests.cs
@@ -2,333 +2,326 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
+public class MediaServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
-    public class MediaServiceTests : UmbracoIntegrationTest
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    [Test]
+    public void Can_Update_Media_Property_Values()
     {
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
+        IMediaType mediaType = MediaTypeBuilder.CreateSimpleMediaType("test", "Test");
+        MediaTypeService.Save(mediaType);
+        IMedia media = MediaBuilder.CreateSimpleMedia(mediaType, "hello", -1);
+        media.SetValue("title", "title of mine");
+        media.SetValue("bodyText", "hello world");
+        MediaService.Save(media);
 
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+        // re-get
+        media = MediaService.GetById(media.Id);
+        media.SetValue("title", "another title of mine"); // Change a value
+        media.SetValue("bodyText", null); // Clear a value
+        media.SetValue("author", "new author"); // Add a value
+        MediaService.Save(media);
 
-        [Test]
-        public void Can_Update_Media_Property_Values()
+        // re-get
+        media = MediaService.GetById(media.Id);
+        Assert.AreEqual("another title of mine", media.GetValue("title"));
+        Assert.IsNull(media.GetValue("bodyText"));
+        Assert.AreEqual("new author", media.GetValue("author"));
+    }
+
+    /// <summary>
+    ///     Used to list out all ambiguous events that will require dispatching with a name
+    /// </summary>
+    [Test]
+    [Explicit]
+    public void List_Ambiguous_Events()
+    {
+        var events = MediaService.GetType().GetEvents(BindingFlags.Static | BindingFlags.Public);
+        var typedEventHandler = typeof(TypedEventHandler<,>);
+        foreach (var e in events)
         {
-            IMediaType mediaType = MediaTypeBuilder.CreateSimpleMediaType("test", "Test");
-            MediaTypeService.Save(mediaType);
-            IMedia media = MediaBuilder.CreateSimpleMedia(mediaType, "hello", -1);
-            media.SetValue("title", "title of mine");
-            media.SetValue("bodyText", "hello world");
-            MediaService.Save(media);
-
-            // re-get
-            media = MediaService.GetById(media.Id);
-            media.SetValue("title", "another title of mine");          // Change a value
-            media.SetValue("bodyText", null);                          // Clear a value
-            media.SetValue("author", "new author");                    // Add a value
-            MediaService.Save(media);
-
-            // re-get
-            media = MediaService.GetById(media.Id);
-            Assert.AreEqual("another title of mine", media.GetValue("title"));
-            Assert.IsNull(media.GetValue("bodyText"));
-            Assert.AreEqual("new author", media.GetValue("author"));
-        }
-
-        /// <summary>
-        /// Used to list out all ambiguous events that will require dispatching with a name
-        /// </summary>
-        [Test]
-        [Explicit]
-        public void List_Ambiguous_Events()
-        {
-            EventInfo[] events = MediaService.GetType().GetEvents(BindingFlags.Static | BindingFlags.Public);
-            Type typedEventHandler = typeof(TypedEventHandler<,>);
-            foreach (EventInfo e in events)
+            // only continue if this is a TypedEventHandler
+            if (!e.EventHandlerType.IsGenericType)
             {
-                // only continue if this is a TypedEventHandler
-                if (!e.EventHandlerType.IsGenericType)
-                {
-                    continue;
-                }
-
-                Type typeDef = e.EventHandlerType.GetGenericTypeDefinition();
-                if (typedEventHandler != typeDef)
-                {
-                    continue;
-                }
-
-                // get the event arg type
-                Type eventArgType = e.EventHandlerType.GenericTypeArguments[1];
-
-                Attempt<EventNameExtractorResult> found = EventNameExtractor.FindEvent(typeof(MediaService), eventArgType, EventNameExtractor.MatchIngNames);
-                if (!found.Success && found.Result.Error == EventNameExtractorError.Ambiguous)
-                {
-                    Console.WriteLine($"Ambiguous event, source: {typeof(MediaService)}, args: {eventArgType}");
-                }
-            }
-        }
-
-        [Test]
-        public void Get_Paged_Children_With_Media_Type_Filter()
-        {
-            MediaType mediaType1 = MediaTypeBuilder.CreateImageMediaType("Image2");
-            MediaTypeService.Save(mediaType1);
-            MediaType mediaType2 = MediaTypeBuilder.CreateImageMediaType("Image3");
-            MediaTypeService.Save(mediaType2);
-
-            for (int i = 0; i < 10; i++)
-            {
-                Media m1 = MediaBuilder.CreateMediaImage(mediaType1, -1);
-                MediaService.Save(m1);
-                Media m2 = MediaBuilder.CreateMediaImage(mediaType2, -1);
-                MediaService.Save(m2);
+                continue;
             }
 
-            IScopeProvider provider = ScopeProvider;
-            using (provider.CreateScope())
+            var typeDef = e.EventHandlerType.GetGenericTypeDefinition();
+            if (typedEventHandler != typeDef)
             {
-                IEnumerable<IMedia> result = MediaService.GetPagedChildren(
-                    -1,
-                    0,
-                    11,
-                    out long total,
-                    provider.CreateQuery<IMedia>()
-                        .Where(x => new[] { mediaType1.Id, mediaType2.Id }.Contains(x.ContentTypeId)),
-                    Ordering.By("SortOrder", Direction.Ascending));
-                Assert.AreEqual(11, result.Count());
-                Assert.AreEqual(20, total);
-
-                result = MediaService.GetPagedChildren(
-                    -1,
-                    1,
-                    11,
-                    out total,
-                    provider.CreateQuery<IMedia>()
-                        .Where(x => new[] { mediaType1.Id, mediaType2.Id }.Contains(x.ContentTypeId)),
-                    Ordering.By("SortOrder", Direction.Ascending));
-                Assert.AreEqual(9, result.Count());
-                Assert.AreEqual(20, total);
-            }
-        }
-
-        [Test]
-        public void Can_Move_Media()
-        {
-            // Arrange
-            Tuple<IMedia, IMedia, IMedia, IMedia, IMedia> mediaItems = CreateTrashedTestMedia();
-            IMedia media = MediaService.GetById(mediaItems.Item3.Id);
-
-            // Act
-            MediaService.Move(media, mediaItems.Item2.Id);
-
-            // Assert
-            Assert.That(media.ParentId, Is.EqualTo(mediaItems.Item2.Id));
-            Assert.That(media.Trashed, Is.False);
-        }
-
-        [Test]
-        public void Can_Move_Media_To_RecycleBin()
-        {
-            // Arrange
-            Tuple<IMedia, IMedia, IMedia, IMedia, IMedia> mediaItems = CreateTrashedTestMedia();
-            IMedia media = MediaService.GetById(mediaItems.Item1.Id);
-
-            // Act
-            MediaService.MoveToRecycleBin(media);
-
-            // Assert
-            Assert.That(media.ParentId, Is.EqualTo(-21));
-            Assert.That(media.Trashed, Is.True);
-        }
-
-        [Test]
-        public void Can_Move_Media_From_RecycleBin()
-        {
-            // Arrange
-            Tuple<IMedia, IMedia, IMedia, IMedia, IMedia> mediaItems = CreateTrashedTestMedia();
-            IMedia media = MediaService.GetById(mediaItems.Item4.Id);
-
-            // Act - moving out of recycle bin
-            MediaService.Move(media, mediaItems.Item1.Id);
-            IMedia mediaChild = MediaService.GetById(mediaItems.Item5.Id);
-
-            // Assert
-            Assert.That(media.ParentId, Is.EqualTo(mediaItems.Item1.Id));
-            Assert.That(media.Trashed, Is.False);
-            Assert.That(mediaChild.ParentId, Is.EqualTo(mediaItems.Item4.Id));
-            Assert.That(mediaChild.Trashed, Is.False);
-        }
-
-        [Test]
-        public void Cannot_Save_Media_With_Empty_Name()
-        {
-            // Arrange
-            MediaType mediaType = MediaTypeBuilder.CreateNewMediaType();
-            MediaTypeService.Save(mediaType);
-            IMedia media = MediaService.CreateMedia(string.Empty, -1, Constants.Conventions.MediaTypes.VideoAlias);
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => MediaService.Save(media));
-        }
-
-
-        // [Test]
-        // public void Ensure_Content_Xml_Created()
-        // {
-        //     var mediaType = MediaTypeBuilder.CreateVideoMediaType();
-        //     MediaTypeService.Save(mediaType);
-        //     var media = MediaService.CreateMedia("Test", -1, Constants.Conventions.MediaTypes.VideoAlias);
-        //
-        //     MediaService.Save(media);
-        //
-        //     using (var scope = ScopeProvider.CreateScope())
-        //     {
-        //         Assert.IsTrue(scope.Database.Exists<ContentXmlDto>(media.Id));
-        //     }
-        // }
-
-        [Test]
-        public void Can_Get_Media_By_Path()
-        {
-            MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("Image2");
-            MediaTypeService.Save(mediaType);
-
-            Media media = MediaBuilder.CreateMediaImage(mediaType, -1);
-            MediaService.Save(media);
-
-            string mediaPath = "/media/test-image.png";
-            IMedia resolvedMedia = MediaService.GetMediaByPath(mediaPath);
-
-            Assert.IsNotNull(resolvedMedia);
-            Assert.That(resolvedMedia.GetValue(Constants.Conventions.Media.File).ToString() == mediaPath);
-        }
-
-        [Test]
-        public void Can_Get_Media_With_Crop_By_Path()
-        {
-            MediaType mediaType = MediaTypeBuilder.CreateImageMediaTypeWithCrop("Image2");
-            MediaTypeService.Save(mediaType);
-
-            Media media = MediaBuilder.CreateMediaImageWithCrop(mediaType, -1);
-            MediaService.Save(media);
-
-            string mediaPath = "/media/test-image.png";
-            IMedia resolvedMedia = MediaService.GetMediaByPath(mediaPath);
-
-            Assert.IsNotNull(resolvedMedia);
-            Assert.That(resolvedMedia.GetValue(Constants.Conventions.Media.File).ToString().Contains(mediaPath));
-        }
-
-        [Test]
-        public void Can_Get_Paged_Children()
-        {
-            MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("Image2");
-            MediaTypeService.Save(mediaType);
-            for (int i = 0; i < 10; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(mediaType, -1);
-                MediaService.Save(c1);
+                continue;
             }
 
-            IMediaService service = MediaService;
+            // get the event arg type
+            var eventArgType = e.EventHandlerType.GenericTypeArguments[1];
 
-            IMedia[] entities = service.GetPagedChildren(-1, 0, 6, out long total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-        }
-
-        [Test]
-        public void Can_Get_Paged_Children_Dont_Get_Descendants()
-        {
-            MediaType mediaType = MediaTypeBuilder.CreateImageMediaType("Image2");
-            MediaTypeService.Save(mediaType);
-
-            // Only add 9 as we also add a folder with children.
-            for (int i = 0; i < 9; i++)
+            var found = EventNameExtractor.FindEvent(typeof(MediaService), eventArgType,
+                EventNameExtractor.MatchIngNames);
+            if (!found.Success && found.Result.Error == EventNameExtractorError.Ambiguous)
             {
-                Media m1 = MediaBuilder.CreateMediaImage(mediaType, -1);
-                MediaService.Save(m1);
+                Console.WriteLine($"Ambiguous event, source: {typeof(MediaService)}, args: {eventArgType}");
             }
-
-            MediaType mediaTypeForFolder = MediaTypeBuilder.CreateImageMediaType("Folder2");
-            MediaTypeService.Save(mediaTypeForFolder);
-            Media mediaFolder = MediaBuilder.CreateMediaFolder(mediaTypeForFolder, -1);
-            MediaService.Save(mediaFolder);
-            for (int i = 0; i < 10; i++)
-            {
-                Media m1 = MediaBuilder.CreateMediaImage(mediaType, mediaFolder.Id);
-                MediaService.Save(m1);
-            }
-
-            IMediaService service = MediaService;
-
-            // Children in root including the folder - not the descendants in the folder.
-            IMedia[] entities = service.GetPagedChildren(-1, 0, 6, out long total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-
-            // Children in folder.
-            entities = service.GetPagedChildren(mediaFolder.Id, 0, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(6));
-            Assert.That(total, Is.EqualTo(10));
-            entities = service.GetPagedChildren(mediaFolder.Id, 1, 6, out total).ToArray();
-            Assert.That(entities.Length, Is.EqualTo(4));
-            Assert.That(total, Is.EqualTo(10));
-        }
-
-        private Tuple<IMedia, IMedia, IMedia, IMedia, IMedia> CreateTrashedTestMedia()
-        {
-            // Create and Save folder-Media -> 1050
-            IMediaType folderMediaType = MediaTypeService.Get(1031);
-            Media folder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
-            MediaService.Save(folder);
-
-            // Create and Save folder-Media -> 1051
-            Media folder2 = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
-            MediaService.Save(folder2);
-
-            // Create and Save image-Media  -> 1052
-            IMediaType imageMediaType = MediaTypeService.Get(1032);
-            Media image = MediaBuilder.CreateMediaImage(imageMediaType, 1050);
-            MediaService.Save(image);
-
-            // Create and Save folder-Media that is trashed -> 1053
-            Media folderTrashed = MediaBuilder.CreateMediaFolder(folderMediaType, -21);
-            folderTrashed.Trashed = true;
-            MediaService.Save(folderTrashed);
-
-            // Create and Save image-Media child of folderTrashed -> 1054
-            Media imageTrashed = MediaBuilder.CreateMediaImage(imageMediaType, folderTrashed.Id);
-            imageTrashed.Trashed = true;
-            MediaService.Save(imageTrashed);
-
-            return new Tuple<IMedia, IMedia, IMedia, IMedia, IMedia>(folder, folder2, image, folderTrashed, imageTrashed);
         }
     }
+
+    [Test]
+    public void Get_Paged_Children_With_Media_Type_Filter()
+    {
+        var mediaType1 = MediaTypeBuilder.CreateImageMediaType("Image2");
+        MediaTypeService.Save(mediaType1);
+        var mediaType2 = MediaTypeBuilder.CreateImageMediaType("Image3");
+        MediaTypeService.Save(mediaType2);
+
+        for (var i = 0; i < 10; i++)
+        {
+            var m1 = MediaBuilder.CreateMediaImage(mediaType1, -1);
+            MediaService.Save(m1);
+            var m2 = MediaBuilder.CreateMediaImage(mediaType2, -1);
+            MediaService.Save(m2);
+        }
+
+        var provider = ScopeProvider;
+        using (provider.CreateScope())
+        {
+            var result = MediaService.GetPagedChildren(
+                -1,
+                0,
+                11,
+                out var total,
+                provider.CreateQuery<IMedia>()
+                    .Where(x => new[] { mediaType1.Id, mediaType2.Id }.Contains(x.ContentTypeId)),
+                Ordering.By("SortOrder"));
+            Assert.AreEqual(11, result.Count());
+            Assert.AreEqual(20, total);
+
+            result = MediaService.GetPagedChildren(
+                -1,
+                1,
+                11,
+                out total,
+                provider.CreateQuery<IMedia>()
+                    .Where(x => new[] { mediaType1.Id, mediaType2.Id }.Contains(x.ContentTypeId)),
+                Ordering.By("SortOrder"));
+            Assert.AreEqual(9, result.Count());
+            Assert.AreEqual(20, total);
+        }
+    }
+
+    [Test]
+    public void Can_Move_Media()
+    {
+        // Arrange
+        var mediaItems = CreateTrashedTestMedia();
+        var media = MediaService.GetById(mediaItems.Item3.Id);
+
+        // Act
+        MediaService.Move(media, mediaItems.Item2.Id);
+
+        // Assert
+        Assert.That(media.ParentId, Is.EqualTo(mediaItems.Item2.Id));
+        Assert.That(media.Trashed, Is.False);
+    }
+
+    [Test]
+    public void Can_Move_Media_To_RecycleBin()
+    {
+        // Arrange
+        var mediaItems = CreateTrashedTestMedia();
+        var media = MediaService.GetById(mediaItems.Item1.Id);
+
+        // Act
+        MediaService.MoveToRecycleBin(media);
+
+        // Assert
+        Assert.That(media.ParentId, Is.EqualTo(-21));
+        Assert.That(media.Trashed, Is.True);
+    }
+
+    [Test]
+    public void Can_Move_Media_From_RecycleBin()
+    {
+        // Arrange
+        var mediaItems = CreateTrashedTestMedia();
+        var media = MediaService.GetById(mediaItems.Item4.Id);
+
+        // Act - moving out of recycle bin
+        MediaService.Move(media, mediaItems.Item1.Id);
+        var mediaChild = MediaService.GetById(mediaItems.Item5.Id);
+
+        // Assert
+        Assert.That(media.ParentId, Is.EqualTo(mediaItems.Item1.Id));
+        Assert.That(media.Trashed, Is.False);
+        Assert.That(mediaChild.ParentId, Is.EqualTo(mediaItems.Item4.Id));
+        Assert.That(mediaChild.Trashed, Is.False);
+    }
+
+    [Test]
+    public void Cannot_Save_Media_With_Empty_Name()
+    {
+        // Arrange
+        var mediaType = MediaTypeBuilder.CreateNewMediaType();
+        MediaTypeService.Save(mediaType);
+        var media = MediaService.CreateMedia(string.Empty, -1, Constants.Conventions.MediaTypes.VideoAlias);
+
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => MediaService.Save(media));
+    }
+
+
+    // [Test]
+    // public void Ensure_Content_Xml_Created()
+    // {
+    //     var mediaType = MediaTypeBuilder.CreateVideoMediaType();
+    //     MediaTypeService.Save(mediaType);
+    //     var media = MediaService.CreateMedia("Test", -1, Constants.Conventions.MediaTypes.VideoAlias);
+    //
+    //     MediaService.Save(media);
+    //
+    //     using (var scope = ScopeProvider.CreateScope())
+    //     {
+    //         Assert.IsTrue(scope.Database.Exists<ContentXmlDto>(media.Id));
+    //     }
+    // }
+
+    [Test]
+    public void Can_Get_Media_By_Path()
+    {
+        var mediaType = MediaTypeBuilder.CreateImageMediaType("Image2");
+        MediaTypeService.Save(mediaType);
+
+        var media = MediaBuilder.CreateMediaImage(mediaType, -1);
+        MediaService.Save(media);
+
+        var mediaPath = "/media/test-image.png";
+        var resolvedMedia = MediaService.GetMediaByPath(mediaPath);
+
+        Assert.IsNotNull(resolvedMedia);
+        Assert.That(resolvedMedia.GetValue(Constants.Conventions.Media.File).ToString() == mediaPath);
+    }
+
+    [Test]
+    public void Can_Get_Media_With_Crop_By_Path()
+    {
+        var mediaType = MediaTypeBuilder.CreateImageMediaTypeWithCrop("Image2");
+        MediaTypeService.Save(mediaType);
+
+        var media = MediaBuilder.CreateMediaImageWithCrop(mediaType, -1);
+        MediaService.Save(media);
+
+        var mediaPath = "/media/test-image.png";
+        var resolvedMedia = MediaService.GetMediaByPath(mediaPath);
+
+        Assert.IsNotNull(resolvedMedia);
+        Assert.That(resolvedMedia.GetValue(Constants.Conventions.Media.File).ToString().Contains(mediaPath));
+    }
+
+    [Test]
+    public void Can_Get_Paged_Children()
+    {
+        var mediaType = MediaTypeBuilder.CreateImageMediaType("Image2");
+        MediaTypeService.Save(mediaType);
+        for (var i = 0; i < 10; i++)
+        {
+            var c1 = MediaBuilder.CreateMediaImage(mediaType, -1);
+            MediaService.Save(c1);
+        }
+
+        var service = MediaService;
+
+        var entities = service.GetPagedChildren(-1, 0, 6, out var total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+    }
+
+    [Test]
+    public void Can_Get_Paged_Children_Dont_Get_Descendants()
+    {
+        var mediaType = MediaTypeBuilder.CreateImageMediaType("Image2");
+        MediaTypeService.Save(mediaType);
+
+        // Only add 9 as we also add a folder with children.
+        for (var i = 0; i < 9; i++)
+        {
+            var m1 = MediaBuilder.CreateMediaImage(mediaType, -1);
+            MediaService.Save(m1);
+        }
+
+        var mediaTypeForFolder = MediaTypeBuilder.CreateImageMediaType("Folder2");
+        MediaTypeService.Save(mediaTypeForFolder);
+        var mediaFolder = MediaBuilder.CreateMediaFolder(mediaTypeForFolder, -1);
+        MediaService.Save(mediaFolder);
+        for (var i = 0; i < 10; i++)
+        {
+            var m1 = MediaBuilder.CreateMediaImage(mediaType, mediaFolder.Id);
+            MediaService.Save(m1);
+        }
+
+        var service = MediaService;
+
+        // Children in root including the folder - not the descendants in the folder.
+        var entities = service.GetPagedChildren(-1, 0, 6, out var total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        entities = service.GetPagedChildren(-1, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+
+        // Children in folder.
+        entities = service.GetPagedChildren(mediaFolder.Id, 0, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(6));
+        Assert.That(total, Is.EqualTo(10));
+        entities = service.GetPagedChildren(mediaFolder.Id, 1, 6, out total).ToArray();
+        Assert.That(entities.Length, Is.EqualTo(4));
+        Assert.That(total, Is.EqualTo(10));
+    }
+
+    private Tuple<IMedia, IMedia, IMedia, IMedia, IMedia> CreateTrashedTestMedia()
+    {
+        // Create and Save folder-Media -> 1050
+        var folderMediaType = MediaTypeService.Get(1031);
+        var folder = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
+        MediaService.Save(folder);
+
+        // Create and Save folder-Media -> 1051
+        var folder2 = MediaBuilder.CreateMediaFolder(folderMediaType, -1);
+        MediaService.Save(folder2);
+
+        // Create and Save image-Media  -> 1052
+        var imageMediaType = MediaTypeService.Get(1032);
+        var image = MediaBuilder.CreateMediaImage(imageMediaType, 1050);
+        MediaService.Save(image);
+
+        // Create and Save folder-Media that is trashed -> 1053
+        var folderTrashed = MediaBuilder.CreateMediaFolder(folderMediaType, -21);
+        folderTrashed.Trashed = true;
+        MediaService.Save(folderTrashed);
+
+        // Create and Save image-Media child of folderTrashed -> 1054
+        var imageTrashed = MediaBuilder.CreateMediaImage(imageMediaType, folderTrashed.Id);
+        imageTrashed.Trashed = true;
+        MediaService.Save(imageTrashed);
+
+        return new Tuple<IMedia, IMedia, IMedia, IMedia, IMedia>(folder, folder2, image, folderTrashed, imageTrashed);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs
index 1ddfa7a2ca..3088e7c0da 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaTypeServiceTests.cs
@@ -4,59 +4,101 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
+public class MediaTypeServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true)]
-    public class MediaTypeServiceTests : UmbracoIntegrationTest
+    private MediaService MediaService => (MediaService)GetRequiredService<IMediaService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
+        .AddNotificationHandler<MediaMovedToRecycleBinNotification, ContentNotificationHandler>();
+
+    [Test]
+    public void Get_With_Missing_Guid()
     {
-        private MediaService MediaService => (MediaService)GetRequiredService<IMediaService>();
+        // Arrange
+        // Act
+        var result = MediaTypeService.Get(Guid.NewGuid());
 
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+        // Assert
+        Assert.IsNull(result);
+    }
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder) => builder
-            .AddNotificationHandler<MediaMovedToRecycleBinNotification, ContentNotificationHandler>();
+    [Test]
+    public void Empty_Description_Is_Always_Null_After_Saving_Media_Type()
+    {
+        var mediaType = MediaTypeBuilder.CreateSimpleMediaType("mediaType", "Media Type");
+        mediaType.Description = null;
+        MediaTypeService.Save(mediaType);
 
-        [Test]
-        public void Get_With_Missing_Guid()
+        var mediaType2 = MediaTypeBuilder.CreateSimpleMediaType("mediaType2", "Media Type 2");
+        mediaType2.Description = string.Empty;
+        MediaTypeService.Save(mediaType2);
+
+        Assert.IsNull(mediaType.Description);
+        Assert.IsNull(mediaType2.Description);
+    }
+
+    [Test]
+    public void Deleting_Media_Type_With_Hierarchy_Of_Media_Items_Moves_Orphaned_Media_To_Recycle_Bin()
+    {
+        IMediaType contentType1 = MediaTypeBuilder.CreateSimpleMediaType("test1", "Test1");
+        MediaTypeService.Save(contentType1);
+        IMediaType contentType2 = MediaTypeBuilder.CreateSimpleMediaType("test2", "Test2");
+        MediaTypeService.Save(contentType2);
+        IMediaType contentType3 = MediaTypeBuilder.CreateSimpleMediaType("test3", "Test3");
+        MediaTypeService.Save(contentType3);
+
+        IMediaType[] contentTypes = { contentType1, contentType2, contentType3 };
+        var parentId = -1;
+
+        var ids = new List<int>();
+
+        for (var i = 0; i < 2; i++)
         {
-            // Arrange
-            // Act
-            IMediaType result = MediaTypeService.Get(Guid.NewGuid());
+            for (var index = 0; index < contentTypes.Length; index++)
+            {
+                var contentType = contentTypes[index];
+                var contentItem = MediaBuilder.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
+                MediaService.Save(contentItem);
+                parentId = contentItem.Id;
 
-            // Assert
-            Assert.IsNull(result);
+                ids.Add(contentItem.Id);
+            }
         }
 
-        [Test]
-        public void Empty_Description_Is_Always_Null_After_Saving_Media_Type()
+        // delete the first content type, all other content of different content types should be in the recycle bin
+        MediaTypeService.Delete(contentTypes[0]);
+
+        var found = MediaService.GetByIds(ids);
+
+        Assert.AreEqual(4, found.Count());
+        foreach (var content in found)
         {
-            MediaType mediaType = MediaTypeBuilder.CreateSimpleMediaType("mediaType", "Media Type");
-            mediaType.Description = null;
-            MediaTypeService.Save(mediaType);
-
-            MediaType mediaType2 = MediaTypeBuilder.CreateSimpleMediaType("mediaType2", "Media Type 2");
-            mediaType2.Description = string.Empty;
-            MediaTypeService.Save(mediaType2);
-
-            Assert.IsNull(mediaType.Description);
-            Assert.IsNull(mediaType2.Description);
+            Assert.IsTrue(content.Trashed);
         }
+    }
 
-        [Test]
-        public void Deleting_Media_Type_With_Hierarchy_Of_Media_Items_Moves_Orphaned_Media_To_Recycle_Bin()
+    [Test]
+    public void Deleting_Media_Types_With_Hierarchy_Of_Media_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items()
+    {
+        ContentNotificationHandler.MovedMediaToRecycleBin = MovedMediaToRecycleBin;
+
+        try
         {
             IMediaType contentType1 = MediaTypeBuilder.CreateSimpleMediaType("test1", "Test1");
             MediaTypeService.Save(contentType1);
@@ -65,17 +107,18 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
             IMediaType contentType3 = MediaTypeBuilder.CreateSimpleMediaType("test3", "Test3");
             MediaTypeService.Save(contentType3);
 
-            IMediaType[] contentTypes = new[] { contentType1, contentType2, contentType3 };
-            int parentId = -1;
+            IMediaType[] contentTypes = { contentType1, contentType2, contentType3 };
+            var parentId = -1;
 
             var ids = new List<int>();
 
-            for (int i = 0; i < 2; i++)
+            for (var i = 0; i < 2; i++)
             {
-                for (int index = 0; index < contentTypes.Length; index++)
+                for (var index = 0; index < contentTypes.Length; index++)
                 {
-                    IMediaType contentType = contentTypes[index];
-                    Media contentItem = MediaBuilder.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
+                    var contentType = contentTypes[index];
+                    var contentItem =
+                        MediaBuilder.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
                     MediaService.Save(contentItem);
                     parentId = contentItem.Id;
 
@@ -83,147 +126,107 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
                 }
             }
 
-            // delete the first content type, all other content of different content types should be in the recycle bin
-            MediaTypeService.Delete(contentTypes[0]);
-
-            IEnumerable<IMedia> found = MediaService.GetByIds(ids);
-
-            Assert.AreEqual(4, found.Count());
-            foreach (IMedia content in found)
+            foreach (var contentType in contentTypes.Reverse())
             {
-                Assert.IsTrue(content.Trashed);
+                MediaTypeService.Delete(contentType);
             }
         }
-
-        [Test]
-        public void Deleting_Media_Types_With_Hierarchy_Of_Media_Items_Doesnt_Raise_Trashed_Event_For_Deleted_Items()
+        finally
         {
-            ContentNotificationHandler.MovedMediaToRecycleBin = MovedMediaToRecycleBin;
-
-            try
-            {
-                IMediaType contentType1 = MediaTypeBuilder.CreateSimpleMediaType("test1", "Test1");
-                MediaTypeService.Save(contentType1);
-                IMediaType contentType2 = MediaTypeBuilder.CreateSimpleMediaType("test2", "Test2");
-                MediaTypeService.Save(contentType2);
-                IMediaType contentType3 = MediaTypeBuilder.CreateSimpleMediaType("test3", "Test3");
-                MediaTypeService.Save(contentType3);
-
-                IMediaType[] contentTypes = new[] { contentType1, contentType2, contentType3 };
-                int parentId = -1;
-
-                var ids = new List<int>();
-
-                for (int i = 0; i < 2; i++)
-                {
-                    for (int index = 0; index < contentTypes.Length; index++)
-                    {
-                        IMediaType contentType = contentTypes[index];
-                        Media contentItem = MediaBuilder.CreateSimpleMedia(contentType, "MyName_" + index + "_" + i, parentId);
-                        MediaService.Save(contentItem);
-                        parentId = contentItem.Id;
-
-                        ids.Add(contentItem.Id);
-                    }
-                }
-
-                foreach (IMediaType contentType in contentTypes.Reverse())
-                {
-                    MediaTypeService.Delete(contentType);
-                }
-            }
-            finally
-            {
-                ContentNotificationHandler.MovedMediaToRecycleBin = null;
-            }
-        }
-
-        private void MovedMediaToRecycleBin(MediaMovedToRecycleBinNotification notification)
-        {
-            foreach (MoveEventInfo<IMedia> item in notification.MoveInfoCollection)
-            {
-                // if this item doesn't exist then Fail!
-                IMedia exists = MediaService.GetById(item.Entity.Id);
-                if (exists == null)
-                {
-                    Assert.Fail("The item doesn't exist");
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Copy_MediaType_By_Performing_Clone()
-        {
-            // Arrange
-            var mediaType = MediaTypeBuilder.CreateImageMediaType("Image2") as IMediaType;
-            MediaTypeService.Save(mediaType);
-
-            // Act
-            IMediaType sut = mediaType.DeepCloneWithResetIdentities("Image2_2");
-            Assert.IsNotNull(sut);
-            MediaTypeService.Save(sut);
-
-            // Assert
-            Assert.That(sut.HasIdentity, Is.True);
-            Assert.AreEqual(mediaType.ParentId, sut.ParentId);
-            Assert.AreEqual(mediaType.Level, sut.Level);
-            Assert.AreEqual(mediaType.PropertyTypes.Count(), sut.PropertyTypes.Count());
-            Assert.AreNotEqual(mediaType.Id, sut.Id);
-            Assert.AreNotEqual(mediaType.Key, sut.Key);
-            Assert.AreNotEqual(mediaType.Path, sut.Path);
-            Assert.AreNotEqual(mediaType.SortOrder, sut.SortOrder);
-            Assert.AreNotEqual(mediaType.PropertyTypes.First(x => x.Alias.Equals("umbracoFile")).Id, sut.PropertyTypes.First(x => x.Alias.Equals("umbracoFile")).Id);
-            Assert.AreNotEqual(mediaType.PropertyGroups.First(x => x.Name.Equals("Media")).Id, sut.PropertyGroups.First(x => x.Name.Equals("Media")).Id);
-        }
-
-        [Test]
-        public void Can_Copy_MediaType_To_New_Parent_By_Performing_Clone()
-        {
-            // Arrange
-            MediaType parentMediaType1 = MediaTypeBuilder.CreateSimpleMediaType("parent1", "Parent1");
-            MediaTypeService.Save(parentMediaType1);
-            MediaType parentMediaType2 = MediaTypeBuilder.CreateSimpleMediaType("parent2", "Parent2", null, true);
-            MediaTypeService.Save(parentMediaType2);
-            var mediaType = MediaTypeBuilder.CreateImageMediaType("Image2") as IMediaType;
-            MediaTypeService.Save(mediaType);
-
-            // Act
-            IMediaType clone = mediaType.DeepCloneWithResetIdentities("newcategory");
-            Assert.IsNotNull(clone);
-            clone.RemoveContentType("parent1");
-            clone.AddContentType(parentMediaType2);
-            clone.ParentId = parentMediaType2.Id;
-            MediaTypeService.Save(clone);
-
-            // Assert
-            Assert.That(clone.HasIdentity, Is.True);
-
-            IMediaType clonedMediaType = MediaTypeService.Get(clone.Id);
-            IMediaType originalMediaType = MediaTypeService.Get(mediaType.Id);
-
-            Assert.That(clonedMediaType.CompositionAliases().Any(x => x.Equals("parent2")), Is.True);
-            Assert.That(clonedMediaType.CompositionAliases().Any(x => x.Equals("parent1")), Is.False);
-
-            Assert.AreEqual(clonedMediaType.Path, "-1," + parentMediaType2.Id + "," + clonedMediaType.Id);
-            Assert.AreEqual(clonedMediaType.PropertyTypes.Count(), originalMediaType.PropertyTypes.Count());
-
-            Assert.AreNotEqual(clonedMediaType.ParentId, originalMediaType.ParentId);
-            Assert.AreEqual(clonedMediaType.ParentId, parentMediaType2.Id);
-
-            Assert.AreNotEqual(clonedMediaType.Id, originalMediaType.Id);
-            Assert.AreNotEqual(clonedMediaType.Key, originalMediaType.Key);
-            Assert.AreNotEqual(clonedMediaType.Path, originalMediaType.Path);
-
-            Assert.AreNotEqual(clonedMediaType.PropertyTypes.First(x => x.Alias.StartsWith("umbracoFile")).Id, originalMediaType.PropertyTypes.First(x => x.Alias.StartsWith("umbracoFile")).Id);
-            Assert.AreNotEqual(clonedMediaType.PropertyGroups.First(x => x.Name.StartsWith("Media")).Id, originalMediaType.PropertyGroups.First(x => x.Name.StartsWith("Media")).Id);
-        }
-
-        public class ContentNotificationHandler :
-            INotificationHandler<MediaMovedToRecycleBinNotification>
-        {
-            public void Handle(MediaMovedToRecycleBinNotification notification) => MovedMediaToRecycleBin?.Invoke(notification);
-
-            public static Action<MediaMovedToRecycleBinNotification> MovedMediaToRecycleBin { get; set; }
+            ContentNotificationHandler.MovedMediaToRecycleBin = null;
         }
     }
+
+    private void MovedMediaToRecycleBin(MediaMovedToRecycleBinNotification notification)
+    {
+        foreach (var item in notification.MoveInfoCollection)
+        {
+            // if this item doesn't exist then Fail!
+            var exists = MediaService.GetById(item.Entity.Id);
+            if (exists == null)
+            {
+                Assert.Fail("The item doesn't exist");
+            }
+        }
+    }
+
+    [Test]
+    public void Can_Copy_MediaType_By_Performing_Clone()
+    {
+        // Arrange
+        var mediaType = MediaTypeBuilder.CreateImageMediaType("Image2") as IMediaType;
+        MediaTypeService.Save(mediaType);
+
+        // Act
+        var sut = mediaType.DeepCloneWithResetIdentities("Image2_2");
+        Assert.IsNotNull(sut);
+        MediaTypeService.Save(sut);
+
+        // Assert
+        Assert.That(sut.HasIdentity, Is.True);
+        Assert.AreEqual(mediaType.ParentId, sut.ParentId);
+        Assert.AreEqual(mediaType.Level, sut.Level);
+        Assert.AreEqual(mediaType.PropertyTypes.Count(), sut.PropertyTypes.Count());
+        Assert.AreNotEqual(mediaType.Id, sut.Id);
+        Assert.AreNotEqual(mediaType.Key, sut.Key);
+        Assert.AreNotEqual(mediaType.Path, sut.Path);
+        Assert.AreNotEqual(mediaType.SortOrder, sut.SortOrder);
+        Assert.AreNotEqual(mediaType.PropertyTypes.First(x => x.Alias.Equals("umbracoFile")).Id,
+            sut.PropertyTypes.First(x => x.Alias.Equals("umbracoFile")).Id);
+        Assert.AreNotEqual(mediaType.PropertyGroups.First(x => x.Name.Equals("Media")).Id,
+            sut.PropertyGroups.First(x => x.Name.Equals("Media")).Id);
+    }
+
+    [Test]
+    public void Can_Copy_MediaType_To_New_Parent_By_Performing_Clone()
+    {
+        // Arrange
+        var parentMediaType1 = MediaTypeBuilder.CreateSimpleMediaType("parent1", "Parent1");
+        MediaTypeService.Save(parentMediaType1);
+        var parentMediaType2 = MediaTypeBuilder.CreateSimpleMediaType("parent2", "Parent2", null, true);
+        MediaTypeService.Save(parentMediaType2);
+        var mediaType = MediaTypeBuilder.CreateImageMediaType("Image2") as IMediaType;
+        MediaTypeService.Save(mediaType);
+
+        // Act
+        var clone = mediaType.DeepCloneWithResetIdentities("newcategory");
+        Assert.IsNotNull(clone);
+        clone.RemoveContentType("parent1");
+        clone.AddContentType(parentMediaType2);
+        clone.ParentId = parentMediaType2.Id;
+        MediaTypeService.Save(clone);
+
+        // Assert
+        Assert.That(clone.HasIdentity, Is.True);
+
+        var clonedMediaType = MediaTypeService.Get(clone.Id);
+        var originalMediaType = MediaTypeService.Get(mediaType.Id);
+
+        Assert.That(clonedMediaType.CompositionAliases().Any(x => x.Equals("parent2")), Is.True);
+        Assert.That(clonedMediaType.CompositionAliases().Any(x => x.Equals("parent1")), Is.False);
+
+        Assert.AreEqual(clonedMediaType.Path, "-1," + parentMediaType2.Id + "," + clonedMediaType.Id);
+        Assert.AreEqual(clonedMediaType.PropertyTypes.Count(), originalMediaType.PropertyTypes.Count());
+
+        Assert.AreNotEqual(clonedMediaType.ParentId, originalMediaType.ParentId);
+        Assert.AreEqual(clonedMediaType.ParentId, parentMediaType2.Id);
+
+        Assert.AreNotEqual(clonedMediaType.Id, originalMediaType.Id);
+        Assert.AreNotEqual(clonedMediaType.Key, originalMediaType.Key);
+        Assert.AreNotEqual(clonedMediaType.Path, originalMediaType.Path);
+
+        Assert.AreNotEqual(clonedMediaType.PropertyTypes.First(x => x.Alias.StartsWith("umbracoFile")).Id,
+            originalMediaType.PropertyTypes.First(x => x.Alias.StartsWith("umbracoFile")).Id);
+        Assert.AreNotEqual(clonedMediaType.PropertyGroups.First(x => x.Name.StartsWith("Media")).Id,
+            originalMediaType.PropertyGroups.First(x => x.Name.StartsWith("Media")).Id);
+    }
+
+    public class ContentNotificationHandler :
+        INotificationHandler<MediaMovedToRecycleBinNotification>
+    {
+        public static Action<MediaMovedToRecycleBinNotification> MovedMediaToRecycleBin { get; set; }
+
+        public void Handle(MediaMovedToRecycleBinNotification notification) =>
+            MovedMediaToRecycleBin?.Invoke(notification);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs
index 86ec5769b3..1b5e1b5e33 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberServiceTests.cs
@@ -2,11 +2,8 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
@@ -15,9 +12,7 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common;
@@ -25,1384 +20,1411 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+[TestFixture]
+[Category("Slow")]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true,
+    WithApplication = true)]
+public class MemberServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [Category("Slow")]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)]
-    public class MemberServiceTests : UmbracoIntegrationTest
+    private IMemberTypeService MemberTypeService => GetRequiredService<IMemberTypeService>();
+
+    private IMemberService MemberService => GetRequiredService<IMemberService>();
+
+    [Test]
+    public void Can_Update_Member_Property_Values()
     {
-        private IMemberTypeService MemberTypeService => GetRequiredService<IMemberTypeService>();
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member =
+            MemberBuilder.CreateSimpleMember(memberType, "hello", "helloworld@test123.com", "hello", "hello");
+        member.SetValue("title", "title of mine");
+        member.SetValue("bodyText", "hello world");
+        MemberService.Save(member);
 
-        private IMemberService MemberService => GetRequiredService<IMemberService>();
+        // re-get
+        member = MemberService.GetById(member.Id);
+        member.SetValue("title", "another title of mine"); // Change a value
+        member.SetValue("bodyText", null); // Clear a value
+        member.SetValue("author", "new author"); // Add a value
+        MemberService.Save(member);
 
-        [Test]
-        public void Can_Update_Member_Property_Values()
+        // re-get
+        member = MemberService.GetById(member.Id);
+        Assert.AreEqual("another title of mine", member.GetValue("title"));
+        Assert.IsNull(member.GetValue("bodyText"));
+        Assert.AreEqual("new author", member.GetValue("author"));
+    }
+
+    [Test]
+    public void Can_Get_By_Username()
+    {
+        var memberType = MemberTypeService.Get("member");
+        IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
+        MemberService.Save(member);
+
+        var member2 = MemberService.GetByUsername(member.Username);
+
+        Assert.IsNotNull(member2);
+        Assert.AreEqual(member.Email, member2.Email);
+    }
+
+    [Test]
+    public void Can_Set_Last_Login_Date()
+    {
+        var now = DateTime.Now;
+        var memberType = MemberTypeService.Get("member");
+        IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
         {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "hello", "helloworld@test123.com", "hello", "hello");
-            member.SetValue("title", "title of mine");
-            member.SetValue("bodyText", "hello world");
-            MemberService.Save(member);
+            LastLoginDate = now,
+            UpdateDate = now
+        };
+        MemberService.Save(member);
 
-            // re-get
-            member = MemberService.GetById(member.Id);
-            member.SetValue("title", "another title of mine");          // Change a value
-            member.SetValue("bodyText", null);                          // Clear a value
-            member.SetValue("author", "new author");                    // Add a value
-            MemberService.Save(member);
+        var newDate = now.AddDays(10);
+        member.LastLoginDate = newDate;
+        member.UpdateDate = newDate;
+        MemberService.Save(member);
 
-            // re-get
-            member = MemberService.GetById(member.Id);
-            Assert.AreEqual("another title of mine", member.GetValue("title"));
-            Assert.IsNull(member.GetValue("bodyText"));
-            Assert.AreEqual("new author", member.GetValue("author"));
+        // re-get
+        member = MemberService.GetById(member.Id);
+
+        Assert.That(member.LastLoginDate, Is.EqualTo(newDate).Within(1).Seconds);
+        Assert.That(member.UpdateDate, Is.EqualTo(newDate).Within(1).Seconds);
+    }
+
+    // These might seem like some somewhat pointless tests, but there's some funky things going on in MemberRepository when saving.
+    [Test]
+    public void Can_Set_Failed_Password_Attempts()
+    {
+        var memberType = MemberTypeService.Get("member");
+        IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+        {
+            FailedPasswordAttempts = 1
+        };
+        MemberService.Save(member);
+
+        member.FailedPasswordAttempts = 2;
+        MemberService.Save(member);
+
+        member = MemberService.GetById(member.Id);
+
+        Assert.AreEqual(2, member.FailedPasswordAttempts);
+    }
+
+    [Test]
+    public void Can_Set_Is_Approved()
+    {
+        var memberType = MemberTypeService.Get("member");
+        IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
+        MemberService.Save(member);
+
+        member.IsApproved = false;
+        MemberService.Save(member);
+
+        member = MemberService.GetById(member.Id);
+
+        Assert.IsFalse(member.IsApproved);
+    }
+
+    [Test]
+    public void Can_Set_Is_Locked_Out()
+    {
+        var memberType = MemberTypeService.Get("member");
+        IMember member =
+            new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true) { IsLockedOut = false };
+        MemberService.Save(member);
+
+        member.IsLockedOut = true;
+        MemberService.Save(member);
+
+        member = MemberService.GetById(member.Id);
+
+        Assert.IsTrue(member.IsLockedOut);
+    }
+
+    [Test]
+    public void Can_Set_Last_Lockout_Date()
+    {
+        var now = DateTime.Now;
+        var memberType = MemberTypeService.Get("member");
+        IMember member =
+            new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true) { LastLockoutDate = now };
+        MemberService.Save(member);
+
+        var newDate = now.AddDays(10);
+        member.LastLockoutDate = newDate;
+        MemberService.Save(member);
+
+        // re-get
+        member = MemberService.GetById(member.Id);
+
+        Assert.That(member.LastLockoutDate, Is.EqualTo(newDate).Within(1).Seconds);
+    }
+
+    [Test]
+    public void Can_set_Last_Login_Date()
+    {
+        var now = DateTime.Now;
+        var memberType = MemberTypeService.Get("member");
+        IMember member =
+            new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true) { LastLoginDate = now };
+        MemberService.Save(member);
+
+        var newDate = now.AddDays(10);
+        member.LastLoginDate = newDate;
+        MemberService.Save(member);
+
+        // re-get
+        member = MemberService.GetById(member.Id);
+
+        Assert.That(member.LastLoginDate, Is.EqualTo(newDate).Within(1).Seconds);
+    }
+
+    [Test]
+    public void Can_Set_Last_Password_Change_Date()
+    {
+        var now = DateTime.Now;
+        var memberType = MemberTypeService.Get("member");
+        IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+        {
+            LastPasswordChangeDate = now
+        };
+        MemberService.Save(member);
+
+        var newDate = now.AddDays(10);
+        member.LastPasswordChangeDate = newDate;
+        MemberService.Save(member);
+
+        // re-get
+        member = MemberService.GetById(member.Id);
+
+        Assert.That(member.LastPasswordChangeDate, Is.EqualTo(newDate).Within(1).Seconds);
+    }
+
+    [Test]
+    public void Can_Create_Member_With_Properties()
+    {
+        var memberType = MemberTypeService.Get("member");
+        IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
+        MemberService.Save(member);
+
+        member = MemberService.GetById(member.Id);
+        Assert.AreEqual("xemail", member.Email);
+
+        var contentTypeFactory = new PublishedContentTypeFactory(new NoopPublishedModelFactory(),
+            new PropertyValueConverterCollection(() => Enumerable.Empty<IPropertyValueConverter>()),
+            GetRequiredService<IDataTypeService>());
+        var pmemberType = new PublishedContentType(memberType, contentTypeFactory);
+
+        var publishedSnapshotAccessor = new TestPublishedSnapshotAccessor();
+        var variationContextAccessor = new TestVariationContextAccessor();
+        var pmember = PublishedMember.Create(member, pmemberType, false, publishedSnapshotAccessor,
+            variationContextAccessor, GetRequiredService<IPublishedModelFactory>());
+
+        // contains the umbracoMember... properties created when installing, on the member type
+        // contains the other properties, that PublishedContentType adds (BuiltinMemberProperties)
+        string[] aliases =
+        {
+            Constants.Conventions.Member.Comments, nameof(IMember.Email), nameof(IMember.Username),
+            nameof(IMember.Comments), nameof(IMember.IsApproved), nameof(IMember.IsLockedOut),
+            nameof(IMember.LastLockoutDate), nameof(IMember.CreateDate), nameof(IMember.LastLoginDate),
+            nameof(IMember.LastPasswordChangeDate)
+        };
+
+        var properties = pmember.Properties.ToList();
+
+        Assert.IsTrue(properties.Select(x => x.Alias).ContainsAll(aliases));
+
+        var email = properties[aliases.IndexOf(nameof(IMember.Email))];
+        Assert.AreEqual("xemail", email.GetSourceValue());
+    }
+
+    [Test]
+    public void Can_Create_Member()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        Assert.AreNotEqual(0, member.Id);
+        var foundMember = MemberService.GetById(member.Id);
+        Assert.IsNotNull(foundMember);
+        Assert.AreEqual("test@test.com", foundMember.Email);
+    }
+
+    [Test]
+    public void Can_Create_Member_With_Long_TLD_In_Email()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.marketing", "pass", "test");
+        MemberService.Save(member);
+
+        Assert.AreNotEqual(0, member.Id);
+        var foundMember = MemberService.GetById(member.Id);
+        Assert.IsNotNull(foundMember);
+        Assert.AreEqual("test@test.marketing", foundMember.Email);
+    }
+
+    [Test]
+    public void Can_Create_Role()
+    {
+        MemberService.AddRole("MyTestRole");
+
+        var found = MemberService.GetAllRoles();
+
+        Assert.AreEqual(1, found.Count());
+        Assert.AreEqual("MyTestRole", found.Single().Name);
+    }
+
+    [Test]
+    public void Can_Create_Duplicate_Role()
+    {
+        MemberService.AddRole("MyTestRole");
+        MemberService.AddRole("MyTestRole");
+
+        var found = MemberService.GetAllRoles();
+
+        Assert.AreEqual(1, found.Count());
+        Assert.AreEqual("MyTestRole", found.Single().Name);
+    }
+
+    [Test]
+    public void Can_Get_All_Roles()
+    {
+        MemberService.AddRole("MyTestRole1");
+        MemberService.AddRole("MyTestRole2");
+        MemberService.AddRole("MyTestRole3");
+
+        var found = MemberService.GetAllRoles();
+
+        Assert.AreEqual(3, found.Count());
+    }
+
+    [Test]
+    public void Can_Get_All_Roles_IDs()
+    {
+        MemberService.AddRole("MyTestRole1");
+        MemberService.AddRole("MyTestRole2");
+        MemberService.AddRole("MyTestRole3");
+
+        var found = MemberService.GetAllRolesIds();
+
+        Assert.AreEqual(3, found.Count());
+    }
+
+    [Test]
+    public void Can_Replace_Roles()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        string[] roleNames1 = { "TR1", "TR2" };
+        MemberService.AssignRoles(new[] { member.Id }, roleNames1);
+        var memberRoles = MemberService.GetAllRoles(member.Id);
+        CollectionAssert.AreEquivalent(roleNames1, memberRoles);
+
+        string[] roleNames2 = { "TR3", "TR4" };
+        MemberService.ReplaceRoles(new[] { member.Id }, roleNames2);
+        memberRoles = MemberService.GetAllRoles(member.Id);
+        CollectionAssert.AreEquivalent(roleNames2, memberRoles);
+    }
+
+    [Test]
+    public void Can_Get_All_Roles_By_Member_Id()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        MemberService.AddRole("MyTestRole1");
+        MemberService.AddRole("MyTestRole2");
+        MemberService.AddRole("MyTestRole3");
+        MemberService.AssignRoles(new[] { member.Id }, new[] { "MyTestRole1", "MyTestRole2" });
+
+        var memberRoles = MemberService.GetAllRoles(member.Id);
+
+        Assert.AreEqual(2, memberRoles.Count());
+    }
+
+    [Test]
+    public void Can_Get_All_Roles_Ids_By_Member_Id()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        MemberService.AddRole("MyTestRole1");
+        MemberService.AddRole("MyTestRole2");
+        MemberService.AddRole("MyTestRole3");
+        MemberService.AssignRoles(new[] { member.Id }, new[] { "MyTestRole1", "MyTestRole2" });
+
+        var memberRoles = MemberService.GetAllRolesIds(member.Id);
+
+        Assert.AreEqual(2, memberRoles.Count());
+    }
+
+    [Test]
+    public void Can_Get_All_Roles_By_Member_Username()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        // need to test with '@' symbol in the lookup
+        IMember member2 =
+            MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2@test.com");
+        MemberService.Save(member2);
+
+        MemberService.AddRole("MyTestRole1");
+        MemberService.AddRole("MyTestRole2");
+        MemberService.AddRole("MyTestRole3");
+        MemberService.AssignRoles(new[] { member.Id, member2.Id }, new[] { "MyTestRole1", "MyTestRole2" });
+
+        var memberRoles = MemberService.GetAllRoles("test");
+        Assert.AreEqual(2, memberRoles.Count());
+
+        var memberRoles2 = MemberService.GetAllRoles("test2@test.com");
+        Assert.AreEqual(2, memberRoles2.Count());
+    }
+
+    [Test]
+    public void Can_Delete_Role()
+    {
+        MemberService.AddRole("MyTestRole1");
+
+        MemberService.DeleteRole("MyTestRole1", false);
+
+        var memberRoles = MemberService.GetAllRoles();
+
+        Assert.AreEqual(0, memberRoles.Count());
+    }
+
+    [Test]
+    public void Throws_When_Deleting_Assigned_Role()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        MemberService.AddRole("MyTestRole1");
+        MemberService.AssignRoles(new[] { member.Id }, new[] { "MyTestRole1", "MyTestRole2" });
+
+        Assert.Throws<InvalidOperationException>(() => MemberService.DeleteRole("MyTestRole1", true));
+    }
+
+    [Test]
+    public void Can_Get_Members_In_Role()
+    {
+        MemberService.AddRole("MyTestRole1");
+        int roleId;
+        using (var scope = ScopeProvider.CreateScope())
+        {
+            roleId = ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>(
+                "SELECT id from umbracoNode where [text] = 'MyTestRole1'");
+            scope.Complete();
         }
 
-        [Test]
-        public void Can_Get_By_Username()
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+
+        using (var scope = ScopeProvider.CreateScope())
         {
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
-            MemberService.Save(member);
-
-            IMember member2 = MemberService.GetByUsername(member.Username);
-
-            Assert.IsNotNull(member2);
-            Assert.AreEqual(member.Email, member2.Email);
-        }
-
-        [Test]
-        public void Can_Set_Last_Login_Date()
-        {
-            DateTime now = DateTime.Now;
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+            ScopeAccessor.AmbientScope.Database.Insert(new Member2MemberGroupDto
             {
-                LastLoginDate = now,
-                UpdateDate = now,
-            };
-            MemberService.Save(member);
-
-            DateTime newDate = now.AddDays(10);
-            member.LastLoginDate = newDate;
-            member.UpdateDate = newDate;
-            MemberService.Save(member);
-
-            // re-get
-            member = MemberService.GetById(member.Id);
-
-            Assert.That(member.LastLoginDate, Is.EqualTo(newDate).Within(1).Seconds);
-            Assert.That(member.UpdateDate, Is.EqualTo(newDate).Within(1).Seconds);
-        }
-
-        // These might seem like some somewhat pointless tests, but there's some funky things going on in MemberRepository when saving.
-        [Test]
-        public void Can_Set_Failed_Password_Attempts()
-        {
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+                MemberGroup = roleId,
+                Member = member1.Id
+            });
+            ScopeAccessor.AmbientScope.Database.Insert(new Member2MemberGroupDto
             {
-                FailedPasswordAttempts = 1,
-            };
-            MemberService.Save(member);
-
-            member.FailedPasswordAttempts = 2;
-            MemberService.Save(member);
-
-            member = MemberService.GetById(member.Id);
-
-            Assert.AreEqual(2, member.FailedPasswordAttempts);
+                MemberGroup = roleId,
+                Member = member2.Id
+            });
+            scope.Complete();
         }
 
-        [Test]
-        public void Can_Set_Is_Approved()
-        {
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
-            MemberService.Save(member);
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+        Assert.AreEqual(2, membersInRole.Count());
+    }
 
-            member.IsApproved = false;
-            MemberService.Save(member);
+    [Test]
+    public void Cannot_Save_Member_With_Empty_Name()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, string.Empty, "test@test.com", "pass", "test");
 
-            member = MemberService.GetById(member.Id);
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => MemberService.Save(member));
+    }
 
-            Assert.IsFalse(member.IsApproved);
-        }
+    [TestCase("MyTestRole1", "test1", StringPropertyMatchType.StartsWith, 1)]
+    [TestCase("MyTestRole1", "test", StringPropertyMatchType.StartsWith, 3)]
+    [TestCase("MyTestRole1", "test1", StringPropertyMatchType.Exact, 1)]
+    [TestCase("MyTestRole1", "test", StringPropertyMatchType.Exact, 0)]
+    [TestCase("MyTestRole1", "st2", StringPropertyMatchType.EndsWith, 1)]
+    [TestCase("MyTestRole1", "test%", StringPropertyMatchType.Wildcard, 3)]
+    public void Find_Members_In_Role(string roleName1, string usernameToMatch, StringPropertyMatchType matchType,
+        int resultCount)
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+        var member3 = MemberBuilder.CreateSimpleMember(memberType, "test3", "test3@test.com", "pass", "test3");
+        MemberService.Save(member3);
 
-        [Test]
-        public void Can_Set_Is_Locked_Out()
-        {
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+        MemberService.AssignRoles(new[] { member1.Id, member2.Id, member3.Id }, new[] { roleName1 });
+
+        var result = MemberService.FindMembersInRole(roleName1, usernameToMatch, matchType);
+        Assert.AreEqual(resultCount, result.Count());
+    }
+
+    [Test]
+    public void Associate_Members_To_Roles_With_Member_Id()
+    {
+        MemberService.AddRole("MyTestRole1");
+
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+
+        // temp make sure they exist
+        Assert.IsNotNull(MemberService.GetById(member1.Id));
+        Assert.IsNotNull(MemberService.GetById(member2.Id));
+
+        MemberService.AssignRoles(new[] { member1.Id, member2.Id }, new[] { "MyTestRole1" });
+
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+
+        Assert.AreEqual(2, membersInRole.Count());
+    }
+
+    [Test]
+    public void Associate_Members_To_Roles_With_Member_Id_Casing()
+    {
+        MemberService.AddRole("MyTestRole1");
+
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+
+        // temp make sure they exist
+        Assert.IsNotNull(MemberService.GetById(member1.Id));
+        Assert.IsNotNull(MemberService.GetById(member2.Id));
+
+        MemberService.AssignRoles(new[] { member1.Id, member2.Id }, new[] { "mytestrole1" });
+
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+
+        Assert.AreEqual(2, membersInRole.Count());
+    }
+
+    [Test]
+    public void Associate_Members_To_Roles_With_Member_Username()
+    {
+        MemberService.AddRole("MyTestRole1");
+
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+
+        MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1" });
+
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+
+        Assert.AreEqual(2, membersInRole.Count());
+    }
+
+    [Test]
+    public void Associate_Members_To_Roles_With_Member_Username_Containing_At_Symbols()
+    {
+        MemberService.AddRole("MyTestRole1");
+
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1@test.com");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2@test.com");
+        MemberService.Save(member2);
+
+        MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1" });
+
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+
+        Assert.AreEqual(2, membersInRole.Count());
+    }
+
+    [Test]
+    public void Associate_Members_To_Roles_With_New_Role()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+
+        // implicitly create the role
+        MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1" });
+
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+
+        Assert.AreEqual(2, membersInRole.Count());
+    }
+
+    [Test]
+    public void Remove_Members_From_Roles_With_Member_Id()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+
+        MemberService.AssignRoles(new[] { member1.Id, member2.Id }, new[] { "MyTestRole1", "MyTestRole2" });
+
+        MemberService.DissociateRoles(new[] { member1.Id }, new[] { "MyTestRole1" });
+        MemberService.DissociateRoles(new[] { member1.Id, member2.Id }, new[] { "MyTestRole2" });
+
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+        Assert.AreEqual(1, membersInRole.Count());
+        membersInRole = MemberService.GetMembersInRole("MyTestRole2");
+        Assert.AreEqual(0, membersInRole.Count());
+    }
+
+    [Test]
+    public void Remove_Members_From_Roles_With_Member_Username()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
+        MemberService.Save(member1);
+        var member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
+        MemberService.Save(member2);
+
+        MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1", "MyTestRole2" });
+
+        MemberService.DissociateRoles(new[] { member1.Username }, new[] { "MyTestRole1" });
+        MemberService.DissociateRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole2" });
+
+        var membersInRole = MemberService.GetMembersInRole("MyTestRole1");
+        Assert.AreEqual(1, membersInRole.Count());
+        membersInRole = MemberService.GetMembersInRole("MyTestRole2");
+        Assert.AreEqual(0, membersInRole.Count());
+    }
+
+    [Test]
+    public void Can_Delete_member()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        MemberService.Delete(member);
+        var deleted = MemberService.GetById(member.Id);
+
+        // Assert
+        Assert.That(deleted, Is.Null);
+    }
+
+    [Test]
+    public void Exists_By_Username()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+        IMember member2 =
+            MemberBuilder.CreateSimpleMember(memberType, "test", "test2@test.com", "pass", "test2@test.com");
+        MemberService.Save(member2);
+
+        Assert.IsTrue(MemberService.Exists("test"));
+        Assert.IsFalse(MemberService.Exists("notFound"));
+        Assert.IsTrue(MemberService.Exists("test2@test.com"));
+    }
+
+    [Test]
+    public void Exists_By_Id()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        Assert.IsTrue(MemberService.Exists(member.Id));
+        Assert.IsFalse(MemberService.Exists(9876));
+    }
+
+    [Test]
+    public void Tracks_Dirty_Changes()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        var resolved = MemberService.GetByEmail(member.Email);
+
+        // NOTE: This will not trigger a property isDirty because this is not based on a 'Property', it is
+        // just a c# property of the Member object
+        resolved.Email = "changed@test.com";
+
+        // NOTE: This will not trigger a property isDirty for the same reason above, but this is a new change, so leave this to make sure.
+        resolved.FailedPasswordAttempts = 1234;
+
+        // NOTE: this WILL trigger a property isDirty because setting this c# property actually sets a value of
+        // the underlying 'Property'
+        resolved.Comments = "This will make it dirty";
+
+        var dirtyMember = (ICanBeDirty)resolved;
+        var dirtyProperties = resolved.Properties.Where(x => x.IsDirty()).ToList();
+        Assert.IsTrue(dirtyMember.IsDirty());
+        Assert.AreEqual(1, dirtyProperties.Count);
+
+        // Assert that email and failed password attempts is still set as dirty on the member it self
+        Assert.IsTrue(dirtyMember.IsPropertyDirty(nameof(resolved.Email)));
+        Assert.IsTrue(dirtyMember.IsPropertyDirty(nameof(resolved.FailedPasswordAttempts)));
+
+        // Comment will also be marked as dirty on the member object because content base merges dirty properties.
+        Assert.IsTrue(dirtyMember.IsPropertyDirty(Constants.Conventions.Member.Comments));
+        Assert.AreEqual(3, dirtyMember.GetDirtyProperties().Count());
+    }
+
+    [Test]
+    public void Get_By_Email()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        Assert.IsNotNull(MemberService.GetByEmail(member.Email));
+        Assert.IsNull(MemberService.GetByEmail("do@not.find"));
+    }
+
+    [Test]
+    public void Get_Member_Name()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member =
+            MemberBuilder.CreateSimpleMember(memberType, "Test Real Name", "test@test.com", "pass", "testUsername");
+        MemberService.Save(member);
+
+        Assert.AreEqual("Test Real Name", member.Name);
+    }
+
+    [Test]
+    public void Get_By_Username()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        Assert.IsNotNull(MemberService.GetByUsername(member.Username));
+        Assert.IsNull(MemberService.GetByUsername("notFound"));
+    }
+
+    [Test]
+    public void Get_By_Object_Id()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+
+        Assert.IsNotNull(MemberService.GetById(member.Id));
+        Assert.IsNull(MemberService.GetById(9876));
+    }
+
+    [Test]
+    public void Get_All_Paged_Members()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        var found = MemberService.GetAll(0, 2, out var totalRecs);
+
+        Assert.AreEqual(2, found.Count());
+        Assert.AreEqual(10, totalRecs);
+        Assert.AreEqual("test0", found.First().Username);
+        Assert.AreEqual("test1", found.Last().Username);
+    }
+
+    [Test]
+    public void Get_All_Paged_Members_With_Filter()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        var found = MemberService.GetAll(0, 2, out var totalRecs, "username", Direction.Ascending, true, null,
+            "Member No-");
+
+        Assert.AreEqual(2, found.Count());
+        Assert.AreEqual(10, totalRecs);
+        Assert.AreEqual("test0", found.First().Username);
+        Assert.AreEqual("test1", found.Last().Username);
+
+        found = MemberService.GetAll(0, 2, out totalRecs, "username", Direction.Ascending, true, null, "Member No-5");
+
+        Assert.AreEqual(1, found.Count());
+        Assert.AreEqual(1, totalRecs);
+        Assert.AreEqual("test5", found.First().Username);
+    }
+
+    [Test]
+    public void Find_By_Name_Starts_With()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "Bob", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindMembersByDisplayName("B", 0, 100, out var totalRecs);
+
+        Assert.AreEqual(1, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Email_Starts_With()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // don't find this
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByEmail("tes", 0, 100, out var totalRecs);
+
+        Assert.AreEqual(10, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Email_Ends_With()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // include this
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByEmail("test.com", 0, 100, out var totalRecs, StringPropertyMatchType.EndsWith);
+
+        Assert.AreEqual(11, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Email_Contains()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // include this
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByEmail("test", 0, 100, out var totalRecs, StringPropertyMatchType.Contains);
+
+        Assert.AreEqual(11, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Email_Exact()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // include this
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByEmail("hello@test.com", 0, 100, out var totalRecs,
+            StringPropertyMatchType.Exact);
+
+        Assert.AreEqual(1, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Login_Starts_With()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // don't find this
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByUsername("tes", 0, 100, out var totalRecs);
+
+        Assert.AreEqual(10, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Login_Ends_With()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // include this
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByUsername("llo", 0, 100, out var totalRecs, StringPropertyMatchType.EndsWith);
+
+        Assert.AreEqual(1, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Login_Contains()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // include this
+        var customMember =
+            MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hellotest");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByUsername("test", 0, 100, out var totalRecs, StringPropertyMatchType.Contains);
+
+        Assert.AreEqual(11, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Login_Exact()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+
+        // include this
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.FindByUsername("hello", 0, 100, out var totalRecs, StringPropertyMatchType.Exact);
+
+        Assert.AreEqual(1, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_String_Value_Exact()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "title", "hello member");
+
+        Assert.AreEqual(1, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_String_Value_Contains()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "title", " member", StringPropertyMatchType.Contains);
+
+        Assert.AreEqual(11, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_String_Value_Starts_With()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "title", "Member No", StringPropertyMatchType.StartsWith);
+
+        Assert.AreEqual(10, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_String_Value_Ends_With()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("title", "title of mine");
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "title", "mine", StringPropertyMatchType.EndsWith);
+
+        Assert.AreEqual(1, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_Int_Value_Exact()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "number")
             {
-                IsLockedOut = false,
-            };
-            MemberService.Save(member);
+                Name = "Number",
+                DataTypeId =
+                    -51 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members =
+            MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
+        MemberService.Save(members);
 
-            member.IsLockedOut = true;
-            MemberService.Save(member);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("number", 2);
+        MemberService.Save(customMember);
 
-            member = MemberService.GetById(member.Id);
+        var found = MemberService.GetMembersByPropertyValue(
+            "number", 2);
 
-            Assert.IsTrue(member.IsLockedOut);
-        }
+        Assert.AreEqual(2, found.Count());
+    }
 
-        [Test]
-        public void Can_Set_Last_Lockout_Date()
-        {
-            DateTime now = DateTime.Now;
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+    [Test]
+    public void Get_By_Property_Int_Value_Greater_Than()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "number")
             {
-                LastLockoutDate = now,
-            };
-            MemberService.Save(member);
+                Name = "Number",
+                DataTypeId =
+                    -51 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members =
+            MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
+        MemberService.Save(members);
 
-            DateTime newDate = now.AddDays(10);
-            member.LastLockoutDate = newDate;
-            MemberService.Save(member);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("number", 10);
+        MemberService.Save(customMember);
 
-            // re-get
-            member = MemberService.GetById(member.Id);
+        var found = MemberService.GetMembersByPropertyValue(
+            "number", 3, ValuePropertyMatchType.GreaterThan);
 
-            Assert.That(member.LastLockoutDate, Is.EqualTo(newDate).Within(1).Seconds);
-        }
+        Assert.AreEqual(7, found.Count());
+    }
 
-        [Test]
-        public void Can_set_Last_Login_Date()
-        {
-            DateTime now = DateTime.Now;
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+    [Test]
+    public void Get_By_Property_Int_Value_Greater_Than_Equal_To()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "number")
             {
-                LastLoginDate = now,
-            };
-            MemberService.Save(member);
+                Name = "Number",
+                DataTypeId =
+                    -51 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members =
+            MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
+        MemberService.Save(members);
 
-            DateTime newDate = now.AddDays(10);
-            member.LastLoginDate = newDate;
-            MemberService.Save(member);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("number", 10);
+        MemberService.Save(customMember);
 
-            // re-get
-            member = MemberService.GetById(member.Id);
+        var found = MemberService.GetMembersByPropertyValue(
+            "number", 3, ValuePropertyMatchType.GreaterThanOrEqualTo);
 
-            Assert.That(member.LastLoginDate, Is.EqualTo(newDate).Within(1).Seconds);
-        }
+        Assert.AreEqual(8, found.Count());
+    }
 
-        [Test]
-        public void Can_Set_Last_Password_Change_Date()
-        {
-            DateTime now = DateTime.Now;
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true)
+    [Test]
+    public void Get_By_Property_Int_Value_Less_Than()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.DateTime,
+                ValueStorageType.Date,
+                "number")
             {
-                LastPasswordChangeDate = now,
-            };
-            MemberService.Save(member);
+                Name = "Number",
+                DataTypeId =
+                    -51 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members =
+            MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
+        MemberService.Save(members);
 
-            DateTime newDate = now.AddDays(10);
-            member.LastPasswordChangeDate = newDate;
-            MemberService.Save(member);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("number", 1);
+        MemberService.Save(customMember);
 
-            // re-get
-            member = MemberService.GetById(member.Id);
+        var found = MemberService.GetMembersByPropertyValue(
+            "number", 5, ValuePropertyMatchType.LessThan);
 
-            Assert.That(member.LastPasswordChangeDate, Is.EqualTo(newDate).Within(1).Seconds);
-        }
+        Assert.AreEqual(6, found.Count());
+    }
 
-        [Test]
-        public void Can_Create_Member_With_Properties()
-        {
-            IMemberType memberType = MemberTypeService.Get("member");
-            IMember member = new Member("xname", "xemail", "xusername", "xrawpassword", memberType, true);
-            MemberService.Save(member);
-
-            member = MemberService.GetById(member.Id);
-            Assert.AreEqual("xemail", member.Email);
-
-            var contentTypeFactory = new PublishedContentTypeFactory(new NoopPublishedModelFactory(), new PropertyValueConverterCollection(() => Enumerable.Empty<IPropertyValueConverter>()), GetRequiredService<IDataTypeService>());
-            var pmemberType = new PublishedContentType(memberType, contentTypeFactory);
-
-            var publishedSnapshotAccessor = new TestPublishedSnapshotAccessor();
-            var variationContextAccessor = new TestVariationContextAccessor();
-            IPublishedContent pmember = PublishedMember.Create(member, pmemberType, false, publishedSnapshotAccessor, variationContextAccessor, GetRequiredService<IPublishedModelFactory>());
-
-            // contains the umbracoMember... properties created when installing, on the member type
-            // contains the other properties, that PublishedContentType adds (BuiltinMemberProperties)
-            string[] aliases = new[]
+    [Test]
+    public void Get_By_Property_Int_Value_Less_Than_Or_Equal()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "number")
             {
-                Constants.Conventions.Member.Comments,
-                nameof(IMember.Email),
-                nameof(IMember.Username),
-                nameof(IMember.Comments),
-                nameof(IMember.IsApproved),
-                nameof(IMember.IsLockedOut),
-                nameof(IMember.LastLockoutDate),
-                nameof(IMember.CreateDate),
-                nameof(IMember.LastLoginDate),
-                nameof(IMember.LastPasswordChangeDate)
-            };
+                Name = "Number",
+                DataTypeId =
+                    -51 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members =
+            MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
+        MemberService.Save(members);
 
-            var properties = pmember.Properties.ToList();
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("number", 1);
+        MemberService.Save(customMember);
 
-            Assert.IsTrue(properties.Select(x => x.Alias).ContainsAll(aliases));
+        var found = MemberService.GetMembersByPropertyValue(
+            "number", 5, ValuePropertyMatchType.LessThanOrEqualTo);
 
-            IPublishedProperty email = properties[aliases.IndexOf(nameof(IMember.Email))];
-            Assert.AreEqual("xemail", email.GetSourceValue());
-        }
+        Assert.AreEqual(7, found.Count());
+    }
 
-        [Test]
-        public void Can_Create_Member()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            Assert.AreNotEqual(0, member.Id);
-            IMember foundMember = MemberService.GetById(member.Id);
-            Assert.IsNotNull(foundMember);
-            Assert.AreEqual("test@test.com", foundMember.Email);
-        }
-
-        [Test]
-        public void Can_Create_Member_With_Long_TLD_In_Email()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.marketing", "pass", "test");
-            MemberService.Save(member);
-
-            Assert.AreNotEqual(0, member.Id);
-            IMember foundMember = MemberService.GetById(member.Id);
-            Assert.IsNotNull(foundMember);
-            Assert.AreEqual("test@test.marketing", foundMember.Email);
-        }
-
-        [Test]
-        public void Can_Create_Role()
-        {
-            MemberService.AddRole("MyTestRole");
-
-            IEnumerable<IMemberGroup> found = MemberService.GetAllRoles();
-
-            Assert.AreEqual(1, found.Count());
-            Assert.AreEqual("MyTestRole", found.Single().Name);
-        }
-
-        [Test]
-        public void Can_Create_Duplicate_Role()
-        {
-            MemberService.AddRole("MyTestRole");
-            MemberService.AddRole("MyTestRole");
-
-            IEnumerable<IMemberGroup> found = MemberService.GetAllRoles();
-
-            Assert.AreEqual(1, found.Count());
-            Assert.AreEqual("MyTestRole", found.Single().Name);
-        }
-
-        [Test]
-        public void Can_Get_All_Roles()
-        {
-            MemberService.AddRole("MyTestRole1");
-            MemberService.AddRole("MyTestRole2");
-            MemberService.AddRole("MyTestRole3");
-
-            IEnumerable<IMemberGroup> found = MemberService.GetAllRoles();
-
-            Assert.AreEqual(3, found.Count());
-        }
-
-        [Test]
-        public void Can_Get_All_Roles_IDs()
-        {
-            MemberService.AddRole("MyTestRole1");
-            MemberService.AddRole("MyTestRole2");
-            MemberService.AddRole("MyTestRole3");
-
-            IEnumerable<int> found = MemberService.GetAllRolesIds();
-
-            Assert.AreEqual(3, found.Count());
-        }
-
-        [Test]
-        public void Can_Replace_Roles()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            string[] roleNames1 = new[] { "TR1", "TR2" };
-            MemberService.AssignRoles(new[] { member.Id }, roleNames1);
-            IEnumerable<string> memberRoles = MemberService.GetAllRoles(member.Id);
-            CollectionAssert.AreEquivalent(roleNames1, memberRoles);
-
-            string[] roleNames2 = new[] { "TR3", "TR4" };
-            MemberService.ReplaceRoles(new[] { member.Id }, roleNames2);
-            memberRoles = MemberService.GetAllRoles(member.Id);
-            CollectionAssert.AreEquivalent(roleNames2, memberRoles);
-        }
-
-        [Test]
-        public void Can_Get_All_Roles_By_Member_Id()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            MemberService.AddRole("MyTestRole1");
-            MemberService.AddRole("MyTestRole2");
-            MemberService.AddRole("MyTestRole3");
-            MemberService.AssignRoles(new[] { member.Id }, new[] { "MyTestRole1", "MyTestRole2" });
-
-            IEnumerable<string> memberRoles = MemberService.GetAllRoles(member.Id);
-
-            Assert.AreEqual(2, memberRoles.Count());
-        }
-
-        [Test]
-        public void Can_Get_All_Roles_Ids_By_Member_Id()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            MemberService.AddRole("MyTestRole1");
-            MemberService.AddRole("MyTestRole2");
-            MemberService.AddRole("MyTestRole3");
-            MemberService.AssignRoles(new[] { member.Id }, new[] { "MyTestRole1", "MyTestRole2" });
-
-            IEnumerable<int> memberRoles = MemberService.GetAllRolesIds(member.Id);
-
-            Assert.AreEqual(2, memberRoles.Count());
-        }
-
-        [Test]
-        public void Can_Get_All_Roles_By_Member_Username()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            // need to test with '@' symbol in the lookup
-            IMember member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2@test.com");
-            MemberService.Save(member2);
-
-            MemberService.AddRole("MyTestRole1");
-            MemberService.AddRole("MyTestRole2");
-            MemberService.AddRole("MyTestRole3");
-            MemberService.AssignRoles(new[] { member.Id, member2.Id }, new[] { "MyTestRole1", "MyTestRole2" });
-
-            IEnumerable<string> memberRoles = MemberService.GetAllRoles("test");
-            Assert.AreEqual(2, memberRoles.Count());
-
-            IEnumerable<string> memberRoles2 = MemberService.GetAllRoles("test2@test.com");
-            Assert.AreEqual(2, memberRoles2.Count());
-        }
-
-        [Test]
-        public void Can_Delete_Role()
-        {
-            MemberService.AddRole("MyTestRole1");
-
-            MemberService.DeleteRole("MyTestRole1", false);
-
-            IEnumerable<IMemberGroup> memberRoles = MemberService.GetAllRoles();
-
-            Assert.AreEqual(0, memberRoles.Count());
-        }
-
-        [Test]
-        public void Throws_When_Deleting_Assigned_Role()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            MemberService.AddRole("MyTestRole1");
-            MemberService.AssignRoles(new[] { member.Id }, new[] { "MyTestRole1", "MyTestRole2" });
-
-            Assert.Throws<InvalidOperationException>(() => MemberService.DeleteRole("MyTestRole1", true));
-        }
-
-        [Test]
-        public void Can_Get_Members_In_Role()
-        {
-            MemberService.AddRole("MyTestRole1");
-            int roleId;
-            using (IScope scope = ScopeProvider.CreateScope())
+    [Test]
+    public void Get_By_Property_Date_Value_Exact()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "date")
             {
-                roleId = ScopeAccessor.AmbientScope.Database.ExecuteScalar<int>("SELECT id from umbracoNode where [text] = 'MyTestRole1'");
-                scope.Complete();
-            }
+                Name = "Date",
+                DataTypeId =
+                    -36 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10,
+            (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
+        MemberService.Save(members);
 
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 2, 0));
+        MemberService.Save(customMember);
 
-            using (IScope scope = ScopeProvider.CreateScope())
+        var found = MemberService.GetMembersByPropertyValue(
+            "date", new DateTime(2013, 12, 20, 1, 2, 0));
+
+        Assert.AreEqual(2, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_Date_Value_Greater_Than()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "date")
             {
-                ScopeAccessor.AmbientScope.Database.Insert(new Member2MemberGroupDto { MemberGroup = roleId, Member = member1.Id });
-                ScopeAccessor.AmbientScope.Database.Insert(new Member2MemberGroupDto { MemberGroup = roleId, Member = member2.Id });
-                scope.Complete();
-            }
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-            Assert.AreEqual(2, membersInRole.Count());
-        }
-
-        [Test]
-        public void Cannot_Save_Member_With_Empty_Name()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, string.Empty, "test@test.com", "pass", "test");
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => MemberService.Save(member));
-        }
-
-        [TestCase("MyTestRole1", "test1", StringPropertyMatchType.StartsWith, 1)]
-        [TestCase("MyTestRole1", "test", StringPropertyMatchType.StartsWith, 3)]
-        [TestCase("MyTestRole1", "test1", StringPropertyMatchType.Exact, 1)]
-        [TestCase("MyTestRole1", "test", StringPropertyMatchType.Exact, 0)]
-        [TestCase("MyTestRole1", "st2", StringPropertyMatchType.EndsWith, 1)]
-        [TestCase("MyTestRole1", "test%", StringPropertyMatchType.Wildcard, 3)]
-        public void Find_Members_In_Role(string roleName1, string usernameToMatch, StringPropertyMatchType matchType, int resultCount)
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
-            Member member3 = MemberBuilder.CreateSimpleMember(memberType, "test3", "test3@test.com", "pass", "test3");
-            MemberService.Save(member3);
-
-            MemberService.AssignRoles(new[] { member1.Id, member2.Id, member3.Id }, new[] { roleName1 });
-
-            IEnumerable<IMember> result = MemberService.FindMembersInRole(roleName1, usernameToMatch, matchType);
-            Assert.AreEqual(resultCount, result.Count());
-        }
-
-        [Test]
-        public void Associate_Members_To_Roles_With_Member_Id()
-        {
-            MemberService.AddRole("MyTestRole1");
-
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
-
-            // temp make sure they exist
-            Assert.IsNotNull(MemberService.GetById(member1.Id));
-            Assert.IsNotNull(MemberService.GetById(member2.Id));
-
-            MemberService.AssignRoles(new[] { member1.Id, member2.Id }, new[] { "MyTestRole1" });
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-
-            Assert.AreEqual(2, membersInRole.Count());
-        }
-
-        [Test]
-        public void Associate_Members_To_Roles_With_Member_Id_Casing()
-        {
-            MemberService.AddRole("MyTestRole1");
-
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
-
-            // temp make sure they exist
-            Assert.IsNotNull(MemberService.GetById(member1.Id));
-            Assert.IsNotNull(MemberService.GetById(member2.Id));
-
-            MemberService.AssignRoles(new[] { member1.Id, member2.Id }, new[] { "mytestrole1" });
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-
-            Assert.AreEqual(2, membersInRole.Count());
-        }
-
-        [Test]
-        public void Associate_Members_To_Roles_With_Member_Username()
-        {
-            MemberService.AddRole("MyTestRole1");
-
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
-
-            MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1" });
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-
-            Assert.AreEqual(2, membersInRole.Count());
-        }
-
-        [Test]
-        public void Associate_Members_To_Roles_With_Member_Username_Containing_At_Symbols()
-        {
-            MemberService.AddRole("MyTestRole1");
-
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1@test.com");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2@test.com");
-            MemberService.Save(member2);
-
-            MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1" });
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-
-            Assert.AreEqual(2, membersInRole.Count());
-        }
-
-        [Test]
-        public void Associate_Members_To_Roles_With_New_Role()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
-
-            // implicitly create the role
-            MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1" });
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-
-            Assert.AreEqual(2, membersInRole.Count());
-        }
-
-        [Test]
-        public void Remove_Members_From_Roles_With_Member_Id()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
-
-            MemberService.AssignRoles(new[] { member1.Id, member2.Id }, new[] { "MyTestRole1", "MyTestRole2" });
-
-            MemberService.DissociateRoles(new[] { member1.Id }, new[] { "MyTestRole1" });
-            MemberService.DissociateRoles(new[] { member1.Id, member2.Id }, new[] { "MyTestRole2" });
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-            Assert.AreEqual(1, membersInRole.Count());
-            membersInRole = MemberService.GetMembersInRole("MyTestRole2");
-            Assert.AreEqual(0, membersInRole.Count());
-        }
-
-        [Test]
-        public void Remove_Members_From_Roles_With_Member_Username()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            Member member1 = MemberBuilder.CreateSimpleMember(memberType, "test1", "test1@test.com", "pass", "test1");
-            MemberService.Save(member1);
-            Member member2 = MemberBuilder.CreateSimpleMember(memberType, "test2", "test2@test.com", "pass", "test2");
-            MemberService.Save(member2);
-
-            MemberService.AssignRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole1", "MyTestRole2" });
-
-            MemberService.DissociateRoles(new[] { member1.Username }, new[] { "MyTestRole1" });
-            MemberService.DissociateRoles(new[] { member1.Username, member2.Username }, new[] { "MyTestRole2" });
-
-            IEnumerable<IMember> membersInRole = MemberService.GetMembersInRole("MyTestRole1");
-            Assert.AreEqual(1, membersInRole.Count());
-            membersInRole = MemberService.GetMembersInRole("MyTestRole2");
-            Assert.AreEqual(0, membersInRole.Count());
-        }
-
-        [Test]
-        public void Can_Delete_member()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            MemberService.Delete(member);
-            IMember deleted = MemberService.GetById(member.Id);
-
-            // Assert
-            Assert.That(deleted, Is.Null);
-        }
-
-        [Test]
-        public void Exists_By_Username()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-            IMember member2 = MemberBuilder.CreateSimpleMember(memberType, "test", "test2@test.com", "pass", "test2@test.com");
-            MemberService.Save(member2);
-
-            Assert.IsTrue(MemberService.Exists("test"));
-            Assert.IsFalse(MemberService.Exists("notFound"));
-            Assert.IsTrue(MemberService.Exists("test2@test.com"));
-        }
-
-        [Test]
-        public void Exists_By_Id()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            Assert.IsTrue(MemberService.Exists(member.Id));
-            Assert.IsFalse(MemberService.Exists(9876));
-        }
-
-        [Test]
-        public void Tracks_Dirty_Changes()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            IMember resolved = MemberService.GetByEmail(member.Email);
-
-            // NOTE: This will not trigger a property isDirty because this is not based on a 'Property', it is
-            // just a c# property of the Member object
-            resolved.Email = "changed@test.com";
-
-            // NOTE: This will not trigger a property isDirty for the same reason above, but this is a new change, so leave this to make sure.
-            resolved.FailedPasswordAttempts = 1234;
-
-            // NOTE: this WILL trigger a property isDirty because setting this c# property actually sets a value of
-            // the underlying 'Property'
-            resolved.Comments = "This will make it dirty";
-
-            var dirtyMember = (ICanBeDirty)resolved;
-            var dirtyProperties = resolved.Properties.Where(x => x.IsDirty()).ToList();
-            Assert.IsTrue(dirtyMember.IsDirty());
-            Assert.AreEqual(1, dirtyProperties.Count);
-
-            // Assert that email and failed password attempts is still set as dirty on the member it self
-            Assert.IsTrue(dirtyMember.IsPropertyDirty(nameof(resolved.Email)));
-            Assert.IsTrue(dirtyMember.IsPropertyDirty(nameof(resolved.FailedPasswordAttempts)));
-
-            // Comment will also be marked as dirty on the member object because content base merges dirty properties.
-            Assert.IsTrue(dirtyMember.IsPropertyDirty(Constants.Conventions.Member.Comments));
-            Assert.AreEqual(3, dirtyMember.GetDirtyProperties().Count());
-        }
-
-        [Test]
-        public void Get_By_Email()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            Assert.IsNotNull(MemberService.GetByEmail(member.Email));
-            Assert.IsNull(MemberService.GetByEmail("do@not.find"));
-        }
-
-        [Test]
-        public void Get_Member_Name()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "Test Real Name", "test@test.com", "pass", "testUsername");
-            MemberService.Save(member);
-
-            Assert.AreEqual("Test Real Name", member.Name);
-        }
-
-        [Test]
-        public void Get_By_Username()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            Assert.IsNotNull(MemberService.GetByUsername(member.Username));
-            Assert.IsNull(MemberService.GetByUsername("notFound"));
-        }
-
-        [Test]
-        public void Get_By_Object_Id()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-
-            Assert.IsNotNull(MemberService.GetById(member.Id));
-            Assert.IsNull(MemberService.GetById(9876));
-        }
-
-        [Test]
-        public void Get_All_Paged_Members()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            IEnumerable<IMember> found = MemberService.GetAll(0, 2, out long totalRecs);
-
-            Assert.AreEqual(2, found.Count());
-            Assert.AreEqual(10, totalRecs);
-            Assert.AreEqual("test0", found.First().Username);
-            Assert.AreEqual("test1", found.Last().Username);
-        }
-
-        [Test]
-        public void Get_All_Paged_Members_With_Filter()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            IEnumerable<IMember> found = MemberService.GetAll(0, 2, out long totalRecs, "username", Direction.Ascending, true, null, "Member No-");
-
-            Assert.AreEqual(2, found.Count());
-            Assert.AreEqual(10, totalRecs);
-            Assert.AreEqual("test0", found.First().Username);
-            Assert.AreEqual("test1", found.Last().Username);
-
-            found = MemberService.GetAll(0, 2, out totalRecs, "username", Direction.Ascending, true, null, "Member No-5");
-
-            Assert.AreEqual(1, found.Count());
-            Assert.AreEqual(1, totalRecs);
-            Assert.AreEqual("test5", found.First().Username);
-        }
-
-        [Test]
-        public void Find_By_Name_Starts_With()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "Bob", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindMembersByDisplayName("B", 0, 100, out long totalRecs, StringPropertyMatchType.StartsWith);
-
-            Assert.AreEqual(1, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Email_Starts_With()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // don't find this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByEmail("tes", 0, 100, out long totalRecs, StringPropertyMatchType.StartsWith);
-
-            Assert.AreEqual(10, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Email_Ends_With()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // include this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByEmail("test.com", 0, 100, out long totalRecs, StringPropertyMatchType.EndsWith);
-
-            Assert.AreEqual(11, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Email_Contains()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // include this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByEmail("test", 0, 100, out long totalRecs, StringPropertyMatchType.Contains);
-
-            Assert.AreEqual(11, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Email_Exact()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // include this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByEmail("hello@test.com", 0, 100, out long totalRecs, StringPropertyMatchType.Exact);
-
-            Assert.AreEqual(1, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Login_Starts_With()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // don't find this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByUsername("tes", 0, 100, out long totalRecs, StringPropertyMatchType.StartsWith);
-
-            Assert.AreEqual(10, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Login_Ends_With()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // include this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByUsername("llo", 0, 100, out long totalRecs, StringPropertyMatchType.EndsWith);
-
-            Assert.AreEqual(1, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Login_Contains()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // include this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hellotest");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByUsername("test", 0, 100, out long totalRecs, StringPropertyMatchType.Contains);
-
-            Assert.AreEqual(11, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Login_Exact()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-
-            // include this
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.FindByUsername("hello", 0, 100, out long totalRecs, StringPropertyMatchType.Exact);
-
-            Assert.AreEqual(1, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_String_Value_Exact()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "title", "hello member", StringPropertyMatchType.Exact);
-
-            Assert.AreEqual(1, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_String_Value_Contains()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "title", " member", StringPropertyMatchType.Contains);
-
-            Assert.AreEqual(11, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_String_Value_Starts_With()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "title", "Member No", StringPropertyMatchType.StartsWith);
-
-            Assert.AreEqual(10, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_String_Value_Ends_With()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("title", "title of mine");
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "title", "mine", StringPropertyMatchType.EndsWith);
-
-            Assert.AreEqual(1, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Int_Value_Exact()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "number")
-                    {
-                        Name = "Number",
-                        DataTypeId = -51,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("number", 2);
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "number", 2, ValuePropertyMatchType.Exact);
-
-            Assert.AreEqual(2, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Int_Value_Greater_Than()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "number")
-                    {
-                        Name = "Number",
-                        DataTypeId = -51,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("number", 10);
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "number", 3, ValuePropertyMatchType.GreaterThan);
-
-            Assert.AreEqual(7, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Int_Value_Greater_Than_Equal_To()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "number")
-                {
-                    Name = "Number",
-                    DataTypeId = -51,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("number", 10);
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "number", 3, ValuePropertyMatchType.GreaterThanOrEqualTo);
-
-            Assert.AreEqual(8, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Int_Value_Less_Than()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.DateTime,
-                    ValueStorageType.Date,
-                    "number")
-                    {
-                        Name = "Number",
-                        DataTypeId = -51,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("number", 1);
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "number", 5, ValuePropertyMatchType.LessThan);
-
-            Assert.AreEqual(6, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Int_Value_Less_Than_Or_Equal()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "number")
-                    {
-                        Name = "Number",
-                        DataTypeId = -51,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("number", i));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("number", 1);
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "number", 5, ValuePropertyMatchType.LessThanOrEqualTo);
-
-            Assert.AreEqual(7, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Date_Value_Exact()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "date")
-                    {
-                        Name = "Date",
-                        DataTypeId = -36,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 2, 0));
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "date", new DateTime(2013, 12, 20, 1, 2, 0), ValuePropertyMatchType.Exact);
-
-            Assert.AreEqual(2, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Date_Value_Greater_Than()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "date")
-                    {
-                        Name = "Date",
-                        DataTypeId = -36,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 10, 0));
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "date", new DateTime(2013, 12, 20, 1, 3, 0), ValuePropertyMatchType.GreaterThan);
-
-            Assert.AreEqual(7, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Date_Value_Greater_Than_Equal_To()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "date")
-                    {
-                        Name = "Date",
-                        DataTypeId = -36,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 10, 0));
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "date", new DateTime(2013, 12, 20, 1, 3, 0), ValuePropertyMatchType.GreaterThanOrEqualTo);
-
-            Assert.AreEqual(8, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Date_Value_Less_Than()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "date")
-                    {
-                        Name = "Date",
-                        DataTypeId = -36,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 1, 0));
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "date", new DateTime(2013, 12, 20, 1, 5, 0), ValuePropertyMatchType.LessThan);
-
-            Assert.AreEqual(6, found.Count());
-        }
-
-        [Test]
-        public void Get_By_Property_Date_Value_Less_Than_Or_Equal()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.AddPropertyType(
-                new PropertyType(
-                    ShortStringHelper,
-                    Constants.PropertyEditors.Aliases.Integer,
-                    ValueStorageType.Integer,
-                    "date")
-                    {
-                        Name = "Date",
-                        DataTypeId = -36,  // NOTE: This is what really determines the db type - the above definition doesn't really do anything
-                    }, "content", "Content");
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 1, 0));
-            MemberService.Save(customMember);
-
-            IEnumerable<IMember> found = MemberService.GetMembersByPropertyValue(
-                "date", new DateTime(2013, 12, 20, 1, 5, 0), ValuePropertyMatchType.LessThanOrEqualTo);
-
-            Assert.AreEqual(7, found.Count());
-        }
-
-        [Test]
-        public void Count_All_Members()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
-            MemberService.Save(members);
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            int found = MemberService.GetCount(MemberCountType.All);
-
-            Assert.AreEqual(11, found);
-        }
-
-        [Test]
-        public void Count_All_Locked_Members()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.IsLockedOut = i % 2 == 0);
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.IsLockedOut = true;
-            MemberService.Save(customMember);
-
-            int found = MemberService.GetCount(MemberCountType.LockedOut);
-
-            Assert.AreEqual(6, found);
-        }
-
-        [Test]
-        public void Count_All_Approved_Members()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IEnumerable<IMember> members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.IsApproved = i % 2 == 0);
-            MemberService.Save(members);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            customMember.IsApproved = false;
-            MemberService.Save(customMember);
-
-            int found = MemberService.GetCount(MemberCountType.Approved);
-
-            Assert.AreEqual(5, found);
-        }
-
-        [Test]
-        public void Setting_Property_On_Built_In_Member_Property_When_Property_Doesnt_Exist_On_Type_Is_Ok()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            memberType.RemovePropertyType(Constants.Conventions.Member.Comments);
-            MemberTypeService.Save(memberType);
-            Assert.IsFalse(memberType.PropertyTypes.Any(x => x.Alias == Constants.Conventions.Member.Comments));
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-
-            // this should not throw an exception
-            customMember.Comments = "hello world";
-            MemberService.Save(customMember);
-
-            IMember found = MemberService.GetById(customMember.Id);
-
-            Assert.IsTrue(found.Comments.IsNullOrWhiteSpace());
-        }
-
-        [Test]
-        public void New_Member_Approved_By_Default()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-
-            Member customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
-            MemberService.Save(customMember);
-
-            IMember found = MemberService.GetById(customMember.Id);
-
-            Assert.IsTrue(found.IsApproved);
-        }
-
-        [Test]
-        public void Can_CreateWithIdentity()
-        {
-            // Arrange
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            string username = Path.GetRandomFileName();
-
-            // Act
-            IMember member = MemberService.CreateMemberWithIdentity(username, $"{username}@domain.email", Path.GetFileNameWithoutExtension(username), memberType);
-            IMember found = MemberService.GetById(member.Id);
-
-            // Assert
-            Assert.IsNotNull(member, "Verifying a member instance has been created");
-            Assert.IsNotNull(found, "Verifying the created member instance has been retrieved");
-            Assert.IsTrue(found?.Name == member?.Name, "Verifying the retrieved member instance has the expected name");
-        }
+                Name = "Date",
+                DataTypeId =
+                    -36 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10,
+            (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
+        MemberService.Save(members);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 10, 0));
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "date", new DateTime(2013, 12, 20, 1, 3, 0), ValuePropertyMatchType.GreaterThan);
+
+        Assert.AreEqual(7, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_Date_Value_Greater_Than_Equal_To()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "date")
+            {
+                Name = "Date",
+                DataTypeId =
+                    -36 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10,
+            (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
+        MemberService.Save(members);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 10, 0));
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "date", new DateTime(2013, 12, 20, 1, 3, 0), ValuePropertyMatchType.GreaterThanOrEqualTo);
+
+        Assert.AreEqual(8, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_Date_Value_Less_Than()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "date")
+            {
+                Name = "Date",
+                DataTypeId =
+                    -36 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10,
+            (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
+        MemberService.Save(members);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 1, 0));
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "date", new DateTime(2013, 12, 20, 1, 5, 0), ValuePropertyMatchType.LessThan);
+
+        Assert.AreEqual(6, found.Count());
+    }
+
+    [Test]
+    public void Get_By_Property_Date_Value_Less_Than_Or_Equal()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.AddPropertyType(
+            new PropertyType(
+                ShortStringHelper,
+                Constants.PropertyEditors.Aliases.Integer,
+                ValueStorageType.Integer,
+                "date")
+            {
+                Name = "Date",
+                DataTypeId =
+                    -36 // NOTE: This is what really determines the db type - the above definition doesn't really do anything
+            }, "content", "Content");
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10,
+            (i, member) => member.SetValue("date", new DateTime(2013, 12, 20, 1, i, 0)));
+        MemberService.Save(members);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.SetValue("date", new DateTime(2013, 12, 20, 1, 1, 0));
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetMembersByPropertyValue(
+            "date", new DateTime(2013, 12, 20, 1, 5, 0), ValuePropertyMatchType.LessThanOrEqualTo);
+
+        Assert.AreEqual(7, found.Count());
+    }
+
+    [Test]
+    public void Count_All_Members()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members = MemberBuilder.CreateMultipleSimpleMembers(memberType, 10);
+        MemberService.Save(members);
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetCount(MemberCountType.All);
+
+        Assert.AreEqual(11, found);
+    }
+
+    [Test]
+    public void Count_All_Locked_Members()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members =
+            MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.IsLockedOut = i % 2 == 0);
+        MemberService.Save(members);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.IsLockedOut = true;
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetCount(MemberCountType.LockedOut);
+
+        Assert.AreEqual(6, found);
+    }
+
+    [Test]
+    public void Count_All_Approved_Members()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var members =
+            MemberBuilder.CreateMultipleSimpleMembers(memberType, 10, (i, member) => member.IsApproved = i % 2 == 0);
+        MemberService.Save(members);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        customMember.IsApproved = false;
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetCount(MemberCountType.Approved);
+
+        Assert.AreEqual(5, found);
+    }
+
+    [Test]
+    public void Setting_Property_On_Built_In_Member_Property_When_Property_Doesnt_Exist_On_Type_Is_Ok()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        memberType.RemovePropertyType(Constants.Conventions.Member.Comments);
+        MemberTypeService.Save(memberType);
+        Assert.IsFalse(memberType.PropertyTypes.Any(x => x.Alias == Constants.Conventions.Member.Comments));
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+
+        // this should not throw an exception
+        customMember.Comments = "hello world";
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetById(customMember.Id);
+
+        Assert.IsTrue(found.Comments.IsNullOrWhiteSpace());
+    }
+
+    [Test]
+    public void New_Member_Approved_By_Default()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+
+        var customMember = MemberBuilder.CreateSimpleMember(memberType, "hello", "hello@test.com", "hello", "hello");
+        MemberService.Save(customMember);
+
+        var found = MemberService.GetById(customMember.Id);
+
+        Assert.IsTrue(found.IsApproved);
+    }
+
+    [Test]
+    public void Can_CreateWithIdentity()
+    {
+        // Arrange
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var username = Path.GetRandomFileName();
+
+        // Act
+        var member = MemberService.CreateMemberWithIdentity(username, $"{username}@domain.email",
+            Path.GetFileNameWithoutExtension(username), memberType);
+        var found = MemberService.GetById(member.Id);
+
+        // Assert
+        Assert.IsNotNull(member, "Verifying a member instance has been created");
+        Assert.IsNotNull(found, "Verifying the created member instance has been retrieved");
+        Assert.IsTrue(found?.Name == member?.Name, "Verifying the retrieved member instance has the expected name");
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs
index e16e659d92..0f010382e5 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MemberTypeServiceTests.cs
@@ -2,9 +2,7 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
@@ -13,381 +11,382 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true,
+    WithApplication = true)]
+public class MemberTypeServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)]
-    public class MemberTypeServiceTests : UmbracoIntegrationTest
+    private IMemberService MemberService => GetRequiredService<IMemberService>();
+
+    private IMemberTypeService MemberTypeService => GetRequiredService<IMemberTypeService>();
+
+    [Test]
+    public void Member_Cannot_Edit_Property()
     {
-        private IMemberService MemberService => GetRequiredService<IMemberService>();
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
 
-        private IMemberTypeService MemberTypeService => GetRequiredService<IMemberTypeService>();
-
-        [Test]
-        public void Member_Cannot_Edit_Property()
+        // re-get
+        memberType = MemberTypeService.Get(memberType.Id);
+        foreach (var p in memberType.PropertyTypes)
         {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-
-            // re-get
-            memberType = MemberTypeService.Get(memberType.Id);
-            foreach (IPropertyType p in memberType.PropertyTypes)
-            {
-                Assert.IsFalse(memberType.MemberCanEditProperty(p.Alias));
-            }
+            Assert.IsFalse(memberType.MemberCanEditProperty(p.Alias));
         }
-
-        [Test]
-        public void Member_Can_Edit_Property()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            string prop = memberType.PropertyTypes.First().Alias;
-            memberType.SetMemberCanEditProperty(prop, true);
-            MemberTypeService.Save(memberType);
-
-            // re-get
-            memberType = MemberTypeService.Get(memberType.Id);
-            foreach (IPropertyType p in memberType.PropertyTypes.Where(x => x.Alias != prop))
-            {
-                Assert.IsFalse(memberType.MemberCanEditProperty(p.Alias));
-            }
-
-            Assert.IsTrue(memberType.MemberCanEditProperty(prop));
-        }
-
-        [Test]
-        public void Member_Cannot_View_Property()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-
-            // re-get
-            memberType = MemberTypeService.Get(memberType.Id);
-            foreach (IPropertyType p in memberType.PropertyTypes)
-            {
-                Assert.IsFalse(memberType.MemberCanViewProperty(p.Alias));
-            }
-        }
-
-        [Test]
-        public void Member_Can_View_Property()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            string prop = memberType.PropertyTypes.First().Alias;
-            memberType.SetMemberCanViewProperty(prop, true);
-            MemberTypeService.Save(memberType);
-
-            // re-get
-            memberType = MemberTypeService.Get(memberType.Id);
-            foreach (IPropertyType p in memberType.PropertyTypes.Where(x => x.Alias != prop))
-            {
-                Assert.IsFalse(memberType.MemberCanViewProperty(p.Alias));
-            }
-
-            Assert.IsTrue(memberType.MemberCanViewProperty(prop));
-        }
-
-        [Test]
-        public void Deleting_PropertyType_Removes_The_Property_From_Member()
-        {
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            MemberTypeService.Save(memberType);
-            IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
-            MemberService.Save(member);
-            int initProps = member.Properties.Count;
-
-            // remove a property (NOT ONE OF THE DEFAULTS)
-            Dictionary<string, PropertyType> standardProps = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
-            memberType.RemovePropertyType(memberType.PropertyTypes.First(x => standardProps.ContainsKey(x.Alias) == false).Alias);
-            MemberTypeService.Save(memberType);
-
-            // re-load it from the db
-            member = MemberService.GetById(member.Id);
-
-            Assert.AreEqual(initProps - 1, member.Properties.Count);
-        }
-
-        [Test]
-        public void Cannot_Save_MemberType_With_Empty_Name()
-        {
-            // Arrange
-            IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType("memberTypeAlias", string.Empty);
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => MemberTypeService.Save(memberType));
-        }
-
-        [Test]
-        public void Empty_Description_Is_Always_Null_After_Saving_Member_Type()
-        {
-            IMemberTypeService service = MemberTypeService;
-            MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            memberType.Description = null;
-            service.Save(memberType);
-
-            MemberType memberType2 = MemberTypeBuilder.CreateSimpleMemberType("memberType2", "Member Type 2");
-            memberType2.Description = string.Empty;
-            service.Save(memberType2);
-
-            Assert.IsNull(memberType.Description);
-            Assert.IsNull(memberType2.Description);
-        }
-
-        // [Test]
-        // public void Can_Save_MemberType_Structure_And_Create_A_Member_Based_On_It()
-        // {
-        //    // Arrange
-        //    var cs = MemberService;
-        //    var cts = MemberTypeService;
-        //    var dtdYesNo = DataTypeService.GetDataTypeDefinitionById(-49);
-        //    var ctBase = new MemberType(-1) { Name = "Base", Alias = "Base", Icon = "folder.gif", Thumbnail = "folder.png" };
-        //    ctBase.AddPropertyType(new PropertyType(dtdYesNo)
-        //        {
-        //            Name = "Hide From Navigation",
-        //            Alias = Constants.Conventions.Content.NaviHide
-        //        }
-        //        /*,"Navigation"*/);
-        //    cts.Save(ctBase);
-
-        // var ctHomePage = new MemberType(ctBase)
-        //        {
-        //            Name = "Home Page",
-        //            Alias = "HomePage",
-        //            Icon = "settingDomain.gif",
-        //            Thumbnail = "folder.png",
-        //            AllowedAsRoot = true
-        //        };
-        //    ctHomePage.AddPropertyType(new PropertyType(dtdYesNo) { Name = "Some property", Alias = "someProperty" }
-        //        /*,"Navigation"*/);
-        //    cts.Save(ctHomePage);
-
-        // // Act
-        //    var homeDoc = cs.CreateMember("Test", "test@test.com", "test", "HomePage");
-
-        // // Assert
-        //    Assert.That(ctBase.HasIdentity, Is.True);
-        //    Assert.That(ctHomePage.HasIdentity, Is.True);
-        //    Assert.That(homeDoc.HasIdentity, Is.True);
-        //    Assert.That(homeDoc.ContentTypeId, Is.EqualTo(ctHomePage.Id));
-        // }
-
-        // [Test]
-        // public void Can_Create_And_Save_MemberType_Composition()
-        // {
-        //    /*
-        //     * Global
-        //     * - Components
-        //     * - Category
-        //     */
-        //    var service = ContentTypeService;
-        //    var global = MemberTypeBuilder.CreateSimpleContentType("global", "Global");
-        //    service.Save(global);
-
-        // var components = MemberTypeBuilder.CreateSimpleContentType("components", "Components", global);
-        //    service.Save(components);
-
-        // var component = MemberTypeBuilder.CreateSimpleContentType("component", "Component", components);
-        //    service.Save(component);
-
-        // var category = MemberTypeBuilder.CreateSimpleContentType("category", "Category", global);
-        //    service.Save(category);
-
-        // var success = category.AddContentType(component);
-
-        // Assert.That(success, Is.False);
-        // }
-
-        // [Test]
-        // public void Can_Remove_ContentType_Composition_From_ContentType()
-        // {
-        //    //Test for U4-2234
-        //    var cts = ContentTypeService;
-        //    //Arrange
-        //    var component = CreateComponent();
-        //    cts.Save(component);
-        //    var banner = CreateBannerComponent(component);
-        //    cts.Save(banner);
-        //    var site = CreateSite();
-        //    cts.Save(site);
-        //    var homepage = CreateHomepage(site);
-        //    cts.Save(homepage);
-
-        // //Add banner to homepage
-        //    var added = homepage.AddContentType(banner);
-        //    cts.Save(homepage);
-
-        // //Assert composition
-        //    var bannerExists = homepage.ContentTypeCompositionExists(banner.Alias);
-        //    var bannerPropertyExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
-        //    Assert.That(added, Is.True);
-        //    Assert.That(bannerExists, Is.True);
-        //    Assert.That(bannerPropertyExists, Is.True);
-        //    Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(6));
-
-        // //Remove banner from homepage
-        //    var removed = homepage.RemoveContentType(banner.Alias);
-        //    cts.Save(homepage);
-
-        // //Assert composition
-        //    var bannerStillExists = homepage.ContentTypeCompositionExists(banner.Alias);
-        //    var bannerPropertyStillExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
-        //    Assert.That(removed, Is.True);
-        //    Assert.That(bannerStillExists, Is.False);
-        //    Assert.That(bannerPropertyStillExists, Is.False);
-        //    Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(4));
-        // }
-
-        // [Test]
-        // public void Can_Copy_ContentType_By_Performing_Clone()
-        // {
-        //    // Arrange
-        //    var service = ContentTypeService;
-        //    var metaContentType = MemberTypeBuilder.CreateMetaContentType();
-        //    service.Save(metaContentType);
-
-        // var simpleContentType = MemberTypeBuilder.CreateSimpleContentType("category", "Category", metaContentType);
-        //    service.Save(simpleContentType);
-        //    var categoryId = simpleContentType.Id;
-
-        // // Act
-        //    var sut = simpleContentType.Clone("newcategory");
-        //    service.Save(sut);
-
-        // // Assert
-        //    Assert.That(sut.HasIdentity, Is.True);
-
-        // var contentType = service.GetContentType(sut.Id);
-        //    var category = service.GetContentType(categoryId);
-
-        // Assert.That(contentType.CompositionAliases().Any(x => x.Equals("meta")), Is.True);
-        //    Assert.AreEqual(contentType.ParentId, category.ParentId);
-        //    Assert.AreEqual(contentType.Level, category.Level);
-        //    Assert.AreEqual(contentType.PropertyTypes.Count(), category.PropertyTypes.Count());
-        //    Assert.AreNotEqual(contentType.Id, category.Id);
-        //    Assert.AreNotEqual(contentType.Key, category.Key);
-        //    Assert.AreNotEqual(contentType.Path, category.Path);
-        //    Assert.AreNotEqual(contentType.SortOrder, category.SortOrder);
-        //    Assert.AreNotEqual(contentType.PropertyTypes.First(x => x.Alias.Equals("title")).Id, category.PropertyTypes.First(x => x.Alias.Equals("title")).Id);
-        //    Assert.AreNotEqual(contentType.PropertyGroups.First(x => x.Name.Equals("Content")).Id, category.PropertyGroups.First(x => x.Name.Equals("Content")).Id);
-
-        // }
-
-        // private ContentType CreateComponent()
-        // {
-        //    var component = new ContentType(-1)
-        //        {
-        //            Alias = "component",
-        //            Name = "Component",
-        //            Description = "ContentType used for Component grouping",
-        //            Icon = ".sprTreeDoc3",
-        //            Thumbnail = "doc.png",
-        //            SortOrder = 1,
-        //            CreatorId = 0,
-        //            Trashed = false
-        //        };
-
-        // var contentCollection = new PropertyTypeCollection();
-        //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "componentGroup", Name = "Component Group", Description = "", HelpText = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
-        //    component.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Component", SortOrder = 1 });
-
-        // return component;
-        // }
-
-        // private ContentType CreateBannerComponent(ContentType parent)
-        // {
-        //    var banner = new ContentType(parent)
-        //        {
-        //            Alias = "banner",
-        //            Name = "Banner Component",
-        //            Description = "ContentType used for Banner Component",
-        //            Icon = ".sprTreeDoc3",
-        //            Thumbnail = "doc.png",
-        //            SortOrder = 1,
-        //            CreatorId = 0,
-        //            Trashed = false
-        //        };
-
-        // var propertyType = new PropertyType(new Guid(), DataTypeDatabaseType.Ntext)
-        //        {
-        //            Alias = "bannerName",
-        //            Name = "Banner Name",
-        //            Description = "",
-        //            HelpText = "",
-        //            Mandatory = false,
-        //            SortOrder = 2,
-        //            DataTypeDefinitionId = -88
-        //        };
-        //    banner.AddPropertyType(propertyType, "Component");
-        //    return banner;
-        // }
-
-        // private ContentType CreateSite()
-        // {
-        //    var site = new ContentType(-1)
-        //        {
-        //            Alias = "site",
-        //            Name = "Site",
-        //            Description = "ContentType used for Site inheritence",
-        //            Icon = ".sprTreeDoc3",
-        //            Thumbnail = "doc.png",
-        //            SortOrder = 2,
-        //            CreatorId = 0,
-        //            Trashed = false
-        //        };
-
-        // var contentCollection = new PropertyTypeCollection();
-        //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "hostname", Name = "Hostname", Description = "", HelpText = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
-        //    site.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Site Settings", SortOrder = 1 });
-
-        // return site;
-        // }
-
-        // private ContentType CreateHomepage(ContentType parent)
-        // {
-        //    var contentType = new ContentType(parent)
-        //        {
-        //            Alias = "homepage",
-        //            Name = "Homepage",
-        //            Description = "ContentType used for the Homepage",
-        //            Icon = ".sprTreeDoc3",
-        //            Thumbnail = "doc.png",
-        //            SortOrder = 1,
-        //            CreatorId = 0,
-        //            Trashed = false
-        //        };
-
-        // var contentCollection = new PropertyTypeCollection();
-        //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "title", Name = "Title", Description = "", HelpText = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
-        //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "bodyText", Name = "Body Text", Description = "", HelpText = "", Mandatory = false, SortOrder = 2, DataTypeDefinitionId = -87 });
-        //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "author", Name = "Author", Description = "Name of the author", HelpText = "", Mandatory = false, SortOrder = 3, DataTypeDefinitionId = -88 });
-
-        // contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
-
-        // return contentType;
-        // }
-
-        // private IEnumerable<IContentType> CreateContentTypeHierarchy()
-        // {
-        //    //create the master type
-        //    var masterContentType = MemberTypeBuilder.CreateSimpleContentType("masterContentType", "MasterContentType");
-        //    masterContentType.Key = new Guid("C00CA18E-5A9D-483B-A371-EECE0D89B4AE");
-        //    ContentTypeService.Save(masterContentType);
-
-        // //add the one we just created
-        //    var list = new List<IContentType> { masterContentType };
-
-        // for (var i = 0; i < 10; i++)
-        //    {
-        //        var contentType = MemberTypeBuilder.CreateSimpleContentType("childType" + i, "ChildType" + i,
-        //                                                                     //make the last entry in the list, this one's parent
-        //                                                                     list.Last());
-
-        // list.Add(contentType);
-        //    }
-
-        // return list;
-        // }
     }
+
+    [Test]
+    public void Member_Can_Edit_Property()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var prop = memberType.PropertyTypes.First().Alias;
+        memberType.SetMemberCanEditProperty(prop, true);
+        MemberTypeService.Save(memberType);
+
+        // re-get
+        memberType = MemberTypeService.Get(memberType.Id);
+        foreach (var p in memberType.PropertyTypes.Where(x => x.Alias != prop))
+        {
+            Assert.IsFalse(memberType.MemberCanEditProperty(p.Alias));
+        }
+
+        Assert.IsTrue(memberType.MemberCanEditProperty(prop));
+    }
+
+    [Test]
+    public void Member_Cannot_View_Property()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+
+        // re-get
+        memberType = MemberTypeService.Get(memberType.Id);
+        foreach (var p in memberType.PropertyTypes)
+        {
+            Assert.IsFalse(memberType.MemberCanViewProperty(p.Alias));
+        }
+    }
+
+    [Test]
+    public void Member_Can_View_Property()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        var prop = memberType.PropertyTypes.First().Alias;
+        memberType.SetMemberCanViewProperty(prop, true);
+        MemberTypeService.Save(memberType);
+
+        // re-get
+        memberType = MemberTypeService.Get(memberType.Id);
+        foreach (var p in memberType.PropertyTypes.Where(x => x.Alias != prop))
+        {
+            Assert.IsFalse(memberType.MemberCanViewProperty(p.Alias));
+        }
+
+        Assert.IsTrue(memberType.MemberCanViewProperty(prop));
+    }
+
+    [Test]
+    public void Deleting_PropertyType_Removes_The_Property_From_Member()
+    {
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        MemberTypeService.Save(memberType);
+        IMember member = MemberBuilder.CreateSimpleMember(memberType, "test", "test@test.com", "pass", "test");
+        MemberService.Save(member);
+        var initProps = member.Properties.Count;
+
+        // remove a property (NOT ONE OF THE DEFAULTS)
+        var standardProps = ConventionsHelper.GetStandardPropertyTypeStubs(ShortStringHelper);
+        memberType.RemovePropertyType(memberType.PropertyTypes.First(x => standardProps.ContainsKey(x.Alias) == false)
+            .Alias);
+        MemberTypeService.Save(memberType);
+
+        // re-load it from the db
+        member = MemberService.GetById(member.Id);
+
+        Assert.AreEqual(initProps - 1, member.Properties.Count);
+    }
+
+    [Test]
+    public void Cannot_Save_MemberType_With_Empty_Name()
+    {
+        // Arrange
+        IMemberType memberType = MemberTypeBuilder.CreateSimpleMemberType("memberTypeAlias", string.Empty);
+
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => MemberTypeService.Save(memberType));
+    }
+
+    [Test]
+    public void Empty_Description_Is_Always_Null_After_Saving_Member_Type()
+    {
+        var service = MemberTypeService;
+        var memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        memberType.Description = null;
+        service.Save(memberType);
+
+        var memberType2 = MemberTypeBuilder.CreateSimpleMemberType("memberType2", "Member Type 2");
+        memberType2.Description = string.Empty;
+        service.Save(memberType2);
+
+        Assert.IsNull(memberType.Description);
+        Assert.IsNull(memberType2.Description);
+    }
+
+    // [Test]
+    // public void Can_Save_MemberType_Structure_And_Create_A_Member_Based_On_It()
+    // {
+    //    // Arrange
+    //    var cs = MemberService;
+    //    var cts = MemberTypeService;
+    //    var dtdYesNo = DataTypeService.GetDataTypeDefinitionById(-49);
+    //    var ctBase = new MemberType(-1) { Name = "Base", Alias = "Base", Icon = "folder.gif", Thumbnail = "folder.png" };
+    //    ctBase.AddPropertyType(new PropertyType(dtdYesNo)
+    //        {
+    //            Name = "Hide From Navigation",
+    //            Alias = Constants.Conventions.Content.NaviHide
+    //        }
+    //        /*,"Navigation"*/);
+    //    cts.Save(ctBase);
+
+    // var ctHomePage = new MemberType(ctBase)
+    //        {
+    //            Name = "Home Page",
+    //            Alias = "HomePage",
+    //            Icon = "settingDomain.gif",
+    //            Thumbnail = "folder.png",
+    //            AllowedAsRoot = true
+    //        };
+    //    ctHomePage.AddPropertyType(new PropertyType(dtdYesNo) { Name = "Some property", Alias = "someProperty" }
+    //        /*,"Navigation"*/);
+    //    cts.Save(ctHomePage);
+
+    // // Act
+    //    var homeDoc = cs.CreateMember("Test", "test@test.com", "test", "HomePage");
+
+    // // Assert
+    //    Assert.That(ctBase.HasIdentity, Is.True);
+    //    Assert.That(ctHomePage.HasIdentity, Is.True);
+    //    Assert.That(homeDoc.HasIdentity, Is.True);
+    //    Assert.That(homeDoc.ContentTypeId, Is.EqualTo(ctHomePage.Id));
+    // }
+
+    // [Test]
+    // public void Can_Create_And_Save_MemberType_Composition()
+    // {
+    //    /*
+    //     * Global
+    //     * - Components
+    //     * - Category
+    //     */
+    //    var service = ContentTypeService;
+    //    var global = MemberTypeBuilder.CreateSimpleContentType("global", "Global");
+    //    service.Save(global);
+
+    // var components = MemberTypeBuilder.CreateSimpleContentType("components", "Components", global);
+    //    service.Save(components);
+
+    // var component = MemberTypeBuilder.CreateSimpleContentType("component", "Component", components);
+    //    service.Save(component);
+
+    // var category = MemberTypeBuilder.CreateSimpleContentType("category", "Category", global);
+    //    service.Save(category);
+
+    // var success = category.AddContentType(component);
+
+    // Assert.That(success, Is.False);
+    // }
+
+    // [Test]
+    // public void Can_Remove_ContentType_Composition_From_ContentType()
+    // {
+    //    //Test for U4-2234
+    //    var cts = ContentTypeService;
+    //    //Arrange
+    //    var component = CreateComponent();
+    //    cts.Save(component);
+    //    var banner = CreateBannerComponent(component);
+    //    cts.Save(banner);
+    //    var site = CreateSite();
+    //    cts.Save(site);
+    //    var homepage = CreateHomepage(site);
+    //    cts.Save(homepage);
+
+    // //Add banner to homepage
+    //    var added = homepage.AddContentType(banner);
+    //    cts.Save(homepage);
+
+    // //Assert composition
+    //    var bannerExists = homepage.ContentTypeCompositionExists(banner.Alias);
+    //    var bannerPropertyExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
+    //    Assert.That(added, Is.True);
+    //    Assert.That(bannerExists, Is.True);
+    //    Assert.That(bannerPropertyExists, Is.True);
+    //    Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(6));
+
+    // //Remove banner from homepage
+    //    var removed = homepage.RemoveContentType(banner.Alias);
+    //    cts.Save(homepage);
+
+    // //Assert composition
+    //    var bannerStillExists = homepage.ContentTypeCompositionExists(banner.Alias);
+    //    var bannerPropertyStillExists = homepage.CompositionPropertyTypes.Any(x => x.Alias.Equals("bannerName"));
+    //    Assert.That(removed, Is.True);
+    //    Assert.That(bannerStillExists, Is.False);
+    //    Assert.That(bannerPropertyStillExists, Is.False);
+    //    Assert.That(homepage.CompositionPropertyTypes.Count(), Is.EqualTo(4));
+    // }
+
+    // [Test]
+    // public void Can_Copy_ContentType_By_Performing_Clone()
+    // {
+    //    // Arrange
+    //    var service = ContentTypeService;
+    //    var metaContentType = MemberTypeBuilder.CreateMetaContentType();
+    //    service.Save(metaContentType);
+
+    // var simpleContentType = MemberTypeBuilder.CreateSimpleContentType("category", "Category", metaContentType);
+    //    service.Save(simpleContentType);
+    //    var categoryId = simpleContentType.Id;
+
+    // // Act
+    //    var sut = simpleContentType.Clone("newcategory");
+    //    service.Save(sut);
+
+    // // Assert
+    //    Assert.That(sut.HasIdentity, Is.True);
+
+    // var contentType = service.GetContentType(sut.Id);
+    //    var category = service.GetContentType(categoryId);
+
+    // Assert.That(contentType.CompositionAliases().Any(x => x.Equals("meta")), Is.True);
+    //    Assert.AreEqual(contentType.ParentId, category.ParentId);
+    //    Assert.AreEqual(contentType.Level, category.Level);
+    //    Assert.AreEqual(contentType.PropertyTypes.Count(), category.PropertyTypes.Count());
+    //    Assert.AreNotEqual(contentType.Id, category.Id);
+    //    Assert.AreNotEqual(contentType.Key, category.Key);
+    //    Assert.AreNotEqual(contentType.Path, category.Path);
+    //    Assert.AreNotEqual(contentType.SortOrder, category.SortOrder);
+    //    Assert.AreNotEqual(contentType.PropertyTypes.First(x => x.Alias.Equals("title")).Id, category.PropertyTypes.First(x => x.Alias.Equals("title")).Id);
+    //    Assert.AreNotEqual(contentType.PropertyGroups.First(x => x.Name.Equals("Content")).Id, category.PropertyGroups.First(x => x.Name.Equals("Content")).Id);
+
+    // }
+
+    // private ContentType CreateComponent()
+    // {
+    //    var component = new ContentType(-1)
+    //        {
+    //            Alias = "component",
+    //            Name = "Component",
+    //            Description = "ContentType used for Component grouping",
+    //            Icon = ".sprTreeDoc3",
+    //            Thumbnail = "doc.png",
+    //            SortOrder = 1,
+    //            CreatorId = 0,
+    //            Trashed = false
+    //        };
+
+    // var contentCollection = new PropertyTypeCollection();
+    //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "componentGroup", Name = "Component Group", Description = "", HelpText = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
+    //    component.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Component", SortOrder = 1 });
+
+    // return component;
+    // }
+
+    // private ContentType CreateBannerComponent(ContentType parent)
+    // {
+    //    var banner = new ContentType(parent)
+    //        {
+    //            Alias = "banner",
+    //            Name = "Banner Component",
+    //            Description = "ContentType used for Banner Component",
+    //            Icon = ".sprTreeDoc3",
+    //            Thumbnail = "doc.png",
+    //            SortOrder = 1,
+    //            CreatorId = 0,
+    //            Trashed = false
+    //        };
+
+    // var propertyType = new PropertyType(new Guid(), DataTypeDatabaseType.Ntext)
+    //        {
+    //            Alias = "bannerName",
+    //            Name = "Banner Name",
+    //            Description = "",
+    //            HelpText = "",
+    //            Mandatory = false,
+    //            SortOrder = 2,
+    //            DataTypeDefinitionId = -88
+    //        };
+    //    banner.AddPropertyType(propertyType, "Component");
+    //    return banner;
+    // }
+
+    // private ContentType CreateSite()
+    // {
+    //    var site = new ContentType(-1)
+    //        {
+    //            Alias = "site",
+    //            Name = "Site",
+    //            Description = "ContentType used for Site inheritence",
+    //            Icon = ".sprTreeDoc3",
+    //            Thumbnail = "doc.png",
+    //            SortOrder = 2,
+    //            CreatorId = 0,
+    //            Trashed = false
+    //        };
+
+    // var contentCollection = new PropertyTypeCollection();
+    //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "hostname", Name = "Hostname", Description = "", HelpText = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
+    //    site.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Site Settings", SortOrder = 1 });
+
+    // return site;
+    // }
+
+    // private ContentType CreateHomepage(ContentType parent)
+    // {
+    //    var contentType = new ContentType(parent)
+    //        {
+    //            Alias = "homepage",
+    //            Name = "Homepage",
+    //            Description = "ContentType used for the Homepage",
+    //            Icon = ".sprTreeDoc3",
+    //            Thumbnail = "doc.png",
+    //            SortOrder = 1,
+    //            CreatorId = 0,
+    //            Trashed = false
+    //        };
+
+    // var contentCollection = new PropertyTypeCollection();
+    //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "title", Name = "Title", Description = "", HelpText = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
+    //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "bodyText", Name = "Body Text", Description = "", HelpText = "", Mandatory = false, SortOrder = 2, DataTypeDefinitionId = -87 });
+    //    contentCollection.Add(new PropertyType(new Guid(), DataTypeDatabaseType.Ntext) { Alias = "author", Name = "Author", Description = "Name of the author", HelpText = "", Mandatory = false, SortOrder = 3, DataTypeDefinitionId = -88 });
+
+    // contentType.PropertyGroups.Add(new PropertyGroup(contentCollection) { Name = "Content", SortOrder = 1 });
+
+    // return contentType;
+    // }
+
+    // private IEnumerable<IContentType> CreateContentTypeHierarchy()
+    // {
+    //    //create the master type
+    //    var masterContentType = MemberTypeBuilder.CreateSimpleContentType("masterContentType", "MasterContentType");
+    //    masterContentType.Key = new Guid("C00CA18E-5A9D-483B-A371-EECE0D89B4AE");
+    //    ContentTypeService.Save(masterContentType);
+
+    // //add the one we just created
+    //    var list = new List<IContentType> { masterContentType };
+
+    // for (var i = 0; i < 10; i++)
+    //    {
+    //        var contentType = MemberTypeBuilder.CreateSimpleContentType("childType" + i, "ChildType" + i,
+    //                                                                     //make the last entry in the list, this one's parent
+    //                                                                     list.Last());
+
+    // list.Add(contentType);
+    //    }
+
+    // return list;
+    // }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/NuCacheRebuildTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/NuCacheRebuildTests.cs
index ef7825ca49..ed0c7ac264 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/NuCacheRebuildTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/NuCacheRebuildTests.cs
@@ -1,6 +1,5 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
@@ -8,80 +7,80 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true,
+    WithApplication = true)]
+public class NuCacheRebuildTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, PublishedRepositoryEvents = true, WithApplication = true)]
-    public class NuCacheRebuildTests : UmbracoIntegrationTest
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IPublishedSnapshotService PublishedSnapshotService => GetRequiredService<IPublishedSnapshotService>();
+
+    [Test]
+    public void UnpublishedNameChanges()
     {
-        private IFileService FileService => GetRequiredService<IFileService>();
+        var urlSegmentProvider = new DefaultUrlSegmentProvider(ShortStringHelper);
 
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
 
-        private IPublishedSnapshotService PublishedSnapshotService => GetRequiredService<IPublishedSnapshotService>();
+        var content = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
 
-        [Test]
-        public void UnpublishedNameChanges()
-        {
-            var urlSegmentProvider = new DefaultUrlSegmentProvider(ShortStringHelper);
+        ContentService.SaveAndPublish(content);
+        var cachedContent = ContentService.GetById(content.Id);
+        var segment = urlSegmentProvider.GetUrlSegment(cachedContent);
 
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
+        // Does a new node work?
 
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
+        Assert.AreEqual("hello", segment);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "hello", Constants.System.Root);
+        content.Name = "goodbye";
+        cachedContent = ContentService.GetById(content.Id);
+        segment = urlSegmentProvider.GetUrlSegment(cachedContent);
 
-            ContentService.SaveAndPublish(content);
-            IContent cachedContent = ContentService.GetById(content.Id);
-            var segment = urlSegmentProvider.GetUrlSegment(cachedContent);
+        // We didn't save anything, so all should still be the same
 
-            // Does a new node work?
+        Assert.AreEqual("hello", segment);
 
-            Assert.AreEqual("hello", segment);
+        ContentService.Save(content);
+        cachedContent = ContentService.GetById(content.Id);
+        segment = urlSegmentProvider.GetUrlSegment(cachedContent);
 
-            content.Name = "goodbye";
-            cachedContent = ContentService.GetById(content.Id);
-            segment = urlSegmentProvider.GetUrlSegment(cachedContent);
+        // At this point we have saved the new name, but not published. The url should still be the previous name
 
-            // We didn't save anything, so all should still be the same
+        Assert.AreEqual("hello", segment);
 
-            Assert.AreEqual("hello", segment);
+        PublishedSnapshotService.Rebuild();
 
-            ContentService.Save(content);
-            cachedContent = ContentService.GetById(content.Id);
-            segment = urlSegmentProvider.GetUrlSegment(cachedContent);
+        cachedContent = ContentService.GetById(content.Id);
+        segment = urlSegmentProvider.GetUrlSegment(cachedContent);
 
-            // At this point we have saved the new name, but not published. The url should still be the previous name
+        // After a rebuild, the unpublished name should still not be the url.
+        // This was previously incorrect, per #11074
 
-            Assert.AreEqual("hello", segment);
+        Assert.AreEqual("hello", segment);
 
-            PublishedSnapshotService.Rebuild();
+        ContentService.SaveAndPublish(content);
+        cachedContent = ContentService.GetById(content.Id);
+        segment = urlSegmentProvider.GetUrlSegment(cachedContent);
 
-            cachedContent = ContentService.GetById(content.Id);
-            segment = urlSegmentProvider.GetUrlSegment(cachedContent);
+        // The page has now been published, so we should see the new url segment
+        Assert.AreEqual("goodbye", segment);
 
-            // After a rebuild, the unpublished name should still not be the url.
-            // This was previously incorrect, per #11074
+        PublishedSnapshotService.Rebuild();
+        cachedContent = ContentService.GetById(content.Id);
+        segment = urlSegmentProvider.GetUrlSegment(cachedContent);
 
-            Assert.AreEqual("hello", segment);
-
-            ContentService.SaveAndPublish(content);
-            cachedContent = ContentService.GetById(content.Id);
-            segment = urlSegmentProvider.GetUrlSegment(cachedContent);
-
-            // The page has now been published, so we should see the new url segment
-            Assert.AreEqual("goodbye", segment);
-
-            PublishedSnapshotService.Rebuild();
-            cachedContent = ContentService.GetById(content.Id);
-            segment = urlSegmentProvider.GetUrlSegment(cachedContent);
-
-            // Just double checking that things remain after a rebuild
-            Assert.AreEqual("goodbye", segment);
-        }
+        // Just double checking that things remain after a rebuild
+        Assert.AreEqual("goodbye", segment);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs
index a815ca91e3..0b97d5d0d5 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/PublicAccessServiceTests.cs
@@ -3,159 +3,127 @@
 
 using System;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class PublicAccessServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class PublicAccessServiceTests : UmbracoIntegrationTest
+    [SetUp]
+    public void CreateTestData()
     {
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template); // else, FK violation on contentType!
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        var ct = ContentTypeBuilder.CreateSimpleContentType("blah", "Blah", defaultTemplateId: template.Id);
+        ContentTypeService.Save(ct);
 
-        private IFileService FileService => GetRequiredService<IFileService>();
+        _content = ContentBuilder.CreateSimpleContent(ct, "Test");
+        ContentService.Save(_content);
+    }
 
-        private IPublicAccessService PublicAccessService => GetRequiredService<IPublicAccessService>();
+    private IContentService ContentService => GetRequiredService<IContentService>();
 
-        private Content _content;
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
 
-        [SetUp]
-        public void CreateTestData()
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IPublicAccessService PublicAccessService => GetRequiredService<IPublicAccessService>();
+
+    private Content _content;
+
+    [Test]
+    public void Can_Add_New_Entry()
+    {
+        // Arrange
+        PublicAccessRule[] rules = { new PublicAccessRule { RuleType = "TestType", RuleValue = "TestVal" } };
+        var entry = new PublicAccessEntry(_content, _content, _content, rules);
+
+        // Act
+        var result = PublicAccessService.Save(entry);
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(OperationResultType.Success, result.Result.Result);
+        Assert.IsTrue(entry.HasIdentity);
+        Assert.AreNotEqual(entry.Key, Guid.Empty);
+        Assert.AreEqual(_content.Id, entry.LoginNodeId);
+        Assert.AreEqual(_content.Id, entry.NoAccessNodeId);
+        Assert.AreEqual(_content.Id, entry.ProtectedNodeId);
+    }
+
+    [Test]
+    public void Can_Add_Rule()
+    {
+        // Arrange
+        PublicAccessRule[] rules = { new PublicAccessRule { RuleType = "TestType", RuleValue = "TestVal" } };
+        var entry = new PublicAccessEntry(_content, _content, _content, rules);
+        PublicAccessService.Save(entry);
+
+        // Act
+        var updated = PublicAccessService.AddRule(_content, "TestType2", "AnotherVal");
+
+        // re-get
+        entry = PublicAccessService.GetEntryForContent(_content);
+
+        // Assert
+        Assert.IsTrue(updated.Success);
+        Assert.AreEqual(OperationResultType.Success, updated.Result.Result);
+        Assert.AreEqual(2, entry.Rules.Count());
+    }
+
+    [Test]
+    public void Can_Add_Multiple_Value_For_Same_Rule_Type()
+    {
+        // Arrange
+        PublicAccessRule[] rules = { new PublicAccessRule { RuleType = "TestType", RuleValue = "TestVal" } };
+        var entry = new PublicAccessEntry(_content, _content, _content, rules);
+        PublicAccessService.Save(entry);
+
+        // Act
+        var updated1 = PublicAccessService.AddRule(_content, "TestType", "AnotherVal1");
+        var updated2 = PublicAccessService.AddRule(_content, "TestType", "AnotherVal2");
+
+        // re-get
+        entry = PublicAccessService.GetEntryForContent(_content);
+
+        // Assert
+        Assert.IsTrue(updated1.Success);
+        Assert.IsTrue(updated2.Success);
+        Assert.AreEqual(OperationResultType.Success, updated1.Result.Result);
+        Assert.AreEqual(OperationResultType.Success, updated2.Result.Result);
+        Assert.AreEqual(3, entry.Rules.Count());
+    }
+
+    [Test]
+    public void Can_Remove_Rule()
+    {
+        // Arrange
+        PublicAccessRule[] rules =
         {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template); // else, FK violation on contentType!
+            new PublicAccessRule {RuleType = "TestType", RuleValue = "TestValue1"},
+            new PublicAccessRule {RuleType = "TestType", RuleValue = "TestValue2"}
+        };
+        var entry = new PublicAccessEntry(_content, _content, _content, rules);
+        PublicAccessService.Save(entry);
 
-            ContentType ct = ContentTypeBuilder.CreateSimpleContentType("blah", "Blah", defaultTemplateId: template.Id);
-            ContentTypeService.Save(ct);
+        // Act
+        var removed = PublicAccessService.RemoveRule(_content, "TestType", "TestValue1");
 
-            _content = ContentBuilder.CreateSimpleContent(ct, "Test", -1);
-            ContentService.Save(_content);
-        }
+        // re-get
+        entry = PublicAccessService.GetEntryForContent(_content);
 
-        [Test]
-        public void Can_Add_New_Entry()
-        {
-            // Arrange
-            PublicAccessRule[] rules = new[]
-            {
-                new PublicAccessRule()
-                {
-                    RuleType = "TestType",
-                    RuleValue = "TestVal"
-                },
-            };
-            var entry = new PublicAccessEntry(_content, _content, _content, rules);
-
-            // Act
-            Attempt<OperationResult> result = PublicAccessService.Save(entry);
-
-            // Assert
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(OperationResultType.Success, result.Result.Result);
-            Assert.IsTrue(entry.HasIdentity);
-            Assert.AreNotEqual(entry.Key, Guid.Empty);
-            Assert.AreEqual(_content.Id, entry.LoginNodeId);
-            Assert.AreEqual(_content.Id, entry.NoAccessNodeId);
-            Assert.AreEqual(_content.Id, entry.ProtectedNodeId);
-        }
-
-        [Test]
-        public void Can_Add_Rule()
-        {
-            // Arrange
-            PublicAccessRule[] rules = new[]
-            {
-                new PublicAccessRule()
-                {
-                    RuleType = "TestType",
-                    RuleValue = "TestVal"
-                },
-            };
-            var entry = new PublicAccessEntry(_content, _content, _content, rules);
-            PublicAccessService.Save(entry);
-
-            // Act
-            Attempt<OperationResult<OperationResultType, PublicAccessEntry>> updated = PublicAccessService.AddRule(_content, "TestType2", "AnotherVal");
-
-            // re-get
-            entry = PublicAccessService.GetEntryForContent(_content);
-
-            // Assert
-            Assert.IsTrue(updated.Success);
-            Assert.AreEqual(OperationResultType.Success, updated.Result.Result);
-            Assert.AreEqual(2, entry.Rules.Count());
-        }
-
-        [Test]
-        public void Can_Add_Multiple_Value_For_Same_Rule_Type()
-        {
-            // Arrange
-            PublicAccessRule[] rules = new[]
-            {
-                new PublicAccessRule()
-                {
-                    RuleType = "TestType",
-                    RuleValue = "TestVal"
-                },
-            };
-            var entry = new PublicAccessEntry(_content, _content, _content, rules);
-            PublicAccessService.Save(entry);
-
-            // Act
-            Attempt<OperationResult<OperationResultType, PublicAccessEntry>> updated1 = PublicAccessService.AddRule(_content, "TestType", "AnotherVal1");
-            Attempt<OperationResult<OperationResultType, PublicAccessEntry>> updated2 = PublicAccessService.AddRule(_content, "TestType", "AnotherVal2");
-
-            // re-get
-            entry = PublicAccessService.GetEntryForContent(_content);
-
-            // Assert
-            Assert.IsTrue(updated1.Success);
-            Assert.IsTrue(updated2.Success);
-            Assert.AreEqual(OperationResultType.Success, updated1.Result.Result);
-            Assert.AreEqual(OperationResultType.Success, updated2.Result.Result);
-            Assert.AreEqual(3, entry.Rules.Count());
-        }
-
-        [Test]
-        public void Can_Remove_Rule()
-        {
-            // Arrange
-            PublicAccessRule[] rules = new[]
-            {
-                new PublicAccessRule()
-                {
-                    RuleType = "TestType",
-                    RuleValue = "TestValue1"
-                },
-                new PublicAccessRule()
-                {
-                    RuleType = "TestType",
-                    RuleValue = "TestValue2"
-                },
-            };
-            var entry = new PublicAccessEntry(_content, _content, _content, rules);
-            PublicAccessService.Save(entry);
-
-            // Act
-            Attempt<OperationResult> removed = PublicAccessService.RemoveRule(_content, "TestType", "TestValue1");
-
-            // re-get
-            entry = PublicAccessService.GetEntryForContent(_content);
-
-            // Assert
-            Assert.IsTrue(removed.Success);
-            Assert.AreEqual(OperationResultType.Success, removed.Result.Result);
-            Assert.AreEqual(1, entry.Rules.Count());
-            Assert.AreEqual("TestValue2", entry.Rules.ElementAt(0).RuleValue);
-        }
+        // Assert
+        Assert.IsTrue(removed.Success);
+        Assert.AreEqual(OperationResultType.Success, removed.Result.Result);
+        Assert.AreEqual(1, entry.Rules.Count());
+        Assert.AreEqual("TestValue2", entry.Rules.ElementAt(0).RuleValue);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs
index 8086018d0d..7ebf4ab1d2 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RedirectUrlServiceTests.cs
@@ -8,91 +8,73 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class RedirectUrlServiceTests : UmbracoIntegrationTestWithContent
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class RedirectUrlServiceTests : UmbracoIntegrationTestWithContent
+    private IContent _firstSubPage;
+    private IContent _secondSubPage;
+    private IContent _thirdSubPage;
+    private const string Url = "blah";
+    private const string UrlAlt = "alternativeUrl";
+    private const string CultureEnglish = "en";
+    private const string CultureGerman = "de";
+    private const string UnusedCulture = "es";
+
+    private IRedirectUrlService RedirectUrlService => GetRequiredService<IRedirectUrlService>();
+
+    public override void CreateTestData()
     {
-        private IContent _firstSubPage;
-        private IContent _secondSubPage;
-        private IContent _thirdSubPage;
-        private const string Url = "blah";
-        private const string UrlAlt = "alternativeUrl";
-        private const string CultureEnglish = "en";
-        private const string CultureGerman = "de";
-        private const string UnusedCulture = "es";
+        base.CreateTestData();
 
-        private IRedirectUrlService RedirectUrlService => GetRequiredService<IRedirectUrlService>();
-
-        public override void CreateTestData()
+        using (var scope = ScopeProvider.CreateScope())
         {
-            base.CreateTestData();
-
-            using (IScope scope = ScopeProvider.CreateScope())
-            {
-                var repository = new RedirectUrlRepository((IScopeAccessor)ScopeProvider, AppCaches.Disabled, Mock.Of<ILogger<RedirectUrlRepository>>());
-                IContent rootContent = ContentService.GetRootContent().First();
-                var subPages = ContentService.GetPagedChildren(rootContent.Id, 0, 3, out _).ToList();
-                _firstSubPage = subPages[0];
-                _secondSubPage = subPages[1];
-                _thirdSubPage = subPages[2];
+            var repository = new RedirectUrlRepository((IScopeAccessor)ScopeProvider, AppCaches.Disabled,
+                Mock.Of<ILogger<RedirectUrlRepository>>());
+            var rootContent = ContentService.GetRootContent().First();
+            var subPages = ContentService.GetPagedChildren(rootContent.Id, 0, 3, out _).ToList();
+            _firstSubPage = subPages[0];
+            _secondSubPage = subPages[1];
+            _thirdSubPage = subPages[2];
 
 
-                repository.Save(new RedirectUrl
-                {
-                    ContentKey = _firstSubPage.Key,
-                    Url = Url,
-                    Culture = CultureEnglish
-                });
-                Thread.Sleep(1000); //Added delay to ensure timestamp difference as sometimes they seem to have the same timestamp
-                repository.Save(new RedirectUrl
-                {
-                    ContentKey = _secondSubPage.Key,
-                    Url = Url,
-                    Culture = CultureGerman
-                });
-                Thread.Sleep(1000);
-                repository.Save(new RedirectUrl
-                {
-                    ContentKey = _thirdSubPage.Key,
-                    Url = UrlAlt,
-                    Culture = string.Empty
-                });
-
-                scope.Complete();
-            }
-        }
-
-        [Test]
-        public void Can_Get_Most_Recent_RedirectUrl()
-        {
-            IRedirectUrl redirect = RedirectUrlService.GetMostRecentRedirectUrl(Url);
-            Assert.AreEqual(redirect.ContentId, _secondSubPage.Id);
-        }
-
-        [Test]
-        public void Can_Get_Most_Recent_RedirectUrl_With_Culture()
-        {
-            var redirect = RedirectUrlService.GetMostRecentRedirectUrl(Url, CultureEnglish);
-            Assert.AreEqual(redirect.ContentId, _firstSubPage.Id);
-        }
-
-        [Test]
-        public void Can_Get_Most_Recent_RedirectUrl_With_Culture_When_No_CultureVariant_Exists()
-        {
-            var redirect = RedirectUrlService.GetMostRecentRedirectUrl(UrlAlt, UnusedCulture);
-            Assert.AreEqual(redirect.ContentId, _thirdSubPage.Id);
+            repository.Save(new RedirectUrl { ContentKey = _firstSubPage.Key, Url = Url, Culture = CultureEnglish });
+            Thread.Sleep(
+                1000); //Added delay to ensure timestamp difference as sometimes they seem to have the same timestamp
+            repository.Save(new RedirectUrl { ContentKey = _secondSubPage.Key, Url = Url, Culture = CultureGerman });
+            Thread.Sleep(1000);
+            repository.Save(new RedirectUrl { ContentKey = _thirdSubPage.Key, Url = UrlAlt, Culture = string.Empty });
 
+            scope.Complete();
         }
     }
+
+    [Test]
+    public void Can_Get_Most_Recent_RedirectUrl()
+    {
+        var redirect = RedirectUrlService.GetMostRecentRedirectUrl(Url);
+        Assert.AreEqual(redirect.ContentId, _secondSubPage.Id);
+    }
+
+    [Test]
+    public void Can_Get_Most_Recent_RedirectUrl_With_Culture()
+    {
+        var redirect = RedirectUrlService.GetMostRecentRedirectUrl(Url, CultureEnglish);
+        Assert.AreEqual(redirect.ContentId, _firstSubPage.Id);
+    }
+
+    [Test]
+    public void Can_Get_Most_Recent_RedirectUrl_With_Culture_When_No_CultureVariant_Exists()
+    {
+        var redirect = RedirectUrlService.GetMostRecentRedirectUrl(UrlAlt, UnusedCulture);
+        Assert.AreEqual(redirect.ContentId, _thirdSubPage.Id);
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs
index 0156100f0a..04c94d7268 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/RelationServiceTests.cs
@@ -4,266 +4,266 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class RelationServiceTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class RelationServiceTests : UmbracoIntegrationTest
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IRelationService RelationService => GetRequiredService<IRelationService>();
+
+    [Test]
+    public void Get_Paged_Relations_By_Relation_Type()
     {
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
-
-        private IContentService ContentService => GetRequiredService<IContentService>();
-
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
-
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
-
-        private IRelationService RelationService => GetRequiredService<IRelationService>();
-
-        [Test]
-        public void Get_Paged_Relations_By_Relation_Type()
+        // Create content
+        var createdContent = new List<IContent>();
+        var contentType = ContentTypeBuilder.CreateBasicContentType("blah");
+        ContentTypeService.Save(contentType);
+        for (var i = 0; i < 3; i++)
         {
-            // Create content
-            var createdContent = new List<IContent>();
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType("blah");
-            ContentTypeService.Save(contentType);
-            for (int i = 0; i < 3; i++)
-            {
-                Content c1 = ContentBuilder.CreateBasicContent(contentType);
-                ContentService.Save(c1);
-                createdContent.Add(c1);
-            }
-
-            // Create media
-            var createdMedia = new List<IMedia>();
-            MediaType imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
-            MediaTypeService.Save(imageType);
-            for (int i = 0; i < 3; i++)
-            {
-                Media c1 = MediaBuilder.CreateMediaImage(imageType, -1);
-                MediaService.Save(c1);
-                createdMedia.Add(c1);
-            }
-
-            IRelationType relType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
-
-            // Relate content to media
-            foreach (IContent content in createdContent)
-            {
-                foreach (IMedia media in createdMedia)
-                {
-                    RelationService.Relate(content.Id, media.Id, relType);
-                }
-            }
-
-            var paged = RelationService.GetPagedByRelationTypeId(relType.Id, 0, 4, out long totalRecs).ToList();
-
-            Assert.AreEqual(9, totalRecs);
-            Assert.AreEqual(4, paged.Count);
-
-            // next page
-            paged.AddRange(RelationService.GetPagedByRelationTypeId(relType.Id, 1, 4, out totalRecs));
-
-            Assert.AreEqual(9, totalRecs);
-            Assert.AreEqual(8, paged.Count);
-
-            Assert.IsTrue(createdContent.Select(x => x.Id).ContainsAll(paged.Select(x => x.ParentId)));
-            Assert.IsTrue(createdMedia.Select(x => x.Id).ContainsAll(paged.Select(x => x.ChildId)));
+            var c1 = ContentBuilder.CreateBasicContent(contentType);
+            ContentService.Save(c1);
+            createdContent.Add(c1);
         }
 
-        [Test]
-        public void Return_List_Of_Content_Items_Where_Media_Item_Referenced()
+        // Create media
+        var createdMedia = new List<IMedia>();
+        var imageType = MediaTypeBuilder.CreateImageMediaType("myImage");
+        MediaTypeService.Save(imageType);
+        for (var i = 0; i < 3; i++)
         {
-            MediaType mt = MediaTypeBuilder.CreateSimpleMediaType("testMediaType", "Test Media Type");
-            MediaTypeService.Save(mt);
-            Media m1 = MediaBuilder.CreateSimpleMedia(mt, "hello 1", -1);
-            MediaService.Save(m1);
+            var c1 = MediaBuilder.CreateMediaImage(imageType, -1);
+            MediaService.Save(c1);
+            createdMedia.Add(c1);
+        }
 
-            ContentType ct = ContentTypeBuilder.CreateTextPageContentType("richTextTest");
-            ct.AllowedTemplates = Enumerable.Empty<ITemplate>();
-            ContentTypeService.Save(ct);
+        var relType = RelationService.GetRelationTypeByAlias(Constants.Conventions.RelationTypes.RelatedMediaAlias);
 
-            void CreateContentWithMediaRefs()
+        // Relate content to media
+        foreach (var content in createdContent)
+        {
+            foreach (var media in createdMedia)
             {
-                Content content = ContentBuilder.CreateTextpageContent(ct, "my content 2", -1);
+                RelationService.Relate(content.Id, media.Id, relType);
+            }
+        }
 
-                // 'bodyText' is a property with a RTE property editor which we knows automatically tracks relations
-                content.Properties["bodyText"].SetValue(@"<p>
+        var paged = RelationService.GetPagedByRelationTypeId(relType.Id, 0, 4, out var totalRecs).ToList();
+
+        Assert.AreEqual(9, totalRecs);
+        Assert.AreEqual(4, paged.Count);
+
+        // next page
+        paged.AddRange(RelationService.GetPagedByRelationTypeId(relType.Id, 1, 4, out totalRecs));
+
+        Assert.AreEqual(9, totalRecs);
+        Assert.AreEqual(8, paged.Count);
+
+        Assert.IsTrue(createdContent.Select(x => x.Id).ContainsAll(paged.Select(x => x.ParentId)));
+        Assert.IsTrue(createdMedia.Select(x => x.Id).ContainsAll(paged.Select(x => x.ChildId)));
+    }
+
+    [Test]
+    public void Return_List_Of_Content_Items_Where_Media_Item_Referenced()
+    {
+        var mt = MediaTypeBuilder.CreateSimpleMediaType("testMediaType", "Test Media Type");
+        MediaTypeService.Save(mt);
+        var m1 = MediaBuilder.CreateSimpleMedia(mt, "hello 1", -1);
+        MediaService.Save(m1);
+
+        var ct = ContentTypeBuilder.CreateTextPageContentType("richTextTest");
+        ct.AllowedTemplates = Enumerable.Empty<ITemplate>();
+        ContentTypeService.Save(ct);
+
+        void CreateContentWithMediaRefs()
+        {
+            var content = ContentBuilder.CreateTextpageContent(ct, "my content 2", -1);
+
+            // 'bodyText' is a property with a RTE property editor which we knows automatically tracks relations
+            content.Properties["bodyText"].SetValue(@"<p>
         <img src='/media/12312.jpg' data-udi='umb://media/" + m1.Key.ToString("N") + @"' />
 </p>");
-                ContentService.Save(content);
-            }
-
-            for (int i = 0; i < 6; i++)
-            {
-                CreateContentWithMediaRefs(); // create 6 content items referencing the same media
-            }
-
-            var relations = RelationService.GetByChildId(m1.Id, Constants.Conventions.RelationTypes.RelatedMediaAlias).ToList();
-            Assert.AreEqual(6, relations.Count);
-
-            var entities = RelationService.GetParentEntitiesFromRelations(relations).ToList();
-            Assert.AreEqual(6, entities.Count);
+            ContentService.Save(content);
         }
 
-        [Test]
-        public void Can_Create_RelationType_Without_Name()
+        for (var i = 0; i < 6; i++)
         {
-            IRelationService rs = RelationService;
-            IRelationType rt = new RelationType("Test", "repeatedEventOccurence", false, Constants.ObjectTypes.Document, Constants.ObjectTypes.Media);
-
-            Assert.DoesNotThrow(() => rs.Save(rt));
-
-            // re-get
-            rt = RelationService.GetRelationTypeById(rt.Id);
-
-            Assert.AreEqual("Test", rt.Name);
-            Assert.AreEqual("repeatedEventOccurence", rt.Alias);
-            Assert.AreEqual(false, rt.IsBidirectional);
-            Assert.AreEqual(Constants.ObjectTypes.Document, rt.ParentObjectType.Value);
-            Assert.AreEqual(Constants.ObjectTypes.Media, rt.ChildObjectType.Value);
+            CreateContentWithMediaRefs(); // create 6 content items referencing the same media
         }
 
-        [Test]
-        public void Create_Relation_Type_Without_Object_Types()
+        var relations = RelationService.GetByChildId(m1.Id, Constants.Conventions.RelationTypes.RelatedMediaAlias)
+            .ToList();
+        Assert.AreEqual(6, relations.Count);
+
+        var entities = RelationService.GetParentEntitiesFromRelations(relations).ToList();
+        Assert.AreEqual(6, entities.Count);
+    }
+
+    [Test]
+    public void Can_Create_RelationType_Without_Name()
+    {
+        var rs = RelationService;
+        IRelationType rt = new RelationType("Test", "repeatedEventOccurence", false, Constants.ObjectTypes.Document,
+            Constants.ObjectTypes.Media);
+
+        Assert.DoesNotThrow(() => rs.Save(rt));
+
+        // re-get
+        rt = RelationService.GetRelationTypeById(rt.Id);
+
+        Assert.AreEqual("Test", rt.Name);
+        Assert.AreEqual("repeatedEventOccurence", rt.Alias);
+        Assert.AreEqual(false, rt.IsBidirectional);
+        Assert.AreEqual(Constants.ObjectTypes.Document, rt.ParentObjectType.Value);
+        Assert.AreEqual(Constants.ObjectTypes.Media, rt.ChildObjectType.Value);
+    }
+
+    [Test]
+    public void Create_Relation_Type_Without_Object_Types()
+    {
+        var rs = RelationService;
+        IRelationType rt = new RelationType("repeatedEventOccurence", "repeatedEventOccurence", false, null, null);
+
+        Assert.DoesNotThrow(() => rs.Save(rt));
+
+        // re-get
+        rt = RelationService.GetRelationTypeById(rt.Id);
+
+        Assert.IsNull(rt.ChildObjectType);
+        Assert.IsNull(rt.ParentObjectType);
+    }
+
+    [Test]
+    public void Relation_Returns_Parent_Child_Object_Types_When_Creating()
+    {
+        var r = CreateAndSaveRelation("Test", "test");
+
+        Assert.AreEqual(Constants.ObjectTypes.Document, r.ParentObjectType);
+        Assert.AreEqual(Constants.ObjectTypes.Media, r.ChildObjectType);
+    }
+
+    [Test]
+    public void Relation_Returns_Parent_Child_Object_Types_When_Getting()
+    {
+        var r = CreateAndSaveRelation("Test", "test");
+
+        // re-get
+        r = RelationService.GetById(r.Id);
+
+        Assert.AreEqual(Constants.ObjectTypes.Document, r.ParentObjectType);
+        Assert.AreEqual(Constants.ObjectTypes.Media, r.ChildObjectType);
+    }
+
+    [Test]
+    public void Insert_Bulk_Relations()
+    {
+        var rs = RelationService;
+
+        var newRelations = CreateRelations(10);
+
+        Assert.IsTrue(newRelations.All(x => !x.HasIdentity));
+
+        RelationService.Save(newRelations);
+
+        Assert.IsTrue(newRelations.All(x => x.HasIdentity));
+    }
+
+    [Test]
+    public void Update_Bulk_Relations()
+    {
+        var rs = RelationService;
+
+        var date = DateTime.Now.AddDays(-10);
+        var newRelations = CreateRelations(10);
+        foreach (var r in newRelations)
         {
-            IRelationService rs = RelationService;
-            IRelationType rt = new RelationType("repeatedEventOccurence", "repeatedEventOccurence", false, null, null);
-
-            Assert.DoesNotThrow(() => rs.Save(rt));
-
-            // re-get
-            rt = RelationService.GetRelationTypeById(rt.Id);
-
-            Assert.IsNull(rt.ChildObjectType);
-            Assert.IsNull(rt.ParentObjectType);
+            r.CreateDate = date;
+            r.UpdateDate = date;
         }
 
-        [Test]
-        public void Relation_Returns_Parent_Child_Object_Types_When_Creating()
-        {
-            IRelation r = CreateAndSaveRelation("Test", "test");
+        // insert
+        RelationService.Save(newRelations);
+        Assert.IsTrue(newRelations.All(x => x.UpdateDate == date));
 
-            Assert.AreEqual(Constants.ObjectTypes.Document, r.ParentObjectType);
-            Assert.AreEqual(Constants.ObjectTypes.Media, r.ChildObjectType);
+        var newDate = DateTime.Now.AddDays(-5);
+        foreach (var r in newRelations)
+        {
+            r.UpdateDate = newDate;
         }
 
-        [Test]
-        public void Relation_Returns_Parent_Child_Object_Types_When_Getting()
+        // update
+        RelationService.Save(newRelations);
+        Assert.IsTrue(newRelations.All(x => x.UpdateDate == newDate));
+    }
+
+    private IRelation CreateAndSaveRelation(string name, string alias)
+    {
+        var rs = RelationService;
+        var rt = new RelationType(name, alias, false, null, null);
+        rs.Save(rt);
+
+        var ct = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(ct);
+
+        var mt = MediaTypeBuilder.CreateImageMediaType("img");
+        MediaTypeService.Save(mt);
+
+        var c1 = ContentBuilder.CreateBasicContent(ct);
+        var c2 = MediaBuilder.CreateMediaImage(mt, -1);
+        ContentService.Save(c1);
+        MediaService.Save(c2);
+
+        var r = new Relation(c1.Id, c2.Id, rt);
+        RelationService.Save(r);
+
+        return r;
+    }
+
+    /// <summary>
+    ///     Creates a bunch of content/media items return relation objects for them (unsaved)
+    /// </summary>
+    /// <param name="count"></param>
+    /// <returns></returns>
+    private IEnumerable<IRelation> CreateRelations(int count)
+    {
+        var rs = RelationService;
+        var rtName = Guid.NewGuid().ToString();
+        var rt = new RelationType(rtName, rtName, false, null, null);
+        rs.Save(rt);
+
+        var ct = ContentTypeBuilder.CreateBasicContentType();
+        ContentTypeService.Save(ct);
+
+        var mt = MediaTypeBuilder.CreateImageMediaType("img");
+        MediaTypeService.Save(mt);
+
+        return Enumerable.Range(1, count).Select(index =>
         {
-            IRelation r = CreateAndSaveRelation("Test", "test");
-
-            // re-get
-            r = RelationService.GetById(r.Id);
-
-            Assert.AreEqual(Constants.ObjectTypes.Document, r.ParentObjectType);
-            Assert.AreEqual(Constants.ObjectTypes.Media, r.ChildObjectType);
-        }
-
-        [Test]
-        public void Insert_Bulk_Relations()
-        {
-            IRelationService rs = RelationService;
-
-            IEnumerable<IRelation> newRelations = CreateRelations(10);
-
-            Assert.IsTrue(newRelations.All(x => !x.HasIdentity));
-
-            RelationService.Save(newRelations);
-
-            Assert.IsTrue(newRelations.All(x => x.HasIdentity));
-        }
-
-        [Test]
-        public void Update_Bulk_Relations()
-        {
-            IRelationService rs = RelationService;
-
-            DateTime date = DateTime.Now.AddDays(-10);
-            IEnumerable<IRelation> newRelations = CreateRelations(10);
-            foreach (IRelation r in newRelations)
-            {
-                r.CreateDate = date;
-                r.UpdateDate = date;
-            }
-
-            // insert
-            RelationService.Save(newRelations);
-            Assert.IsTrue(newRelations.All(x => x.UpdateDate == date));
-
-            DateTime newDate = DateTime.Now.AddDays(-5);
-            foreach (IRelation r in newRelations)
-            {
-                r.UpdateDate = newDate;
-            }
-
-            // update
-            RelationService.Save(newRelations);
-            Assert.IsTrue(newRelations.All(x => x.UpdateDate == newDate));
-        }
-
-        private IRelation CreateAndSaveRelation(string name, string alias)
-        {
-            IRelationService rs = RelationService;
-            var rt = new RelationType(name, alias, false, null, null);
-            rs.Save(rt);
-
-            ContentType ct = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(ct);
-
-            MediaType mt = MediaTypeBuilder.CreateImageMediaType("img");
-            MediaTypeService.Save(mt);
-
-            Content c1 = ContentBuilder.CreateBasicContent(ct);
-            Media c2 = MediaBuilder.CreateMediaImage(mt, -1);
+            var c1 = ContentBuilder.CreateBasicContent(ct);
+            var c2 = MediaBuilder.CreateMediaImage(mt, -1);
             ContentService.Save(c1);
             MediaService.Save(c2);
 
-            var r = new Relation(c1.Id, c2.Id, rt);
-            RelationService.Save(r);
-
-            return r;
-        }
-
-        /// <summary>
-        /// Creates a bunch of content/media items return relation objects for them (unsaved)
-        /// </summary>
-        /// <param name="count"></param>
-        /// <returns></returns>
-        private IEnumerable<IRelation> CreateRelations(int count)
-        {
-            IRelationService rs = RelationService;
-            string rtName = Guid.NewGuid().ToString();
-            var rt = new RelationType(rtName, rtName, false, null, null);
-            rs.Save(rt);
-
-            ContentType ct = ContentTypeBuilder.CreateBasicContentType();
-            ContentTypeService.Save(ct);
-
-            MediaType mt = MediaTypeBuilder.CreateImageMediaType("img");
-            MediaTypeService.Save(mt);
-
-            return Enumerable.Range(1, count).Select(index =>
-            {
-                Content c1 = ContentBuilder.CreateBasicContent(ct);
-                Media c2 = MediaBuilder.CreateMediaImage(mt, -1);
-                ContentService.Save(c1);
-                MediaService.Save(c2);
-
-                return new Relation(c1.Id, c2.Id, rt);
-            }).ToList();
-        }
-
-        // TODO: Create a relation for entities of the wrong Entity Type (GUID) based on the Relation Type's defined parent/child object types
+            return new Relation(c1.Id, c2.Id, rt);
+        }).ToList();
     }
-}
\ No newline at end of file
+
+    // TODO: Create a relation for entities of the wrong Entity Type (GUID) based on the Relation Type's defined parent/child object types
+}
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs
index a3475e9ce5..3224e4964b 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TagServiceTests.cs
@@ -2,9 +2,9 @@
 // See LICENSE for more details.
 
 using System.Linq;
-using System.Threading;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Serialization;
@@ -13,114 +13,116 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+/// <summary>
+///     Tests covering methods in the TagService class.
+///     Involves multiple layers as well as configuration.
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class TagServiceTests : UmbracoIntegrationTest
 {
-    /// <summary>
-    /// Tests covering methods in the TagService class.
-    /// Involves multiple layers as well as configuration.
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class TagServiceTests : UmbracoIntegrationTest
+    [SetUp]
+    public void CreateTestData()
     {
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template); // else, FK violation on contentType!
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        _contentType =
+            ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type",
+                defaultTemplateId: template.Id);
+        _contentType.PropertyGroups.First().PropertyTypes.Add(
+            new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "tags")
+            {
+                DataTypeId = Constants.DataTypes.Tags
+            });
+        ContentTypeService.Save(_contentType);
+    }
 
-        private IFileService FileService => GetRequiredService<IFileService>();
+    private IContentService ContentService => GetRequiredService<IContentService>();
 
-        private ITagService TagService => GetRequiredService<ITagService>();
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
 
-        private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
+    private IFileService FileService => GetRequiredService<IFileService>();
 
-        private IJsonSerializer Serializer => GetRequiredService<IJsonSerializer>();
+    private ITagService TagService => GetRequiredService<ITagService>();
 
-        private PropertyEditorCollection PropertyEditorCollection => GetRequiredService<PropertyEditorCollection>();
+    private IDataTypeService DataTypeService => GetRequiredService<IDataTypeService>();
 
-        private IContentType _contentType;
+    private IJsonSerializer Serializer => GetRequiredService<IJsonSerializer>();
 
-        [SetUp]
-        public void CreateTestData()
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template); // else, FK violation on contentType!
+    private PropertyEditorCollection PropertyEditorCollection => GetRequiredService<PropertyEditorCollection>();
 
-            _contentType = ContentTypeBuilder.CreateSimpleContentType("umbMandatory", "Mandatory Doc Type", defaultTemplateId: template.Id);
-            _contentType.PropertyGroups.First().PropertyTypes.Add(
-                new PropertyType(ShortStringHelper, "test", ValueStorageType.Ntext, "tags")
-                {
-                    DataTypeId = Constants.DataTypes.Tags,
-                });
-            ContentTypeService.Save(_contentType);
-        }
+    private IContentType _contentType;
 
-        [Test]
-        public void TagApiConsistencyTest()
-        {
-            IContent content1 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow", "pig", "goat" });
-            ContentService.SaveAndPublish(content1);
+    [Test]
+    public void TagApiConsistencyTest()
+    {
+        IContent content1 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "cow", "pig", "goat" });
+        ContentService.SaveAndPublish(content1);
 
-            // change
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "elephant" }, true);
-            content1.RemoveTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow" });
-            ContentService.SaveAndPublish(content1);
+        // change
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "elephant" }, true);
+        content1.RemoveTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow" });
+        ContentService.SaveAndPublish(content1);
 
-            // more changes
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "mouse" }, true);
-            ContentService.SaveAndPublish(content1);
-            content1.RemoveTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "mouse" });
-            ContentService.SaveAndPublish(content1);
+        // more changes
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "mouse" }, true);
+        ContentService.SaveAndPublish(content1);
+        content1.RemoveTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "mouse" });
+        ContentService.SaveAndPublish(content1);
 
-            // get it back
-            content1 = ContentService.GetById(content1.Id);
-            string tagsValue = content1.GetValue("tags").ToString();
-            string[] tagsValues = JsonConvert.DeserializeObject<string[]>(tagsValue);
-            Assert.AreEqual(3, tagsValues.Length);
-            Assert.Contains("pig", tagsValues);
-            Assert.Contains("goat", tagsValues);
-            Assert.Contains("elephant", tagsValues);
+        // get it back
+        content1 = ContentService.GetById(content1.Id);
+        var tagsValue = content1.GetValue("tags").ToString();
+        var tagsValues = JsonConvert.DeserializeObject<string[]>(tagsValue);
+        Assert.AreEqual(3, tagsValues.Length);
+        Assert.Contains("pig", tagsValues);
+        Assert.Contains("goat", tagsValues);
+        Assert.Contains("elephant", tagsValues);
 
-            ITag[] tags = TagService.GetTagsForProperty(content1.Id, "tags").ToArray();
-            Assert.IsTrue(tags.All(x => x.Group == "default"));
-            tagsValues = tags.Select(x => x.Text).ToArray();
+        var tags = TagService.GetTagsForProperty(content1.Id, "tags").ToArray();
+        Assert.IsTrue(tags.All(x => x.Group == "default"));
+        tagsValues = tags.Select(x => x.Text).ToArray();
 
-            Assert.AreEqual(3, tagsValues.Length);
-            Assert.Contains("pig", tagsValues);
-            Assert.Contains("goat", tagsValues);
-            Assert.Contains("elephant", tagsValues);
-        }
+        Assert.AreEqual(3, tagsValues.Length);
+        Assert.Contains("pig", tagsValues);
+        Assert.Contains("goat", tagsValues);
+        Assert.Contains("elephant", tagsValues);
+    }
 
-        [Test]
-        public void TagList_Contains_NodeCount()
-        {
-            Content content1 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 1", -1);
-            content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow", "pig", "goat" });
-            ContentService.SaveAndPublish(content1);
+    [Test]
+    public void TagList_Contains_NodeCount()
+    {
+        var content1 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 1");
+        content1.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags",
+            new[] { "cow", "pig", "goat" });
+        ContentService.SaveAndPublish(content1);
 
-            Content content2 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 2", -1);
-            content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow", "pig" });
-            ContentService.SaveAndPublish(content2);
+        var content2 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 2");
+        content2.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow", "pig" });
+        ContentService.SaveAndPublish(content2);
 
-            Content content3 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 3", -1);
-            content3.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow" });
-            ContentService.SaveAndPublish(content3);
+        var content3 = ContentBuilder.CreateSimpleContent(_contentType, "Tagged content 3");
+        content3.AssignTags(PropertyEditorCollection, DataTypeService, Serializer, "tags", new[] { "cow" });
+        ContentService.SaveAndPublish(content3);
 
-            // Act
-            var tags = TagService.GetAllContentTags()
-                .OrderByDescending(x => x.NodeCount)
-                .ToList();
+        // Act
+        var tags = TagService.GetAllContentTags()
+            .OrderByDescending(x => x.NodeCount)
+            .ToList();
 
-            // Assert
-            Assert.AreEqual(3, tags.Count);
-            Assert.AreEqual("cow", tags[0].Text);
-            Assert.AreEqual(3, tags[0].NodeCount);
-            Assert.AreEqual("pig", tags[1].Text);
-            Assert.AreEqual(2, tags[1].NodeCount);
-            Assert.AreEqual("goat", tags[2].Text);
-            Assert.AreEqual(1, tags[2].NodeCount);
-        }
+        // Assert
+        Assert.AreEqual(3, tags.Count);
+        Assert.AreEqual("cow", tags[0].Text);
+        Assert.AreEqual(3, tags[0].NodeCount);
+        Assert.AreEqual("pig", tags[1].Text);
+        Assert.AreEqual(2, tags[1].NodeCount);
+        Assert.AreEqual("goat", tags[2].Text);
+        Assert.AreEqual(1, tags[2].NodeCount);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs
index 4ee52a6869..3220f99b39 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ThreadSafetyServiceTest.cs
@@ -2,25 +2,19 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 using Constants = Umbraco.Cms.Core.Constants;
-
-using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
 using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
 namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
@@ -36,7 +30,6 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
     // but still, the test fails on VSTS in most cases, so now ignoring it,
     // as I could not figure out _why_ and it does not look like we are
     // causing it, getting into __sysObjects locks, no idea why
-
     [TestFixture]
     [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Logger = UmbracoTestOptions.Logger.Console)]
     public class ThreadSafetyServiceTest : UmbracoIntegrationTest
@@ -145,8 +138,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
                         // So although the test passes in v8, there's actually some strange things occuring because Scopes
                         // are being created and disposed concurrently and out of order.
                         var currentScope = ScopeAccessor.AmbientScope;
-                        log.LogInformation("[{ThreadId}] Current Scope? {CurrentScope}",
-                            Thread.CurrentThread.ManagedThreadId, currentScope?.GetDebugInfo());
+                        log.LogInformation("[{ThreadId}] Current Scope? {CurrentScope}", Thread.CurrentThread.ManagedThreadId, currentScope?.GetDebugInfo());
                         Assert.IsNull(currentScope);
 
                         string name1 = "test-" + Guid.NewGuid();
@@ -165,7 +157,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
                     }
                     catch (Exception e)
                     {
-                        //throw;
+                        // throw;
                         lock (exceptions)
                         {
                             exceptions.Add(e);
@@ -240,8 +232,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
                         // So although the test passes in v8, there's actually some strange things occuring because Scopes
                         // are being created and disposed concurrently and out of order.
                         var currentScope = ScopeAccessor.AmbientScope;
-                        log.LogInformation("[{ThreadId}] Current Scope? {CurrentScope}",
-                            Thread.CurrentThread.ManagedThreadId, currentScope?.GetDebugInfo());
+                        log.LogInformation("[{ThreadId}] Current Scope? {CurrentScope}", Thread.CurrentThread.ManagedThreadId, currentScope?.GetDebugInfo());
                         Assert.IsNull(currentScope);
 
                         string name1 = "test-" + Guid.NewGuid();
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs
index 937be937a5..a7e1fbd803 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/TrackRelationsTests.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
@@ -7,54 +8,53 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+[UmbracoTest(
+    Database = UmbracoTestOptions.Database.NewSchemaPerTest,
+    PublishedRepositoryEvents = true,
+    WithApplication = true,
+    Boot = true)]
+public class TrackRelationsTests : UmbracoIntegrationTestWithContent
 {
-    [UmbracoTest(
-        Database = UmbracoTestOptions.Database.NewSchemaPerTest,
-        PublishedRepositoryEvents = true,
-        WithApplication = true,
-        Boot = true)]
-    public class TrackRelationsTests : UmbracoIntegrationTestWithContent
+    private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+
+    private IMediaService MediaService => GetRequiredService<IMediaService>();
+
+    private IRelationService RelationService => GetRequiredService<IRelationService>();
+
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
     {
-        private IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
+        base.CustomTestSetup(builder);
+        builder.AddNuCache();
+    }
 
-        private IMediaService MediaService => GetRequiredService<IMediaService>();
+    [Test]
+    public void Automatically_Track_Relations()
+    {
+        var mt = MediaTypeBuilder.CreateSimpleMediaType("testMediaType", "Test Media Type");
+        MediaTypeService.Save(mt);
+        var m1 = MediaBuilder.CreateSimpleMedia(mt, "hello 1", -1);
+        var m2 = MediaBuilder.CreateSimpleMedia(mt, "hello 1", -1);
+        MediaService.Save(m1);
+        MediaService.Save(m2);
 
-        private IRelationService RelationService => GetRequiredService<IRelationService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
 
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
-        {
-            base.CustomTestSetup(builder);
-            builder.AddNuCache();
-        }
+        var ct = ContentTypeBuilder.CreateTextPageContentType("richTextTest", defaultTemplateId: template.Id);
+        ct.AllowedTemplates = Enumerable.Empty<ITemplate>();
 
-        [Test]
-        public void Automatically_Track_Relations()
-        {
-            var mt = MediaTypeBuilder.CreateSimpleMediaType("testMediaType", "Test Media Type");
-            MediaTypeService.Save(mt);
-            var m1 = MediaBuilder.CreateSimpleMedia(mt, "hello 1", -1);
-            var m2 = MediaBuilder.CreateSimpleMedia(mt, "hello 1", -1);
-            MediaService.Save(m1);
-            MediaService.Save(m2);
+        ContentTypeService.Save(ct);
 
-            var template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
+        var c1 = ContentBuilder.CreateTextpageContent(ct, "my content 1", -1);
+        ContentService.Save(c1);
 
-            var ct = ContentTypeBuilder.CreateTextPageContentType("richTextTest", defaultTemplateId: template.Id);
-            ct.AllowedTemplates = Enumerable.Empty<ITemplate>();
+        var c2 = ContentBuilder.CreateTextpageContent(ct, "my content 2", -1);
 
-            ContentTypeService.Save(ct);
-
-            var c1 = ContentBuilder.CreateTextpageContent(ct, "my content 1", -1);
-            ContentService.Save(c1);
-
-            var c2 = ContentBuilder.CreateTextpageContent(ct, "my content 2", -1);
-
-            // 'bodyText' is a property with a RTE property editor which we knows tracks relations
-            c2.Properties["bodyText"].SetValue(@"<p>
+        // 'bodyText' is a property with a RTE property editor which we knows tracks relations
+        c2.Properties["bodyText"].SetValue(@"<p>
         <img src='/media/12312.jpg' data-udi='umb://media/" + m1.Key.ToString("N") + @"' />
 </p><p><img src='/media/234234.jpg' data-udi=""umb://media/" + m2.Key.ToString("N") + @""" />
 </p>
@@ -62,16 +62,15 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
     <a href=""{locallink:umb://document/" + c1.Key.ToString("N") + @"}"">hello</a>
 </p>");
 
-            ContentService.Save(c2);
+        ContentService.Save(c2);
 
-            var relations = RelationService.GetByParentId(c2.Id).ToList();
-            Assert.AreEqual(3, relations.Count);
-            Assert.AreEqual(Constants.Conventions.RelationTypes.RelatedMediaAlias, relations[0].RelationType.Alias);
-            Assert.AreEqual(m1.Id, relations[0].ChildId);
-            Assert.AreEqual(Constants.Conventions.RelationTypes.RelatedMediaAlias, relations[1].RelationType.Alias);
-            Assert.AreEqual(m2.Id, relations[1].ChildId);
-            Assert.AreEqual(Constants.Conventions.RelationTypes.RelatedDocumentAlias, relations[2].RelationType.Alias);
-            Assert.AreEqual(c1.Id, relations[2].ChildId);
-        }
+        var relations = RelationService.GetByParentId(c2.Id).ToList();
+        Assert.AreEqual(3, relations.Count);
+        Assert.AreEqual(Constants.Conventions.RelationTypes.RelatedMediaAlias, relations[0].RelationType.Alias);
+        Assert.AreEqual(m1.Id, relations[0].ChildId);
+        Assert.AreEqual(Constants.Conventions.RelationTypes.RelatedMediaAlias, relations[1].RelationType.Alias);
+        Assert.AreEqual(m2.Id, relations[1].ChildId);
+        Assert.AreEqual(Constants.Conventions.RelationTypes.RelatedDocumentAlias, relations[2].RelationType.Alias);
+        Assert.AreEqual(c1.Id, relations[2].ChildId);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs
index bd02018e45..4eb0bf1ce0 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/UserServiceTests.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Actions;
@@ -15,1062 +14,1019 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Services;
+
+/// <summary>
+///     Tests covering the UserService
+/// </summary>
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class UserServiceTests : UmbracoIntegrationTest
 {
+    private UserService UserService => (UserService)GetRequiredService<IUserService>();
 
-    /// <summary>
-    /// Tests covering the UserService
-    /// </summary>
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class UserServiceTests : UmbracoIntegrationTest
+    private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+
+    private IFileService FileService => GetRequiredService<IFileService>();
+
+    private IContentService ContentService => GetRequiredService<IContentService>();
+
+    [Test]
+    public void Get_User_Permissions_For_Unassigned_Permission_Nodes()
     {
-        private UserService UserService => (UserService)GetRequiredService<IUserService>();
+        // Arrange
+        var user = CreateTestUser(out _);
 
-        private IContentTypeService ContentTypeService => GetRequiredService<IContentTypeService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
 
-        private IFileService FileService => GetRequiredService<IFileService>();
-
-        private IContentService ContentService => GetRequiredService<IContentService>();
-
-        [Test]
-        public void Get_User_Permissions_For_Unassigned_Permission_Nodes()
+        Content[] content =
         {
-            // Arrange
-            IUser user = CreateTestUser(out _);
+            ContentBuilder.CreateSimpleContent(contentType), ContentBuilder.CreateSimpleContent(contentType),
+            ContentBuilder.CreateSimpleContent(contentType)
+        };
+        ContentService.Save(content);
 
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
+        // Act
+        var permissions = UserService.GetPermissions(user, content[0].Id, content[1].Id, content[2].Id).ToArray();
 
-            Content[] content = new[]
-                {
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType)
-                };
-            ContentService.Save(content);
+        // Assert
+        Assert.AreEqual(3, permissions.Length);
+        Assert.AreEqual(17, permissions[0].AssignedPermissions.Length);
+        Assert.AreEqual(17, permissions[1].AssignedPermissions.Length);
+        Assert.AreEqual(17, permissions[2].AssignedPermissions.Length);
+    }
 
-            // Act
-            EntityPermission[] permissions = UserService.GetPermissions(user, content[0].Id, content[1].Id, content[2].Id).ToArray();
+    [Test]
+    public void Get_User_Permissions_For_Assigned_Permission_Nodes()
+    {
+        // Arrange
+        var user = CreateTestUser(out var userGroup);
 
-            // Assert
-            Assert.AreEqual(3, permissions.Length);
-            Assert.AreEqual(17, permissions[0].AssignedPermissions.Length);
-            Assert.AreEqual(17, permissions[1].AssignedPermissions.Length);
-            Assert.AreEqual(17, permissions[2].AssignedPermissions.Length);
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        Content[] content =
+        {
+            ContentBuilder.CreateSimpleContent(contentType), ContentBuilder.CreateSimpleContent(contentType),
+            ContentBuilder.CreateSimpleContent(contentType)
+        };
+        ContentService.Save(content);
+        ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[0], ActionMove.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[2], ActionBrowse.ActionLetter, new[] { userGroup.Id });
+
+        // Act
+        var permissions = UserService.GetPermissions(user, content[0].Id, content[1].Id, content[2].Id).ToArray();
+
+        // Assert
+        Assert.AreEqual(3, permissions.Length);
+        Assert.AreEqual(3, permissions[0].AssignedPermissions.Length);
+        Assert.AreEqual(2, permissions[1].AssignedPermissions.Length);
+        Assert.AreEqual(1, permissions[2].AssignedPermissions.Length);
+    }
+
+    [Test]
+    public void Get_UserGroup_Assigned_Permissions()
+    {
+        // Arrange
+        var userGroup = CreateTestUserGroup();
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        Content[] content =
+        {
+            ContentBuilder.CreateSimpleContent(contentType), ContentBuilder.CreateSimpleContent(contentType),
+            ContentBuilder.CreateSimpleContent(contentType)
+        };
+        ContentService.Save(content);
+        ContentService.SetPermission(content.ElementAt(0), ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content.ElementAt(0), ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content.ElementAt(0), ActionMove.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content.ElementAt(1), ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content.ElementAt(1), ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content.ElementAt(2), ActionBrowse.ActionLetter, new[] { userGroup.Id });
+
+        // Act
+        var permissions = UserService.GetPermissions(userGroup, false, content[0].Id, content[1].Id, content[2].Id)
+            .ToArray();
+
+        // Assert
+        Assert.AreEqual(3, permissions.Length);
+        Assert.AreEqual(3, permissions[0].AssignedPermissions.Length);
+        Assert.AreEqual(2, permissions[1].AssignedPermissions.Length);
+        Assert.AreEqual(1, permissions[2].AssignedPermissions.Length);
+    }
+
+    [Test]
+    public void Get_UserGroup_Assigned_And_Default_Permissions()
+    {
+        // Arrange
+        var userGroup = CreateTestUserGroup();
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        Content[] content =
+        {
+            ContentBuilder.CreateSimpleContent(contentType), ContentBuilder.CreateSimpleContent(contentType),
+            ContentBuilder.CreateSimpleContent(contentType)
+        };
+        ContentService.Save(content);
+        ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[0], ActionMove.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new[] { userGroup.Id });
+
+        // Act
+        var permissions = UserService.GetPermissions(userGroup, true, content[0].Id, content[1].Id, content[2].Id)
+            .ToArray();
+
+        // Assert
+        Assert.AreEqual(3, permissions.Length);
+        Assert.AreEqual(3, permissions[0].AssignedPermissions.Length);
+        Assert.AreEqual(2, permissions[1].AssignedPermissions.Length);
+        Assert.AreEqual(17, permissions[2].AssignedPermissions.Length);
+    }
+
+    [Test]
+    public void Get_All_User_Permissions_For_All_Nodes_With_Explicit_Permission()
+    {
+        // Arrange
+        var userGroup1 = CreateTestUserGroup();
+        var userGroup2 = CreateTestUserGroup("test2", "Test 2");
+        var userGroup3 = CreateTestUserGroup("test3", "Test 3");
+        var user = UserService.CreateUserWithIdentity("John Doe", "john@umbraco.io");
+
+        var defaultPermissionCount = userGroup3.Permissions.Count();
+
+        user.AddGroup(userGroup1);
+        user.AddGroup(userGroup2);
+        user.AddGroup(userGroup3);
+        UserService.Save(user);
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        Content[] content =
+        {
+            ContentBuilder.CreateSimpleContent(contentType), ContentBuilder.CreateSimpleContent(contentType),
+            ContentBuilder.CreateSimpleContent(contentType)
+        };
+        ContentService.Save(content);
+
+        // assign permissions - we aren't assigning anything explicit for group3 and nothing explicit for content[2] /w group2
+        ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new[] { userGroup1.Id });
+        ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new[] { userGroup1.Id });
+        ContentService.SetPermission(content[0], ActionMove.ActionLetter, new[] { userGroup2.Id });
+        ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new[] { userGroup1.Id });
+        ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new[] { userGroup2.Id });
+        ContentService.SetPermission(content[2], ActionDelete.ActionLetter, new[] { userGroup1.Id });
+
+        // Act
+        // we don't pass in any nodes so it will return all of them
+        var result = UserService.GetPermissions(user).ToArray();
+        var permissions = result
+            .GroupBy(x => x.EntityId)
+            .ToDictionary(x => x.Key, x => x.GroupBy(a => a.UserGroupId).ToDictionary(a => a.Key, a => a.ToArray()));
+
+        // Assert
+
+        // there will be 3 since that is how many content items there are
+        Assert.AreEqual(3, permissions.Count);
+
+        // test permissions contains content[0]
+        Assert.IsTrue(permissions.ContainsKey(content[0].Id));
+
+        // test that this permissions set contains permissions for all groups
+        Assert.IsTrue(permissions[content[0].Id].ContainsKey(userGroup1.Id));
+        Assert.IsTrue(permissions[content[0].Id].ContainsKey(userGroup2.Id));
+        Assert.IsTrue(permissions[content[0].Id].ContainsKey(userGroup3.Id));
+
+        // test that the correct number of permissions are returned for each group
+        Assert.AreEqual(2, permissions[content[0].Id][userGroup1.Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.AreEqual(1, permissions[content[0].Id][userGroup2.Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.AreEqual(defaultPermissionCount,
+            permissions[content[0].Id][userGroup3.Id].SelectMany(x => x.AssignedPermissions).Count());
+
+        // test permissions contains content[1]
+        Assert.IsTrue(permissions.ContainsKey(content[1].Id));
+
+        // test that this permissions set contains permissions for all groups
+        Assert.IsTrue(permissions[content[1].Id].ContainsKey(userGroup1.Id));
+        Assert.IsTrue(permissions[content[1].Id].ContainsKey(userGroup2.Id));
+        Assert.IsTrue(permissions[content[1].Id].ContainsKey(userGroup3.Id));
+
+        // test that the correct number of permissions are returned for each group
+        Assert.AreEqual(1, permissions[content[1].Id][userGroup1.Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.AreEqual(1, permissions[content[1].Id][userGroup2.Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.AreEqual(defaultPermissionCount,
+            permissions[content[1].Id][userGroup3.Id].SelectMany(x => x.AssignedPermissions).Count());
+
+        // test permissions contains content[2]
+        Assert.IsTrue(permissions.ContainsKey(content[2].Id));
+
+        // test that this permissions set contains permissions for all groups
+        Assert.IsTrue(permissions[content[2].Id].ContainsKey(userGroup1.Id));
+        Assert.IsTrue(permissions[content[2].Id].ContainsKey(userGroup2.Id));
+        Assert.IsTrue(permissions[content[2].Id].ContainsKey(userGroup3.Id));
+
+        // test that the correct number of permissions are returned for each group
+        Assert.AreEqual(1, permissions[content[2].Id][userGroup1.Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.AreEqual(defaultPermissionCount,
+            permissions[content[2].Id][userGroup2.Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.AreEqual(defaultPermissionCount,
+            permissions[content[2].Id][userGroup3.Id].SelectMany(x => x.AssignedPermissions).Count());
+    }
+
+    [Test]
+    public void Get_All_User_Group_Permissions_For_All_Nodes()
+    {
+        // Arrange
+        var userGroup = CreateTestUserGroup();
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        Content[] content =
+        {
+            ContentBuilder.CreateSimpleContent(contentType), ContentBuilder.CreateSimpleContent(contentType),
+            ContentBuilder.CreateSimpleContent(contentType)
+        };
+        ContentService.Save(content);
+        ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[0], ActionMove.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(content[2], ActionDelete.ActionLetter, new[] { userGroup.Id });
+
+        // Act
+        // we don't pass in any nodes so it will return all of them
+        var permissions = UserService.GetPermissions(userGroup, true)
+            .GroupBy(x => x.EntityId)
+            .ToDictionary(x => x.Key, x => x);
+
+        // Assert
+        Assert.AreEqual(3, permissions.Count);
+        Assert.IsTrue(permissions.ContainsKey(content[0].Id));
+        Assert.AreEqual(3, permissions[content[0].Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.IsTrue(permissions.ContainsKey(content[1].Id));
+        Assert.AreEqual(2, permissions[content[1].Id].SelectMany(x => x.AssignedPermissions).Count());
+        Assert.IsTrue(permissions.ContainsKey(content[2].Id));
+        Assert.AreEqual(1, permissions[content[2].Id].SelectMany(x => x.AssignedPermissions).Count());
+    }
+
+    [Test]
+    public void Calculate_Permissions_For_User_For_Path()
+    {
+        // see: http://issues.umbraco.org/issue/U4-10075#comment=67-40085
+        // for an overview of what this is testing
+        const string path = "-1,1,2,3,4";
+        var pathIds = path.GetIdsFromPathReversed();
+
+        const int groupA = 7;
+        const int groupB = 8;
+        const int groupC = 9;
+
+        var userGroups = new Dictionary<int, string[]>
+        {
+            {groupA, new[] {"S", "D", "F"}}, {groupB, new[] {"S", "D", "G", "K"}}, {groupC, new[] {"F", "G"}}
+        };
+
+        EntityPermission[] permissions =
+        {
+            new(groupA, 1, userGroups[groupA], true), new(groupA, 2, userGroups[groupA], true),
+            new(groupA, 3, userGroups[groupA], true), new(groupA, 4, userGroups[groupA], true),
+            new(groupB, 1, userGroups[groupB], true), new(groupB, 2, new[] {"F", "R"}, false),
+            new(groupB, 3, userGroups[groupB], true), new(groupB, 4, userGroups[groupB], true),
+            new(groupC, 1, userGroups[groupC], true), new(groupC, 2, userGroups[groupC], true),
+            new(groupC, 3, new[] {"Q", "Z"}, false), new(groupC, 4, userGroups[groupC], true)
+        };
+
+        // Permissions for Id 4
+        var result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds);
+        Assert.AreEqual(4, result.EntityId);
+        var allPermissions = result.GetAllPermissions().ToArray();
+        Assert.AreEqual(6, allPermissions.Length, string.Join(",", allPermissions));
+        Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "R", "Q", "Z" }));
+
+        // Permissions for Id 3
+        result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds.Skip(1).ToArray());
+        Assert.AreEqual(3, result.EntityId);
+        allPermissions = result.GetAllPermissions().ToArray();
+        Assert.AreEqual(6, allPermissions.Length, string.Join(",", allPermissions));
+        Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "R", "Q", "Z" }));
+
+        // Permissions for Id 2
+        result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds.Skip(2).ToArray());
+        Assert.AreEqual(2, result.EntityId);
+        allPermissions = result.GetAllPermissions().ToArray();
+        Assert.AreEqual(5, allPermissions.Length, string.Join(",", allPermissions));
+        Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "G", "R" }));
+
+        // Permissions for Id 1
+        result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds.Skip(3).ToArray());
+        Assert.AreEqual(1, result.EntityId);
+        allPermissions = result.GetAllPermissions().ToArray();
+        Assert.AreEqual(5, allPermissions.Length, string.Join(",", allPermissions));
+        Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "G", "K" }));
+    }
+
+    [Test]
+    public void Determine_Deepest_Explicit_Permissions_For_Group_For_Path_1()
+    {
+        var path = "-1,1,2,3";
+        var pathIds = path.GetIdsFromPathReversed();
+        string[] defaults = { "A", "B" };
+        var permissions = new List<EntityPermission>
+        {
+            new(9876, 1, defaults, true), new(9876, 2, new[] {"B", "C", "D"}, false), new(9876, 3, defaults, true)
+        };
+        var result = UserService.GetPermissionsForPathForGroup(permissions, pathIds, true);
+        Assert.AreEqual(3, result.AssignedPermissions.Length);
+        Assert.IsFalse(result.IsDefaultPermissions);
+        Assert.IsTrue(result.AssignedPermissions.ContainsAll(new[] { "B", "C", "D" }));
+        Assert.AreEqual(2, result.EntityId);
+        Assert.AreEqual(9876, result.UserGroupId);
+    }
+
+    [Test]
+    public void Determine_Deepest_Explicit_Permissions_For_Group_For_Path_2()
+    {
+        var path = "-1,1,2,3";
+        var pathIds = path.GetIdsFromPathReversed();
+        string[] defaults = { "A", "B", "C" };
+        var permissions = new List<EntityPermission>
+        {
+            new(9876, 1, defaults, true), new(9876, 2, defaults, true), new(9876, 3, defaults, true)
+        };
+        var result = UserService.GetPermissionsForPathForGroup(permissions, pathIds);
+        Assert.IsNull(result);
+    }
+
+    [Test]
+    public void Determine_Deepest_Explicit_Permissions_For_Group_For_Path_3()
+    {
+        var path = "-1,1,2,3";
+        var pathIds = path.GetIdsFromPathReversed();
+        string[] defaults = { "A", "B" };
+        var permissions = new List<EntityPermission>
+        {
+            new(9876, 1, defaults, true), new(9876, 2, defaults, true), new(9876, 3, defaults, true)
+        };
+        var result = UserService.GetPermissionsForPathForGroup(permissions, pathIds, true);
+        Assert.AreEqual(2, result.AssignedPermissions.Length);
+        Assert.IsTrue(result.IsDefaultPermissions);
+        Assert.IsTrue(result.AssignedPermissions.ContainsAll(defaults));
+        Assert.AreEqual(3, result.EntityId);
+        Assert.AreEqual(9876, result.UserGroupId);
+    }
+
+    [Test]
+    public void Get_User_Implicit_Permissions()
+    {
+        // Arrange
+        var userGroup = CreateTestUserGroup();
+
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var parent = ContentBuilder.CreateSimpleContent(contentType);
+        ContentService.Save(parent);
+        var child1 = ContentBuilder.CreateSimpleContent(contentType, "child1", parent.Id);
+        ContentService.Save(child1);
+        var child2 = ContentBuilder.CreateSimpleContent(contentType, "child2", child1.Id);
+        ContentService.Save(child2);
+
+        ContentService.SetPermission(parent, ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(parent, ActionDelete.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(parent, ActionMove.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(parent, ActionBrowse.ActionLetter, new[] { userGroup.Id });
+        ContentService.SetPermission(parent, ActionDelete.ActionLetter, new[] { userGroup.Id });
+
+        // Act
+        var permissions = UserService.GetPermissionsForPath(userGroup, child2.Path);
+
+        // Assert
+        var allPermissions = permissions.GetAllPermissions().ToArray();
+        Assert.AreEqual(3, allPermissions.Length);
+    }
+
+    [Test]
+    public void Can_Delete_User()
+    {
+        var user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
+
+        UserService.Delete(user, true);
+        var deleted = UserService.GetUserById(user.Id);
+
+        // Assert
+        Assert.That(deleted, Is.Null);
+    }
+
+    [Test]
+    public void Disables_User_Instead_Of_Deleting_If_Flag_Not_Set()
+    {
+        var user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
+
+        UserService.Delete(user);
+        var deleted = UserService.GetUserById(user.Id);
+
+        // Assert
+        Assert.That(deleted, Is.Not.Null);
+    }
+
+    [Test]
+    public void Exists_By_Username()
+    {
+        var user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
+        var user2 = UserService.CreateUserWithIdentity("john2@umbraco.io", "john2@umbraco.io");
+        Assert.IsTrue(UserService.Exists("JohnDoe"));
+        Assert.IsFalse(UserService.Exists("notFound"));
+        Assert.IsTrue(UserService.Exists("john2@umbraco.io"));
+    }
+
+    [Test]
+    public void Get_By_Email()
+    {
+        var user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
+
+        Assert.IsNotNull(UserService.GetByEmail(user.Email));
+        Assert.IsNull(UserService.GetByEmail("do@not.find"));
+    }
+
+    [Test]
+    public void Get_By_Username()
+    {
+        var user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
+
+        Assert.IsNotNull(UserService.GetByUsername(user.Username));
+        Assert.IsNull(UserService.GetByUsername("notFound"));
+    }
+
+    [Test]
+    public void Get_By_Username_With_Backslash()
+    {
+        var user = UserService.CreateUserWithIdentity("mydomain\\JohnDoe", "john@umbraco.io");
+
+        Assert.IsNotNull(UserService.GetByUsername(user.Username));
+        Assert.IsNull(UserService.GetByUsername("notFound"));
+    }
+
+    [Test]
+    public void Get_By_Object_Id()
+    {
+        var user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
+
+        Assert.IsNotNull(UserService.GetUserById(user.Id));
+        Assert.IsNull(UserService.GetUserById(9876));
+    }
+
+    [Test]
+    public void Find_By_Email_Starts_With()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10);
+        UserService.Save(users);
+
+        // don't find this
+        var customUser = UserBuilder.CreateUser();
+        customUser.Email = "hello@hello.com";
+        UserService.Save(customUser);
+
+        var found = UserService.FindByEmail("tes", 0, 100, out _);
+
+        Assert.AreEqual(10, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Email_Ends_With()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10);
+        UserService.Save(users);
+
+        // include this
+        var customUser = UserBuilder.CreateUser();
+        customUser.Email = "hello@test.com";
+        UserService.Save(customUser);
+
+        var found = UserService.FindByEmail("test.com", 0, 100, out _, StringPropertyMatchType.EndsWith);
+
+        Assert.AreEqual(11, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Email_Contains()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10);
+        UserService.Save(users);
+
+        // include this
+        var customUser = UserBuilder.CreateUser();
+        customUser.Email = "hello@test.com";
+        UserService.Save(customUser);
+
+        var found = UserService.FindByEmail("test", 0, 100, out _, StringPropertyMatchType.Contains);
+
+        Assert.AreEqual(11, found.Count());
+    }
+
+    [Test]
+    public void Find_By_Email_Exact()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10);
+        UserService.Save(users);
+
+        // include this
+        var customUser = UserBuilder.CreateUser();
+        customUser.Email = "hello@test.com";
+        UserService.Save(customUser);
+
+        var found = UserService.FindByEmail("hello@test.com", 0, 100, out _, StringPropertyMatchType.Exact);
+
+        Assert.AreEqual(1, found.Count());
+    }
+
+    [Test]
+    public void Get_All_Paged_Users()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10);
+        UserService.Save(users);
+
+        var found = UserService.GetAll(0, 2, out var totalRecs);
+
+        Assert.AreEqual(2, found.Count());
+
+        // + 1 because of the built in admin user
+        Assert.AreEqual(11, totalRecs);
+        Assert.AreEqual("admin", found.First().Username);
+        Assert.AreEqual("test0", found.Last().Username);
+    }
+
+    [Test]
+    public void Get_All_Paged_Users_With_Filter()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10).ToArray();
+        UserService.Save(users);
+
+        var found = UserService.GetAll(0, 2, out var totalRecs, "username", Direction.Ascending, filter: "test");
+
+        Assert.AreEqual(2, found.Count());
+        Assert.AreEqual(10, totalRecs);
+        Assert.AreEqual("test0", found.First().Username);
+        Assert.AreEqual("test1", found.Last().Username);
+    }
+
+    [Test]
+    public void Get_All_Paged_Users_For_Group()
+    {
+        var userGroup = UserGroupBuilder.CreateUserGroup();
+        UserService.Save(userGroup);
+
+        var users = UserBuilder.CreateMulipleUsers(10).ToArray();
+        for (var i = 0; i < 10;)
+        {
+            users[i].AddGroup(userGroup.ToReadOnlyGroup());
+            i += 2;
         }
 
-        [Test]
-        public void Get_User_Permissions_For_Assigned_Permission_Nodes()
+        UserService.Save(users);
+
+        var found = UserService.GetAll(0, 2, out long totalRecs, "username", Direction.Ascending,
+            includeUserGroups: new[] { userGroup.Alias });
+
+        Assert.AreEqual(2, found.Count());
+        Assert.AreEqual(5, totalRecs);
+        Assert.AreEqual("test0", found.First().Username);
+        Assert.AreEqual("test2", found.Last().Username);
+    }
+
+    [Test]
+    public void Get_All_Paged_Users_For_Group_With_Filter()
+    {
+        var userGroup = UserGroupBuilder.CreateUserGroup();
+        UserService.Save(userGroup);
+
+        var users = UserBuilder.CreateMulipleUsers(10).ToArray();
+        for (var i = 0; i < 10;)
         {
-            // Arrange
-            IUser user = CreateTestUser(out IUserGroup userGroup);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            Content[] content = new[]
-                {
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType)
-                };
-            ContentService.Save(content);
-            ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[0], ActionMove.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[2], ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-
-            // Act
-            EntityPermission[] permissions = UserService.GetPermissions(user, content[0].Id, content[1].Id, content[2].Id).ToArray();
-
-            // Assert
-            Assert.AreEqual(3, permissions.Length);
-            Assert.AreEqual(3, permissions[0].AssignedPermissions.Length);
-            Assert.AreEqual(2, permissions[1].AssignedPermissions.Length);
-            Assert.AreEqual(1, permissions[2].AssignedPermissions.Length);
+            users[i].AddGroup(userGroup.ToReadOnlyGroup());
+            i += 2;
         }
 
-        [Test]
-        public void Get_UserGroup_Assigned_Permissions()
+        for (var i = 0; i < 10;)
         {
-            // Arrange
-            UserGroup userGroup = CreateTestUserGroup();
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            Content[] content = new[]
-                {
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType)
-                };
-            ContentService.Save(content);
-            ContentService.SetPermission(content.ElementAt(0), ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content.ElementAt(0), ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content.ElementAt(0), ActionMove.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content.ElementAt(1), ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content.ElementAt(1), ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content.ElementAt(2), ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-
-            // Act
-            EntityPermission[] permissions = UserService.GetPermissions(userGroup, false, content[0].Id, content[1].Id, content[2].Id).ToArray();
-
-            // Assert
-            Assert.AreEqual(3, permissions.Length);
-            Assert.AreEqual(3, permissions[0].AssignedPermissions.Length);
-            Assert.AreEqual(2, permissions[1].AssignedPermissions.Length);
-            Assert.AreEqual(1, permissions[2].AssignedPermissions.Length);
+            users[i].Name = "blah" + users[i].Name;
+            i += 3;
         }
 
-        [Test]
-        public void Get_UserGroup_Assigned_And_Default_Permissions()
+        UserService.Save(users);
+
+        var found = UserService.GetAll(0, 2, out long totalRecs, "username", Direction.Ascending,
+            userGroups: new[] { userGroup.Alias }, filter: "blah");
+
+        Assert.AreEqual(2, found.Count());
+        Assert.AreEqual(2, totalRecs);
+        Assert.AreEqual("test0", found.First().Username);
+        Assert.AreEqual("test6", found.Last().Username);
+    }
+
+    [Test]
+    public void Count_All_Users()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10);
+        UserService.Save(users);
+        var customUser = UserBuilder.CreateUser();
+        UserService.Save(customUser);
+
+        var found = UserService.GetCount(MemberCountType.All);
+
+        // + 1 because of the built in admin user
+        Assert.AreEqual(12, found);
+    }
+
+    [Ignore("why?")]
+    [Test]
+    public void Count_All_Online_Users()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10,
+            (i, member) => member.LastLoginDate = DateTime.Now.AddMinutes(i * -2));
+        UserService.Save(users);
+
+        var customUser = UserBuilder.CreateUser();
+        throw new NotImplementedException();
+    }
+
+    [Test]
+    public void Count_All_Locked_Users()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10, (i, member) => member.IsLockedOut = i % 2 == 0);
+        UserService.Save(users);
+
+        var customUser = UserBuilder.CreateUser();
+        customUser.IsLockedOut = true;
+        UserService.Save(customUser);
+
+        var found = UserService.GetCount(MemberCountType.LockedOut);
+
+        Assert.AreEqual(6, found);
+    }
+
+    [Test]
+    public void Count_All_Approved_Users()
+    {
+        var users = UserBuilder.CreateMulipleUsers(10, (i, member) => member.IsApproved = i % 2 == 0);
+        UserService.Save(users);
+
+        var customUser = UserBuilder.CreateUser();
+        customUser.IsApproved = false;
+        UserService.Save(customUser);
+
+        var found = UserService.GetCount(MemberCountType.Approved);
+
+        // + 1 because of the built in admin user
+        Assert.AreEqual(6, found);
+    }
+
+    [Test]
+    public void Can_Persist_New_User()
+    {
+        // Act
+        var membershipUser = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
+
+        // Assert
+        Assert.That(membershipUser.HasIdentity, Is.True);
+        Assert.That(membershipUser.Id, Is.GreaterThan(0));
+        IUser user = membershipUser as User;
+        Assert.That(user, Is.Not.Null);
+    }
+
+    [Test]
+    public void Can_Persist_New_User_With_Hashed_Password()
+    {
+        // Act
+        // NOTE: Normally the hash'ing would be handled in the membership provider, so the service just saves the password
+        var password = "123456";
+        var hash = new HMACSHA1
         {
-            // Arrange
-            UserGroup userGroup = CreateTestUserGroup();
+            Key = Encoding.Unicode.GetBytes(password)
+        };
+        var encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password)));
+        var globalSettings = new GlobalSettings();
+        var membershipUser = new User(globalSettings, "JohnDoe", "john@umbraco.io", encodedPassword, encodedPassword);
+        UserService.Save(membershipUser);
 
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
+        // Assert
+        Assert.That(membershipUser.HasIdentity, Is.True);
+        Assert.That(membershipUser.RawPasswordValue, Is.Not.EqualTo(password));
+        Assert.That(membershipUser.RawPasswordValue, Is.EqualTo(encodedPassword));
+        IUser user = membershipUser;
+        Assert.That(user, Is.Not.Null);
+    }
 
-            Content[] content = new[]
-                {
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType),
-                    ContentBuilder.CreateSimpleContent(contentType)
-                };
-            ContentService.Save(content);
-            ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[0], ActionMove.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new int[] { userGroup.Id });
+    [Test]
+    public void Can_Add_And_Remove_Sections_From_UserGroup()
+    {
+        var userGroup = new UserGroup(ShortStringHelper) { Alias = "Group1", Name = "Group 1" };
+        userGroup.AddAllowedSection("content");
+        userGroup.AddAllowedSection("mediat");
+        UserService.Save(userGroup);
 
-            // Act
-            EntityPermission[] permissions = UserService.GetPermissions(userGroup, true, content[0].Id, content[1].Id, content[2].Id)
-                .ToArray();
+        var result1 = UserService.GetUserGroupById(userGroup.Id);
 
-            // Assert
-            Assert.AreEqual(3, permissions.Length);
-            Assert.AreEqual(3, permissions[0].AssignedPermissions.Length);
-            Assert.AreEqual(2, permissions[1].AssignedPermissions.Length);
-            Assert.AreEqual(17, permissions[2].AssignedPermissions.Length);
+        Assert.AreEqual(2, result1.AllowedSections.Count());
+
+        // adds some allowed sections
+        userGroup.AddAllowedSection("test1");
+        userGroup.AddAllowedSection("test2");
+        userGroup.AddAllowedSection("test3");
+        userGroup.AddAllowedSection("test4");
+        UserService.Save(userGroup);
+
+        result1 = UserService.GetUserGroupById(userGroup.Id);
+
+        Assert.AreEqual(6, result1.AllowedSections.Count());
+
+        // simulate clearing the sections
+        foreach (var s in userGroup.AllowedSections)
+        {
+            result1.RemoveAllowedSection(s);
         }
 
-        [Test]
-        public void Get_All_User_Permissions_For_All_Nodes_With_Explicit_Permission()
+        // now just re-add a couple
+        result1.AddAllowedSection("test3");
+        result1.AddAllowedSection("test4");
+        UserService.Save(result1);
+
+        // Assert
+        // re-get
+        result1 = UserService.GetUserGroupById(userGroup.Id);
+        Assert.AreEqual(2, result1.AllowedSections.Count());
+    }
+
+    [Test]
+    public void Can_Remove_Section_From_All_Assigned_UserGroups()
+    {
+        var userGroup1 = new UserGroup(ShortStringHelper) { Alias = "Group1", Name = "Group 1" };
+        var userGroup2 = new UserGroup(ShortStringHelper) { Alias = "Group2", Name = "Group 2" };
+        UserService.Save(userGroup1);
+        UserService.Save(userGroup2);
+
+        // adds some allowed sections
+        userGroup1.AddAllowedSection("test");
+        userGroup2.AddAllowedSection("test");
+        UserService.Save(userGroup1);
+        UserService.Save(userGroup2);
+
+        // now clear the section from all users
+        UserService.DeleteSectionFromAllUserGroups("test");
+
+        // Assert
+        var result1 = UserService.GetUserGroupById(userGroup1.Id);
+        var result2 = UserService.GetUserGroupById(userGroup2.Id);
+        Assert.IsFalse(result1.AllowedSections.Contains("test"));
+        Assert.IsFalse(result2.AllowedSections.Contains("test"));
+    }
+
+    [Test]
+    public void Can_Add_Section_To_All_UserGroups()
+    {
+        var userGroup1 = new UserGroup(ShortStringHelper) { Alias = "Group1", Name = "Group 1" };
+        userGroup1.AddAllowedSection("test");
+
+        var userGroup2 = new UserGroup(ShortStringHelper) { Alias = "Group2", Name = "Group 2" };
+        userGroup2.AddAllowedSection("test");
+
+        var userGroup3 = new UserGroup(ShortStringHelper) { Alias = "Group3", Name = "Group 3" };
+        UserService.Save(userGroup1);
+        UserService.Save(userGroup2);
+        UserService.Save(userGroup3);
+
+        // Assert
+        var result1 = UserService.GetUserGroupById(userGroup1.Id);
+        var result2 = UserService.GetUserGroupById(userGroup2.Id);
+        var result3 = UserService.GetUserGroupById(userGroup3.Id);
+        Assert.IsTrue(result1.AllowedSections.Contains("test"));
+        Assert.IsTrue(result2.AllowedSections.Contains("test"));
+        Assert.IsFalse(result3.AllowedSections.Contains("test"));
+
+        // now add the section to all groups
+        foreach (var userGroup in new[] { userGroup1, userGroup2, userGroup3 })
         {
-            // Arrange
-            UserGroup userGroup1 = CreateTestUserGroup();
-            UserGroup userGroup2 = CreateTestUserGroup("test2", "Test 2");
-            UserGroup userGroup3 = CreateTestUserGroup("test3", "Test 3");
-            IUser user = UserService.CreateUserWithIdentity("John Doe", "john@umbraco.io");
-
-            int defaultPermissionCount = userGroup3.Permissions.Count();
-
-            user.AddGroup(userGroup1);
-            user.AddGroup(userGroup2);
-            user.AddGroup(userGroup3);
-            UserService.Save(user);
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            Content[] content = new[]
-            {
-                ContentBuilder.CreateSimpleContent(contentType),
-                ContentBuilder.CreateSimpleContent(contentType),
-                ContentBuilder.CreateSimpleContent(contentType)
-            };
-            ContentService.Save(content);
-
-            // assign permissions - we aren't assigning anything explicit for group3 and nothing explicit for content[2] /w group2
-            ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new int[] { userGroup1.Id });
-            ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new int[] { userGroup1.Id });
-            ContentService.SetPermission(content[0], ActionMove.ActionLetter, new int[] { userGroup2.Id });
-            ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new int[] { userGroup1.Id });
-            ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new int[] { userGroup2.Id });
-            ContentService.SetPermission(content[2], ActionDelete.ActionLetter, new int[] { userGroup1.Id });
-
-            // Act
-            // we don't pass in any nodes so it will return all of them
-            EntityPermission[] result = UserService.GetPermissions(user).ToArray();
-            var permissions = result
-                .GroupBy(x => x.EntityId)
-                .ToDictionary(x => x.Key, x => x.GroupBy(a => a.UserGroupId).ToDictionary(a => a.Key, a => a.ToArray()));
-
-            // Assert
-
-            // there will be 3 since that is how many content items there are
-            Assert.AreEqual(3, permissions.Count);
-
-            // test permissions contains content[0]
-            Assert.IsTrue(permissions.ContainsKey(content[0].Id));
-
-            // test that this permissions set contains permissions for all groups
-            Assert.IsTrue(permissions[content[0].Id].ContainsKey(userGroup1.Id));
-            Assert.IsTrue(permissions[content[0].Id].ContainsKey(userGroup2.Id));
-            Assert.IsTrue(permissions[content[0].Id].ContainsKey(userGroup3.Id));
-
-            // test that the correct number of permissions are returned for each group
-            Assert.AreEqual(2, permissions[content[0].Id][userGroup1.Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.AreEqual(1, permissions[content[0].Id][userGroup2.Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.AreEqual(defaultPermissionCount, permissions[content[0].Id][userGroup3.Id].SelectMany(x => x.AssignedPermissions).Count());
-
-            // test permissions contains content[1]
-            Assert.IsTrue(permissions.ContainsKey(content[1].Id));
-
-            // test that this permissions set contains permissions for all groups
-            Assert.IsTrue(permissions[content[1].Id].ContainsKey(userGroup1.Id));
-            Assert.IsTrue(permissions[content[1].Id].ContainsKey(userGroup2.Id));
-            Assert.IsTrue(permissions[content[1].Id].ContainsKey(userGroup3.Id));
-
-            // test that the correct number of permissions are returned for each group
-            Assert.AreEqual(1, permissions[content[1].Id][userGroup1.Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.AreEqual(1, permissions[content[1].Id][userGroup2.Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.AreEqual(defaultPermissionCount, permissions[content[1].Id][userGroup3.Id].SelectMany(x => x.AssignedPermissions).Count());
-
-            // test permissions contains content[2]
-            Assert.IsTrue(permissions.ContainsKey(content[2].Id));
-
-            // test that this permissions set contains permissions for all groups
-            Assert.IsTrue(permissions[content[2].Id].ContainsKey(userGroup1.Id));
-            Assert.IsTrue(permissions[content[2].Id].ContainsKey(userGroup2.Id));
-            Assert.IsTrue(permissions[content[2].Id].ContainsKey(userGroup3.Id));
-
-            // test that the correct number of permissions are returned for each group
-            Assert.AreEqual(1, permissions[content[2].Id][userGroup1.Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.AreEqual(defaultPermissionCount, permissions[content[2].Id][userGroup2.Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.AreEqual(defaultPermissionCount, permissions[content[2].Id][userGroup3.Id].SelectMany(x => x.AssignedPermissions).Count());
-        }
-
-        [Test]
-        public void Get_All_User_Group_Permissions_For_All_Nodes()
-        {
-            // Arrange
-            UserGroup userGroup = CreateTestUserGroup();
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            Content[] content = new[]
-            {
-                ContentBuilder.CreateSimpleContent(contentType),
-                ContentBuilder.CreateSimpleContent(contentType),
-                ContentBuilder.CreateSimpleContent(contentType)
-            };
-            ContentService.Save(content);
-            ContentService.SetPermission(content[0], ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[0], ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[0], ActionMove.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[1], ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[1], ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(content[2], ActionDelete.ActionLetter, new int[] { userGroup.Id });
-
-            // Act
-            // we don't pass in any nodes so it will return all of them
-            var permissions = UserService.GetPermissions(userGroup, true)
-                .GroupBy(x => x.EntityId)
-                .ToDictionary(x => x.Key, x => x);
-
-            // Assert
-            Assert.AreEqual(3, permissions.Count);
-            Assert.IsTrue(permissions.ContainsKey(content[0].Id));
-            Assert.AreEqual(3, permissions[content[0].Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.IsTrue(permissions.ContainsKey(content[1].Id));
-            Assert.AreEqual(2, permissions[content[1].Id].SelectMany(x => x.AssignedPermissions).Count());
-            Assert.IsTrue(permissions.ContainsKey(content[2].Id));
-            Assert.AreEqual(1, permissions[content[2].Id].SelectMany(x => x.AssignedPermissions).Count());
-        }
-
-        [Test]
-        public void Calculate_Permissions_For_User_For_Path()
-        {
-            // see: http://issues.umbraco.org/issue/U4-10075#comment=67-40085
-            // for an overview of what this is testing
-            const string path = "-1,1,2,3,4";
-            int[] pathIds = path.GetIdsFromPathReversed();
-
-            const int groupA = 7;
-            const int groupB = 8;
-            const int groupC = 9;
-
-            var userGroups = new Dictionary<int, string[]>
-            {
-                { groupA, new[] { "S", "D", "F" } },
-                { groupB, new[] { "S", "D", "G", "K" } },
-                { groupC, new[] { "F", "G" } }
-            };
-
-            EntityPermission[] permissions = new[]
-            {
-                new EntityPermission(groupA, 1, userGroups[groupA], isDefaultPermissions: true),
-                new EntityPermission(groupA, 2, userGroups[groupA], isDefaultPermissions: true),
-                new EntityPermission(groupA, 3, userGroups[groupA], isDefaultPermissions: true),
-                new EntityPermission(groupA, 4, userGroups[groupA], isDefaultPermissions: true),
-
-                new EntityPermission(groupB, 1, userGroups[groupB], isDefaultPermissions: true),
-                new EntityPermission(groupB, 2, new[] { "F", "R" }, isDefaultPermissions: false),
-                new EntityPermission(groupB, 3, userGroups[groupB], isDefaultPermissions: true),
-                new EntityPermission(groupB, 4, userGroups[groupB], isDefaultPermissions: true),
-
-                new EntityPermission(groupC, 1, userGroups[groupC], isDefaultPermissions: true),
-                new EntityPermission(groupC, 2, userGroups[groupC], isDefaultPermissions: true),
-                new EntityPermission(groupC, 3, new[] { "Q", "Z" }, isDefaultPermissions: false),
-                new EntityPermission(groupC, 4, userGroups[groupC], isDefaultPermissions: true),
-            };
-
-            // Permissions for Id 4
-            EntityPermissionSet result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds);
-            Assert.AreEqual(4, result.EntityId);
-            string[] allPermissions = result.GetAllPermissions().ToArray();
-            Assert.AreEqual(6, allPermissions.Length, string.Join(",", allPermissions));
-            Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "R", "Q", "Z" }));
-
-            // Permissions for Id 3
-            result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds.Skip(1).ToArray());
-            Assert.AreEqual(3, result.EntityId);
-            allPermissions = result.GetAllPermissions().ToArray();
-            Assert.AreEqual(6, allPermissions.Length, string.Join(",", allPermissions));
-            Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "R", "Q", "Z" }));
-
-            // Permissions for Id 2
-            result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds.Skip(2).ToArray());
-            Assert.AreEqual(2, result.EntityId);
-            allPermissions = result.GetAllPermissions().ToArray();
-            Assert.AreEqual(5, allPermissions.Length, string.Join(",", allPermissions));
-            Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "G", "R" }));
-
-            // Permissions for Id 1
-            result = UserService.CalculatePermissionsForPathForUser(permissions, pathIds.Skip(3).ToArray());
-            Assert.AreEqual(1, result.EntityId);
-            allPermissions = result.GetAllPermissions().ToArray();
-            Assert.AreEqual(5, allPermissions.Length, string.Join(",", allPermissions));
-            Assert.IsTrue(allPermissions.ContainsAll(new[] { "S", "D", "F", "G", "K" }));
-        }
-
-        [Test]
-        public void Determine_Deepest_Explicit_Permissions_For_Group_For_Path_1()
-        {
-            string path = "-1,1,2,3";
-            int[] pathIds = path.GetIdsFromPathReversed();
-            string[] defaults = new[] { "A", "B" };
-            var permissions = new List<EntityPermission>
-            {
-                new EntityPermission(9876, 1, defaults, isDefaultPermissions: true),
-                new EntityPermission(9876, 2, new[] { "B", "C", "D" }, isDefaultPermissions: false),
-                new EntityPermission(9876, 3, defaults, isDefaultPermissions: true)
-            };
-            EntityPermission result = UserService.GetPermissionsForPathForGroup(permissions, pathIds, fallbackToDefaultPermissions: true);
-            Assert.AreEqual(3, result.AssignedPermissions.Length);
-            Assert.IsFalse(result.IsDefaultPermissions);
-            Assert.IsTrue(result.AssignedPermissions.ContainsAll(new[] { "B", "C", "D" }));
-            Assert.AreEqual(2, result.EntityId);
-            Assert.AreEqual(9876, result.UserGroupId);
-        }
-
-        [Test]
-        public void Determine_Deepest_Explicit_Permissions_For_Group_For_Path_2()
-        {
-            string path = "-1,1,2,3";
-            int[] pathIds = path.GetIdsFromPathReversed();
-            string[] defaults = new[] { "A", "B", "C" };
-            var permissions = new List<EntityPermission>
-            {
-                new EntityPermission(9876, 1, defaults, isDefaultPermissions: true),
-                new EntityPermission(9876, 2, defaults, isDefaultPermissions: true),
-                new EntityPermission(9876, 3, defaults, isDefaultPermissions: true)
-            };
-            EntityPermission result = UserService.GetPermissionsForPathForGroup(permissions, pathIds, fallbackToDefaultPermissions: false);
-            Assert.IsNull(result);
-        }
-
-        [Test]
-        public void Determine_Deepest_Explicit_Permissions_For_Group_For_Path_3()
-        {
-            string path = "-1,1,2,3";
-            int[] pathIds = path.GetIdsFromPathReversed();
-            string[] defaults = new[] { "A", "B" };
-            var permissions = new List<EntityPermission>
-            {
-                new EntityPermission(9876, 1, defaults, isDefaultPermissions: true),
-                new EntityPermission(9876, 2, defaults, isDefaultPermissions: true),
-                new EntityPermission(9876, 3, defaults, isDefaultPermissions: true)
-            };
-            EntityPermission result = UserService.GetPermissionsForPathForGroup(permissions, pathIds, fallbackToDefaultPermissions: true);
-            Assert.AreEqual(2, result.AssignedPermissions.Length);
-            Assert.IsTrue(result.IsDefaultPermissions);
-            Assert.IsTrue(result.AssignedPermissions.ContainsAll(defaults));
-            Assert.AreEqual(3, result.EntityId);
-            Assert.AreEqual(9876, result.UserGroupId);
-        }
-
-        [Test]
-        public void Get_User_Implicit_Permissions()
-        {
-            // Arrange
-            UserGroup userGroup = CreateTestUserGroup();
-
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            Content parent = ContentBuilder.CreateSimpleContent(contentType);
-            ContentService.Save(parent);
-            Content child1 = ContentBuilder.CreateSimpleContent(contentType, "child1", parent.Id);
-            ContentService.Save(child1);
-            Content child2 = ContentBuilder.CreateSimpleContent(contentType, "child2", child1.Id);
-            ContentService.Save(child2);
-
-            ContentService.SetPermission(parent, ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(parent, ActionDelete.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(parent, ActionMove.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(parent, ActionBrowse.ActionLetter, new int[] { userGroup.Id });
-            ContentService.SetPermission(parent, ActionDelete.ActionLetter, new int[] { userGroup.Id });
-
-            // Act
-            EntityPermissionSet permissions = UserService.GetPermissionsForPath(userGroup, child2.Path);
-
-            // Assert
-            string[] allPermissions = permissions.GetAllPermissions().ToArray();
-            Assert.AreEqual(3, allPermissions.Length);
-        }
-
-        [Test]
-        public void Can_Delete_User()
-        {
-            IUser user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
-
-            UserService.Delete(user, true);
-            IUser deleted = UserService.GetUserById(user.Id);
-
-            // Assert
-            Assert.That(deleted, Is.Null);
-        }
-
-        [Test]
-        public void Disables_User_Instead_Of_Deleting_If_Flag_Not_Set()
-        {
-            IUser user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
-
-            UserService.Delete(user);
-            IUser deleted = UserService.GetUserById(user.Id);
-
-            // Assert
-            Assert.That(deleted, Is.Not.Null);
-        }
-
-        [Test]
-        public void Exists_By_Username()
-        {
-            IUser user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
-            IUser user2 = UserService.CreateUserWithIdentity("john2@umbraco.io", "john2@umbraco.io");
-            Assert.IsTrue(UserService.Exists("JohnDoe"));
-            Assert.IsFalse(UserService.Exists("notFound"));
-            Assert.IsTrue(UserService.Exists("john2@umbraco.io"));
-        }
-
-        [Test]
-        public void Get_By_Email()
-        {
-            IUser user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
-
-            Assert.IsNotNull(UserService.GetByEmail(user.Email));
-            Assert.IsNull(UserService.GetByEmail("do@not.find"));
-        }
-
-        [Test]
-        public void Get_By_Username()
-        {
-            IUser user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
-
-            Assert.IsNotNull(UserService.GetByUsername(user.Username));
-            Assert.IsNull(UserService.GetByUsername("notFound"));
-        }
-
-        [Test]
-        public void Get_By_Username_With_Backslash()
-        {
-            IUser user = UserService.CreateUserWithIdentity("mydomain\\JohnDoe", "john@umbraco.io");
-
-            Assert.IsNotNull(UserService.GetByUsername(user.Username));
-            Assert.IsNull(UserService.GetByUsername("notFound"));
-        }
-
-        [Test]
-        public void Get_By_Object_Id()
-        {
-            IUser user = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
-
-            Assert.IsNotNull(UserService.GetUserById(user.Id));
-            Assert.IsNull(UserService.GetUserById(9876));
-        }
-
-        [Test]
-        public void Find_By_Email_Starts_With()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10);
-            UserService.Save(users);
-
-            // don't find this
-            User customUser = UserBuilder.CreateUser();
-            customUser.Email = "hello@hello.com";
-            UserService.Save(customUser);
-
-            IEnumerable<IUser> found = UserService.FindByEmail("tes", 0, 100, out _, StringPropertyMatchType.StartsWith);
-
-            Assert.AreEqual(10, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Email_Ends_With()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10);
-            UserService.Save(users);
-
-            // include this
-            User customUser = UserBuilder.CreateUser();
-            customUser.Email = "hello@test.com";
-            UserService.Save(customUser);
-
-            IEnumerable<IUser> found = UserService.FindByEmail("test.com", 0, 100, out _, StringPropertyMatchType.EndsWith);
-
-            Assert.AreEqual(11, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Email_Contains()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10);
-            UserService.Save(users);
-
-            // include this
-            User customUser = UserBuilder.CreateUser();
-            customUser.Email = "hello@test.com";
-            UserService.Save(customUser);
-
-            IEnumerable<IUser> found = UserService.FindByEmail("test", 0, 100, out _, StringPropertyMatchType.Contains);
-
-            Assert.AreEqual(11, found.Count());
-        }
-
-        [Test]
-        public void Find_By_Email_Exact()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10);
-            UserService.Save(users);
-
-            // include this
-            User customUser = UserBuilder.CreateUser();
-            customUser.Email = "hello@test.com";
-            UserService.Save(customUser);
-
-            IEnumerable<IUser> found = UserService.FindByEmail("hello@test.com", 0, 100, out _, StringPropertyMatchType.Exact);
-
-            Assert.AreEqual(1, found.Count());
-        }
-
-        [Test]
-        public void Get_All_Paged_Users()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10);
-            UserService.Save(users);
-
-            IEnumerable<IUser> found = UserService.GetAll(0, 2, out long totalRecs);
-
-            Assert.AreEqual(2, found.Count());
-
-            // + 1 because of the built in admin user
-            Assert.AreEqual(11, totalRecs);
-            Assert.AreEqual("admin", found.First().Username);
-            Assert.AreEqual("test0", found.Last().Username);
-        }
-
-        [Test]
-        public void Get_All_Paged_Users_With_Filter()
-        {
-            IUser[] users = UserBuilder.CreateMulipleUsers(10).ToArray();
-            UserService.Save(users);
-
-            IEnumerable<IUser> found = UserService.GetAll(0, 2, out long totalRecs, "username", Direction.Ascending, filter: "test");
-
-            Assert.AreEqual(2, found.Count());
-            Assert.AreEqual(10, totalRecs);
-            Assert.AreEqual("test0", found.First().Username);
-            Assert.AreEqual("test1", found.Last().Username);
-        }
-
-        [Test]
-        public void Get_All_Paged_Users_For_Group()
-        {
-            UserGroup userGroup = UserGroupBuilder.CreateUserGroup();
+            userGroup.AddAllowedSection("test");
             UserService.Save(userGroup);
-
-            IUser[] users = UserBuilder.CreateMulipleUsers(10).ToArray();
-            for (int i = 0; i < 10;)
-            {
-                users[i].AddGroup(userGroup.ToReadOnlyGroup());
-                i = i + 2;
-            }
-
-            UserService.Save(users);
-
-            long totalRecs;
-            IEnumerable<IUser> found = UserService.GetAll(0, 2, out totalRecs, "username", Direction.Ascending, includeUserGroups: new[] { userGroup.Alias });
-
-            Assert.AreEqual(2, found.Count());
-            Assert.AreEqual(5, totalRecs);
-            Assert.AreEqual("test0", found.First().Username);
-            Assert.AreEqual("test2", found.Last().Username);
         }
 
-        [Test]
-        public void Get_All_Paged_Users_For_Group_With_Filter()
+        // Assert
+        result1 = UserService.GetUserGroupById(userGroup1.Id);
+        result2 = UserService.GetUserGroupById(userGroup2.Id);
+        result3 = UserService.GetUserGroupById(userGroup3.Id);
+        Assert.IsTrue(result1.AllowedSections.Contains("test"));
+        Assert.IsTrue(result2.AllowedSections.Contains("test"));
+        Assert.IsTrue(result3.AllowedSections.Contains("test"));
+    }
+
+    [Test]
+    public void Cannot_Create_User_With_Empty_Username() =>
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => UserService.CreateUserWithIdentity(string.Empty, "john@umbraco.io"));
+
+    [Test]
+    public void Cannot_Save_User_With_Empty_Username()
+    {
+        // Arrange
+        var user = UserService.CreateUserWithIdentity("John Doe", "john@umbraco.io");
+        user.Username = string.Empty;
+
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => UserService.Save(user));
+    }
+
+    [Test]
+    public void Cannot_Save_User_With_Empty_Name()
+    {
+        // Arrange
+        var user = UserService.CreateUserWithIdentity("John Doe", "john@umbraco.io");
+        user.Name = string.Empty;
+
+        // Act & Assert
+        Assert.Throws<ArgumentException>(() => UserService.Save(user));
+    }
+
+    [Test]
+    public void Get_By_Profile_Username()
+    {
+        // Arrange
+        var user = UserService.CreateUserWithIdentity("test1", "test1@test.com");
+
+        // Act
+        var profile = UserService.GetProfileByUserName(user.Username);
+
+        // Assert
+        Assert.IsNotNull(profile);
+        Assert.AreEqual(user.Username, profile.Name);
+        Assert.AreEqual(user.Id, profile.Id);
+    }
+
+    [Test]
+    public void Get_By_Profile_Id()
+    {
+        // Arrange
+        var user = UserService.CreateUserWithIdentity("test1", "test1@test.com");
+
+        // Act
+        var profile = UserService.GetProfileById(user.Id);
+
+        // Assert
+        Assert.IsNotNull(profile);
+        Assert.AreEqual(user.Username, profile.Name);
+        Assert.AreEqual(user.Id, profile.Id);
+    }
+
+    [Test]
+    public void Get_By_Profile_Id_Must_Return_Null_If_User_Does_Not_Exist()
+    {
+        var profile = UserService.GetProfileById(42);
+
+        // Assert
+        Assert.IsNull(profile);
+    }
+
+    [Test]
+    public void GetProfilesById_Must_Return_Empty_If_User_Does_Not_Exist()
+    {
+        var profiles = UserService.GetProfilesById(42);
+
+        // Assert
+        CollectionAssert.IsEmpty(profiles);
+    }
+
+    [Test]
+    public void Get_User_By_Username()
+    {
+        // Arrange
+        var originalUser = CreateTestUser(out _);
+
+        // Act
+        var updatedItem = (User)UserService.GetByUsername(originalUser.Username);
+
+        // Assert
+        Assert.IsNotNull(updatedItem);
+        Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));
+        Assert.That(updatedItem.Name, Is.EqualTo(originalUser.Name));
+        Assert.That(updatedItem.Language, Is.EqualTo(originalUser.Language));
+        Assert.That(updatedItem.IsApproved, Is.EqualTo(originalUser.IsApproved));
+        Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(originalUser.RawPasswordValue));
+        Assert.That(updatedItem.IsLockedOut, Is.EqualTo(originalUser.IsLockedOut));
+        Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(originalUser.StartContentIds));
+        Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(originalUser.StartMediaIds));
+        Assert.That(updatedItem.Email, Is.EqualTo(originalUser.Email));
+        Assert.That(updatedItem.Username, Is.EqualTo(originalUser.Username));
+        Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(originalUser.AllowedSections.Count()));
+    }
+
+    [Test]
+    public void Can_Get_Assigned_StartNodes_For_User()
+    {
+        var startContentItems = BuildContentItems(3);
+
+        var testUserGroup = CreateTestUserGroup();
+
+        var userGroupId = testUserGroup.Id;
+
+        CreateTestUsers(startContentItems.Select(x => x.Id).ToArray(), testUserGroup, 3);
+
+        var usersInGroup = UserService.GetAllInGroup(userGroupId);
+
+        foreach (var user in usersInGroup)
         {
-            UserGroup userGroup = UserGroupBuilder.CreateUserGroup();
-            UserService.Save(userGroup);
-
-            IUser[] users = UserBuilder.CreateMulipleUsers(10).ToArray();
-            for (int i = 0; i < 10;)
-            {
-                users[i].AddGroup(userGroup.ToReadOnlyGroup());
-                i = i + 2;
-            }
-
-            for (int i = 0; i < 10;)
-            {
-                users[i].Name = "blah" + users[i].Name;
-                i = i + 3;
-            }
-
-            UserService.Save(users);
-
-            long totalRecs;
-            IEnumerable<IUser> found = UserService.GetAll(0, 2, out totalRecs, "username", Direction.Ascending, userGroups: new[] { userGroup.Alias }, filter: "blah");
-
-            Assert.AreEqual(2, found.Count());
-            Assert.AreEqual(2, totalRecs);
-            Assert.AreEqual("test0", found.First().Username);
-            Assert.AreEqual("test6", found.Last().Username);
-        }
-
-        [Test]
-        public void Count_All_Users()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10);
-            UserService.Save(users);
-            User customUser = UserBuilder.CreateUser();
-            UserService.Save(customUser);
-
-            int found = UserService.GetCount(MemberCountType.All);
-
-            // + 1 because of the built in admin user
-            Assert.AreEqual(12, found);
-        }
-
-        [Ignore("why?")]
-        [Test]
-        public void Count_All_Online_Users()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10, (i, member) => member.LastLoginDate = DateTime.Now.AddMinutes(i * -2));
-            UserService.Save(users);
-
-            User customUser = UserBuilder.CreateUser();
-            throw new NotImplementedException();
-        }
-
-        [Test]
-        public void Count_All_Locked_Users()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10, (i, member) => member.IsLockedOut = i % 2 == 0);
-            UserService.Save(users);
-
-            User customUser = UserBuilder.CreateUser();
-            customUser.IsLockedOut = true;
-            UserService.Save(customUser);
-
-            int found = UserService.GetCount(MemberCountType.LockedOut);
-
-            Assert.AreEqual(6, found);
-        }
-
-        [Test]
-        public void Count_All_Approved_Users()
-        {
-            IEnumerable<IUser> users = UserBuilder.CreateMulipleUsers(10, (i, member) => member.IsApproved = i % 2 == 0);
-            UserService.Save(users);
-
-            User customUser = UserBuilder.CreateUser();
-            customUser.IsApproved = false;
-            UserService.Save(customUser);
-
-            int found = UserService.GetCount(MemberCountType.Approved);
-
-            // + 1 because of the built in admin user
-            Assert.AreEqual(6, found);
-        }
-
-        [Test]
-        public void Can_Persist_New_User()
-        {
-            // Act
-            IUser membershipUser = UserService.CreateUserWithIdentity("JohnDoe", "john@umbraco.io");
-
-            // Assert
-            Assert.That(membershipUser.HasIdentity, Is.True);
-            Assert.That(membershipUser.Id, Is.GreaterThan(0));
-            IUser user = membershipUser as User;
-            Assert.That(user, Is.Not.Null);
-        }
-
-        [Test]
-        public void Can_Persist_New_User_With_Hashed_Password()
-        {
-            // Act
-            // NOTE: Normally the hash'ing would be handled in the membership provider, so the service just saves the password
-            string password = "123456";
-            var hash = new HMACSHA1();
-            hash.Key = Encoding.Unicode.GetBytes(password);
-            string encodedPassword = Convert.ToBase64String(hash.ComputeHash(Encoding.Unicode.GetBytes(password)));
-            var globalSettings = new GlobalSettings();
-            var membershipUser = new User(globalSettings, "JohnDoe", "john@umbraco.io", encodedPassword, encodedPassword);
-            UserService.Save(membershipUser);
-
-            // Assert
-            Assert.That(membershipUser.HasIdentity, Is.True);
-            Assert.That(membershipUser.RawPasswordValue, Is.Not.EqualTo(password));
-            Assert.That(membershipUser.RawPasswordValue, Is.EqualTo(encodedPassword));
-            IUser user = membershipUser as User;
-            Assert.That(user, Is.Not.Null);
-        }
-
-        [Test]
-        public void Can_Add_And_Remove_Sections_From_UserGroup()
-        {
-            var userGroup = new UserGroup(ShortStringHelper)
-            {
-                Alias = "Group1",
-                Name = "Group 1"
-            };
-            userGroup.AddAllowedSection("content");
-            userGroup.AddAllowedSection("mediat");
-            UserService.Save(userGroup);
-
-            IUserGroup result1 = UserService.GetUserGroupById(userGroup.Id);
-
-            Assert.AreEqual(2, result1.AllowedSections.Count());
-
-            // adds some allowed sections
-            userGroup.AddAllowedSection("test1");
-            userGroup.AddAllowedSection("test2");
-            userGroup.AddAllowedSection("test3");
-            userGroup.AddAllowedSection("test4");
-            UserService.Save(userGroup);
-
-            result1 = UserService.GetUserGroupById(userGroup.Id);
-
-            Assert.AreEqual(6, result1.AllowedSections.Count());
-
-            // simulate clearing the sections
-            foreach (string s in userGroup.AllowedSections)
-            {
-                result1.RemoveAllowedSection(s);
-            }
-
-            // now just re-add a couple
-            result1.AddAllowedSection("test3");
-            result1.AddAllowedSection("test4");
-            UserService.Save(result1);
-
-            // Assert
-            // re-get
-            result1 = UserService.GetUserGroupById(userGroup.Id);
-            Assert.AreEqual(2, result1.AllowedSections.Count());
-        }
-
-        [Test]
-        public void Can_Remove_Section_From_All_Assigned_UserGroups()
-        {
-            var userGroup1 = new UserGroup(ShortStringHelper)
-            {
-                Alias = "Group1",
-                Name = "Group 1"
-            };
-            var userGroup2 = new UserGroup(ShortStringHelper)
-            {
-                Alias = "Group2",
-                Name = "Group 2"
-            };
-            UserService.Save(userGroup1);
-            UserService.Save(userGroup2);
-
-            // adds some allowed sections
-            userGroup1.AddAllowedSection("test");
-            userGroup2.AddAllowedSection("test");
-            UserService.Save(userGroup1);
-            UserService.Save(userGroup2);
-
-            // now clear the section from all users
-            UserService.DeleteSectionFromAllUserGroups("test");
-
-            // Assert
-            IUserGroup result1 = UserService.GetUserGroupById(userGroup1.Id);
-            IUserGroup result2 = UserService.GetUserGroupById(userGroup2.Id);
-            Assert.IsFalse(result1.AllowedSections.Contains("test"));
-            Assert.IsFalse(result2.AllowedSections.Contains("test"));
-        }
-
-        [Test]
-        public void Can_Add_Section_To_All_UserGroups()
-        {
-            var userGroup1 = new UserGroup(ShortStringHelper)
-            {
-                Alias = "Group1",
-                Name = "Group 1"
-            };
-            userGroup1.AddAllowedSection("test");
-
-            var userGroup2 = new UserGroup(ShortStringHelper)
-            {
-                Alias = "Group2",
-                Name = "Group 2"
-            };
-            userGroup2.AddAllowedSection("test");
-
-            var userGroup3 = new UserGroup(ShortStringHelper)
-            {
-                Alias = "Group3",
-                Name = "Group 3"
-            };
-            UserService.Save(userGroup1);
-            UserService.Save(userGroup2);
-            UserService.Save(userGroup3);
-
-            // Assert
-            IUserGroup result1 = UserService.GetUserGroupById(userGroup1.Id);
-            IUserGroup result2 = UserService.GetUserGroupById(userGroup2.Id);
-            IUserGroup result3 = UserService.GetUserGroupById(userGroup3.Id);
-            Assert.IsTrue(result1.AllowedSections.Contains("test"));
-            Assert.IsTrue(result2.AllowedSections.Contains("test"));
-            Assert.IsFalse(result3.AllowedSections.Contains("test"));
-
-            // now add the section to all groups
-            foreach (UserGroup userGroup in new[] { userGroup1, userGroup2, userGroup3 })
-            {
-                userGroup.AddAllowedSection("test");
-                UserService.Save(userGroup);
-            }
-
-            // Assert
-            result1 = UserService.GetUserGroupById(userGroup1.Id);
-            result2 = UserService.GetUserGroupById(userGroup2.Id);
-            result3 = UserService.GetUserGroupById(userGroup3.Id);
-            Assert.IsTrue(result1.AllowedSections.Contains("test"));
-            Assert.IsTrue(result2.AllowedSections.Contains("test"));
-            Assert.IsTrue(result3.AllowedSections.Contains("test"));
-        }
-
-        [Test]
-        public void Cannot_Create_User_With_Empty_Username()
-        {
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => UserService.CreateUserWithIdentity(string.Empty, "john@umbraco.io"));
-        }
-
-        [Test]
-        public void Cannot_Save_User_With_Empty_Username()
-        {
-            // Arrange
-            IUser user = UserService.CreateUserWithIdentity("John Doe", "john@umbraco.io");
-            user.Username = string.Empty;
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => UserService.Save(user));
-        }
-
-        [Test]
-        public void Cannot_Save_User_With_Empty_Name()
-        {
-            // Arrange
-            IUser user = UserService.CreateUserWithIdentity("John Doe", "john@umbraco.io");
-            user.Name = string.Empty;
-
-            // Act & Assert
-            Assert.Throws<ArgumentException>(() => UserService.Save(user));
-        }
-
-        [Test]
-        public void Get_By_Profile_Username()
-        {
-            // Arrange
-            IUser user = UserService.CreateUserWithIdentity("test1", "test1@test.com");
-
-            // Act
-            IProfile profile = UserService.GetProfileByUserName(user.Username);
-
-            // Assert
-            Assert.IsNotNull(profile);
-            Assert.AreEqual(user.Username, profile.Name);
-            Assert.AreEqual(user.Id, profile.Id);
-        }
-
-        [Test]
-        public void Get_By_Profile_Id()
-        {
-            // Arrange
-            IUser user = UserService.CreateUserWithIdentity("test1", "test1@test.com");
-
-            // Act
-            IProfile profile = UserService.GetProfileById((int)user.Id);
-
-            // Assert
-            Assert.IsNotNull(profile);
-            Assert.AreEqual(user.Username, profile.Name);
-            Assert.AreEqual(user.Id, profile.Id);
-        }
-
-        [Test]
-        public void Get_By_Profile_Id_Must_Return_Null_If_User_Does_Not_Exist()
-        {
-            IProfile profile = UserService.GetProfileById(42);
-
-            // Assert
-            Assert.IsNull(profile);
-        }
-
-        [Test]
-        public void GetProfilesById_Must_Return_Empty_If_User_Does_Not_Exist()
-        {
-            IEnumerable<IProfile> profiles = UserService.GetProfilesById(42);
-
-            // Assert
-            CollectionAssert.IsEmpty(profiles);
-        }
-
-        [Test]
-        public void Get_User_By_Username()
-        {
-            // Arrange
-            IUser originalUser = CreateTestUser(out _);
-
-            // Act
-            var updatedItem = (User)UserService.GetByUsername(originalUser.Username);
-
-            // Assert
-            Assert.IsNotNull(updatedItem);
-            Assert.That(updatedItem.Id, Is.EqualTo(originalUser.Id));
-            Assert.That(updatedItem.Name, Is.EqualTo(originalUser.Name));
-            Assert.That(updatedItem.Language, Is.EqualTo(originalUser.Language));
-            Assert.That(updatedItem.IsApproved, Is.EqualTo(originalUser.IsApproved));
-            Assert.That(updatedItem.RawPasswordValue, Is.EqualTo(originalUser.RawPasswordValue));
-            Assert.That(updatedItem.IsLockedOut, Is.EqualTo(originalUser.IsLockedOut));
-            Assert.IsTrue(updatedItem.StartContentIds.UnsortedSequenceEqual(originalUser.StartContentIds));
-            Assert.IsTrue(updatedItem.StartMediaIds.UnsortedSequenceEqual(originalUser.StartMediaIds));
-            Assert.That(updatedItem.Email, Is.EqualTo(originalUser.Email));
-            Assert.That(updatedItem.Username, Is.EqualTo(originalUser.Username));
-            Assert.That(updatedItem.AllowedSections.Count(), Is.EqualTo(originalUser.AllowedSections.Count()));
-        }
-
-        [Test]
-        public void Can_Get_Assigned_StartNodes_For_User()
-        {
-            Content[] startContentItems = BuildContentItems(3);
-
-            UserGroup testUserGroup = CreateTestUserGroup();
-
-            int userGroupId = testUserGroup.Id;
-
-            CreateTestUsers(startContentItems.Select(x => x.Id).ToArray(), testUserGroup, 3);
-
-            IEnumerable<IUser> usersInGroup = UserService.GetAllInGroup(userGroupId);
-
-            foreach (IUser user in usersInGroup)
-            {
-                Assert.AreEqual(user.StartContentIds.Length, startContentItems.Length);
-            }
-        }
-
-        private Content[] BuildContentItems(int numberToCreate)
-        {
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            FileService.SaveTemplate(template);
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
-            ContentTypeService.Save(contentType);
-
-            var startContentItems = new List<Content>();
-
-            for (int i = 0; i < numberToCreate; i++)
-            {
-                startContentItems.Add(ContentBuilder.CreateSimpleContent(contentType));
-            }
-
-            ContentService.Save(startContentItems);
-
-            return startContentItems.ToArray();
-        }
-
-        private IUser CreateTestUser(out IUserGroup userGroup)
-        {
-            userGroup = CreateTestUserGroup();
-
-            IUser user = UserService.CreateUserWithIdentity("test1", "test1@test.com");
-
-            user.AddGroup(userGroup.ToReadOnlyGroup());
-
-            UserService.Save(user);
-
-            return user;
-        }
-
-        private List<IUser> CreateTestUsers(int[] startContentIds, IUserGroup userGroup, int numberToCreate)
-        {
-            var users = new List<IUser>();
-
-            for (int i = 0; i < numberToCreate; i++)
-            {
-                IUser user = UserService.CreateUserWithIdentity($"test{i}", $"test{i}@test.com");
-                user.AddGroup(userGroup.ToReadOnlyGroup());
-
-                var updateable = (User)user;
-                updateable.StartContentIds = startContentIds;
-
-                UserService.Save(user);
-
-                users.Add(user);
-            }
-
-            return users;
-        }
-
-        private UserGroup CreateTestUserGroup(string alias = "testGroup", string name = "Test Group")
-        {
-            string[] permissions = "ABCDEFGHIJ1234567".ToCharArray().Select(x => x.ToString()).ToArray();
-            UserGroup userGroup = UserGroupBuilder.CreateUserGroup(alias, name, permissions: permissions);
-
-            UserService.Save(userGroup);
-
-            return userGroup;
+            Assert.AreEqual(user.StartContentIds.Length, startContentItems.Length);
         }
     }
+
+    private Content[] BuildContentItems(int numberToCreate)
+    {
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        FileService.SaveTemplate(template);
+        var contentType = ContentTypeBuilder.CreateSimpleContentType(defaultTemplateId: template.Id);
+        ContentTypeService.Save(contentType);
+
+        var startContentItems = new List<Content>();
+
+        for (var i = 0; i < numberToCreate; i++)
+        {
+            startContentItems.Add(ContentBuilder.CreateSimpleContent(contentType));
+        }
+
+        ContentService.Save(startContentItems);
+
+        return startContentItems.ToArray();
+    }
+
+    private IUser CreateTestUser(out IUserGroup userGroup)
+    {
+        userGroup = CreateTestUserGroup();
+
+        var user = UserService.CreateUserWithIdentity("test1", "test1@test.com");
+
+        user.AddGroup(userGroup.ToReadOnlyGroup());
+
+        UserService.Save(user);
+
+        return user;
+    }
+
+    private List<IUser> CreateTestUsers(int[] startContentIds, IUserGroup userGroup, int numberToCreate)
+    {
+        var users = new List<IUser>();
+
+        for (var i = 0; i < numberToCreate; i++)
+        {
+            var user = UserService.CreateUserWithIdentity($"test{i}", $"test{i}@test.com");
+            user.AddGroup(userGroup.ToReadOnlyGroup());
+
+            var updateable = (User)user;
+            updateable.StartContentIds = startContentIds;
+
+            UserService.Save(user);
+
+            users.Add(user);
+        }
+
+        return users;
+    }
+
+    private UserGroup CreateTestUserGroup(string alias = "testGroup", string name = "Test Group")
+    {
+        var permissions = "ABCDEFGHIJ1234567".ToCharArray().Select(x => x.ToString()).ToArray();
+        var userGroup = UserGroupBuilder.CreateUserGroup(alias, name, permissions: permissions);
+
+        UserService.Save(userGroup);
+
+        return userGroup;
+    }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs
index 68dee932fa..fa14b4ed83 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/BackOfficeAssetsControllerTests.cs
@@ -2,28 +2,26 @@
 // See LICENSE for more details.
 
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Umbraco.Cms.Tests.Integration.TestServerTest;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
+
+[TestFixture]
+public class BackOfficeAssetsControllerTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class BackOfficeAssetsControllerTests : UmbracoTestServerTestBase
+    [Test]
+    public async Task EnsureSuccessStatusCode()
     {
-        [Test]
-        public async Task EnsureSuccessStatusCode()
-        {
-            // Arrange
-            string url = PrepareApiControllerUrl<BackOfficeAssetsController>(x => x.GetSupportedLocales());
+        // Arrange
+        var url = PrepareApiControllerUrl<BackOfficeAssetsController>(x => x.GetSupportedLocales());
 
-            // Act
-            HttpResponseMessage response = await Client.GetAsync(url);
+        // Act
+        var response = await Client.GetAsync(url);
 
-            // Assert
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-        }
+        // Assert
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
index ec5968e92d..011cd453d9 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
@@ -7,6 +7,7 @@ using System.Net.Http;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Services;
@@ -16,685 +17,635 @@ using Umbraco.Cms.Tests.Integration.TestServerTest;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Formatters;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
+
+[TestFixture]
+public class ContentControllerTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class ContentControllerTests : UmbracoTestServerTestBase
+    private const string UsIso = "en-US";
+    private const string DkIso = "da-DK";
+
+    /// <summary>
+    ///     Returns 404 if the content wasn't found based on the ID specified
+    /// </summary>
+    [Test]
+    public async Task PostSave_Validate_Existing_Content()
     {
-        private const string UsIso = "en-US";
-        private const string DkIso = "da-DK";
+        var localizationService = GetRequiredService<ILocalizationService>();
 
-        /// <summary>
-        ///     Returns 404 if the content wasn't found based on the ID specified
-        /// </summary>
-        [Test]
-        public async Task PostSave_Validate_Existing_Content()
+        // Add another language
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
+
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("Title")
+            .Done()
+            .WithContentVariation(ContentVariation.Nothing)
+            .Build();
+
+        contentTypeService.Save(contentType);
+
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithName("Invariant")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("title", "Cool invariant title")
+            .Done()
+            .Build();
+        contentService.SaveAndPublish(content);
+
+        var model = new ContentItemSaveBuilder()
+            .WithContent(content)
+            .WithId(-1337) // HERE We overwrite the Id, so we don't expect to find it on the server
+            .Build();
+
+        // Act
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
+
+        // Assert
+        Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
+        //// Assert.AreEqual(")]}',\n{\"Message\":\"content was not found\"}", response.Item1.Content.ReadAsStringAsync().Result);
+        ////
+        ////             //var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
+        ////             //Assert.AreEqual(0, obj.TotalItems);
+    }
+
+    [Test]
+    public async Task PostSave_Validate_At_Least_One_Variant_Flagged_For_Saving()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+
+        // Add another language
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
+
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("Title")
+            .Done()
+            .WithContentVariation(ContentVariation.Nothing)
+            .Build();
+
+        contentTypeService.Save(contentType);
+
+        var contentService = GetRequiredService<IContentService>();
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithName("Invariant")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("title", "Cool invariant title")
+            .Done()
+            .Build();
+        contentService.SaveAndPublish(content);
+
+        var model = new ContentItemSaveBuilder()
+            .WithContent(content)
+            .Build();
+
+        // HERE we force the test to fail
+        model.Variants = model.Variants.Select(x =>
         {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
+            x.Save = false;
+            return x;
+        });
 
-            // Add another language
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
+        // Act
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
 
-            string url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+        // Assert
+        var body = await response.Content.ReadAsStringAsync();
 
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("title")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("Title")
-                .Done()
-                .WithContentVariation(ContentVariation.Nothing)
-                .Build();
-
-            contentTypeService.Save(contentType);
-
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithName("Invariant")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("title", "Cool invariant title")
-                .Done()
-                .Build();
-            contentService.SaveAndPublish(content);
-
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(content)
-                .WithId(-1337) // HERE We overwrite the Id, so we don't expect to find it on the server
-                .Build();
-
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
-
-            // Assert
+        Assert.Multiple(() =>
+        {
             Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
-            //// Assert.AreEqual(")]}',\n{\"Message\":\"content was not found\"}", response.Item1.Content.ReadAsStringAsync().Result);
-            ////
-            ////             //var obj = JsonConvert.DeserializeObject<PagedResult<UserDisplay>>(response.Item2);
-            ////             //Assert.AreEqual(0, obj.TotalItems);
-        }
+            Assert.AreEqual(
+                AngularJsonMediaTypeFormatter.XsrfPrefix + "{\"Message\":\"No variants flagged for saving\"}", body);
+        });
+    }
 
-        [Test]
-        public async Task PostSave_Validate_At_Least_One_Variant_Flagged_For_Saving()
+    /// <summary>
+    ///     Returns 404 if any of the posted properties dont actually exist
+    /// </summary>
+    [Test]
+    public async Task PostSave_Validate_Properties_Exist()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+
+        // Add another language
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
+
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("Title")
+            .Done()
+            .WithContentVariation(ContentVariation.Nothing)
+            .Build();
+
+        contentTypeService.Save(contentType);
+
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithName("Invariant")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("title", "Cool invariant title")
+            .Done()
+            .Build();
+        contentService.SaveAndPublish(content);
+
+        var model = new ContentItemSaveBuilder()
+            .WithId(content.Id)
+            .WithContentTypeAlias(content.ContentType.Alias)
+            .AddVariant()
+            .AddProperty()
+            .WithId(2)
+            .WithAlias("doesntexists")
+            .WithValue("Whatever")
+            .Done()
+            .Done()
+            .Build();
+
+        // Act
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
+
+        // Assert
+        var body = await response.Content.ReadAsStringAsync();
+
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+
+        Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
+    }
+
+    [Test]
+    public async Task PostSave_Simple_Invariant()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+
+        // Add another language
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
+
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("Title")
+            .Done()
+            .WithContentVariation(ContentVariation.Nothing)
+            .Build();
+
+        contentTypeService.Save(contentType);
+
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithName("Invariant")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("title", "Cool invariant title")
+            .Done()
+            .Build();
+        contentService.SaveAndPublish(content);
+        var model = new ContentItemSaveBuilder()
+            .WithContent(content)
+            .Build();
+
+        // Act
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
+
+        // Assert
+        var body = await response.Content.ReadAsStringAsync();
+
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+
+        Assert.Multiple(() =>
         {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, body);
+            var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
+            Assert.AreEqual(1, display.Variants.Count());
+        });
+    }
 
-            // Add another language
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
+    [Test]
+    public async Task PostSave_Validate_Empty_Name()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
 
-            string url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+        // Add another language
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
 
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
 
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("title")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("Title")
-                .Done()
-                .WithContentVariation(ContentVariation.Nothing)
-                .Build();
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
 
-            contentTypeService.Save(contentType);
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("Title")
+            .Done()
+            .WithContentVariation(ContentVariation.Nothing)
+            .Build();
 
-            IContentService contentService = GetRequiredService<IContentService>();
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithName("Invariant")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("title", "Cool invariant title")
-                .Done()
-                .Build();
-            contentService.SaveAndPublish(content);
+        contentTypeService.Save(contentType);
 
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(content)
-                .Build();
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithName("Invariant")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("title", "Cool invariant title")
+            .Done()
+            .Build();
+        contentService.SaveAndPublish(content);
 
-            // HERE we force the test to fail
-            model.Variants = model.Variants.Select(x =>
-            {
-                x.Save = false;
-                return x;
-            });
+        content.Name = null; // Removes the name of one of the variants to force an error
+        var model = new ContentItemSaveBuilder()
+            .WithContent(content)
+            .Build();
 
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
+        // Act
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
 
-            // Assert
-            string body = await response.Content.ReadAsStringAsync();
+        // Assert
+        var body = await response.Content.ReadAsStringAsync();
 
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
-                Assert.AreEqual(AngularJsonMediaTypeFormatter.XsrfPrefix + "{\"Message\":\"No variants flagged for saving\"}", body);
-            });
-        }
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
 
-        /// <summary>
-        ///     Returns 404 if any of the posted properties dont actually exist
-        /// </summary>
-        [Test]
-        public async Task PostSave_Validate_Properties_Exist()
+        Assert.Multiple(() =>
         {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
+            Assert.AreEqual(HttpStatusCode.BadRequest, response.StatusCode);
+            var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
+            Assert.AreEqual(1, display.Errors.Count(), string.Join(",", display.Errors));
+            CollectionAssert.Contains(display.Errors.Keys, "Variants[0].Name");
+        });
+    }
 
-            // Add another language
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
+    [Test]
+    public async Task PostSave_Validate_Variants_Empty_Name()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
 
-            string url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+        // Add another language
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
 
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
 
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("title")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("Title")
-                .Done()
-                .WithContentVariation(ContentVariation.Nothing)
-                .Build();
+        var contentService = GetRequiredService<IContentService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
 
-            contentTypeService.Save(contentType);
+        var contentType = new ContentTypeBuilder()
+            .WithId(0)
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithValueStorageType(ValueStorageType.Integer)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithName("Title")
+            .Done()
+            .WithContentVariation(ContentVariation.Culture)
+            .Build();
 
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithName("Invariant")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("title", "Cool invariant title")
-                .Done()
-                .Build();
-            contentService.SaveAndPublish(content);
+        contentTypeService.Save(contentType);
 
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithId(content.Id)
-                .WithContentTypeAlias(content.ContentType.Alias)
-                .AddVariant()
-                    .AddProperty()
-                        .WithId(2)
-                        .WithAlias("doesntexists")
-                        .WithValue("Whatever")
-                        .Done()
-                    .Done()
-                .Build();
+        var content = new ContentBuilder()
+            .WithId(0)
+            .WithCultureName(UsIso, "English")
+            .WithCultureName(DkIso, "Danish")
+            .WithContentType(contentType)
+            .AddPropertyData()
+            .WithKeyValue("title", "Cool invariant title")
+            .Done()
+            .Build();
+        contentService.SaveAndPublish(content);
 
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
+        content.CultureInfos[0].Name = null; // Removes the name of one of the variants to force an error
+        var model = new ContentItemSaveBuilder()
+            .WithContent(content)
+            .Build();
 
-            // Assert
-            string body = await response.Content.ReadAsStringAsync();
+        // Act
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
 
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-            Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
-        }
-
-        [Test]
-        public async Task PostSave_Simple_Invariant()
+        // Assert
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        Assert.Multiple(() =>
         {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
+            Assert.AreEqual(HttpStatusCode.BadRequest, response.StatusCode);
+            var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
+            Assert.AreEqual(2, display.Errors.Count());
+            CollectionAssert.Contains(display.Errors.Keys, "Variants[0].Name");
+            CollectionAssert.Contains(display.Errors.Keys, "_content_variant_en-US_null_");
+        });
+    }
 
-            // Add another language
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
+    [Test]
+    public async Task PostSave_Validates_Domains_Exist()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
 
-            string url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
+        contentTypeService.Save(contentType);
 
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
+        var content = new ContentBuilder()
+            .WithId(1)
+            .WithContentType(contentType)
+            .WithCultureName(UsIso, "Root")
+            .WithCultureName(DkIso, "Rod")
+            .Build();
 
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("title")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("Title")
-                .Done()
-                .WithContentVariation(ContentVariation.Nothing)
-                .Build();
+        var model = new ContentItemSaveBuilder()
+            .WithContent(content)
+            .WithAction(ContentSaveAction.PublishNew)
+            .Build();
 
-            contentTypeService.Save(contentType);
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
 
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithName("Invariant")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("title", "Cool invariant title")
-                .Done()
-                .Build();
-            contentService.SaveAndPublish(content);
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(content)
-                .Build();
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
 
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
 
-            // Assert
-            string body = await response.Content.ReadAsStringAsync();
+        var localizedTextService = GetRequiredService<ILocalizedTextService>();
+        var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithNoDomains");
 
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode, body);
-                ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-                Assert.AreEqual(1, display.Variants.Count());
-            });
-        }
-
-        [Test]
-        public async Task PostSave_Validate_Empty_Name()
+        Assert.Multiple(() =>
         {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
+            Assert.IsNotNull(display);
+            Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+            Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
+        });
+    }
 
-            // Add another language
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
+    [Test]
+    public async Task PostSave_Validates_All_Ancestor_Cultures_Are_Considered()
+    {
+        var sweIso = "sv-SE";
+        var localizationService = GetRequiredService<ILocalizationService>();
+        //Create 2 new languages
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
 
-            string url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(sweIso)
+            .WithIsDefault(false)
+            .Build());
 
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
+        contentTypeService.Save(contentType);
 
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("title")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("Title")
-                .Done()
-                .WithContentVariation(ContentVariation.Nothing)
-                .Build();
+        var content = new ContentBuilder()
+            .WithoutIdentity()
+            .WithContentType(contentType)
+            .WithCultureName(UsIso, "Root")
+            .Build();
 
-            contentTypeService.Save(contentType);
+        var contentService = GetRequiredService<IContentService>();
+        contentService.SaveAndPublish(content);
 
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithName("Invariant")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("title", "Cool invariant title")
-                .Done()
-                .Build();
-            contentService.SaveAndPublish(content);
+        var childContent = new ContentBuilder()
+            .WithoutIdentity()
+            .WithContentType(contentType)
+            .WithParent(content)
+            .WithCultureName(DkIso, "Barn")
+            .WithCultureName(UsIso, "Child")
+            .Build();
 
-            content.Name = null; // Removes the name of one of the variants to force an error
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(content)
-                .Build();
+        contentService.SaveAndPublish(childContent);
 
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
+        var grandChildContent = new ContentBuilder()
+            .WithoutIdentity()
+            .WithContentType(contentType)
+            .WithParent(childContent)
+            .WithCultureName(sweIso, "Bjarn")
+            .Build();
 
-            // Assert
-            string body = await response.Content.ReadAsStringAsync();
 
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        var model = new ContentItemSaveBuilder()
+            .WithContent(grandChildContent)
+            .WithParentId(childContent.Id)
+            .WithAction(ContentSaveAction.PublishNew)
+            .Build();
 
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.BadRequest, response.StatusCode);
-                ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-                Assert.AreEqual(1, display.Errors.Count(), string.Join(",", display.Errors));
-                CollectionAssert.Contains(display.Errors.Keys, "Variants[0].Name");
-            });
-        }
+        var enLanguage = localizationService.GetLanguageByIsoCode(UsIso);
+        var domainService = GetRequiredService<IDomainService>();
+        var enDomain = new UmbracoDomain("/en") { RootContentId = content.Id, LanguageId = enLanguage.Id };
+        domainService.Save(enDomain);
 
-        [Test]
-        public async Task PostSave_Validate_Variants_Empty_Name()
+        var dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
+        var dkDomain = new UmbracoDomain("/dk") { RootContentId = childContent.Id, LanguageId = dkLanguage.Id };
+        domainService.Save(dkDomain);
+
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+
+        var result = JsonConvert.SerializeObject(model);
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
+
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
+
+
+        var localizedTextService = GetRequiredService<ILocalizedTextService>();
+        var expectedMessage =
+            localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] { "sv-SE" });
+
+        Assert.Multiple(() =>
         {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
+            Assert.NotNull(display);
+            Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+            Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
+        });
+    }
 
-            // Add another language
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
+    [Test]
+    public async Task PostSave_Validates_All_Cultures_Has_Domains()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
 
-            string url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
+        contentTypeService.Save(contentType);
 
-            IContentService contentService = GetRequiredService<IContentService>();
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
+        var content = new ContentBuilder()
+            .WithoutIdentity()
+            .WithContentType(contentType)
+            .WithCultureName(UsIso, "Root")
+            .WithCultureName(DkIso, "Rod")
+            .Build();
 
-            IContentType contentType = new ContentTypeBuilder()
-                .WithId(0)
-                .AddPropertyType()
-                .WithAlias("title")
-                .WithValueStorageType(ValueStorageType.Integer)
-                .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                .WithName("Title")
-                .Done()
-                .WithContentVariation(ContentVariation.Culture)
-                .Build();
+        var contentService = GetRequiredService<IContentService>();
+        contentService.Save(content);
 
-            contentTypeService.Save(contentType);
+        var model = new ContentItemSaveBuilder()
+            .WithContent(content)
+            .WithAction(ContentSaveAction.Publish)
+            .Build();
 
-            Content content = new ContentBuilder()
-                .WithId(0)
-                .WithCultureName(UsIso, "English")
-                .WithCultureName(DkIso, "Danish")
-                .WithContentType(contentType)
-                .AddPropertyData()
-                .WithKeyValue("title", "Cool invariant title")
-                .Done()
-                .Build();
-            contentService.SaveAndPublish(content);
+        var dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
+        var domainService = GetRequiredService<IDomainService>();
+        var dkDomain = new UmbracoDomain("/") { RootContentId = content.Id, LanguageId = dkLanguage.Id };
+        domainService.Save(dkDomain);
 
-            content.CultureInfos[0].Name = null; // Removes the name of one of the variants to force an error
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(content)
-                .Build();
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
 
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
 
-            // Assert
-            string body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.BadRequest, response.StatusCode);
-                ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-                Assert.AreEqual(2, display.Errors.Count());
-                CollectionAssert.Contains(display.Errors.Keys, "Variants[0].Name");
-                CollectionAssert.Contains(display.Errors.Keys, "_content_variant_en-US_null_");
-            });
-        }
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
 
-        [Test]
-        public async Task PostSave_Validates_Domains_Exist()
+
+        var localizedTextService = GetRequiredService<ILocalizedTextService>();
+        var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] { UsIso });
+
+        Assert.Multiple(() =>
         {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
+            Assert.NotNull(display);
+            Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+            Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
+        });
+    }
 
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-            IContentType contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-            contentTypeService.Save(contentType);
+    [Test]
+    public async Task PostSave_Checks_Ancestors_For_Domains()
+    {
+        var localizationService = GetRequiredService<ILocalizationService>();
+        localizationService.Save(new LanguageBuilder()
+            .WithCultureInfo(DkIso)
+            .WithIsDefault(false)
+            .Build());
 
-            Content content = new ContentBuilder()
-                .WithId(1)
-                .WithContentType(contentType)
-                .WithCultureName(UsIso, "Root")
-                .WithCultureName(DkIso, "Rod")
-                .Build();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+        var contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
+        contentTypeService.Save(contentType);
 
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(content)
-                .WithAction(ContentSaveAction.PublishNew)
-                .Build();
+        var rootNode = new ContentBuilder()
+            .WithoutIdentity()
+            .WithContentType(contentType)
+            .WithCultureName(UsIso, "Root")
+            .WithCultureName(DkIso, "Rod")
+            .Build();
 
-            var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+        var contentService = GetRequiredService<IContentService>();
+        contentService.SaveAndPublish(rootNode);
 
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
+        var childNode = new ContentBuilder()
+            .WithoutIdentity()
+            .WithParent(rootNode)
+            .WithContentType(contentType)
+            .WithCultureName(DkIso, "Barn")
+            .WithCultureName(UsIso, "Child")
+            .Build();
 
-            var body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
+        contentService.SaveAndPublish(childNode);
 
-            ILocalizedTextService localizedTextService = GetRequiredService<ILocalizedTextService>();
-            var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithNoDomains");
+        var grandChild = new ContentBuilder()
+            .WithoutIdentity()
+            .WithParent(childNode)
+            .WithContentType(contentType)
+            .WithCultureName(DkIso, "BarneBarn")
+            .WithCultureName(UsIso, "GrandChild")
+            .Build();
 
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(display);
-                Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-                Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
-            });
-        }
+        contentService.Save(grandChild);
 
-        [Test]
-        public async Task PostSave_Validates_All_Ancestor_Cultures_Are_Considered()
+        var dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
+        var usLanguage = localizationService.GetLanguageByIsoCode(UsIso);
+        var domainService = GetRequiredService<IDomainService>();
+        var dkDomain = new UmbracoDomain("/") { RootContentId = rootNode.Id, LanguageId = dkLanguage.Id };
+
+        var usDomain = new UmbracoDomain("/en") { RootContentId = childNode.Id, LanguageId = usLanguage.Id };
+
+        domainService.Save(dkDomain);
+        domainService.Save(usDomain);
+
+        var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
+
+        var model = new ContentItemSaveBuilder()
+            .WithContent(grandChild)
+            .WithAction(ContentSaveAction.Publish)
+            .Build();
+
+        var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
+
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        var display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
+
+        Assert.Multiple(() =>
         {
-            var sweIso = "sv-SE";
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            //Create 2 new languages
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
-
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(sweIso)
-                .WithIsDefault(false)
-                .Build());
-
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-            IContentType contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-            contentTypeService.Save(contentType);
-
-            Content content = new ContentBuilder()
-                .WithoutIdentity()
-                .WithContentType(contentType)
-                .WithCultureName(UsIso, "Root")
-                .Build();
-
-            IContentService contentService = GetRequiredService<IContentService>();
-            contentService.SaveAndPublish(content);
-
-            Content childContent = new ContentBuilder()
-                .WithoutIdentity()
-                .WithContentType(contentType)
-                .WithParent(content)
-                .WithCultureName(DkIso, "Barn")
-                .WithCultureName(UsIso, "Child")
-                .Build();
-
-            contentService.SaveAndPublish(childContent);
-
-            Content grandChildContent = new ContentBuilder()
-                .WithoutIdentity()
-                .WithContentType(contentType)
-                .WithParent(childContent)
-                .WithCultureName(sweIso, "Bjarn")
-                .Build();
-
-
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(grandChildContent)
-                .WithParentId(childContent.Id)
-                .WithAction(ContentSaveAction.PublishNew)
-                .Build();
-
-            ILanguage enLanguage = localizationService.GetLanguageByIsoCode(UsIso);
-            IDomainService domainService = GetRequiredService<IDomainService>();
-            var enDomain = new UmbracoDomain("/en")
-            {
-                RootContentId = content.Id,
-                LanguageId = enLanguage.Id
-            };
-            domainService.Save(enDomain);
-
-            ILanguage dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
-            var dkDomain = new UmbracoDomain("/dk")
-            {
-                RootContentId = childContent.Id,
-                LanguageId = dkLanguage.Id
-            };
-            domainService.Save(dkDomain);
-
-            var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-            var result = JsonConvert.SerializeObject(model);
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
-
-            var body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-
-
-            ILocalizedTextService localizedTextService = GetRequiredService<ILocalizedTextService>();
-            var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new []{"sv-SE"});
-
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(display);
-                Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-                Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
-            });
-        }
-
-        [Test]
-        public async Task PostSave_Validates_All_Cultures_Has_Domains()
-        {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
-
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-            IContentType contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-            contentTypeService.Save(contentType);
-
-            Content content = new ContentBuilder()
-                .WithoutIdentity()
-                .WithContentType(contentType)
-                .WithCultureName(UsIso, "Root")
-                .WithCultureName(DkIso, "Rod")
-                .Build();
-
-            IContentService contentService = GetRequiredService<IContentService>();
-            contentService.Save(content);
-
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(content)
-                .WithAction(ContentSaveAction.Publish)
-                .Build();
-
-            ILanguage dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
-            IDomainService domainService = GetRequiredService<IDomainService>();
-            var dkDomain = new UmbracoDomain("/")
-            {
-                RootContentId = content.Id,
-                LanguageId = dkLanguage.Id
-            };
-            domainService.Save(dkDomain);
-
-            var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
-
-            var body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-
-
-            ILocalizedTextService localizedTextService = GetRequiredService<ILocalizedTextService>();
-            var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new []{UsIso});
-
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(display);
-                Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-                Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
-            });
-        }
-
-        [Test]
-        public async Task PostSave_Checks_Ancestors_For_Domains()
-        {
-            ILocalizationService localizationService = GetRequiredService<ILocalizationService>();
-            localizationService.Save(new LanguageBuilder()
-                .WithCultureInfo(DkIso)
-                .WithIsDefault(false)
-                .Build());
-
-            IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-            IContentType contentType = new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
-            contentTypeService.Save(contentType);
-
-            Content rootNode = new ContentBuilder()
-                .WithoutIdentity()
-                .WithContentType(contentType)
-                .WithCultureName(UsIso, "Root")
-                .WithCultureName(DkIso, "Rod")
-                .Build();
-
-            IContentService contentService = GetRequiredService<IContentService>();
-            contentService.SaveAndPublish(rootNode);
-
-            Content childNode = new ContentBuilder()
-                .WithoutIdentity()
-                .WithParent(rootNode)
-                .WithContentType(contentType)
-                .WithCultureName(DkIso, "Barn")
-                .WithCultureName(UsIso, "Child")
-                .Build();
-
-            contentService.SaveAndPublish(childNode);
-
-            Content grandChild = new ContentBuilder()
-                .WithoutIdentity()
-                .WithParent(childNode)
-                .WithContentType(contentType)
-                .WithCultureName(DkIso, "BarneBarn")
-                .WithCultureName(UsIso, "GrandChild")
-                .Build();
-
-            contentService.Save(grandChild);
-
-            ILanguage dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
-            ILanguage usLanguage = localizationService.GetLanguageByIsoCode(UsIso);
-            IDomainService domainService = GetRequiredService<IDomainService>();
-            var dkDomain = new UmbracoDomain("/")
-            {
-                RootContentId = rootNode.Id,
-                LanguageId = dkLanguage.Id
-            };
-
-            var usDomain = new UmbracoDomain("/en")
-            {
-                RootContentId = childNode.Id,
-                LanguageId = usLanguage.Id
-            };
-
-            domainService.Save(dkDomain);
-            domainService.Save(usDomain);
-
-            var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
-
-            ContentItemSave model = new ContentItemSaveBuilder()
-                .WithContent(grandChild)
-                .WithAction(ContentSaveAction.Publish)
-                .Build();
-
-            HttpResponseMessage response = await Client.PostAsync(url, new MultipartFormDataContent
-            {
-                { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
-            });
-
-            var body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
-
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(display);
-                // Assert all is good, a success notification for each culture published and no warnings.
-                Assert.AreEqual(2, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Success));
-                Assert.AreEqual(0, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-            });
-        }
+            Assert.NotNull(display);
+            // Assert all is good, a success notification for each culture published and no warnings.
+            Assert.AreEqual(2, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Success));
+            Assert.AreEqual(0, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/DataTypeControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/DataTypeControllerTests.cs
index 059d6d15c8..80ededff93 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/DataTypeControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/DataTypeControllerTests.cs
@@ -1,4 +1,3 @@
-using System.Net.Http;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
@@ -22,20 +21,20 @@ public class DataTypeControllerTests : UmbracoTestServerTestBase
     [TestCase(false)]
     public async Task Has_Values_Returns_Correct_Values(bool expectHasValues)
     {
-        IDataTypeService dataTypeService = GetRequiredService<IDataTypeService>();
-        IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-        IContentService contentService = GetRequiredService<IContentService>();
-        IJsonSerializer serializer = GetRequiredService<IJsonSerializer>();
+        var dataTypeService = GetRequiredService<IDataTypeService>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+        var contentService = GetRequiredService<IContentService>();
+        var serializer = GetRequiredService<IJsonSerializer>();
 
         var dataType = new DataTypeBuilder()
             .WithId(0)
             .WithoutIdentity()
             .WithDatabaseType(ValueStorageType.Ntext)
             .Build();
-        
+
         dataTypeService.Save(dataType);
 
-        IContentType contentType = new ContentTypeBuilder()
+        var contentType = new ContentTypeBuilder()
             .WithId(0)
             .AddPropertyType()
             .WithDataTypeId(dataType.Id)
@@ -49,7 +48,7 @@ public class DataTypeControllerTests : UmbracoTestServerTestBase
 
         if (expectHasValues)
         {
-            Content content = new ContentBuilder()
+            var content = new ContentBuilder()
                 .WithId(0)
                 .WithContentType(contentType)
                 .AddPropertyData()
@@ -60,11 +59,11 @@ public class DataTypeControllerTests : UmbracoTestServerTestBase
             contentService.Save(content);
         }
 
-        string url = PrepareApiControllerUrl<DataTypeController>(x => x.HasValues(dataType.Id));
+        var url = PrepareApiControllerUrl<DataTypeController>(x => x.HasValues(dataType.Id));
 
-        HttpResponseMessage response = await Client.GetAsync(url);
+        var response = await Client.GetAsync(url);
 
-        string body = await response.Content.ReadAsStringAsync();
+        var body = await response.Content.ReadAsStringAsync();
         body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
 
         var result = serializer.Deserialize<DataTypeHasValuesDisplay>(body);
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/EntityControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/EntityControllerTests.cs
index ecbd8d52aa..52dd930ac5 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/EntityControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/EntityControllerTests.cs
@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
@@ -17,470 +16,380 @@ using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Formatters;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
+
+[TestFixture]
+public class EntityControllerTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class EntityControllerTests : UmbracoTestServerTestBase
+    private IScopeProvider ScopeProvider => GetRequiredService<IScopeProvider>();
+
+    [Test]
+    public async Task GetUrlsByIds_MediaWithIntegerIds_ReturnsValidMap()
     {
-        private IScopeProvider ScopeProvider => GetRequiredService<IScopeProvider>();
+        var mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
+        var mediaService = Services.GetRequiredService<IMediaService>();
 
-        [Test]
-        public async Task GetUrlsByIds_MediaWithIntegerIds_ReturnsValidMap()
+        var mediaItems = new List<Media>();
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
         {
-            IMediaTypeService mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
-            IMediaService mediaService = Services.GetRequiredService<IMediaService>();
+            var mediaType = mediaTypeService.Get("image");
+            mediaTypeService.Save(mediaType);
 
-            var mediaItems = new List<Media>();
+            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
+            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
 
-            using (ScopeProvider.CreateScope(autoComplete: true))
+            foreach (var media in mediaItems)
             {
-                IMediaType mediaType = mediaTypeService.Get("image");
-                mediaTypeService.Save(mediaType);
-
-                mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType,  -1));
-                mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-
-                foreach (Media media in mediaItems)
-                {
-                    mediaService.Save(media);
-                }
+                mediaService.Save(media);
             }
-
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Media
-            };
-
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-            var payload = new
-            {
-                ids = new[]
-                {
-                    mediaItems[0].Id,
-                    mediaItems[1].Id,
-                }
-            };
-
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-            IDictionary<int, string> results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
-                Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
-            });
         }
 
-        [Test]
-        public async Task GetUrlsByIds_Media_ReturnsEmptyStringsInMapForUnknownItems()
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
+
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+
+        var payload = new { ids = new[] { mediaItems[0].Id, mediaItems[1].Id } };
+
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
+
+        Assert.Multiple(() =>
         {
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Media
-            };
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
+            Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
+        });
+    }
 
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+    [Test]
+    public async Task GetUrlsByIds_Media_ReturnsEmptyStringsInMapForUnknownItems()
+    {
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
 
-            var payload = new
-            {
-                ids = new[] { 1, 2 }
-            };
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
 
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+        var payload = new { ids = new[] { 1, 2 } };
 
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
 
-            IDictionary<int, string> results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
 
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.That(results!.Keys.Count, Is.EqualTo(2));
-                Assert.AreEqual(results![payload.ids[0]], string.Empty);
-            });
-        }
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
 
-        [Test]
-        public async Task GetUrlsByIds_MediaWithGuidIds_ReturnsValidMap()
+        Assert.Multiple(() =>
         {
-            IMediaTypeService mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
-            IMediaService mediaService = Services.GetRequiredService<IMediaService>();
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.That(results!.Keys.Count, Is.EqualTo(2));
+            Assert.AreEqual(results![payload.ids[0]], string.Empty);
+        });
+    }
 
-            var mediaItems = new List<Media>();
+    [Test]
+    public async Task GetUrlsByIds_MediaWithGuidIds_ReturnsValidMap()
+    {
+        var mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
+        var mediaService = Services.GetRequiredService<IMediaService>();
 
-            using (ScopeProvider.CreateScope(autoComplete: true))
+        var mediaItems = new List<Media>();
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
+        {
+            var mediaType = mediaTypeService.Get("image");
+            mediaTypeService.Save(mediaType);
+
+            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
+            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
+
+            foreach (var media in mediaItems)
             {
-                IMediaType mediaType = mediaTypeService.Get("image");
-                mediaTypeService.Save(mediaType);
-
-                mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-                mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-
-                foreach (Media media in mediaItems)
-                {
-                    mediaService.Save(media);
-                }
+                mediaService.Save(media);
             }
-
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Media
-            };
-
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-            var payload = new
-            {
-                ids = new[]
-                {
-                    mediaItems[0].Key.ToString(),
-                    mediaItems[1].Key.ToString(),
-                }
-            };
-
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-            IDictionary<string, string> results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
-                Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
-            });
         }
 
-        [Test]
-        public async Task GetUrlsByIds_MediaWithUdiIds_ReturnsValidMap()
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
+
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+
+        var payload = new { ids = new[] { mediaItems[0].Key.ToString(), mediaItems[1].Key.ToString() } };
+
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
+
+        Assert.Multiple(() =>
         {
-            IMediaTypeService mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
-            IMediaService mediaService = Services.GetRequiredService<IMediaService>();
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
+            Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
+        });
+    }
 
-            var mediaItems = new List<Media>();
+    [Test]
+    public async Task GetUrlsByIds_MediaWithUdiIds_ReturnsValidMap()
+    {
+        var mediaTypeService = Services.GetRequiredService<IMediaTypeService>();
+        var mediaService = Services.GetRequiredService<IMediaService>();
 
-            using (ScopeProvider.CreateScope(autoComplete: true))
+        var mediaItems = new List<Media>();
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
+        {
+            var mediaType = mediaTypeService.Get("image");
+            mediaTypeService.Save(mediaType);
+
+            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
+            mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
+
+            foreach (var media in mediaItems)
             {
-                IMediaType mediaType = mediaTypeService.Get("image");
-                mediaTypeService.Save(mediaType);
-
-                mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-                mediaItems.Add(MediaBuilder.CreateMediaImage(mediaType, -1));
-
-                foreach (Media media in mediaItems)
-                {
-                    mediaService.Save(media);
-                }
+                mediaService.Save(media);
             }
-
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Media
-            };
-
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-            var payload = new
-            {
-                ids = new[]
-                {
-                    mediaItems[0].GetUdi().ToString(),
-                    mediaItems[1].GetUdi().ToString(),
-                }
-            };
-
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-            IDictionary<string, string> results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
-                Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
-            });
         }
 
-        [Test]
-        public async Task GetUrlsByIds_Documents_ReturnsHashesInMapForUnknownItems()
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Media };
+
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+
+        var payload = new { ids = new[] { mediaItems[0].GetUdi().ToString(), mediaItems[1].GetUdi().ToString() } };
+
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
+
+        Assert.Multiple(() =>
         {
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Document
-            };
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.IsTrue(results![payload.ids[0]].StartsWith("/media"));
+            Assert.IsTrue(results![payload.ids[1]].StartsWith("/media"));
+        });
+    }
 
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+    [Test]
+    public async Task GetUrlsByIds_Documents_ReturnsHashesInMapForUnknownItems()
+    {
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
 
-            var payload = new
-            {
-                ids = new[] { 1, 2 }
-            };
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
 
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+        var payload = new { ids = new[] { 1, 2 } };
 
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
 
-            IDictionary<int, string> results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
 
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.That(results!.Keys.Count, Is.EqualTo(2));
-                Assert.AreEqual(results![payload.ids[0]], "#");
-            });
-        }
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
 
-        [Test]
-        public async Task GetUrlsByIds_DocumentWithIntIds_ReturnsValidMap()
+        Assert.Multiple(() =>
         {
-            IContentTypeService contentTypeService = Services.GetRequiredService<IContentTypeService>();
-            IContentService contentService = Services.GetRequiredService<IContentService>();
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.That(results!.Keys.Count, Is.EqualTo(2));
+            Assert.AreEqual(results![payload.ids[0]], "#");
+        });
+    }
 
-            var contentItems = new List<IContent>();
+    [Test]
+    public async Task GetUrlsByIds_DocumentWithIntIds_ReturnsValidMap()
+    {
+        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
+        var contentService = Services.GetRequiredService<IContentService>();
 
-            using (ScopeProvider.CreateScope(autoComplete: true))
+        var contentItems = new List<IContent>();
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
+        {
+            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
+            contentTypeService.Save(contentType);
+
+            var builder = new ContentBuilder()
+                .WithContentType(contentType);
+
+            var root = builder.WithName("foo").Build();
+            contentService.SaveAndPublish(root);
+
+            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
+            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
+
+            foreach (var content in contentItems)
             {
-                IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-                contentTypeService.Save(contentType);
-
-                ContentBuilder builder = new ContentBuilder()
-                    .WithContentType(contentType);
-
-                Content root = builder.WithName("foo").Build();
-                contentService.SaveAndPublish(root);
-
-                contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-                contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-                foreach (IContent content in contentItems)
-                {
-                    contentService.SaveAndPublish(content);
-                }
+                contentService.SaveAndPublish(content);
             }
-
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Document
-            };
-
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-            var payload = new
-            {
-                ids = new[]
-                {
-                    contentItems[0].Id,
-                    contentItems[1].Id,
-                }
-            };
-
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-            IDictionary<int, string> results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
-                Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
-            });
         }
 
-        [Test]
-        public async Task GetUrlsByIds_DocumentWithGuidIds_ReturnsValidMap()
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
+
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+
+        var payload = new { ids = new[] { contentItems[0].Id, contentItems[1].Id } };
+
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<int, string>>();
+
+        Assert.Multiple(() =>
         {
-            IContentTypeService contentTypeService = Services.GetRequiredService<IContentTypeService>();
-            IContentService contentService = Services.GetRequiredService<IContentService>();
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
+            Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
+        });
+    }
 
-            var contentItems = new List<IContent>();
+    [Test]
+    public async Task GetUrlsByIds_DocumentWithGuidIds_ReturnsValidMap()
+    {
+        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
+        var contentService = Services.GetRequiredService<IContentService>();
 
-            using (ScopeProvider.CreateScope(autoComplete: true))
-            {
-                IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-                contentTypeService.Save(contentType);
+        var contentItems = new List<IContent>();
 
-                ContentBuilder builder = new ContentBuilder()
-                    .WithContentType(contentType);
-
-                Content root = builder.WithName("foo").Build();
-                contentService.SaveAndPublish(root);
-
-                contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-                contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-                foreach (IContent content in contentItems)
-                {
-                    contentService.SaveAndPublish(content);
-                }
-            }
-
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Document
-            };
-
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-            var payload = new
-            {
-                ids = new[]
-                {
-                    contentItems[0].Key.ToString(),
-                    contentItems[1].Key.ToString(),
-                }
-            };
-
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-            IDictionary<string, string> results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
-                Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
-            });
-        }
-
-        [Test]
-        public async Task GetUrlsByIds_DocumentWithUdiIds_ReturnsValidMap()
+        using (ScopeProvider.CreateScope(autoComplete: true))
         {
-            IContentTypeService contentTypeService = Services.GetRequiredService<IContentTypeService>();
-            IContentService contentService = Services.GetRequiredService<IContentService>();
+            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
+            contentTypeService.Save(contentType);
 
-            var contentItems = new List<IContent>();
+            var builder = new ContentBuilder()
+                .WithContentType(contentType);
 
-            using (ScopeProvider.CreateScope(autoComplete: true))
+            var root = builder.WithName("foo").Build();
+            contentService.SaveAndPublish(root);
+
+            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
+            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
+
+            foreach (var content in contentItems)
             {
-                IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-                contentTypeService.Save(contentType);
-
-                ContentBuilder builder = new ContentBuilder()
-                    .WithContentType(contentType);
-
-                Content root = builder.WithName("foo").Build();
-                contentService.SaveAndPublish(root);
-
-                contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-                contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-                foreach (IContent content in contentItems)
-                {
-                    contentService.SaveAndPublish(content);
-                }
+                contentService.SaveAndPublish(content);
             }
-
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Document
-            };
-
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
-
-            var payload = new
-            {
-                ids = new[]
-                {
-                    contentItems[0].GetUdi().ToString(),
-                    contentItems[1].GetUdi().ToString(),
-                }
-            };
-
-            HttpResponseMessage response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
-
-            // skip pointless un-parseable cruft.
-            (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
-
-            IDictionary<string, string> results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
-                Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
-            });
         }
 
-        [Test]
-        public async Task GetByIds_MultipleCalls_WorksAsExpected()
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
+
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+
+        var payload = new { ids = new[] { contentItems[0].Key.ToString(), contentItems[1].Key.ToString() } };
+
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
+
+        Assert.Multiple(() =>
         {
-            IContentTypeService contentTypeService = Services.GetRequiredService<IContentTypeService>();
-            IContentService contentService = Services.GetRequiredService<IContentService>();
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
+            Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
+        });
+    }
 
-            var contentItems = new List<IContent>();
+    [Test]
+    public async Task GetUrlsByIds_DocumentWithUdiIds_ReturnsValidMap()
+    {
+        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
+        var contentService = Services.GetRequiredService<IContentService>();
 
-            using (ScopeProvider.CreateScope(autoComplete: true))
+        var contentItems = new List<IContent>();
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
+        {
+            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
+            contentTypeService.Save(contentType);
+
+            var builder = new ContentBuilder()
+                .WithContentType(contentType);
+
+            var root = builder.WithName("foo").Build();
+            contentService.SaveAndPublish(root);
+
+            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
+            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
+
+            foreach (var content in contentItems)
             {
-                IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-                contentTypeService.Save(contentType);
-
-                ContentBuilder builder = new ContentBuilder()
-                    .WithContentType(contentType);
-
-                Content root = builder.WithName("foo").Build();
-                contentService.SaveAndPublish(root);
-
-                contentItems.Add(builder.WithParent(root).WithName("bar").Build());
-                contentItems.Add(builder.WithParent(root).WithName("baz").Build());
-
-                foreach (IContent content in contentItems)
-                {
-                    contentService.SaveAndPublish(content);
-                }
+                contentService.SaveAndPublish(content);
             }
-
-            var queryParameters = new Dictionary<string, object>
-            {
-                ["type"] = Constants.UdiEntityType.Document
-            };
-
-            var url = LinkGenerator.GetUmbracoControllerUrl("GetByIds", typeof(EntityController), queryParameters);
-
-            var udiPayload = new
-            {
-                ids = new[]
-                {
-                    contentItems[0].GetUdi().ToString(),
-                    contentItems[1].GetUdi().ToString(),
-                }
-            };
-
-            var intPayload = new
-            {
-                ids = new[]
-                {
-                    contentItems[0].Id,
-                    contentItems[1].Id,
-                }
-            };
-
-            HttpResponseMessage udiResponse = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, udiPayload);
-            HttpResponseMessage intResponse = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, intPayload);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, udiResponse.StatusCode, "First request error");
-                Assert.AreEqual(HttpStatusCode.OK, intResponse.StatusCode, "Second request error");
-            });
         }
+
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
+
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetUrlsByIds", typeof(EntityController), queryParameters);
+
+        var payload = new { ids = new[] { contentItems[0].GetUdi().ToString(), contentItems[1].GetUdi().ToString() } };
+
+        var response = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, payload);
+
+        // skip pointless un-parseable cruft.
+        (await response.Content.ReadAsStreamAsync()).Seek(AngularJsonMediaTypeFormatter.XsrfPrefix.Length, SeekOrigin.Begin);
+
+        var results = await response.Content.ReadFromJsonAsync<IDictionary<string, string>>();
+
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            Assert.IsTrue(results![payload.ids[0]].StartsWith("/bar"));
+            Assert.IsTrue(results![payload.ids[1]].StartsWith("/baz"));
+        });
+    }
+
+    [Test]
+    public async Task GetByIds_MultipleCalls_WorksAsExpected()
+    {
+        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
+        var contentService = Services.GetRequiredService<IContentService>();
+
+        var contentItems = new List<IContent>();
+
+        using (ScopeProvider.CreateScope(autoComplete: true))
+        {
+            IContentType contentType = ContentTypeBuilder.CreateBasicContentType();
+            contentTypeService.Save(contentType);
+
+            var builder = new ContentBuilder()
+                .WithContentType(contentType);
+
+            var root = builder.WithName("foo").Build();
+            contentService.SaveAndPublish(root);
+
+            contentItems.Add(builder.WithParent(root).WithName("bar").Build());
+            contentItems.Add(builder.WithParent(root).WithName("baz").Build());
+
+            foreach (var content in contentItems)
+            {
+                contentService.SaveAndPublish(content);
+            }
+        }
+
+        var queryParameters = new Dictionary<string, object> { ["type"] = Constants.UdiEntityType.Document };
+
+        var url = LinkGenerator.GetUmbracoControllerUrl("GetByIds", typeof(EntityController), queryParameters);
+
+        var udiPayload = new { ids = new[] { contentItems[0].GetUdi().ToString(), contentItems[1].GetUdi().ToString() } };
+
+        var intPayload = new { ids = new[] { contentItems[0].Id, contentItems[1].Id } };
+
+        var udiResponse = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, udiPayload);
+        var intResponse = await HttpClientJsonExtensions.PostAsJsonAsync(Client, url, intPayload);
+
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual(HttpStatusCode.OK, udiResponse.StatusCode, "First request error");
+            Assert.AreEqual(HttpStatusCode.OK, intResponse.StatusCode, "Second request error");
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/PropertyTypeControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/PropertyTypeControllerTests.cs
index c80a68c0d8..2046d3934d 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/PropertyTypeControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/PropertyTypeControllerTests.cs
@@ -1,4 +1,3 @@
-using System.Net.Http;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
@@ -23,12 +22,12 @@ public class PropertyTypeControllerTests : UmbracoTestServerTestBase
     [TestCase(false)]
     public async Task Has_Values_Returns_Correct_Values(bool expectHasValues)
     {
-        IContentTypeService contentTypeService = GetRequiredService<IContentTypeService>();
-        IContentService contentService = GetRequiredService<IContentService>();
-        IJsonSerializer serializer = GetRequiredService<IJsonSerializer>();
+        var contentTypeService = GetRequiredService<IContentTypeService>();
+        var contentService = GetRequiredService<IContentService>();
+        var serializer = GetRequiredService<IJsonSerializer>();
 
-        string propertyTypeAlias = "title";
-        IContentType contentType = new ContentTypeBuilder()
+        var propertyTypeAlias = "title";
+        var contentType = new ContentTypeBuilder()
             .WithId(0)
             .AddPropertyType()
             .WithAlias(propertyTypeAlias)
@@ -43,7 +42,7 @@ public class PropertyTypeControllerTests : UmbracoTestServerTestBase
 
         if (expectHasValues)
         {
-            Content content = new ContentBuilder()
+            var content = new ContentBuilder()
                 .WithId(0)
                 .WithName("TestContent")
                 .WithContentType(contentType)
@@ -55,11 +54,11 @@ public class PropertyTypeControllerTests : UmbracoTestServerTestBase
             contentService.Save(content);
         }
 
-        string url = PrepareApiControllerUrl<PropertyTypeController>(x => x.HasValues(propertyTypeAlias));
+        var url = PrepareApiControllerUrl<PropertyTypeController>(x => x.HasValues(propertyTypeAlias));
 
-        HttpResponseMessage response = await Client.GetAsync(url);
+        var response = await Client.GetAsync(url);
 
-        string body = await response.Content.ReadAsStringAsync();
+        var body = await response.Content.ReadAsStringAsync();
         body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
 
         var result = serializer.Deserialize<PropertyTypeHasValuesDisplay>(body);
@@ -70,6 +69,5 @@ public class PropertyTypeControllerTests : UmbracoTestServerTestBase
             Assert.AreEqual(propertyTypeAlias, result.PropertyTypeAlias);
             Assert.AreEqual(expectHasValues, result.HasValues);
         });
-
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs
index 1a36f3054b..0edaea5329 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/TemplateQueryControllerTests.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -14,39 +13,38 @@ using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Formatters;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
+
+[TestFixture]
+public class TemplateQueryControllerTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class TemplateQueryControllerTests : UmbracoTestServerTestBase
+    [Test]
+    public async Task GetContentTypes__Ensure_camel_case()
     {
-        [Test]
-        public async Task GetContentTypes__Ensure_camel_case()
+        var url = PrepareApiControllerUrl<TemplateQueryController>(x => x.GetContentTypes());
+
+        // Act
+        var response = await Client.GetAsync(url);
+
+        var body = await response.Content.ReadAsStringAsync();
+
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+
+        // Assert
+        Assert.Multiple(() =>
         {
-            string url = PrepareApiControllerUrl<TemplateQueryController>(x => x.GetContentTypes());
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
 
-            // Act
-            HttpResponseMessage response = await Client.GetAsync(url);
+            Assert.DoesNotThrow(() => JsonConvert.DeserializeObject<ContentTypeModel[]>(body));
 
-            string body = await response.Content.ReadAsStringAsync();
-
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-
-            // Assert
-            Assert.Multiple(() =>
+            var jtokens = JsonConvert.DeserializeObject<JToken[]>(body);
+            foreach (var jToken in jtokens)
             {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-                Assert.DoesNotThrow(() => JsonConvert.DeserializeObject<ContentTypeModel[]>(body));
-
-                JToken[] jtokens = JsonConvert.DeserializeObject<JToken[]>(body);
-                foreach (JToken jToken in jtokens)
-                {
-                    string alias = nameof(ContentTypeModel.Alias);
-                    string camelCaseAlias = alias.ToCamelCase();
-                    Assert.IsNotNull(jToken.Value<string>(camelCaseAlias), $"'{jToken}' do not contain the key '{camelCaseAlias}' in the expected casing");
-                    Assert.IsNull(jToken.Value<string>(alias), $"'{jToken}' do contain the key '{alias}', which was not expect in that casing");
-                }
-            });
-        }
+                var alias = nameof(ContentTypeModel.Alias);
+                var camelCaseAlias = alias.ToCamelCase();
+                Assert.IsNotNull(jToken.Value<string>(camelCaseAlias), $"'{jToken}' do not contain the key '{camelCaseAlias}' in the expected casing");
+                Assert.IsNull(jToken.Value<string>(alias), $"'{jToken}' do contain the key '{alias}', which was not expect in that casing");
+            }
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
index fd2481536b..6fcd1d7eee 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
@@ -23,228 +23,212 @@ using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.Common.Formatters;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Controllers;
+
+[TestFixture]
+public class UsersControllerTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class UsersControllerTests : UmbracoTestServerTestBase
+    [Test]
+    public async Task Save_User()
     {
-        [Test]
-        public async Task Save_User()
+        var url = PrepareApiControllerUrl<UsersController>(x => x.PostSaveUser(null));
+
+        var userService = GetRequiredService<IUserService>();
+
+        var user = new UserBuilder()
+            .AddUserGroup()
+            .WithAlias("writer") // Needs to be an existing alias
+            .Done()
+            .Build();
+
+        userService.Save(user);
+
+        var userSave = new UserSave
         {
-            string url = PrepareApiControllerUrl<UsersController>(x => x.PostSaveUser(null));
+            Id = user.Id,
+            Email = user.Email,
+            Username = user.Username,
+            Culture = "en",
+            Name = user.Name,
+            UserGroups = user.Groups.Select(x => x.Alias).ToArray()
+        };
 
-            IUserService userService = GetRequiredService<IUserService>();
+        // Act
+        var response = await Client.PostAsync(
+            url,
+            new StringContent(JsonConvert.SerializeObject(userSave), Encoding.UTF8, MediaTypeNames.Application.Json));
 
-            User user = new UserBuilder()
+        // Assert
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+            var body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+
+            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+            var actual = JsonConvert.DeserializeObject<UserDisplay>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
+            Assert.AreEqual(userSave.Name, actual.Name);
+            Assert.AreEqual(userSave.Id, actual.Id);
+            Assert.AreEqual(userSave.Email, actual.Email);
+            var userGroupAliases = actual.UserGroups.Select(x => x.Alias).ToArray();
+            CollectionAssert.AreEquivalent(userSave.UserGroups, userGroupAliases);
+        });
+    }
+
+    [Test]
+    public async Task GetPagedUsers_Empty()
+    {
+        // We get page 2 to force an empty response because there always in the useradmin user
+        var url = PrepareApiControllerUrl<UsersController>(x =>
+            x.GetPagedUsers(2, 10, "username", Direction.Ascending, null, null, string.Empty));
+
+        // Act
+        var response = await Client.GetAsync(url);
+
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+        var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
+        Assert.Multiple(() =>
+        {
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(1, actual.TotalItems);
+            CollectionAssert.IsEmpty(actual.Items);
+        });
+    }
+
+    [Test]
+    public async Task GetPagedUsers_multiple_pages()
+    {
+        var totalNumberOfUsers = 11;
+        var pageSize = totalNumberOfUsers - 1;
+        var url = PrepareApiControllerUrl<UsersController>(x =>
+            x.GetPagedUsers(1, pageSize, "username", Direction.Ascending, null, null, string.Empty));
+
+        var userService = GetRequiredService<IUserService>();
+
+        // We already has admin user = -1, so we start from 1.
+        for (var i = 1; i < totalNumberOfUsers; i++)
+        {
+            var user = new UserBuilder()
+                .WithName($"Test user {i}")
                 .AddUserGroup()
                 .WithAlias("writer") // Needs to be an existing alias
                 .Done()
                 .Build();
 
             userService.Save(user);
-
-            var userSave = new UserSave
-            {
-                Id = user.Id,
-                Email = user.Email,
-                Username = user.Username,
-                Culture = "en",
-                Name = user.Name,
-                UserGroups = user.Groups.Select(x => x.Alias).ToArray()
-            };
-
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(
-                url,
-                new StringContent(JsonConvert.SerializeObject(userSave), Encoding.UTF8, MediaTypeNames.Application.Json));
-
-            // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-                string body = response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
-
-                body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-                UserDisplay actual = JsonConvert.DeserializeObject<UserDisplay>(body, new JsonSerializerSettings
-                {
-                    ContractResolver = new IgnoreRequiredAttributesResolver()
-                });
-                Assert.AreEqual(userSave.Name, actual.Name);
-                Assert.AreEqual(userSave.Id, actual.Id);
-                Assert.AreEqual(userSave.Email, actual.Email);
-                string[] userGroupAliases = actual.UserGroups.Select(x => x.Alias).ToArray();
-                CollectionAssert.AreEquivalent(userSave.UserGroups, userGroupAliases);
-            });
         }
 
-        [Test]
-        public async Task GetPagedUsers_Empty()
+        // Act
+        var response = await Client.GetAsync(url);
+
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+        var actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
+        Assert.Multiple(() =>
         {
-            // We get page 2 to force an empty response because there always in the useradmin user
-            string url = PrepareApiControllerUrl<UsersController>(x => x.GetPagedUsers(2, 10, "username", Direction.Ascending, null, null, string.Empty));
+            Assert.IsNotNull(actual);
+            Assert.AreEqual(totalNumberOfUsers, actual.TotalItems);
+            Assert.AreEqual(pageSize, actual.Items.Count());
+        });
+    }
 
-            // Act
-            HttpResponseMessage response = await Client.GetAsync(url);
+    [Test]
+    public async Task PostUnlockUsers_When_UserIds_Not_Supplied_Expect_Ok_Response()
+    {
+        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(Array.Empty<int>()));
 
-            string body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            PagedResult<UserBasic> actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
-            {
-                ContractResolver = new IgnoreRequiredAttributesResolver()
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(actual);
-                Assert.AreEqual(1, actual.TotalItems);
-                CollectionAssert.IsEmpty(actual.Items);
-            });
-        }
+        // Act
+        var response = await Client.PostAsync(url, new StringContent(string.Empty));
 
-        [Test]
-        public async Task GetPagedUsers_multiple_pages()
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+    }
+
+    [Test]
+    public async Task PostUnlockUsers_When_User_Does_Not_Exist_Expect_Zero_Users_Message()
+    {
+        var userId = 42; // Must not exist
+        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(new[] { userId }));
+
+        // Act
+        var response = await Client.PostAsync(url, new StringContent(string.Empty));
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+
+        var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
+        Assert.Multiple(() => Assert.AreEqual("Unlocked 0 users", actual.Message));
+    }
+
+    [Test]
+    public async Task PostUnlockUsers_When_One_UserId_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
+    {
+        var userService = GetRequiredService<IUserService>();
+
+        var user = new UserBuilder()
+            .AddUserGroup()
+            .WithAlias("writer") // Needs to be an existing alias
+            .Done()
+            .WithIsLockedOut(true, DateTime.UtcNow)
+            .Build();
+
+        userService.Save(user);
+        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(new[] { user.Id }));
+
+        // Act
+        var response = await Client.PostAsync(url, new StringContent(string.Empty));
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+        var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
+
+        Assert.Multiple(() =>
         {
-            int totalNumberOfUsers = 11;
-            int pageSize = totalNumberOfUsers - 1;
-            string url = PrepareApiControllerUrl<UsersController>(x => x.GetPagedUsers(1, pageSize, "username", Direction.Ascending, null, null, string.Empty));
+            Assert.NotNull(actual);
+            Assert.AreEqual($"{user.Name} is now unlocked", actual.Message);
+        });
+    }
 
-            IUserService userService = GetRequiredService<IUserService>();
+    [Test]
+    public async Task
+        PostUnlockUsers_When_Multiple_UserIds_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
+    {
+        var numberOfUsers = 3;
+        var userService = GetRequiredService<IUserService>();
 
-            // We already has admin user = -1, so we start from 1.
-            for (int i = 1; i < totalNumberOfUsers; i++)
-            {
-                User user = new UserBuilder()
-                     .WithName($"Test user {i}")
-                     .AddUserGroup()
-                     .WithAlias("writer") // Needs to be an existing alias
-                     .Done()
-                     .Build();
-
-                userService.Save(user);
-            }
-
-            // Act
-            HttpResponseMessage response = await Client.GetAsync(url);
-
-            string body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            PagedResult<UserBasic> actual = JsonConvert.DeserializeObject<PagedResult<UserBasic>>(body, new JsonSerializerSettings
-            {
-                ContractResolver = new IgnoreRequiredAttributesResolver()
-            });
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(actual);
-                Assert.AreEqual(totalNumberOfUsers, actual.TotalItems);
-                Assert.AreEqual(pageSize, actual.Items.Count());
-            });
-        }
-
-        [Test]
-        public async Task PostUnlockUsers_When_UserIds_Not_Supplied_Expect_Ok_Response()
+        var users = new List<IUser>();
+        for (var i = 0; i < numberOfUsers; i++)
         {
-            string url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(Array.Empty<int>()));
-
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
-
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-        }
-
-        [Test]
-        public async Task PostUnlockUsers_When_User_Does_Not_Exist_Expect_Zero_Users_Message()
-        {
-            int userId = 42; // Must not exist
-            string url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(new[] { userId }));
-
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
-            string body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-            SimpleNotificationModel actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
-            {
-                ContractResolver = new IgnoreRequiredAttributesResolver()
-            });
-            Assert.Multiple(() => Assert.AreEqual($"Unlocked 0 users", actual.Message));
-        }
-
-        [Test]
-        public async Task PostUnlockUsers_When_One_UserId_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
-        {
-            IUserService userService = GetRequiredService<IUserService>();
-
-            User user = new UserBuilder()
+            users.Add(new UserBuilder()
+                .WithName($"Test User {i}")
+                .WithEmail($"TestUser{i}@umbraco.com")
+                .WithUsername($"TestUser{i}")
                 .AddUserGroup()
-                    .WithAlias("writer") // Needs to be an existing alias
+                .WithAlias("writer") // Needs to be an existing alias
                 .Done()
                 .WithIsLockedOut(true, DateTime.UtcNow)
-                .Build();
-
-            userService.Save(user);
-            string url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(new[] { user.Id }));
-
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
-            string body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            SimpleNotificationModel actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
-            {
-                ContractResolver = new IgnoreRequiredAttributesResolver()
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(actual);
-                Assert.AreEqual($"{user.Name} is now unlocked", actual.Message);
-            });
+                .Build());
         }
 
-        [Test]
-        public async Task PostUnlockUsers_When_Multiple_UserIds_Supplied_Expect_User_Locked_Out_With_Correct_Response_Message()
+        foreach (var user in users)
         {
-            int numberOfUsers = 3;
-            IUserService userService = GetRequiredService<IUserService>();
-
-            var users = new List<IUser>();
-            for (int i = 0; i < numberOfUsers; i++)
-            {
-                users.Add(new UserBuilder()
-                    .WithName($"Test User {i}")
-                    .WithEmail($"TestUser{i}@umbraco.com")
-                    .WithUsername($"TestUser{i}")
-                    .AddUserGroup()
-                    .WithAlias("writer") // Needs to be an existing alias
-                    .Done()
-                    .WithIsLockedOut(true, DateTime.UtcNow)
-                    .Build());
-            }
-
-            foreach (IUser user in users)
-            {
-                userService.Save(user);
-            }
-
-            string url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(users.Select(x => x.Id).ToArray()));
-
-            // Act
-            HttpResponseMessage response = await Client.PostAsync(url, new StringContent(string.Empty));
-            string body = await response.Content.ReadAsStringAsync();
-            body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-            SimpleNotificationModel actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings
-            {
-                ContractResolver = new IgnoreRequiredAttributesResolver()
-            });
-
-            Assert.Multiple(() =>
-            {
-                Assert.NotNull(actual);
-                Assert.AreEqual($"Unlocked {users.Count()} users", actual.Message);
-            });
+            userService.Save(user);
         }
+
+        var url = PrepareApiControllerUrl<UsersController>(x => x.PostUnlockUsers(users.Select(x => x.Id).ToArray()));
+
+        // Act
+        var response = await Client.PostAsync(url, new StringContent(string.Empty));
+        var body = await response.Content.ReadAsStringAsync();
+        body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
+        var actual = JsonConvert.DeserializeObject<SimpleNotificationModel>(body, new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
+
+        Assert.Multiple(() =>
+        {
+            Assert.NotNull(actual);
+            Assert.AreEqual($"Unlocked {users.Count()} users", actual.Message);
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
index 5fc3917b35..c15c9b5b39 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
@@ -11,13 +11,11 @@ using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
@@ -29,143 +27,148 @@ using Umbraco.Cms.Web.BackOffice.ModelBinders;
 using Umbraco.Extensions;
 using DataType = Umbraco.Cms.Core.Models.DataType;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Filters
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Filters;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Mapper = true, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
+public class ContentModelValidatorTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Mapper = true, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
-    public class ContentModelValidatorTests : UmbracoIntegrationTest
+    [SetUp]
+    public void SetUp()
     {
-        private const string ContentTypeAlias = "textPage";
-        private IContentType _contentType;
-        private ContentModelBinderHelper _modelBinderHelper = new ContentModelBinderHelper();
-        private IShortStringHelper _shortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
-
-        [SetUp]
-        public void SetUp()
+        var complexEditorConfig = new NestedContentConfiguration
         {
-            var complexEditorConfig = new NestedContentConfiguration
-            {
-                ContentTypes = new[]
-                {
-                      new NestedContentConfiguration.ContentType { Alias = "feature" }
-                }
-            };
+            ContentTypes = new[] { new NestedContentConfiguration.ContentType { Alias = "feature" } }
+        };
 
-            ComplexTestEditor complexTestEditor = Services.GetRequiredService<ComplexTestEditor>();
-            TestEditor testEditor = Services.GetRequiredService<TestEditor>();
-            IDataTypeService dataTypeService = Services.GetRequiredService<IDataTypeService>();
-            IConfigurationEditorJsonSerializer serializer = Services.GetRequiredService<IConfigurationEditorJsonSerializer>();
+        var complexTestEditor = Services.GetRequiredService<ComplexTestEditor>();
+        var testEditor = Services.GetRequiredService<TestEditor>();
+        var dataTypeService = Services.GetRequiredService<IDataTypeService>();
+        var serializer = Services.GetRequiredService<IConfigurationEditorJsonSerializer>();
 
-            var complexDataType = new DataType(complexTestEditor, serializer)
-            {
-                Name = "ComplexTest",
-                Configuration = complexEditorConfig
-            };
+        var complexDataType = new DataType(complexTestEditor, serializer)
+        {
+            Name = "ComplexTest",
+            Configuration = complexEditorConfig
+        };
 
-            var testDataType = new DataType(testEditor, serializer)
-            {
-                Name = "Test",
-            };
-            dataTypeService.Save(complexDataType);
-            dataTypeService.Save(testDataType);
+        var testDataType = new DataType(testEditor, serializer) { Name = "Test" };
+        dataTypeService.Save(complexDataType);
+        dataTypeService.Save(testDataType);
 
-            IFileService fileService = Services.GetRequiredService<IFileService>();
-            Template template = TemplateBuilder.CreateTextPageTemplate();
-            fileService.SaveTemplate(template);
+        var fileService = Services.GetRequiredService<IFileService>();
+        var template = TemplateBuilder.CreateTextPageTemplate();
+        fileService.SaveTemplate(template);
 
-            _contentType = ContentTypeBuilder.CreateTextPageContentType(ContentTypeAlias, defaultTemplateId: template.Id);
+        _contentType = ContentTypeBuilder.CreateTextPageContentType(ContentTypeAlias, defaultTemplateId: template.Id);
 
-            // add complex editor
-            foreach (IPropertyType pt in _contentType.PropertyTypes)
-            {
-                pt.DataTypeId = testDataType.Id;
-            }
-
-            _contentType.AddPropertyType(
-                new PropertyType(_shortStringHelper, "complexTest", ValueStorageType.Ntext) { Alias = "complex", Name = "Complex", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = complexDataType.Id },
-                "content", "Content");
-
-            // make them all validate with a regex rule that will not pass
-            foreach (IPropertyType prop in _contentType.PropertyTypes)
-            {
-                prop.ValidationRegExp = "^donotmatch$";
-                prop.ValidationRegExpMessage = "Does not match!";
-            }
-
-            IContentTypeService contentTypeService = Services.GetRequiredService<IContentTypeService>();
-            contentTypeService.Save(_contentType);
+        // add complex editor
+        foreach (var pt in _contentType.PropertyTypes)
+        {
+            pt.DataTypeId = testDataType.Id;
         }
 
-        //// protected override void Compose()
-        //// {
-        ////     base.Compose();
-        ////
-        ////     var complexEditorConfig = new NestedContentConfiguration
-        ////     {
-        ////         ContentTypes = new[]
-        ////         {
-        ////             new NestedContentConfiguration.ContentType { Alias = "feature" }
-        ////         }
-        ////     };
-        ////     var dataTypeService = new Mock<IDataTypeService>();
-        ////     dataTypeService.Setup(x => x.GetDataType(It.IsAny<int>()))
-        ////         .Returns((int id) => id == ComplexDataTypeId
-        ////                 ? Mock.Of<IDataType>(x => x.Configuration == complexEditorConfig)
-        ////                 : Mock.Of<IDataType>());
-        ////
-        ////     var contentTypeService = new Mock<IContentTypeService>();
-        ////     contentTypeService.Setup(x => x.GetAll(It.IsAny<int[]>()))
-        ////         .Returns(() => new List<IContentType>
-        ////         {
-        ////             _contentType
-        ////         });
-        ////
-        ////     var textService = new Mock<ILocalizedTextService>();
-        ////     textService.Setup(x => x.Localize("validation/invalidPattern", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns(() => "invalidPattern");
-        ////     textService.Setup(x => x.Localize("validation/invalidNull", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("invalidNull");
-        ////     textService.Setup(x => x.Localize("validation/invalidEmpty", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("invalidEmpty");
-        ////
-        ////     composition.Services.AddUnique(x => Mock.Of<IDataTypeService>(x => x.GetDataType(It.IsAny<int>()) == Mock.Of<IDataType>()));
-        ////     composition.Services.AddUnique(x => dataTypeService.Object);
-        ////     composition.Services.AddUnique(x => contentTypeService.Object);
-        ////     composition.Services.AddUnique(x => textService.Object);
-        ////
-        ////     Composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
-        ////         .Add<TestEditor>()
-        ////         .Add<ComplexTestEditor>();
-        //// }
+        _contentType.AddPropertyType(
+            new PropertyType(_shortStringHelper, "complexTest", ValueStorageType.Ntext)
+            {
+                Alias = "complex",
+                Name = "Complex",
+                Description = string.Empty,
+                Mandatory = false,
+                SortOrder = 1,
+                DataTypeId = complexDataType.Id
+            },
+            "content",
+            "Content");
 
-        [Test]
-        public void Validating_ContentItemSave()
+        // make them all validate with a regex rule that will not pass
+        foreach (var prop in _contentType.PropertyTypes)
         {
-            ILogger<ContentSaveModelValidator> logger = Services.GetRequiredService<ILogger<ContentSaveModelValidator>>();
-            IPropertyValidationService propertyValidationService = Services.GetRequiredService<IPropertyValidationService>();
-            IUmbracoMapper umbracoMapper = Services.GetRequiredService<IUmbracoMapper>();
+            prop.ValidationRegExp = "^donotmatch$";
+            prop.ValidationRegExpMessage = "Does not match!";
+        }
 
-            var validator = new ContentSaveModelValidator(logger, propertyValidationService);
+        var contentTypeService = Services.GetRequiredService<IContentTypeService>();
+        contentTypeService.Save(_contentType);
+    }
 
-            Content content = ContentBuilder.CreateTextpageContent(_contentType, "test", -1);
+    private const string ContentTypeAlias = "textPage";
+    private IContentType _contentType;
+    private readonly ContentModelBinderHelper _modelBinderHelper = new();
 
-            var id1 = new Guid("c8df5136-d606-41f0-9134-dea6ae0c2fd9");
-            var id2 = new Guid("f916104a-4082-48b2-a515-5c4bf2230f38");
-            var id3 = new Guid("77E15DE9-1C79-47B2-BC60-4913BC4D4C6A");
+    private readonly IShortStringHelper _shortStringHelper =
+        new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
 
-            // TODO: Ok now test with a 4th level complex nested editor
+    //// protected override void Compose()
+    //// {
+    ////     base.Compose();
+    ////
+    ////     var complexEditorConfig = new NestedContentConfiguration
+    ////     {
+    ////         ContentTypes = new[]
+    ////         {
+    ////             new NestedContentConfiguration.ContentType { Alias = "feature" }
+    ////         }
+    ////     };
+    ////     var dataTypeService = new Mock<IDataTypeService>();
+    ////     dataTypeService.Setup(x => x.GetDataType(It.IsAny<int>()))
+    ////         .Returns((int id) => id == ComplexDataTypeId
+    ////                 ? Mock.Of<IDataType>(x => x.Configuration == complexEditorConfig)
+    ////                 : Mock.Of<IDataType>());
+    ////
+    ////     var contentTypeService = new Mock<IContentTypeService>();
+    ////     contentTypeService.Setup(x => x.GetAll(It.IsAny<int[]>()))
+    ////         .Returns(() => new List<IContentType>
+    ////         {
+    ////             _contentType
+    ////         });
+    ////
+    ////     var textService = new Mock<ILocalizedTextService>();
+    ////     textService.Setup(x => x.Localize("validation/invalidPattern", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns(() => "invalidPattern");
+    ////     textService.Setup(x => x.Localize("validation/invalidNull", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("invalidNull");
+    ////     textService.Setup(x => x.Localize("validation/invalidEmpty", It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("invalidEmpty");
+    ////
+    ////     composition.Services.AddUnique(x => Mock.Of<IDataTypeService>(x => x.GetDataType(It.IsAny<int>()) == Mock.Of<IDataType>()));
+    ////     composition.Services.AddUnique(x => dataTypeService.Object);
+    ////     composition.Services.AddUnique(x => contentTypeService.Object);
+    ////     composition.Services.AddUnique(x => textService.Object);
+    ////
+    ////     Composition.WithCollectionBuilder<DataEditorCollectionBuilder>()
+    ////         .Add<TestEditor>()
+    ////         .Add<ComplexTestEditor>();
+    //// }
 
-            string complexValue = @"[{
-             		""key"": """ + id1.ToString() + @""",
+    [Test]
+    public void Validating_ContentItemSave()
+    {
+        var logger = Services.GetRequiredService<ILogger<ContentSaveModelValidator>>();
+        var propertyValidationService = Services.GetRequiredService<IPropertyValidationService>();
+        var umbracoMapper = Services.GetRequiredService<IUmbracoMapper>();
+
+        var validator = new ContentSaveModelValidator(logger, propertyValidationService);
+
+        var content = ContentBuilder.CreateTextpageContent(_contentType, "test", -1);
+
+        var id1 = new Guid("c8df5136-d606-41f0-9134-dea6ae0c2fd9");
+        var id2 = new Guid("f916104a-4082-48b2-a515-5c4bf2230f38");
+        var id3 = new Guid("77E15DE9-1C79-47B2-BC60-4913BC4D4C6A");
+
+        // TODO: Ok now test with a 4th level complex nested editor
+
+        var complexValue = @"[{
+             		""key"": """ + id1 + @""",
              		""name"": ""Hello world"",
              		""ncContentTypeAlias"": """ + ContentTypeAlias + @""",
              		""title"": ""Hello world"",
                      ""bodyText"": ""The world is round""
              	}, {
-             		""key"": """ + id2.ToString() + @""",
+             		""key"": """ + id2 + @""",
              		""name"": ""Super nested"",
              		""ncContentTypeAlias"": """ + ContentTypeAlias + @""",
              		""title"": ""Hi there!"",
                      ""bodyText"": ""Well hello there"",
                      ""complex"" : [{
-             		    ""key"": """ + id3.ToString() + @""",
+             		    ""key"": """ + id3 + @""",
              		    ""name"": ""I am a sub nested content"",
              		    ""ncContentTypeAlias"": """ + ContentTypeAlias + @""",
              		    ""title"": ""Hello up there :)"",
@@ -173,153 +176,158 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.Filters
              	    }]
              	}
              ]";
-            content.SetValue("complex", complexValue);
+        content.SetValue("complex", complexValue);
 
-            // map the persisted properties to a model representing properties to save
-            // var saveProperties = content.Properties.Select(x => Mapper.Map<ContentPropertyBasic>(x)).ToList();
-            var saveProperties = content.Properties.Select(x =>
-            {
-                return new ContentPropertyBasic
-                {
-                    Alias = x.Alias,
-                    Id = x.Id,
-                    Value = x.GetValue()
-                };
-            }).ToList();
-
-            var saveVariants = new List<ContentVariantSave>
-             {
-                 new ContentVariantSave
-                     {
-                         Culture = string.Empty,
-                         Segment = string.Empty,
-                         Name = content.Name,
-                         Save = true,
-                         Properties = saveProperties
-                     }
-             };
-
-            var save = new ContentItemSave
-            {
-                Id = content.Id,
-                Action = ContentSaveAction.Save,
-                ContentTypeAlias = _contentType.Alias,
-                ParentId = -1,
-                PersistedContent = content,
-                TemplateAlias = null,
-                Variants = saveVariants
-            };
-
-            // This will map the ContentItemSave.Variants.PropertyCollectionDto and then map the values in the saved model
-            // back onto the persisted IContent model.
-            ContentItemBinder.BindModel(save, content, _modelBinderHelper, umbracoMapper);
-
-            var modelState = new ModelStateDictionary();
-            bool isValid = validator.ValidatePropertiesData(save, saveVariants[0], saveVariants[0].PropertyCollectionDto, modelState);
-
-            // list results for debugging
-            foreach (KeyValuePair<string, ModelStateEntry> state in modelState)
-            {
-                Console.WriteLine(state.Key);
-                foreach (ModelError error in state.Value.Errors)
-                {
-                    Console.WriteLine("\t" + error.ErrorMessage);
-                }
-            }
-
-            // assert
-            Assert.IsFalse(isValid);
-            Assert.AreEqual(11, modelState.Keys.Count());
-            const string complexPropertyKey = "_Properties.complex.invariant.null";
-            Assert.IsTrue(modelState.Keys.Contains(complexPropertyKey));
-            foreach (KeyValuePair<string, ModelStateEntry> state in modelState.Where(x => x.Key != complexPropertyKey))
-            {
-                foreach (ModelError error in state.Value.Errors)
-                {
-                    Assert.IsFalse(error.ErrorMessage.DetectIsJson()); // non complex is just an error message
-                }
-            }
-
-            ModelErrorCollection complexEditorErrors = modelState.Single(x => x.Key == complexPropertyKey).Value.Errors;
-            Assert.AreEqual(1, complexEditorErrors.Count);
-            ModelError nestedError = complexEditorErrors[0];
-            JArray jsonError = JsonConvert.DeserializeObject<JArray>(nestedError.ErrorMessage);
-
-            string[] modelStateKeys = new[] { "_Properties.title.invariant.null.innerFieldId", "_Properties.title.invariant.null.value", "_Properties.bodyText.invariant.null.innerFieldId", "_Properties.bodyText.invariant.null.value" };
-            AssertNestedValidation(jsonError, 0, id1, modelStateKeys);
-            AssertNestedValidation(jsonError, 1, id2, modelStateKeys.Concat(new[] { "_Properties.complex.invariant.null.innerFieldId", "_Properties.complex.invariant.null.value" }).ToArray());
-            var nestedJsonError = jsonError.SelectToken("$[1].complex") as JArray;
-            Assert.IsNotNull(nestedJsonError);
-            AssertNestedValidation(nestedJsonError, 0, id3, modelStateKeys);
-        }
-
-        private void AssertNestedValidation(JArray jsonError, int index, Guid id, string[] modelStateKeys)
+        // map the persisted properties to a model representing properties to save
+        // var saveProperties = content.Properties.Select(x => Mapper.Map<ContentPropertyBasic>(x)).ToList();
+        var saveProperties = content.Properties.Select(x =>
         {
-            Assert.IsNotNull(jsonError.SelectToken("$[" + index + "]"));
-            Assert.AreEqual(id.ToString(), jsonError.SelectToken("$[" + index + "].$id").Value<string>());
-            Assert.AreEqual("textPage", jsonError.SelectToken("$[" + index + "].$elementTypeAlias").Value<string>());
-            Assert.IsNotNull(jsonError.SelectToken("$[" + index + "].ModelState"));
-            foreach (string key in modelStateKeys)
+            return new ContentPropertyBasic { Alias = x.Alias, Id = x.Id, Value = x.GetValue() };
+        }).ToList();
+
+        var saveVariants = new List<ContentVariantSave>
+        {
+            new()
             {
-                var error = jsonError.SelectToken("$[" + index + "].ModelState['" + key + "']") as JArray;
-                Assert.IsNotNull(error);
-                Assert.AreEqual(1, error.Count);
+                Culture = string.Empty,
+                Segment = string.Empty,
+                Name = content.Name,
+                Save = true,
+                Properties = saveProperties
+            }
+        };
+
+        var save = new ContentItemSave
+        {
+            Id = content.Id,
+            Action = ContentSaveAction.Save,
+            ContentTypeAlias = _contentType.Alias,
+            ParentId = -1,
+            PersistedContent = content,
+            TemplateAlias = null,
+            Variants = saveVariants
+        };
+
+        // This will map the ContentItemSave.Variants.PropertyCollectionDto and then map the values in the saved model
+        // back onto the persisted IContent model.
+        ContentItemBinder.BindModel(save, content, _modelBinderHelper, umbracoMapper);
+
+        var modelState = new ModelStateDictionary();
+        var isValid =
+            validator.ValidatePropertiesData(save, saveVariants[0], saveVariants[0].PropertyCollectionDto, modelState);
+
+        // list results for debugging
+        foreach (var state in modelState)
+        {
+            Console.WriteLine(state.Key);
+            foreach (var error in state.Value.Errors)
+            {
+                Console.WriteLine("\t" + error.ErrorMessage);
             }
         }
 
-        // [HideFromTypeFinder]
-        [DataEditor("complexTest", "test", "test")]
-        public class ComplexTestEditor : NestedContentPropertyEditor
+        // assert
+        Assert.IsFalse(isValid);
+        Assert.AreEqual(11, modelState.Keys.Count());
+        const string complexPropertyKey = "_Properties.complex.invariant.null";
+        Assert.IsTrue(modelState.Keys.Contains(complexPropertyKey));
+        foreach (var state in modelState.Where(x => x.Key != complexPropertyKey))
         {
-            public ComplexTestEditor(
-                IDataValueEditorFactory dataValueEditorFactory,
+            foreach (var error in state.Value.Errors)
+            {
+                Assert.IsFalse(error.ErrorMessage.DetectIsJson()); // non complex is just an error message
+            }
+        }
+
+        var complexEditorErrors = modelState.Single(x => x.Key == complexPropertyKey).Value.Errors;
+        Assert.AreEqual(1, complexEditorErrors.Count);
+        var nestedError = complexEditorErrors[0];
+        var jsonError = JsonConvert.DeserializeObject<JArray>(nestedError.ErrorMessage);
+
+        string[] modelStateKeys =
+        {
+            "_Properties.title.invariant.null.innerFieldId", "_Properties.title.invariant.null.value",
+            "_Properties.bodyText.invariant.null.innerFieldId", "_Properties.bodyText.invariant.null.value"
+        };
+        AssertNestedValidation(jsonError, 0, id1, modelStateKeys);
+        AssertNestedValidation(
+            jsonError,
+            1,
+            id2,
+            modelStateKeys.Concat(new[]
+            {
+                "_Properties.complex.invariant.null.innerFieldId", "_Properties.complex.invariant.null.value"
+            }).ToArray());
+        var nestedJsonError = jsonError.SelectToken("$[1].complex") as JArray;
+        Assert.IsNotNull(nestedJsonError);
+        AssertNestedValidation(nestedJsonError, 0, id3, modelStateKeys);
+    }
+
+    private void AssertNestedValidation(JArray jsonError, int index, Guid id, string[] modelStateKeys)
+    {
+        Assert.IsNotNull(jsonError.SelectToken("$[" + index + "]"));
+        Assert.AreEqual(id.ToString(), jsonError.SelectToken("$[" + index + "].$id").Value<string>());
+        Assert.AreEqual("textPage", jsonError.SelectToken("$[" + index + "].$elementTypeAlias").Value<string>());
+        Assert.IsNotNull(jsonError.SelectToken("$[" + index + "].ModelState"));
+        foreach (var key in modelStateKeys)
+        {
+            var error = jsonError.SelectToken("$[" + index + "].ModelState['" + key + "']") as JArray;
+            Assert.IsNotNull(error);
+            Assert.AreEqual(1, error.Count);
+        }
+    }
+
+    // [HideFromTypeFinder]
+    [DataEditor("complexTest", "test", "test")]
+    public class ComplexTestEditor : NestedContentPropertyEditor
+    {
+        public ComplexTestEditor(
+            IDataValueEditorFactory dataValueEditorFactory,
+            IIOHelper ioHelper,
+            IEditorConfigurationParser editorConfigurationParser)
+            : base(dataValueEditorFactory, ioHelper, editorConfigurationParser)
+        {
+        }
+
+        protected override IDataValueEditor CreateValueEditor()
+        {
+            var editor = base.CreateValueEditor();
+            editor.Validators.Add(new NeverValidateValidator());
+            return editor;
+        }
+    }
+
+    // [HideFromTypeFinder]
+    [DataEditor("test", "test", "test")] // This alias aligns with the prop editor alias for all properties created from MockedContentTypes.CreateTextPageContentType
+    public class TestEditor : DataEditor
+    {
+        public TestEditor(
+            IDataValueEditorFactory dataValueEditorFactory)
+            : base(dataValueEditorFactory)
+        {
+        }
+
+        protected override IDataValueEditor CreateValueEditor() =>
+            DataValueEditorFactory.Create<TestValueEditor>(Attribute);
+
+        private class TestValueEditor : DataValueEditor
+        {
+            public TestValueEditor(
+                ILocalizedTextService localizedTextService,
+                IShortStringHelper shortStringHelper,
+                IJsonSerializer jsonSerializer,
                 IIOHelper ioHelper,
-                IEditorConfigurationParser editorConfigurationParser)
-                : base(dataValueEditorFactory, ioHelper, editorConfigurationParser)
-            {
-            }
-
-            protected override IDataValueEditor CreateValueEditor()
-            {
-                IDataValueEditor editor = base.CreateValueEditor();
-                editor.Validators.Add(new NeverValidateValidator());
-                return editor;
-            }
+                DataEditorAttribute attribute)
+                : base(localizedTextService, shortStringHelper, jsonSerializer, ioHelper, attribute) =>
+                Validators.Add(new NeverValidateValidator());
         }
+    }
 
-        // [HideFromTypeFinder]
-        [DataEditor("test", "test", "test")] // This alias aligns with the prop editor alias for all properties created from MockedContentTypes.CreateTextPageContentType
-        public class TestEditor : DataEditor
+    public class NeverValidateValidator : IValueValidator
+    {
+        public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
         {
-            public TestEditor(
-                IDataValueEditorFactory dataValueEditorFactory)
-                : base(dataValueEditorFactory)
-            {
-            }
-
-            protected override IDataValueEditor CreateValueEditor() => DataValueEditorFactory.Create<TestValueEditor>(Attribute);
-
-            private class TestValueEditor : DataValueEditor
-            {
-                public TestValueEditor(
-                    ILocalizedTextService localizedTextService,
-                    IShortStringHelper shortStringHelper,
-                    IJsonSerializer jsonSerializer,
-                    IIOHelper ioHelper,
-                    DataEditorAttribute attribute)
-                    : base(localizedTextService, shortStringHelper, jsonSerializer, ioHelper, attribute)
-                {
-                    Validators.Add(new NeverValidateValidator());
-                }
-            }
-        }
-
-        public class NeverValidateValidator : IValueValidator
-        {
-            public IEnumerable<ValidationResult> Validate(object value, string valueType, object dataTypeConfiguration)
-            {
-                yield return new ValidationResult("WRONG!", new[] { "innerFieldId" });
-            }
+            yield return new ValidationResult("WRONG!", new[] { "innerFieldId" });
         }
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs
index f55f969837..cc0baea33c 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UmbracoBackOfficeServiceCollectionExtensionsTests.cs
@@ -9,37 +9,36 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice;
+
+[TestFixture]
+public class UmbracoBackOfficeServiceCollectionExtensionsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    public class UmbracoBackOfficeServiceCollectionExtensionsTests : UmbracoIntegrationTest
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddBackOfficeIdentity();
+
+    [Test]
+    public void AddUmbracoBackOfficeIdentity_ExpectBackOfficeUserStoreResolvable()
     {
-        protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddBackOfficeIdentity();
+        var userStore = Services.GetService<IUserStore<BackOfficeIdentityUser>>();
 
-        [Test]
-        public void AddUmbracoBackOfficeIdentity_ExpectBackOfficeUserStoreResolvable()
-        {
-            IUserStore<BackOfficeIdentityUser> userStore = Services.GetService<IUserStore<BackOfficeIdentityUser>>();
+        Assert.IsNotNull(userStore);
+        Assert.AreEqual(typeof(BackOfficeUserStore), userStore.GetType());
+    }
 
-            Assert.IsNotNull(userStore);
-            Assert.AreEqual(typeof(BackOfficeUserStore), userStore.GetType());
-        }
+    [Test]
+    public void AddUmbracoBackOfficeIdentity_ExpectBackOfficeClaimsPrincipalFactoryResolvable()
+    {
+        var principalFactory = Services.GetService<IUserClaimsPrincipalFactory<BackOfficeIdentityUser>>();
 
-        [Test]
-        public void AddUmbracoBackOfficeIdentity_ExpectBackOfficeClaimsPrincipalFactoryResolvable()
-        {
-            IUserClaimsPrincipalFactory<BackOfficeIdentityUser> principalFactory = Services.GetService<IUserClaimsPrincipalFactory<BackOfficeIdentityUser>>();
+        Assert.IsNotNull(principalFactory);
+        Assert.AreEqual(typeof(BackOfficeClaimsPrincipalFactory), principalFactory.GetType());
+    }
 
-            Assert.IsNotNull(principalFactory);
-            Assert.AreEqual(typeof(BackOfficeClaimsPrincipalFactory), principalFactory.GetType());
-        }
+    [Test]
+    public void AddUmbracoBackOfficeIdentity_ExpectBackOfficeUserManagerResolvable()
+    {
+        var userManager = Services.GetService<IBackOfficeUserManager>();
 
-        [Test]
-        public void AddUmbracoBackOfficeIdentity_ExpectBackOfficeUserManagerResolvable()
-        {
-            IBackOfficeUserManager userManager = Services.GetService<IBackOfficeUserManager>();
-
-            Assert.NotNull(userManager);
-        }
+        Assert.NotNull(userManager);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UrlAndDomains/DomainAndUrlsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UrlAndDomains/DomainAndUrlsTests.cs
index 39a5fd2e5f..85f0f7439c 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UrlAndDomains/DomainAndUrlsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/UrlAndDomains/DomainAndUrlsTests.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
-using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Core.Models;
@@ -17,137 +15,135 @@ using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.UrlAndDomains
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.BackOffice.UrlAndDomains;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Mapper = true, WithApplication = true, Logger = UmbracoTestOptions.Logger.Console)]
+public class DomainAndUrlsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest, Mapper = true, WithApplication = true,
-        Logger = UmbracoTestOptions.Logger.Console)]
-    public class DomainAndUrlsTests : UmbracoIntegrationTest
+    [SetUp]
+    public void Setup()
     {
-        [SetUp]
-        public void Setup()
+        var xml = PackageMigrationResource.GetEmbeddedPackageDataManifest(GetType());
+        var packagingService = GetRequiredService<IPackagingService>();
+        InstallationSummary = packagingService.InstallCompiledPackageData(xml);
+
+        Root = InstallationSummary.ContentInstalled.First();
+        ContentService.SaveAndPublish(Root);
+
+        var cultures = new List<string>
         {
-            XDocument xml = PackageMigrationResource.GetEmbeddedPackageDataManifest(GetType());
-            IPackagingService packagingService = GetRequiredService<IPackagingService>();
-            InstallationSummary = packagingService.InstallCompiledPackageData(xml);
+            GetRequiredService<ILocalizationService>().GetDefaultLanguageIsoCode()
+        };
 
-            Root = InstallationSummary.ContentInstalled.First();
-            ContentService.SaveAndPublish(Root);
+        foreach (var language in InstallationSummary.LanguagesInstalled)
+        {
+            cultures.Add(language.IsoCode);
+        }
 
-            var cultures = new List<string>();
-            cultures.Add(GetRequiredService<ILocalizationService>().GetDefaultLanguageIsoCode());
+        Cultures = cultures.ToArray();
 
-            foreach (ILanguage language in InstallationSummary.LanguagesInstalled)
+        var httpContextAccessor = GetRequiredService<IHttpContextAccessor>();
+
+        httpContextAccessor.HttpContext = new DefaultHttpContext
+        {
+            Request =
             {
-                cultures.Add(language.IsoCode);
+                Scheme = "https",
+                Host = new HostString("localhost"),
+                Path = "/",
+                QueryString = new QueryString(string.Empty)
             }
+        };
 
-            Cultures = cultures.ToArray();
+        //Like the request middleware we specify the VariationContext to the default language.
+        _variationContextAccessor.VariationContext = new VariationContext(Cultures[0]);
+        GetRequiredService<IUmbracoContextFactory>().EnsureUmbracoContext();
+    }
 
-            IHttpContextAccessor httpContextAccessor = GetRequiredService<IHttpContextAccessor>();
+    private IContentService ContentService => GetRequiredService<IContentService>();
 
-            httpContextAccessor.HttpContext = new DefaultHttpContext
-            {
-                Request =
-                {
-                    Scheme = "https",
-                    Host = new HostString("localhost"),
-                    Path = "/",
-                    QueryString = new QueryString(string.Empty)
-                }
-            };
+    public InstallationSummary InstallationSummary { get; set; }
 
-            //Like the request middleware we specify the VariationContext to the default language.
-            _variationContextAccessor.VariationContext = new VariationContext(Cultures[0]);
-            GetRequiredService<IUmbracoContextFactory>().EnsureUmbracoContext();
+    protected override void CustomTestSetup(IUmbracoBuilder builder)
+    {
+        builder.Services.AddUnique<IVariationContextAccessor>(_variationContextAccessor);
+        builder.AddNuCache();
+    }
+
+    private readonly TestVariationContextAccessor _variationContextAccessor = new();
+
+    public IContent Root { get; set; }
+    public string[] Cultures { get; set; }
+
+
+    [Test]
+    public void Having_three_cultures_and_set_domain_on_all_of_them()
+    {
+        foreach (var culture in Cultures)
+        {
+            SetDomainOnContent(Root, culture, GetDomainUrlFromCultureCode(culture));
         }
 
-        private IContentService ContentService => GetRequiredService<IContentService>();
+        var rootUrls = GetContentUrlsAsync(Root).ToArray();
 
-        public InstallationSummary InstallationSummary { get; set; }
-
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
-        {
-            builder.Services.AddUnique<IVariationContextAccessor>(_variationContextAccessor);
-            builder.AddNuCache();
-        }
-
-        private readonly TestVariationContextAccessor _variationContextAccessor = new TestVariationContextAccessor();
-
-        public IContent Root { get; set; }
-        public string[] Cultures { get; set; }
-
-
-        [Test]
-        public void Having_three_cultures_and_set_domain_on_all_of_them()
+        Assert.Multiple(() =>
         {
+            Assert.AreEqual(6, rootUrls.Count());
             foreach (var culture in Cultures)
             {
-                SetDomainOnContent(Root, culture, GetDomainUrlFromCultureCode(culture));
+                var domain = GetDomainUrlFromCultureCode(culture);
+                Assert.IsTrue(rootUrls.Any(x => x.Text == domain));
+                Assert.IsTrue(rootUrls.Any(x => x.Text == "https://localhost" + domain));
             }
-
-            IEnumerable<UrlInfo> rootUrls = GetContentUrlsAsync(Root);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(6, rootUrls.Count());
-                foreach (var culture in Cultures)
-                {
-                    var domain = GetDomainUrlFromCultureCode(culture);
-                    Assert.IsTrue(rootUrls.Any(x => x.Text == domain));
-                    Assert.IsTrue(rootUrls.Any(x => x.Text == "https://localhost" + domain));
-                }
-            });
-        }
-
-        [Test]
-        public void Having_three_cultures_but_set_domain_on_a_non_default_language()
-        {
-            var culture = Cultures[1];
-            var domain = GetDomainUrlFromCultureCode(culture);
-            SetDomainOnContent(Root, culture, domain);
-
-            IEnumerable<UrlInfo> rootUrls = GetContentUrlsAsync(Root);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(4, rootUrls.Count());
-
-                //We expect two for the domain that is setup
-                Assert.IsTrue(rootUrls.Any(x => x.IsUrl && x.Text == domain && x.Culture == culture));
-                Assert.IsTrue(rootUrls.Any(x => x.IsUrl && x.Text == "https://localhost" + domain && x.Culture == culture));
-
-                //We expect the default language to be routable on the default path "/"
-                Assert.IsTrue(rootUrls.Any(x=>x.IsUrl && x.Text == "/" && x.Culture == Cultures[0]));
-
-                //We dont expect non-default languages without a domain to be routable
-                Assert.IsTrue(rootUrls.Any(x=>x.IsUrl == false && x.Culture == Cultures[2]));
-            });
-        }
-
-        private static string GetDomainUrlFromCultureCode(string culture) =>
-            "/" + culture.Replace("-", string.Empty).ToLower() + "/";
-
-        private void SetDomainOnContent(IContent content, string cultureIsoCode, string domain)
-        {
-            IDomainService domainService = GetRequiredService<IDomainService>();
-            var langId = GetRequiredService<ILocalizationService>().GetLanguageIdByIsoCode(cultureIsoCode);
-            domainService.Save(
-                new UmbracoDomain(domain) { RootContentId = content.Id, LanguageId = langId });
-        }
-
-        private IEnumerable<UrlInfo> GetContentUrlsAsync(IContent root) =>
-            root.GetContentUrlsAsync(
-                GetRequiredService<IPublishedRouter>(),
-                GetRequiredService<IUmbracoContextAccessor>().GetRequiredUmbracoContext(),
-                GetRequiredService<ILocalizationService>(),
-                GetRequiredService<ILocalizedTextService>(),
-                ContentService,
-                GetRequiredService<IVariationContextAccessor>(),
-                GetRequiredService<ILogger<IContent>>(),
-                GetRequiredService<UriUtility>(),
-                GetRequiredService<IPublishedUrlProvider>()
-            ).GetAwaiter().GetResult();
-
+        });
     }
+
+    [Test]
+    public void Having_three_cultures_but_set_domain_on_a_non_default_language()
+    {
+        var culture = Cultures[1];
+        var domain = GetDomainUrlFromCultureCode(culture);
+        SetDomainOnContent(Root, culture, domain);
+
+        var rootUrls = GetContentUrlsAsync(Root).ToArray();
+
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual(4, rootUrls.Count());
+
+            //We expect two for the domain that is setup
+            Assert.IsTrue(rootUrls.Any(x => x.IsUrl && x.Text == domain && x.Culture == culture));
+            Assert.IsTrue(rootUrls.Any(x => x.IsUrl && x.Text == "https://localhost" + domain && x.Culture == culture));
+
+            //We expect the default language to be routable on the default path "/"
+            Assert.IsTrue(rootUrls.Any(x => x.IsUrl && x.Text == "/" && x.Culture == Cultures[0]));
+
+            //We dont expect non-default languages without a domain to be routable
+            Assert.IsTrue(rootUrls.Any(x => x.IsUrl == false && x.Culture == Cultures[2]));
+        });
+    }
+
+    private static string GetDomainUrlFromCultureCode(string culture) =>
+        "/" + culture.Replace("-", string.Empty).ToLower() + "/";
+
+    private void SetDomainOnContent(IContent content, string cultureIsoCode, string domain)
+    {
+        var domainService = GetRequiredService<IDomainService>();
+        var langId = GetRequiredService<ILocalizationService>().GetLanguageIdByIsoCode(cultureIsoCode);
+        domainService.Save(
+            new UmbracoDomain(domain) { RootContentId = content.Id, LanguageId = langId });
+    }
+
+    private IEnumerable<UrlInfo> GetContentUrlsAsync(IContent root) =>
+        root.GetContentUrlsAsync(
+            GetRequiredService<IPublishedRouter>(),
+            GetRequiredService<IUmbracoContextAccessor>().GetRequiredUmbracoContext(),
+            GetRequiredService<ILocalizationService>(),
+            GetRequiredService<ILocalizedTextService>(),
+            ContentService,
+            GetRequiredService<IVariationContextAccessor>(),
+            GetRequiredService<ILogger<IContent>>(),
+            GetRequiredService<UriUtility>(),
+            GetRequiredService<IPublishedUrlProvider>()).GetAwaiter().GetResult();
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs
index 28c61a743c..66fc0c8143 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.Common/MembersServiceCollectionExtensionsTests.cs
@@ -6,28 +6,27 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Tests.Integration.Testing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Tests.Integration.Umbraco.Web.Common
+namespace Umbraco.Tests.Integration.Umbraco.Web.Common;
+
+[TestFixture]
+public class MembersServiceCollectionExtensionsTests : UmbracoIntegrationTest
 {
-    [TestFixture]
-    public class MembersServiceCollectionExtensionsTests : UmbracoIntegrationTest
+    protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddMembersIdentity();
+
+    [Test]
+    public void AddMembersIdentity_ExpectMembersUserStoreResolvable()
     {
-        protected override void CustomTestSetup(IUmbracoBuilder builder) => builder.AddMembersIdentity();
+        var userStore = Services.GetService<IUserStore<MemberIdentityUser>>();
 
-        [Test]
-        public void AddMembersIdentity_ExpectMembersUserStoreResolvable()
-        {
-            IUserStore<MemberIdentityUser> userStore = Services.GetService<IUserStore<MemberIdentityUser>>();
+        Assert.IsNotNull(userStore);
+        Assert.AreEqual(typeof(MemberUserStore), userStore.GetType());
+    }
 
-            Assert.IsNotNull(userStore);
-            Assert.AreEqual(typeof(MemberUserStore), userStore.GetType());
-        }
+    [Test]
+    public void AddMembersIdentity_ExpectMembersUserManagerResolvable()
+    {
+        var userManager = Services.GetService<IMemberManager>();
 
-        [Test]
-        public void AddMembersIdentity_ExpectMembersUserManagerResolvable()
-        {
-            IMemberManager userManager = Services.GetService<IMemberManager>();
-
-            Assert.NotNull(userManager);
-        }
+        Assert.NotNull(userManager);
     }
 }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs b/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs
index 7a3fa7c853..2bc3dc3d89 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Web.Website/Routing/FrontEndRouteTests.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
@@ -16,81 +14,105 @@ using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.Website.Routing
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Web.Website.Routing;
+
+[TestFixture]
+public class SurfaceControllerTests : UmbracoTestServerTestBase
 {
-    [TestFixture]
-    public class SurfaceControllerTests : UmbracoTestServerTestBase
+    [Test]
+    public async Task Auto_Routes_For_Default_Action()
     {
-        [Test]
-        public async Task Auto_Routes_For_Default_Action()
-        {
-            string url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.Index());
+        var url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.Index());
 
-            // Act
-            HttpResponseMessage response = await Client.GetAsync(url);
+        // Act
+        var response = await Client.GetAsync(url);
 
-            string body = await response.Content.ReadAsStringAsync();
+        var body = await response.Content.ReadAsStringAsync();
 
-            // Assert
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-        }
-
-        [Test]
-        public async Task Auto_Routes_For_Custom_Action()
-        {
-            string url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.News());
-
-            // Act
-            HttpResponseMessage response = await Client.GetAsync(url);
-
-            string body = await response.Content.ReadAsStringAsync();
-
-            // Assert
-            Assert.AreEqual(HttpStatusCode.NoContent, response.StatusCode);
-        }
-
-        [Test]
-        public async Task Plugin_Controller_Routes_By_Area()
-        {
-            // Create URL manually, because PrepareSurfaceController URl will prepare whatever the controller is routed as
-            Type controllerType = typeof(TestPluginController);
-            var pluginAttribute = CustomAttributeExtensions.GetCustomAttribute<PluginControllerAttribute>(controllerType, false);
-            var controllerName = ControllerExtensions.GetControllerName(controllerType);
-            string url = $"/umbraco/{pluginAttribute?.AreaName}/{controllerName}";
-            PrepareUrl(url);
-
-            HttpResponseMessage response = await Client.GetAsync(url);
-
-            string body = await response.Content.ReadAsStringAsync();
-
-            Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
-
-        }
+        // Assert
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
     }
 
-    // Test controllers must be non-nested, else we need to jump through some hoops with custom
-    // IApplicationFeatureProvider<ControllerFeature>
-    // For future notes if we want this, some example code of this is here
-    // https://tpodolak.com/blog/2020/06/22/asp-net-core-adding-controllers-directly-integration-tests/
-    public class TestSurfaceController : SurfaceController
+    [Test]
+    public async Task Auto_Routes_For_Custom_Action()
     {
-        public TestSurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IPublishedUrlProvider publishedUrlProvider)
-            : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger, publishedUrlProvider)
-        {
-        }
+        var url = PrepareSurfaceControllerUrl<TestSurfaceController>(x => x.News());
 
-        public IActionResult Index() => Ok();
+        // Act
+        var response = await Client.GetAsync(url);
 
-        public IActionResult News() => NoContent();
+        var body = await response.Content.ReadAsStringAsync();
+
+        // Assert
+        Assert.AreEqual(HttpStatusCode.NoContent, response.StatusCode);
     }
 
-    [PluginController("TestArea")]
-    public class TestPluginController : SurfaceController
+    [Test]
+    public async Task Plugin_Controller_Routes_By_Area()
     {
-        public TestPluginController(IUmbracoContextAccessor umbracoContextAccessor, IUmbracoDatabaseFactory databaseFactory, ServiceContext services, AppCaches appCaches, IProfilingLogger profilingLogger, IPublishedUrlProvider publishedUrlProvider) : base(umbracoContextAccessor, databaseFactory, services, appCaches, profilingLogger, publishedUrlProvider)
-        {
-        }
+        // Create URL manually, because PrepareSurfaceController URl will prepare whatever the controller is routed as
+        var controllerType = typeof(TestPluginController);
+        var pluginAttribute =
+            CustomAttributeExtensions.GetCustomAttribute<PluginControllerAttribute>(controllerType, false);
+        var controllerName = ControllerExtensions.GetControllerName(controllerType);
+        var url = $"/umbraco/{pluginAttribute?.AreaName}/{controllerName}";
+        PrepareUrl(url);
 
-        public IActionResult Index() => Ok();
+        var response = await Client.GetAsync(url);
+
+        var body = await response.Content.ReadAsStringAsync();
+
+        Assert.AreEqual(HttpStatusCode.OK, response.StatusCode);
     }
 }
+
+// Test controllers must be non-nested, else we need to jump through some hoops with custom
+// IApplicationFeatureProvider<ControllerFeature>
+// For future notes if we want this, some example code of this is here
+// https://tpodolak.com/blog/2020/06/22/asp-net-core-adding-controllers-directly-integration-tests/
+public class TestSurfaceController : SurfaceController
+{
+    public TestSurfaceController(
+        IUmbracoContextAccessor umbracoContextAccessor,
+        IUmbracoDatabaseFactory databaseFactory,
+        ServiceContext services,
+        AppCaches appCaches,
+        IProfilingLogger profilingLogger,
+        IPublishedUrlProvider publishedUrlProvider)
+        : base(
+            umbracoContextAccessor,
+            databaseFactory,
+            services,
+            appCaches,
+            profilingLogger,
+            publishedUrlProvider)
+    {
+    }
+
+    public IActionResult Index() => Ok();
+
+    public IActionResult News() => NoContent();
+}
+
+[PluginController("TestArea")]
+public class TestPluginController : SurfaceController
+{
+    public TestPluginController(
+        IUmbracoContextAccessor umbracoContextAccessor,
+        IUmbracoDatabaseFactory databaseFactory,
+        ServiceContext services,
+        AppCaches appCaches,
+        IProfilingLogger profilingLogger,
+        IPublishedUrlProvider publishedUrlProvider)
+        : base(
+            umbracoContextAccessor,
+            databaseFactory,
+            services,
+            appCaches,
+            profilingLogger,
+            publishedUrlProvider)
+    {
+    }
+
+    public IActionResult Index() => Ok();
+}
diff --git a/tests/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
index 7134891f11..b89a53cfe0 100644
--- a/tests/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
+++ b/tests/Umbraco.Tests.UnitTests/AutoFixture/AutoMoqDataAttribute.cs
@@ -4,19 +4,18 @@
 using System;
 using AutoFixture.NUnit3;
 
-namespace Umbraco.Cms.Tests.UnitTests.AutoFixture
+namespace Umbraco.Cms.Tests.UnitTests.AutoFixture;
+
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor)]
+public class AutoMoqDataAttribute : AutoDataAttribute
 {
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor)]
-    public class AutoMoqDataAttribute : AutoDataAttribute
+    /// <summary>
+    ///     Uses AutoFixture to automatically mock (using Moq) the injected types. E.g when injecting interfaces.
+    ///     AutoFixture is used to generate concrete types. If the concrete type required some types injected, the
+    ///     [Frozen] can be used to ensure the same variable is injected and available as parameter for the test
+    /// </summary>
+    public AutoMoqDataAttribute()
+        : base(UmbracoAutoMoqFixtureFactory.CreateDefaultFixture)
     {
-        /// <summary>
-        /// Uses AutoFixture to automatically mock (using Moq) the injected types. E.g when injecting interfaces.
-        /// AutoFixture is used to generate concrete types. If the concrete type required some types injected, the
-        /// [Frozen] can be used to ensure the same variable is injected and available as parameter for the test
-        /// </summary>
-        public AutoMoqDataAttribute()
-            : base(UmbracoAutoMoqFixtureFactory.CreateDefaultFixture)
-        {
-        }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/OmitRecursionCustomization.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/OmitRecursionCustomization.cs
index 8a799c2401..1ae0af54ef 100644
--- a/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/OmitRecursionCustomization.cs
+++ b/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/OmitRecursionCustomization.cs
@@ -1,10 +1,9 @@
 using AutoFixture;
 
-namespace Umbraco.Cms.Tests.UnitTests.AutoFixture.Customizations
+namespace Umbraco.Cms.Tests.UnitTests.AutoFixture.Customizations;
+
+internal class OmitRecursionCustomization : ICustomization
 {
-    internal class OmitRecursionCustomization : ICustomization
-    {
-        public void Customize(IFixture fixture) =>
-            fixture.Behaviors.Add(new OmitOnRecursionBehavior());
-    }
+    public void Customize(IFixture fixture) =>
+        fixture.Behaviors.Add(new OmitOnRecursionBehavior());
 }
diff --git a/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs
index a0bf275d41..45ff7320c2 100644
--- a/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs
+++ b/tests/Umbraco.Tests.UnitTests/AutoFixture/Customizations/UmbracoCustomizations.cs
@@ -18,55 +18,58 @@ using Umbraco.Cms.Web.BackOffice.Install;
 using Umbraco.Cms.Web.BackOffice.Routing;
 using Umbraco.Cms.Web.Common.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.AutoFixture.Customizations
+namespace Umbraco.Cms.Tests.UnitTests.AutoFixture.Customizations;
+
+internal class UmbracoCustomizations : ICustomization
 {
-    internal class UmbracoCustomizations : ICustomization
+    public void Customize(IFixture fixture)
     {
-        public void Customize(IFixture fixture)
-        {
-            fixture.Customize<BackOfficeIdentityUser>(
-                u => u.FromFactory<string, string, string>(
-                    (a, b, c) => BackOfficeIdentityUser.CreateNew(new GlobalSettings(), a, b, c)));
+        fixture.Customize<BackOfficeIdentityUser>(
+            u => u.FromFactory<string, string, string>(
+                (a, b, c) => BackOfficeIdentityUser.CreateNew(new GlobalSettings(), a, b, c)));
 
-            fixture
-                .Customize(new ConstructorCustomization(typeof(UsersController), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(InstallController), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(PreviewController), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(MemberController), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(BackOfficeController), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(BackOfficeUserManager), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(MemberManager), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(DatabaseSchemaCreatorFactory), new GreedyConstructorQuery()))
-                .Customize(new ConstructorCustomization(typeof(BackOfficeServerVariables), new GreedyConstructorQuery()));
+        fixture
+            .Customize(new ConstructorCustomization(typeof(UsersController), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(InstallController), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(PreviewController), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(MemberController), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(BackOfficeController), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(BackOfficeUserManager), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(MemberManager), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(DatabaseSchemaCreatorFactory), new GreedyConstructorQuery()))
+            .Customize(new ConstructorCustomization(typeof(BackOfficeServerVariables), new GreedyConstructorQuery()));
 
-            // When requesting an IUserStore ensure we actually uses a IUserLockoutStore
-            fixture.Customize<IUserStore<BackOfficeIdentityUser>>(cc => cc.FromFactory(Mock.Of<IUserLockoutStore<BackOfficeIdentityUser>>));
+        // When requesting an IUserStore ensure we actually uses a IUserLockoutStore
+        fixture.Customize<IUserStore<BackOfficeIdentityUser>>(cc =>
+            cc.FromFactory(Mock.Of<IUserLockoutStore<BackOfficeIdentityUser>>));
 
-            fixture.Customize<IUmbracoVersion>(
-                u => u.FromFactory(
-                    () => new UmbracoVersion()));
+        fixture.Customize<IUmbracoVersion>(
+            u => u.FromFactory(
+                () => new UmbracoVersion()));
 
-            fixture.Customize<HostingSettings>(x =>
-                x.With(settings => settings.ApplicationVirtualPath, string.Empty));
+        fixture.Customize<HostingSettings>(x =>
+            x.With(settings => settings.ApplicationVirtualPath, string.Empty));
 
-            fixture.Customize<BackOfficeAreaRoutes>(u => u.FromFactory(
-                () => new BackOfficeAreaRoutes(
-                    Options.Create(new GlobalSettings()),
-                    Mock.Of<IHostingEnvironment>(x => x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
-                    Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run),
-                    new UmbracoApiControllerTypeCollection(Enumerable.Empty<Type>))));
+        fixture.Customize<BackOfficeAreaRoutes>(u => u.FromFactory(
+            () => new BackOfficeAreaRoutes(
+                Options.Create(new GlobalSettings()),
+                Mock.Of<IHostingEnvironment>(x =>
+                    x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
+                Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run),
+                new UmbracoApiControllerTypeCollection(Enumerable.Empty<Type>))));
 
-            fixture.Customize<PreviewRoutes>(u => u.FromFactory(
-                () => new PreviewRoutes(
-                    Options.Create(new GlobalSettings()),
-                    Mock.Of<IHostingEnvironment>(x => x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
-                    Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run))));
+        fixture.Customize<PreviewRoutes>(u => u.FromFactory(
+            () => new PreviewRoutes(
+                Options.Create(new GlobalSettings()),
+                Mock.Of<IHostingEnvironment>(x =>
+                    x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
+                Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run))));
 
-            var httpContextAccessor = new HttpContextAccessor { HttpContext = new DefaultHttpContext() };
-            fixture.Customize<HttpContext>(x => x.FromFactory(() => httpContextAccessor.HttpContext));
-            fixture.Customize<IHttpContextAccessor>(x => x.FromFactory(() => httpContextAccessor));
+        var httpContextAccessor = new HttpContextAccessor { HttpContext = new DefaultHttpContext() };
+        fixture.Customize<HttpContext>(x => x.FromFactory(() => httpContextAccessor.HttpContext));
+        fixture.Customize<IHttpContextAccessor>(x => x.FromFactory(() => httpContextAccessor));
 
-            fixture.Customize<WebRoutingSettings>(x => x.With(settings => settings.UmbracoApplicationUrl, "http://localhost:5000"));
-        }
+        fixture.Customize<WebRoutingSettings>(x =>
+            x.With(settings => settings.UmbracoApplicationUrl, "http://localhost:5000"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs
index a4a28477b1..2fc0cf6101 100644
--- a/tests/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs
+++ b/tests/Umbraco.Tests.UnitTests/AutoFixture/InlineAutoMoqDataAttribute.cs
@@ -4,19 +4,18 @@
 using System;
 using AutoFixture.NUnit3;
 
-namespace Umbraco.Cms.Tests.UnitTests.AutoFixture
+namespace Umbraco.Cms.Tests.UnitTests.AutoFixture;
+
+[AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = true)]
+public class InlineAutoMoqDataAttribute : InlineAutoDataAttribute
 {
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = true)]
-    public class InlineAutoMoqDataAttribute : InlineAutoDataAttribute
+    /// <summary>
+    ///     Uses AutoFixture to automatically mock (using Moq) the injected types. E.g when injecting interfaces.
+    ///     AutoFixture is used to generate concrete types. If the concrete type required some types injected, the
+    ///     [Frozen] can be used to ensure the same variable is injected and available as parameter for the test
+    /// </summary>
+    public InlineAutoMoqDataAttribute(params object[] arguments)
+        : base(UmbracoAutoMoqFixtureFactory.CreateDefaultFixture, arguments)
     {
-        /// <summary>
-        /// Uses AutoFixture to automatically mock (using Moq) the injected types. E.g when injecting interfaces.
-        /// AutoFixture is used to generate concrete types. If the concrete type required some types injected, the
-        /// [Frozen] can be used to ensure the same variable is injected and available as parameter for the test
-        /// </summary>
-        public InlineAutoMoqDataAttribute(params object[] arguments)
-            : base(UmbracoAutoMoqFixtureFactory.CreateDefaultFixture, arguments)
-        {
-        }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/AutoFixture/UmbracoAutoMoqFixtureFactory.cs b/tests/Umbraco.Tests.UnitTests/AutoFixture/UmbracoAutoMoqFixtureFactory.cs
index 114cef063c..3813b49e91 100644
--- a/tests/Umbraco.Tests.UnitTests/AutoFixture/UmbracoAutoMoqFixtureFactory.cs
+++ b/tests/Umbraco.Tests.UnitTests/AutoFixture/UmbracoAutoMoqFixtureFactory.cs
@@ -2,14 +2,13 @@ using AutoFixture;
 using AutoFixture.AutoMoq;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture.Customizations;
 
-namespace Umbraco.Cms.Tests.UnitTests.AutoFixture
+namespace Umbraco.Cms.Tests.UnitTests.AutoFixture;
+
+internal static class UmbracoAutoMoqFixtureFactory
 {
-    internal static class UmbracoAutoMoqFixtureFactory
-    {
-        internal static IFixture CreateDefaultFixture() =>
-            new Fixture()
-                .Customize(new AutoMoqCustomization { ConfigureMembers = true })
-                .Customize(new OmitRecursionCustomization())
-                .Customize(new UmbracoCustomizations());
-    }
+    internal static IFixture CreateDefaultFixture() =>
+        new Fixture()
+            .Customize(new AutoMoqCustomization { ConfigureMembers = true })
+            .Customize(new OmitRecursionCustomization())
+            .Customize(new UmbracoCustomizations());
 }
diff --git a/tests/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
index 05ebc64c65..8e74e4b9bd 100644
--- a/tests/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
+++ b/tests/Umbraco.Tests.UnitTests/TestHelpers/BaseUsingSqlSyntax.cs
@@ -1,55 +1,50 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Moq;
 using NPoco;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Extensions;
+using MapperCollection = NPoco.MapperCollection;
 
-namespace Umbraco.Cms.Tests.UnitTests.TestHelpers
+namespace Umbraco.Cms.Tests.UnitTests.TestHelpers;
+
+[TestFixture]
+public abstract class BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public abstract class BaseUsingSqlSyntax
+    [SetUp]
+    public virtual void Setup()
     {
-        protected IMapperCollection Mappers { get; private set; }
+        var container = TestHelper.GetServiceCollection();
+        var typeLoader = TestHelper.GetMockedTypeLoader();
 
-        protected ISqlContext SqlContext { get; private set; }
+        var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
 
-        protected Sql<ISqlContext> Sql() => NPoco.Sql.BuilderFor(SqlContext);
+        composition.WithCollectionBuilder<MapperCollectionBuilder>()
+            .AddCoreMappers();
 
-        [SetUp]
-        public virtual void Setup()
-        {
-            IServiceCollection container = TestHelper.GetServiceCollection();
-            TypeLoader typeLoader = TestHelper.GetMockedTypeLoader();
+        composition.Services.AddUnique(_ => SqlContext);
 
-            var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            composition.WithCollectionBuilder<MapperCollectionBuilder>()
-                .AddCoreMappers();
-
-            composition.Services.AddUnique(_ => SqlContext);
-
-            IServiceProvider factory = composition.CreateServiceProvider();
-            var pocoMappers = new NPoco.MapperCollection
-            {
-                new NullableDateMapper()
-            };
-            var pocoDataFactory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, pocoMappers).Init(), pocoMappers);
-            var sqlSyntax = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
-            SqlContext = new SqlContext(sqlSyntax, DatabaseType.SqlServer2012, pocoDataFactory, factory.GetRequiredService<IMapperCollection>());
-            Mappers = factory.GetRequiredService<IMapperCollection>();
-        }
+        var factory = composition.CreateServiceProvider();
+        var pocoMappers = new MapperCollection { new NullableDateMapper() };
+        var pocoDataFactory =
+            new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, pocoMappers).Init(), pocoMappers);
+        var sqlSyntax = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
+        SqlContext = new SqlContext(sqlSyntax, DatabaseType.SqlServer2012, pocoDataFactory, factory.GetRequiredService<IMapperCollection>());
+        Mappers = factory.GetRequiredService<IMapperCollection>();
     }
+
+    protected IMapperCollection Mappers { get; private set; }
+
+    protected ISqlContext SqlContext { get; private set; }
+
+    protected Sql<ISqlContext> Sql() => NPoco.Sql.BuilderFor(SqlContext);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs
index 72793780f8..ab08f12ce7 100644
--- a/tests/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs
+++ b/tests/Umbraco.Tests.UnitTests/TestHelpers/CompositionExtensions.cs
@@ -1,19 +1,18 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
 using Microsoft.Extensions.DependencyInjection;
 using Umbraco.Cms.Core.DependencyInjection;
 
-namespace Umbraco.Cms.Tests.UnitTests.TestHelpers
+namespace Umbraco.Cms.Tests.UnitTests.TestHelpers;
+
+public static class CompositionExtensions
 {
-    public static class CompositionExtensions
+    [Obsolete("This extension method exists only to ease migration, please refactor")]
+    public static IServiceProvider CreateServiceProvider(this IUmbracoBuilder builder)
     {
-        [Obsolete("This extension method exists only to ease migration, please refactor")]
-        public static IServiceProvider CreateServiceProvider(this IUmbracoBuilder builder)
-        {
-            builder.Build();
-            return builder.Services.BuildServiceProvider();
-        }
+        builder.Build();
+        return builder.Services.BuildServiceProvider();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs
index 8e3cea58d6..94a64b31c9 100644
--- a/tests/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs
+++ b/tests/Umbraco.Tests.UnitTests/TestHelpers/Objects/TestUmbracoContextFactory.cs
@@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Options;
 using Moq;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Web;
@@ -13,59 +12,58 @@ using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Web.Common.AspNetCore;
 using Umbraco.Cms.Web.Common.UmbracoContext;
 
-namespace Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects
+namespace Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects;
+
+/// <summary>
+///     Simplify creating test UmbracoContext's
+/// </summary>
+public class TestUmbracoContextFactory
 {
-    /// <summary>
-    /// Simplify creating test UmbracoContext's
-    /// </summary>
-    public class TestUmbracoContextFactory
+    public static IUmbracoContextFactory Create(
+        GlobalSettings globalSettings = null,
+        IUmbracoContextAccessor umbracoContextAccessor = null,
+        IHttpContextAccessor httpContextAccessor = null,
+        IPublishedUrlProvider publishedUrlProvider = null)
     {
-        public static IUmbracoContextFactory Create(
-            GlobalSettings globalSettings = null,
-            IUmbracoContextAccessor umbracoContextAccessor = null,
-            IHttpContextAccessor httpContextAccessor = null,
-            IPublishedUrlProvider publishedUrlProvider = null)
+        if (globalSettings == null)
         {
-            if (globalSettings == null)
-            {
-                globalSettings = new GlobalSettings();
-            }
-
-            if (umbracoContextAccessor == null)
-            {
-                umbracoContextAccessor = new TestUmbracoContextAccessor();
-            }
-
-            if (httpContextAccessor == null)
-            {
-                httpContextAccessor = Mock.Of<IHttpContextAccessor>();
-            }
-
-            if (publishedUrlProvider == null)
-            {
-                publishedUrlProvider = Mock.Of<IPublishedUrlProvider>();
-            }
-
-            var contentCache = new Mock<IPublishedContentCache>();
-            var mediaCache = new Mock<IPublishedMediaCache>();
-            var snapshot = new Mock<IPublishedSnapshot>();
-            snapshot.Setup(x => x.Content).Returns(contentCache.Object);
-            snapshot.Setup(x => x.Media).Returns(mediaCache.Object);
-            var snapshotService = new Mock<IPublishedSnapshotService>();
-            snapshotService.Setup(x => x.CreatePublishedSnapshot(It.IsAny<string>())).Returns(snapshot.Object);
-
-            IHostingEnvironment hostingEnvironment = TestHelper.GetHostingEnvironment();
-
-            var umbracoContextFactory = new UmbracoContextFactory(
-                umbracoContextAccessor,
-                snapshotService.Object,
-                new UmbracoRequestPaths(Options.Create(globalSettings), hostingEnvironment),
-                hostingEnvironment,
-                new UriUtility(hostingEnvironment),
-                new AspNetCoreCookieManager(httpContextAccessor),
-                httpContextAccessor);
-
-            return umbracoContextFactory;
+            globalSettings = new GlobalSettings();
         }
+
+        if (umbracoContextAccessor == null)
+        {
+            umbracoContextAccessor = new TestUmbracoContextAccessor();
+        }
+
+        if (httpContextAccessor == null)
+        {
+            httpContextAccessor = Mock.Of<IHttpContextAccessor>();
+        }
+
+        if (publishedUrlProvider == null)
+        {
+            publishedUrlProvider = Mock.Of<IPublishedUrlProvider>();
+        }
+
+        var contentCache = new Mock<IPublishedContentCache>();
+        var mediaCache = new Mock<IPublishedMediaCache>();
+        var snapshot = new Mock<IPublishedSnapshot>();
+        snapshot.Setup(x => x.Content).Returns(contentCache.Object);
+        snapshot.Setup(x => x.Media).Returns(mediaCache.Object);
+        var snapshotService = new Mock<IPublishedSnapshotService>();
+        snapshotService.Setup(x => x.CreatePublishedSnapshot(It.IsAny<string>())).Returns(snapshot.Object);
+
+        var hostingEnvironment = TestHelper.GetHostingEnvironment();
+
+        var umbracoContextFactory = new UmbracoContextFactory(
+            umbracoContextAccessor,
+            snapshotService.Object,
+            new UmbracoRequestPaths(Options.Create(globalSettings), hostingEnvironment),
+            hostingEnvironment,
+            new UriUtility(hostingEnvironment),
+            new AspNetCoreCookieManager(httpContextAccessor),
+            httpContextAccessor);
+
+        return umbracoContextFactory;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/TestHelpers/PublishedSnapshotServiceTestBase.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/PublishedSnapshotServiceTestBase.cs
index a74f9e5726..dbc862e39c 100644
--- a/tests/Umbraco.Tests.UnitTests/TestHelpers/PublishedSnapshotServiceTestBase.cs
+++ b/tests/Umbraco.Tests.UnitTests/TestHelpers/PublishedSnapshotServiceTestBase.cs
@@ -8,7 +8,6 @@ using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Hosting;
@@ -29,250 +28,264 @@ using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Extensions;
+using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
 
-namespace Umbraco.Cms.Tests.UnitTests.TestHelpers
+namespace Umbraco.Cms.Tests.UnitTests.TestHelpers;
+
+[TestFixture]
+public class PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class PublishedSnapshotServiceTestBase
+    [SetUp]
+    public virtual void Setup()
     {
-        [SetUp]
-        public virtual void Setup()
-        {
-            VariationContextAccessor = new TestVariationContextAccessor();
-            PublishedSnapshotAccessor = new TestPublishedSnapshotAccessor();
-        }
+        VariationContextAccessor = new TestVariationContextAccessor();
+        PublishedSnapshotAccessor = new TestPublishedSnapshotAccessor();
+    }
 
-        [TearDown]
-        public void Teardown() => SnapshotService?.Dispose();
+    [TearDown]
+    public void Teardown() => SnapshotService?.Dispose();
 
-        protected IShortStringHelper ShortStringHelper { get; } = TestHelper.ShortStringHelper;
-        protected virtual IPublishedModelFactory PublishedModelFactory { get; } = new NoopPublishedModelFactory();
-        protected IContentTypeService ContentTypeService { get; private set; }
-        protected IMediaTypeService MediaTypeService { get; private set; }
-        protected IDataTypeService DataTypeService { get; private set; }
-        protected IDomainService DomainService { get; private set; }
-        protected IPublishedValueFallback PublishedValueFallback { get; private set; }
-        protected IPublishedSnapshotService SnapshotService { get; private set; }
-        protected IVariationContextAccessor VariationContextAccessor { get; private set; }
-        protected TestPublishedSnapshotAccessor PublishedSnapshotAccessor { get; private set; }
-        protected TestNuCacheContentService NuCacheContentService { get; private set; }
-        protected PublishedContentTypeFactory PublishedContentTypeFactory { get; private set; }
-        protected GlobalSettings GlobalSettings { get; } = new();
+    protected IShortStringHelper ShortStringHelper { get; } = TestHelper.ShortStringHelper;
 
-        protected virtual PropertyValueConverterCollection PropertyValueConverterCollection =>
-            new(() => new[] { new TestSimpleTinyMceValueConverter() });
+    protected virtual IPublishedModelFactory PublishedModelFactory { get; } = new NoopPublishedModelFactory();
 
-        protected IPublishedContent GetContent(int id)
-        {
-            IPublishedSnapshot snapshot = GetPublishedSnapshot();
-            IPublishedContent doc = snapshot.Content.GetById(id);
-            Assert.IsNotNull(doc);
-            return doc;
-        }
+    protected IContentTypeService ContentTypeService { get; private set; }
 
-        protected IPublishedContent GetMedia(int id)
-        {
-            IPublishedSnapshot snapshot = GetPublishedSnapshot();
-            IPublishedContent doc = snapshot.Media.GetById(id);
-            Assert.IsNotNull(doc);
-            return doc;
-        }
+    protected IMediaTypeService MediaTypeService { get; private set; }
 
-        protected UrlProvider GetUrlProvider(
-            IUmbracoContextAccessor umbracoContextAccessor,
-            RequestHandlerSettings requestHandlerSettings,
-            WebRoutingSettings webRoutingSettings,
-            out UriUtility uriUtility)
-        {
-            uriUtility = new UriUtility(Mock.Of<IHostingEnvironment>());
-            var urlProvider = new DefaultUrlProvider(
-                Mock.Of<IOptionsMonitor<RequestHandlerSettings>>(x=> x.CurrentValue == requestHandlerSettings),
-                Mock.Of<ILogger<DefaultUrlProvider>>(),
-                new SiteDomainMapper(),
-                umbracoContextAccessor,
-                uriUtility,
-                Mock.Of<ILocalizationService>(x=>x.GetDefaultLanguageIsoCode() == GlobalSettings.DefaultUILanguage)
-            );
+    protected IDataTypeService DataTypeService { get; private set; }
 
-            var publishedUrlProvider = new UrlProvider(
-                umbracoContextAccessor,
-                Options.Create(webRoutingSettings),
-                new UrlProviderCollection(() => new[] { urlProvider }),
-                new MediaUrlProviderCollection(() => Enumerable.Empty<IMediaUrlProvider>()),
-                Mock.Of<IVariationContextAccessor>());
+    protected IDomainService DomainService { get; private set; }
 
-            return publishedUrlProvider;
-        }
+    protected IPublishedValueFallback PublishedValueFallback { get; private set; }
 
-        protected static PublishedRouter CreatePublishedRouter(
-            IUmbracoContextAccessor umbracoContextAccessor,
-            IEnumerable<IContentFinder> contentFinders = null,
-            IPublishedUrlProvider publishedUrlProvider = null) => new(Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x=> x.CurrentValue == new WebRoutingSettings()),
-            new ContentFinderCollection(() => contentFinders ?? Enumerable.Empty<IContentFinder>()),
-            new TestLastChanceFinder(), new TestVariationContextAccessor(), Mock.Of<IProfilingLogger>(),
-            Mock.Of<ILogger<PublishedRouter>>(), publishedUrlProvider ?? Mock.Of<IPublishedUrlProvider>(),
-            Mock.Of<IRequestAccessor>(), Mock.Of<IPublishedValueFallback>(), Mock.Of<IFileService>(),
-            Mock.Of<IContentTypeService>(), umbracoContextAccessor, Mock.Of<IEventAggregator>());
+    protected IPublishedSnapshotService SnapshotService { get; private set; }
 
-        protected IUmbracoContextAccessor GetUmbracoContextAccessor(string urlAsString)
-        {
-            IPublishedSnapshot snapshot = GetPublishedSnapshot();
+    protected IVariationContextAccessor VariationContextAccessor { get; private set; }
 
-            var uri = new Uri(urlAsString.Contains(Uri.SchemeDelimiter)
-                ? urlAsString
-                : $"http://example.com{urlAsString}");
+    protected TestPublishedSnapshotAccessor PublishedSnapshotAccessor { get; private set; }
 
-            IUmbracoContext umbracoContext = Mock.Of<IUmbracoContext>(
-                x => x.CleanedUmbracoUrl == uri
-                     && x.Content == snapshot.Content
-                     && x.PublishedSnapshot == snapshot);
-            var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            return umbracoContextAccessor;
-        }
+    protected TestNuCacheContentService NuCacheContentService { get; private set; }
 
-        /// <summary>
-        ///     Used as a property editor for any test property that has an editor alias called "Umbraco.Void.RTE"
-        /// </summary>
-        private class TestSimpleTinyMceValueConverter : SimpleTinyMceValueConverter
-        {
-            public override bool IsConverter(IPublishedPropertyType propertyType)
-                => propertyType.EditorAlias == "Umbraco.Void.RTE";
-        }
+    protected PublishedContentTypeFactory PublishedContentTypeFactory { get; private set; }
 
-        protected static DataType[] GetDefaultDataTypes()
-        {
-            var serializer = new ConfigurationEditorJsonSerializer();
+    protected GlobalSettings GlobalSettings { get; } = new();
 
-            // create data types, property types and content types
-            var dataType =
-                new DataType(new VoidEditor("Editor", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 3 };
+    protected virtual PropertyValueConverterCollection PropertyValueConverterCollection =>
+        new(() => new[] { new TestSimpleTinyMceValueConverter() });
 
-            return new[] { dataType };
-        }
+    protected IPublishedContent GetContent(int id)
+    {
+        var snapshot = GetPublishedSnapshot();
+        var doc = snapshot.Content.GetById(id);
+        Assert.IsNotNull(doc);
+        return doc;
+    }
 
-        protected virtual ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes,
-            IDataType[] dataTypes)
-        {
-            var contentTypeService = new Mock<IContentTypeService>();
-            contentTypeService.Setup(x => x.GetAll()).Returns(contentTypes);
-            contentTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
-            contentTypeService.Setup(x => x.Get(It.IsAny<string>()))
-                .Returns((string alias) => contentTypes.FirstOrDefault(x => x.Alias.InvariantEquals(alias)));
+    protected IPublishedContent GetMedia(int id)
+    {
+        var snapshot = GetPublishedSnapshot();
+        var doc = snapshot.Media.GetById(id);
+        Assert.IsNotNull(doc);
+        return doc;
+    }
 
-            var mediaTypeService = new Mock<IMediaTypeService>();
-            mediaTypeService.Setup(x => x.GetAll()).Returns(mediaTypes);
-            mediaTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(mediaTypes);
-            mediaTypeService.Setup(x => x.Get(It.IsAny<string>()))
-                .Returns((string alias) => mediaTypes.FirstOrDefault(x => x.Alias.InvariantEquals(alias)));
+    protected UrlProvider GetUrlProvider(
+        IUmbracoContextAccessor umbracoContextAccessor,
+        RequestHandlerSettings requestHandlerSettings,
+        WebRoutingSettings webRoutingSettings,
+        out UriUtility uriUtility)
+    {
+        uriUtility = new UriUtility(Mock.Of<IHostingEnvironment>());
+        var urlProvider = new DefaultUrlProvider(
+            Mock.Of<IOptionsMonitor<RequestHandlerSettings>>(x => x.CurrentValue == requestHandlerSettings),
+            Mock.Of<ILogger<DefaultUrlProvider>>(),
+            new SiteDomainMapper(),
+            umbracoContextAccessor,
+            uriUtility,
+            Mock.Of<ILocalizationService>(x => x.GetDefaultLanguageIsoCode() == GlobalSettings.DefaultUILanguage));
 
-            var contentTypeServiceBaseFactory = new Mock<IContentTypeBaseServiceProvider>();
-            contentTypeServiceBaseFactory.Setup(x => x.For(It.IsAny<IContentBase>()))
-                .Returns(contentTypeService.Object);
+        var publishedUrlProvider = new UrlProvider(
+            umbracoContextAccessor,
+            Options.Create(webRoutingSettings),
+            new UrlProviderCollection(() => new[] { urlProvider }),
+            new MediaUrlProviderCollection(() => Enumerable.Empty<IMediaUrlProvider>()),
+            Mock.Of<IVariationContextAccessor>());
 
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataTypes);
+        return publishedUrlProvider;
+    }
 
-            return ServiceContext.CreatePartial(
-                dataTypeService: dataTypeServiceMock.Object,
-                memberTypeService: Mock.Of<IMemberTypeService>(),
-                memberService: Mock.Of<IMemberService>(),
-                contentTypeService: contentTypeService.Object,
-                mediaTypeService: mediaTypeService.Object,
-                localizationService: Mock.Of<ILocalizationService>(),
-                domainService: Mock.Of<IDomainService>(),
-                fileService: Mock.Of<IFileService>()
-            );
-        }
+    protected static PublishedRouter CreatePublishedRouter(
+        IUmbracoContextAccessor umbracoContextAccessor,
+        IEnumerable<IContentFinder> contentFinders = null,
+        IPublishedUrlProvider publishedUrlProvider = null) => new(
+        Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == new WebRoutingSettings()),
+        new ContentFinderCollection(() => contentFinders ?? Enumerable.Empty<IContentFinder>()),
+        new TestLastChanceFinder(),
+        new TestVariationContextAccessor(),
+        Mock.Of<IProfilingLogger>(),
+        Mock.Of<ILogger<PublishedRouter>>(),
+        publishedUrlProvider ?? Mock.Of<IPublishedUrlProvider>(),
+        Mock.Of<IRequestAccessor>(),
+        Mock.Of<IPublishedValueFallback>(),
+        Mock.Of<IFileService>(),
+        Mock.Of<IContentTypeService>(),
+        umbracoContextAccessor,
+        Mock.Of<IEventAggregator>());
 
-        /// <summary>
-        ///     Creates a published snapshot and set the accessor to resolve the created one
-        /// </summary>
-        /// <returns></returns>
-        protected IPublishedSnapshot GetPublishedSnapshot()
-        {
-            IPublishedSnapshot snapshot = SnapshotService.CreatePublishedSnapshot(null);
-            PublishedSnapshotAccessor.SetCurrent(snapshot);
-            return snapshot;
-        }
+    protected IUmbracoContextAccessor GetUmbracoContextAccessor(string urlAsString)
+    {
+        var snapshot = GetPublishedSnapshot();
 
-        /// <summary>
-        ///     Initializes the <see cref="IPublishedSnapshotService'" /> with a source of data
-        /// </summary>
-        /// <param name="contentNodeKits"></param>
-        /// <param name="contentTypes"></param>
-        protected void InitializedCache(
-            IEnumerable<ContentNodeKit> contentNodeKits,
-            IContentType[] contentTypes,
-            IDataType[] dataTypes = null,
-            IEnumerable<ContentNodeKit> mediaNodeKits = null,
-            IMediaType[] mediaTypes = null)
-        {
-            // create a data source for NuCache
-            NuCacheContentService = new TestNuCacheContentService(contentNodeKits, mediaNodeKits);
+        var uri = new Uri(urlAsString.Contains(Uri.SchemeDelimiter)
+            ? urlAsString
+            : $"http://example.com{urlAsString}");
 
-            IRuntimeState runtime = Mock.Of<IRuntimeState>();
-            Mock.Get(runtime).Setup(x => x.Level).Returns(RuntimeLevel.Run);
+        var umbracoContext = Mock.Of<IUmbracoContext>(
+            x => x.CleanedUmbracoUrl == uri
+                 && x.Content == snapshot.Content
+                 && x.PublishedSnapshot == snapshot);
+        var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
+        return umbracoContextAccessor;
+    }
 
-            // create a service context
-            ServiceContext serviceContext = CreateServiceContext(
-                contentTypes ?? Array.Empty<IContentType>(),
-                mediaTypes ?? Array.Empty<IMediaType>(),
-                dataTypes ?? GetDefaultDataTypes());
+    /// <summary>
+    ///     Used as a property editor for any test property that has an editor alias called "Umbraco.Void.RTE"
+    /// </summary>
+    private class TestSimpleTinyMceValueConverter : SimpleTinyMceValueConverter
+    {
+        public override bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.EditorAlias == "Umbraco.Void.RTE";
+    }
 
-            DataTypeService = serviceContext.DataTypeService;
-            ContentTypeService = serviceContext.ContentTypeService;
-            MediaTypeService = serviceContext.MediaTypeService;
-            DomainService = serviceContext.DomainService;
+    protected static DataType[] GetDefaultDataTypes()
+    {
+        var serializer = new ConfigurationEditorJsonSerializer();
 
-            // create a scope provider
-            Infrastructure.Scoping.IScopeProvider scopeProvider = Mock.Of<Infrastructure.Scoping.IScopeProvider>();
-            Mock.Get(scopeProvider)
-                .Setup(x => x.CreateScope(
-                    It.IsAny<IsolationLevel>(),
-                    It.IsAny<RepositoryCacheMode>(),
-                    It.IsAny<IEventDispatcher>(),
-                    It.IsAny<IScopedNotificationPublisher>(),
-                    It.IsAny<bool?>(),
-                    It.IsAny<bool>(),
-                    It.IsAny<bool>()))
-                .Returns(Mock.Of<IScope>);
+        // create data types, property types and content types
+        var dataType =
+            new DataType(new VoidEditor("Editor", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 3 };
 
-            // create a published content type factory
-            PublishedContentTypeFactory = new PublishedContentTypeFactory(
-                PublishedModelFactory,
-                PropertyValueConverterCollection,
-                DataTypeService);
+        return new[] { dataType };
+    }
 
-            ITypeFinder typeFinder = TestHelper.GetTypeFinder();
+    protected virtual ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes, IDataType[] dataTypes)
+    {
+        var contentTypeService = new Mock<IContentTypeService>();
+        contentTypeService.Setup(x => x.GetAll()).Returns(contentTypes);
+        contentTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(contentTypes);
+        contentTypeService.Setup(x => x.Get(It.IsAny<string>()))
+            .Returns((string alias) => contentTypes.FirstOrDefault(x => x.Alias.InvariantEquals(alias)));
 
-            var nuCacheSettings = new NuCacheSettings();
+        var mediaTypeService = new Mock<IMediaTypeService>();
+        mediaTypeService.Setup(x => x.GetAll()).Returns(mediaTypes);
+        mediaTypeService.Setup(x => x.GetAll(It.IsAny<int[]>())).Returns(mediaTypes);
+        mediaTypeService.Setup(x => x.Get(It.IsAny<string>()))
+            .Returns((string alias) => mediaTypes.FirstOrDefault(x => x.Alias.InvariantEquals(alias)));
 
-            // at last, create the complete NuCache snapshot service!
-            var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
-            SnapshotService = new PublishedSnapshotService(
-                options,
-                Mock.Of<ISyncBootStateAccessor>(x => x.GetSyncBootState() == SyncBootState.WarmBoot),
-                new SimpleMainDom(),
-                serviceContext,
-                PublishedContentTypeFactory,
-                PublishedSnapshotAccessor,
-                VariationContextAccessor,
-                Mock.Of<IProfilingLogger>(),
-                NullLoggerFactory.Instance,
-                scopeProvider,
-                NuCacheContentService,
-                new TestDefaultCultureAccessor(),
-                Options.Create(GlobalSettings),
-                PublishedModelFactory,
-                TestHelper.GetHostingEnvironment(),
-                Options.Create(nuCacheSettings),
-                //ContentNestedDataSerializerFactory,
-                new ContentDataSerializer(new DictionaryOfPropertyDataSerializer()));
+        var contentTypeServiceBaseFactory = new Mock<IContentTypeBaseServiceProvider>();
+        contentTypeServiceBaseFactory.Setup(x => x.For(It.IsAny<IContentBase>()))
+            .Returns(contentTypeService.Object);
 
-            // invariant is the current default
-            VariationContextAccessor.VariationContext = new VariationContext();
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataTypes);
 
-            PublishedValueFallback = new PublishedValueFallback(serviceContext, VariationContextAccessor);
-        }
+        return ServiceContext.CreatePartial(
+            dataTypeService: dataTypeServiceMock.Object,
+            memberTypeService: Mock.Of<IMemberTypeService>(),
+            memberService: Mock.Of<IMemberService>(),
+            contentTypeService: contentTypeService.Object,
+            mediaTypeService: mediaTypeService.Object,
+            localizationService: Mock.Of<ILocalizationService>(),
+            domainService: Mock.Of<IDomainService>(),
+            fileService: Mock.Of<IFileService>());
+    }
+
+    /// <summary>
+    ///     Creates a published snapshot and set the accessor to resolve the created one
+    /// </summary>
+    /// <returns></returns>
+    protected IPublishedSnapshot GetPublishedSnapshot()
+    {
+        var snapshot = SnapshotService.CreatePublishedSnapshot(null);
+        PublishedSnapshotAccessor.SetCurrent(snapshot);
+        return snapshot;
+    }
+
+    /// <summary>
+    ///     Initializes the <see cref="IPublishedSnapshotService'" /> with a source of data
+    /// </summary>
+    protected void InitializedCache(
+        IEnumerable<ContentNodeKit> contentNodeKits,
+        IContentType[] contentTypes,
+        IDataType[] dataTypes = null,
+        IEnumerable<ContentNodeKit> mediaNodeKits = null,
+        IMediaType[] mediaTypes = null)
+    {
+        // create a data source for NuCache
+        NuCacheContentService = new TestNuCacheContentService(contentNodeKits, mediaNodeKits);
+
+        var runtime = Mock.Of<IRuntimeState>();
+        Mock.Get(runtime).Setup(x => x.Level).Returns(RuntimeLevel.Run);
+
+        // create a service context
+        var serviceContext = CreateServiceContext(
+            contentTypes ?? Array.Empty<IContentType>(),
+            mediaTypes ?? Array.Empty<IMediaType>(),
+            dataTypes ?? GetDefaultDataTypes());
+
+        DataTypeService = serviceContext.DataTypeService;
+        ContentTypeService = serviceContext.ContentTypeService;
+        MediaTypeService = serviceContext.MediaTypeService;
+        DomainService = serviceContext.DomainService;
+
+        // create a scope provider
+        var scopeProvider = Mock.Of<IScopeProvider>();
+        Mock.Get(scopeProvider)
+            .Setup(x => x.CreateScope(
+                It.IsAny<IsolationLevel>(),
+                It.IsAny<RepositoryCacheMode>(),
+                It.IsAny<IEventDispatcher>(),
+                It.IsAny<IScopedNotificationPublisher>(),
+                It.IsAny<bool?>(),
+                It.IsAny<bool>(),
+                It.IsAny<bool>()))
+            .Returns(Mock.Of<IScope>);
+
+        // create a published content type factory
+        PublishedContentTypeFactory = new PublishedContentTypeFactory(
+            PublishedModelFactory,
+            PropertyValueConverterCollection,
+            DataTypeService);
+
+        var typeFinder = TestHelper.GetTypeFinder();
+
+        var nuCacheSettings = new NuCacheSettings();
+
+        // at last, create the complete NuCache snapshot service!
+        var options = new PublishedSnapshotServiceOptions { IgnoreLocalDb = true };
+        SnapshotService = new PublishedSnapshotService(
+            options,
+            Mock.Of<ISyncBootStateAccessor>(x => x.GetSyncBootState() == SyncBootState.WarmBoot),
+            new SimpleMainDom(),
+            serviceContext,
+            PublishedContentTypeFactory,
+            PublishedSnapshotAccessor,
+            VariationContextAccessor,
+            Mock.Of<IProfilingLogger>(),
+            NullLoggerFactory.Instance,
+            scopeProvider,
+            NuCacheContentService,
+            new TestDefaultCultureAccessor(),
+            Options.Create(GlobalSettings),
+            PublishedModelFactory,
+            TestHelper.GetHostingEnvironment(),
+            Options.Create(nuCacheSettings),
+            new ContentDataSerializer(new DictionaryOfPropertyDataSerializer()));
+
+        // invariant is the current default
+        VariationContextAccessor.VariationContext = new VariationContext();
+
+        PublishedValueFallback = new PublishedValueFallback(serviceContext, VariationContextAccessor);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs
index 3b13e3ca0c..cfc57ee9ff 100644
--- a/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs
+++ b/tests/Umbraco.Tests.UnitTests/TestHelpers/TestHelper.cs
@@ -37,278 +37,314 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Mail;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 using File = System.IO.File;
 using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
 
-namespace Umbraco.Cms.Tests.UnitTests.TestHelpers
+namespace Umbraco.Cms.Tests.UnitTests.TestHelpers;
+
+/// <summary>
+///     Common helper properties and methods useful to testing
+/// </summary>
+public static class TestHelper
 {
+    private static readonly TestHelperInternal s_testHelperInternal = new();
+
     /// <summary>
-    /// Common helper properties and methods useful to testing
+    ///     Gets the working directory of the test project.
     /// </summary>
-    public static class TestHelper
+    /// <value>The assembly directory.</value>
+    public static string WorkingDirectory => s_testHelperInternal.WorkingDirectory;
+
+    public static IShortStringHelper ShortStringHelper => s_testHelperInternal.ShortStringHelper;
+
+    public static IJsonSerializer JsonSerializer => s_testHelperInternal.JsonSerializer;
+
+    public static IVariationContextAccessor VariationContextAccessor => s_testHelperInternal.VariationContextAccessor;
+
+    public static IBulkSqlInsertProvider BulkSqlInsertProvider => s_testHelperInternal.BulkSqlInsertProvider;
+
+    public static IMarchal Marchal => s_testHelperInternal.Marchal;
+
+    public static CoreDebugSettings CoreDebugSettings => s_testHelperInternal.CoreDebugSettings;
+
+    public static IIOHelper IOHelper => s_testHelperInternal.IOHelper;
+
+    public static IMainDom MainDom => s_testHelperInternal.MainDom;
+
+    public static UriUtility UriUtility => s_testHelperInternal.UriUtility;
+
+    public static IEmailSender EmailSender { get; } = new EmailSender(new NullLogger<EmailSender>(), new TestOptionsMonitor<GlobalSettings>(new GlobalSettings()), Mock.Of<IEventAggregator>());
+
+    public static ITypeFinder GetTypeFinder() => s_testHelperInternal.GetTypeFinder();
+
+    public static TypeLoader GetMockedTypeLoader() => s_testHelperInternal.GetMockedTypeLoader();
+
+    public static Lazy<ISqlContext> GetMockSqlContext()
     {
-        private static readonly TestHelperInternal s_testHelperInternal = new TestHelperInternal();
+        var sqlContext = Mock.Of<ISqlContext>();
+        var syntax = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
+        Mock.Get(sqlContext).Setup(x => x.SqlSyntax).Returns(syntax);
+        return new Lazy<ISqlContext>(() => sqlContext);
+    }
 
-        private class TestHelperInternal : TestHelperBase
+    public static MapperConfigurationStore CreateMaps() => new();
+
+    /// <summary>
+    ///     Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based
+    ///     on a virtual path name
+    /// </summary>
+    public static string MapPathForTestFiles(string relativePath) =>
+        s_testHelperInternal.MapPathForTestFiles(relativePath);
+
+    public static void InitializeContentDirectories() => CreateDirectories(new[]
+    {
+        Constants.SystemDirectories.MvcViews,
+        new GlobalSettings().UmbracoMediaPhysicalRootPath,
+        Constants.SystemDirectories.AppPlugins,
+    });
+
+    public static void CleanContentDirectories() => CleanDirectories(new[]
+    {
+        Constants.SystemDirectories.MvcViews,
+        new GlobalSettings().UmbracoMediaPhysicalRootPath,
+    });
+
+    public static void CreateDirectories(string[] directories)
+    {
+        foreach (var directory in directories)
         {
-            public TestHelperInternal()
-                : base(typeof(TestHelperInternal).Assembly)
+            var directoryInfo = new DirectoryInfo(IOHelper.MapPath(directory));
+            if (directoryInfo.Exists == false)
             {
+                Directory.CreateDirectory(IOHelper.MapPath(directory));
             }
-
-            public override IBulkSqlInsertProvider BulkSqlInsertProvider { get; } = Mock.Of<IBulkSqlInsertProvider>();
-
-            public override IMarchal Marchal { get; } = Mock.Of<IMarchal>();
-
-            public override IHostingEnvironment GetHostingEnvironment()
-            {
-                var testPath = TestContext.CurrentContext.TestDirectory.Split("bin")[0];
-                return new TestHostingEnvironment(
-                    Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == new HostingSettings()),
-                    Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == new WebRoutingSettings()),
-                    Mock.Of<IWebHostEnvironment>(
-                        x =>
-                            x.WebRootPath == "/" &&
-                            x.ContentRootPath == testPath));
-            }
-
-            public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime()
-                => Mock.Of<IApplicationShutdownRegistry>();
-
-            public override IIpResolver GetIpResolver()
-                => Mock.Of<IIpResolver>();
         }
+    }
 
-        public static ITypeFinder GetTypeFinder() => s_testHelperInternal.GetTypeFinder();
+    public static void CleanDirectories(string[] directories)
+    {
+        var preserves = new Dictionary<string, string[]> { { Constants.SystemDirectories.MvcViews, new[] { "dummy.txt" } } };
 
-        public static TypeLoader GetMockedTypeLoader() => s_testHelperInternal.GetMockedTypeLoader();
-
-        public static Lazy<ISqlContext> GetMockSqlContext()
+        foreach (var directory in directories)
         {
-            ISqlContext sqlContext = Mock.Of<ISqlContext>();
-            var syntax = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
-            Mock.Get(sqlContext).Setup(x => x.SqlSyntax).Returns(syntax);
-            return new Lazy<ISqlContext>(() => sqlContext);
-        }
-
-        public static MapperConfigurationStore CreateMaps()
-            => new MapperConfigurationStore();
-
-        /// <summary>
-        /// Gets the working directory of the test project.
-        /// </summary>
-        /// <value>The assembly directory.</value>
-        public static string WorkingDirectory => s_testHelperInternal.WorkingDirectory;
-
-        public static IShortStringHelper ShortStringHelper => s_testHelperInternal.ShortStringHelper;
-
-        public static IJsonSerializer JsonSerializer => s_testHelperInternal.JsonSerializer;
-
-        public static IVariationContextAccessor VariationContextAccessor => s_testHelperInternal.VariationContextAccessor;
-
-        public static IBulkSqlInsertProvider BulkSqlInsertProvider => s_testHelperInternal.BulkSqlInsertProvider;
-
-        public static IMarchal Marchal => s_testHelperInternal.Marchal;
-
-        public static CoreDebugSettings CoreDebugSettings => s_testHelperInternal.CoreDebugSettings;
-
-        public static IIOHelper IOHelper => s_testHelperInternal.IOHelper;
-
-        public static IMainDom MainDom => s_testHelperInternal.MainDom;
-
-        public static UriUtility UriUtility => s_testHelperInternal.UriUtility;
-
-        public static IEmailSender EmailSender { get; } = new EmailSender(new NullLogger<EmailSender>(), new TestOptionsMonitor<GlobalSettings>(new GlobalSettings()), Mock.Of<IEventAggregator>());
-
-        /// <summary>
-        /// Some test files are copied to the /bin (/bin/debug) on build, this is a utility to return their physical path based on a virtual path name
-        /// </summary>
-        public static string MapPathForTestFiles(string relativePath) => s_testHelperInternal.MapPathForTestFiles(relativePath);
-
-        public static void InitializeContentDirectories() => CreateDirectories(new[] { Constants.SystemDirectories.MvcViews, new GlobalSettings().UmbracoMediaPhysicalRootPath, Constants.SystemDirectories.AppPlugins });
-
-        public static void CleanContentDirectories() => CleanDirectories(new[] { Constants.SystemDirectories.MvcViews, new GlobalSettings().UmbracoMediaPhysicalRootPath });
-
-        public static void CreateDirectories(string[] directories)
-        {
-            foreach (var directory in directories)
+            var directoryInfo = new DirectoryInfo(IOHelper.MapPath(directory));
+            var preserve = preserves.ContainsKey(directory) ? preserves[directory] : null;
+            if (directoryInfo.Exists)
             {
-                var directoryInfo = new DirectoryInfo(IOHelper.MapPath(directory));
-                if (directoryInfo.Exists == false)
+                foreach (var fileInfo in directoryInfo.GetFiles()
+                             .Where(x => preserve == null || preserve.Contains(x.Name) == false))
                 {
-                    Directory.CreateDirectory(IOHelper.MapPath(directory));
+                    fileInfo.Delete();
                 }
             }
         }
+    }
 
-        public static void CleanDirectories(string[] directories)
+    public static void CleanUmbracoSettingsConfig()
+    {
+        var currDir = new DirectoryInfo(WorkingDirectory);
+
+        var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
+        if (File.Exists(umbracoSettingsFile))
         {
-            var preserves = new Dictionary<string, string[]>
-            {
-                { Constants.SystemDirectories.MvcViews, new[] { "dummy.txt" } }
-            };
-
-            foreach (var directory in directories)
-            {
-                var directoryInfo = new DirectoryInfo(IOHelper.MapPath(directory));
-                var preserve = preserves.ContainsKey(directory) ? preserves[directory] : null;
-                if (directoryInfo.Exists)
-                {
-                    foreach (FileInfo fileInfo in directoryInfo.GetFiles().Where(x => preserve == null || preserve.Contains(x.Name) == false))
-                    {
-                        fileInfo.Delete();
-                    }
-                }
-            }
+            File.Delete(umbracoSettingsFile);
         }
+    }
 
-        public static void CleanUmbracoSettingsConfig()
+    // TODO: Move to Assertions or AssertHelper
+    // FIXME: obsolete the dateTimeFormat thing and replace with dateDelta
+    public static void AssertPropertyValuesAreEqual(
+        object actual,
+        object expected,
+        string dateTimeFormat = null,
+        Func<IEnumerable, IEnumerable> sorter = null,
+        string[] ignoreProperties = null)
+    {
+        const int dateDeltaMilliseconds = 500; // .5s
+
+        var properties = expected.GetType().GetProperties();
+        foreach (var property in properties)
         {
-            var currDir = new DirectoryInfo(WorkingDirectory);
-
-            var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config");
-            if (File.Exists(umbracoSettingsFile))
+            // ignore properties that are attributed with EditorBrowsableState.Never
+            var att = property.GetCustomAttribute<EditorBrowsableAttribute>(false);
+            if (att != null && att.State == EditorBrowsableState.Never)
             {
-                File.Delete(umbracoSettingsFile);
+                continue;
             }
+
+            // ignore explicitely ignored properties
+            if (ignoreProperties != null && ignoreProperties.Contains(property.Name))
+            {
+                continue;
+            }
+
+            var actualValue = property.GetValue(actual, null);
+            var expectedValue = property.GetValue(expected, null);
+
+            AssertAreEqual(property, expectedValue, actualValue, sorter, dateDeltaMilliseconds);
         }
+    }
 
-        // TODO: Move to Assertions or AssertHelper
-        // FIXME: obsolete the dateTimeFormat thing and replace with dateDelta
-        public static void AssertPropertyValuesAreEqual(object actual, object expected, string dateTimeFormat = null, Func<IEnumerable, IEnumerable> sorter = null, string[] ignoreProperties = null)
+    private static void AssertAreEqual(PropertyInfo property, object expected, object actual, Func<IEnumerable, IEnumerable> sorter = null, int dateDeltaMilliseconds = 0)
+    {
+        if (!(expected is string) && expected is IEnumerable enumerable)
         {
-            const int dateDeltaMilliseconds = 500; // .5s
-
-            PropertyInfo[] properties = expected.GetType().GetProperties();
-            foreach (PropertyInfo property in properties)
+            // sort property collection by alias, not by property ids
+            // on members, built-in properties don't have ids (always zero)
+            if (expected is PropertyCollection)
             {
-                // ignore properties that are attributed with EditorBrowsableState.Never
-                EditorBrowsableAttribute att = property.GetCustomAttribute<EditorBrowsableAttribute>(false);
-                if (att != null && att.State == EditorBrowsableState.Never)
-                {
-                    continue;
-                }
-
-                // ignore explicitely ignored properties
-                if (ignoreProperties != null && ignoreProperties.Contains(property.Name))
-                {
-                    continue;
-                }
-
-                var actualValue = property.GetValue(actual, null);
-                var expectedValue = property.GetValue(expected, null);
-
-                AssertAreEqual(property, expectedValue, actualValue, sorter, dateDeltaMilliseconds);
+                sorter = e => ((PropertyCollection)e).OrderBy(x => x.Alias);
             }
+
+            // compare lists
+            AssertListsAreEqual(property, (IEnumerable)actual, enumerable, sorter, dateDeltaMilliseconds);
         }
-
-        private static void AssertAreEqual(PropertyInfo property, object expected, object actual, Func<IEnumerable, IEnumerable> sorter = null, int dateDeltaMilliseconds = 0)
+        else if (expected is DateTime expectedDateTime)
         {
-            if (!(expected is string) && expected is IEnumerable enumerable)
+            // compare date & time with delta
+            var actualDateTime = (DateTime)actual;
+            var delta = (actualDateTime - expectedDateTime).TotalMilliseconds;
+            Assert.IsTrue(
+                Math.Abs(delta) <= dateDeltaMilliseconds,
+                "Property {0}.{1} does not match. Expected: {2} but was: {3}",
+                property.DeclaringType.Name,
+                property.Name,
+                expected,
+                actual);
+        }
+        else if (expected is Property expectedProperty)
+        {
+            // compare values
+            var actualProperty = (Property)actual;
+            var expectedPropertyValues =
+                expectedProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
+            var actualPropertyValues = actualProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
+            if (expectedPropertyValues.Length != actualPropertyValues.Length)
             {
-                // sort property collection by alias, not by property ids
-                // on members, built-in properties don't have ids (always zero)
-                if (expected is PropertyCollection)
-                {
-                    sorter = e => ((PropertyCollection)e).OrderBy(x => x.Alias);
-                }
+                Assert.Fail(
+                    $"{property.DeclaringType.Name}.{property.Name}: Expected {expectedPropertyValues.Length} but got {actualPropertyValues.Length}.");
+            }
 
-                // compare lists
-                AssertListsAreEqual(property, (IEnumerable)actual, enumerable, sorter, dateDeltaMilliseconds);
-            }
-            else if (expected is DateTime expectedDateTime)
+            for (var i = 0; i < expectedPropertyValues.Length; i++)
             {
-                // compare date & time with delta
-                var actualDateTime = (DateTime)actual;
-                var delta = (actualDateTime - expectedDateTime).TotalMilliseconds;
-                Assert.IsTrue(Math.Abs(delta) <= dateDeltaMilliseconds, "Property {0}.{1} does not match. Expected: {2} but was: {3}", property.DeclaringType.Name, property.Name, expected, actual);
-            }
-            else if (expected is Property expectedProperty)
-            {
-                // compare values
-                var actualProperty = (Property)actual;
-                IPropertyValue[] expectedPropertyValues = expectedProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
-                IPropertyValue[] actualPropertyValues = actualProperty.Values.OrderBy(x => x.Culture).ThenBy(x => x.Segment).ToArray();
-                if (expectedPropertyValues.Length != actualPropertyValues.Length)
-                {
-                    Assert.Fail($"{property.DeclaringType.Name}.{property.Name}: Expected {expectedPropertyValues.Length} but got {actualPropertyValues.Length}.");
-                }
-
-                for (var i = 0; i < expectedPropertyValues.Length; i++)
-                {
-                    Assert.AreEqual(expectedPropertyValues[i].EditedValue, actualPropertyValues[i].EditedValue, $"{property.DeclaringType.Name}.{property.Name}: Expected draft value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".");
-                    Assert.AreEqual(expectedPropertyValues[i].PublishedValue, actualPropertyValues[i].PublishedValue, $"{property.DeclaringType.Name}.{property.Name}: Expected published value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".");
-                }
-            }
-            else if (expected is IDataEditor expectedEditor)
-            {
-                Assert.IsInstanceOf<IDataEditor>(actual);
-                var actualEditor = (IDataEditor)actual;
-                Assert.AreEqual(expectedEditor.Alias,  actualEditor.Alias);
-
-                // what else shall we test?
-            }
-            else
-            {
-                // directly compare values
                 Assert.AreEqual(
-                    expected,
-                    actual,
-                    "Property {0}.{1} does not match. Expected: {2} but was: {3}",
-                    property.DeclaringType.Name,
-                    property.Name,
-                    expected?.ToString() ?? "<null>",
-                    actual?.ToString() ?? "<null>");
+                    expectedPropertyValues[i].EditedValue,
+                    actualPropertyValues[i].EditedValue,
+                    $"{property.DeclaringType.Name}.{property.Name}: Expected draft value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".");
+                Assert.AreEqual(
+                    expectedPropertyValues[i].PublishedValue,
+                    actualPropertyValues[i].PublishedValue,
+                    $"{property.DeclaringType.Name}.{property.Name}: Expected published value \"{expectedPropertyValues[i].EditedValue}\" but got \"{actualPropertyValues[i].EditedValue}\".");
             }
         }
-
-        private static void AssertListsAreEqual(PropertyInfo property, IEnumerable expected, IEnumerable actual, Func<IEnumerable, IEnumerable> sorter = null, int dateDeltaMilliseconds = 0)
+        else if (expected is IDataEditor expectedEditor)
         {
-            if (sorter == null)
-            {
-                // this is pretty hackerific but saves us some code to write
-                sorter = enumerable =>
-                {
-                    // semi-generic way of ensuring any collection of IEntity are sorted by Ids for comparison
-                    var entities = enumerable.OfType<IEntity>().ToList();
-                    return entities.Count > 0 ? (IEnumerable)entities.OrderBy(x => x.Id) : entities;
-                };
-            }
+            Assert.IsInstanceOf<IDataEditor>(actual);
+            var actualEditor = (IDataEditor)actual;
+            Assert.AreEqual(expectedEditor.Alias, actualEditor.Alias);
 
-            var expectedListEx = sorter(expected).Cast<object>().ToList();
-            var actualListEx = sorter(actual).Cast<object>().ToList();
+            // what else shall we test?
+        }
+        else
+        {
+            // directly compare values
+            Assert.AreEqual(
+                expected,
+                actual,
+                "Property {0}.{1} does not match. Expected: {2} but was: {3}",
+                property.DeclaringType.Name,
+                property.Name,
+                expected?.ToString() ?? "<null>",
+                actual?.ToString() ?? "<null>");
+        }
+    }
 
-            if (actualListEx.Count != expectedListEx.Count)
+    private static void AssertListsAreEqual(
+        PropertyInfo property,
+        IEnumerable expected,
+        IEnumerable actual,
+        Func<IEnumerable, IEnumerable> sorter = null,
+        int dateDeltaMilliseconds = 0)
+    {
+        if (sorter == null)
+        {
+            // this is pretty hackerific but saves us some code to write
+            sorter = enumerable =>
             {
-                Assert.Fail("Collection {0}.{1} does not match. Expected IEnumerable containing {2} elements but was IEnumerable containing {3} elements", property.PropertyType.Name, property.Name, expectedListEx.Count, actualListEx.Count);
-            }
-
-            for (var i = 0; i < actualListEx.Count; i++)
-            {
-                AssertAreEqual(property, expectedListEx[i], actualListEx[i], sorter, dateDeltaMilliseconds);
-            }
+                // semi-generic way of ensuring any collection of IEntity are sorted by Ids for comparison
+                var entities = enumerable.OfType<IEntity>().ToList();
+                return entities.Count > 0 ? entities.OrderBy(x => x.Id) : entities;
+            };
         }
 
-        public static IUmbracoVersion GetUmbracoVersion() => s_testHelperInternal.GetUmbracoVersion();
+        var expectedListEx = sorter(expected).Cast<object>().ToList();
+        var actualListEx = sorter(actual).Cast<object>().ToList();
 
-        public static IServiceCollection GetServiceCollection() => new ServiceCollection().AddLazySupport();
+        if (actualListEx.Count != expectedListEx.Count)
+        {
+            Assert.Fail(
+                "Collection {0}.{1} does not match. Expected IEnumerable containing {2} elements but was IEnumerable containing {3} elements",
+                property.PropertyType.Name,
+                property.Name,
+                expectedListEx.Count,
+                actualListEx.Count);
+        }
 
-        public static IHostingEnvironment GetHostingEnvironment() => s_testHelperInternal.GetHostingEnvironment();
+        for (var i = 0; i < actualListEx.Count; i++)
+        {
+            AssertAreEqual(property, expectedListEx[i], actualListEx[i], sorter, dateDeltaMilliseconds);
+        }
+    }
 
-        public static ILoggingConfiguration GetLoggingConfiguration(IHostingEnvironment hostingEnv) => s_testHelperInternal.GetLoggingConfiguration(hostingEnv);
+    public static IUmbracoVersion GetUmbracoVersion() => s_testHelperInternal.GetUmbracoVersion();
 
-        public static IApplicationShutdownRegistry GetHostingEnvironmentLifetime() => s_testHelperInternal.GetHostingEnvironmentLifetime();
+    public static IServiceCollection GetServiceCollection() => new ServiceCollection().AddLazySupport();
 
-        public static IIpResolver GetIpResolver() => s_testHelperInternal.GetIpResolver();
+    public static IHostingEnvironment GetHostingEnvironment() => s_testHelperInternal.GetHostingEnvironment();
 
-        public static IRequestCache GetRequestCache() => s_testHelperInternal.GetRequestCache();
+    public static ILoggingConfiguration GetLoggingConfiguration(IHostingEnvironment hostingEnv) =>
+        s_testHelperInternal.GetLoggingConfiguration(hostingEnv);
 
-        public static IPublishedUrlProvider GetPublishedUrlProvider() => s_testHelperInternal.GetPublishedUrlProvider();
+    public static IApplicationShutdownRegistry GetHostingEnvironmentLifetime() =>
+        s_testHelperInternal.GetHostingEnvironmentLifetime();
+
+    public static IIpResolver GetIpResolver() => s_testHelperInternal.GetIpResolver();
+
+    public static IRequestCache GetRequestCache() => s_testHelperInternal.GetRequestCache();
+
+    public static IPublishedUrlProvider GetPublishedUrlProvider() => s_testHelperInternal.GetPublishedUrlProvider();
+
+    private class TestHelperInternal : TestHelperBase
+    {
+        public TestHelperInternal()
+            : base(typeof(TestHelperInternal).Assembly)
+        {
+        }
+
+        public override IBulkSqlInsertProvider BulkSqlInsertProvider { get; } = Mock.Of<IBulkSqlInsertProvider>();
+
+        public override IMarchal Marchal { get; } = Mock.Of<IMarchal>();
+
+        public override IHostingEnvironment GetHostingEnvironment()
+        {
+            var testPath = TestContext.CurrentContext.TestDirectory.Split("bin")[0];
+            return new TestHostingEnvironment(
+                Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == new HostingSettings()),
+                Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == new WebRoutingSettings()),
+                Mock.Of<IWebHostEnvironment>(
+                    x =>
+                        x.WebRootPath == "/" &&
+                        x.ContentRootPath == testPath));
+        }
+
+        public override IApplicationShutdownRegistry GetHostingEnvironmentLifetime()
+            => Mock.Of<IApplicationShutdownRegistry>();
+
+        public override IIpResolver GetIpResolver()
+            => Mock.Of<IIpResolver>();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/TestHelpers/TestNuCacheContentService.cs b/tests/Umbraco.Tests.UnitTests/TestHelpers/TestNuCacheContentService.cs
index 25542c5203..f31b64c8cc 100644
--- a/tests/Umbraco.Tests.UnitTests/TestHelpers/TestNuCacheContentService.cs
+++ b/tests/Umbraco.Tests.UnitTests/TestHelpers/TestNuCacheContentService.cs
@@ -6,90 +6,104 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Infrastructure.PublishedCache.Persistence;
 
-namespace Umbraco.Cms.Tests.UnitTests.TestHelpers
+namespace Umbraco.Cms.Tests.UnitTests.TestHelpers;
+
+public class TestNuCacheContentService : INuCacheContentService
 {
-    public class TestNuCacheContentService : INuCacheContentService
+    public TestNuCacheContentService(params ContentNodeKit[] kits)
+        : this((IEnumerable<ContentNodeKit>)kits)
     {
-        private IPublishedModelFactory PublishedModelFactory { get; } = new NoopPublishedModelFactory();
-
-        public TestNuCacheContentService(params ContentNodeKit[] kits)
-            : this((IEnumerable<ContentNodeKit>)kits)
-        { }
-
-        public TestNuCacheContentService(IEnumerable<ContentNodeKit> contentKits, IEnumerable<ContentNodeKit> mediaKits = null)
-        {
-            ContentKits = contentKits?.ToDictionary(x => x.Node.Id, x => x) ?? new Dictionary<int, ContentNodeKit>();
-            MediaKits = mediaKits?.ToDictionary(x => x.Node.Id, x => x) ?? new Dictionary<int, ContentNodeKit>();
-        }
-
-        public Dictionary<int, ContentNodeKit> ContentKits { get; }
-        public Dictionary<int, ContentNodeKit> MediaKits { get; }
-
-        // note: it is important to clone the returned kits, as the inner
-        // ContentNode is directly reused and modified by the snapshot service
-        public ContentNodeKit GetContentSource(int id)
-            => ContentKits.TryGetValue(id, out ContentNodeKit kit) ? kit.Clone(PublishedModelFactory) : default;
-
-        public IEnumerable<ContentNodeKit> GetAllContentSources()
-            => ContentKits.Values
-                .OrderBy(x => x.Node.Level)
-                .ThenBy(x => x.Node.ParentContentId)
-                .ThenBy(x => x.Node.SortOrder)
-                .Select(x => x.Clone(PublishedModelFactory));
-
-        public IEnumerable<ContentNodeKit> GetBranchContentSources(int id)
-            => ContentKits.Values
-                .Where(x => x.Node.Path.EndsWith("," + id) || x.Node.Path.Contains("," + id + ","))
-                .OrderBy(x => x.Node.Level)
-                .ThenBy(x => x.Node.ParentContentId)
-                .ThenBy(x => x.Node.SortOrder)
-                .Select(x => x.Clone(PublishedModelFactory));
-
-        public IEnumerable<ContentNodeKit> GetTypeContentSources(IEnumerable<int> ids)
-            => ContentKits.Values
-                .Where(x => ids.Contains(x.ContentTypeId))
-                .OrderBy(x => x.Node.Level)
-                .ThenBy(x => x.Node.ParentContentId)
-                .ThenBy(x => x.Node.SortOrder)
-                .Select(x => x.Clone(PublishedModelFactory));
-
-        public ContentNodeKit GetMediaSource(int id)
-            => MediaKits.TryGetValue(id, out ContentNodeKit kit) ? kit.Clone(PublishedModelFactory) : default;
-
-        public IEnumerable<ContentNodeKit> GetAllMediaSources()
-            => MediaKits.Values
-                .OrderBy(x => x.Node.Level)
-                .ThenBy(x => x.Node.ParentContentId)
-                .ThenBy(x => x.Node.SortOrder)
-                .Select(x => x.Clone(PublishedModelFactory));
-
-        public IEnumerable<ContentNodeKit> GetBranchMediaSources(int id)
-            => MediaKits.Values
-                .Where(x => x.Node.Path.EndsWith("," + id) || x.Node.Path.Contains("," + id + ","))
-                .OrderBy(x => x.Node.Level)
-                .ThenBy(x => x.Node.ParentContentId)
-                .ThenBy(x => x.Node.SortOrder)
-                .Select(x => x.Clone(PublishedModelFactory));
-
-        public IEnumerable<ContentNodeKit> GetTypeMediaSources(IEnumerable<int> ids)
-            => MediaKits.Values
-                .Where(x => ids.Contains(x.ContentTypeId))
-                .OrderBy(x => x.Node.Level)
-                .ThenBy(x => x.Node.ParentContentId)
-                .ThenBy(x => x.Node.SortOrder)
-                .Select(x => x.Clone(PublishedModelFactory));
-
-        public void DeleteContentItem(IContentBase item) => throw new NotImplementedException();
-        public void DeleteContentItems(IEnumerable<IContentBase> items) => throw new NotImplementedException();
-        public void RefreshContent(IContent content) => throw new NotImplementedException();
-
-        public void RebuildDatabaseCacheIfSerializerChanged() => throw new NotImplementedException();
-        public void RefreshMedia(IMedia media) => throw new NotImplementedException();
-        public void RefreshMember(IMember member) => throw new NotImplementedException();
-        public void Rebuild(IReadOnlyCollection<int> contentTypeIds = null, IReadOnlyCollection<int> mediaTypeIds = null, IReadOnlyCollection<int> memberTypeIds = null) => throw new NotImplementedException();
-
-        public bool VerifyContentDbCache() => throw new NotImplementedException();
-        public bool VerifyMediaDbCache() => throw new NotImplementedException();
-        public bool VerifyMemberDbCache() => throw new NotImplementedException();
     }
+
+    public TestNuCacheContentService(
+        IEnumerable<ContentNodeKit> contentKits,
+        IEnumerable<ContentNodeKit> mediaKits = null)
+    {
+        ContentKits = contentKits?.ToDictionary(x => x.Node.Id, x => x) ?? new Dictionary<int, ContentNodeKit>();
+        MediaKits = mediaKits?.ToDictionary(x => x.Node.Id, x => x) ?? new Dictionary<int, ContentNodeKit>();
+    }
+
+    private IPublishedModelFactory PublishedModelFactory { get; } = new NoopPublishedModelFactory();
+
+    public Dictionary<int, ContentNodeKit> ContentKits { get; }
+
+    public Dictionary<int, ContentNodeKit> MediaKits { get; }
+
+    // note: it is important to clone the returned kits, as the inner
+    // ContentNode is directly reused and modified by the snapshot service
+    public ContentNodeKit GetContentSource(int id)
+        => ContentKits.TryGetValue(id, out var kit) ? kit.Clone(PublishedModelFactory) : default;
+
+    public IEnumerable<ContentNodeKit> GetAllContentSources()
+        => ContentKits.Values
+            .OrderBy(x => x.Node.Level)
+            .ThenBy(x => x.Node.ParentContentId)
+            .ThenBy(x => x.Node.SortOrder)
+            .Select(x => x.Clone(PublishedModelFactory));
+
+    public IEnumerable<ContentNodeKit> GetBranchContentSources(int id)
+        => ContentKits.Values
+            .Where(x => x.Node.Path.EndsWith("," + id) || x.Node.Path.Contains("," + id + ","))
+            .OrderBy(x => x.Node.Level)
+            .ThenBy(x => x.Node.ParentContentId)
+            .ThenBy(x => x.Node.SortOrder)
+            .Select(x => x.Clone(PublishedModelFactory));
+
+    public IEnumerable<ContentNodeKit> GetTypeContentSources(IEnumerable<int> ids)
+        => ContentKits.Values
+            .Where(x => ids.Contains(x.ContentTypeId))
+            .OrderBy(x => x.Node.Level)
+            .ThenBy(x => x.Node.ParentContentId)
+            .ThenBy(x => x.Node.SortOrder)
+            .Select(x => x.Clone(PublishedModelFactory));
+
+    public ContentNodeKit GetMediaSource(int id)
+        => MediaKits.TryGetValue(id, out var kit) ? kit.Clone(PublishedModelFactory) : default;
+
+    public IEnumerable<ContentNodeKit> GetAllMediaSources()
+        => MediaKits.Values
+            .OrderBy(x => x.Node.Level)
+            .ThenBy(x => x.Node.ParentContentId)
+            .ThenBy(x => x.Node.SortOrder)
+            .Select(x => x.Clone(PublishedModelFactory));
+
+    public IEnumerable<ContentNodeKit> GetBranchMediaSources(int id)
+        => MediaKits.Values
+            .Where(x => x.Node.Path.EndsWith("," + id) || x.Node.Path.Contains("," + id + ","))
+            .OrderBy(x => x.Node.Level)
+            .ThenBy(x => x.Node.ParentContentId)
+            .ThenBy(x => x.Node.SortOrder)
+            .Select(x => x.Clone(PublishedModelFactory));
+
+    public IEnumerable<ContentNodeKit> GetTypeMediaSources(IEnumerable<int> ids)
+        => MediaKits.Values
+            .Where(x => ids.Contains(x.ContentTypeId))
+            .OrderBy(x => x.Node.Level)
+            .ThenBy(x => x.Node.ParentContentId)
+            .ThenBy(x => x.Node.SortOrder)
+            .Select(x => x.Clone(PublishedModelFactory));
+
+    public void DeleteContentItem(IContentBase item) => throw new NotImplementedException();
+
+    public void DeleteContentItems(IEnumerable<IContentBase> items) => throw new NotImplementedException();
+
+    public void RefreshContent(IContent content) => throw new NotImplementedException();
+
+    public void RebuildDatabaseCacheIfSerializerChanged() => throw new NotImplementedException();
+
+    public void RefreshMedia(IMedia media) => throw new NotImplementedException();
+
+    public void RefreshMember(IMember member) => throw new NotImplementedException();
+
+    public void Rebuild(
+        IReadOnlyCollection<int> contentTypeIds = null,
+        IReadOnlyCollection<int> mediaTypeIds = null,
+        IReadOnlyCollection<int> memberTypeIds = null) =>
+        throw new NotImplementedException();
+
+    public bool VerifyContentDbCache() => throw new NotImplementedException();
+
+    public bool VerifyMediaDbCache() => throw new NotImplementedException();
+
+    public bool VerifyMemberDbCache() => throw new NotImplementedException();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs
index 73987c3c4a..1e3f18f2c4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/AttemptTests.cs
@@ -4,21 +4,20 @@
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
-{
-    [TestFixture]
-    public class AttemptTests
-    {
-        [Test]
-        public void AttemptIf()
-        {
-            // Just making sure that it is ok to use TryParse as a condition.
-            var attempt = Attempt.If(int.TryParse("1234", out int value), value);
-            Assert.IsTrue(attempt.Success);
-            Assert.AreEqual(1234, attempt.Result);
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
 
-            attempt = Attempt.If(int.TryParse("12xxx34", out value), value);
-            Assert.IsFalse(attempt.Success);
-        }
+[TestFixture]
+public class AttemptTests
+{
+    [Test]
+    public void AttemptIf()
+    {
+        // Just making sure that it is ok to use TryParse as a condition.
+        var attempt = Attempt.If(int.TryParse("1234", out var value), value);
+        Assert.IsTrue(attempt.Success);
+        Assert.AreEqual(1234, attempt.Result);
+
+        attempt = Attempt.If(int.TryParse("12xxx34", out value), value);
+        Assert.IsFalse(attempt.Success);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs
index ce47b490a6..1a2967b280 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/IdentityExtensionsTests.cs
@@ -7,43 +7,42 @@ using Microsoft.AspNetCore.Identity;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice;
+
+public class IdentityExtensionsTests
 {
-    public class IdentityExtensionsTests
+    [Test]
+    public void ToErrorMessage_When_Errors_Are_Null_Expect_ArgumentNullException()
     {
-        [Test]
-        public void ToErrorMessage_When_Errors_Are_Null_Expect_ArgumentNullException()
+        IEnumerable<IdentityError> errors = null;
+
+        Assert.Throws<ArgumentNullException>(() => errors.ToErrorMessage());
+    }
+
+    [Test]
+    public void ToErrorMessage_When_Single_Error_Expect_Error_Description()
+    {
+        const string expectedError = "invalid something";
+        var errors = new List<IdentityError> { new() { Code = "1", Description = expectedError } };
+
+        var errorMessage = errors.ToErrorMessage();
+
+        Assert.AreEqual(expectedError, errorMessage);
+    }
+
+    [Test]
+    public void ToErrorMessage_When_Multiple_Errors_Expect_Error_Descriptions_With_Comma_Delimiter()
+    {
+        const string error1 = "invalid something";
+        const string error2 = "invalid something else";
+        var errors = new List<IdentityError>
         {
-            IEnumerable<IdentityError> errors = null;
+            new() { Code = "1", Description = error1 },
+            new() { Code = "2", Description = error2 },
+        };
 
-            Assert.Throws<ArgumentNullException>(() => errors.ToErrorMessage());
-        }
+        var errorMessage = errors.ToErrorMessage();
 
-        [Test]
-        public void ToErrorMessage_When_Single_Error_Expect_Error_Description()
-        {
-            const string expectedError = "invalid something";
-            var errors = new List<IdentityError> { new IdentityError { Code = "1", Description = expectedError } };
-
-            string errorMessage = errors.ToErrorMessage();
-
-            Assert.AreEqual(expectedError, errorMessage);
-        }
-
-        [Test]
-        public void ToErrorMessage_When_Multiple_Errors_Expect_Error_Descriptions_With_Comma_Delimiter()
-        {
-            const string error1 = "invalid something";
-            const string error2 = "invalid something else";
-            var errors = new List<IdentityError>
-            {
-                new IdentityError { Code = "1", Description = error1 },
-                new IdentityError { Code = "2", Description = error2 }
-            };
-
-            string errorMessage = errors.ToErrorMessage();
-
-            Assert.AreEqual($"{error1}, {error2}", errorMessage);
-        }
+        Assert.AreEqual($"{error1}, {error2}", errorMessage);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs
index 881b880c80..8ec8634970 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/BackOffice/UmbracoBackOfficeIdentityTests.cs
@@ -5,126 +5,123 @@ using System;
 using System.Linq;
 using System.Security.Claims;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Security;
+using Umbraco.Cms.Core;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice;
+
+[TestFixture]
+public class UmbracoBackOfficeIdentityTests
 {
-    [TestFixture]
-    public class UmbracoBackOfficeIdentityTests
+    public const string TestIssuer = "TestIssuer";
+
+    [Test]
+    public void Create_From_Claims_Identity()
     {
-        public const string TestIssuer = "TestIssuer";
-
-        [Test]
-        public void Create_From_Claims_Identity()
+        var securityStamp = Guid.NewGuid().ToString();
+        var claimsIdentity = new ClaimsIdentity(new[]
         {
-            var securityStamp = Guid.NewGuid().ToString();
-            var claimsIdentity = new ClaimsIdentity(new[]
-            {
-                // This is the id that 'identity' uses to check for the user id.
-                new Claim(ClaimTypes.NameIdentifier, "1234", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            // This is the id that 'identity' uses to check for the user id.
+            new Claim(ClaimTypes.NameIdentifier, "1234", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
 
-                // This is the id that 'identity' uses to check for the username.
-                new Claim(ClaimTypes.Name, "testing", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            // This is the id that 'identity' uses to check for the username.
+            new Claim(ClaimTypes.Name, "testing", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(ClaimTypes.GivenName, "hello world", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.StartContentNodeIdClaimType, "-1", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.StartMediaNodeIdClaimType, "5543", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.StartMediaNodeIdClaimType, "5555", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.AllowedApplicationsClaimType, "content", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.AllowedApplicationsClaimType, "media", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(ClaimTypes.Locality, "en-us", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(ClaimsIdentity.DefaultRoleClaimType, "admin", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.SecurityStampClaimType, securityStamp, ClaimValueTypes.String, TestIssuer, TestIssuer),
+        });
 
-                new Claim(ClaimTypes.GivenName, "hello world", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.StartContentNodeIdClaimType, "-1", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.StartMediaNodeIdClaimType, "5543", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.StartMediaNodeIdClaimType, "5555", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.AllowedApplicationsClaimType, "content", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.AllowedApplicationsClaimType, "media", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(ClaimTypes.Locality, "en-us", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(ClaimsIdentity.DefaultRoleClaimType, "admin", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.SecurityStampClaimType, securityStamp, ClaimValueTypes.String, TestIssuer, TestIssuer),
-            });
-
-            if (!claimsIdentity.VerifyBackOfficeIdentity(out ClaimsIdentity verifiedIdentity))
-            {
-                Assert.Fail();
-            }
-
-            Assert.IsNull(verifiedIdentity.Actor);
-            Assert.AreEqual(1234, verifiedIdentity.GetId());
-            //// Assert.AreEqual(sessionId, backofficeIdentity.SessionId);
-            Assert.AreEqual(securityStamp, verifiedIdentity.GetSecurityStamp());
-            Assert.AreEqual("testing", verifiedIdentity.GetUsername());
-            Assert.AreEqual("hello world", verifiedIdentity.GetRealName());
-            Assert.AreEqual(1, verifiedIdentity.GetStartContentNodes().Length);
-            Assert.IsTrue(verifiedIdentity.GetStartMediaNodes().UnsortedSequenceEqual(new[] { 5543, 5555 }));
-            Assert.IsTrue(new[] { "content", "media" }.SequenceEqual(verifiedIdentity.GetAllowedApplications()));
-            Assert.AreEqual("en-us", verifiedIdentity.GetCultureString());
-            Assert.IsTrue(new[] { "admin" }.SequenceEqual(verifiedIdentity.GetRoles()));
-
-            Assert.AreEqual(11, verifiedIdentity.Claims.Count());
+        if (!claimsIdentity.VerifyBackOfficeIdentity(out var verifiedIdentity))
+        {
+            Assert.Fail();
         }
 
-        [Test]
-        public void Create_From_Claims_Identity_Missing_Required_Claim()
+        Assert.IsNull(verifiedIdentity.Actor);
+        Assert.AreEqual(1234, verifiedIdentity.GetId());
+        //// Assert.AreEqual(sessionId, backofficeIdentity.SessionId);
+        Assert.AreEqual(securityStamp, verifiedIdentity.GetSecurityStamp());
+        Assert.AreEqual("testing", verifiedIdentity.GetUsername());
+        Assert.AreEqual("hello world", verifiedIdentity.GetRealName());
+        Assert.AreEqual(1, verifiedIdentity.GetStartContentNodes().Length);
+        Assert.IsTrue(verifiedIdentity.GetStartMediaNodes().UnsortedSequenceEqual(new[] { 5543, 5555 }));
+        Assert.IsTrue(new[] { "content", "media" }.SequenceEqual(verifiedIdentity.GetAllowedApplications()));
+        Assert.AreEqual("en-us", verifiedIdentity.GetCultureString());
+        Assert.IsTrue(new[] { "admin" }.SequenceEqual(verifiedIdentity.GetRoles()));
+
+        Assert.AreEqual(11, verifiedIdentity.Claims.Count());
+    }
+
+    [Test]
+    public void Create_From_Claims_Identity_Missing_Required_Claim()
+    {
+        var claimsIdentity = new ClaimsIdentity(new[]
         {
-            var claimsIdentity = new ClaimsIdentity(new[]
-            {
-                new Claim(ClaimTypes.NameIdentifier, "1234", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim(ClaimTypes.Name, "testing", ClaimValueTypes.String, TestIssuer, TestIssuer),
-            });
+            new Claim(ClaimTypes.NameIdentifier, "1234", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim(ClaimTypes.Name, "testing", ClaimValueTypes.String, TestIssuer, TestIssuer),
+        });
 
-            if (claimsIdentity.VerifyBackOfficeIdentity(out _))
-            {
-                Assert.Fail();
-            }
-
-            Assert.Pass();
+        if (claimsIdentity.VerifyBackOfficeIdentity(out _))
+        {
+            Assert.Fail();
         }
 
-        [Test]
-        public void Create_From_Claims_Identity_Required_Claim_Null()
+        Assert.Pass();
+    }
+
+    [Test]
+    public void Create_From_Claims_Identity_Required_Claim_Null()
+    {
+        var claimsIdentity = new ClaimsIdentity(new[]
         {
-            var claimsIdentity = new ClaimsIdentity(new[]
-            {
-                // Null or empty
-                new Claim(ClaimTypes.NameIdentifier, string.Empty, ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim(ClaimTypes.Name, "testing", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(ClaimTypes.GivenName, "hello world", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.StartContentNodeIdClaimType, "-1", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.StartMediaNodeIdClaimType, "5543", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.AllowedApplicationsClaimType, "content", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(Constants.Security.AllowedApplicationsClaimType, "media", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(ClaimTypes.Locality, "en-us", ClaimValueTypes.String, TestIssuer, TestIssuer),
-                new Claim(ClaimsIdentity.DefaultRoleClaimType, "admin", ClaimValueTypes.String, TestIssuer, TestIssuer),
-            });
+            // Null or empty
+            new Claim(ClaimTypes.NameIdentifier, string.Empty, ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim(ClaimTypes.Name, "testing", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(ClaimTypes.GivenName, "hello world", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.StartContentNodeIdClaimType, "-1", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.StartMediaNodeIdClaimType, "5543", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.AllowedApplicationsClaimType, "content", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(Constants.Security.AllowedApplicationsClaimType, "media", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(ClaimTypes.Locality, "en-us", ClaimValueTypes.String, TestIssuer, TestIssuer),
+            new Claim(ClaimsIdentity.DefaultRoleClaimType, "admin", ClaimValueTypes.String, TestIssuer, TestIssuer),
+        });
 
-            if (claimsIdentity.VerifyBackOfficeIdentity(out _))
-            {
-                Assert.Fail();
-            }
-
-            Assert.Pass();
+        if (claimsIdentity.VerifyBackOfficeIdentity(out _))
+        {
+            Assert.Fail();
         }
 
-        [Test]
-        public void Create_With_Claims_And_User_Data()
+        Assert.Pass();
+    }
+
+    [Test]
+    public void Create_With_Claims_And_User_Data()
+    {
+        var securityStamp = Guid.NewGuid().ToString();
+
+        var claimsIdentity = new ClaimsIdentity(new[]
         {
-            var securityStamp = Guid.NewGuid().ToString();
+            new Claim("TestClaim1", "test", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+            new Claim("TestClaim1", "test", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
+        });
 
-            var claimsIdentity = new ClaimsIdentity(new[]
-            {
-                new Claim("TestClaim1", "test", ClaimValueTypes.Integer32, TestIssuer, TestIssuer),
-                new Claim("TestClaim1", "test", ClaimValueTypes.Integer32, TestIssuer, TestIssuer)
-            });
+        claimsIdentity.AddRequiredClaims(
+            "1234",
+            "testing",
+            "hello world",
+            new[] { 654 },
+            new[] { 654 },
+            "en-us",
+            securityStamp,
+            new[] { "content", "media" },
+            new[] { "admin" });
 
-            claimsIdentity.AddRequiredClaims(
-                "1234",
-                "testing",
-                "hello world",
-                new[] { 654 },
-                new[] { 654 },
-                "en-us",
-                securityStamp,
-                new[] { "content", "media" },
-                new[] { "admin" });
-
-            Assert.AreEqual(12, claimsIdentity.Claims.Count());
-            Assert.IsNull(claimsIdentity.Actor);
-        }
+        Assert.AreEqual(12, claimsIdentity.Claims.Count());
+        Assert.IsNull(claimsIdentity.Actor);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs
index 115be24f8a..66c8d7a75c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/AppCacheTests.cs
@@ -2,269 +2,267 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+public abstract class AppCacheTests
 {
-    public abstract class AppCacheTests
+    internal abstract IAppCache AppCache { get; }
+
+    protected abstract int GetTotalItemCount { get; }
+
+    [SetUp]
+    public virtual void Setup()
     {
-        internal abstract IAppCache AppCache { get; }
+    }
 
-        protected abstract int GetTotalItemCount { get; }
+    [TearDown]
+    public virtual void TearDown() => AppCache.Clear();
 
-        [SetUp]
-        public virtual void Setup()
+    [Test]
+    public void Throws_On_Reentry()
+    {
+        // don't run for DictionaryAppCache - not making sense
+        if (GetType() == typeof(DictionaryAppCacheTests))
         {
+            Assert.Ignore("Do not run for DictionaryAppCache.");
         }
 
-        [TearDown]
-        public virtual void TearDown() => AppCache.Clear();
-
-        [Test]
-        public void Throws_On_Reentry()
+        Exception exception = null;
+        var result = AppCache.Get("blah", () =>
         {
-            // don't run for DictionaryAppCache - not making sense
-            if (GetType() == typeof(DictionaryAppCacheTests))
+            try
             {
-                Assert.Ignore("Do not run for DictionaryAppCache.");
+                var result2 = AppCache.Get("blah");
+            }
+            catch (Exception e)
+            {
+                exception = e;
             }
 
-            Exception exception = null;
-            var result = AppCache.Get("blah", () =>
-            {
-                try
-                {
-                    var result2 = AppCache.Get("blah");
-                }
-                catch (Exception e)
-                {
-                    exception = e;
-                }
+            return "value";
+        });
+        Assert.IsNotNull(exception);
+        Assert.IsAssignableFrom<InvalidOperationException>(exception);
+    }
 
-                return "value";
+    [Test]
+    public void Does_Not_Cache_Exceptions()
+    {
+        var counter = 0;
+
+        object result;
+        try
+        {
+            result = AppCache.Get("Blah", () =>
+            {
+                counter++;
+                throw new Exception("Do not cache this");
             });
-            Assert.IsNotNull(exception);
-            Assert.IsAssignableFrom<InvalidOperationException>(exception);
+        }
+        catch (Exception)
+        {
         }
 
-        [Test]
-        public void Does_Not_Cache_Exceptions()
+        try
         {
-            var counter = 0;
-
-            object result;
-            try
-            {
-                result = AppCache.Get("Blah", () =>
-                    {
-                        counter++;
-                        throw new Exception("Do not cache this");
-                    });
-            }
-            catch (Exception)
-            {
-            }
-
-            try
-            {
-                result = AppCache.Get("Blah", () =>
-                    {
-                        counter++;
-                        throw new Exception("Do not cache this");
-                    });
-            }
-            catch (Exception)
-            {
-            }
-
-            Assert.Greater(counter, 1);
-        }
-
-        [Test]
-        public void Ensures_Delegate_Result_Is_Cached_Once()
-        {
-            var counter = 0;
-
-            object result;
-
             result = AppCache.Get("Blah", () =>
-                {
-                    counter++;
-                    return string.Empty;
-                });
-
-            result = AppCache.Get("Blah", () =>
-                {
-                    counter++;
-                    return string.Empty;
-                });
-
-            Assert.AreEqual(1, counter);
+            {
+                counter++;
+                throw new Exception("Do not cache this");
+            });
         }
-
-        [Test]
-        public void Can_Get_By_Search()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var cacheContent2 = new MacroCacheContent();
-            var cacheContent3 = new MacroCacheContent();
-            var cacheContent4 = new LiteralControl();
-            AppCache.Get("Test1", () => cacheContent1);
-            AppCache.Get("Tester2", () => cacheContent2);
-            AppCache.Get("Tes3", () => cacheContent3);
-            AppCache.Get("different4", () => cacheContent4);
-
-            Assert.AreEqual(4, GetTotalItemCount);
-
-            IEnumerable<object> result = AppCache.SearchByKey("Tes");
-
-            Assert.AreEqual(3, result.Count());
-        }
-
-        [Test]
-        public void Can_Clear_By_Expression()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var cacheContent2 = new MacroCacheContent();
-            var cacheContent3 = new MacroCacheContent();
-            var cacheContent4 = new LiteralControl();
-            AppCache.Get("TTes1t", () => cacheContent1);
-            AppCache.Get("Tester2", () => cacheContent2);
-            AppCache.Get("Tes3", () => cacheContent3);
-            AppCache.Get("different4", () => cacheContent4);
-
-            Assert.AreEqual(4, GetTotalItemCount);
-
-            AppCache.ClearByRegex("^\\w+es\\d.*");
-
-            Assert.AreEqual(2, GetTotalItemCount);
-        }
-
-        [Test]
-        public void Can_Clear_By_Search()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var cacheContent2 = new MacroCacheContent();
-            var cacheContent3 = new MacroCacheContent();
-            var cacheContent4 = new LiteralControl();
-            AppCache.Get("Test1", () => cacheContent1);
-            AppCache.Get("Tester2", () => cacheContent2);
-            AppCache.Get("Tes3", () => cacheContent3);
-            AppCache.Get("different4", () => cacheContent4);
-
-            Assert.AreEqual(4, GetTotalItemCount);
-
-            AppCache.ClearByKey("Test");
-
-            Assert.AreEqual(2, GetTotalItemCount);
-        }
-
-        [Test]
-        public void Can_Clear_By_Key()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var cacheContent2 = new MacroCacheContent();
-            var cacheContent3 = new MacroCacheContent();
-            var cacheContent4 = new LiteralControl();
-            AppCache.Get("Test1", () => cacheContent1);
-            AppCache.Get("Test2", () => cacheContent2);
-            AppCache.Get("Test3", () => cacheContent3);
-            AppCache.Get("Test4", () => cacheContent4);
-
-            Assert.AreEqual(4, GetTotalItemCount);
-
-            AppCache.Clear("Test1");
-            AppCache.Clear("Test2");
-
-            Assert.AreEqual(2, GetTotalItemCount);
-        }
-
-        [Test]
-        public void Can_Clear_All_Items()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var cacheContent2 = new MacroCacheContent();
-            var cacheContent3 = new MacroCacheContent();
-            var cacheContent4 = new LiteralControl();
-            AppCache.Get("Test1", () => cacheContent1);
-            AppCache.Get("Test2", () => cacheContent2);
-            AppCache.Get("Test3", () => cacheContent3);
-            AppCache.Get("Test4", () => cacheContent4);
-
-            Assert.AreEqual(4, GetTotalItemCount);
-
-            AppCache.Clear();
-
-            Assert.AreEqual(0, GetTotalItemCount);
-        }
-
-        [Test]
-        public void Can_Add_When_Not_Available()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            AppCache.Get("Test1", () => cacheContent1);
-            Assert.AreEqual(1, GetTotalItemCount);
-        }
-
-        [Test]
-        public void Can_Get_When_Available()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var result = AppCache.Get("Test1", () => cacheContent1);
-            var result2 = AppCache.Get("Test1", () => cacheContent1);
-            Assert.AreEqual(1, GetTotalItemCount);
-            Assert.AreEqual(result, result2);
-        }
-
-        [Test]
-        public void Can_Remove_By_Type_Name()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var cacheContent2 = new MacroCacheContent();
-            var cacheContent3 = new MacroCacheContent();
-            var cacheContent4 = new LiteralControl();
-            AppCache.Get("Test1", () => cacheContent1);
-            AppCache.Get("Test2", () => cacheContent2);
-            AppCache.Get("Test3", () => cacheContent3);
-            AppCache.Get("Test4", () => cacheContent4);
-
-            Assert.AreEqual(4, GetTotalItemCount);
-
-            ////Provider.ClearCacheObjectTypes("umbraco.MacroCacheContent");
-            AppCache.ClearOfType<MacroCacheContent>();
-
-            Assert.AreEqual(1, GetTotalItemCount);
-        }
-
-        [Test]
-        public void Can_Remove_By_Strong_Type()
-        {
-            var cacheContent1 = new MacroCacheContent();
-            var cacheContent2 = new MacroCacheContent();
-            var cacheContent3 = new MacroCacheContent();
-            var cacheContent4 = new LiteralControl();
-            AppCache.Get("Test1", () => cacheContent1);
-            AppCache.Get("Test2", () => cacheContent2);
-            AppCache.Get("Test3", () => cacheContent3);
-            AppCache.Get("Test4", () => cacheContent4);
-
-            Assert.AreEqual(4, GetTotalItemCount);
-
-            AppCache.ClearOfType<MacroCacheContent>();
-
-            Assert.AreEqual(1, GetTotalItemCount);
-        }
-
-        // Just used for these tests
-        private class MacroCacheContent
+        catch (Exception)
         {
         }
 
-        private class LiteralControl
+        Assert.Greater(counter, 1);
+    }
+
+    [Test]
+    public void Ensures_Delegate_Result_Is_Cached_Once()
+    {
+        var counter = 0;
+
+        object result;
+
+        result = AppCache.Get("Blah", () =>
         {
-        }
+            counter++;
+            return string.Empty;
+        });
+
+        result = AppCache.Get("Blah", () =>
+        {
+            counter++;
+            return string.Empty;
+        });
+
+        Assert.AreEqual(1, counter);
+    }
+
+    [Test]
+    public void Can_Get_By_Search()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var cacheContent2 = new MacroCacheContent();
+        var cacheContent3 = new MacroCacheContent();
+        var cacheContent4 = new LiteralControl();
+        AppCache.Get("Test1", () => cacheContent1);
+        AppCache.Get("Tester2", () => cacheContent2);
+        AppCache.Get("Tes3", () => cacheContent3);
+        AppCache.Get("different4", () => cacheContent4);
+
+        Assert.AreEqual(4, GetTotalItemCount);
+
+        var result = AppCache.SearchByKey("Tes");
+
+        Assert.AreEqual(3, result.Count());
+    }
+
+    [Test]
+    public void Can_Clear_By_Expression()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var cacheContent2 = new MacroCacheContent();
+        var cacheContent3 = new MacroCacheContent();
+        var cacheContent4 = new LiteralControl();
+        AppCache.Get("TTes1t", () => cacheContent1);
+        AppCache.Get("Tester2", () => cacheContent2);
+        AppCache.Get("Tes3", () => cacheContent3);
+        AppCache.Get("different4", () => cacheContent4);
+
+        Assert.AreEqual(4, GetTotalItemCount);
+
+        AppCache.ClearByRegex("^\\w+es\\d.*");
+
+        Assert.AreEqual(2, GetTotalItemCount);
+    }
+
+    [Test]
+    public void Can_Clear_By_Search()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var cacheContent2 = new MacroCacheContent();
+        var cacheContent3 = new MacroCacheContent();
+        var cacheContent4 = new LiteralControl();
+        AppCache.Get("Test1", () => cacheContent1);
+        AppCache.Get("Tester2", () => cacheContent2);
+        AppCache.Get("Tes3", () => cacheContent3);
+        AppCache.Get("different4", () => cacheContent4);
+
+        Assert.AreEqual(4, GetTotalItemCount);
+
+        AppCache.ClearByKey("Test");
+
+        Assert.AreEqual(2, GetTotalItemCount);
+    }
+
+    [Test]
+    public void Can_Clear_By_Key()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var cacheContent2 = new MacroCacheContent();
+        var cacheContent3 = new MacroCacheContent();
+        var cacheContent4 = new LiteralControl();
+        AppCache.Get("Test1", () => cacheContent1);
+        AppCache.Get("Test2", () => cacheContent2);
+        AppCache.Get("Test3", () => cacheContent3);
+        AppCache.Get("Test4", () => cacheContent4);
+
+        Assert.AreEqual(4, GetTotalItemCount);
+
+        AppCache.Clear("Test1");
+        AppCache.Clear("Test2");
+
+        Assert.AreEqual(2, GetTotalItemCount);
+    }
+
+    [Test]
+    public void Can_Clear_All_Items()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var cacheContent2 = new MacroCacheContent();
+        var cacheContent3 = new MacroCacheContent();
+        var cacheContent4 = new LiteralControl();
+        AppCache.Get("Test1", () => cacheContent1);
+        AppCache.Get("Test2", () => cacheContent2);
+        AppCache.Get("Test3", () => cacheContent3);
+        AppCache.Get("Test4", () => cacheContent4);
+
+        Assert.AreEqual(4, GetTotalItemCount);
+
+        AppCache.Clear();
+
+        Assert.AreEqual(0, GetTotalItemCount);
+    }
+
+    [Test]
+    public void Can_Add_When_Not_Available()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        AppCache.Get("Test1", () => cacheContent1);
+        Assert.AreEqual(1, GetTotalItemCount);
+    }
+
+    [Test]
+    public void Can_Get_When_Available()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var result = AppCache.Get("Test1", () => cacheContent1);
+        var result2 = AppCache.Get("Test1", () => cacheContent1);
+        Assert.AreEqual(1, GetTotalItemCount);
+        Assert.AreEqual(result, result2);
+    }
+
+    [Test]
+    public void Can_Remove_By_Type_Name()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var cacheContent2 = new MacroCacheContent();
+        var cacheContent3 = new MacroCacheContent();
+        var cacheContent4 = new LiteralControl();
+        AppCache.Get("Test1", () => cacheContent1);
+        AppCache.Get("Test2", () => cacheContent2);
+        AppCache.Get("Test3", () => cacheContent3);
+        AppCache.Get("Test4", () => cacheContent4);
+
+        Assert.AreEqual(4, GetTotalItemCount);
+
+        ////Provider.ClearCacheObjectTypes("umbraco.MacroCacheContent");
+        AppCache.ClearOfType<MacroCacheContent>();
+
+        Assert.AreEqual(1, GetTotalItemCount);
+    }
+
+    [Test]
+    public void Can_Remove_By_Strong_Type()
+    {
+        var cacheContent1 = new MacroCacheContent();
+        var cacheContent2 = new MacroCacheContent();
+        var cacheContent3 = new MacroCacheContent();
+        var cacheContent4 = new LiteralControl();
+        AppCache.Get("Test1", () => cacheContent1);
+        AppCache.Get("Test2", () => cacheContent2);
+        AppCache.Get("Test3", () => cacheContent3);
+        AppCache.Get("Test4", () => cacheContent4);
+
+        Assert.AreEqual(4, GetTotalItemCount);
+
+        AppCache.ClearOfType<MacroCacheContent>();
+
+        Assert.AreEqual(1, GetTotalItemCount);
+    }
+
+    // Just used for these tests
+    private class MacroCacheContent
+    {
+    }
+
+    private class LiteralControl
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs
index 260cd3c6ca..4994fcb221 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DeepCloneAppCacheTests.cs
@@ -12,111 +12,102 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class DeepCloneAppCacheTests : RuntimeAppCacheTests
 {
-    [TestFixture]
-    public class DeepCloneAppCacheTests : RuntimeAppCacheTests
+    public override void Setup()
     {
-        private DeepCloneAppCache _provider;
-        private ObjectCacheAppCache _memberCache;
+        base.Setup();
+        _memberCache = new ObjectCacheAppCache();
 
-        protected override int GetTotalItemCount => _memberCache.MemoryCache.Count();
+        _provider = new DeepCloneAppCache(_memberCache);
+    }
 
-        public override void Setup()
+    private DeepCloneAppCache _provider;
+    private ObjectCacheAppCache _memberCache;
+
+    protected override int GetTotalItemCount => _memberCache.MemoryCache.Count();
+
+    internal override IAppCache AppCache => _provider;
+
+    internal override IAppPolicyCache AppPolicyCache => _provider;
+
+    [Test]
+    public void Clones_List()
+    {
+        var original = new DeepCloneableList<TestClone>(ListCloneBehavior.Always) { new(), new(), new() };
+
+        var val = _provider.GetCacheItem("test", () => original);
+
+        Assert.AreEqual(original.Count, val.Count);
+        foreach (var item in val)
         {
-            base.Setup();
-            _memberCache = new ObjectCacheAppCache();
+            Assert.IsTrue(item.IsClone);
+        }
+    }
 
-            _provider = new DeepCloneAppCache(_memberCache);
+    [Test]
+    public void Ensures_Cloned_And_Reset()
+    {
+        var original = new TestClass { Name = "hello" };
+        Assert.IsTrue(original.IsDirty());
+
+        var val = _provider.GetCacheItem("test", () => original);
+
+        Assert.AreNotEqual(original.CloneId, val.CloneId);
+        Assert.IsFalse(val.IsDirty());
+    }
+
+    [Test]
+    public void DoesNotCacheExceptions()
+    {
+        string value;
+        Assert.Throws<Exception>(() => { value = (string)_provider.Get("key", () => GetValue(1)); });
+        Assert.Throws<Exception>(() => { value = (string)_provider.Get("key", () => GetValue(2)); });
+
+        // does not throw
+        value = (string)_provider.Get("key", () => GetValue(3));
+        Assert.AreEqual("succ3", value);
+
+        // cache
+        value = (string)_provider.Get("key", () => GetValue(4));
+        Assert.AreEqual("succ3", value);
+    }
+
+    private static string GetValue(int i)
+    {
+        Debug.Print("get" + i);
+        if (i < 3)
+        {
+            throw new Exception("fail");
         }
 
-        internal override IAppCache AppCache => _provider;
+        return "succ" + i;
+    }
 
-        internal override IAppPolicyCache AppPolicyCache => _provider;
+    private class TestClass : BeingDirtyBase, IDeepCloneable
+    {
+        private string _name;
 
-        [Test]
-        public void Clones_List()
+        public TestClass() => CloneId = Guid.NewGuid();
+
+        public string Name
         {
-            var original = new DeepCloneableList<TestClone>(ListCloneBehavior.Always)
-            {
-                new TestClone(),
-                new TestClone(),
-                new TestClone()
-            };
+            get => _name;
 
-            DeepCloneableList<TestClone> val = _provider.GetCacheItem("test", () => original);
-
-            Assert.AreEqual(original.Count, val.Count);
-            foreach (TestClone item in val)
-            {
-                Assert.IsTrue(item.IsClone);
-            }
+            set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
         }
 
-        [Test]
-        public void Ensures_Cloned_And_Reset()
+        public Guid CloneId { get; set; }
+
+        public object DeepClone()
         {
-            var original = new TestClass()
-            {
-                Name = "hello"
-            };
-            Assert.IsTrue(original.IsDirty());
-
-            var val = _provider.GetCacheItem("test", () => original);
-
-            Assert.AreNotEqual(original.CloneId, val.CloneId);
-            Assert.IsFalse(val.IsDirty());
-        }
-
-        [Test]
-        public void DoesNotCacheExceptions()
-        {
-            string value;
-            Assert.Throws<Exception>(() => { value = (string)_provider.Get("key", () => GetValue(1)); });
-            Assert.Throws<Exception>(() => { value = (string)_provider.Get("key", () => GetValue(2)); });
-
-            // does not throw
-            value = (string)_provider.Get("key", () => GetValue(3));
-            Assert.AreEqual("succ3", value);
-
-            // cache
-            value = (string)_provider.Get("key", () => GetValue(4));
-            Assert.AreEqual("succ3", value);
-        }
-
-        private static string GetValue(int i)
-        {
-            Debug.Print("get" + i);
-            if (i < 3)
-            {
-                throw new Exception("fail");
-            }
-
-            return "succ" + i;
-        }
-
-        private class TestClass : BeingDirtyBase, IDeepCloneable
-        {
-            public TestClass() => CloneId = Guid.NewGuid();
-
-            private string _name;
-
-            public string Name
-            {
-                get => _name;
-
-                set => SetPropertyValueAndDetectChanges(value, ref _name, nameof(Name));
-            }
-
-            public Guid CloneId { get; set; }
-
-            public object DeepClone()
-            {
-                var shallowClone = (TestClass)MemberwiseClone();
-                DeepCloneHelper.DeepCloneRefProperties(this, shallowClone);
-                shallowClone.CloneId = Guid.NewGuid();
-                return shallowClone;
-            }
+            var shallowClone = (TestClass)MemberwiseClone();
+            DeepCloneHelper.DeepCloneRefProperties(this, shallowClone);
+            shallowClone.CloneId = Guid.NewGuid();
+            return shallowClone;
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs
index f14af8cc19..56bcbac1ee 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DefaultCachePolicyTests.cs
@@ -7,131 +7,140 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Scoping;
+using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class DefaultCachePolicyTests
 {
-    [TestFixture]
-    public class DefaultCachePolicyTests
+    private IScopeAccessor DefaultAccessor
     {
-        private IScopeAccessor DefaultAccessor
+        get
         {
-            get
-            {
-                var accessor = new Mock<IScopeAccessor>();
-                var scope = new Mock<IScope>();
-                scope.Setup(x => x.RepositoryCacheMode).Returns(Cms.Core.Scoping.RepositoryCacheMode.Default);
-                accessor.Setup(x => x.AmbientScope).Returns(scope.Object);
-                return accessor.Object;
-            }
+            var accessor = new Mock<IScopeAccessor>();
+            var scope = new Mock<IScope>();
+            scope.Setup(x => x.RepositoryCacheMode).Returns(RepositoryCacheMode.Default);
+            accessor.Setup(x => x.AmbientScope).Returns(scope.Object);
+            return accessor.Object;
         }
+    }
 
-        [Test]
-        public void Caches_Single()
-        {
-            var isCached = false;
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
-                .Callback(() => isCached = true);
+    [Test]
+    public void Caches_Single()
+    {
+        var isCached = false;
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
+            .Callback(() => isCached = true);
 
-            var defaultPolicy = new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+        var defaultPolicy =
+            new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
 
-            AuditItem unused = defaultPolicy.Get(1, id => new AuditItem(1, AuditType.Copy, 123, "test", "blah"), o => null);
-            Assert.IsTrue(isCached);
-        }
+        var unused = defaultPolicy.Get(1, id => new AuditItem(1, AuditType.Copy, 123, "test", "blah"), o => null);
+        Assert.IsTrue(isCached);
+    }
 
-        [Test]
-        public void Get_Single_From_Cache()
-        {
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Get(It.IsAny<string>())).Returns(new AuditItem(1, AuditType.Copy, 123, "test", "blah"));
+    [Test]
+    public void Get_Single_From_Cache()
+    {
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Get(It.IsAny<string>())).Returns(new AuditItem(1, AuditType.Copy, 123, "test", "blah"));
 
-            var defaultPolicy = new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+        var defaultPolicy =
+            new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
 
-            AuditItem found = defaultPolicy.Get(1, id => null, ids => null);
-            Assert.IsNotNull(found);
-        }
+        var found = defaultPolicy.Get(1, id => null, ids => null);
+        Assert.IsNotNull(found);
+    }
 
-        [Test]
-        public void Caches_Per_Id_For_Get_All()
-        {
-            var cached = new List<string>();
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
-                .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) => cached.Add(cacheKey));
-            cache.Setup(x => x.SearchByKey(It.IsAny<string>())).Returns(new AuditItem[] { });
+    [Test]
+    public void Caches_Per_Id_For_Get_All()
+    {
+        var cached = new List<string>();
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
+            .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) => cached.Add(cacheKey));
+        cache.Setup(x => x.SearchByKey(It.IsAny<string>())).Returns(new AuditItem[] { });
 
-            var defaultPolicy = new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+        var defaultPolicy =
+            new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
 
-            AuditItem[] unused = defaultPolicy.GetAll(new object[] { }, ids => new[]
-                    {
-                        new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                        new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
-                    });
-
-            Assert.AreEqual(2, cached.Count);
-        }
-
-        [Test]
-        public void Get_All_Without_Ids_From_Cache()
-        {
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.SearchByKey(It.IsAny<string>())).Returns(new[]
+        var unused = defaultPolicy.GetAll(
+            new object[] { },
+            ids => new[]
             {
                 new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
+                new AuditItem(2, AuditType.Copy, 123, "test", "blah2"),
             });
 
-            var defaultPolicy = new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+        Assert.AreEqual(2, cached.Count);
+    }
 
-            AuditItem[] found = defaultPolicy.GetAll(new object[] { }, ids => new[] { (AuditItem)null });
-            Assert.AreEqual(2, found.Length);
-        }
-
-        [Test]
-        public void If_CreateOrUpdate_Throws_Cache_Is_Removed()
+    [Test]
+    public void Get_All_Without_Ids_From_Cache()
+    {
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.SearchByKey(It.IsAny<string>())).Returns(new[]
         {
-            var cacheCleared = false;
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Clear(It.IsAny<string>()))
-                .Callback(() => cacheCleared = true);
+            new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
+            new AuditItem(2, AuditType.Copy, 123, "test", "blah2"),
+        });
 
-            var defaultPolicy = new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
-            try
-            {
-                defaultPolicy.Update(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
-            }
-            catch
-            {
-                // We need this catch or nunit throws up
-            }
-            finally
-            {
-                Assert.IsTrue(cacheCleared);
-            }
-        }
+        var defaultPolicy =
+            new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
 
-        [Test]
-        public void If_Removes_Throws_Cache_Is_Removed()
+        var found = defaultPolicy.GetAll(new object[] { }, ids => new[] { (AuditItem)null });
+        Assert.AreEqual(2, found.Length);
+    }
+
+    [Test]
+    public void If_CreateOrUpdate_Throws_Cache_Is_Removed()
+    {
+        var cacheCleared = false;
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Clear(It.IsAny<string>()))
+            .Callback(() => cacheCleared = true);
+
+        var defaultPolicy =
+            new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+        try
         {
-            var cacheCleared = false;
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Clear(It.IsAny<string>()))
-                .Callback(() => cacheCleared = true);
+            defaultPolicy.Update(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
+        }
+        catch
+        {
+            // We need this catch or nunit throws up
+        }
+        finally
+        {
+            Assert.IsTrue(cacheCleared);
+        }
+    }
 
-            var defaultPolicy = new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
-            try
-            {
-                defaultPolicy.Delete(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
-            }
-            catch
-            {
-                // We need this catch or nunit throws up
-            }
-            finally
-            {
-                Assert.IsTrue(cacheCleared);
-            }
+    [Test]
+    public void If_Removes_Throws_Cache_Is_Removed()
+    {
+        var cacheCleared = false;
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Clear(It.IsAny<string>()))
+            .Callback(() => cacheCleared = true);
+
+        var defaultPolicy =
+            new DefaultRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+        try
+        {
+            defaultPolicy.Delete(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
+        }
+        catch
+        {
+            // We need this catch or nunit throws up
+        }
+        finally
+        {
+            Assert.IsTrue(cacheCleared);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs
index 97acab7ce4..616b4ae80b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DictionaryAppCacheTests.cs
@@ -1,24 +1,23 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class DictionaryAppCacheTests : AppCacheTests
 {
-    [TestFixture]
-    public class DictionaryAppCacheTests : AppCacheTests
+    public override void Setup()
     {
-        private DictionaryAppCache _appCache;
-
-        public override void Setup()
-        {
-            base.Setup();
-            _appCache = new DictionaryAppCache();
-        }
-
-        internal override IAppCache AppCache => _appCache;
-
-        protected override int GetTotalItemCount => _appCache.Count;
+        base.Setup();
+        _appCache = new DictionaryAppCache();
     }
+
+    private DictionaryAppCache _appCache;
+
+    internal override IAppCache AppCache => _appCache;
+
+    protected override int GetTotalItemCount => _appCache.Count;
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs
index 7397e06d1d..53270a5ac2 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/DistributedCache/DistributedCacheTests.cs
@@ -8,175 +8,186 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Sync;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache.DistributedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache.DistributedCache;
+
+/// <summary>
+///     Ensures that calls to DistributedCache methods carry through to the IServerMessenger correctly
+/// </summary>
+[TestFixture]
+public class DistributedCacheTests
 {
-    /// <summary>
-    /// Ensures that calls to DistributedCache methods carry through to the IServerMessenger correctly
-    /// </summary>
-    [TestFixture]
-    public class DistributedCacheTests
+    [SetUp]
+    public void Setup()
     {
-        private global::Umbraco.Cms.Core.Cache.DistributedCache _distributedCache;
+        ServerRegistrar = new TestServerRegistrar();
+        ServerMessenger = new TestServerMessenger();
 
-        private IServerRoleAccessor ServerRegistrar { get; set; }
+        var cacheRefresherCollection = new CacheRefresherCollection(() => new[] { new TestCacheRefresher() });
 
-        private TestServerMessenger ServerMessenger { get; set; }
+        _distributedCache = new Cms.Core.Cache.DistributedCache(ServerMessenger, cacheRefresherCollection);
+    }
 
-        [SetUp]
-        public void Setup()
+    private Cms.Core.Cache.DistributedCache _distributedCache;
+
+    private IServerRoleAccessor ServerRegistrar { get; set; }
+
+    private TestServerMessenger ServerMessenger { get; set; }
+
+    [Test]
+    public void RefreshIntId()
+    {
+        for (var i = 1; i < 11; i++)
         {
-            ServerRegistrar = new TestServerRegistrar();
-            ServerMessenger = new TestServerMessenger();
-
-            var cacheRefresherCollection = new CacheRefresherCollection(() => new[]
-            {
-                new TestCacheRefresher()
-            });
-
-            _distributedCache = new global::Umbraco.Cms.Core.Cache.DistributedCache(ServerMessenger, cacheRefresherCollection);
+            _distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
         }
 
-        [Test]
-        public void RefreshIntId()
-        {
-            for (var i = 1; i < 11; i++)
-            {
-                _distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
-            }
+        Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
+    }
 
-            Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
+    [Test]
+    public void RefreshIntIdFromObject()
+    {
+        for (var i = 0; i < 10; i++)
+        {
+            _distributedCache.Refresh(
+                Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"),
+                x => x.Id,
+                new TestObjectWithId { Id = i });
         }
 
-        [Test]
-        public void RefreshIntIdFromObject()
-        {
-            for (var i = 0; i < 10; i++)
-            {
-                _distributedCache.Refresh(
-                    Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"),
-                    x => x.Id,
-                    new TestObjectWithId { Id = i });
-            }
+        Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
+    }
 
-            Assert.AreEqual(10, ServerMessenger.IntIdsRefreshed.Count);
+    [Test]
+    public void RefreshGuidId()
+    {
+        for (var i = 0; i < 11; i++)
+        {
+            _distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), Guid.NewGuid());
         }
 
-        [Test]
-        public void RefreshGuidId()
-        {
-            for (var i = 0; i < 11; i++)
-            {
-                _distributedCache.Refresh(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), Guid.NewGuid());
-            }
+        Assert.AreEqual(11, ServerMessenger.GuidIdsRefreshed.Count);
+    }
 
-            Assert.AreEqual(11, ServerMessenger.GuidIdsRefreshed.Count);
+    [Test]
+    public void RemoveIds()
+    {
+        for (var i = 1; i < 13; i++)
+        {
+            _distributedCache.Remove(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
         }
 
-        [Test]
-        public void RemoveIds()
-        {
-            for (var i = 1; i < 13; i++)
-            {
-                _distributedCache.Remove(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"), i);
-            }
+        Assert.AreEqual(12, ServerMessenger.IntIdsRemoved.Count);
+    }
 
-            Assert.AreEqual(12, ServerMessenger.IntIdsRemoved.Count);
+    [Test]
+    public void FullRefreshes()
+    {
+        for (var i = 0; i < 13; i++)
+        {
+            _distributedCache.RefreshAll(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"));
         }
 
-        [Test]
-        public void FullRefreshes()
-        {
-            for (var i = 0; i < 13; i++)
-            {
-                _distributedCache.RefreshAll(Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73"));
-            }
+        Assert.AreEqual(13, ServerMessenger.CountOfFullRefreshes);
+    }
 
-            Assert.AreEqual(13, ServerMessenger.CountOfFullRefreshes);
+    internal class TestObjectWithId
+    {
+        public int Id { get; set; }
+    }
+
+    internal class TestCacheRefresher : ICacheRefresher
+    {
+        public static readonly Guid UniqueId = Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73");
+
+        public Guid RefresherUniqueId => UniqueId;
+
+        public string Name => "Test Cache Refresher";
+
+        public void RefreshAll()
+        {
         }
 
-        internal class TestObjectWithId
+        public void Refresh(int id)
         {
-            public int Id { get; set; }
         }
 
-        internal class TestCacheRefresher : ICacheRefresher
+        public void Remove(int id)
         {
-            public static readonly Guid UniqueId = Guid.Parse("E0F452CB-DCB2-4E84-B5A5-4F01744C5C73");
-
-            public Guid RefresherUniqueId => UniqueId;
-
-            public string Name => "Test Cache Refresher";
-
-            public void RefreshAll()
-            {
-            }
-
-            public void Refresh(int id)
-            {
-            }
-
-            public void Remove(int id)
-            {
-            }
-
-            public void Refresh(Guid id)
-            {
-            }
         }
 
-        internal class TestServerMessenger : IServerMessenger
+        public void Refresh(Guid id)
         {
-            // Used for tests
-            public List<int> IntIdsRefreshed { get; } = new List<int>();
-            public List<Guid> GuidIdsRefreshed { get; } = new List<Guid>();
-            public List<int> IntIdsRemoved { get; } = new List<int>();
-            public List<string> PayloadsRemoved { get; } = new List<string>();
-            public List<string> PayloadsRefreshed { get; } = new List<string>();
-            public int CountOfFullRefreshes { get; private set; } = 0;
-
-            public void QueueRefresh<TPayload>(ICacheRefresher refresher, TPayload[] payload)
-            {
-                // doing nothing
-            }
-
-            public void PerformRefresh(ICacheRefresher refresher, string jsonPayload) => PayloadsRefreshed.Add(jsonPayload);
-
-            public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) => IntIdsRefreshed.AddRange(instances.Select(getNumericId));
-
-            public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, Guid> getGuidId, params T[] instances) => GuidIdsRefreshed.AddRange(instances.Select(getGuidId));
-
-            public void PerformRemove(ICacheRefresher refresher, string jsonPayload) => PayloadsRemoved.Add(jsonPayload);
-
-            public void QueueRemove<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) => IntIdsRemoved.AddRange(instances.Select(getNumericId));
-
-            public void QueueRemove(ICacheRefresher refresher, params int[] numericIds) => IntIdsRemoved.AddRange(numericIds);
-
-            public void QueueRefresh(ICacheRefresher refresher, params int[] numericIds) => IntIdsRefreshed.AddRange(numericIds);
-
-            public void QueueRefresh(ICacheRefresher refresher, params Guid[] guidIds) => GuidIdsRefreshed.AddRange(guidIds);
-
-            public void QueueRefreshAll(ICacheRefresher refresher) => CountOfFullRefreshes++;
-
-            public void Sync() { }
-
-            public void SendMessages() { }
-        }
-
-        internal class TestServerRegistrar : IServerRoleAccessor
-        {
-            public IEnumerable<IServerAddress> Registrations => new List<IServerAddress>
-            {
-                new TestServerAddress("localhost")
-            };
-
-            public ServerRole CurrentServerRole => throw new NotImplementedException();
-        }
-
-        public class TestServerAddress : IServerAddress
-        {
-            public TestServerAddress(string address) => ServerAddress = address;
-
-            public string ServerAddress { get; private set; }
         }
     }
+
+    internal class TestServerMessenger : IServerMessenger
+    {
+        // Used for tests
+        public List<int> IntIdsRefreshed { get; } = new();
+
+        public List<Guid> GuidIdsRefreshed { get; } = new();
+
+        public List<int> IntIdsRemoved { get; } = new();
+
+        public List<string> PayloadsRemoved { get; } = new();
+
+        public List<string> PayloadsRefreshed { get; } = new();
+
+        public int CountOfFullRefreshes { get; private set; }
+
+        public void QueueRefresh<TPayload>(ICacheRefresher refresher, TPayload[] payload)
+        {
+            // doing nothing
+        }
+
+        public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) =>
+            IntIdsRefreshed.AddRange(instances.Select(getNumericId));
+
+        public void QueueRefresh<T>(ICacheRefresher refresher, Func<T, Guid> getGuidId, params T[] instances) =>
+            GuidIdsRefreshed.AddRange(instances.Select(getGuidId));
+
+        public void QueueRemove<T>(ICacheRefresher refresher, Func<T, int> getNumericId, params T[] instances) =>
+            IntIdsRemoved.AddRange(instances.Select(getNumericId));
+
+        public void QueueRemove(ICacheRefresher refresher, params int[] numericIds) =>
+            IntIdsRemoved.AddRange(numericIds);
+
+        public void QueueRefresh(ICacheRefresher refresher, params int[] numericIds) =>
+            IntIdsRefreshed.AddRange(numericIds);
+
+        public void QueueRefresh(ICacheRefresher refresher, params Guid[] guidIds) =>
+            GuidIdsRefreshed.AddRange(guidIds);
+
+        public void QueueRefreshAll(ICacheRefresher refresher) => CountOfFullRefreshes++;
+
+        public void Sync()
+        {
+        }
+
+        public void SendMessages()
+        {
+        }
+
+        public void PerformRefresh(ICacheRefresher refresher, string jsonPayload) => PayloadsRefreshed.Add(jsonPayload);
+
+        public void PerformRemove(ICacheRefresher refresher, string jsonPayload) => PayloadsRemoved.Add(jsonPayload);
+    }
+
+    internal class TestServerRegistrar : IServerRoleAccessor
+    {
+        public IEnumerable<IServerAddress> Registrations => new List<IServerAddress>
+        {
+            new TestServerAddress("localhost"),
+        };
+
+        public ServerRole CurrentServerRole => throw new NotImplementedException();
+    }
+
+    public class TestServerAddress : IServerAddress
+    {
+        public TestServerAddress(string address) => ServerAddress = address;
+
+        public string ServerAddress { get; }
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs
index 284454ea25..d49327c58b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/FullDataSetCachePolicyTests.cs
@@ -10,206 +10,214 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Collections;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Scoping;
+using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class FullDataSetCachePolicyTests
 {
-    [TestFixture]
-    public class FullDataSetCachePolicyTests
+    private IScopeAccessor DefaultAccessor
     {
-        private IScopeAccessor DefaultAccessor
+        get
         {
-            get
-            {
-                var accessor = new Mock<IScopeAccessor>();
-                var scope = new Mock<IScope>();
-                scope.Setup(x => x.RepositoryCacheMode).Returns(Cms.Core.Scoping.RepositoryCacheMode.Default);
-                accessor.Setup(x => x.AmbientScope).Returns(scope.Object);
-                return accessor.Object;
-            }
+            var accessor = new Mock<IScopeAccessor>();
+            var scope = new Mock<IScope>();
+            scope.Setup(x => x.RepositoryCacheMode).Returns(RepositoryCacheMode.Default);
+            accessor.Setup(x => x.AmbientScope).Returns(scope.Object);
+            return accessor.Object;
         }
+    }
 
-        [Test]
-        public void Caches_Single()
+    [Test]
+    public void Caches_Single()
+    {
+        AuditItem[] getAll =
         {
-            AuditItem[] getAll = new[]
+            new(1, AuditType.Copy, 123, "test", "blah"),
+            new(2, AuditType.Copy, 123, "test", "blah2"),
+        };
+
+        var isCached = false;
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
+            .Callback(() => isCached = true);
+
+        var policy =
+            new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+
+        var unused = policy.Get(1, id => new AuditItem(1, AuditType.Copy, 123, "test", "blah"), ids => getAll);
+        Assert.IsTrue(isCached);
+    }
+
+    [Test]
+    public void Get_Single_From_Cache()
+    {
+        AuditItem[] getAll =
+        {
+            new(1, AuditType.Copy, 123, "test", "blah"), new(2, AuditType.Copy, 123, "test", "blah2"),
+        };
+
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Get(It.IsAny<string>())).Returns(new AuditItem(1, AuditType.Copy, 123, "test", "blah"));
+
+        var defaultPolicy =
+            new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+
+        var found = defaultPolicy.Get(1, id => null, ids => getAll);
+        Assert.IsNotNull(found);
+    }
+
+    [Test]
+    public void Get_All_Caches_Empty_List()
+    {
+        var getAll = new AuditItem[] { };
+
+        var cached = new List<string>();
+
+        IList list = null;
+
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
+            .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) =>
             {
-                new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
-            };
+                cached.Add(cacheKey);
 
-            var isCached = false;
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
-                .Callback(() => isCached = true);
-
-            var policy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
-
-            AuditItem unused = policy.Get(1, id => new AuditItem(1, AuditType.Copy, 123, "test", "blah"), ids => getAll);
-            Assert.IsTrue(isCached);
-        }
-
-        [Test]
-        public void Get_Single_From_Cache()
-        {
-            AuditItem[] getAll = new[]
-            {
-                new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
-            };
-
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Get(It.IsAny<string>())).Returns(new AuditItem(1, AuditType.Copy, 123, "test", "blah"));
-
-            var defaultPolicy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
-
-            AuditItem found = defaultPolicy.Get(1, id => null, ids => getAll);
-            Assert.IsNotNull(found);
-        }
-
-        [Test]
-        public void Get_All_Caches_Empty_List()
-        {
-            var getAll = new AuditItem[] { };
-
-            var cached = new List<string>();
-
-            IList list = null;
-
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
-                .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) =>
-                {
-                    cached.Add(cacheKey);
-
-                    list = o() as IList;
-                });
-
-            // Return null if this is the first pass.
-            cache.Setup(x => x.Get(It.IsAny<string>()))
-                .Returns(() => cached.Any() ? new DeepCloneableList<AuditItem>(ListCloneBehavior.CloneOnce) : null);
-
-            var policy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
-
-            AuditItem[] found = policy.GetAll(new object[] { }, ids => getAll);
-
-            Assert.AreEqual(1, cached.Count);
-            Assert.IsNotNull(list);
-
-            // Do it again, ensure that its coming from the cache!
-            policy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
-
-            found = policy.GetAll(new object[] { }, ids => getAll);
-
-            Assert.AreEqual(1, cached.Count);
-            Assert.IsNotNull(list);
-        }
-
-        [Test]
-        public void Get_All_Caches_As_Single_List()
-        {
-            AuditItem[] getAll = new[]
-            {
-                new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
-            };
-
-            var cached = new List<string>();
-            IList list = null;
-
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
-                .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) =>
-                {
-                    cached.Add(cacheKey);
-
-                    list = o() as IList;
-                });
-            cache.Setup(x => x.Get(It.IsAny<string>())).Returns(new AuditItem[] { });
-
-            var defaultPolicy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
-
-            AuditItem[] found = defaultPolicy.GetAll(new object[] { }, ids => getAll);
-
-            Assert.AreEqual(1, cached.Count);
-            Assert.IsNotNull(list);
-        }
-
-        [Test]
-        public void Get_All_Without_Ids_From_Cache()
-        {
-            AuditItem[] getAll = new[] { (AuditItem)null };
-
-            var cache = new Mock<IAppPolicyCache>();
-
-            cache.Setup(x => x.Get(It.IsAny<string>())).Returns(() => new DeepCloneableList<AuditItem>(ListCloneBehavior.CloneOnce)
-            {
-                new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
+                list = o() as IList;
             });
 
-            var defaultPolicy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+        // Return null if this is the first pass.
+        cache.Setup(x => x.Get(It.IsAny<string>()))
+            .Returns(() => cached.Any() ? new DeepCloneableList<AuditItem>(ListCloneBehavior.CloneOnce) : null);
 
-            AuditItem[] found = defaultPolicy.GetAll(new object[] { }, ids => getAll);
-            Assert.AreEqual(2, found.Length);
-        }
+        var policy =
+            new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
 
-        [Test]
-        public void If_CreateOrUpdate_Throws_Cache_Is_Removed()
+        var found = policy.GetAll(new object[] { }, ids => getAll);
+
+        Assert.AreEqual(1, cached.Count);
+        Assert.IsNotNull(list);
+
+        // Do it again, ensure that its coming from the cache!
+        policy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+
+        found = policy.GetAll(new object[] { }, ids => getAll);
+
+        Assert.AreEqual(1, cached.Count);
+        Assert.IsNotNull(list);
+    }
+
+    [Test]
+    public void Get_All_Caches_As_Single_List()
+    {
+        AuditItem[] getAll =
         {
-            AuditItem[] getAll = new[]
-            {
-                new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
-            };
+            new(1, AuditType.Copy, 123, "test", "blah"),
+            new(2, AuditType.Copy, 123, "test", "blah2"),
+        };
 
-            var cacheCleared = false;
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Clear(It.IsAny<string>()))
-                .Callback(() => cacheCleared = true);
+        var cached = new List<string>();
+        IList list = null;
 
-            var defaultPolicy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
-            try
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
+            .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) =>
             {
-                defaultPolicy.Update(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
-            }
-            catch
-            {
-                // We need this catch or nunit throws up.
-            }
-            finally
-            {
-                Assert.IsTrue(cacheCleared);
-            }
-        }
+                cached.Add(cacheKey);
 
-        [Test]
-        public void If_Removes_Throws_Cache_Is_Removed()
+                list = o() as IList;
+            });
+        cache.Setup(x => x.Get(It.IsAny<string>())).Returns(new AuditItem[] { });
+
+        var defaultPolicy =
+            new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+
+        var found = defaultPolicy.GetAll(new object[] { }, ids => getAll);
+
+        Assert.AreEqual(1, cached.Count);
+        Assert.IsNotNull(list);
+    }
+
+    [Test]
+    public void Get_All_Without_Ids_From_Cache()
+    {
+        AuditItem[] getAll = { null };
+
+        var cache = new Mock<IAppPolicyCache>();
+
+        cache.Setup(x => x.Get(It.IsAny<string>())).Returns(() =>
+            new DeepCloneableList<AuditItem>(ListCloneBehavior.CloneOnce)
+            {
+                new(1, AuditType.Copy, 123, "test", "blah"),
+                new(2, AuditType.Copy, 123, "test", "blah2"),
+            });
+
+        var defaultPolicy =
+            new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+
+        var found = defaultPolicy.GetAll(new object[] { }, ids => getAll);
+        Assert.AreEqual(2, found.Length);
+    }
+
+    [Test]
+    public void If_CreateOrUpdate_Throws_Cache_Is_Removed()
+    {
+        AuditItem[] getAll =
         {
-            AuditItem[] getAll = new[]
-            {
-                new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
-            };
+            new(1, AuditType.Copy, 123, "test", "blah"),
+            new(2, AuditType.Copy, 123, "test", "blah2"),
+        };
 
-            var cacheCleared = false;
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Clear(It.IsAny<string>()))
-                .Callback(() => cacheCleared = true);
+        var cacheCleared = false;
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Clear(It.IsAny<string>()))
+            .Callback(() => cacheCleared = true);
 
-            var defaultPolicy = new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
-            try
-            {
-                defaultPolicy.Delete(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
-            }
-            catch
-            {
-                // We need this catch or nunit throws up.
-            }
-            finally
-            {
-                Assert.IsTrue(cacheCleared);
-            }
+        var defaultPolicy =
+            new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+        try
+        {
+            defaultPolicy.Update(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
+        }
+        catch
+        {
+            // We need this catch or nunit throws up.
+        }
+        finally
+        {
+            Assert.IsTrue(cacheCleared);
+        }
+    }
+
+    [Test]
+    public void If_Removes_Throws_Cache_Is_Removed()
+    {
+        AuditItem[] getAll =
+        {
+            new(1, AuditType.Copy, 123, "test", "blah"),
+            new(2, AuditType.Copy, 123, "test", "blah2"),
+        };
+
+        var cacheCleared = false;
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Clear(It.IsAny<string>()))
+            .Callback(() => cacheCleared = true);
+
+        var defaultPolicy =
+            new FullDataSetRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, item => item.Id, false);
+        try
+        {
+            defaultPolicy.Delete(new AuditItem(1, AuditType.Copy, 123, "test", "blah"), item => throw new Exception("blah!"));
+        }
+        catch
+        {
+            // We need this catch or nunit throws up.
+        }
+        finally
+        {
+            Assert.IsTrue(cacheCleared);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs
index 30134c1b1a..aee0e975c3 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/HttpContextRequestAppCacheTests.cs
@@ -6,25 +6,24 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class HttpContextRequestAppCacheTests : AppCacheTests
 {
-    [TestFixture]
-    public class HttpContextRequestAppCacheTests : AppCacheTests
+    public override void Setup()
     {
-        private HttpContextRequestAppCache _appCache;
-        private IHttpContextAccessor _httpContextAccessor;
+        base.Setup();
+        var httpContext = new DefaultHttpContext();
 
-        public override void Setup()
-        {
-            base.Setup();
-            var httpContext = new DefaultHttpContext();
-
-            _httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
-            _appCache = new HttpContextRequestAppCache(_httpContextAccessor);
-        }
-
-        internal override IAppCache AppCache => _appCache;
-
-        protected override int GetTotalItemCount => _httpContextAccessor.HttpContext.Items.Count;
+        _httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
+        _appCache = new HttpContextRequestAppCache(_httpContextAccessor);
     }
+
+    private HttpContextRequestAppCache _appCache;
+    private IHttpContextAccessor _httpContextAccessor;
+
+    internal override IAppCache AppCache => _appCache;
+
+    protected override int GetTotalItemCount => _httpContextAccessor.HttpContext.Items.Count;
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs
index 73b50e2d63..4b68a85871 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ObjectAppCacheTests.cs
@@ -5,23 +5,22 @@ using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class ObjectAppCacheTests : RuntimeAppCacheTests
 {
-    [TestFixture]
-    public class ObjectAppCacheTests : RuntimeAppCacheTests
+    public override void Setup()
     {
-        private ObjectCacheAppCache _provider;
-
-        protected override int GetTotalItemCount => _provider.MemoryCache.Count();
-
-        public override void Setup()
-        {
-            base.Setup();
-            _provider = new ObjectCacheAppCache();
-        }
-
-        internal override IAppCache AppCache => _provider;
-
-        internal override IAppPolicyCache AppPolicyCache => _provider;
+        base.Setup();
+        _provider = new ObjectCacheAppCache();
     }
+
+    private ObjectCacheAppCache _provider;
+
+    protected override int GetTotalItemCount => _provider.MemoryCache.Count();
+
+    internal override IAppCache AppCache => _provider;
+
+    internal override IAppPolicyCache AppPolicyCache => _provider;
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs
index 5c9d2b13cf..6fcd37adb7 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RefresherTests.cs
@@ -7,63 +7,75 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Services.Changes;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class RefresherTests
 {
-    [TestFixture]
-    public class RefresherTests
+    [Test]
+    public void MediaCacheRefresherCanDeserializeJsonPayload()
     {
-        [Test]
-        public void MediaCacheRefresherCanDeserializeJsonPayload()
+        MediaCacheRefresher.JsonPayload[] source =
         {
-            MediaCacheRefresher.JsonPayload[] source = new[] { new MediaCacheRefresher.JsonPayload(1234, Guid.NewGuid(), TreeChangeTypes.None) };
-            var json = JsonConvert.SerializeObject(source);
-            MediaCacheRefresher.JsonPayload[] payload = JsonConvert.DeserializeObject<MediaCacheRefresher.JsonPayload[]>(json);
-            Assert.AreEqual(source[0].Id, payload[0].Id);
-            Assert.AreEqual(source[0].Key, payload[0].Key);
-            Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
-        }
+            new MediaCacheRefresher.JsonPayload(1234, Guid.NewGuid(), TreeChangeTypes.None),
+        };
+        var json = JsonConvert.SerializeObject(source);
+        var payload = JsonConvert.DeserializeObject<MediaCacheRefresher.JsonPayload[]>(json);
+        Assert.AreEqual(source[0].Id, payload[0].Id);
+        Assert.AreEqual(source[0].Key, payload[0].Key);
+        Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
+    }
 
-        [Test]
-        public void ContentCacheRefresherCanDeserializeJsonPayload()
+    [Test]
+    public void ContentCacheRefresherCanDeserializeJsonPayload()
+    {
+        ContentCacheRefresher.JsonPayload[] source =
         {
-            ContentCacheRefresher.JsonPayload[] source = new[] { new ContentCacheRefresher.JsonPayload(1234, Guid.NewGuid(), TreeChangeTypes.None) };
-            var json = JsonConvert.SerializeObject(source);
-            ContentCacheRefresher.JsonPayload[] payload = JsonConvert.DeserializeObject<ContentCacheRefresher.JsonPayload[]>(json);
-            Assert.AreEqual(source[0].Id, payload[0].Id);
-            Assert.AreEqual(source[0].Key, payload[0].Key);
-            Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
-        }
+            new ContentCacheRefresher.JsonPayload(1234, Guid.NewGuid(), TreeChangeTypes.None),
+        };
+        var json = JsonConvert.SerializeObject(source);
+        var payload = JsonConvert.DeserializeObject<ContentCacheRefresher.JsonPayload[]>(json);
+        Assert.AreEqual(source[0].Id, payload[0].Id);
+        Assert.AreEqual(source[0].Key, payload[0].Key);
+        Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
+    }
 
-        [Test]
-        public void ContentTypeCacheRefresherCanDeserializeJsonPayload()
+    [Test]
+    public void ContentTypeCacheRefresherCanDeserializeJsonPayload()
+    {
+        ContentTypeCacheRefresher.JsonPayload[] source =
         {
-            ContentTypeCacheRefresher.JsonPayload[] source = new[] { new ContentTypeCacheRefresher.JsonPayload("xxx", 1234, ContentTypeChangeTypes.None) };
-            var json = JsonConvert.SerializeObject(source);
-            ContentTypeCacheRefresher.JsonPayload[] payload = JsonConvert.DeserializeObject<ContentTypeCacheRefresher.JsonPayload[]>(json);
-            Assert.AreEqual(source[0].ItemType, payload[0].ItemType);
-            Assert.AreEqual(source[0].Id, payload[0].Id);
-            Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
-        }
+            new ContentTypeCacheRefresher.JsonPayload("xxx", 1234, ContentTypeChangeTypes.None),
+        };
+        var json = JsonConvert.SerializeObject(source);
+        var payload = JsonConvert.DeserializeObject<ContentTypeCacheRefresher.JsonPayload[]>(json);
+        Assert.AreEqual(source[0].ItemType, payload[0].ItemType);
+        Assert.AreEqual(source[0].Id, payload[0].Id);
+        Assert.AreEqual(source[0].ChangeTypes, payload[0].ChangeTypes);
+    }
 
-        [Test]
-        public void DataTypeCacheRefresherCanDeserializeJsonPayload()
+    [Test]
+    public void DataTypeCacheRefresherCanDeserializeJsonPayload()
+    {
+        DataTypeCacheRefresher.JsonPayload[] source =
         {
-            DataTypeCacheRefresher.JsonPayload[] source = new[] { new DataTypeCacheRefresher.JsonPayload(1234, Guid.NewGuid(), true) };
-            var json = JsonConvert.SerializeObject(source);
-            DataTypeCacheRefresher.JsonPayload[] payload = JsonConvert.DeserializeObject<DataTypeCacheRefresher.JsonPayload[]>(json);
-            Assert.AreEqual(source[0].Id, payload[0].Id);
-            Assert.AreEqual(source[0].Key, payload[0].Key);
-            Assert.AreEqual(source[0].Removed, payload[0].Removed);
-        }
+            new DataTypeCacheRefresher.JsonPayload(1234, Guid.NewGuid(), true),
+        };
+        var json = JsonConvert.SerializeObject(source);
+        var payload = JsonConvert.DeserializeObject<DataTypeCacheRefresher.JsonPayload[]>(json);
+        Assert.AreEqual(source[0].Id, payload[0].Id);
+        Assert.AreEqual(source[0].Key, payload[0].Key);
+        Assert.AreEqual(source[0].Removed, payload[0].Removed);
+    }
 
-        [Test]
-        public void DomainCacheRefresherCanDeserializeJsonPayload()
-        {
-            DomainCacheRefresher.JsonPayload[] source = new[] { new DomainCacheRefresher.JsonPayload(1234, DomainChangeTypes.None) };
-            var json = JsonConvert.SerializeObject(source);
-            DomainCacheRefresher.JsonPayload[] payload = JsonConvert.DeserializeObject<DomainCacheRefresher.JsonPayload[]>(json);
-            Assert.AreEqual(source[0].Id, payload[0].Id);
-            Assert.AreEqual(source[0].ChangeType, payload[0].ChangeType);
-        }
+    [Test]
+    public void DomainCacheRefresherCanDeserializeJsonPayload()
+    {
+        DomainCacheRefresher.JsonPayload[]
+            source = { new DomainCacheRefresher.JsonPayload(1234, DomainChangeTypes.None) };
+        var json = JsonConvert.SerializeObject(source);
+        var payload = JsonConvert.DeserializeObject<DomainCacheRefresher.JsonPayload[]>(json);
+        Assert.AreEqual(source[0].Id, payload[0].Id);
+        Assert.AreEqual(source[0].ChangeType, payload[0].ChangeType);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs
index 89e8fdb072..1b7efdd923 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/RuntimeAppCacheTests.cs
@@ -7,25 +7,24 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+public abstract class RuntimeAppCacheTests : AppCacheTests
 {
-    public abstract class RuntimeAppCacheTests : AppCacheTests
+    internal abstract IAppPolicyCache AppPolicyCache { get; }
+
+    [Test]
+    [Explicit("Testing for timeouts cannot work on VSTS.")]
+    public void Can_Add_And_Expire_Struct_Strongly_Typed_With_Null()
     {
-        internal abstract IAppPolicyCache AppPolicyCache { get; }
+        var now = DateTime.Now;
+        AppPolicyCache.Insert("DateTimeTest", () => now, new TimeSpan(0, 0, 0, 0, 200));
+        Assert.AreEqual(now, AppCache.GetCacheItem<DateTime>("DateTimeTest"));
+        Assert.AreEqual(now, AppCache.GetCacheItem<DateTime?>("DateTimeTest"));
 
-        [Test]
-        [Explicit("Testing for timeouts cannot work on VSTS.")]
-        public void Can_Add_And_Expire_Struct_Strongly_Typed_With_Null()
-        {
-            var now = DateTime.Now;
-            AppPolicyCache.Insert("DateTimeTest", () => now, new TimeSpan(0, 0, 0, 0, 200));
-            Assert.AreEqual(now, AppCache.GetCacheItem<DateTime>("DateTimeTest"));
-            Assert.AreEqual(now, AppCache.GetCacheItem<DateTime?>("DateTimeTest"));
+        Thread.Sleep(300); // sleep longer than the cache expiration
 
-            Thread.Sleep(300); // sleep longer than the cache expiration
-
-            Assert.AreEqual(default(DateTime), AppCache.GetCacheItem<DateTime>("DateTimeTest"));
-            Assert.AreEqual(null, AppCache.GetCacheItem<DateTime?>("DateTimeTest"));
-        }
+        Assert.AreEqual(default(DateTime), AppCache.GetCacheItem<DateTime>("DateTimeTest"));
+        Assert.AreEqual(null, AppCache.GetCacheItem<DateTime?>("DateTimeTest"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs
index e38cab93e5..5200d0fd88 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/SingleItemsOnlyCachePolicyTests.cs
@@ -11,55 +11,56 @@ using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Scoping;
 using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class SingleItemsOnlyCachePolicyTests
 {
-    [TestFixture]
-    public class SingleItemsOnlyCachePolicyTests
+    private IScopeAccessor DefaultAccessor
     {
-        private IScopeAccessor DefaultAccessor
+        get
         {
-            get
-            {
-                var accessor = new Mock<IScopeAccessor>();
-                var scope = new Mock<IScope>();
-                scope.Setup(x => x.RepositoryCacheMode).Returns(RepositoryCacheMode.Default);
-                accessor.Setup(x => x.AmbientScope).Returns(scope.Object);
-                return accessor.Object;
-            }
-        }
-
-        [Test]
-        public void Get_All_Doesnt_Cache()
-        {
-            var cached = new List<string>();
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
-                .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) => cached.Add(cacheKey));
-            cache.Setup(x => x.SearchByKey(It.IsAny<string>())).Returns(new AuditItem[] { });
-
-            var defaultPolicy = new SingleItemsOnlyRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
-
-            AuditItem[] unused = defaultPolicy.GetAll(new object[] { }, ids => new[]
-                    {
-                        new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
-                        new AuditItem(2, AuditType.Copy, 123, "test", "blah2")
-                    });
-
-            Assert.AreEqual(0, cached.Count);
-        }
-
-        [Test]
-        public void Caches_Single()
-        {
-            var isCached = false;
-            var cache = new Mock<IAppPolicyCache>();
-            cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
-                .Callback(() => isCached = true);
-
-            var defaultPolicy = new SingleItemsOnlyRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
-
-            AuditItem unused = defaultPolicy.Get(1, id => new AuditItem(1, AuditType.Copy, 123, "test", "blah"), ids => null);
-            Assert.IsTrue(isCached);
+            var accessor = new Mock<IScopeAccessor>();
+            var scope = new Mock<IScope>();
+            scope.Setup(x => x.RepositoryCacheMode).Returns(RepositoryCacheMode.Default);
+            accessor.Setup(x => x.AmbientScope).Returns(scope.Object);
+            return accessor.Object;
         }
     }
+
+    [Test]
+    public void Get_All_Doesnt_Cache()
+    {
+        var cached = new List<string>();
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
+            .Callback((string cacheKey, Func<object> o, TimeSpan? t, bool b, string[] s) => cached.Add(cacheKey));
+        cache.Setup(x => x.SearchByKey(It.IsAny<string>())).Returns(new AuditItem[] { });
+
+        var defaultPolicy = new SingleItemsOnlyRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+
+        var unused = defaultPolicy.GetAll(
+            new object[] { },
+            ids => new[]
+            {
+                new AuditItem(1, AuditType.Copy, 123, "test", "blah"),
+                new AuditItem(2, AuditType.Copy, 123, "test", "blah2"),
+            });
+
+        Assert.AreEqual(0, cached.Count);
+    }
+
+    [Test]
+    public void Caches_Single()
+    {
+        var isCached = false;
+        var cache = new Mock<IAppPolicyCache>();
+        cache.Setup(x => x.Insert(It.IsAny<string>(), It.IsAny<Func<object>>(), It.IsAny<TimeSpan?>(), It.IsAny<bool>(), It.IsAny<string[]>()))
+            .Callback(() => isCached = true);
+
+        var defaultPolicy = new SingleItemsOnlyRepositoryCachePolicy<AuditItem, object>(cache.Object, DefaultAccessor, new RepositoryCachePolicyOptions());
+
+        var unused = defaultPolicy.Get(1, id => new AuditItem(1, AuditType.Copy, 123, "test", "blah"), ids => null);
+        Assert.IsTrue(isCached);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs
index 94cd9924f9..5bf72b8500 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Cache/ValueEditorCacheTests.cs
@@ -1,133 +1,135 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Cache;
+
+[TestFixture]
+public class ValueEditorCacheTests
 {
-    [TestFixture]
-    public class ValueEditorCacheTests
+    [Test]
+    public void Caches_ValueEditor()
     {
+        var sut = new ValueEditorCache();
 
-        [Test]
-        public void Caches_ValueEditor()
+        var dataEditor = new FakeDataEditor("TestEditor");
+        var dataType = CreateDataTypeMock(1).Object;
+
+        // Request the same value editor twice
+        var firstEditor = sut.GetValueEditor(dataEditor, dataType);
+        var secondEditor = sut.GetValueEditor(dataEditor, dataType);
+
+        Assert.Multiple(() =>
         {
-            var sut = new ValueEditorCache();
+            Assert.AreSame(firstEditor, secondEditor);
+            Assert.AreEqual(1, dataEditor.ValueEditorCount, "GetValueEditor invoked more than once.");
+        });
+    }
 
-            var dataEditor = new FakeDataEditor("TestEditor");
-            IDataType dataType = CreateDataTypeMock(1).Object;
+    [Test]
+    public void Different_Data_Editors_Returns_Different_Value_Editors()
+    {
+        var sut = new ValueEditorCache();
 
-            // Request the same value editor twice
-            IDataValueEditor firstEditor = sut.GetValueEditor(dataEditor, dataType);
-            IDataValueEditor secondEditor = sut.GetValueEditor(dataEditor, dataType);
+        var dataEditor1 = new FakeDataEditor("Editor1");
+        var dataEditor2 = new FakeDataEditor("Editor2");
+        var dataType = CreateDataTypeMock(1).Object;
 
-            Assert.Multiple(() =>
-            {
-                Assert.AreSame(firstEditor, secondEditor);
-                Assert.AreEqual(1, dataEditor.ValueEditorCount, "GetValueEditor invoked more than once.");
-            });
+        var firstEditor = sut.GetValueEditor(dataEditor1, dataType);
+        var secondEditor = sut.GetValueEditor(dataEditor2, dataType);
+
+        Assert.AreNotSame(firstEditor, secondEditor);
+    }
+
+    [Test]
+    public void Different_Data_Types_Returns_Different_Value_Editors()
+    {
+        var sut = new ValueEditorCache();
+        var dataEditor = new FakeDataEditor("Editor");
+        var dataType1 = CreateDataTypeMock(1).Object;
+        var dataType2 = CreateDataTypeMock(2).Object;
+
+        var firstEditor = sut.GetValueEditor(dataEditor, dataType1);
+        var secondEditor = sut.GetValueEditor(dataEditor, dataType2);
+
+        Assert.AreNotSame(firstEditor, secondEditor);
+    }
+
+    [Test]
+    public void Clear_Cache_Removes_Specific_Editors()
+    {
+        var sut = new ValueEditorCache();
+
+        var dataEditor1 = new FakeDataEditor("Editor 1");
+        var dataEditor2 = new FakeDataEditor("Editor 2");
+
+        var dataType1 = CreateDataTypeMock(1).Object;
+        var dataType2 = CreateDataTypeMock(2).Object;
+
+        // Load the editors into cache
+        var editor1DataType1 = sut.GetValueEditor(dataEditor1, dataType1);
+        var editor1Datatype2 = sut.GetValueEditor(dataEditor1, dataType2);
+        var editor2DataType1 = sut.GetValueEditor(dataEditor2, dataType1);
+        var editor2Datatype2 = sut.GetValueEditor(dataEditor2, dataType2);
+
+        sut.ClearCache(new[] { dataType1.Id });
+
+        // New value editor objects should be created after it's cleared
+        Assert.AreNotSame(editor1DataType1, sut.GetValueEditor(dataEditor1, dataType1), "Value editor was not cleared from cache");
+        Assert.AreNotSame(editor2DataType1, sut.GetValueEditor(dataEditor2, dataType1), "Value editor was not cleared from cache");
+
+        // But the value editors for data type 2 should be the same
+        Assert.AreSame(editor1Datatype2, sut.GetValueEditor(dataEditor1, dataType2), "Too many editors was cleared from cache");
+        Assert.AreSame(editor2Datatype2, sut.GetValueEditor(dataEditor2, dataType2), "Too many editors was cleared from cache");
+    }
+
+    private Mock<IDataType> CreateDataTypeMock(int id)
+    {
+        var mock = new Mock<IDataType>();
+        mock.Setup(x => x.Id).Returns(id);
+        return mock;
+    }
+
+    /// <summary>
+    ///     A fake IDataEditor
+    /// </summary>
+    /// <remarks>
+    ///     This is necessary to ensure that different objects are returned from GetValueEditor
+    /// </remarks>
+    private class FakeDataEditor : IDataEditor
+    {
+        public int ValueEditorCount;
+
+        public FakeDataEditor(string alias) => Alias = alias;
+
+        public string Alias { get; }
+
+        public EditorType Type { get; }
+
+        public string Name { get; }
+
+        public string Icon { get; }
+
+        public string Group { get; }
+
+        public bool IsDeprecated { get; }
+
+        public IDataValueEditor GetValueEditor()
+        {
+            ValueEditorCount++;
+            return Mock.Of<IDataValueEditor>();
         }
 
-        [Test]
-        public void Different_Data_Editors_Returns_Different_Value_Editors()
-        {
-            var sut = new ValueEditorCache();
+        public IDataValueEditor GetValueEditor(object configuration) => GetValueEditor();
 
-            var dataEditor1 = new FakeDataEditor("Editor1");
-            var dataEditor2 = new FakeDataEditor("Editor2");
-            IDataType dataType = CreateDataTypeMock(1).Object;
+        public IDictionary<string, object> DefaultConfiguration { get; }
 
-            IDataValueEditor firstEditor = sut.GetValueEditor(dataEditor1, dataType);
-            IDataValueEditor secondEditor = sut.GetValueEditor(dataEditor2, dataType);
+        public IConfigurationEditor GetConfigurationEditor() => throw new NotImplementedException();
 
-            Assert.AreNotSame(firstEditor, secondEditor);
-        }
-
-        [Test]
-        public void Different_Data_Types_Returns_Different_Value_Editors()
-        {
-            var sut = new ValueEditorCache();
-            var dataEditor = new FakeDataEditor("Editor");
-            IDataType dataType1 = CreateDataTypeMock(1).Object;
-            IDataType dataType2 = CreateDataTypeMock(2).Object;
-
-            IDataValueEditor firstEditor = sut.GetValueEditor(dataEditor, dataType1);
-            IDataValueEditor secondEditor = sut.GetValueEditor(dataEditor, dataType2);
-
-            Assert.AreNotSame(firstEditor, secondEditor);
-        }
-
-        [Test]
-        public void Clear_Cache_Removes_Specific_Editors()
-        {
-            var sut = new ValueEditorCache();
-
-            var dataEditor1 = new FakeDataEditor("Editor 1");
-            var dataEditor2 = new FakeDataEditor("Editor 2");
-
-            IDataType dataType1 = CreateDataTypeMock(1).Object;
-            IDataType dataType2 = CreateDataTypeMock(2).Object;
-
-            // Load the editors into cache
-            IDataValueEditor editor1DataType1 = sut.GetValueEditor(dataEditor1, dataType1);
-            IDataValueEditor editor1Datatype2 = sut.GetValueEditor(dataEditor1, dataType2);
-            IDataValueEditor editor2DataType1 = sut.GetValueEditor(dataEditor2, dataType1);
-            IDataValueEditor editor2Datatype2 = sut.GetValueEditor(dataEditor2, dataType2);
-
-            sut.ClearCache(new []{dataType1.Id});
-
-            // New value editor objects should be created after it's cleared
-            Assert.AreNotSame(editor1DataType1, sut.GetValueEditor(dataEditor1, dataType1), "Value editor was not cleared from cache");
-            Assert.AreNotSame(editor2DataType1, sut.GetValueEditor(dataEditor2, dataType1), "Value editor was not cleared from cache");
-
-            // But the value editors for data type 2 should be the same
-            Assert.AreSame(editor1Datatype2, sut.GetValueEditor(dataEditor1, dataType2), "Too many editors was cleared from cache");
-            Assert.AreSame(editor2Datatype2, sut.GetValueEditor(dataEditor2, dataType2), "Too many editors was cleared from cache");
-        }
-
-
-        private Mock<IDataType> CreateDataTypeMock(int id)
-        {
-            var mock = new Mock<IDataType>();
-            mock.Setup(x => x.Id).Returns(id);
-            return mock;
-        }
-
-        /// <summary>
-        /// A fake IDataEditor
-        /// </summary>
-        /// <remarks>
-        /// This is necessary to ensure that different objects are returned from GetValueEditor
-        /// </remarks>
-        private class FakeDataEditor : IDataEditor
-        {
-            public FakeDataEditor(string alias)
-            {
-                Alias = alias;
-            }
-
-            public string Alias { get; }
-            public EditorType Type { get; }
-            public string Name { get; }
-            public string Icon { get; }
-            public string Group { get; }
-            public bool IsDeprecated { get; }
-
-            public IDataValueEditor GetValueEditor()
-            {
-                ValueEditorCount++;
-                return Mock.Of<IDataValueEditor>();
-            }
-            public IDataValueEditor GetValueEditor(object configuration) => GetValueEditor();
-
-            public IDictionary<string, object> DefaultConfiguration { get; }
-            public IConfigurationEditor GetConfigurationEditor() => throw new System.NotImplementedException();
-
-            public IPropertyIndexValueFactory PropertyIndexValueFactory { get; }
-
-            public int ValueEditorCount;
-        }
+        public IPropertyIndexValueFactory PropertyIndexValueFactory { get; }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs
index d531b091c9..27dd384af7 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ClaimsIdentityExtensionsTests.cs
@@ -7,46 +7,45 @@ using System.Security.Claims;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+public class ClaimsIdentityExtensionsTests
 {
-    public class ClaimsIdentityExtensionsTests
+    [Test]
+    public void FindFirstValue_WhenIdentityIsNull_ExpectArgumentNullException()
     {
-        [Test]
-        public void FindFirstValue_WhenIdentityIsNull_ExpectArgumentNullException()
-        {
-            ClaimsIdentity identity = null;
-            Assert.Throws<ArgumentNullException>(() => identity.FindFirstValue("test"));
-        }
+        ClaimsIdentity identity = null;
+        Assert.Throws<ArgumentNullException>(() => identity.FindFirstValue("test"));
+    }
 
-        [Test]
-        public void FindFirstValue_WhenClaimNotPresent_ExpectNull()
-        {
-            var identity = new ClaimsIdentity(new List<Claim>());
-            var value = identity.FindFirstValue("test");
-            Assert.IsNull(value);
-        }
+    [Test]
+    public void FindFirstValue_WhenClaimNotPresent_ExpectNull()
+    {
+        var identity = new ClaimsIdentity(new List<Claim>());
+        var value = identity.FindFirstValue("test");
+        Assert.IsNull(value);
+    }
 
-        [Test]
-        public void FindFirstValue_WhenMatchingClaimPresent_ExpectCorrectValue()
-        {
-            var expectedClaim = new Claim("test", "123", "string", "Umbraco");
-            var identity = new ClaimsIdentity(new List<Claim> { expectedClaim });
+    [Test]
+    public void FindFirstValue_WhenMatchingClaimPresent_ExpectCorrectValue()
+    {
+        var expectedClaim = new Claim("test", "123", "string", "Umbraco");
+        var identity = new ClaimsIdentity(new List<Claim> { expectedClaim });
 
-            var value = identity.FindFirstValue("test");
+        var value = identity.FindFirstValue("test");
 
-            Assert.AreEqual(expectedClaim.Value, value);
-        }
+        Assert.AreEqual(expectedClaim.Value, value);
+    }
 
-        [Test]
-        public void FindFirstValue_WhenMultipleMatchingClaimsPresent_ExpectFirstValue()
-        {
-            var expectedClaim = new Claim("test", "123", "string", "Umbraco");
-            var dupeClaim = new Claim(expectedClaim.Type, Guid.NewGuid().ToString());
-            var identity = new ClaimsIdentity(new List<Claim> { expectedClaim, dupeClaim });
+    [Test]
+    public void FindFirstValue_WhenMultipleMatchingClaimsPresent_ExpectFirstValue()
+    {
+        var expectedClaim = new Claim("test", "123", "string", "Umbraco");
+        var dupeClaim = new Claim(expectedClaim.Type, Guid.NewGuid().ToString());
+        var identity = new ClaimsIdentity(new List<Claim> { expectedClaim, dupeClaim });
 
-            var value = identity.FindFirstValue("test");
+        var value = identity.FindFirstValue("test");
 
-            Assert.AreEqual(expectedClaim.Value, value);
-        }
+        Assert.AreEqual(expectedClaim.Value, value);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs
index d5e6a88589..dd0ea1c424 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/DeepCloneableListTests.cs
@@ -6,103 +6,82 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Collections;
 using Umbraco.Cms.Tests.Common;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections;
+
+[TestFixture]
+public class DeepCloneableListTests
 {
-    [TestFixture]
-    public class DeepCloneableListTests
+    [Test]
+    public void Deep_Clones_Each_Item_Once()
     {
-        [Test]
-        public void Deep_Clones_Each_Item_Once()
+        var list = new DeepCloneableList<TestClone>(ListCloneBehavior.CloneOnce) { new(), new(), new() };
+
+        var cloned = list.DeepClone() as DeepCloneableList<TestClone>;
+
+        // Test that each item in the sequence is equal - based on the equality comparer of TestClone (i.e. it's ID)
+        Assert.IsTrue(list.SequenceEqual(cloned));
+
+        // Test that each instance in the list is not the same one
+        foreach (var item in list)
         {
-            var list = new DeepCloneableList<TestClone>(ListCloneBehavior.CloneOnce)
-            {
-                new TestClone(),
-                new TestClone(),
-                new TestClone()
-            };
-
-            var cloned = list.DeepClone() as DeepCloneableList<TestClone>;
-
-            // Test that each item in the sequence is equal - based on the equality comparer of TestClone (i.e. it's ID)
-            Assert.IsTrue(list.SequenceEqual(cloned));
-
-            // Test that each instance in the list is not the same one
-            foreach (TestClone item in list)
-            {
-                TestClone clone = cloned.Single(x => x.Id == item.Id);
-                Assert.AreNotSame(item, clone);
-            }
-
-            // Clone again from the clone - since it's clone once the items should be the same
-            var cloned2 = cloned.DeepClone() as DeepCloneableList<TestClone>;
-
-            // Test that each item in the sequence is equal - based on the equality comparer of TestClone (i.e. it's ID)
-            Assert.IsTrue(cloned.SequenceEqual(cloned2));
-
-            // Test that each instance in the list is the same one
-            foreach (TestClone item in cloned)
-            {
-                TestClone clone = cloned2.Single(x => x.Id == item.Id);
-                Assert.AreSame(item, clone);
-            }
+            var clone = cloned.Single(x => x.Id == item.Id);
+            Assert.AreNotSame(item, clone);
         }
 
-        [Test]
-        public void Deep_Clones_All_Elements()
+        // Clone again from the clone - since it's clone once the items should be the same
+        var cloned2 = cloned.DeepClone() as DeepCloneableList<TestClone>;
+
+        // Test that each item in the sequence is equal - based on the equality comparer of TestClone (i.e. it's ID)
+        Assert.IsTrue(cloned.SequenceEqual(cloned2));
+
+        // Test that each instance in the list is the same one
+        foreach (var item in cloned)
         {
-            var list = new DeepCloneableList<TestClone>(ListCloneBehavior.Always)
-            {
-                new TestClone(),
-                new TestClone(),
-                new TestClone()
-            };
-
-            var cloned = list.DeepClone() as DeepCloneableList<TestClone>;
-
-            Assert.IsNotNull(cloned);
-            Assert.AreNotSame(list, cloned);
-            Assert.AreEqual(list.Count, cloned.Count);
+            var clone = cloned2.Single(x => x.Id == item.Id);
+            Assert.AreSame(item, clone);
         }
+    }
 
-        [Test]
-        public void Clones_Each_Item()
+    [Test]
+    public void Deep_Clones_All_Elements()
+    {
+        var list = new DeepCloneableList<TestClone>(ListCloneBehavior.Always) { new(), new(), new() };
+
+        var cloned = list.DeepClone() as DeepCloneableList<TestClone>;
+
+        Assert.IsNotNull(cloned);
+        Assert.AreNotSame(list, cloned);
+        Assert.AreEqual(list.Count, cloned.Count);
+    }
+
+    [Test]
+    public void Clones_Each_Item()
+    {
+        var list = new DeepCloneableList<TestClone>(ListCloneBehavior.Always) { new(), new(), new() };
+
+        var cloned = (DeepCloneableList<TestClone>)list.DeepClone();
+
+        foreach (var item in cloned)
         {
-            var list = new DeepCloneableList<TestClone>(ListCloneBehavior.Always)
-            {
-                new TestClone(),
-                new TestClone(),
-                new TestClone()
-            };
-
-            var cloned = (DeepCloneableList<TestClone>)list.DeepClone();
-
-            foreach (TestClone item in cloned)
-            {
-                Assert.IsTrue(item.IsClone);
-            }
+            Assert.IsTrue(item.IsClone);
         }
+    }
 
-        [Test]
-        public void Cloned_Sequence_Equals()
+    [Test]
+    public void Cloned_Sequence_Equals()
+    {
+        var list = new DeepCloneableList<TestClone>(ListCloneBehavior.Always) { new(), new(), new() };
+
+        var cloned = (DeepCloneableList<TestClone>)list.DeepClone();
+
+        // Test that each item in the sequence is equal - based on the equality comparer of TestClone (i.e. it's ID)
+        Assert.IsTrue(list.SequenceEqual(cloned));
+
+        // Test that each instance in the list is not the same one
+        foreach (var item in list)
         {
-            var list = new DeepCloneableList<TestClone>(ListCloneBehavior.Always)
-            {
-                new TestClone(),
-                new TestClone(),
-                new TestClone()
-            };
-
-            var cloned = (DeepCloneableList<TestClone>)list.DeepClone();
-
-            // Test that each item in the sequence is equal - based on the equality comparer of TestClone (i.e. it's ID)
-            Assert.IsTrue(list.SequenceEqual(cloned));
-
-            // Test that each instance in the list is not the same one
-            foreach (TestClone item in list)
-            {
-                TestClone clone = cloned.Single(x => x.Id == item.Id);
-                Assert.AreNotSame(item, clone);
-            }
+            var clone = cloned.Single(x => x.Id == item.Id);
+            Assert.AreNotSame(item, clone);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs
index 4b77543140..b4f8e0504e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/OrderedHashSetTests.cs
@@ -5,92 +5,91 @@ using System;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Collections;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections;
+
+[TestFixture]
+public class OrderedHashSetTests
 {
-    [TestFixture]
-    public class OrderedHashSetTests
+    [Test]
+    public void Keeps_Last()
     {
-        [Test]
-        public void Keeps_Last()
+        var list = new OrderedHashSet<MyClass>(false);
+        MyClass[] items = { new MyClass("test"), new MyClass("test"), new MyClass("test") };
+        foreach (var item in items)
         {
-            var list = new OrderedHashSet<MyClass>(keepOldest: false);
-            MyClass[] items = new[] { new MyClass("test"), new MyClass("test"), new MyClass("test") };
-            foreach (MyClass item in items)
-            {
-                list.Add(item);
-            }
-
-            Assert.AreEqual(1, list.Count);
-            Assert.AreEqual(items[2].Id, list[0].Id);
-            Assert.AreNotEqual(items[0].Id, list[0].Id);
+            list.Add(item);
         }
 
-        [Test]
-        public void Keeps_First()
-        {
-            var list = new OrderedHashSet<MyClass>(keepOldest: true);
-            MyClass[] items = new[] { new MyClass("test"), new MyClass("test"), new MyClass("test") };
-            foreach (MyClass item in items)
-            {
-                list.Add(item);
-            }
+        Assert.AreEqual(1, list.Count);
+        Assert.AreEqual(items[2].Id, list[0].Id);
+        Assert.AreNotEqual(items[0].Id, list[0].Id);
+    }
 
-            Assert.AreEqual(1, list.Count);
-            Assert.AreEqual(items[0].Id, list[0].Id);
+    [Test]
+    public void Keeps_First()
+    {
+        var list = new OrderedHashSet<MyClass>();
+        MyClass[] items = { new MyClass("test"), new MyClass("test"), new MyClass("test") };
+        foreach (var item in items)
+        {
+            list.Add(item);
         }
 
-        private class MyClass : IEquatable<MyClass>
+        Assert.AreEqual(1, list.Count);
+        Assert.AreEqual(items[0].Id, list[0].Id);
+    }
+
+    private class MyClass : IEquatable<MyClass>
+    {
+        public MyClass(string name)
         {
-            public MyClass(string name)
-            {
-                Name = name;
-                Id = Guid.NewGuid();
-            }
-
-            public string Name { get; }
-
-            public Guid Id { get; }
-
-            public bool Equals(MyClass other)
-            {
-                if (other is null)
-                {
-                    return false;
-                }
-
-                if (ReferenceEquals(this, other))
-                {
-                    return true;
-                }
-
-                return string.Equals(Name, other.Name);
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (obj is null)
-                {
-                    return false;
-                }
-
-                if (ReferenceEquals(this, obj))
-                {
-                    return true;
-                }
-
-                if (obj.GetType() != GetType())
-                {
-                    return false;
-                }
-
-                return Equals((MyClass)obj);
-            }
-
-            public override int GetHashCode() => Name.GetHashCode();
-
-            public static bool operator ==(MyClass left, MyClass right) => Equals(left, right);
-
-            public static bool operator !=(MyClass left, MyClass right) => Equals(left, right) == false;
+            Name = name;
+            Id = Guid.NewGuid();
         }
+
+        public string Name { get; }
+
+        public Guid Id { get; }
+
+        public bool Equals(MyClass other)
+        {
+            if (other is null)
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, other))
+            {
+                return true;
+            }
+
+            return string.Equals(Name, other.Name);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is null)
+            {
+                return false;
+            }
+
+            if (ReferenceEquals(this, obj))
+            {
+                return true;
+            }
+
+            if (obj.GetType() != GetType())
+            {
+                return false;
+            }
+
+            return Equals((MyClass)obj);
+        }
+
+        public override int GetHashCode() => Name.GetHashCode();
+
+        public static bool operator ==(MyClass left, MyClass right) => Equals(left, right);
+
+        public static bool operator !=(MyClass left, MyClass right) => Equals(left, right) == false;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/StackQueueTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/StackQueueTests.cs
index c20a5a3aca..47335cf6ba 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/StackQueueTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Collections/StackQueueTests.cs
@@ -1,74 +1,72 @@
 using NUnit.Framework;
 using Umbraco.Cms.Core.Collections;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections
-{
-    [TestFixture]
-    public class StackQueueTests
-    {
-        [Test]
-        public void Queue()
-        {
-            var sq = new StackQueue<int>();
-            for (var i = 0; i < 3; i++)
-            {
-                sq.Enqueue(i);
-            }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Collections;
 
-            var expected = 0;
-            while (sq.Count > 0)
-            {
-                var next = sq.Dequeue();
-                Assert.AreEqual(expected, next);
-                expected++;
-            }
+[TestFixture]
+public class StackQueueTests
+{
+    [Test]
+    public void Queue()
+    {
+        var sq = new StackQueue<int>();
+        for (var i = 0; i < 3; i++)
+        {
+            sq.Enqueue(i);
         }
 
-        [Test]
-        public void Stack()
+        var expected = 0;
+        while (sq.Count > 0)
         {
-            var sq = new StackQueue<int>();
-            for (var i = 0; i < 3; i++)
+            var next = sq.Dequeue();
+            Assert.AreEqual(expected, next);
+            expected++;
+        }
+    }
+
+    [Test]
+    public void Stack()
+    {
+        var sq = new StackQueue<int>();
+        for (var i = 0; i < 3; i++)
+        {
+            sq.Push(i);
+        }
+
+        var expected = 2;
+        while (sq.Count > 0)
+        {
+            var next = sq.Pop();
+            Assert.AreEqual(expected, next);
+            expected--;
+        }
+    }
+
+    [Test]
+    public void Stack_And_Queue()
+    {
+        var sq = new StackQueue<int>();
+        for (var i = 0; i < 5; i++)
+        {
+            if (i % 2 == 0)
             {
                 sq.Push(i);
             }
-
-            var expected = 2;
-            while (sq.Count > 0)
+            else
             {
-                var next = sq.Pop();
-                Assert.AreEqual(expected, next);
-                expected--;
+                sq.Enqueue(i);
             }
         }
 
-        [Test]
-        public void Stack_And_Queue()
-        {
-            var sq = new StackQueue<int>();
-            for (var i = 0; i < 5; i++)
-            {
-                if (i % 2 == 0)
-                {
-                    sq.Push(i);
-                }
-                else
-                {
-                    sq.Enqueue(i);
-                }
-            }
-
-            // 4 (push)
-            // 3 (enqueue)
-            // 2 (push)
-            // 1 (enqueue)
-            // 0 (push)
-
-            Assert.AreEqual(4, sq.Pop());
-            Assert.AreEqual(0, sq.Dequeue());
-            Assert.AreEqual(3, sq.Pop());
-            Assert.AreEqual(1, sq.Dequeue());
-            Assert.AreEqual(2, sq.Pop());
-        }
+        // 4 (push)
+        // 3 (enqueue)
+        // 2 (push)
+        // 1 (enqueue)
+        // 0 (push)
+        Assert.AreEqual(4, sq.Pop());
+        Assert.AreEqual(0, sq.Dequeue());
+        Assert.AreEqual(3, sq.Pop());
+        Assert.AreEqual(1, sq.Dequeue());
+        Assert.AreEqual(2, sq.Pop());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
index 8aca86ba80..47ea784fdc 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
@@ -32,614 +32,655 @@ using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components;
+
+[TestFixture]
+public class ComponentTests
 {
-    [TestFixture]
-    public class ComponentTests
+    private static readonly List<Type> Composed = new();
+    private static readonly IIOHelper IOHelper = TestHelper.IOHelper;
+    private static readonly List<Type> Initialized = new();
+    private static readonly List<Type> Terminated = new();
+
+    private static IServiceProvider MockFactory(Action<Mock<IServiceProvider>> setup = null)
     {
-        private static readonly List<Type> Composed = new List<Type>();
-        private static readonly IIOHelper IOHelper = TestHelper.IOHelper;
-        private static readonly List<Type> Initialized = new List<Type>();
-        private static readonly List<Type> Terminated = new List<Type>();
-
-        private static IServiceProvider MockFactory(Action<Mock<IServiceProvider>> setup = null)
-        {
-            // FIXME: use IUmbracoDatabaseFactory vs UmbracoDatabaseFactory, clean it all up!
-            var mock = new Mock<IServiceProvider>();
-            ILoggerFactory loggerFactory = NullLoggerFactory.Instance;
-            ILogger logger = loggerFactory.CreateLogger("GenericLogger");
-            var globalSettings = new GlobalSettings();
-            var connectionStrings = new ConnectionStrings();
-            var mapperCollection = new NPocoMapperCollection(() => new[] { new NullableDateMapper() });
-            var f = new UmbracoDatabaseFactory(
-                loggerFactory.CreateLogger<UmbracoDatabaseFactory>(),
+        // FIXME: use IUmbracoDatabaseFactory vs UmbracoDatabaseFactory, clean it all up!
+        var mock = new Mock<IServiceProvider>();
+        ILoggerFactory loggerFactory = NullLoggerFactory.Instance;
+        var logger = loggerFactory.CreateLogger("GenericLogger");
+        var globalSettings = new GlobalSettings();
+        var connectionStrings = new ConnectionStrings();
+        var mapperCollection = new NPocoMapperCollection(() => new[] { new NullableDateMapper() });
+        var f = new UmbracoDatabaseFactory(
+            loggerFactory.CreateLogger<UmbracoDatabaseFactory>(),
+            loggerFactory,
+            Options.Create(globalSettings),
+            Mock.Of<IOptionsMonitor<ConnectionStrings>>(x => x.Get(It.IsAny<string>()) == connectionStrings),
+            new MapperCollection(() => Enumerable.Empty<BaseMapper>()),
+            Mock.Of<IDbProviderFactoryCreator>(),
+            new DatabaseSchemaCreatorFactory(
+                loggerFactory.CreateLogger<DatabaseSchemaCreator>(),
                 loggerFactory,
-                Options.Create(globalSettings),
-                Mock.Of<IOptionsMonitor<ConnectionStrings>>(x => x.Get(It.IsAny<string>()) == connectionStrings),
-                new MapperCollection(() => Enumerable.Empty<BaseMapper>()),
-                Mock.Of<IDbProviderFactoryCreator>(),
-                new DatabaseSchemaCreatorFactory(loggerFactory.CreateLogger<DatabaseSchemaCreator>(), loggerFactory, new UmbracoVersion(), Mock.Of<IEventAggregator>(), Mock.Of<IOptionsMonitor<InstallDefaultDataSettings>>()),
-                mapperCollection);
+                new UmbracoVersion(),
+                Mock.Of<IEventAggregator>(),
+                Mock.Of<IOptionsMonitor<InstallDefaultDataSettings>>()),
+            mapperCollection);
 
-            var fs = new FileSystems(loggerFactory, IOHelper, Options.Create(globalSettings), Mock.Of<IHostingEnvironment>());
-            var coreDebug = new CoreDebugSettings();
-            var mediaFileManager = new MediaFileManager(
-                Mock.Of<IFileSystem>(),
-                Mock.Of<IMediaPathScheme>(),
-                Mock.Of<ILogger<MediaFileManager>>(),
-                Mock.Of<IShortStringHelper>(),
-                Mock.Of<IServiceProvider>(),
-                Options.Create(new ContentSettings()));
-            IEventAggregator eventAggregator = Mock.Of<IEventAggregator>();
-            var scopeProvider = new ScopeProvider(new AmbientScopeStack(), new AmbientScopeContextStack(), Mock.Of<IDistributedLockingMechanismFactory>(),f , fs, new TestOptionsMonitor<CoreDebugSettings>(coreDebug), mediaFileManager, loggerFactory, eventAggregator);
+        var fs = new FileSystems(
+            loggerFactory,
+            IOHelper,
+            Options.Create(globalSettings),
+            Mock.Of<IHostingEnvironment>());
+        var coreDebug = new CoreDebugSettings();
+        var mediaFileManager = new MediaFileManager(
+            Mock.Of<IFileSystem>(),
+            Mock.Of<IMediaPathScheme>(),
+            Mock.Of<ILogger<MediaFileManager>>(),
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IServiceProvider>(),
+            Options.Create(new ContentSettings()));
+        var eventAggregator = Mock.Of<IEventAggregator>();
+        var scopeProvider = new ScopeProvider(
+            new AmbientScopeStack(), new AmbientScopeContextStack(),Mock.Of<IDistributedLockingMechanismFactory>(),
+            f,
+            fs,
+            new TestOptionsMonitor<CoreDebugSettings>(coreDebug),
+            mediaFileManager,
+            loggerFactory,
+            
+            eventAggregator);
 
-            mock.Setup(x => x.GetService(typeof(ILogger))).Returns(logger);
-            mock.Setup(x => x.GetService(typeof(ILogger<ComponentCollection>))).Returns(loggerFactory.CreateLogger<ComponentCollection>);
-            mock.Setup(x => x.GetService(typeof(ILoggerFactory))).Returns(loggerFactory);
-            mock.Setup(x => x.GetService(typeof(IProfilingLogger))).Returns(new ProfilingLogger(loggerFactory.CreateLogger<ProfilingLogger>(), Mock.Of<IProfiler>()));
-            mock.Setup(x => x.GetService(typeof(IUmbracoDatabaseFactory))).Returns(f);
-            mock.Setup(x => x.GetService(typeof(ICoreScopeProvider))).Returns(scopeProvider);
+        mock.Setup(x => x.GetService(typeof(ILogger))).Returns(logger);
+        mock.Setup(x => x.GetService(typeof(ILogger<ComponentCollection>)))
+            .Returns(loggerFactory.CreateLogger<ComponentCollection>);
+        mock.Setup(x => x.GetService(typeof(ILoggerFactory))).Returns(loggerFactory);
+        mock.Setup(x => x.GetService(typeof(IProfilingLogger)))
+            .Returns(new ProfilingLogger(loggerFactory.CreateLogger<ProfilingLogger>(), Mock.Of<IProfiler>()));
+        mock.Setup(x => x.GetService(typeof(IUmbracoDatabaseFactory))).Returns(f);
+        mock.Setup(x => x.GetService(typeof(ICoreScopeProvider))).Returns(scopeProvider);
 
-            setup?.Invoke(mock);
-            return mock.Object;
-        }
+        setup?.Invoke(mock);
+        return mock.Object;
+    }
 
-        private static IServiceCollection MockRegister() => new ServiceCollection();
+    private static IServiceCollection MockRegister() => new ServiceCollection();
 
-        private static TypeLoader MockTypeLoader() => new TypeLoader(Mock.Of<ITypeFinder>(), new VaryingRuntimeHash(), Mock.Of<IAppPolicyCache>(), new DirectoryInfo(TestHelper.GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)), Mock.Of<ILogger<TypeLoader>>(), Mock.Of<IProfiler>());
+    private static TypeLoader MockTypeLoader() => new(
+        Mock.Of<ITypeFinder>(),
+        new VaryingRuntimeHash(),
+        Mock.Of<IAppPolicyCache>(),
+        new DirectoryInfo(TestHelper.GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)),
+        Mock.Of<ILogger<TypeLoader>>(),
+        Mock.Of<IProfiler>());
 
-        [Test]
-        public void Boot1A()
+    [Test]
+    public void Boot1A()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        var types = TypeArray<Composer1, Composer2, Composer4>();
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+
+        // 2 is Core and requires 4
+        // 3 is User
+        // => reorder components accordingly
+        composers.Compose();
+        AssertTypeArray(TypeArray<Composer1, Composer4, Composer2>(), Composed);
+
+        var factory = MockFactory(m =>
         {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = TypeArray<Composer1, Composer2, Composer4>();
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-
-            // 2 is Core and requires 4
-            // 3 is User
-            // => reorder components accordingly
-            composers.Compose();
-            AssertTypeArray(TypeArray<Composer1, Composer4, Composer2>(), Composed);
-
-            IServiceProvider factory = MockFactory(m =>
+            m.Setup(x => x.GetService(It.Is<Type>(t => t == typeof(ISomeResource)))).Returns(() => new SomeResource());
+            m.Setup(x => x.GetService(It.IsAny<Type>())).Returns<Type>(type =>
             {
-                m.Setup(x => x.GetService(It.Is<Type>(t => t == typeof(ISomeResource)))).Returns(() => new SomeResource());
-                m.Setup(x => x.GetService(It.IsAny<Type>())).Returns<Type>((type) =>
+                if (type == typeof(Composer1))
                 {
-                    if (type == typeof(Composer1))
-                    {
-                        return new Composer1();
-                    }
+                    return new Composer1();
+                }
 
-                    if (type == typeof(Composer5))
-                    {
-                        return new Composer5();
-                    }
-
-                    if (type == typeof(Component5))
-                    {
-                        return new Component5(new SomeResource());
-                    }
-
-                    if (type == typeof(IProfilingLogger))
-                    {
-                        return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
-                    }
-
-                    if (type == typeof(ILogger<ComponentCollection>))
-                    {
-                        return Mock.Of<ILogger<ComponentCollection>>();
-                    }
-
-                    throw new NotSupportedException(type.FullName);
-                });
-            });
-
-            ComponentCollectionBuilder builder = composition.WithCollectionBuilder<ComponentCollectionBuilder>();
-            builder.RegisterWith(register);
-            ComponentCollection components = builder.CreateCollection(factory);
-
-            Assert.IsEmpty(components);
-            components.Initialize();
-            Assert.IsEmpty(Initialized);
-            components.Terminate();
-            Assert.IsEmpty(Terminated);
-        }
-
-        [Test]
-        public void Boot1B()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = TypeArray<Composer1, Composer2, Composer3, Composer4>();
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-
-            // 2 is Core and requires 4
-            // 3 is User - stays with RuntimeLevel.Run
-            // => reorder components accordingly
-            composers.Compose();
-            AssertTypeArray(TypeArray<Composer1, Composer4, Composer2, Composer3>(), Composed);
-        }
-
-        [Test]
-        public void Boot2()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = TypeArray<Composer20, Composer21>();
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-
-            // 21 is required by 20
-            // => reorder components accordingly
-            composers.Compose();
-            AssertTypeArray(TypeArray<Composer21, Composer20>(), Composed);
-        }
-
-        [Test]
-        public void Boot3()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = TypeArray<Composer22, Composer24, Composer25>();
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-
-            // i23 requires 22
-            // 24, 25 implement i23
-            // 25 required by i23
-            // => reorder components accordingly
-            composers.Compose();
-            AssertTypeArray(TypeArray<Composer22, Composer25, Composer24>(), Composed);
-        }
-
-        [Test]
-        public void BrokenRequire()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = TypeArray<Composer1, Composer2, Composer3>();
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            try
-            {
-                // 2 is Core and requires 4
-                // 4 is missing
-                // => throw
-                composers.Compose();
-                Assert.Fail("Expected exception.");
-            }
-            catch (Exception e)
-            {
-                Assert.AreEqual("Broken composer dependency: Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer2 -> Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer4.", e.Message);
-            }
-        }
-
-        [Test]
-        public void BrokenRequired()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = TypeArray<Composer2, Composer4, Composer13>();
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-
-            // 2 is Core and requires 4
-            // 13 is required by 1
-            // 1 is missing
-            // => reorder components accordingly
-            composers.Compose();
-            AssertTypeArray(TypeArray<Composer4, Composer2, Composer13>(), Composed);
-        }
-
-        [Test]
-        public void Initialize()
-        {
-            Composed.Clear();
-            Initialized.Clear();
-            Terminated.Clear();
-
-            IServiceCollection register = MockRegister();
-            TypeLoader typeLoader = MockTypeLoader();
-            IServiceProvider factory = MockFactory(m =>
-            {
-                m.Setup(x => x.GetService(It.Is<Type>(t => t == typeof(ISomeResource)))).Returns(() => new SomeResource());
-                m.Setup(x => x.GetService(It.IsAny<Type>())).Returns<Type>((type) =>
+                if (type == typeof(Composer5))
                 {
-                    if (type == typeof(Composer1))
-                    {
-                        return new Composer1();
-                    }
+                    return new Composer5();
+                }
 
-                    if (type == typeof(Composer5))
-                    {
-                        return new Composer5();
-                    }
+                if (type == typeof(Component5))
+                {
+                    return new Component5(new SomeResource());
+                }
 
-                    if (type == typeof(Composer5a))
-                    {
-                        return new Composer5a();
-                    }
+                if (type == typeof(IProfilingLogger))
+                {
+                    return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
+                }
 
-                    if (type == typeof(Component5))
-                    {
-                        return new Component5(new SomeResource());
-                    }
+                if (type == typeof(ILogger<ComponentCollection>))
+                {
+                    return Mock.Of<ILogger<ComponentCollection>>();
+                }
 
-                    if (type == typeof(Component5a))
-                    {
-                        return new Component5a();
-                    }
-
-                    if (type == typeof(IProfilingLogger))
-                    {
-                        return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
-                    }
-
-                    if (type == typeof(ILogger<ComponentCollection>))
-                    {
-                        return Mock.Of<ILogger<ComponentCollection>>();
-                    }
-
-                    throw new NotSupportedException(type.FullName);
-                });
+                throw new NotSupportedException(type.FullName);
             });
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+        });
 
-            Type[] types = new[] { typeof(Composer1), typeof(Composer5), typeof(Composer5a) };
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        var builder = composition.WithCollectionBuilder<ComponentCollectionBuilder>();
+        builder.RegisterWith(register);
+        var components = builder.CreateCollection(factory);
 
-            Assert.IsEmpty(Composed);
-            composers.Compose();
-            AssertTypeArray(TypeArray<Composer1, Composer5, Composer5a>(), Composed);
+        Assert.IsEmpty(components);
+        components.Initialize();
+        Assert.IsEmpty(Initialized);
+        components.Terminate();
+        Assert.IsEmpty(Terminated);
+    }
 
-            ComponentCollectionBuilder builder = composition.WithCollectionBuilder<ComponentCollectionBuilder>();
-            builder.RegisterWith(register);
-            ComponentCollection components = builder.CreateCollection(factory);
+    [Test]
+    public void Boot1B()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
 
-            Assert.IsEmpty(Initialized);
-            components.Initialize();
-            AssertTypeArray(TypeArray<Component5, Component5a>(), Initialized);
+        var types = TypeArray<Composer1, Composer2, Composer3, Composer4>();
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
 
-            Assert.IsEmpty(Terminated);
-            components.Terminate();
-            AssertTypeArray(TypeArray<Component5a, Component5>(), Terminated);
-        }
+        // 2 is Core and requires 4
+        // 3 is User - stays with RuntimeLevel.Run
+        // => reorder components accordingly
+        composers.Compose();
+        AssertTypeArray(TypeArray<Composer1, Composer4, Composer2, Composer3>(), Composed);
+    }
 
-        [Test]
-        public void Requires1()
+    [Test]
+    public void Boot2()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        var types = TypeArray<Composer20, Composer21>();
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+
+        // 21 is required by 20
+        // => reorder components accordingly
+        composers.Compose();
+        AssertTypeArray(TypeArray<Composer21, Composer20>(), Composed);
+    }
+
+    [Test]
+    public void Boot3()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        var types = TypeArray<Composer22, Composer24, Composer25>();
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+
+        // i23 requires 22
+        // 24, 25 implement i23
+        // 25 required by i23
+        // => reorder components accordingly
+        composers.Compose();
+        AssertTypeArray(TypeArray<Composer22, Composer25, Composer24>(), Composed);
+    }
+
+    [Test]
+    public void BrokenRequire()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        var types = TypeArray<Composer1, Composer2, Composer3>();
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        try
         {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = new[] { typeof(Composer6), typeof(Composer7), typeof(Composer8) };
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
+            // 2 is Core and requires 4
+            // 4 is missing
+            // => throw
             composers.Compose();
-            Assert.AreEqual(2, Composed.Count);
-            Assert.AreEqual(typeof(Composer6), Composed[0]);
-            Assert.AreEqual(typeof(Composer8), Composed[1]);
+            Assert.Fail("Expected exception.");
         }
-
-        [Test]
-        public void Requires2A()
+        catch (Exception e)
         {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = new[] { typeof(Composer9), typeof(Composer2), typeof(Composer4) };
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            composers.Compose();
-            Assert.AreEqual(3, Composed.Count);
-            Assert.AreEqual(typeof(Composer4), Composed[0]);
-            Assert.AreEqual(typeof(Composer2), Composed[1]);
+            Assert.AreEqual(
+                "Broken composer dependency: Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer2 -> Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Components.ComponentTests+Composer4.",
+                e.Message);
         }
+    }
 
-        [Test]
-        public void Requires2B()
+    [Test]
+    public void BrokenRequired()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        var types = TypeArray<Composer2, Composer4, Composer13>();
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+
+        // 2 is Core and requires 4
+        // 13 is required by 1
+        // 1 is missing
+        // => reorder components accordingly
+        composers.Compose();
+        AssertTypeArray(TypeArray<Composer4, Composer2, Composer13>(), Composed);
+    }
+
+    [Test]
+    public void Initialize()
+    {
+        Composed.Clear();
+        Initialized.Clear();
+        Terminated.Clear();
+
+        var register = MockRegister();
+        var typeLoader = MockTypeLoader();
+        var factory = MockFactory(m =>
         {
-            IServiceCollection register = MockRegister();
-            TypeLoader typeLoader = MockTypeLoader();
-            IServiceProvider factory = MockFactory();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = new[] { typeof(Composer9), typeof(Composer2), typeof(Composer4) };
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            composers.Compose();
-            ComponentCollectionBuilder builder = composition.WithCollectionBuilder<ComponentCollectionBuilder>();
-            builder.RegisterWith(register);
-            ComponentCollection components = builder.CreateCollection(factory);
-            Assert.AreEqual(3, Composed.Count);
-            Assert.AreEqual(typeof(Composer4), Composed[0]);
-            Assert.AreEqual(typeof(Composer2), Composed[1]);
-            Assert.AreEqual(typeof(Composer9), Composed[2]);
-        }
-
-        [Test]
-        public void WeakDependencies()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = new[] { typeof(Composer10) };
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            composers.Compose();
-            Assert.AreEqual(1, Composed.Count);
-            Assert.AreEqual(typeof(Composer10), Composed[0]);
-
-            types = new[] { typeof(Composer11) };
-            composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            Assert.Throws<Exception>(() => composers.Compose());
-            Console.WriteLine("throws:");
-            composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Dictionary<Type, List<Type>> requirements = composers.GetRequirements(false);
-            Console.WriteLine(ComposerGraph.GetComposersReport(requirements));
-
-            types = new[] { typeof(Composer2) };
-            composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            Assert.Throws<Exception>(() => composers.Compose());
-            Console.WriteLine("throws:");
-            composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            requirements = composers.GetRequirements(false);
-            Console.WriteLine(ComposerGraph.GetComposersReport(requirements));
-
-            types = new[] { typeof(Composer12) };
-            composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            composers.Compose();
-            Assert.AreEqual(1, Composed.Count);
-            Assert.AreEqual(typeof(Composer12), Composed[0]);
-        }
-
-        [Test]
-        public void DisableMissing()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = new[] { typeof(Composer6), typeof(Composer8) }; // 8 disables 7 which is not in the list
-            var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            composers.Compose();
-            Assert.AreEqual(2, Composed.Count);
-            Assert.AreEqual(typeof(Composer6), Composed[0]);
-            Assert.AreEqual(typeof(Composer8), Composed[1]);
-        }
-
-        [Test]
-        public void AttributesPriorities()
-        {
-            IServiceCollection register = MockRegister();
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            Type[] types = new[] { typeof(Composer26) };
-            DisableComposerAttribute[] enableDisableAttributes = new[] { new DisableComposerAttribute(typeof(Composer26)) };
-            var composers = new ComposerGraph(composition, types, enableDisableAttributes, Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            composers.Compose();
-            Assert.AreEqual(0, Composed.Count); // 26 gone
-
-            types = new[] { typeof(Composer26), typeof(Composer27) }; // 26 disabled by assembly attribute, enabled by 27
-            composers = new ComposerGraph(composition, types, enableDisableAttributes, Mock.Of<ILogger<ComposerGraph>>());
-            Composed.Clear();
-            composers.Compose();
-            Assert.AreEqual(2, Composed.Count); // both
-            Assert.AreEqual(typeof(Composer26), Composed[0]);
-            Assert.AreEqual(typeof(Composer27), Composed[1]);
-        }
-
-        [Test]
-        public void AllComposers()
-        {
-            ITypeFinder typeFinder = TestHelper.GetTypeFinder();
-            var typeLoader = new TypeLoader(typeFinder, new VaryingRuntimeHash(), AppCaches.Disabled.RuntimeCache, new DirectoryInfo(TestHelper.GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)), Mock.Of<ILogger<TypeLoader>>(), Mock.Of<IProfiler>());
-
-            IServiceCollection register = MockRegister();
-            var builder = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            var allComposers = typeLoader.GetTypes<IComposer>().ToList();
-            var types = allComposers.Where(x => x.FullName.StartsWith("Umbraco.Core.") || x.FullName.StartsWith("Umbraco.Web")).ToList();
-            var composers = new ComposerGraph(builder, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
-            Dictionary<Type, List<Type>> requirements = composers.GetRequirements();
-            string report = ComposerGraph.GetComposersReport(requirements);
-            Console.WriteLine(report);
-            IEnumerable<Type> composerTypes = composers.SortComposers(requirements);
-
-            foreach (Type type in composerTypes)
+            m.Setup(x => x.GetService(It.Is<Type>(t => t == typeof(ISomeResource)))).Returns(() => new SomeResource());
+            m.Setup(x => x.GetService(It.IsAny<Type>())).Returns<Type>(type =>
             {
-                Console.WriteLine(type);
-            }
-        }
+                if (type == typeof(Composer1))
+                {
+                    return new Composer1();
+                }
 
-        public class TestComposerBase : IComposer
+                if (type == typeof(Composer5))
+                {
+                    return new Composer5();
+                }
+
+                if (type == typeof(Composer5a))
+                {
+                    return new Composer5a();
+                }
+
+                if (type == typeof(Component5))
+                {
+                    return new Component5(new SomeResource());
+                }
+
+                if (type == typeof(Component5a))
+                {
+                    return new Component5a();
+                }
+
+                if (type == typeof(IProfilingLogger))
+                {
+                    return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
+                }
+
+                if (type == typeof(ILogger<ComponentCollection>))
+                {
+                    return Mock.Of<ILogger<ComponentCollection>>();
+                }
+
+                throw new NotSupportedException(type.FullName);
+            });
+        });
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        Type[] types = { typeof(Composer1), typeof(Composer5), typeof(Composer5a) };
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+
+        Assert.IsEmpty(Composed);
+        composers.Compose();
+        AssertTypeArray(TypeArray<Composer1, Composer5, Composer5a>(), Composed);
+
+        var builder = composition.WithCollectionBuilder<ComponentCollectionBuilder>();
+        builder.RegisterWith(register);
+        var components = builder.CreateCollection(factory);
+
+        Assert.IsEmpty(Initialized);
+        components.Initialize();
+        AssertTypeArray(TypeArray<Component5, Component5a>(), Initialized);
+
+        Assert.IsEmpty(Terminated);
+        components.Terminate();
+        AssertTypeArray(TypeArray<Component5a, Component5>(), Terminated);
+    }
+
+    [Test]
+    public void Requires1()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        Type[] types = { typeof(Composer6), typeof(Composer7), typeof(Composer8) };
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        Assert.AreEqual(2, Composed.Count);
+        Assert.AreEqual(typeof(Composer6), Composed[0]);
+        Assert.AreEqual(typeof(Composer8), Composed[1]);
+    }
+
+    [Test]
+    public void Requires2A()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        Type[] types = { typeof(Composer9), typeof(Composer2), typeof(Composer4) };
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        Assert.AreEqual(3, Composed.Count);
+        Assert.AreEqual(typeof(Composer4), Composed[0]);
+        Assert.AreEqual(typeof(Composer2), Composed[1]);
+    }
+
+    [Test]
+    public void Requires2B()
+    {
+        var register = MockRegister();
+        var typeLoader = MockTypeLoader();
+        var factory = MockFactory();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        Type[] types = { typeof(Composer9), typeof(Composer2), typeof(Composer4) };
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        var builder = composition.WithCollectionBuilder<ComponentCollectionBuilder>();
+        builder.RegisterWith(register);
+        var components = builder.CreateCollection(factory);
+        Assert.AreEqual(3, Composed.Count);
+        Assert.AreEqual(typeof(Composer4), Composed[0]);
+        Assert.AreEqual(typeof(Composer2), Composed[1]);
+        Assert.AreEqual(typeof(Composer9), Composed[2]);
+    }
+
+    [Test]
+    public void WeakDependencies()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        Type[] types = { typeof(Composer10) };
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        Assert.AreEqual(1, Composed.Count);
+        Assert.AreEqual(typeof(Composer10), Composed[0]);
+
+        types = new[] { typeof(Composer11) };
+        composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        Assert.Throws<Exception>(() => composers.Compose());
+        Console.WriteLine("throws:");
+        composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        var requirements = composers.GetRequirements(false);
+        Console.WriteLine(ComposerGraph.GetComposersReport(requirements));
+
+        types = new[] { typeof(Composer2) };
+        composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        Assert.Throws<Exception>(() => composers.Compose());
+        Console.WriteLine("throws:");
+        composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        requirements = composers.GetRequirements(false);
+        Console.WriteLine(ComposerGraph.GetComposersReport(requirements));
+
+        types = new[] { typeof(Composer12) };
+        composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        Assert.AreEqual(1, Composed.Count);
+        Assert.AreEqual(typeof(Composer12), Composed[0]);
+    }
+
+    [Test]
+    public void DisableMissing()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        Type[] types = { typeof(Composer6), typeof(Composer8) }; // 8 disables 7 which is not in the list
+        var composers = new ComposerGraph(composition, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        Assert.AreEqual(2, Composed.Count);
+        Assert.AreEqual(typeof(Composer6), Composed[0]);
+        Assert.AreEqual(typeof(Composer8), Composed[1]);
+    }
+
+    [Test]
+    public void AttributesPriorities()
+    {
+        var register = MockRegister();
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        Type[] types = { typeof(Composer26) };
+        DisableComposerAttribute[] enableDisableAttributes = { new(typeof(Composer26)) };
+        var composers =
+            new ComposerGraph(composition, types, enableDisableAttributes, Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        Assert.AreEqual(0, Composed.Count); // 26 gone
+
+        types = new[] { typeof(Composer26), typeof(Composer27) }; // 26 disabled by assembly attribute, enabled by 27
+        composers = new ComposerGraph(composition, types, enableDisableAttributes, Mock.Of<ILogger<ComposerGraph>>());
+        Composed.Clear();
+        composers.Compose();
+        Assert.AreEqual(2, Composed.Count); // both
+        Assert.AreEqual(typeof(Composer26), Composed[0]);
+        Assert.AreEqual(typeof(Composer27), Composed[1]);
+    }
+
+    [Test]
+    public void AllComposers()
+    {
+        var typeFinder = TestHelper.GetTypeFinder();
+        var typeLoader = new TypeLoader(
+            typeFinder,
+            new VaryingRuntimeHash(),
+            AppCaches.Disabled.RuntimeCache,
+            new DirectoryInfo(TestHelper.GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)),
+            Mock.Of<ILogger<TypeLoader>>(),
+            Mock.Of<IProfiler>());
+
+        var register = MockRegister();
+        var builder = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        var allComposers = typeLoader.GetTypes<IComposer>().ToList();
+        var types = allComposers
+            .Where(x => x.FullName.StartsWith("Umbraco.Core.") || x.FullName.StartsWith("Umbraco.Web")).ToList();
+        var composers = new ComposerGraph(builder, types, Enumerable.Empty<Attribute>(), Mock.Of<ILogger<ComposerGraph>>());
+        var requirements = composers.GetRequirements();
+        var report = ComposerGraph.GetComposersReport(requirements);
+        Console.WriteLine(report);
+        var composerTypes = composers.SortComposers(requirements);
+
+        foreach (var type in composerTypes)
         {
-            public virtual void Compose(IUmbracoBuilder builder) => Composed.Add(GetType());
+            Console.WriteLine(type);
         }
+    }
 
-        public class Composer1 : TestComposerBase
+    public class TestComposerBase : IComposer
+    {
+        public virtual void Compose(IUmbracoBuilder builder) => Composed.Add(GetType());
+    }
+
+    public class Composer1 : TestComposerBase
+    {
+    }
+
+    [ComposeAfter(typeof(Composer4))]
+    public class Composer2 : TestComposerBase
+    {
+    }
+
+    public class Composer3 : TestComposerBase
+    {
+    }
+
+    public class Composer4 : TestComposerBase
+    {
+    }
+
+    public class Composer5 : TestComposerBase
+    {
+        public override void Compose(IUmbracoBuilder builder)
         {
+            base.Compose(builder);
+            builder.Components().Append<Component5>();
         }
+    }
 
-        [ComposeAfter(typeof(Composer4))]
-        public class Composer2 : TestComposerBase
+    [ComposeAfter(typeof(Composer5))]
+    public class Composer5a : TestComposerBase
+    {
+        public override void Compose(IUmbracoBuilder builder)
         {
+            base.Compose(builder);
+            builder.Components().Append<Component5a>();
         }
+    }
 
-        public class Composer3 : TestComposerBase, IComposer
+    public class TestComponentBase : IComponent
+    {
+        public virtual void Initialize() => Initialized.Add(GetType());
+
+        public virtual void Terminate() => Terminated.Add(GetType());
+    }
+
+    public class Component5 : TestComponentBase
+    {
+        private readonly ISomeResource _resource;
+
+        public Component5(ISomeResource resource) => _resource = resource;
+    }
+
+    public class Component5a : TestComponentBase
+    {
+    }
+
+    [Disable]
+    public class Composer6 : TestComposerBase
+    {
+    }
+
+    public class Composer7 : TestComposerBase
+    {
+    }
+
+    [Disable(typeof(Composer7))]
+    [Enable(typeof(Composer6))]
+    public class Composer8 : TestComposerBase
+    {
+    }
+
+    public interface ITestComposer : IComposer
+    {
+    }
+
+    [ComposeAfter(typeof(Composer2))]
+    [ComposeAfter(typeof(Composer4))]
+    public class Composer9 : TestComposerBase, ITestComposer
+    {
+    }
+
+    [ComposeAfter(typeof(ITestComposer))]
+    public class Composer10 : TestComposerBase
+    {
+    }
+
+    [ComposeAfter(typeof(ITestComposer), false)]
+    public class Composer11 : TestComposerBase
+    {
+    }
+
+    [ComposeAfter(typeof(Composer4), true)]
+    public class Composer12 : TestComposerBase
+    {
+    }
+
+    [ComposeBefore(typeof(Composer1))]
+    public class Composer13 : TestComposerBase
+    {
+    }
+
+    public interface ISomeResource
+    {
+    }
+
+    public class SomeResource : ISomeResource
+    {
+    }
+
+    public class Composer20 : TestComposerBase
+    {
+    }
+
+    [ComposeBefore(typeof(Composer20))]
+    public class Composer21 : TestComposerBase
+    {
+    }
+
+    public class Composer22 : TestComposerBase
+    {
+    }
+
+    [ComposeAfter(typeof(Composer22))]
+    public interface IComposer23 : IComposer
+    {
+    }
+
+    public class Composer24 : TestComposerBase, IComposer23
+    {
+    }
+
+    // should insert itself between 22 and anything i23
+    [ComposeBefore(typeof(IComposer23))]
+    ////[RequireComponent(typeof(Component22))] - not needed, implement i23
+    public class Composer25 : TestComposerBase, IComposer23
+    {
+    }
+
+    public class Composer26 : TestComposerBase
+    {
+    }
+
+    [Enable(typeof(Composer26))]
+    public class Composer27 : TestComposerBase
+    {
+    }
+
+    // FIXME: move to Testing
+    private static Type[] TypeArray<T1>() => new[] { typeof(T1) };
+
+    private static Type[] TypeArray<T1, T2>() => new[] { typeof(T1), typeof(T2) };
+
+    private static Type[] TypeArray<T1, T2, T3>() => new[] { typeof(T1), typeof(T2), typeof(T3) };
+
+    private static Type[] TypeArray<T1, T2, T3, T4>() => new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4) };
+
+    private static Type[] TypeArray<T1, T2, T3, T4, T5>() =>
+        new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5) };
+
+    private static Type[] TypeArray<T1, T2, T3, T4, T5, T6>() =>
+        new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5), typeof(T6) };
+
+    private static Type[] TypeArray<T1, T2, T3, T4, T5, T6, T7>() => new[]
+    {
+        typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5), typeof(T6), typeof(T7),
+    };
+
+    private static Type[] TypeArray<T1, T2, T3, T4, T5, T6, T7, T8>() => new[]
+    {
+        typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5), typeof(T6), typeof(T7), typeof(T8),
+    };
+
+    private static void AssertTypeArray(IReadOnlyList<Type> expected, IReadOnlyList<Type> test)
+    {
+        Assert.AreEqual(expected.Count, test.Count);
+        for (var i = 0; i < expected.Count; i++)
         {
-        }
-
-
-        public class Composer4 : TestComposerBase
-        {
-        }
-
-        public class Composer5 : TestComposerBase
-        {
-            public override void Compose(IUmbracoBuilder builder)
-            {
-                base.Compose(builder);
-                builder.Components().Append<Component5>();
-            }
-        }
-
-        [ComposeAfter(typeof(Composer5))]
-        public class Composer5a : TestComposerBase
-        {
-            public override void Compose(IUmbracoBuilder builder)
-            {
-                base.Compose(builder);
-                builder.Components().Append<Component5a>();
-            }
-        }
-
-        public class TestComponentBase : IComponent
-        {
-            public virtual void Initialize() => Initialized.Add(GetType());
-
-            public virtual void Terminate() => Terminated.Add(GetType());
-        }
-
-        public class Component5 : TestComponentBase
-        {
-            private readonly ISomeResource _resource;
-
-            public Component5(ISomeResource resource) => _resource = resource;
-        }
-
-        public class Component5a : TestComponentBase
-        {
-        }
-
-        [Disable]
-        public class Composer6 : TestComposerBase
-        {
-        }
-
-        public class Composer7 : TestComposerBase
-        {
-        }
-
-        [Disable(typeof(Composer7))]
-        [Enable(typeof(Composer6))]
-        public class Composer8 : TestComposerBase
-        {
-        }
-
-        public interface ITestComposer : IComposer
-        {
-        }
-
-        [ComposeAfter(typeof(Composer2))]
-        [ComposeAfter(typeof(Composer4))]
-        public class Composer9 : TestComposerBase, ITestComposer
-        {
-        }
-
-        [ComposeAfter(typeof(ITestComposer))]
-        public class Composer10 : TestComposerBase
-        {
-        }
-
-        [ComposeAfter(typeof(ITestComposer), false)]
-        public class Composer11 : TestComposerBase
-        {
-        }
-
-        [ComposeAfter(typeof(Composer4), true)]
-        public class Composer12 : TestComposerBase
-        {
-        }
-
-        [ComposeBefore(typeof(Composer1))]
-        public class Composer13 : TestComposerBase
-        {
-        }
-
-        public interface ISomeResource
-        {
-        }
-
-        public class SomeResource : ISomeResource
-        {
-        }
-
-        public class Composer20 : TestComposerBase
-        {
-        }
-
-        [ComposeBefore(typeof(Composer20))]
-        public class Composer21 : TestComposerBase
-        {
-        }
-
-        public class Composer22 : TestComposerBase
-        {
-        }
-
-        [ComposeAfter(typeof(Composer22))]
-        public interface IComposer23 : IComposer
-        {
-        }
-
-        public class Composer24 : TestComposerBase, IComposer23
-        {
-        }
-
-        // should insert itself between 22 and anything i23
-        [ComposeBefore(typeof(IComposer23))]
-        ////[RequireComponent(typeof(Component22))] - not needed, implement i23
-        public class Composer25 : TestComposerBase, IComposer23
-        {
-        }
-
-        public class Composer26 : TestComposerBase
-        {
-        }
-
-        [Enable(typeof(Composer26))]
-        public class Composer27 : TestComposerBase
-        {
-        }
-
-        // FIXME: move to Testing
-        private static Type[] TypeArray<T1>() => new[] { typeof(T1) };
-
-        private static Type[] TypeArray<T1, T2>() => new[] { typeof(T1), typeof(T2) };
-
-        private static Type[] TypeArray<T1, T2, T3>() => new[] { typeof(T1), typeof(T2), typeof(T3) };
-
-        private static Type[] TypeArray<T1, T2, T3, T4>() => new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4) };
-
-        private static Type[] TypeArray<T1, T2, T3, T4, T5>() => new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5) };
-
-        private static Type[] TypeArray<T1, T2, T3, T4, T5, T6>() => new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5), typeof(T6) };
-
-        private static Type[] TypeArray<T1, T2, T3, T4, T5, T6, T7>() => new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5), typeof(T6), typeof(T7) };
-
-        private static Type[] TypeArray<T1, T2, T3, T4, T5, T6, T7, T8>() => new[] { typeof(T1), typeof(T2), typeof(T3), typeof(T4), typeof(T5), typeof(T6), typeof(T7), typeof(T8) };
-
-        private static void AssertTypeArray(IReadOnlyList<Type> expected, IReadOnlyList<Type> test)
-        {
-            Assert.AreEqual(expected.Count, test.Count);
-            for (int i = 0; i < expected.Count; i++)
-            {
-                Assert.AreEqual(expected[i], test[i]);
-            }
+            Assert.AreEqual(expected[i], test[i]);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
index b375e3a7c6..dd6c676b88 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/CollectionBuildersTests.cs
@@ -12,539 +12,544 @@ using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
+
+[TestFixture]
+public class CollectionBuildersTests
 {
-    [TestFixture]
-    public class CollectionBuildersTests
+    [SetUp]
+    public void Setup()
     {
-        private IUmbracoBuilder _composition;
+        var register = TestHelper.GetServiceCollection();
+        _composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+    }
 
-        [SetUp]
-        public void Setup()
+    [TearDown]
+    public void TearDown()
+    {
+    }
+
+    private IUmbracoBuilder _composition;
+
+    [Test]
+    public void ContainsTypes()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        Assert.IsTrue(builder.Has<Resolved1>());
+        Assert.IsTrue(builder.Has<Resolved2>());
+        Assert.IsFalse(builder.Has<Resolved3>());
+        //// Assert.IsFalse(col.ContainsType<Resolved4>()); // does not compile
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
+    }
+
+    [Test]
+    public void CanClearBuilderBeforeCollectionIsCreated()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        builder.Clear();
+        Assert.IsFalse(builder.Has<Resolved1>());
+        Assert.IsFalse(builder.Has<Resolved2>());
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col);
+    }
+
+    [Test]
+    public void CannotClearBuilderOnceCollectionIsCreated()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+
+        Assert.Throws<InvalidOperationException>(() => builder.Clear());
+    }
+
+    [Test]
+    public void CanAppendToBuilder()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
+        builder.Append<Resolved1>();
+        builder.Append<Resolved2>();
+
+        Assert.IsTrue(builder.Has<Resolved1>());
+        Assert.IsTrue(builder.Has<Resolved2>());
+        Assert.IsFalse(builder.Has<Resolved3>());
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
+    }
+
+    [Test]
+    public void CannotAppendToBuilderOnceCollectionIsCreated()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+
+        Assert.Throws<InvalidOperationException>(() => builder.Append<Resolved1>());
+    }
+
+    [Test]
+    public void CanAppendDuplicateToBuilderAndDeDuplicate()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
+        builder.Append<Resolved1>();
+        builder.Append<Resolved1>();
+
+        var factory = _composition.CreateServiceProvider();
+
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1));
+    }
+
+    [Test]
+    public void CannotAppendInvalidTypeToBUilder()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
+
+        ////builder.Append<Resolved4>(); // does not compile
+        Assert.Throws<InvalidOperationException>(() => builder.Append(new[] { typeof(Resolved4) }));
+    }
+
+    [Test]
+    public void CanRemoveFromBuilder()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .Remove<Resolved2>();
+
+        Assert.IsTrue(builder.Has<Resolved1>());
+        Assert.IsFalse(builder.Has<Resolved2>());
+        Assert.IsFalse(builder.Has<Resolved3>());
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1));
+    }
+
+    [Test]
+    public void CanRemoveMissingFromBuilder()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .Remove<Resolved3>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
+    }
+
+    [Test]
+    public void CannotRemoveFromBuilderOnceCollectionIsCreated()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        Assert.Throws<InvalidOperationException>(() => builder.Remove<Resolved2>());
+    }
+
+    [Test]
+    public void CanInsertIntoBuilder()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .Insert<Resolved3>();
+
+        Assert.IsTrue(builder.Has<Resolved1>());
+        Assert.IsTrue(builder.Has<Resolved2>());
+        Assert.IsTrue(builder.Has<Resolved3>());
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved3), typeof(Resolved1), typeof(Resolved2));
+    }
+
+    [Test]
+    public void CannotInsertIntoBuilderOnceCollectionIsCreated()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        Assert.Throws<InvalidOperationException>(() => builder.Insert<Resolved3>());
+    }
+
+    [Test]
+    public void CanInsertDuplicateIntoBuilderAndDeDuplicate()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .Insert<Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved2), typeof(Resolved1));
+    }
+
+    [Test]
+    public void CanInsertIntoEmptyBuilder()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
+        builder.Insert<Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved2));
+    }
+
+    [Test]
+    public void CannotInsertIntoBuilderAtWrongIndex()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        Assert.Throws<ArgumentOutOfRangeException>(() => builder.Insert<Resolved3>(99));
+
+        Assert.Throws<ArgumentOutOfRangeException>(() => builder.Insert<Resolved3>(-1));
+    }
+
+    [Test]
+    public void CanInsertIntoBuilderBefore()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .InsertBefore<Resolved2, Resolved3>();
+
+        Assert.IsTrue(builder.Has<Resolved1>());
+        Assert.IsTrue(builder.Has<Resolved2>());
+        Assert.IsTrue(builder.Has<Resolved3>());
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1), typeof(Resolved3), typeof(Resolved2));
+    }
+
+    [Test]
+    public void CanInsertIntoBuilderAfter()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .InsertAfter<Resolved1, Resolved3>();
+
+        Assert.IsTrue(builder.Has<Resolved1>());
+        Assert.IsTrue(builder.Has<Resolved2>());
+        Assert.IsTrue(builder.Has<Resolved3>());
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1), typeof(Resolved3), typeof(Resolved2));
+    }
+
+    [Test]
+    public void CanInsertIntoBuilderAfterLast()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .InsertAfter<Resolved2, Resolved3>();
+
+        Assert.IsTrue(builder.Has<Resolved1>());
+        Assert.IsTrue(builder.Has<Resolved2>());
+        Assert.IsTrue(builder.Has<Resolved3>());
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1), typeof(Resolved2), typeof(Resolved3));
+    }
+
+    [Test]
+    public void CannotInsertIntoBuilderBeforeOnceCollectionIsCreated()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        Assert.Throws<InvalidOperationException>(() =>
+            builder.InsertBefore<Resolved2, Resolved3>());
+    }
+
+    [Test]
+    public void CanInsertDuplicateIntoBuilderBeforeAndDeDuplicate()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>()
+            .Append<Resolved2>()
+            .InsertBefore<Resolved1, Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved2), typeof(Resolved1));
+    }
+
+    [Test]
+    public void CannotInsertIntoBuilderBeforeMissing()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Append<Resolved1>();
+
+        Assert.Throws<InvalidOperationException>(() =>
+            builder.InsertBefore<Resolved2, Resolved3>());
+    }
+
+    [Test]
+    public void ScopeBuilderCreatesScopedCollection()
+    {
+        _composition.WithCollectionBuilder<TestCollectionBuilderScope>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        // CreateCollection creates a new collection each time
+        // but the container manages the scope, so to test the scope
+        // the collection must come from the container.
+        var factory = _composition.CreateServiceProvider();
+
+        using (var scope = factory.CreateScope())
         {
-            IServiceCollection register = TestHelper.GetServiceCollection();
-            _composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-        }
-
-        [TearDown]
-        public void TearDown()
-        {
-        }
-
-        [Test]
-        public void ContainsTypes()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            Assert.IsTrue(builder.Has<Resolved1>());
-            Assert.IsTrue(builder.Has<Resolved2>());
-            Assert.IsFalse(builder.Has<Resolved3>());
-            //// Assert.IsFalse(col.ContainsType<Resolved4>()); // does not compile
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
-        }
-
-        [Test]
-        public void CanClearBuilderBeforeCollectionIsCreated()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            builder.Clear();
-            Assert.IsFalse(builder.Has<Resolved1>());
-            Assert.IsFalse(builder.Has<Resolved2>());
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col);
-        }
-
-        [Test]
-        public void CannotClearBuilderOnceCollectionIsCreated()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-
-            Assert.Throws<InvalidOperationException>(() => builder.Clear());
-        }
-
-        [Test]
-        public void CanAppendToBuilder()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
-            builder.Append<Resolved1>();
-            builder.Append<Resolved2>();
-
-            Assert.IsTrue(builder.Has<Resolved1>());
-            Assert.IsTrue(builder.Has<Resolved2>());
-            Assert.IsFalse(builder.Has<Resolved3>());
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
-        }
-
-        [Test]
-        public void CannotAppendToBuilderOnceCollectionIsCreated()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-
-            Assert.Throws<InvalidOperationException>(() => builder.Append<Resolved1>());
-        }
-
-        [Test]
-        public void CanAppendDuplicateToBuilderAndDeDuplicate()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
-            builder.Append<Resolved1>();
-            builder.Append<Resolved1>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1));
-        }
-
-        [Test]
-        public void CannotAppendInvalidTypeToBUilder()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
-
-            ////builder.Append<Resolved4>(); // does not compile
-            Assert.Throws<InvalidOperationException>(() => builder.Append(new[] { typeof(Resolved4) }));
-        }
-
-        [Test]
-        public void CanRemoveFromBuilder()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .Remove<Resolved2>();
-
-            Assert.IsTrue(builder.Has<Resolved1>());
-            Assert.IsFalse(builder.Has<Resolved2>());
-            Assert.IsFalse(builder.Has<Resolved3>());
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1));
-        }
-
-        [Test]
-        public void CanRemoveMissingFromBuilder()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .Remove<Resolved3>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
-        }
-
-        [Test]
-        public void CannotRemoveFromBuilderOnceCollectionIsCreated()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            Assert.Throws<InvalidOperationException>(() => builder.Remove<Resolved2>());
-        }
-
-        [Test]
-        public void CanInsertIntoBuilder()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .Insert<Resolved3>();
-
-            Assert.IsTrue(builder.Has<Resolved1>());
-            Assert.IsTrue(builder.Has<Resolved2>());
-            Assert.IsTrue(builder.Has<Resolved3>());
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved3), typeof(Resolved1), typeof(Resolved2));
-        }
-
-        [Test]
-        public void CannotInsertIntoBuilderOnceCollectionIsCreated()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            Assert.Throws<InvalidOperationException>(() => builder.Insert<Resolved3>());
-        }
-
-        [Test]
-        public void CanInsertDuplicateIntoBuilderAndDeDuplicate()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .Insert<Resolved2>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved2), typeof(Resolved1));
-        }
-
-        [Test]
-        public void CanInsertIntoEmptyBuilder()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>();
-            builder.Insert<Resolved2>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved2));
-        }
-
-        [Test]
-        public void CannotInsertIntoBuilderAtWrongIndex()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => builder.Insert<Resolved3>(99));
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => builder.Insert<Resolved3>(-1));
-        }
-
-        [Test]
-        public void CanInsertIntoBuilderBefore()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .InsertBefore<Resolved2, Resolved3>();
-
-            Assert.IsTrue(builder.Has<Resolved1>());
-            Assert.IsTrue(builder.Has<Resolved2>());
-            Assert.IsTrue(builder.Has<Resolved3>());
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1), typeof(Resolved3), typeof(Resolved2));
-        }
-
-        [Test]
-        public void CanInsertIntoBuilderAfter()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .InsertAfter<Resolved1, Resolved3>();
-
-            Assert.IsTrue(builder.Has<Resolved1>());
-            Assert.IsTrue(builder.Has<Resolved2>());
-            Assert.IsTrue(builder.Has<Resolved3>());
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1), typeof(Resolved3), typeof(Resolved2));
-        }
-
-        [Test]
-        public void CanInsertIntoBuilderAfterLast()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .InsertAfter<Resolved2, Resolved3>();
-
-            Assert.IsTrue(builder.Has<Resolved1>());
-            Assert.IsTrue(builder.Has<Resolved2>());
-            Assert.IsTrue(builder.Has<Resolved3>());
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1), typeof(Resolved2), typeof(Resolved3));
-        }
-
-        [Test]
-        public void CannotInsertIntoBuilderBeforeOnceCollectionIsCreated()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            Assert.Throws<InvalidOperationException>(() =>
-                builder.InsertBefore<Resolved2, Resolved3>());
-        }
-
-        [Test]
-        public void CanInsertDuplicateIntoBuilderBeforeAndDeDuplicate()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>()
-                .Append<Resolved2>()
-                .InsertBefore<Resolved1, Resolved2>();
-
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved2), typeof(Resolved1));
-        }
-
-        [Test]
-        public void CannotInsertIntoBuilderBeforeMissing()
-        {
-            TestCollectionBuilder builder = _composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Append<Resolved1>();
-
-            Assert.Throws<InvalidOperationException>(() =>
-                builder.InsertBefore<Resolved2, Resolved3>());
-        }
-
-        [Test]
-        public void ScopeBuilderCreatesScopedCollection()
-        {
-            _composition.WithCollectionBuilder<TestCollectionBuilderScope>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            // CreateCollection creates a new collection each time
-            // but the container manages the scope, so to test the scope
-            // the collection must come from the container.
-            IServiceProvider factory = _composition.CreateServiceProvider();
-
-            using (IServiceScope scope = factory.CreateScope())
-            {
-                TestCollection col1 = scope.ServiceProvider.GetRequiredService<TestCollection>();
-                AssertCollection(col1, typeof(Resolved1), typeof(Resolved2));
-
-                TestCollection col2 = scope.ServiceProvider.GetRequiredService<TestCollection>();
-                AssertCollection(col2, typeof(Resolved1), typeof(Resolved2));
-
-                AssertSameCollection(scope.ServiceProvider, col1, col2);
-            }
-        }
-
-        [Test]
-        public void TransientBuilderCreatesTransientCollection()
-        {
-            _composition.WithCollectionBuilder<TestCollectionBuilderTransient>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            // CreateCollection creates a new collection each time
-            // but the container manages the scope, so to test the scope
-            // the collection must come from the container.
-            IServiceProvider factory = _composition.CreateServiceProvider();
-
-            TestCollection col1 = factory.GetRequiredService<TestCollection>();
+            var col1 = scope.ServiceProvider.GetRequiredService<TestCollection>();
             AssertCollection(col1, typeof(Resolved1), typeof(Resolved2));
 
-            TestCollection col2 = factory.GetRequiredService<TestCollection>();
-            AssertCollection(col1, typeof(Resolved1), typeof(Resolved2));
+            var col2 = scope.ServiceProvider.GetRequiredService<TestCollection>();
+            AssertCollection(col2, typeof(Resolved1), typeof(Resolved2));
 
-            AssertNotSameCollection(col1, col2);
+            AssertSameCollection(scope.ServiceProvider, col1, col2);
+        }
+    }
+
+    [Test]
+    public void TransientBuilderCreatesTransientCollection()
+    {
+        _composition.WithCollectionBuilder<TestCollectionBuilderTransient>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        // CreateCollection creates a new collection each time
+        // but the container manages the scope, so to test the scope
+        // the collection must come from the container.
+        var factory = _composition.CreateServiceProvider();
+
+        var col1 = factory.GetRequiredService<TestCollection>();
+        AssertCollection(col1, typeof(Resolved1), typeof(Resolved2));
+
+        var col2 = factory.GetRequiredService<TestCollection>();
+        AssertCollection(col1, typeof(Resolved1), typeof(Resolved2));
+
+        AssertNotSameCollection(col1, col2);
+    }
+
+    [Test]
+    public void BuilderRespectsTypesOrder()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilderTransient>()
+            .Append<Resolved3>()
+            .Insert<Resolved1>()
+            .InsertBefore<Resolved3, Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col1 = builder.CreateCollection(factory);
+        AssertCollection(col1, typeof(Resolved1), typeof(Resolved2), typeof(Resolved3));
+    }
+
+    [Test]
+    public void ScopeBuilderRespectsContainerScope()
+    {
+        _composition.WithCollectionBuilder<TestCollectionBuilderScope>()
+            .Append<Resolved1>()
+            .Append<Resolved2>();
+
+        // CreateCollection creates a new collection each time
+        // but the container manages the scope, so to test the scope
+        // the collection must come from the container/
+        var serviceProvider = _composition.CreateServiceProvider();
+
+        TestCollection col1A, col1B;
+        using (var scope = serviceProvider.CreateScope())
+        {
+            col1A = scope.ServiceProvider.GetRequiredService<TestCollection>();
+            col1B = scope.ServiceProvider.GetRequiredService<TestCollection>();
+
+            AssertCollection(col1A, typeof(Resolved1), typeof(Resolved2));
+            AssertCollection(col1B, typeof(Resolved1), typeof(Resolved2));
+            AssertSameCollection(serviceProvider, col1A, col1B);
         }
 
-        [Test]
-        public void BuilderRespectsTypesOrder()
-        {
-            TestCollectionBuilderTransient builder = _composition.WithCollectionBuilder<TestCollectionBuilderTransient>()
-                .Append<Resolved3>()
-                .Insert<Resolved1>()
-                .InsertBefore<Resolved3, Resolved2>();
+        TestCollection col2;
 
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col1 = builder.CreateCollection(factory);
-            AssertCollection(col1, typeof(Resolved1), typeof(Resolved2), typeof(Resolved3));
+        using (var scope = serviceProvider.CreateScope())
+        {
+            col2 = scope.ServiceProvider.GetRequiredService<TestCollection>();
+
+            // NOTE: We must assert here so that the lazy collection is resolved
+            // within this service provider scope, else if you resolve the collection
+            // after the service provider scope is disposed, you'll get an object
+            // disposed error (expected).
+            AssertCollection(col2, typeof(Resolved1), typeof(Resolved2));
         }
 
-        [Test]
-        public void ScopeBuilderRespectsContainerScope()
+        AssertNotSameCollection(col1A, col2);
+    }
+
+    [Test]
+    public void WeightedBuilderCreatesWeightedCollection()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilderWeighted>()
+            .Add<Resolved1>()
+            .Add<Resolved2>();
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved2), typeof(Resolved1));
+    }
+
+    [Test]
+    public void WeightedBuilderSetWeight()
+    {
+        var builder = _composition.WithCollectionBuilder<TestCollectionBuilderWeighted>()
+            .Add<Resolved1>()
+            .Add<Resolved2>();
+        builder.SetWeight<Resolved1>(10);
+
+        var factory = _composition.CreateServiceProvider();
+        var col = builder.CreateCollection(factory);
+        AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
+    }
+
+    private static void AssertCollection(IEnumerable<Resolved> col, params Type[] expected)
+    {
+        var colA = col.ToArray();
+        Assert.AreEqual(expected.Length, colA.Length);
+        for (var i = 0; i < expected.Length; i++)
         {
-            _composition.WithCollectionBuilder<TestCollectionBuilderScope>()
-                .Append<Resolved1>()
-                .Append<Resolved2>();
-
-            // CreateCollection creates a new collection each time
-            // but the container manages the scope, so to test the scope
-            // the collection must come from the container/
-            IServiceProvider serviceProvider = _composition.CreateServiceProvider();
-
-            TestCollection col1A, col1B;
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                col1A = scope.ServiceProvider.GetRequiredService<TestCollection>();
-                col1B = scope.ServiceProvider.GetRequiredService<TestCollection>();
-
-                AssertCollection(col1A, typeof(Resolved1), typeof(Resolved2));
-                AssertCollection(col1B, typeof(Resolved1), typeof(Resolved2));
-                AssertSameCollection(serviceProvider, col1A, col1B);
-            }
-
-            TestCollection col2;
-
-            using (IServiceScope scope = serviceProvider.CreateScope())
-            {
-                col2 = scope.ServiceProvider.GetRequiredService<TestCollection>();
-
-                // NOTE: We must assert here so that the lazy collection is resolved
-                // within this service provider scope, else if you resolve the collection
-                // after the service provider scope is disposed, you'll get an object
-                // disposed error (expected).
-                AssertCollection(col2, typeof(Resolved1), typeof(Resolved2));
-            }
-            
-            AssertNotSameCollection(col1A, col2);
+            Assert.IsInstanceOf(expected[i], colA[i]);
         }
+    }
 
-        [Test]
-        public void WeightedBuilderCreatesWeightedCollection()
+    private static void AssertSameCollection(IServiceProvider factory, IEnumerable<Resolved> col1, IEnumerable<Resolved> col2)
+    {
+        Assert.AreSame(col1, col2);
+
+        var col1A = col1.ToArray();
+        var col2A = col2.ToArray();
+
+        Assert.AreEqual(col1A.Length, col2A.Length);
+
+        // Ensure each item in each collection is the same but also
+        // resolve each item from the factory to ensure it's also the same since
+        // it should have the same lifespan.
+        for (var i = 0; i < col1A.Length; i++)
         {
-            TestCollectionBuilderWeighted builder = _composition.WithCollectionBuilder<TestCollectionBuilderWeighted>()
-               .Add<Resolved1>()
-               .Add<Resolved2>();
+            Assert.AreSame(col1A[i], col2A[i]);
 
-            IServiceProvider factory = _composition.CreateServiceProvider();
-            TestCollection col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved2), typeof(Resolved1));
+            var itemA = factory.GetRequiredService(col1A[i].GetType());
+            var itemB = factory.GetRequiredService(col2A[i].GetType());
+
+            Assert.AreSame(itemA, itemB);
         }
+    }
 
-        [Test]
-        public void WeightedBuilderSetWeight()
+    private static void AssertNotSameCollection(IEnumerable<Resolved> col1, IEnumerable<Resolved> col2)
+    {
+        Assert.AreNotSame(col1, col2);
+
+        var col1A = col1.ToArray();
+        var col2A = col2.ToArray();
+
+        Assert.AreEqual(col1A.Length, col2A.Length);
+
+        for (var i = 0; i < col1A.Length; i++)
         {
-            var builder = _composition.WithCollectionBuilder<TestCollectionBuilderWeighted>()
-                .Add<Resolved1>()
-                .Add<Resolved2>();
-            builder.SetWeight<Resolved1>(10);
-
-            var factory = _composition.CreateServiceProvider();
-            var col = builder.CreateCollection(factory);
-            AssertCollection(col, typeof(Resolved1), typeof(Resolved2));
+            Assert.AreNotSame(col1A[i], col2A[i]);
         }
+    }
 
-        private static void AssertCollection(IEnumerable<Resolved> col, params Type[] expected)
+    public abstract class Resolved
+    {
+    }
+
+    public class Resolved1 : Resolved
+    {
+    }
+
+    [Weight(50)] // default is 100
+    public class Resolved2 : Resolved
+    {
+    }
+
+    public class Resolved3 : Resolved
+    {
+    }
+
+    public class Resolved4 // not! : Resolved
+    {
+    }
+
+    // ReSharper disable once ClassNeverInstantiated.Local
+    private class TestCollectionBuilder : OrderedCollectionBuilderBase<TestCollectionBuilder, TestCollection, Resolved>
+    {
+        protected override TestCollectionBuilder This => this;
+    }
+
+    // ReSharper disable once ClassNeverInstantiated.Local
+    private class
+        TestCollectionBuilderTransient : OrderedCollectionBuilderBase<TestCollectionBuilderTransient, TestCollection,
+            Resolved>
+    {
+        protected override TestCollectionBuilderTransient This => this;
+
+        protected override ServiceLifetime CollectionLifetime => ServiceLifetime.Transient; // transient
+    }
+
+    // ReSharper disable once ClassNeverInstantiated.Local
+    private class
+        TestCollectionBuilderScope : OrderedCollectionBuilderBase<TestCollectionBuilderScope, TestCollection, Resolved>
+    {
+        protected override TestCollectionBuilderScope This => this;
+
+        protected override ServiceLifetime CollectionLifetime => ServiceLifetime.Scoped;
+    }
+
+    // ReSharper disable once ClassNeverInstantiated.Local
+    private class
+        TestCollectionBuilderWeighted : WeightedCollectionBuilderBase<TestCollectionBuilderWeighted, TestCollection,
+            Resolved>
+    {
+        protected override TestCollectionBuilderWeighted This => this;
+    }
+
+    // ReSharper disable once ClassNeverInstantiated.Local
+    private class TestCollection : BuilderCollectionBase<Resolved>
+    {
+        public TestCollection(Func<IEnumerable<Resolved>> items)
+            : base(items)
         {
-            Resolved[] colA = col.ToArray();
-            Assert.AreEqual(expected.Length, colA.Length);
-            for (int i = 0; i < expected.Length; i++)
-            {
-                Assert.IsInstanceOf(expected[i], colA[i]);
-            }
-        }
-
-        private static void AssertSameCollection(IServiceProvider factory, IEnumerable<Resolved> col1, IEnumerable<Resolved> col2)
-        {
-            Assert.AreSame(col1, col2);
-
-            Resolved[] col1A = col1.ToArray();
-            Resolved[] col2A = col2.ToArray();
-
-            Assert.AreEqual(col1A.Length, col2A.Length);
-
-            // Ensure each item in each collection is the same but also
-            // resolve each item from the factory to ensure it's also the same since
-            // it should have the same lifespan.
-            for (int i = 0; i < col1A.Length; i++)
-            {
-                Assert.AreSame(col1A[i], col2A[i]);
-
-                object itemA = factory.GetRequiredService(col1A[i].GetType());
-                object itemB = factory.GetRequiredService(col2A[i].GetType());
-
-                Assert.AreSame(itemA, itemB);
-            }
-        }
-
-        private static void AssertNotSameCollection(IEnumerable<Resolved> col1, IEnumerable<Resolved> col2)
-        {
-            Assert.AreNotSame(col1, col2);
-
-            Resolved[] col1A = col1.ToArray();
-            Resolved[] col2A = col2.ToArray();
-
-            Assert.AreEqual(col1A.Length, col2A.Length);
-
-            for (int i = 0; i < col1A.Length; i++)
-            {
-                Assert.AreNotSame(col1A[i], col2A[i]);
-            }
-        }
-
-        public abstract class Resolved
-        {
-        }
-
-        public class Resolved1 : Resolved
-        {
-        }
-
-        [Weight(50)] // default is 100
-        public class Resolved2 : Resolved
-        {
-        }
-
-        public class Resolved3 : Resolved
-        {
-        }
-
-        public class Resolved4 // not! : Resolved
-        {
-        }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class TestCollectionBuilder : OrderedCollectionBuilderBase<TestCollectionBuilder, TestCollection, Resolved>
-        {
-            protected override TestCollectionBuilder This => this;
-        }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class TestCollectionBuilderTransient : OrderedCollectionBuilderBase<TestCollectionBuilderTransient, TestCollection, Resolved>
-        {
-            protected override TestCollectionBuilderTransient This => this;
-
-            protected override ServiceLifetime CollectionLifetime => ServiceLifetime.Transient; // transient
-        }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class TestCollectionBuilderScope : OrderedCollectionBuilderBase<TestCollectionBuilderScope, TestCollection, Resolved>
-        {
-            protected override TestCollectionBuilderScope This => this;
-
-            protected override ServiceLifetime CollectionLifetime => ServiceLifetime.Scoped;
-        }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class TestCollectionBuilderWeighted : WeightedCollectionBuilderBase<TestCollectionBuilderWeighted, TestCollection, Resolved>
-        {
-            protected override TestCollectionBuilderWeighted This => this;
-        }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class TestCollection : BuilderCollectionBase<Resolved>
-        {
-            public TestCollection(Func<IEnumerable<Resolved>> items) : base(items)
-            {
-            }
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs
index ac536b7aee..f3c615e98e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/ComposingTestBase.cs
@@ -7,29 +7,36 @@ using System.Reflection;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
+
+public abstract class ComposingTestBase
 {
-    public abstract class ComposingTestBase
-    {
-        protected TypeLoader TypeLoader { get; private set; }
+    protected TypeLoader TypeLoader { get; private set; }
 
-        [SetUp]
-        public void Initialize()
+    protected virtual IEnumerable<Assembly> AssembliesToScan
+        => new[]
         {
-            var typeFinder = TestHelper.GetTypeFinder();
-            TypeLoader = new TypeLoader(typeFinder, new VaryingRuntimeHash(), NoAppCache.Instance, new DirectoryInfo(TestHelper.GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)), Mock.Of<ILogger<TypeLoader>>(), Mock.Of<IProfiler>(), false, AssembliesToScan);
-        }
+            GetType().Assembly, // this assembly only
+        };
 
-        protected virtual IEnumerable<Assembly> AssembliesToScan
-            => new[]
-            {
-                GetType().Assembly // this assembly only
-            };
+    [SetUp]
+    public void Initialize()
+    {
+        var typeFinder = TestHelper.GetTypeFinder();
+        TypeLoader = new TypeLoader(
+            typeFinder,
+            new VaryingRuntimeHash(),
+            NoAppCache.Instance,
+            new DirectoryInfo(TestHelper.GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)),
+            Mock.Of<ILogger<TypeLoader>>(),
+            Mock.Of<IProfiler>(),
+            false,
+            AssembliesToScan);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs
index ec36e1c670..14b2e07342 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/LazyCollectionBuilderTests.cs
@@ -13,180 +13,181 @@ using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
+
+/// <summary>
+///     Tests for lazy collection builder.
+/// </summary>
+/// <remarks>
+///     Lazy collection builder does not throw on duplicate, just uses distinct types
+///     so we don't have a test for duplicates as we had with resolvers in v7.
+/// </remarks>
+[TestFixture]
+public class LazyCollectionBuilderTests
 {
-    /// <summary>
-    /// Tests for lazy collection builder.
-    /// </summary>
-    /// <remarks>
-    /// Lazy collection builder does not throw on duplicate, just uses distinct types
-    /// so we don't have a test for duplicates as we had with resolvers in v7.
-    /// </remarks>
-    [TestFixture]
-    public class LazyCollectionBuilderTests
+    private IServiceCollection CreateRegister() => TestHelper.GetServiceCollection();
+
+    [Test]
+    public void LazyCollectionBuilderHandlesTypes()
     {
-        private IServiceCollection CreateRegister() => TestHelper.GetServiceCollection();
+        var container = CreateRegister();
+        var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
 
-        [Test]
-        public void LazyCollectionBuilderHandlesTypes()
+        composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Add<TransientObject3>()
+            .Add<TransientObject2>()
+            .Add<TransientObject3>()
+            .Add<TransientObject1>();
+
+        var factory = composition.CreateServiceProvider();
+
+        var values = factory.GetRequiredService<TestCollection>();
+
+        Assert.AreEqual(3, values.Count());
+        Assert.IsTrue(values.Select(x => x.GetType())
+            .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2), typeof(TransientObject3) }));
+
+        var other = factory.GetRequiredService<TestCollection>();
+        Assert.AreNotSame(values, other); // transient
+        var o1 = other.FirstOrDefault(x => x is TransientObject1);
+        Assert.IsFalse(values.Contains(o1)); // transient
+    }
+
+    [Test]
+    public void LazyCollectionBuilderHandlesProducers()
+    {
+        var container = CreateRegister();
+        var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
+            .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
+            .Add(() => new[] { typeof(TransientObject1) });
+
+        var factory = composition.CreateServiceProvider();
+
+        var values = factory.GetRequiredService<TestCollection>();
+
+        Assert.AreEqual(3, values.Count());
+        Assert.IsTrue(values.Select(x => x.GetType())
+            .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2), typeof(TransientObject3) }));
+
+        var other = factory.GetRequiredService<TestCollection>();
+        Assert.AreNotSame(values, other); // transient
+        var o1 = other.FirstOrDefault(x => x is TransientObject1);
+        Assert.IsFalse(values.Contains(o1)); // transient
+    }
+
+    [Test]
+    public void LazyCollectionBuilderHandlesTypesAndProducers()
+    {
+        var container = CreateRegister();
+        var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Add<TransientObject3>()
+            .Add<TransientObject2>()
+            .Add<TransientObject3>()
+            .Add(() => new[] { typeof(TransientObject1) });
+
+        var factory = composition.CreateServiceProvider();
+
+        var values = factory.GetRequiredService<TestCollection>();
+
+        Assert.AreEqual(3, values.Count());
+        Assert.IsTrue(values.Select(x => x.GetType())
+            .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2), typeof(TransientObject3) }));
+
+        var other = factory.GetRequiredService<TestCollection>();
+        Assert.AreNotSame(values, other); // transient
+        var o1 = other.FirstOrDefault(x => x is TransientObject1);
+        Assert.IsFalse(values.Contains(o1)); // transient
+    }
+
+    [Test]
+    public void LazyCollectionBuilderThrowsOnIllegalTypes()
+    {
+        var container = CreateRegister();
+        var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Add<TransientObject3>()
+
+            // illegal, does not implement the interface!
+            ////.Add<TransientObject4>()
+
+            // legal so far...
+            .Add(() => new[] { typeof(TransientObject4) });
+
+        Assert.Throws<InvalidOperationException>(() =>
         {
-            IServiceCollection container = CreateRegister();
-            var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+            // but throws here when trying to register the types, right before creating the factory
+            var factory = composition.CreateServiceProvider();
+        });
+    }
 
-            composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Add<TransientObject3>()
-                .Add<TransientObject2>()
-                .Add<TransientObject3>()
-                .Add<TransientObject1>();
+    [Test]
+    public void LazyCollectionBuilderCanExcludeTypes()
+    {
+        var container = CreateRegister();
+        var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
 
-            IServiceProvider factory = composition.CreateServiceProvider();
+        composition.WithCollectionBuilder<TestCollectionBuilder>()
+            .Add<TransientObject3>()
+            .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2), typeof(TransientObject1) })
+            .Exclude<TransientObject3>();
 
-            TestCollection values = factory.GetRequiredService<TestCollection>();
+        var factory = composition.CreateServiceProvider();
 
-            Assert.AreEqual(3, values.Count());
-            Assert.IsTrue(values.Select(x => x.GetType())
-                .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2), typeof(TransientObject3) }));
+        var values = factory.GetRequiredService<TestCollection>();
 
-            TestCollection other = factory.GetRequiredService<TestCollection>();
-            Assert.AreNotSame(values, other); // transient
-            ITestInterface o1 = other.FirstOrDefault(x => x is TransientObject1);
-            Assert.IsFalse(values.Contains(o1)); // transient
-        }
+        Assert.AreEqual(2, values.Count());
+        Assert.IsFalse(values.Select(x => x.GetType())
+            .Contains(typeof(TransientObject3)));
+        Assert.IsTrue(values.Select(x => x.GetType())
+            .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2) }));
 
-        [Test]
-        public void LazyCollectionBuilderHandlesProducers()
+        var other = factory.GetRequiredService<TestCollection>();
+        Assert.AreNotSame(values, other); // transient
+        var o1 = other.FirstOrDefault(x => x is TransientObject1);
+        Assert.IsFalse(values.Contains(o1)); // transient
+    }
+
+    private interface ITestInterface
+    {
+    }
+
+    private class TransientObject1 : ITestInterface
+    {
+    }
+
+    private class TransientObject2 : ITestInterface
+    {
+    }
+
+    private class TransientObject3 : ITestInterface
+    {
+    }
+
+    private class TransientObject4
+    {
+    }
+
+    // ReSharper disable once ClassNeverInstantiated.Local
+    private class
+        TestCollectionBuilder : LazyCollectionBuilderBase<TestCollectionBuilder, TestCollection, ITestInterface>
+    {
+        protected override TestCollectionBuilder This => this;
+
+        protected override ServiceLifetime CollectionLifetime => ServiceLifetime.Transient; // transient
+    }
+
+    // ReSharper disable once ClassNeverInstantiated.Local
+    private class TestCollection : BuilderCollectionBase<ITestInterface>
+    {
+        public TestCollection(Func<IEnumerable<ITestInterface>> items)
+            : base(items)
         {
-            IServiceCollection container = CreateRegister();
-            var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
-                .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2) })
-                .Add(() => new[] { typeof(TransientObject1) });
-
-            IServiceProvider factory = composition.CreateServiceProvider();
-
-            TestCollection values = factory.GetRequiredService<TestCollection>();
-
-            Assert.AreEqual(3, values.Count());
-            Assert.IsTrue(values.Select(x => x.GetType())
-                .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2), typeof(TransientObject3) }));
-
-            TestCollection other = factory.GetRequiredService<TestCollection>();
-            Assert.AreNotSame(values, other); // transient
-            ITestInterface o1 = other.FirstOrDefault(x => x is TransientObject1);
-            Assert.IsFalse(values.Contains(o1)); // transient
-        }
-
-        [Test]
-        public void LazyCollectionBuilderHandlesTypesAndProducers()
-        {
-            IServiceCollection container = CreateRegister();
-            var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Add<TransientObject3>()
-                .Add<TransientObject2>()
-                .Add<TransientObject3>()
-                .Add(() => new[] { typeof(TransientObject1) });
-
-            IServiceProvider factory = composition.CreateServiceProvider();
-
-            TestCollection values = factory.GetRequiredService<TestCollection>();
-
-            Assert.AreEqual(3, values.Count());
-            Assert.IsTrue(values.Select(x => x.GetType())
-                .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2), typeof(TransientObject3) }));
-
-            TestCollection other = factory.GetRequiredService<TestCollection>();
-            Assert.AreNotSame(values, other); // transient
-            ITestInterface o1 = other.FirstOrDefault(x => x is TransientObject1);
-            Assert.IsFalse(values.Contains(o1)); // transient
-        }
-
-        [Test]
-        public void LazyCollectionBuilderThrowsOnIllegalTypes()
-        {
-            IServiceCollection container = CreateRegister();
-            var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Add<TransientObject3>()
-
-                // illegal, does not implement the interface!
-                ////.Add<TransientObject4>()
-
-                // legal so far...
-                .Add(() => new[] { typeof(TransientObject4)  });
-
-            Assert.Throws<InvalidOperationException>(() =>
-            {
-                // but throws here when trying to register the types, right before creating the factory
-                IServiceProvider factory = composition.CreateServiceProvider();
-            });
-        }
-
-        [Test]
-        public void LazyCollectionBuilderCanExcludeTypes()
-        {
-            IServiceCollection container = CreateRegister();
-            var composition = new UmbracoBuilder(container, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            composition.WithCollectionBuilder<TestCollectionBuilder>()
-                .Add<TransientObject3>()
-                .Add(() => new[] { typeof(TransientObject3), typeof(TransientObject2), typeof(TransientObject1) })
-                .Exclude<TransientObject3>();
-
-            IServiceProvider factory = composition.CreateServiceProvider();
-
-            TestCollection values = factory.GetRequiredService<TestCollection>();
-
-            Assert.AreEqual(2, values.Count());
-            Assert.IsFalse(values.Select(x => x.GetType())
-                .Contains(typeof(TransientObject3)));
-            Assert.IsTrue(values.Select(x => x.GetType())
-                .ContainsAll(new[] { typeof(TransientObject1), typeof(TransientObject2) }));
-
-            TestCollection other = factory.GetRequiredService<TestCollection>();
-            Assert.AreNotSame(values, other); // transient
-            ITestInterface o1 = other.FirstOrDefault(x => x is TransientObject1);
-            Assert.IsFalse(values.Contains(o1)); // transient
-        }
-
-        private interface ITestInterface
-        {
-        }
-
-        private class TransientObject1 : ITestInterface
-        {
-        }
-
-        private class TransientObject2 : ITestInterface
-        {
-        }
-
-        private class TransientObject3 : ITestInterface
-        {
-        }
-
-        private class TransientObject4
-        {
-        }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class TestCollectionBuilder : LazyCollectionBuilderBase<TestCollectionBuilder, TestCollection, ITestInterface>
-        {
-            protected override TestCollectionBuilder This => this;
-
-            protected override ServiceLifetime CollectionLifetime => ServiceLifetime.Transient; // transient
-        }
-
-        // ReSharper disable once ClassNeverInstantiated.Local
-        private class TestCollection : BuilderCollectionBase<ITestInterface>
-        {
-            public TestCollection(Func<IEnumerable<ITestInterface>> items) : base(items)
-            {
-            }
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
index cbdb2ac5b8..e3bca4fb4f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeFinderTests.cs
@@ -2,9 +2,9 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Xml;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
@@ -13,68 +13,71 @@ using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Web.BackOffice.Trees;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
+
+/// <summary>
+///     Tests for typefinder
+/// </summary>
+[TestFixture]
+public class TypeFinderTests
 {
-    /// <summary>
-    /// Tests for typefinder
-    /// </summary>
-    [TestFixture]
-    public class TypeFinderTests
+    [SetUp]
+    public void Initialize() => _assemblies = new[]
     {
-        /// <summary>
-        /// List of assemblies to scan
-        /// </summary>
-        private Assembly[] _assemblies;
+        GetType().Assembly,
+        typeof(Guid).Assembly,
+        typeof(Assert).Assembly,
+        typeof(NameTable).Assembly,
+        typeof(TypeFinder).Assembly,
+    };
 
-        [SetUp]
-        public void Initialize() => _assemblies = new[]
-                {
-                    GetType().Assembly,
-                    typeof(System.Guid).Assembly,
-                    typeof(NUnit.Framework.Assert).Assembly,
-                    typeof(System.Xml.NameTable).Assembly,
-                    typeof(TypeFinder).Assembly,
-                };
+    /// <summary>
+    ///     List of assemblies to scan
+    /// </summary>
+    private Assembly[] _assemblies;
 
-        [Test]
-        public void Find_Class_Of_Type_With_Attribute()
-        {
-            var typeFinder = new TypeFinder(Mock.Of<ILogger<TypeFinder>>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
-            IEnumerable<Type> typesFound = typeFinder.FindClassesOfTypeWithAttribute<TestEditor, MyTestAttribute>(_assemblies);
-            Assert.AreEqual(2, typesFound.Count());
-        }
+    [Test]
+    public void Find_Class_Of_Type_With_Attribute()
+    {
+        var typeFinder = new TypeFinder(
+            Mock.Of<ILogger<TypeFinder>>(),
+            new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
+        var typesFound = typeFinder.FindClassesOfTypeWithAttribute<TestEditor, MyTestAttribute>(_assemblies);
+        Assert.AreEqual(2, typesFound.Count());
+    }
 
-        [Test]
-        public void Find_Classes_With_Attribute()
-        {
-            var typeFinder = new TypeFinder(Mock.Of<ILogger<TypeFinder>>(), new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
-            IEnumerable<Type> typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
-            Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree]
+    [Test]
+    public void Find_Classes_With_Attribute()
+    {
+        var typeFinder = new TypeFinder(
+            Mock.Of<ILogger<TypeFinder>>(),
+            new DefaultUmbracoAssemblyProvider(GetType().Assembly, NullLoggerFactory.Instance));
+        var typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(_assemblies);
+        Assert.AreEqual(0, typesFound.Count()); // 0 classes in _assemblies are marked with [Tree]
 
-            typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(new[] { typeof(TreeAttribute).Assembly });
-            Assert.AreEqual(23, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
+        typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>(new[] { typeof(TreeAttribute).Assembly });
+        Assert.AreEqual(23, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
 
-            typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>();
-            Assert.AreEqual(23, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
-        }
+        typesFound = typeFinder.FindClassesWithAttribute<TreeAttribute>();
+        Assert.AreEqual(23, typesFound.Count()); // + classes in Umbraco.Web are marked with [Tree]
+    }
 
-        [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-        public class MyTestAttribute : Attribute
-        {
-        }
+    [AttributeUsage(AttributeTargets.Class)]
+    public class MyTestAttribute : Attribute
+    {
+    }
 
-        public abstract class TestEditor
-        {
-        }
+    public abstract class TestEditor
+    {
+    }
 
-        [MyTest]
-        public class BenchmarkTestEditor : TestEditor
-        {
-        }
+    [MyTest]
+    public class BenchmarkTestEditor : TestEditor
+    {
+    }
 
-        [MyTest]
-        public class MyOtherTestEditor : TestEditor
-        {
-        }
+    [MyTest]
+    public class MyOtherTestEditor : TestEditor
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs
index 29c583dc75..e24ade5ec4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeHelperTests.cs
@@ -2,6 +2,7 @@
 // See LICENSE for more details.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data.Odbc;
@@ -10,256 +11,255 @@ using System.Linq;
 using System.Reflection;
 using Microsoft.Data.SqlClient;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
+
+/// <summary>
+///     Tests for TypeHelper
+/// </summary>
+[TestFixture]
+public class TypeHelperTests
 {
-    /// <summary>
-    /// Tests for TypeHelper
-    /// </summary>
-    [TestFixture]
-    public class TypeHelperTests
+    private class Base<T>
     {
-        private class Base<T>
-        {
-        }
+    }
 
-        private interface IBase<T>
-        {
-        }
+    private interface IBase<T>
+    {
+    }
 
-        private interface IDerived<T> : IBase<T>
-        {
-        }
+    private interface IDerived<T> : IBase<T>
+    {
+    }
 
-        private class Derived<T> : Base<T>, IBase<T>
-        {
-        }
+    private class Derived<T> : Base<T>, IBase<T>
+    {
+    }
 
-        private class Derived2<T> : Derived<T>
-        {
-        }
+    private class Derived2<T> : Derived<T>
+    {
+    }
 
-        private class DerivedI<T> : IDerived<T>
-        {
-        }
+    private class DerivedI<T> : IDerived<T>
+    {
+    }
 
-        [Test]
-        public void Is_Static_Class()
-        {
-            Assert.IsTrue(TypeHelper.IsStaticClass(typeof(TypeHelper)));
-            Assert.IsFalse(TypeHelper.IsStaticClass(typeof(TypeHelperTests)));
-        }
+    [Test]
+    public void Is_Static_Class()
+    {
+        Assert.IsTrue(TypeHelper.IsStaticClass(typeof(TypeHelper)));
+        Assert.IsFalse(TypeHelper.IsStaticClass(typeof(TypeHelperTests)));
+    }
 
-        [Test]
-        public void Find_Common_Base_Class()
-        {
-            Attempt<Type> t1 = TypeHelper.GetLowestBaseType(
-                typeof(OleDbCommand),
-                typeof(OdbcCommand),
-                typeof(SqlCommand));
-            Assert.IsFalse(t1.Success);
+    [Test]
+    public void Find_Common_Base_Class()
+    {
+        var t1 = TypeHelper.GetLowestBaseType(
+            typeof(OleDbCommand),
+            typeof(OdbcCommand),
+            typeof(SqlCommand));
+        Assert.IsFalse(t1.Success);
 
-            Attempt<Type> t2 = TypeHelper.GetLowestBaseType(
-                typeof(OleDbCommand),
-                typeof(OdbcCommand),
-                typeof(SqlCommand),
-                typeof(Component));
-            Assert.IsTrue(t2.Success);
-            Assert.AreEqual(typeof(Component), t2.Result);
+        var t2 = TypeHelper.GetLowestBaseType(
+            typeof(OleDbCommand),
+            typeof(OdbcCommand),
+            typeof(SqlCommand),
+            typeof(Component));
+        Assert.IsTrue(t2.Success);
+        Assert.AreEqual(typeof(Component), t2.Result);
 
-            Attempt<Type> t3 = TypeHelper.GetLowestBaseType(
-                typeof(OleDbCommand),
-                typeof(OdbcCommand),
-                typeof(SqlCommand),
-                typeof(Component),
-                typeof(Component).BaseType);
-            Assert.IsTrue(t3.Success);
-            Assert.AreEqual(typeof(MarshalByRefObject), t3.Result);
+        var t3 = TypeHelper.GetLowestBaseType(
+            typeof(OleDbCommand),
+            typeof(OdbcCommand),
+            typeof(SqlCommand),
+            typeof(Component),
+            typeof(Component).BaseType);
+        Assert.IsTrue(t3.Success);
+        Assert.AreEqual(typeof(MarshalByRefObject), t3.Result);
 
-            Attempt<Type> t4 = TypeHelper.GetLowestBaseType(
-                typeof(OleDbCommand),
-                typeof(OdbcCommand),
-                typeof(SqlCommand),
-                typeof(Component),
-                typeof(Component).BaseType,
-                typeof(int));
-            Assert.IsFalse(t4.Success);
+        var t4 = TypeHelper.GetLowestBaseType(
+            typeof(OleDbCommand),
+            typeof(OdbcCommand),
+            typeof(SqlCommand),
+            typeof(Component),
+            typeof(Component).BaseType,
+            typeof(int));
+        Assert.IsFalse(t4.Success);
 
-            Attempt<Type> t5 = TypeHelper.GetLowestBaseType(typeof(PropertyAliasDto));
-            Assert.IsTrue(t5.Success);
-            Assert.AreEqual(typeof(PropertyAliasDto), t5.Result);
-        }
+        var t5 = TypeHelper.GetLowestBaseType(typeof(PropertyAliasDto));
+        Assert.IsTrue(t5.Success);
+        Assert.AreEqual(typeof(PropertyAliasDto), t5.Result);
+    }
 
-        [Test]
-        public void MatchTypesTest()
-        {
-            var bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(int), typeof(int), bindings));
-            Assert.AreEqual(0, bindings.Count);
+    [Test]
+    public void MatchTypesTest()
+    {
+        var bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(int), typeof(int), bindings));
+        Assert.AreEqual(0, bindings.Count);
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsFalse(TypeHelper.MatchType(typeof(int), typeof(string), bindings));
-            Assert.AreEqual(0, bindings.Count);
+        bindings = new Dictionary<string, Type>();
+        Assert.IsFalse(TypeHelper.MatchType(typeof(int), typeof(string), bindings));
+        Assert.AreEqual(0, bindings.Count);
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(System.Collections.IEnumerable), bindings));
-            Assert.AreEqual(0, bindings.Count);
+        bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IEnumerable), bindings));
+        Assert.AreEqual(0, bindings.Count);
 
-            Type t1 = typeof(IList<>); // IList<>
-            Type a1 = t1.GetGenericArguments()[0]; // <T>
-            t1 = t1.MakeGenericType(a1); // IList<T>
-            Type t2 = a1;
+        var t1 = typeof(IList<>); // IList<>
+        var a1 = t1.GetGenericArguments()[0]; // <T>
+        t1 = t1.MakeGenericType(a1); // IList<T>
+        var t2 = a1;
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(int), t2, bindings));
-            Assert.AreEqual(1, bindings.Count);
-            Assert.AreEqual(typeof(int), bindings["T"]);
+        bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(int), t2, bindings));
+        Assert.AreEqual(1, bindings.Count);
+        Assert.AreEqual(typeof(int), bindings["T"]);
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(IList<int>), t1, bindings));
-            Assert.AreEqual(1, bindings.Count);
-            Assert.AreEqual(typeof(int), bindings["T"]);
+        bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(IList<int>), t1, bindings));
+        Assert.AreEqual(1, bindings.Count);
+        Assert.AreEqual(typeof(int), bindings["T"]);
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IList<int>), bindings));
-            Assert.AreEqual(0, bindings.Count);
+        bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IList<int>), bindings));
+        Assert.AreEqual(0, bindings.Count);
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), t1, bindings));
-            Assert.AreEqual(1, bindings.Count);
-            Assert.AreEqual(typeof(int), bindings["T"]);
+        bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), t1, bindings));
+        Assert.AreEqual(1, bindings.Count);
+        Assert.AreEqual(typeof(int), bindings["T"]);
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Dictionary<int, string>), typeof(IDictionary<,>), bindings));
-            Assert.AreEqual(2, bindings.Count);
-            Assert.AreEqual(typeof(int), bindings["TKey"]);
-            Assert.AreEqual(typeof(string), bindings["TValue"]);
+        bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Dictionary<int, string>), typeof(IDictionary<,>), bindings));
+        Assert.AreEqual(2, bindings.Count);
+        Assert.AreEqual(typeof(int), bindings["TKey"]);
+        Assert.AreEqual(typeof(string), bindings["TValue"]);
 
-            t1 = typeof(IDictionary<,>); // IDictionary<,>
-            a1 = t1.GetGenericArguments()[0]; // <TKey>
-            t1 = t1.MakeGenericType(a1, a1); // IDictionary<TKey,TKey>
+        t1 = typeof(IDictionary<,>); // IDictionary<,>
+        a1 = t1.GetGenericArguments()[0]; // <TKey>
+        t1 = t1.MakeGenericType(a1, a1); // IDictionary<TKey,TKey>
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsFalse(TypeHelper.MatchType(typeof(Dictionary<int, string>), t1, bindings));
+        bindings = new Dictionary<string, Type>();
+        Assert.IsFalse(TypeHelper.MatchType(typeof(Dictionary<int, string>), t1, bindings));
 
-            bindings = new Dictionary<string, Type>();
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Dictionary<int, int>), t1, bindings));
-            Assert.AreEqual(1, bindings.Count);
-            Assert.AreEqual(typeof(int), bindings["TKey"]);
-        }
+        bindings = new Dictionary<string, Type>();
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Dictionary<int, int>), t1, bindings));
+        Assert.AreEqual(1, bindings.Count);
+        Assert.AreEqual(typeof(int), bindings["TKey"]);
+    }
 
-        [Test]
-        public void MatchType()
-        {
-            // both are OK
-            Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IEnumerable<>)));
+    [Test]
+    public void MatchType()
+    {
+        // both are OK
+        Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IEnumerable<>)));
 
-            Type t1 = typeof(IDictionary<,>); // IDictionary<,>
-            Type a1 = t1.GetGenericArguments()[0];
-            t1 = t1.MakeGenericType(a1, a1); // IDictionary<T,T>
+        var t1 = typeof(IDictionary<,>); // IDictionary<,>
+        var a1 = t1.GetGenericArguments()[0];
+        t1 = t1.MakeGenericType(a1, a1); // IDictionary<T,T>
 
-            // both are OK
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Dictionary<int, int>), t1));
+        // both are OK
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Dictionary<int, int>), t1));
 
-            Assert.IsFalse(TypeHelper.MatchType(typeof(Dictionary<int, string>), t1));
+        Assert.IsFalse(TypeHelper.MatchType(typeof(Dictionary<int, string>), t1));
 
-            // these are all of there from Is_Assignable_To_Generic_Type
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(Base<>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IEnumerable<>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(Derived<>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Derived2<int>), typeof(Base<>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(DerivedI<int>), typeof(IBase<>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Derived2<int>), typeof(IBase<>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(int?), typeof(Nullable<>)));
+        // these are all of there from Is_Assignable_To_Generic_Type
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(Base<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IEnumerable<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(Derived<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Derived2<int>), typeof(Base<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(DerivedI<int>), typeof(IBase<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Derived2<int>), typeof(IBase<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(int?), typeof(Nullable<>)));
 
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(object)));
-            Assert.IsFalse(TypeHelper.MatchType(typeof(Derived<int>), typeof(List<>)));
-            Assert.IsFalse(TypeHelper.MatchType(typeof(Derived<int>), typeof(IEnumerable<>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(Base<int>)));
-            Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IEnumerable<int>)));
-            Assert.IsFalse(TypeHelper.MatchType(typeof(int), typeof(Nullable<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(object)));
+        Assert.IsFalse(TypeHelper.MatchType(typeof(Derived<int>), typeof(List<>)));
+        Assert.IsFalse(TypeHelper.MatchType(typeof(Derived<int>), typeof(IEnumerable<>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(Derived<int>), typeof(Base<int>)));
+        Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), typeof(IEnumerable<int>)));
+        Assert.IsFalse(TypeHelper.MatchType(typeof(int), typeof(Nullable<>)));
 
-            // This get's the "Type" from the Count extension method on IEnumerable<T>, however the type IEnumerable<T> isn't
-            // IEnumerable<> and it is not a generic definition, this attempts to explain that:
-            // http://blogs.msdn.com/b/haibo_luo/archive/2006/02/17/534480.aspx
-            Type genericEnumerableNonGenericDefinition = typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public)
-                .Single(x => x.Name == "Count" && x.GetParameters().Count() == 1)
-                .GetParameters()
-                .Single()
-                .ParameterType;
+        // This get's the "Type" from the Count extension method on IEnumerable<T>, however the type IEnumerable<T> isn't
+        // IEnumerable<> and it is not a generic definition, this attempts to explain that:
+        // http://blogs.msdn.com/b/haibo_luo/archive/2006/02/17/534480.aspx
+        var genericEnumerableNonGenericDefinition = typeof(Enumerable)
+            .GetMethods(BindingFlags.Static | BindingFlags.Public)
+            .Single(x => x.Name == "Count" && x.GetParameters().Count() == 1)
+            .GetParameters()
+            .Single()
+            .ParameterType;
 
-            Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), genericEnumerableNonGenericDefinition));
-        }
+        Assert.IsTrue(TypeHelper.MatchType(typeof(List<int>), genericEnumerableNonGenericDefinition));
+    }
 
-        [Test]
-        public void CreateOpenGenericTypes()
-        {
-            // readings
-            // http://stackoverflow.com/questions/13466078/create-open-constructed-type-from-string
-            // http://stackoverflow.com/questions/6704722/c-sharp-language-how-to-get-type-of-bound-but-open-generic-class
+    [Test]
+    public void CreateOpenGenericTypes()
+    {
+        // readings
+        // http://stackoverflow.com/questions/13466078/create-open-constructed-type-from-string
+        // http://stackoverflow.com/questions/6704722/c-sharp-language-how-to-get-type-of-bound-but-open-generic-class
 
-            // note that FullName returns "The fully qualified name of the type, including its namespace but not its
-            // assembly; or null if the current instance represents a generic type parameter, an array type, pointer
-            // type, or byref type based on a type parameter, or a generic type that is not a generic type definition
-            // but contains unresolved type parameters."
-            var t = Type.GetType("System.Collections.Generic.IList`1");
-            Assert.IsNotNull(t);
-            Assert.IsTrue(t.IsGenericTypeDefinition);
-            Assert.AreEqual("IList`1", t.Name);
-            Assert.AreEqual("System.Collections.Generic.IList`1", t.FullName);
-            Assert.AreEqual("System.Collections.Generic.IList`1[T]", t.ToString());
+        // note that FullName returns "The fully qualified name of the type, including its namespace but not its
+        // assembly; or null if the current instance represents a generic type parameter, an array type, pointer
+        // type, or byref type based on a type parameter, or a generic type that is not a generic type definition
+        // but contains unresolved type parameters."
+        var t = Type.GetType("System.Collections.Generic.IList`1");
+        Assert.IsNotNull(t);
+        Assert.IsTrue(t.IsGenericTypeDefinition);
+        Assert.AreEqual("IList`1", t.Name);
+        Assert.AreEqual("System.Collections.Generic.IList`1", t.FullName);
+        Assert.AreEqual("System.Collections.Generic.IList`1[T]", t.ToString());
 
-            t = typeof(IList<>);
-            Assert.IsTrue(t.IsGenericTypeDefinition);
-            Assert.AreEqual("IList`1", t.Name);
-            Assert.AreEqual("System.Collections.Generic.IList`1", t.FullName);
-            Assert.AreEqual("System.Collections.Generic.IList`1[T]", t.ToString());
+        t = typeof(IList<>);
+        Assert.IsTrue(t.IsGenericTypeDefinition);
+        Assert.AreEqual("IList`1", t.Name);
+        Assert.AreEqual("System.Collections.Generic.IList`1", t.FullName);
+        Assert.AreEqual("System.Collections.Generic.IList`1[T]", t.ToString());
 
-            t = typeof(IDictionary<,>);
-            Assert.IsTrue(t.IsGenericTypeDefinition);
-            Assert.AreEqual("IDictionary`2", t.Name);
-            Assert.AreEqual("System.Collections.Generic.IDictionary`2", t.FullName);
-            Assert.AreEqual("System.Collections.Generic.IDictionary`2[TKey,TValue]", t.ToString());
+        t = typeof(IDictionary<,>);
+        Assert.IsTrue(t.IsGenericTypeDefinition);
+        Assert.AreEqual("IDictionary`2", t.Name);
+        Assert.AreEqual("System.Collections.Generic.IDictionary`2", t.FullName);
+        Assert.AreEqual("System.Collections.Generic.IDictionary`2[TKey,TValue]", t.ToString());
 
-            t = typeof(IDictionary<,>);
-            t = t.MakeGenericType(t.GetGenericArguments()[0], t.GetGenericArguments()[1]);
-            Assert.AreEqual("IDictionary`2", t.Name);
-            Assert.AreEqual("System.Collections.Generic.IDictionary`2", t.FullName);
-            Assert.AreEqual("System.Collections.Generic.IDictionary`2[TKey,TValue]", t.ToString());
+        t = typeof(IDictionary<,>);
+        t = t.MakeGenericType(t.GetGenericArguments()[0], t.GetGenericArguments()[1]);
+        Assert.AreEqual("IDictionary`2", t.Name);
+        Assert.AreEqual("System.Collections.Generic.IDictionary`2", t.FullName);
+        Assert.AreEqual("System.Collections.Generic.IDictionary`2[TKey,TValue]", t.ToString());
 
-            t = typeof(IDictionary<,>);
-            t = t.MakeGenericType(t.GetGenericArguments()[0], t.GetGenericArguments()[0]);
-            Assert.IsFalse(t.IsGenericTypeDefinition); // not anymore
-            Assert.AreEqual("IDictionary`2", t.Name);
-            Assert.IsNull(t.FullName); // see note above
-            Assert.AreEqual("System.Collections.Generic.IDictionary`2[TKey,TKey]", t.ToString());
+        t = typeof(IDictionary<,>);
+        t = t.MakeGenericType(t.GetGenericArguments()[0], t.GetGenericArguments()[0]);
+        Assert.IsFalse(t.IsGenericTypeDefinition); // not anymore
+        Assert.AreEqual("IDictionary`2", t.Name);
+        Assert.IsNull(t.FullName); // see note above
+        Assert.AreEqual("System.Collections.Generic.IDictionary`2[TKey,TKey]", t.ToString());
 
-            t = typeof(IList<>);
-            Assert.IsTrue(t.IsGenericTypeDefinition);
-            t = t.MakeGenericType(t.GetGenericArguments()[0]);
-            Assert.AreEqual("IList`1", t.Name);
-            Assert.AreEqual("System.Collections.Generic.IList`1", t.FullName);
-            Assert.AreEqual("System.Collections.Generic.IList`1[T]", t.ToString());
+        t = typeof(IList<>);
+        Assert.IsTrue(t.IsGenericTypeDefinition);
+        t = t.MakeGenericType(t.GetGenericArguments()[0]);
+        Assert.AreEqual("IList`1", t.Name);
+        Assert.AreEqual("System.Collections.Generic.IList`1", t.FullName);
+        Assert.AreEqual("System.Collections.Generic.IList`1[T]", t.ToString());
 
-            t = typeof(IList<int>);
-            Assert.AreEqual("System.Collections.Generic.IList`1[System.Int32]", t.ToString());
+        t = typeof(IList<int>);
+        Assert.AreEqual("System.Collections.Generic.IList`1[System.Int32]", t.ToString());
 
-            t = typeof(IDictionary<,>);
-            t = t.MakeGenericType(typeof(int), t.GetGenericArguments()[1]);
-            Assert.IsFalse(t.IsGenericTypeDefinition); // not anymore
-            Assert.AreEqual("IDictionary`2", t.Name);
-            Assert.IsNull(t.FullName); // see note above
-            Assert.AreEqual("System.Collections.Generic.IDictionary`2[System.Int32,TValue]", t.ToString());
-        }
+        t = typeof(IDictionary<,>);
+        t = t.MakeGenericType(typeof(int), t.GetGenericArguments()[1]);
+        Assert.IsFalse(t.IsGenericTypeDefinition); // not anymore
+        Assert.AreEqual("IDictionary`2", t.Name);
+        Assert.IsNull(t.FullName); // see note above
+        Assert.AreEqual("System.Collections.Generic.IDictionary`2[System.Int32,TValue]", t.ToString());
+    }
 
-        /// <summary>
-        /// USED ONLY FOR TESTS ABOVE
-        /// </summary>
-        public class PropertyAliasDto
-        {
-            public string Alias { get; set; }
-        }
+    /// <summary>
+    ///     USED ONLY FOR TESTS ABOVE
+    /// </summary>
+    public class PropertyAliasDto
+    {
+        public string Alias { get; set; }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs
index 973ce87ff1..66b5b78212 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderExtensions.cs
@@ -1,20 +1,17 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
 using System.Collections.Generic;
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
+
+/// <summary>
+///     Used for PluginTypeResolverTests
+/// </summary>
+internal static class TypeLoaderExtensions
 {
-    /// <summary>
-    /// Used for PluginTypeResolverTests
-    /// </summary>
-    internal static class TypeLoaderExtensions
-    {
-        public static IEnumerable<Type> ResolveFindMeTypes(this TypeLoader resolver)
-        {
-            return resolver.GetTypes<TypeLoaderTests.IFindMe>();
-        }
-    }
+    public static IEnumerable<Type> ResolveFindMeTypes(this TypeLoader resolver) =>
+        resolver.GetTypes<TypeLoaderTests.IFindMe>();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs
index 19f04ac869..045e3002e7 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Composing/TypeLoaderTests.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Xml;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
@@ -14,234 +15,232 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Cms.Web.Common.UmbracoContext;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Composing;
+
+[TestFixture]
+public class TypeLoaderTests
 {
-    [TestFixture]
-    public class TypeLoaderTests
+    [SetUp]
+    public void Initialize()
     {
-        private TypeLoader _typeLoader;
+        // this ensures it's reset
+        var typeFinder = TestHelper.GetTypeFinder();
 
-        [SetUp]
-        public void Initialize()
+        // For testing, we'll specify which assemblies are scanned for the PluginTypeResolver
+        // TODO: Should probably update this so it only searches this assembly and add custom types to be found
+        Assembly[] assemblies =
         {
-            // this ensures it's reset
-            ITypeFinder typeFinder = TestHelper.GetTypeFinder();
+            GetType().Assembly,
+            typeof(Guid).Assembly,
+            typeof(Assert).Assembly,
+            typeof(NameTable).Assembly,
+            ////typeof(TabPage).Assembly,
+            typeof(TypeFinder).Assembly, typeof(UmbracoContext).Assembly,
+            typeof(CheckBoxListPropertyEditor).Assembly,
+        };
+        _typeLoader = new TypeLoader(
+            typeFinder,
+            new VaryingRuntimeHash(),
+            NoAppCache.Instance,
+            new DirectoryInfo(TestHelper.GetHostingEnvironment()
+                .MapPathContentRoot(Constants.SystemDirectories.TempData)),
+            Mock.Of<ILogger<TypeLoader>>(),
+            Mock.Of<IProfiler>(),
+            false,
+            assemblies);
+    }
 
-            // For testing, we'll specify which assemblies are scanned for the PluginTypeResolver
-            // TODO: Should probably update this so it only searches this assembly and add custom types to be found
-            Assembly[] assemblies = new[]
-                {
-                    GetType().Assembly,
-                    typeof(Guid).Assembly,
-                    typeof(Assert).Assembly,
-                    typeof(System.Xml.NameTable).Assembly,
-                    ////typeof(TabPage).Assembly,
-                    typeof(TypeFinder).Assembly,
-                    typeof(UmbracoContext).Assembly,
-                    typeof(CheckBoxListPropertyEditor).Assembly
-                };
-            _typeLoader = new TypeLoader(
-                typeFinder,
-                new VaryingRuntimeHash(),
-                NoAppCache.Instance,
-                new DirectoryInfo(TestHelper.GetHostingEnvironment().MapPathContentRoot(Constants.SystemDirectories.TempData)),
-                Mock.Of<ILogger<TypeLoader>>(),
-                Mock.Of<IProfiler>(),
-                false,
-                assemblies);
+    [TearDown]
+    public void TearDown()
+    {
+        _typeLoader = null;
+
+        // cleanup
+        var assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
+        var tlDir = Path.Combine(assDir.FullName, "TypeLoader");
+        if (!Directory.Exists(tlDir))
+        {
+            return;
         }
 
-        [TearDown]
-        public void TearDown()
-        {
-            _typeLoader = null;
+        Directory.Delete(tlDir, true);
+    }
 
-            // cleanup
-            DirectoryInfo assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
-            string tlDir = Path.Combine(assDir.FullName, "TypeLoader");
-            if (!Directory.Exists(tlDir))
+    private TypeLoader _typeLoader;
+
+    private DirectoryInfo PrepareFolder()
+    {
+        var assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
+        var tlDir = Path.Combine(assDir.FullName, "TypeLoader");
+        var dir = Directory.CreateDirectory(Path.Combine(tlDir, Guid.NewGuid().ToString("N")));
+        return dir;
+    }
+
+    ////[Test]
+    ////public void Scan_Vs_Load_Benchmark()
+    ////{
+    ////    var typeLoader = new TypeLoader(false);
+    ////    var watch = new Stopwatch();
+    ////    watch.Start();
+    ////    for (var i = 0; i < 1000; i++)
+    ////    {
+    ////        var type2 = Type.GetType("umbraco.macroCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
+    ////        var type3 = Type.GetType("umbraco.templateCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
+    ////        var type4 = Type.GetType("umbraco.presentation.cache.MediaLibraryRefreshers, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
+    ////        var type5 = Type.GetType("umbraco.presentation.cache.pageRefresher, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
+    ////    }
+    ////    watch.Stop();
+    ////    Debug.WriteLine("TOTAL TIME (1st round): " + watch.ElapsedMilliseconds);
+    ////    watch.Start();
+    ////    for (var i = 0; i < 1000; i++)
+    ////    {
+    ////        var type2 = BuildManager.GetType("umbraco.macroCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
+    ////        var type3 = BuildManager.GetType("umbraco.templateCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
+    ////        var type4 = BuildManager.GetType("umbraco.presentation.cache.MediaLibraryRefreshers, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
+    ////        var type5 = BuildManager.GetType("umbraco.presentation.cache.pageRefresher, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
+    ////    }
+    ////    watch.Stop();
+    ////    Debug.WriteLine("TOTAL TIME (1st round): " + watch.ElapsedMilliseconds);
+    ////    watch.Reset();
+    ////    watch.Start();
+    ////    for (var i = 0; i < 1000; i++)
+    ////    {
+    ////        var refreshers = typeLoader.GetTypes<ICacheRefresher>(false);
+    ////    }
+    ////    watch.Stop();
+    ////    Debug.WriteLine("TOTAL TIME (2nd round): " + watch.ElapsedMilliseconds);
+    ////}
+
+    [Test]
+    public void Get_Plugins_Hash_With_Hash_Generator()
+    {
+        // Arrange
+        var dir = PrepareFolder();
+        var d1 = dir.CreateSubdirectory("1");
+        var d2 = dir.CreateSubdirectory("2");
+        var d3 = dir.CreateSubdirectory("3");
+        var d4 = dir.CreateSubdirectory("4");
+        var f1 = new FileInfo(Path.Combine(d1.FullName, "test1.dll"));
+        var f2 = new FileInfo(Path.Combine(d1.FullName, "test2.dll"));
+        var f3 = new FileInfo(Path.Combine(d2.FullName, "test1.dll"));
+        var f4 = new FileInfo(Path.Combine(d2.FullName, "test2.dll"));
+        var f5 = new FileInfo(Path.Combine(d3.FullName, "test1.dll"));
+        var f6 = new FileInfo(Path.Combine(d3.FullName, "test2.dll"));
+        var f7 = new FileInfo(Path.Combine(d4.FullName, "test1.dll"));
+        f1.CreateText().Close();
+        f2.CreateText().Close();
+        f3.CreateText().Close();
+        f4.CreateText().Close();
+        f5.CreateText().Close();
+        f6.CreateText().Close();
+        f7.CreateText().Close();
+        FileInfo[] list1 = { f1, f2, f3, f4, f5, f6 };
+        FileInfo[] list2 = { f1, f3, f5 };
+        FileInfo[] list3 = { f1, f3, f5, f7 };
+
+        // Act
+        var hash1 = GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
+        var hash2 = GetFileHash(list2, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
+        var hash3 = GetFileHash(list3, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
+
+        // Assert
+        Assert.AreNotEqual(hash1, hash2);
+        Assert.AreNotEqual(hash1, hash3);
+        Assert.AreNotEqual(hash2, hash3);
+
+        Assert.AreEqual(hash1, GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>())));
+    }
+
+    [Test]
+    public void Ensure_Only_One_Type_List_Created()
+    {
+        _ = _typeLoader.ResolveFindMeTypes();
+        _ = _typeLoader.ResolveFindMeTypes();
+        Assert.AreEqual(1, _typeLoader.TypeLists.Count(x => x.BaseType == typeof(IFindMe) && x.AttributeType == null));
+    }
+
+    [Test]
+    public void Resolves_Types()
+    {
+        var foundTypes1 = _typeLoader.ResolveFindMeTypes();
+        Assert.AreEqual(2, foundTypes1.Count());
+    }
+
+    [Test]
+    public void GetDataEditors()
+    {
+        var types = _typeLoader.GetDataEditors();
+        Assert.AreEqual(41, types.Count());
+    }
+
+    /// <summary>
+    ///     This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of
+    ///     assignable types
+    ///     not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.
+    /// </summary>
+    [Test]
+    public void TypeList_Resolves_Explicit_Types()
+    {
+        var types = new HashSet<TypeLoader.TypeList>();
+
+        var propEditors = new TypeLoader.TypeList(typeof(DataEditor), null);
+        propEditors.Add(typeof(LabelPropertyEditor));
+        types.Add(propEditors);
+
+        var found = types.SingleOrDefault(x => x.BaseType == typeof(DataEditor) && x.AttributeType == null);
+
+        Assert.IsNotNull(found);
+
+        // This should not find a type list of this type
+        var shouldNotFind = types.SingleOrDefault(x => x.BaseType == typeof(IDataEditor) && x.AttributeType == null);
+
+        Assert.IsNull(shouldNotFind);
+    }
+
+    public interface IFindMe : IDiscoverable
+    {
+    }
+
+    public class FindMe1 : IFindMe
+    {
+    }
+
+    public class FindMe2 : IFindMe
+    {
+    }
+
+    /// <summary>
+    ///     Returns a unique hash for a combination of FileInfo objects.
+    /// </summary>
+    /// <param name="filesAndFolders">A collection of files.</param>
+    /// <param name="logger">A profiling logger.</param>
+    /// <returns>The hash.</returns>
+    // internal for tests
+    private static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, IProfilingLogger logger)
+    {
+        using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
+        {
+            using var generator = new HashGenerator();
+
+            // Get the distinct file infos to hash.
+            var uniqInfos = new HashSet<string>();
+
+            foreach (var fileOrFolder in filesAndFolders)
             {
-                return;
-            }
-
-            Directory.Delete(tlDir, true);
-        }
-
-        private DirectoryInfo PrepareFolder()
-        {
-            DirectoryInfo assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
-            string tlDir = Path.Combine(assDir.FullName, "TypeLoader");
-            DirectoryInfo dir = Directory.CreateDirectory(Path.Combine(tlDir, Guid.NewGuid().ToString("N")));
-            return dir;
-        }
-
-        ////[Test]
-        ////public void Scan_Vs_Load_Benchmark()
-        ////{
-        ////    var typeLoader = new TypeLoader(false);
-        ////    var watch = new Stopwatch();
-        ////    watch.Start();
-        ////    for (var i = 0; i < 1000; i++)
-        ////    {
-        ////        var type2 = Type.GetType("umbraco.macroCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
-        ////        var type3 = Type.GetType("umbraco.templateCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
-        ////        var type4 = Type.GetType("umbraco.presentation.cache.MediaLibraryRefreshers, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
-        ////        var type5 = Type.GetType("umbraco.presentation.cache.pageRefresher, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null");
-        ////    }
-        ////    watch.Stop();
-        ////    Debug.WriteLine("TOTAL TIME (1st round): " + watch.ElapsedMilliseconds);
-        ////    watch.Start();
-        ////    for (var i = 0; i < 1000; i++)
-        ////    {
-        ////        var type2 = BuildManager.GetType("umbraco.macroCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
-        ////        var type3 = BuildManager.GetType("umbraco.templateCacheRefresh, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
-        ////        var type4 = BuildManager.GetType("umbraco.presentation.cache.MediaLibraryRefreshers, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
-        ////        var type5 = BuildManager.GetType("umbraco.presentation.cache.pageRefresher, umbraco, Version=1.0.4698.259, Culture=neutral, PublicKeyToken=null", true);
-        ////    }
-        ////    watch.Stop();
-        ////    Debug.WriteLine("TOTAL TIME (1st round): " + watch.ElapsedMilliseconds);
-        ////    watch.Reset();
-        ////    watch.Start();
-        ////    for (var i = 0; i < 1000; i++)
-        ////    {
-        ////        var refreshers = typeLoader.GetTypes<ICacheRefresher>(false);
-        ////    }
-        ////    watch.Stop();
-        ////    Debug.WriteLine("TOTAL TIME (2nd round): " + watch.ElapsedMilliseconds);
-        ////}
-
-
-        [Test]
-        public void Get_Plugins_Hash_With_Hash_Generator()
-        {
-            // Arrange
-            DirectoryInfo dir = PrepareFolder();
-            DirectoryInfo d1 = dir.CreateSubdirectory("1");
-            DirectoryInfo d2 = dir.CreateSubdirectory("2");
-            DirectoryInfo d3 = dir.CreateSubdirectory("3");
-            DirectoryInfo d4 = dir.CreateSubdirectory("4");
-            var f1 = new FileInfo(Path.Combine(d1.FullName, "test1.dll"));
-            var f2 = new FileInfo(Path.Combine(d1.FullName, "test2.dll"));
-            var f3 = new FileInfo(Path.Combine(d2.FullName, "test1.dll"));
-            var f4 = new FileInfo(Path.Combine(d2.FullName, "test2.dll"));
-            var f5 = new FileInfo(Path.Combine(d3.FullName, "test1.dll"));
-            var f6 = new FileInfo(Path.Combine(d3.FullName, "test2.dll"));
-            var f7 = new FileInfo(Path.Combine(d4.FullName, "test1.dll"));
-            f1.CreateText().Close();
-            f2.CreateText().Close();
-            f3.CreateText().Close();
-            f4.CreateText().Close();
-            f5.CreateText().Close();
-            f6.CreateText().Close();
-            f7.CreateText().Close();
-            FileInfo[] list1 = new[] { f1, f2, f3, f4, f5, f6 };
-            FileInfo[] list2 = new[] { f1, f3, f5 };
-            FileInfo[] list3 = new[] { f1, f3, f5, f7 };
-
-            // Act
-            string hash1 = GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
-            string hash2 = GetFileHash(list2, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
-            string hash3 = GetFileHash(list3, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>()));
-
-            // Assert
-            Assert.AreNotEqual(hash1, hash2);
-            Assert.AreNotEqual(hash1, hash3);
-            Assert.AreNotEqual(hash2, hash3);
-
-            Assert.AreEqual(hash1, GetFileHash(list1, new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>())));
-        }
-
-        [Test]
-        public void Ensure_Only_One_Type_List_Created()
-        {
-            _ = _typeLoader.ResolveFindMeTypes();
-            _ = _typeLoader.ResolveFindMeTypes();
-            Assert.AreEqual(1, _typeLoader.TypeLists.Count(x => x.BaseType == typeof(IFindMe) && x.AttributeType == null));
-        }
-
-        [Test]
-        public void Resolves_Types()
-        {
-            IEnumerable<Type> foundTypes1 = _typeLoader.ResolveFindMeTypes();
-            Assert.AreEqual(2, foundTypes1.Count());
-        }
-
-        [Test]
-        public void GetDataEditors()
-        {
-            IEnumerable<Type> types = _typeLoader.GetDataEditors();
-            Assert.AreEqual(41, types.Count());
-        }
-
-        /// <summary>
-        /// This demonstrates this issue: http://issues.umbraco.org/issue/U4-3505 - the TypeList was returning a list of assignable types
-        /// not explicit types which is sort of ideal but is confusing so we'll do it the less confusing way.
-        /// </summary>
-        [Test]
-        public void TypeList_Resolves_Explicit_Types()
-        {
-            var types = new HashSet<TypeLoader.TypeList>();
-
-            var propEditors = new TypeLoader.TypeList(typeof(DataEditor), null);
-            propEditors.Add(typeof(LabelPropertyEditor));
-            types.Add(propEditors);
-
-            TypeLoader.TypeList found = types.SingleOrDefault(x => x.BaseType == typeof(DataEditor) && x.AttributeType == null);
-
-            Assert.IsNotNull(found);
-
-            // This should not find a type list of this type
-            TypeLoader.TypeList shouldNotFind = types.SingleOrDefault(x => x.BaseType == typeof(IDataEditor) && x.AttributeType == null);
-
-            Assert.IsNull(shouldNotFind);
-        }
-
-        public interface IFindMe : IDiscoverable
-        {
-        }
-
-        public class FindMe1 : IFindMe
-        {
-        }
-
-        public class FindMe2 : IFindMe
-        {
-        }
-
-        /// <summary>
-        /// Returns a unique hash for a combination of FileInfo objects.
-        /// </summary>
-        /// <param name="filesAndFolders">A collection of files.</param>
-        /// <param name="logger">A profiling logger.</param>
-        /// <returns>The hash.</returns>
-        // internal for tests
-        private static string GetFileHash(IEnumerable<FileSystemInfo> filesAndFolders, IProfilingLogger logger)
-        {
-            using (logger.DebugDuration<TypeLoader>("Determining hash of code files on disk", "Hash determined"))
-            {
-                using var generator = new HashGenerator();
-
-                // Get the distinct file infos to hash.
-                var uniqInfos = new HashSet<string>();
-
-                foreach (FileSystemInfo fileOrFolder in filesAndFolders)
+                if (uniqInfos.Contains(fileOrFolder.FullName))
                 {
-                    if (uniqInfos.Contains(fileOrFolder.FullName))
-                    {
-                        continue;
-                    }
-
-                    uniqInfos.Add(fileOrFolder.FullName);
-                    generator.AddFileSystemItem(fileOrFolder);
+                    continue;
                 }
 
-                return generator.GenerateHash();
+                uniqInfos.Add(fileOrFolder.FullName);
+                generator.AddFileSystemItem(fileOrFolder);
             }
+
+            return generator.GenerateHash();
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/ConfigureConnectionStringsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/ConfigureConnectionStringsTests.cs
index 98ec3e01e6..111892cd65 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/ConfigureConnectionStringsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/ConfigureConnectionStringsTests.cs
@@ -83,7 +83,8 @@ public class ConfigureConnectionStringsTests
         AppDomain.CurrentDomain.SetData("DataDirectory", aDataDirectory);
         var config = new Dictionary<string, string>
         {
-            [$"ConnectionStrings:{UmbracoDbDsn}"] = $"{ConnectionStrings.DataDirectoryPlaceholder}/{aConnectionString}",
+            [$"ConnectionStrings:{UmbracoDbDsn}"] =
+                $"{ConnectionStrings.DataDirectoryPlaceholder}/{aConnectionString}",
             [$"ConnectionStrings:{UmbracoDbDsn}_ProviderName"] = aProviderName,
         };
 
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs
index 9c40b53643..f750fb4929 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Extensions/HealthCheckSettingsExtensionsTests.cs
@@ -7,45 +7,38 @@ using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Extensions;
+
+[TestFixture]
+public class HealthCheckSettingsExtensionsTests
 {
-    [TestFixture]
-    public class HealthCheckSettingsExtensionsTests
+    private ICronTabParser CronTabParser => new NCronTabParser();
+
+    [TestCase("30 12 * * *", 30)]
+    [TestCase("15 18 * * *", (60 * 6) + 15)]
+    [TestCase("0 3 * * *", 60 * 15)]
+    [TestCase("0 3 2 * *", (24 * 60 * 1) + (60 * 15))]
+    [TestCase("0 6 * * 3", (24 * 60 * 3) + (60 * 18))]
+    public void Returns_Notification_Delay_From_Provided_Time(string firstRunTimeCronExpression, int expectedDelayInMinutes)
     {
-        private ICronTabParser CronTabParser => new NCronTabParser();
-
-        [TestCase("30 12 * * *", 30)]
-        [TestCase("15 18 * * *", (60 * 6) + 15)]
-        [TestCase("0 3 * * *", 60 * 15)]
-        [TestCase("0 3 2 * *", (24 * 60 * 1) + (60 * 15))]
-        [TestCase("0 6 * * 3", (24 * 60 * 3) + (60 * 18))]
-        public void Returns_Notification_Delay_From_Provided_Time(string firstRunTimeCronExpression, int expectedDelayInMinutes)
+        var settings = new HealthChecksSettings
         {
-            var settings = new HealthChecksSettings
-            {
-                Notification = new HealthChecksNotificationSettings
-                {
-                    FirstRunTime = firstRunTimeCronExpression,
-                }
-            };
-            var now = new DateTime(2020, 10, 31, 12, 0, 0);
-            TimeSpan result = settings.GetNotificationDelay(CronTabParser, now, TimeSpan.Zero);
-            Assert.AreEqual(expectedDelayInMinutes, result.TotalMinutes);
-        }
+            Notification = new HealthChecksNotificationSettings { FirstRunTime = firstRunTimeCronExpression },
+        };
+        var now = new DateTime(2020, 10, 31, 12, 0, 0);
+        var result = settings.GetNotificationDelay(CronTabParser, now, TimeSpan.Zero);
+        Assert.AreEqual(expectedDelayInMinutes, result.TotalMinutes);
+    }
 
-        [Test]
-        public void Returns_Notification_Delay_From_Default_When_Provided_Time_Too_Close_To_Current_Time()
+    [Test]
+    public void Returns_Notification_Delay_From_Default_When_Provided_Time_Too_Close_To_Current_Time()
+    {
+        var settings = new HealthChecksSettings
         {
-            var settings = new HealthChecksSettings
-            {
-                Notification = new HealthChecksNotificationSettings
-                {
-                    FirstRunTime = "30 12 * * *",
-                }
-            };
-            var now = new DateTime(2020, 10, 31, 12, 25, 0);
-            TimeSpan result = settings.GetNotificationDelay(CronTabParser, now, TimeSpan.FromMinutes(10));
-            Assert.AreEqual(10, result.TotalMinutes);
-        }
+            Notification = new HealthChecksNotificationSettings { FirstRunTime = "30 12 * * *" },
+        };
+        var now = new DateTime(2020, 10, 31, 12, 25, 0);
+        var result = settings.GetNotificationDelay(CronTabParser, now, TimeSpan.FromMinutes(10));
+        Assert.AreEqual(10, result.TotalMinutes);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs
index f603463c70..1fda465840 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/GlobalSettingsTests.cs
@@ -9,28 +9,27 @@ using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 using Umbraco.Cms.Web.Common.AspNetCore;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models;
+
+[TestFixture]
+public class GlobalSettingsTests
 {
-    [TestFixture]
-    public class GlobalSettingsTests
+    [InlineAutoMoqData("~/umbraco", "/", "umbraco")]
+    [InlineAutoMoqData("~/umbraco", "/MyVirtualDir", "umbraco")]
+    [InlineAutoMoqData("~/customPath", "/MyVirtualDir/", "custompath")]
+    [InlineAutoMoqData("~/some-wacky/nestedPath", "/MyVirtualDir", "some-wacky-nestedpath")]
+    [InlineAutoMoqData("~/some-wacky/nestedPath", "/MyVirtualDir/NestedVDir/", "some-wacky-nestedpath")]
+    public void Umbraco_Mvc_Area(
+        string path,
+        string rootPath,
+        string outcome,
+        [Frozen] IOptionsMonitor<HostingSettings> hostingSettings,
+        AspNetCoreHostingEnvironment hostingEnvironment)
     {
-        [InlineAutoMoqData("~/umbraco", "/", "umbraco")]
-        [InlineAutoMoqData("~/umbraco", "/MyVirtualDir", "umbraco")]
-        [InlineAutoMoqData("~/customPath", "/MyVirtualDir/", "custompath")]
-        [InlineAutoMoqData("~/some-wacky/nestedPath", "/MyVirtualDir", "some-wacky-nestedpath")]
-        [InlineAutoMoqData("~/some-wacky/nestedPath", "/MyVirtualDir/NestedVDir/", "some-wacky-nestedpath")]
-        public void Umbraco_Mvc_Area(
-            string path,
-            string rootPath,
-            string outcome,
-            [Frozen] IOptionsMonitor<HostingSettings> hostingSettings,
-            AspNetCoreHostingEnvironment hostingEnvironment)
-        {
-            hostingSettings.CurrentValue.ApplicationVirtualPath = rootPath;
+        hostingSettings.CurrentValue.ApplicationVirtualPath = rootPath;
 
-            var globalSettings = new GlobalSettings { UmbracoPath = path };
+        var globalSettings = new GlobalSettings { UmbracoPath = path };
 
-            Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(hostingEnvironment));
-        }
+        Assert.AreEqual(outcome, globalSettings.GetUmbracoMvcAreaNoCache(hostingEnvironment));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs
index f159ecbc85..10a0df465a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/RequestHandlerSettingsTests.cs
@@ -3,88 +3,90 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models;
+
+[TestFixture]
+public class RequestHandlerSettingsTests
 {
-    [TestFixture]
-    public class RequestHandlerSettingsTests
+    [Test]
+    public void Given_CharCollection_With_DefaultEnabled_MergesCollection()
     {
-        [Test]
-        public void Given_CharCollection_With_DefaultEnabled_MergesCollection()
+        var userCollection = new CharItem[]
         {
-            var userCollection = new CharItem[]
-            {
-                new () { Char = "test", Replacement = "replace" },
-                new () { Char = "test2", Replacement = "replace2" }
-            };
+            new() { Char = "test", Replacement = "replace" },
+            new() { Char = "test2", Replacement = "replace2" },
+        };
 
+        var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
+        var actual = settings.GetCharReplacements().ToList();
 
-            var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
-            var actual = settings.GetCharReplacements().ToList();
+        var expectedCollection = RequestHandlerSettings.DefaultCharCollection.ToList();
+        expectedCollection.AddRange(userCollection);
 
-            var expectedCollection = RequestHandlerSettings.DefaultCharCollection.ToList();
-            expectedCollection.AddRange(userCollection);
+        Assert.AreEqual(expectedCollection.Count, actual.Count);
+        Assert.That(actual, Is.EquivalentTo(expectedCollection));
+    }
 
-            Assert.AreEqual(expectedCollection.Count, actual.Count);
-            Assert.That(actual, Is.EquivalentTo(expectedCollection));
-        }
-
-        [Test]
-        public void Given_CharCollection_With_DefaultDisabled_ReturnsUserCollection()
+    [Test]
+    public void Given_CharCollection_With_DefaultDisabled_ReturnsUserCollection()
+    {
+        var userCollection = new CharItem[]
         {
-            var userCollection = new CharItem[]
-            {
-                new () { Char = "test", Replacement = "replace" },
-                new () { Char = "test2", Replacement = "replace2" }
-            };
+            new() { Char = "test", Replacement = "replace" },
+            new() { Char = "test2", Replacement = "replace2" },
+        };
 
-            var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection, EnableDefaultCharReplacements = false };
-            var actual = settings.GetCharReplacements().ToList();
-
-            Assert.AreEqual(userCollection.Length, actual.Count);
-            Assert.That(actual, Is.EquivalentTo(userCollection));
-        }
-
-        [Test]
-        public void Given_CharCollection_That_OverridesDefaultValues_ReturnsReplacements()
+        var settings = new RequestHandlerSettings
         {
-            var userCollection = new CharItem[]
-            {
-                new () { Char = "%", Replacement = "percent" },
-                new () { Char = ".", Replacement = "dot" }
-            };
+            UserDefinedCharCollection = userCollection,
+            EnableDefaultCharReplacements = false,
+        };
+        var actual = settings.GetCharReplacements().ToList();
 
-            var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
-            var actual = settings.GetCharReplacements().ToList();
+        Assert.AreEqual(userCollection.Length, actual.Count);
+        Assert.That(actual, Is.EquivalentTo(userCollection));
+    }
 
-            Assert.AreEqual(RequestHandlerSettings.DefaultCharCollection.Length, actual.Count);
-
-            Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "%" && x.Replacement == "percent"));
-            Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "." && x.Replacement == "dot"));
-            Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "%" && x.Replacement == string.Empty));
-            Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "." && x.Replacement == string.Empty));
-        }
-
-        [Test]
-        public void Given_CharCollection_That_OverridesDefaultValues_And_ContainsNew_ReturnsMergedWithReplacements()
+    [Test]
+    public void Given_CharCollection_That_OverridesDefaultValues_ReturnsReplacements()
+    {
+        var userCollection = new CharItem[]
         {
-            var userCollection = new CharItem[]
-            {
-                new () { Char = "%", Replacement = "percent" },
-                new () { Char = ".", Replacement = "dot" },
-                new () { Char = "new", Replacement = "new" }
-            };
+            new() { Char = "%", Replacement = "percent" },
+            new() { Char = ".", Replacement = "dot" },
+        };
 
-            var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
-            var actual = settings.GetCharReplacements().ToList();
+        var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
+        var actual = settings.GetCharReplacements().ToList();
 
-            // Add 1 to the length, because we're expecting to only add one new one
-            Assert.AreEqual(RequestHandlerSettings.DefaultCharCollection.Length + 1, actual.Count);
+        Assert.AreEqual(RequestHandlerSettings.DefaultCharCollection.Length, actual.Count);
 
-            Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "%" && x.Replacement == "percent"));
-            Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "." && x.Replacement == "dot"));
-            Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "new" && x.Replacement == "new"));
-            Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "%" && x.Replacement == string.Empty));
-            Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "." && x.Replacement == string.Empty));
-        }
+        Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "%" && x.Replacement == "percent"));
+        Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "." && x.Replacement == "dot"));
+        Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "%" && x.Replacement == string.Empty));
+        Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "." && x.Replacement == string.Empty));
+    }
+
+    [Test]
+    public void Given_CharCollection_That_OverridesDefaultValues_And_ContainsNew_ReturnsMergedWithReplacements()
+    {
+        var userCollection = new CharItem[]
+        {
+            new() { Char = "%", Replacement = "percent" },
+            new() { Char = ".", Replacement = "dot" },
+            new() { Char = "new", Replacement = "new" },
+        };
+
+        var settings = new RequestHandlerSettings { UserDefinedCharCollection = userCollection };
+        var actual = settings.GetCharReplacements().ToList();
+
+        // Add 1 to the length, because we're expecting to only add one new one
+        Assert.AreEqual(RequestHandlerSettings.DefaultCharCollection.Length + 1, actual.Count);
+
+        Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "%" && x.Replacement == "percent"));
+        Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "." && x.Replacement == "dot"));
+        Assert.That(actual, Has.Exactly(1).Matches<CharItem>(x => x.Char == "new" && x.Replacement == "new"));
+        Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "%" && x.Replacement == string.Empty));
+        Assert.That(actual, Has.Exactly(0).Matches<CharItem>(x => x.Char == "." && x.Replacement == string.Empty));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs
index d0b29f4cac..9d18f9fb2b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/ContentSettingsValidatorTests.cs
@@ -52,15 +52,15 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validati
             {
                 Error404Collection = new ContentErrorPage[]
                     {
-                        new ContentErrorPage { Culture = culture, ContentId = 1, ContentXPath = contentXPath },
+                        new() { Culture = culture, ContentId = 1, ContentXPath = contentXPath },
                     },
                 Imaging = new ContentImagingSettings
                 {
                     AutoFillImageProperties = new ImagingAutoFillUploadField[]
                         {
-                            new ImagingAutoFillUploadField { Alias = autoFillImagePropertyAlias, WidthFieldAlias = "w", HeightFieldAlias = "h", LengthFieldAlias = "l", ExtensionFieldAlias = "e" }
-                        }
-                }
+                            new() { Alias = autoFillImagePropertyAlias, WidthFieldAlias = "w", HeightFieldAlias = "h", LengthFieldAlias = "l", ExtensionFieldAlias = "e" },
+                        },
+                },
             };
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs
index 1c63e16ad3..7316c35b01 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/GlobalSettingsValidatorTests.cs
@@ -2,78 +2,61 @@
 // See LICENSE for more details.
 
 using System;
-using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Configuration.Models.Validation;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation;
+
+[TestFixture]
+public class GlobalSettingsValidatorTests
 {
-    [TestFixture]
-    public class GlobalSettingsValidatorTests
+    [Test]
+    public void Returns_Success_ForValid_Configuration()
     {
-        [Test]
-        public void Returns_Success_ForValid_Configuration()
-        {
-            var validator = new GlobalSettingsValidator();
-            var options = new GlobalSettings();
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.True(result.Succeeded);
-        }
+        var validator = new GlobalSettingsValidator();
+        var options = new GlobalSettings();
+        var result = validator.Validate("settings", options);
+        Assert.True(result.Succeeded);
+    }
 
-        [Test]
-        public void Returns_Fail_For_Configuration_With_Invalid_SmtpFrom_Field()
-        {
-            var validator = new GlobalSettingsValidator();
-            var options = new GlobalSettings
-            {
-                Smtp = new SmtpSettings
-                {
-                    From = "invalid",
-                }
-            };
+    [Test]
+    public void Returns_Fail_For_Configuration_With_Invalid_SmtpFrom_Field()
+    {
+        var validator = new GlobalSettingsValidator();
+        var options = new GlobalSettings { Smtp = new SmtpSettings { From = "invalid" } };
 
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.False(result.Succeeded);
-        }
+        var result = validator.Validate("settings", options);
+        Assert.False(result.Succeeded);
+    }
 
-        [Test]
-        public void Returns_Fail_For_Configuration_With_Insufficient_SqlWriteLockTimeOut()
-        {
-            var validator = new GlobalSettingsValidator();
-            var options = new GlobalSettings
-            {
-                DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:00.099")
-            };
+    [Test]
+    public void Returns_Fail_For_Configuration_With_Insufficient_SqlWriteLockTimeOut()
+    {
+        var validator = new GlobalSettingsValidator();
+        var options = new GlobalSettings { DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:00.099") };
 
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.False(result.Succeeded);
-        }
+        var result = validator.Validate("settings", options);
+        Assert.False(result.Succeeded);
+    }
 
-        [Test]
-        public void Returns_Fail_For_Configuration_With_Excessive_SqlWriteLockTimeOut()
-        {
-            var validator = new GlobalSettingsValidator();
-            var options = new GlobalSettings
-            {
-                DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:21")
-            };
+    [Test]
+    public void Returns_Fail_For_Configuration_With_Excessive_SqlWriteLockTimeOut()
+    {
+        var validator = new GlobalSettingsValidator();
+        var options = new GlobalSettings { DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:21") };
 
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.False(result.Succeeded);
-        }
+        var result = validator.Validate("settings", options);
+        Assert.False(result.Succeeded);
+    }
 
-        [Test]
-        public void Returns_Success_For_Configuration_With_Valid_SqlWriteLockTimeOut()
-        {
-            var validator = new GlobalSettingsValidator();
-            var options = new GlobalSettings
-            {
-                DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:20")
-            };
+    [Test]
+    public void Returns_Success_For_Configuration_With_Valid_SqlWriteLockTimeOut()
+    {
+        var validator = new GlobalSettingsValidator();
+        var options = new GlobalSettings { DistributedLockingWriteLockDefaultTimeout = TimeSpan.Parse("00:00:20") };
 
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.True(result.Succeeded);
-        }
+        var result = validator.Validate("settings", options);
+        Assert.True(result.Succeeded);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs
index 7774684630..a2b900d859 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/HealthChecksSettingsValidatorTests.cs
@@ -2,44 +2,42 @@
 // See LICENSE for more details.
 
 using System;
-using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Configuration.Models.Validation;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation;
+
+[TestFixture]
+public class HealthChecksSettingsValidatorTests
 {
-    [TestFixture]
-    public class HealthChecksSettingsValidatorTests
+    [Test]
+    public void Returns_Success_ForValid_Configuration()
     {
-        [Test]
-        public void Returns_Success_ForValid_Configuration()
-        {
-            var validator = new HealthChecksSettingsValidator(new NCronTabParser());
-            HealthChecksSettings options = BuildHealthChecksSettings();
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.True(result.Succeeded);
-        }
-
-        [Test]
-        public void Returns_Fail_For_Configuration_With_Invalid_Notification_FirstRunTime()
-        {
-            var validator = new HealthChecksSettingsValidator(new NCronTabParser());
-            HealthChecksSettings options = BuildHealthChecksSettings(firstRunTime: "0 3 *");
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.False(result.Succeeded);
-        }
-
-        private static HealthChecksSettings BuildHealthChecksSettings(string firstRunTime = "0 3 * * *") =>
-            new HealthChecksSettings
-            {
-                Notification = new HealthChecksNotificationSettings
-                {
-                    Enabled = true,
-                    FirstRunTime = firstRunTime,
-                    Period = TimeSpan.FromHours(1),
-                }
-            };
+        var validator = new HealthChecksSettingsValidator(new NCronTabParser());
+        var options = BuildHealthChecksSettings();
+        var result = validator.Validate("settings", options);
+        Assert.True(result.Succeeded);
     }
+
+    [Test]
+    public void Returns_Fail_For_Configuration_With_Invalid_Notification_FirstRunTime()
+    {
+        var validator = new HealthChecksSettingsValidator(new NCronTabParser());
+        var options = BuildHealthChecksSettings("0 3 *");
+        var result = validator.Validate("settings", options);
+        Assert.False(result.Succeeded);
+    }
+
+    private static HealthChecksSettings BuildHealthChecksSettings(string firstRunTime = "0 3 * * *") =>
+        new()
+        {
+            Notification = new HealthChecksNotificationSettings
+            {
+                Enabled = true,
+                FirstRunTime = firstRunTime,
+                Period = TimeSpan.FromHours(1),
+            },
+        };
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs
index d8f0c0847a..58fec03b61 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/Models/Validation/RequestHandlerSettingsValidatorTests.cs
@@ -1,32 +1,30 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Configuration.Models.Validation;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation
-{
-    [TestFixture]
-    public class RequestHandlerSettingsValidatorTests
-    {
-        [Test]
-        public void Returns_Success_ForValid_Configuration()
-        {
-            var validator = new RequestHandlerSettingsValidator();
-            var options = new RequestHandlerSettings();
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.True(result.Succeeded);
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration.Models.Validation;
 
-        [Test]
-        public void Returns_Fail_For_Configuration_With_Invalid_ConvertUrlsToAscii_Field()
-        {
-            var validator = new RequestHandlerSettingsValidator();
-            var options = new RequestHandlerSettings { ConvertUrlsToAscii = "invalid" };
-            ValidateOptionsResult result = validator.Validate("settings", options);
-            Assert.False(result.Succeeded);
-        }
+[TestFixture]
+public class RequestHandlerSettingsValidatorTests
+{
+    [Test]
+    public void Returns_Success_ForValid_Configuration()
+    {
+        var validator = new RequestHandlerSettingsValidator();
+        var options = new RequestHandlerSettings();
+        var result = validator.Validate("settings", options);
+        Assert.True(result.Succeeded);
+    }
+
+    [Test]
+    public void Returns_Fail_For_Configuration_With_Invalid_ConvertUrlsToAscii_Field()
+    {
+        var validator = new RequestHandlerSettingsValidator();
+        var options = new RequestHandlerSettings { ConvertUrlsToAscii = "invalid" };
+        var result = validator.Validate("settings", options);
+        Assert.False(result.Succeeded);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs
index 6162d3b1b5..745f51989a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Configuration/NCronTabParserTests.cs
@@ -4,32 +4,28 @@
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration
-{
-    [TestFixture]
-    public class NCronTabParserTests
-    {
-        private ICronTabParser Sut => new NCronTabParser();
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Configuration;
 
-        [TestCase("", ExpectedResult = false)]
-        [TestCase("* * * * 1", ExpectedResult = true)]
-        [TestCase("* * * * * 1", ExpectedResult = false)]
-        [TestCase("* * * 1", ExpectedResult = false)]
-        [TestCase("Invalid", ExpectedResult = false)]
-        [TestCase("I n v a l", ExpectedResult = false)]
-        [TestCase("23 0-20/2 * * *", ExpectedResult = true)]
-        [TestCase("5 4 * * sun", ExpectedResult = true)]
-        [TestCase("0 0,12 1 */2 *", ExpectedResult = true)]
-        [TestCase("0 0 1,15 * 3", ExpectedResult = true)]
-        [TestCase("5 0 * 8 *", ExpectedResult = true)]
-        [TestCase("22 * * 1-5 *", ExpectedResult = true)]
-        [TestCase("23 0-20/2 * * *", ExpectedResult = true)]
-        [TestCase("23 0-20/2 * * sun-sat", ExpectedResult = true)]
-        [TestCase("23 0-20/2 * jan-dec sun-sat", ExpectedResult = true)]
-        [TestCase("* * 32 * *", ExpectedResult = false)]
-        public bool IsValidCronTab(string input)
-        {
-            return Sut.IsValidCronTab(input);
-        }
-    }
+[TestFixture]
+public class NCronTabParserTests
+{
+    private ICronTabParser Sut => new NCronTabParser();
+
+    [TestCase("", ExpectedResult = false)]
+    [TestCase("* * * * 1", ExpectedResult = true)]
+    [TestCase("* * * * * 1", ExpectedResult = false)]
+    [TestCase("* * * 1", ExpectedResult = false)]
+    [TestCase("Invalid", ExpectedResult = false)]
+    [TestCase("I n v a l", ExpectedResult = false)]
+    [TestCase("23 0-20/2 * * *", ExpectedResult = true)]
+    [TestCase("5 4 * * sun", ExpectedResult = true)]
+    [TestCase("0 0,12 1 */2 *", ExpectedResult = true)]
+    [TestCase("0 0 1,15 * 3", ExpectedResult = true)]
+    [TestCase("5 0 * 8 *", ExpectedResult = true)]
+    [TestCase("22 * * 1-5 *", ExpectedResult = true)]
+    [TestCase("23 0-20/2 * * *", ExpectedResult = true)]
+    [TestCase("23 0-20/2 * * sun-sat", ExpectedResult = true)]
+    [TestCase("23 0-20/2 * jan-dec sun-sat", ExpectedResult = true)]
+    [TestCase("* * 32 * *", ExpectedResult = false)]
+    public bool IsValidCronTab(string input) => Sut.IsValidCronTab(input);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
index 00362a0abe..dc87f7094c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/ObjectExtensionsTests.cs
@@ -7,293 +7,292 @@ using System.Globalization;
 using System.Linq;
 using System.Threading;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings;
+
+[TestFixture]
+public class ObjectExtensionsTests
 {
-    [TestFixture]
-    public class ObjectExtensionsTests
+    [SetUp]
+    public void TestSetup()
     {
-        private CultureInfo _savedCulture;
+        _savedCulture = Thread.CurrentThread.CurrentCulture;
+        Thread.CurrentThread.CurrentCulture =
+            CultureInfo.GetCultureInfo("en-GB"); // make sure the dates parse correctly
+    }
 
-        [SetUp]
-        public void TestSetup()
+    [TearDown]
+    public void TestTearDown() => Thread.CurrentThread.CurrentCulture = _savedCulture;
+
+    private CultureInfo _savedCulture;
+
+    [Test]
+    public void Can_Convert_List_To_Enumerable()
+    {
+        var list = new List<string> { "hello", "world", "awesome" };
+        var result = list.TryConvertTo<IEnumerable<string>>();
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(3, result.Result.Count());
+    }
+
+    [Test]
+    public void ObjectExtensions_Object_To_Dictionary()
+    {
+        // Arrange
+        var obj = new { Key1 = "value1", Key2 = "value2", Key3 = "value3" };
+
+        // Act
+        var d = obj.ToDictionary<string>();
+
+        // Assert
+        Assert.IsTrue(d.Keys.Contains("Key1"));
+        Assert.IsTrue(d.Keys.Contains("Key2"));
+        Assert.IsTrue(d.Keys.Contains("Key3"));
+        Assert.AreEqual(d["Key1"], "value1");
+        Assert.AreEqual(d["Key2"], "value2");
+        Assert.AreEqual(d["Key3"], "value3");
+    }
+
+    [Test]
+    public void CanConvertIntToNullableInt()
+    {
+        var i = 1;
+        var result = i.TryConvertTo<int>();
+        Assert.That(result.Success, Is.True);
+    }
+
+    [Test]
+    public void CanConvertNullableIntToInt()
+    {
+        int? i = 1;
+        var result = i.TryConvertTo<int>();
+        Assert.That(result.Success, Is.True);
+    }
+
+    [Test]
+    public virtual void CanConvertStringToBool()
+    {
+        var testCases = new Dictionary<string, bool>
         {
-            _savedCulture = Thread.CurrentThread.CurrentCulture;
-            Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("en-GB"); // make sure the dates parse correctly
-        }
+            { "TRUE", true },
+            { "True", true },
+            { "true", true },
+            { "1", true },
+            { "FALSE", false },
+            { "False", false },
+            { "false", false },
+            { "0", false },
+            { string.Empty, false },
+        };
 
-        [TearDown]
-        public void TestTearDown() => Thread.CurrentThread.CurrentCulture = _savedCulture;
-
-        [Test]
-        public void Can_Convert_List_To_Enumerable()
+        foreach (var testCase in testCases)
         {
-            var list = new List<string> { "hello", "world", "awesome" };
-            Attempt<IEnumerable<string>> result = list.TryConvertTo<IEnumerable<string>>();
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(3, result.Result.Count());
-        }
+            var result = testCase.Key.TryConvertTo<bool>();
 
-        [Test]
-        public void ObjectExtensions_Object_To_Dictionary()
-        {
-            // Arrange
-            var obj = new { Key1 = "value1", Key2 = "value2", Key3 = "value3" };
-
-            // Act
-            IDictionary<string, string> d = obj.ToDictionary<string>();
-
-            // Assert
-            Assert.IsTrue(d.Keys.Contains("Key1"));
-            Assert.IsTrue(d.Keys.Contains("Key2"));
-            Assert.IsTrue(d.Keys.Contains("Key3"));
-            Assert.AreEqual(d["Key1"], "value1");
-            Assert.AreEqual(d["Key2"], "value2");
-            Assert.AreEqual(d["Key3"], "value3");
-        }
-
-        [Test]
-        public void CanConvertIntToNullableInt()
-        {
-            int i = 1;
-            Attempt<int> result = i.TryConvertTo<int>();
-            Assert.That(result.Success, Is.True);
-        }
-
-        [Test]
-        public void CanConvertNullableIntToInt()
-        {
-            int? i = 1;
-            Attempt<int> result = i.TryConvertTo<int>();
-            Assert.That(result.Success, Is.True);
-        }
-
-        [Test]
-        public virtual void CanConvertStringToBool()
-        {
-            var testCases = new Dictionary<string, bool>
-                {
-                    { "TRUE", true },
-                    { "True", true },
-                    { "true", true },
-                    { "1", true },
-                    { "FALSE", false },
-                    { "False", false },
-                    { "false", false },
-                    { "0", false },
-                    { string.Empty, false }
-                };
-
-            foreach (KeyValuePair<string, bool> testCase in testCases)
-            {
-                Attempt<bool> result = testCase.Key.TryConvertTo<bool>();
-
-                Assert.IsTrue(result.Success, testCase.Key);
-                Assert.AreEqual(testCase.Value, result.Result, testCase.Key);
-            }
-        }
-
-        [TestCase("2012-11-10", true)]
-        [TestCase("2012/11/10", true)]
-        [TestCase("10/11/2012", true)]// assuming your culture uses DD/MM/YYYY
-        [TestCase("11/10/2012", false)]// assuming your culture uses DD/MM/YYYY
-        [TestCase("Sat 10, Nov 2012", true)]
-        [TestCase("Saturday 10, Nov 2012", true)]
-        [TestCase("Sat 10, November 2012", true)]
-        [TestCase("Saturday 10, November 2012", true)]
-        [TestCase("2012-11-10 13:14:15", true)]
-        [TestCase("2012-11-10T13:14:15Z", true)]
-        public virtual void CanConvertStringToDateTime(string date, bool outcome)
-        {
-            var dateTime = new DateTime(2012, 11, 10, 13, 14, 15);
-
-            Attempt<DateTime> result = date.TryConvertTo<DateTime>();
-
-            Assert.IsTrue(result.Success, date);
-            Assert.AreEqual(DateTime.Equals(dateTime.Date, result.Result.Date), outcome, date);
-        }
-
-        [Test]
-        public virtual void CanConvertBlankStringToNullDateTime()
-        {
-            Attempt<DateTime?> result = string.Empty.TryConvertTo<DateTime?>();
-            Assert.IsTrue(result.Success);
-            Assert.IsNull(result.Result);
-        }
-
-        [Test]
-        public virtual void CanConvertBlankStringToNullBool()
-        {
-            Attempt<bool?> result = string.Empty.TryConvertTo<bool?>();
-            Assert.IsTrue(result.Success);
-            Assert.IsNull(result.Result);
-        }
-
-        [Test]
-        public virtual void CanConvertBlankStringToDateTime()
-        {
-            Attempt<DateTime> result = string.Empty.TryConvertTo<DateTime>();
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(DateTime.MinValue, result.Result);
-        }
-
-        [Test]
-        public virtual void CanConvertObjectToString_Using_ToString_Overload()
-        {
-            Attempt<string> result = new MyTestObject().TryConvertTo<string>();
-
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual("Hello world", result.Result);
-        }
-
-        [Test]
-        public virtual void CanConvertObjectToSameObject()
-        {
-            var obj = new MyTestObject();
-            Attempt<object> result = obj.TryConvertTo<object>();
-
-            Assert.AreEqual(obj, result.Result);
-        }
-
-        [Test]
-        public void ConvertToIntegerTest()
-        {
-            Attempt<int> conv = "100".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = "100.000".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = "100,000".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            // oops
-            conv = "100.001".TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = 100m.TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            conv = 100.000m.TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-
-            // oops
-            conv = 100.001m.TryConvertTo<int>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100, conv.Result);
-        }
-
-        [Test]
-        public void ConvertToDecimalTest()
-        {
-            Attempt<decimal> conv = "100".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100.000".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100,000".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100.001".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
-
-            conv = 100m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = 100.000m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = 100.001m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
-
-            conv = 100.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-        }
-
-        [Test]
-        public void ConvertToNullableDecimalTest()
-        {
-            Attempt<decimal?> conv = "100".TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100.000".TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100,000".TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = "100.001".TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
-
-            conv = 100m.TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = 100.000m.TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-
-            conv = 100.001m.TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
-
-            conv = 100.TryConvertTo<decimal?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-        }
-
-        [Test]
-        public void ConvertToDateTimeTest()
-        {
-            Attempt<DateTime> conv = "2016-06-07".TryConvertTo<DateTime>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
-        }
-
-        [Test]
-        public void ConvertToNullableDateTimeTest()
-        {
-            Attempt<DateTime?> conv = "2016-06-07".TryConvertTo<DateTime?>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
-        }
-
-        [Test]
-        public void Value_Editor_Can_Convert_Decimal_To_Decimal_Clr_Type()
-        {
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
-
-            Attempt<object> result = valueEditor.TryConvertValueToCrlType(12.34d);
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(12.34d, result.Result);
-        }
-
-        private class MyTestObject
-        {
-            public override string ToString() => "Hello world";
+            Assert.IsTrue(result.Success, testCase.Key);
+            Assert.AreEqual(testCase.Value, result.Result, testCase.Key);
         }
     }
+
+    [TestCase("2012-11-10", true)]
+    [TestCase("2012/11/10", true)]
+    [TestCase("10/11/2012", true)] // assuming your culture uses DD/MM/YYYY
+    [TestCase("11/10/2012", false)] // assuming your culture uses DD/MM/YYYY
+    [TestCase("Sat 10, Nov 2012", true)]
+    [TestCase("Saturday 10, Nov 2012", true)]
+    [TestCase("Sat 10, November 2012", true)]
+    [TestCase("Saturday 10, November 2012", true)]
+    [TestCase("2012-11-10 13:14:15", true)]
+    [TestCase("2012-11-10T13:14:15Z", true)]
+    public virtual void CanConvertStringToDateTime(string date, bool outcome)
+    {
+        var dateTime = new DateTime(2012, 11, 10, 13, 14, 15);
+
+        var result = date.TryConvertTo<DateTime>();
+
+        Assert.IsTrue(result.Success, date);
+        Assert.AreEqual(DateTime.Equals(dateTime.Date, result.Result.Date), outcome, date);
+    }
+
+    [Test]
+    public virtual void CanConvertBlankStringToNullDateTime()
+    {
+        var result = string.Empty.TryConvertTo<DateTime?>();
+        Assert.IsTrue(result.Success);
+        Assert.IsNull(result.Result);
+    }
+
+    [Test]
+    public virtual void CanConvertBlankStringToNullBool()
+    {
+        var result = string.Empty.TryConvertTo<bool?>();
+        Assert.IsTrue(result.Success);
+        Assert.IsNull(result.Result);
+    }
+
+    [Test]
+    public virtual void CanConvertBlankStringToDateTime()
+    {
+        var result = string.Empty.TryConvertTo<DateTime>();
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(DateTime.MinValue, result.Result);
+    }
+
+    [Test]
+    public virtual void CanConvertObjectToString_Using_ToString_Overload()
+    {
+        var result = new MyTestObject().TryConvertTo<string>();
+
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual("Hello world", result.Result);
+    }
+
+    [Test]
+    public virtual void CanConvertObjectToSameObject()
+    {
+        var obj = new MyTestObject();
+        var result = obj.TryConvertTo<object>();
+
+        Assert.AreEqual(obj, result.Result);
+    }
+
+    [Test]
+    public void ConvertToIntegerTest()
+    {
+        var conv = "100".TryConvertTo<int>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100, conv.Result);
+
+        conv = "100.000".TryConvertTo<int>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100, conv.Result);
+
+        conv = "100,000".TryConvertTo<int>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100, conv.Result);
+
+        // oops
+        conv = "100.001".TryConvertTo<int>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100, conv.Result);
+
+        conv = 100m.TryConvertTo<int>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100, conv.Result);
+
+        conv = 100.000m.TryConvertTo<int>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100, conv.Result);
+
+        // oops
+        conv = 100.001m.TryConvertTo<int>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100, conv.Result);
+    }
+
+    [Test]
+    public void ConvertToDecimalTest()
+    {
+        var conv = "100".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = "100.000".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = "100,000".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = "100.001".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100.001m, conv.Result);
+
+        conv = 100m.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = 100.000m.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = 100.001m.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100.001m, conv.Result);
+
+        conv = 100.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+    }
+
+    [Test]
+    public void ConvertToNullableDecimalTest()
+    {
+        var conv = "100".TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = "100.000".TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = "100,000".TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = "100.001".TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100.001m, conv.Result);
+
+        conv = 100m.TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = 100.000m.TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+
+        conv = 100.001m.TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100.001m, conv.Result);
+
+        conv = 100.TryConvertTo<decimal?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+    }
+
+    [Test]
+    public void ConvertToDateTimeTest()
+    {
+        var conv = "2016-06-07".TryConvertTo<DateTime>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
+    }
+
+    [Test]
+    public void ConvertToNullableDateTimeTest()
+    {
+        var conv = "2016-06-07".TryConvertTo<DateTime?>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
+    }
+
+    [Test]
+    public void Value_Editor_Can_Convert_Decimal_To_Decimal_Clr_Type()
+    {
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
+
+        var result = valueEditor.TryConvertValueToCrlType(12.34d);
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(12.34d, result.Result);
+    }
+
+    private class MyTestObject
+    {
+        public override string ToString() => "Hello world";
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs
index 4e7930f8b6..307c06d6aa 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/TryConvertToTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
@@ -6,130 +6,129 @@ using System.Globalization;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings;
+
+[TestFixture]
+public class TryConvertToTests
 {
-    [TestFixture]
-    public class TryConvertToTests
+    [Test]
+    public void ConvertToBoolTest()
     {
-        [Test]
-        public void ConvertToBoolTest()
+        var conv = 1.TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(true, conv.Result);
+
+        conv = "1".TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(true, conv.Result);
+
+        conv = 0.TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(false, conv.Result);
+
+        conv = "0".TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(false, conv.Result);
+
+        conv = "Yes".TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(true, conv.Result);
+
+        conv = "yes".TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(true, conv.Result);
+
+        conv = "No".TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(false, conv.Result);
+
+        conv = "no".TryConvertTo<bool>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(false, conv.Result);
+    }
+
+    [Test]
+    [TestCase("en-US", -1, ExpectedResult = -1)]
+    [TestCase("en-US", "-1", ExpectedResult = -1)]
+    [TestCase("en-US", "100", ExpectedResult = 100)]
+    [TestCase("en-US", "100.000", ExpectedResult = 100)]
+    [TestCase("en-US", "100,000", ExpectedResult = 100)]
+    [TestCase("en-US", "100.001", ExpectedResult = 100)]
+    [TestCase("en-US", 100, ExpectedResult = 100)]
+    [TestCase("en-US", 100.000, ExpectedResult = 100)]
+    [TestCase("en-US", 100.001, ExpectedResult = 100)]
+    [TestCase("sv-SE", -1, ExpectedResult = -1)]
+    [TestCase("sv-SE", "−1", ExpectedResult = -1)] // Note '−' vs '-'
+    [TestCase("sv-SE", "100", ExpectedResult = 100)]
+    [TestCase("sv-SE", "100.000", ExpectedResult = 100)]
+    [TestCase("sv-SE", "100,000", ExpectedResult = 100)]
+    [TestCase("sv-SE", "100.001", ExpectedResult = 100)]
+    [TestCase("sv-SE", 100, ExpectedResult = 100)]
+    [TestCase("sv-SE", 100.000, ExpectedResult = 100)]
+    [TestCase("sv-SE", 100.001, ExpectedResult = 100)]
+    [TestCase("da-DK", "-1", ExpectedResult = -1)]
+    [TestCase("da-DK", -1, ExpectedResult = -1)]
+    [TestCase("da-DK", "100", ExpectedResult = 100)]
+    [TestCase("da-DK", "100.000", ExpectedResult = 100)]
+    [TestCase("da-DK", "100,000", ExpectedResult = 100)]
+    [TestCase("da-DK", "100.001", ExpectedResult = 100)]
+    [TestCase("da-DK", 100, ExpectedResult = 100)]
+    [TestCase("da-DK", 100.000, ExpectedResult = 100)]
+    [TestCase("da-DK", 100.001, ExpectedResult = 100)]
+    public int ConvertToIntegerTest(string culture, object input)
+    {
+        if (culture is not null)
         {
-            var conv = 1.TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(true, conv.Result);
-
-            conv = "1".TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(true, conv.Result);
-
-            conv = 0.TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(false, conv.Result);
-
-            conv = "0".TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(false, conv.Result);
-
-            conv = "Yes".TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(true, conv.Result);
-
-            conv = "yes".TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(true, conv.Result);
-
-            conv = "No".TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(false, conv.Result);
-
-            conv = "no".TryConvertTo<bool>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(false, conv.Result);
+            CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo(culture);
         }
 
+        var conv = input.TryConvertTo<int>();
+        Assert.IsTrue(conv);
 
-        [Test]
-        [TestCase("en-US", -1, ExpectedResult = -1)]
-        [TestCase("en-US", "-1", ExpectedResult = -1)]
-        [TestCase("en-US", "100", ExpectedResult = 100)]
-        [TestCase("en-US", "100.000", ExpectedResult = 100)]
-        [TestCase("en-US", "100,000", ExpectedResult = 100)]
-        [TestCase("en-US", "100.001", ExpectedResult = 100)]
-        [TestCase("en-US", 100, ExpectedResult = 100)]
-        [TestCase("en-US", 100.000, ExpectedResult = 100)]
-        [TestCase("en-US", 100.001, ExpectedResult = 100)]
-        [TestCase("sv-SE", -1, ExpectedResult = -1)]
-        [TestCase("sv-SE", "−1", ExpectedResult = -1)] // Note '−' vs '-'
-        [TestCase("sv-SE", "100", ExpectedResult = 100)]
-        [TestCase("sv-SE", "100.000", ExpectedResult = 100)]
-        [TestCase("sv-SE", "100,000", ExpectedResult = 100)]
-        [TestCase("sv-SE", "100.001", ExpectedResult = 100)]
-        [TestCase("sv-SE", 100, ExpectedResult = 100)]
-        [TestCase("sv-SE", 100.000, ExpectedResult = 100)]
-        [TestCase("sv-SE", 100.001, ExpectedResult = 100)]
-        [TestCase("da-DK", "-1", ExpectedResult = -1)]
-        [TestCase("da-DK", -1, ExpectedResult = -1)]
-        [TestCase("da-DK", "100", ExpectedResult = 100)]
-        [TestCase("da-DK", "100.000", ExpectedResult = 100)]
-        [TestCase("da-DK", "100,000", ExpectedResult = 100)]
-        [TestCase("da-DK", "100.001", ExpectedResult = 100)]
-        [TestCase("da-DK", 100, ExpectedResult = 100)]
-        [TestCase("da-DK", 100.000, ExpectedResult = 100)]
-        [TestCase("da-DK", 100.001, ExpectedResult = 100)]
-        public int ConvertToIntegerTest(string culture, object input)
-        {
-            if (culture is not null)
-            {
-                CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo(culture);
-            }
-            var conv = input.TryConvertTo<int>();
-            Assert.IsTrue(conv);
+        return conv.Result;
+    }
 
-            return conv.Result;
-        }
+    [Test]
+    public void ConvertToDecimalTest()
+    {
+        var conv = "100".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
 
-        [Test]
-        public void ConvertToDecimalTest()
-        {
-            var conv = "100".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
+        conv = "100.000".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
 
-            conv = "100.000".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
+        conv = "100,000".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
 
-            conv = "100,000".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
+        conv = "100.001".TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100.001m, conv.Result);
 
-            conv = "100.001".TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
+        conv = 100m.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
 
-            conv = 100m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
+        conv = 100.000m.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
 
-            conv = 100.000m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
+        conv = 100.001m.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100.001m, conv.Result);
 
-            conv = 100.001m.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100.001m, conv.Result);
+        conv = 100.TryConvertTo<decimal>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(100m, conv.Result);
+    }
 
-            conv = 100.TryConvertTo<decimal>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(100m, conv.Result);
-        }
-
-        [Test]
-        public void ConvertToDateTimeTest()
-        {
-            var conv = "2016-06-07".TryConvertTo<DateTime>();
-            Assert.IsTrue(conv);
-            Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
-        }
+    [Test]
+    public void ConvertToDateTimeTest()
+    {
+        var conv = "2016-06-07".TryConvertTo<DateTime>();
+        Assert.IsTrue(conv);
+        Assert.AreEqual(new DateTime(2016, 6, 7), conv.Result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs
index df7799ab54..1596bf9888 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreThings/UdiTests.cs
@@ -10,313 +10,321 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
 using Umbraco.Cms.Infrastructure.Serialization;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreThings;
+
+[TestFixture]
+public class UdiTests
 {
-    [TestFixture]
-    public class UdiTests
+    [SetUp]
+    public void SetUp() => UdiParser.ResetUdiTypes();
+
+    [Test]
+    public void StringUdiCtorTest()
     {
-        [SetUp]
-        public void SetUp() => UdiParser.ResetUdiTypes();
+        var udi = new StringUdi(Constants.UdiEntityType.AnyString, "test-id");
+        Assert.AreEqual(Constants.UdiEntityType.AnyString, udi.EntityType);
+        Assert.AreEqual("test-id", udi.Id);
+        Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/test-id", udi.ToString());
+    }
 
-        [Test]
-        public void StringUdiCtorTest()
+    [Test]
+    public void StringUdiParseTest()
+    {
+        var udi = UdiParser.Parse("umb://" + Constants.UdiEntityType.AnyString + "/test-id");
+        Assert.AreEqual(Constants.UdiEntityType.AnyString, udi.EntityType);
+        Assert.IsInstanceOf<StringUdi>(udi);
+        var stringEntityId = udi as StringUdi;
+        Assert.IsNotNull(stringEntityId);
+        Assert.AreEqual("test-id", stringEntityId.Id);
+        Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/test-id", udi.ToString());
+
+        udi = UdiParser.Parse("umb://" + Constants.UdiEntityType.AnyString + "/DA845952BE474EE9BD6F6194272AC750");
+        Assert.IsInstanceOf<StringUdi>(udi);
+    }
+
+    [Test]
+    public void StringEncodingTest()
+    {
+        // absolute path is unescaped
+        var uri = new Uri("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test");
+        Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/this is a test", uri.ToString());
+        Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test", uri.AbsoluteUri);
+        Assert.AreEqual("/this%20is%20a%20test", uri.AbsolutePath);
+
+        Assert.AreEqual("/this is a test", Uri.UnescapeDataString(uri.AbsolutePath));
+        Assert.AreEqual("%2Fthis%20is%20a%20test", Uri.EscapeDataString("/this is a test"));
+        Assert.AreEqual("/this%20is%20a%20test", Uri.EscapeUriString("/this is a test"));
+
+        var udi = UdiParser.Parse("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test");
+        Assert.AreEqual(Constants.UdiEntityType.AnyString, udi.EntityType);
+        Assert.IsInstanceOf<StringUdi>(udi);
+        var stringEntityId = udi as StringUdi;
+        Assert.IsNotNull(stringEntityId);
+        Assert.AreEqual("this is a test", stringEntityId.Id);
+        Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test", udi.ToString());
+
+        var udi2 = new StringUdi(Constants.UdiEntityType.AnyString, "this is a test");
+        Assert.AreEqual(udi, udi2);
+
+        var udi3 = new StringUdi(Constants.UdiEntityType.AnyString, "path to/this is a test.xyz");
+        Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/path%20to/this%20is%20a%20test.xyz", udi3.ToString());
+    }
+
+    [Test]
+    public void StringEncodingTest2()
+    {
+        // reserved = : / ? # [ ] @ ! $ & ' ( ) * + , ; =
+        // unreserved = alpha digit - . _ ~
+        Assert.AreEqual("%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2B%2C%3B%3D.-_~%25", Uri.EscapeDataString(":/?#[]@!$&'()+,;=.-_~%"));
+        Assert.AreEqual(":/?#[]@!$&'()+,;=.-_~%25", Uri.EscapeUriString(":/?#[]@!$&'()+,;=.-_~%"));
+
+        // we cannot have reserved chars at random places
+        // we want to keep the / in string udis
+        var r = string.Join("/", "path/to/View[1].cshtml".Split('/').Select(Uri.EscapeDataString));
+        Assert.AreEqual("path/to/View%5B1%5D.cshtml", r);
+        Assert.IsTrue(Uri.IsWellFormedUriString("umb://partial-view-macro/" + r, UriKind.Absolute));
+
+        // with the proper fix in StringUdi this should work:
+        var udi1 = new StringUdi("partial-view-macro", "path/to/View[1].cshtml");
+        Assert.AreEqual("umb://partial-view-macro/path/to/View%5B1%5D.cshtml", udi1.ToString());
+        var udi2 = UdiParser.Parse("umb://partial-view-macro/path/to/View%5B1%5D.cshtml");
+        Assert.AreEqual("path/to/View[1].cshtml", ((StringUdi)udi2).Id);
+    }
+
+    [Test]
+    public void GuidUdiCtorTest()
+    {
+        var guid = Guid.NewGuid();
+        var udi = new GuidUdi(Constants.UdiEntityType.AnyGuid, guid);
+        Assert.AreEqual(Constants.UdiEntityType.AnyGuid, udi.EntityType);
+        Assert.AreEqual(guid, udi.Guid);
+        Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyGuid + "/" + guid.ToString("N"), udi.ToString());
+    }
+
+    [Test]
+    public void GuidUdiParseTest()
+    {
+        var guid = Guid.NewGuid();
+        var s = "umb://" + Constants.UdiEntityType.AnyGuid + "/" + guid.ToString("N");
+        var udi = UdiParser.Parse(s);
+        Assert.AreEqual(Constants.UdiEntityType.AnyGuid, udi.EntityType);
+        Assert.IsInstanceOf<GuidUdi>(udi);
+        var gudi = udi as GuidUdi;
+        Assert.IsNotNull(gudi);
+        Assert.AreEqual(guid, gudi.Guid);
+        Assert.AreEqual(s, udi.ToString());
+    }
+
+    [Test]
+    public void EqualityTest()
+    {
+        var guid1 = Guid.NewGuid();
+        var guid2 = Guid.NewGuid();
+
+        Assert.IsTrue(new GuidUdi("type", guid1).Equals(new GuidUdi("type", guid1)));
+        Assert.IsTrue(new GuidUdi("type", guid1) == new GuidUdi("type", guid1));
+
+        Assert.IsTrue(new GuidUdi("type", guid1).Equals(new GuidUdi("type", guid1)));
+        Assert.IsTrue(new GuidUdi("type", guid1) == new GuidUdi("type", guid1));
+
+        Assert.IsFalse(new GuidUdi("type", guid1).Equals(new GuidUdi("typex", guid1)));
+        Assert.IsFalse(new GuidUdi("type", guid1) == new GuidUdi("typex", guid1));
+        Assert.IsFalse(new GuidUdi("type", guid1).Equals(new GuidUdi("type", guid2)));
+        Assert.IsFalse(new GuidUdi("type", guid1) == new GuidUdi("type", guid2));
+
+        Assert.IsTrue(new GuidUdi("type", guid1).ToString() == new StringUdi("type", guid1.ToString("N")).ToString());
+        Assert.IsFalse(new GuidUdi("type", guid1) == new StringUdi("type", guid1.ToString("N")));
+    }
+
+    [Test]
+    public void DistinctTest()
+    {
+        var guid1 = Guid.NewGuid();
+        GuidUdi[] entities =
         {
-            var udi = new StringUdi(Constants.UdiEntityType.AnyString, "test-id");
-            Assert.AreEqual(Constants.UdiEntityType.AnyString, udi.EntityType);
-            Assert.AreEqual("test-id", udi.Id);
-            Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/test-id", udi.ToString());
-        }
+            new GuidUdi(Constants.UdiEntityType.AnyGuid, guid1),
+            new GuidUdi(Constants.UdiEntityType.AnyGuid, guid1),
+            new GuidUdi(Constants.UdiEntityType.AnyGuid, guid1),
+        };
+        Assert.AreEqual(1, entities.Distinct().Count());
+    }
 
-        [Test]
-        public void StringUdiParseTest()
+    [Test]
+    public void CreateTest()
+    {
+        var guid = Guid.NewGuid();
+        var udi = Udi.Create(Constants.UdiEntityType.AnyGuid, guid);
+        Assert.AreEqual(Constants.UdiEntityType.AnyGuid, udi.EntityType);
+        Assert.AreEqual(guid, ((GuidUdi)udi).Guid);
+
+        // *not* testing whether Udi.Create(type, invalidValue) throws
+        // because we don't throw anymore - see U4-10409
+    }
+
+    [Test]
+    public void RootUdiTest()
+    {
+        var stringUdi = new StringUdi(Constants.UdiEntityType.AnyString, string.Empty);
+        Assert.IsTrue(stringUdi.IsRoot);
+        Assert.AreEqual("umb://any-string/", stringUdi.ToString());
+
+        var guidUdi = new GuidUdi(Constants.UdiEntityType.AnyGuid, Guid.Empty);
+        Assert.IsTrue(guidUdi.IsRoot);
+        Assert.AreEqual("umb://any-guid/00000000000000000000000000000000", guidUdi.ToString());
+
+        var udi = UdiParser.Parse("umb://any-string/");
+        Assert.IsTrue(udi.IsRoot);
+        Assert.IsInstanceOf<StringUdi>(udi);
+
+        udi = UdiParser.Parse("umb://any-guid/00000000000000000000000000000000");
+        Assert.IsTrue(udi.IsRoot);
+        Assert.IsInstanceOf<GuidUdi>(udi);
+
+        udi = UdiParser.Parse("umb://any-guid/");
+        Assert.IsTrue(udi.IsRoot);
+        Assert.IsInstanceOf<GuidUdi>(udi);
+    }
+
+    [Test]
+    public void RangeTest()
+    {
+        // can parse open string udi
+        var stringUdiString = "umb://" + Constants.UdiEntityType.AnyString;
+        Assert.IsTrue(UdiParser.TryParse(stringUdiString, out var stringUdi));
+        Assert.AreEqual(string.Empty, ((StringUdi)stringUdi).Id);
+
+        // can parse open guid udi
+        var guidUdiString = "umb://" + Constants.UdiEntityType.AnyGuid;
+        Assert.IsTrue(UdiParser.TryParse(guidUdiString, out var guidUdi));
+        Assert.AreEqual(Guid.Empty, ((GuidUdi)guidUdi).Guid);
+
+        // can create a range
+        var range = new UdiRange(stringUdi, Constants.DeploySelector.ChildrenOfThis);
+
+        // cannot create invalid ranges
+        Assert.Throws<ArgumentException>(() => new UdiRange(guidUdi, "x"));
+    }
+
+    [Test]
+    public void SerializationTest()
+    {
+        var settings = new JsonSerializerSettings
         {
-            Udi udi = UdiParser.Parse("umb://" + Constants.UdiEntityType.AnyString + "/test-id");
-            Assert.AreEqual(Constants.UdiEntityType.AnyString, udi.EntityType);
-            Assert.IsInstanceOf<StringUdi>(udi);
-            var stringEntityId = udi as StringUdi;
-            Assert.IsNotNull(stringEntityId);
-            Assert.AreEqual("test-id", stringEntityId.Id);
-            Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/test-id", udi.ToString());
+            Converters = new JsonConverter[] { new UdiJsonConverter(), new UdiRangeJsonConverter() },
+        };
 
-            udi = UdiParser.Parse("umb://" + Constants.UdiEntityType.AnyString + "/DA845952BE474EE9BD6F6194272AC750");
-            Assert.IsInstanceOf<StringUdi>(udi);
-        }
+        var guid = Guid.NewGuid();
+        var udi = new GuidUdi(Constants.UdiEntityType.AnyGuid, guid);
+        var json = JsonConvert.SerializeObject(udi, settings);
+        Assert.AreEqual(string.Format("\"umb://any-guid/{0:N}\"", guid), json);
 
-        [Test]
-        public void StringEncodingTest()
+        var dudi = JsonConvert.DeserializeObject<Udi>(json, settings);
+        Assert.AreEqual(Constants.UdiEntityType.AnyGuid, dudi.EntityType);
+        Assert.AreEqual(guid, ((GuidUdi)dudi).Guid);
+
+        var range = new UdiRange(udi, Constants.DeploySelector.ChildrenOfThis);
+        json = JsonConvert.SerializeObject(range, settings);
+        Assert.AreEqual(string.Format("\"umb://any-guid/{0:N}?children\"", guid), json);
+
+        var drange = JsonConvert.DeserializeObject<UdiRange>(json, settings);
+        Assert.AreEqual(udi, drange.Udi);
+        Assert.AreEqual(string.Format("umb://any-guid/{0:N}", guid), drange.Udi.UriValue.ToString());
+        Assert.AreEqual(Constants.DeploySelector.ChildrenOfThis, drange.Selector);
+    }
+
+    [Test]
+    public void ValidateUdiEntityType()
+    {
+        var types = UdiParser.GetKnownUdiTypes();
+
+        foreach (var fi in typeof(Constants.UdiEntityType).GetFields(BindingFlags.Public | BindingFlags.Static))
         {
-            // absolute path is unescaped
-            var uri = new Uri("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test");
-            Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/this is a test", uri.ToString());
-            Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test", uri.AbsoluteUri);
-            Assert.AreEqual("/this%20is%20a%20test", uri.AbsolutePath);
-
-            Assert.AreEqual("/this is a test", Uri.UnescapeDataString(uri.AbsolutePath));
-            Assert.AreEqual("%2Fthis%20is%20a%20test", Uri.EscapeDataString("/this is a test"));
-            Assert.AreEqual("/this%20is%20a%20test", Uri.EscapeUriString("/this is a test"));
-
-            Udi udi = UdiParser.Parse("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test");
-            Assert.AreEqual(Constants.UdiEntityType.AnyString, udi.EntityType);
-            Assert.IsInstanceOf<StringUdi>(udi);
-            var stringEntityId = udi as StringUdi;
-            Assert.IsNotNull(stringEntityId);
-            Assert.AreEqual("this is a test", stringEntityId.Id);
-            Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/this%20is%20a%20test", udi.ToString());
-
-            var udi2 = new StringUdi(Constants.UdiEntityType.AnyString, "this is a test");
-            Assert.AreEqual(udi, udi2);
-
-            var udi3 = new StringUdi(Constants.UdiEntityType.AnyString, "path to/this is a test.xyz");
-            Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyString + "/path%20to/this%20is%20a%20test.xyz", udi3.ToString());
-        }
-
-        [Test]
-        public void StringEncodingTest2()
-        {
-            // reserved = : / ? # [ ] @ ! $ & ' ( ) * + , ; =
-            // unreserved = alpha digit - . _ ~
-            Assert.AreEqual("%3A%2F%3F%23%5B%5D%40%21%24%26%27%28%29%2B%2C%3B%3D.-_~%25", Uri.EscapeDataString(":/?#[]@!$&'()+,;=.-_~%"));
-            Assert.AreEqual(":/?#[]@!$&'()+,;=.-_~%25", Uri.EscapeUriString(":/?#[]@!$&'()+,;=.-_~%"));
-
-            // we cannot have reserved chars at random places
-            // we want to keep the / in string udis
-            var r = string.Join("/", "path/to/View[1].cshtml".Split('/').Select(Uri.EscapeDataString));
-            Assert.AreEqual("path/to/View%5B1%5D.cshtml", r);
-            Assert.IsTrue(Uri.IsWellFormedUriString("umb://partial-view-macro/" + r, UriKind.Absolute));
-
-            // with the proper fix in StringUdi this should work:
-            var udi1 = new StringUdi("partial-view-macro", "path/to/View[1].cshtml");
-            Assert.AreEqual("umb://partial-view-macro/path/to/View%5B1%5D.cshtml", udi1.ToString());
-            Udi udi2 = UdiParser.Parse("umb://partial-view-macro/path/to/View%5B1%5D.cshtml");
-            Assert.AreEqual("path/to/View[1].cshtml", ((StringUdi)udi2).Id);
-        }
-
-        [Test]
-        public void GuidUdiCtorTest()
-        {
-            var guid = Guid.NewGuid();
-            var udi = new GuidUdi(Constants.UdiEntityType.AnyGuid, guid);
-            Assert.AreEqual(Constants.UdiEntityType.AnyGuid, udi.EntityType);
-            Assert.AreEqual(guid, udi.Guid);
-            Assert.AreEqual("umb://" + Constants.UdiEntityType.AnyGuid + "/" + guid.ToString("N"), udi.ToString());
-        }
-
-        [Test]
-        public void GuidUdiParseTest()
-        {
-            var guid = Guid.NewGuid();
-            var s = "umb://" + Constants.UdiEntityType.AnyGuid + "/" + guid.ToString("N");
-            Udi udi = UdiParser.Parse(s);
-            Assert.AreEqual(Constants.UdiEntityType.AnyGuid, udi.EntityType);
-            Assert.IsInstanceOf<GuidUdi>(udi);
-            var gudi = udi as GuidUdi;
-            Assert.IsNotNull(gudi);
-            Assert.AreEqual(guid, gudi.Guid);
-            Assert.AreEqual(s, udi.ToString());
-        }
-
-        [Test]
-        public void EqualityTest()
-        {
-            var guid1 = Guid.NewGuid();
-            var guid2 = Guid.NewGuid();
-
-            Assert.IsTrue(new GuidUdi("type", guid1).Equals(new GuidUdi("type", guid1)));
-            Assert.IsTrue(new GuidUdi("type", guid1) == new GuidUdi("type", guid1));
-
-            Assert.IsTrue(new GuidUdi("type", guid1).Equals(new GuidUdi("type", guid1)));
-            Assert.IsTrue(new GuidUdi("type", guid1) == new GuidUdi("type", guid1));
-
-            Assert.IsFalse(new GuidUdi("type", guid1).Equals(new GuidUdi("typex", guid1)));
-            Assert.IsFalse(new GuidUdi("type", guid1) == new GuidUdi("typex", guid1));
-            Assert.IsFalse(new GuidUdi("type", guid1).Equals(new GuidUdi("type", guid2)));
-            Assert.IsFalse(new GuidUdi("type", guid1) == new GuidUdi("type", guid2));
-
-            Assert.IsTrue(new GuidUdi("type", guid1).ToString() == new StringUdi("type", guid1.ToString("N")).ToString());
-            Assert.IsFalse(new GuidUdi("type", guid1) == new StringUdi("type", guid1.ToString("N")));
-        }
-
-        [Test]
-        public void DistinctTest()
-        {
-            var guid1 = Guid.NewGuid();
-            GuidUdi[] entities = new[]
+            // IsLiteral determines if its value is written at
+            //   compile time and not changeable
+            // IsInitOnly determine if the field can be set
+            //   in the body of the constructor
+            // for C# a field which is readonly keyword would have both true
+            //   but a const field would have only IsLiteral equal to true
+            if (fi.IsLiteral && fi.IsInitOnly == false)
             {
-                new GuidUdi(Constants.UdiEntityType.AnyGuid, guid1),
-                new GuidUdi(Constants.UdiEntityType.AnyGuid, guid1),
-                new GuidUdi(Constants.UdiEntityType.AnyGuid, guid1),
-            };
-            Assert.AreEqual(1, entities.Distinct().Count());
-        }
+                var value = fi.GetValue(null).ToString();
 
-        [Test]
-        public void CreateTest()
-        {
-            var guid = Guid.NewGuid();
-            var udi = Udi.Create(Constants.UdiEntityType.AnyGuid, guid);
-            Assert.AreEqual(Constants.UdiEntityType.AnyGuid, udi.EntityType);
-            Assert.AreEqual(guid, ((GuidUdi)udi).Guid);
-
-            // *not* testing whether Udi.Create(type, invalidValue) throws
-            // because we don't throw anymore - see U4-10409
-        }
-
-        [Test]
-        public void RootUdiTest()
-        {
-            var stringUdi = new StringUdi(Constants.UdiEntityType.AnyString, string.Empty);
-            Assert.IsTrue(stringUdi.IsRoot);
-            Assert.AreEqual("umb://any-string/", stringUdi.ToString());
-
-            var guidUdi = new GuidUdi(Constants.UdiEntityType.AnyGuid, Guid.Empty);
-            Assert.IsTrue(guidUdi.IsRoot);
-            Assert.AreEqual("umb://any-guid/00000000000000000000000000000000", guidUdi.ToString());
-
-            Udi udi = UdiParser.Parse("umb://any-string/");
-            Assert.IsTrue(udi.IsRoot);
-            Assert.IsInstanceOf<StringUdi>(udi);
-
-            udi = UdiParser.Parse("umb://any-guid/00000000000000000000000000000000");
-            Assert.IsTrue(udi.IsRoot);
-            Assert.IsInstanceOf<GuidUdi>(udi);
-
-            udi = UdiParser.Parse("umb://any-guid/");
-            Assert.IsTrue(udi.IsRoot);
-            Assert.IsInstanceOf<GuidUdi>(udi);
-        }
-
-        [Test]
-        public void RangeTest()
-        {
-            // can parse open string udi
-            var stringUdiString = "umb://" + Constants.UdiEntityType.AnyString;
-            Assert.IsTrue(UdiParser.TryParse(stringUdiString, out Udi stringUdi));
-            Assert.AreEqual(string.Empty, ((StringUdi)stringUdi).Id);
-
-            // can parse open guid udi
-            var guidUdiString = "umb://" + Constants.UdiEntityType.AnyGuid;
-            Assert.IsTrue(UdiParser.TryParse(guidUdiString, out Udi guidUdi));
-            Assert.AreEqual(Guid.Empty, ((GuidUdi)guidUdi).Guid);
-
-            // can create a range
-            var range = new UdiRange(stringUdi, Constants.DeploySelector.ChildrenOfThis);
-
-            // cannot create invalid ranges
-            Assert.Throws<ArgumentException>(() => new UdiRange(guidUdi, "x"));
-        }
-
-        [Test]
-        public void SerializationTest()
-        {
-            var settings = new JsonSerializerSettings
-            {
-                Converters = new JsonConverter[] { new UdiJsonConverter(), new UdiRangeJsonConverter() }
-            };
-
-            var guid = Guid.NewGuid();
-            var udi = new GuidUdi(Constants.UdiEntityType.AnyGuid, guid);
-            var json = JsonConvert.SerializeObject(udi, settings);
-            Assert.AreEqual(string.Format("\"umb://any-guid/{0:N}\"", guid), json);
-
-            Udi dudi = JsonConvert.DeserializeObject<Udi>(json, settings);
-            Assert.AreEqual(Constants.UdiEntityType.AnyGuid, dudi.EntityType);
-            Assert.AreEqual(guid, ((GuidUdi)dudi).Guid);
-
-            var range = new UdiRange(udi, Constants.DeploySelector.ChildrenOfThis);
-            json = JsonConvert.SerializeObject(range, settings);
-            Assert.AreEqual(string.Format("\"umb://any-guid/{0:N}?children\"", guid), json);
-
-            UdiRange drange = JsonConvert.DeserializeObject<UdiRange>(json, settings);
-            Assert.AreEqual(udi, drange.Udi);
-            Assert.AreEqual(string.Format("umb://any-guid/{0:N}", guid), drange.Udi.UriValue.ToString());
-            Assert.AreEqual(Constants.DeploySelector.ChildrenOfThis, drange.Selector);
-        }
-
-        [Test]
-        public void ValidateUdiEntityType()
-        {
-            Dictionary<string, UdiType> types = UdiParser.GetKnownUdiTypes();
-
-            foreach (FieldInfo fi in typeof(Constants.UdiEntityType).GetFields(BindingFlags.Public | BindingFlags.Static))
-            {
-                // IsLiteral determines if its value is written at
-                //   compile time and not changeable
-                // IsInitOnly determine if the field can be set
-                //   in the body of the constructor
-                // for C# a field which is readonly keyword would have both true
-                //   but a const field would have only IsLiteral equal to true
-                if (fi.IsLiteral && fi.IsInitOnly == false)
+                if (types.ContainsKey(value) == false)
                 {
-                    var value = fi.GetValue(null).ToString();
-
-                    if (types.ContainsKey(value) == false)
-                    {
-                        Assert.Fail("Error in class Constants.UdiEntityType, type \"{0}\" is not declared by GetTypes.", value);
-                    }
-
-                    types.Remove(value);
+                    Assert.Fail("Error in class Constants.UdiEntityType, type \"{0}\" is not declared by GetTypes.", value);
                 }
+
+                types.Remove(value);
             }
-
-            Assert.AreEqual(0, types.Count, "Error in class Constants.UdiEntityType, GetTypes declares types that don't exist ({0}).", string.Join(",", types.Keys.Select(x => "\"" + x + "\"")));
         }
 
-        [Test]
-        public void KnownTypes()
-        {
-            // cannot parse an unknown type, udi is null
-            // this will scan
-            Assert.IsFalse(UdiParser.TryParse("umb://whatever/1234", out Udi udi));
-            Assert.IsNull(udi);
+        Assert.AreEqual(
+            0,
+            types.Count,
+            "Error in class Constants.UdiEntityType, GetTypes declares types that don't exist ({0}).",
+            string.Join(",", types.Keys.Select(x => "\"" + x + "\"")));
+    }
 
-            UdiParser.ResetUdiTypes();
+    [Test]
+    public void KnownTypes()
+    {
+        // cannot parse an unknown type, udi is null
+        // this will scan
+        Assert.IsFalse(UdiParser.TryParse("umb://whatever/1234", out var udi));
+        Assert.IsNull(udi);
 
-            // unless we want to know
-            Assert.IsFalse(UdiParser.TryParse("umb://whatever/1234", true, out udi));
-            Assert.AreEqual(Constants.UdiEntityType.Unknown, udi.EntityType);
-            Assert.AreEqual("Umbraco.Cms.Core.UnknownTypeUdi", udi.GetType().FullName);
+        UdiParser.ResetUdiTypes();
 
-            UdiParser.ResetUdiTypes();
+        // unless we want to know
+        Assert.IsFalse(UdiParser.TryParse("umb://whatever/1234", true, out udi));
+        Assert.AreEqual(Constants.UdiEntityType.Unknown, udi.EntityType);
+        Assert.AreEqual("Umbraco.Cms.Core.UnknownTypeUdi", udi.GetType().FullName);
 
-            // not known
-            Assert.IsFalse(UdiParser.TryParse("umb://foo/A87F65C8D6B94E868F6949BA92C93045", true, out udi));
-            Assert.AreEqual(Constants.UdiEntityType.Unknown, udi.EntityType);
-            Assert.AreEqual("Umbraco.Cms.Core.UnknownTypeUdi", udi.GetType().FullName);
+        UdiParser.ResetUdiTypes();
 
-            // scanned
-            UdiParserServiceConnectors.RegisterServiceConnector<FooConnector>(); // this is the equivalent of scanning but we'll just manually register this one
-            Assert.IsTrue(UdiParser.TryParse("umb://foo/A87F65C8D6B94E868F6949BA92C93045", out udi));
-            Assert.IsInstanceOf<GuidUdi>(udi);
+        // not known
+        Assert.IsFalse(UdiParser.TryParse("umb://foo/A87F65C8D6B94E868F6949BA92C93045", true, out udi));
+        Assert.AreEqual(Constants.UdiEntityType.Unknown, udi.EntityType);
+        Assert.AreEqual("Umbraco.Cms.Core.UnknownTypeUdi", udi.GetType().FullName);
 
-            // known
-            Assert.IsTrue(UdiParser.TryParse("umb://foo/A87F65C8D6B94E868F6949BA92C93045", true, out udi));
-            Assert.IsInstanceOf<GuidUdi>(udi);
+        // scanned
+        UdiParserServiceConnectors
+            .RegisterServiceConnector<
+                FooConnector>(); // this is the equivalent of scanning but we'll just manually register this one
+        Assert.IsTrue(UdiParser.TryParse("umb://foo/A87F65C8D6B94E868F6949BA92C93045", out udi));
+        Assert.IsInstanceOf<GuidUdi>(udi);
 
-            // can get method for Deploy compatibility
-            MethodInfo method = typeof(UdiParser).GetMethod("Parse", BindingFlags.Static | BindingFlags.Public, null, new[] { typeof(string), typeof(bool) }, null);
-            Assert.IsNotNull(method);
-        }
+        // known
+        Assert.IsTrue(UdiParser.TryParse("umb://foo/A87F65C8D6B94E868F6949BA92C93045", true, out udi));
+        Assert.IsInstanceOf<GuidUdi>(udi);
 
-        [UdiDefinition("foo", UdiType.GuidUdi)]
-        public class FooConnector : IServiceConnector
-        {
-            public IArtifact GetArtifact(Udi udi) => throw new NotImplementedException();
+        // can get method for Deploy compatibility
+        var method = typeof(UdiParser).GetMethod("Parse", BindingFlags.Static | BindingFlags.Public, null, new[] { typeof(string), typeof(bool) }, null);
+        Assert.IsNotNull(method);
+    }
 
-            public IArtifact GetArtifact(object entity) => throw new NotImplementedException();
+    [UdiDefinition("foo", UdiType.GuidUdi)]
+    public class FooConnector : IServiceConnector
+    {
+        public IArtifact GetArtifact(Udi udi) => throw new NotImplementedException();
 
-            public ArtifactDeployState ProcessInit(IArtifact art, IDeployContext context) => throw new NotImplementedException();
+        public IArtifact GetArtifact(object entity) => throw new NotImplementedException();
 
-            public void Process(ArtifactDeployState dart, IDeployContext context, int pass) => throw new NotImplementedException();
+        public ArtifactDeployState ProcessInit(IArtifact art, IDeployContext context) =>
+            throw new NotImplementedException();
 
-            public void Explode(UdiRange range, List<Udi> udis) => throw new NotImplementedException();
+        public void Process(ArtifactDeployState dart, IDeployContext context, int pass) =>
+            throw new NotImplementedException();
 
-            public NamedUdiRange GetRange(Udi udi, string selector) => throw new NotImplementedException();
+        public void Explode(UdiRange range, List<Udi> udis) => throw new NotImplementedException();
 
-            public NamedUdiRange GetRange(string entityType, string sid, string selector) => throw new NotImplementedException();
+        public NamedUdiRange GetRange(Udi udi, string selector) => throw new NotImplementedException();
 
-            public bool Compare(IArtifact art1, IArtifact art2, ICollection<Difference> differences = null) => throw new NotImplementedException();
-        }
+        public NamedUdiRange GetRange(string entityType, string sid, string selector) =>
+            throw new NotImplementedException();
+
+        public bool Compare(IArtifact art1, IArtifact art2, ICollection<Difference> differences = null) =>
+            throw new NotImplementedException();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs
index 97814824d6..0e50193a98 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/FrameworkXmlTests.cs
@@ -2,15 +2,14 @@
 // See LICENSE for more details.
 
 using System.Xml;
-using System.Xml.XPath;
 using NUnit.Framework;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml;
+
+[TestFixture]
+public class FrameworkXmlTests
 {
-    [TestFixture]
-    public class FrameworkXmlTests
-    {
-        private const string Xml1 = @"<root>
+    private const string Xml1 = @"<root>
     <items>
         <item1 />
         <item2>
@@ -25,205 +24,204 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
     </items>
 </root>";
 
-        // Umbraco : the following test shows that when legacy imports the whole tree in a
-        // "contentAll" xslt macro parameter, the entire collection of nodes is cloned ie is
-        // duplicated.
-        //
-        // What is the impact on memory?
-        // What happens for non-xslt macros?
-        [Test]
-        public void ImportNodeClonesImportedNode()
+    // Umbraco : the following test shows that when legacy imports the whole tree in a
+    // "contentAll" xslt macro parameter, the entire collection of nodes is cloned ie is
+    // duplicated.
+    //
+    // What is the impact on memory?
+    // What happens for non-xslt macros?
+    [Test]
+    public void ImportNodeClonesImportedNode()
+    {
+        var doc1 = new XmlDocument();
+        doc1.LoadXml(Xml1);
+
+        var node1 = doc1.SelectSingleNode("//item2");
+        Assert.IsNotNull(node1);
+
+        var doc2 = new XmlDocument();
+        doc2.LoadXml("<nodes />");
+        var node2 = doc2.ImportNode(node1, true);
+        var root2 = doc2.DocumentElement;
+        Assert.IsNotNull(root2);
+        root2.AppendChild(node2);
+
+        var node3 = doc2.SelectSingleNode("//item2");
+
+        Assert.AreNotSame(node1, node2); // has been cloned
+        Assert.AreSame(node2, node3); // has been appended
+
+        Assert.AreNotSame(node1.FirstChild, node2.FirstChild); // deep clone
+    }
+
+    // Umbraco: the CanRemove...NodeAndNavigate tests shows that if the underlying XmlDocument
+    // is modified while navigating, then strange situations can be created. For xslt macros,
+    // the result depends on what the xslt engine is doing at the moment = unpredictable.
+    //
+    // What happens for non-xslt macros?
+    [Test]
+    public void CanRemoveCurrentNodeAndNavigate()
+    {
+        var doc1 = new XmlDocument();
+        doc1.LoadXml(Xml1);
+        var nav1 = doc1.CreateNavigator();
+
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("root", nav1.Name);
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("items", nav1.Name);
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("item1", nav1.Name);
+        Assert.IsTrue(nav1.MoveToNext());
+        Assert.AreEqual("item2", nav1.Name);
+
+        var node1 = doc1.SelectSingleNode("//item2");
+        Assert.IsNotNull(node1);
+        var parent1 = node1.ParentNode;
+        Assert.IsNotNull(parent1);
+        parent1.RemoveChild(node1);
+
+        // navigator now navigates on an isolated fragment
+        // that is rooted on the node that was removed
+        Assert.AreEqual("item2", nav1.Name);
+        Assert.IsFalse(nav1.MoveToPrevious());
+        Assert.IsFalse(nav1.MoveToNext());
+        Assert.IsFalse(nav1.MoveToParent());
+
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("item21", nav1.Name);
+        Assert.IsTrue(nav1.MoveToParent());
+        Assert.AreEqual("item2", nav1.Name);
+
+        nav1.MoveToRoot();
+        Assert.AreEqual("item2", nav1.Name);
+    }
+
+    [Test]
+    public void CanRemovePathNodeAndNavigate()
+    {
+        var doc1 = new XmlDocument();
+        doc1.LoadXml(Xml1);
+        var nav1 = doc1.CreateNavigator();
+
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("root", nav1.Name);
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("items", nav1.Name);
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("item1", nav1.Name);
+        Assert.IsTrue(nav1.MoveToNext());
+        Assert.AreEqual("item2", nav1.Name);
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("item21", nav1.Name);
+
+        var node1 = doc1.SelectSingleNode("//item2");
+        Assert.IsNotNull(node1);
+        var parent1 = node1.ParentNode;
+        Assert.IsNotNull(parent1);
+        parent1.RemoveChild(node1);
+
+        // navigator now navigates on an isolated fragment
+        // that is rooted on the node that was removed
+        Assert.AreEqual("item21", nav1.Name);
+        Assert.IsTrue(nav1.MoveToParent());
+        Assert.AreEqual("item2", nav1.Name);
+        Assert.IsFalse(nav1.MoveToPrevious());
+        Assert.IsFalse(nav1.MoveToNext());
+        Assert.IsFalse(nav1.MoveToParent());
+
+        nav1.MoveToRoot();
+        Assert.AreEqual("item2", nav1.Name);
+    }
+
+    [Test]
+    public void CanRemoveOutOfPathNodeAndNavigate()
+    {
+        var doc1 = new XmlDocument();
+        doc1.LoadXml(Xml1);
+        var nav1 = doc1.CreateNavigator();
+
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("root", nav1.Name);
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("items", nav1.Name);
+        Assert.IsTrue(nav1.MoveToFirstChild());
+        Assert.AreEqual("item1", nav1.Name);
+        Assert.IsTrue(nav1.MoveToNext());
+        Assert.AreEqual("item2", nav1.Name);
+        Assert.IsTrue(nav1.MoveToNext());
+        Assert.AreEqual("item3", nav1.Name);
+        Assert.IsTrue(nav1.MoveToNext());
+        Assert.AreEqual("item4", nav1.Name);
+
+        var node1 = doc1.SelectSingleNode("//item2");
+        Assert.IsNotNull(node1);
+        var parent1 = node1.ParentNode;
+        Assert.IsNotNull(parent1);
+        parent1.RemoveChild(node1);
+
+        // navigator sees the change
+        Assert.AreEqual("item4", nav1.Name);
+        Assert.IsTrue(nav1.MoveToPrevious());
+        Assert.AreEqual("item3", nav1.Name);
+        Assert.IsTrue(nav1.MoveToPrevious());
+        Assert.AreEqual("item1", nav1.Name);
+    }
+
+    // Umbraco: the following test shows that if the underlying XmlDocument is modified while
+    // iterating, then strange situations can be created. For xslt macros, the result depends
+    // on what the xslt engine is doing at the moment = unpredictable.
+    //
+    // What happens for non-xslt macros?
+    [Test]
+    public void CanRemoveNodeAndIterate()
+    {
+        var doc1 = new XmlDocument();
+        doc1.LoadXml(Xml1);
+        var nav1 = doc1.CreateNavigator();
+
+        var iter1 = nav1.Select("//items/*");
+        var iter2 = nav1.Select("//items/*");
+
+        Assert.AreEqual(6, iter1.Count);
+
+        var node1 = doc1.SelectSingleNode("//item2");
+        Assert.IsNotNull(node1);
+        var parent1 = node1.ParentNode;
+        Assert.IsNotNull(parent1);
+        parent1.RemoveChild(node1);
+
+        // iterator partially sees the change
+        Assert.AreEqual(6, iter1.Count); // has been cached, not updated
+        Assert.AreEqual(5, iter2.Count); // not calculated yet, correct value
+
+        var count = 0;
+        while (iter1.MoveNext())
         {
-            var doc1 = new XmlDocument();
-            doc1.LoadXml(Xml1);
-
-            XmlNode node1 = doc1.SelectSingleNode("//item2");
-            Assert.IsNotNull(node1);
-
-            var doc2 = new XmlDocument();
-            doc2.LoadXml("<nodes />");
-            XmlNode node2 = doc2.ImportNode(node1, true);
-            XmlElement root2 = doc2.DocumentElement;
-            Assert.IsNotNull(root2);
-            root2.AppendChild(node2);
-
-            XmlNode node3 = doc2.SelectSingleNode("//item2");
-
-            Assert.AreNotSame(node1, node2); // has been cloned
-            Assert.AreSame(node2, node3); // has been appended
-
-            Assert.AreNotSame(node1.FirstChild, node2.FirstChild); // deep clone
+            count++;
         }
 
-        // Umbraco: the CanRemove...NodeAndNavigate tests shows that if the underlying XmlDocument
-        // is modified while navigating, then strange situations can be created. For xslt macros,
-        // the result depends on what the xslt engine is doing at the moment = unpredictable.
-        //
-        // What happens for non-xslt macros?
-        [Test]
-        public void CanRemoveCurrentNodeAndNavigate()
-        {
-            var doc1 = new XmlDocument();
-            doc1.LoadXml(Xml1);
-            XPathNavigator nav1 = doc1.CreateNavigator();
+        Assert.AreEqual(5, count);
+    }
 
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("root", nav1.Name);
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("items", nav1.Name);
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("item1", nav1.Name);
-            Assert.IsTrue(nav1.MoveToNext());
-            Assert.AreEqual("item2", nav1.Name);
+    [Test]
+    public void OldFrameworkXPathBugIsFixed()
+    {
+        // see http://bytes.com/topic/net/answers/177129-reusing-xpathexpression-multiple-iterations
+        var doc = new XmlDocument();
+        doc.LoadXml("<root><a><a1/><a2/></a><b/></root>");
 
-            XmlNode node1 = doc1.SelectSingleNode("//item2");
-            Assert.IsNotNull(node1);
-            XmlNode parent1 = node1.ParentNode;
-            Assert.IsNotNull(parent1);
-            parent1.RemoveChild(node1);
+        var nav = doc.CreateNavigator();
+        var expr = nav.Compile("*");
 
-            // navigator now navigates on an isolated fragment
-            // that is rooted on the node that was removed
-            Assert.AreEqual("item2", nav1.Name);
-            Assert.IsFalse(nav1.MoveToPrevious());
-            Assert.IsFalse(nav1.MoveToNext());
-            Assert.IsFalse(nav1.MoveToParent());
+        nav.MoveToFirstChild(); // root
+        var iter1 = nav.Select(expr);
+        iter1.MoveNext(); // root/a
+        var iter2 = iter1.Current.Select(expr);
+        iter2.MoveNext(); // /root/a/a1
+        iter2.MoveNext(); // /root/a/a2
 
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("item21", nav1.Name);
-            Assert.IsTrue(nav1.MoveToParent());
-            Assert.AreEqual("item2", nav1.Name);
-
-            nav1.MoveToRoot();
-            Assert.AreEqual("item2", nav1.Name);
-        }
-
-        [Test]
-        public void CanRemovePathNodeAndNavigate()
-        {
-            var doc1 = new XmlDocument();
-            doc1.LoadXml(Xml1);
-            XPathNavigator nav1 = doc1.CreateNavigator();
-
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("root", nav1.Name);
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("items", nav1.Name);
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("item1", nav1.Name);
-            Assert.IsTrue(nav1.MoveToNext());
-            Assert.AreEqual("item2", nav1.Name);
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("item21", nav1.Name);
-
-            XmlNode node1 = doc1.SelectSingleNode("//item2");
-            Assert.IsNotNull(node1);
-            XmlNode parent1 = node1.ParentNode;
-            Assert.IsNotNull(parent1);
-            parent1.RemoveChild(node1);
-
-            // navigator now navigates on an isolated fragment
-            // that is rooted on the node that was removed
-            Assert.AreEqual("item21", nav1.Name);
-            Assert.IsTrue(nav1.MoveToParent());
-            Assert.AreEqual("item2", nav1.Name);
-            Assert.IsFalse(nav1.MoveToPrevious());
-            Assert.IsFalse(nav1.MoveToNext());
-            Assert.IsFalse(nav1.MoveToParent());
-
-            nav1.MoveToRoot();
-            Assert.AreEqual("item2", nav1.Name);
-        }
-
-        [Test]
-        public void CanRemoveOutOfPathNodeAndNavigate()
-        {
-            var doc1 = new XmlDocument();
-            doc1.LoadXml(Xml1);
-            XPathNavigator nav1 = doc1.CreateNavigator();
-
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("root", nav1.Name);
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("items", nav1.Name);
-            Assert.IsTrue(nav1.MoveToFirstChild());
-            Assert.AreEqual("item1", nav1.Name);
-            Assert.IsTrue(nav1.MoveToNext());
-            Assert.AreEqual("item2", nav1.Name);
-            Assert.IsTrue(nav1.MoveToNext());
-            Assert.AreEqual("item3", nav1.Name);
-            Assert.IsTrue(nav1.MoveToNext());
-            Assert.AreEqual("item4", nav1.Name);
-
-            XmlNode node1 = doc1.SelectSingleNode("//item2");
-            Assert.IsNotNull(node1);
-            XmlNode parent1 = node1.ParentNode;
-            Assert.IsNotNull(parent1);
-            parent1.RemoveChild(node1);
-
-            // navigator sees the change
-            Assert.AreEqual("item4", nav1.Name);
-            Assert.IsTrue(nav1.MoveToPrevious());
-            Assert.AreEqual("item3", nav1.Name);
-            Assert.IsTrue(nav1.MoveToPrevious());
-            Assert.AreEqual("item1", nav1.Name);
-        }
-
-        // Umbraco: the following test shows that if the underlying XmlDocument is modified while
-        // iterating, then strange situations can be created. For xslt macros, the result depends
-        // on what the xslt engine is doing at the moment = unpredictable.
-        //
-        // What happens for non-xslt macros?
-        [Test]
-        public void CanRemoveNodeAndIterate()
-        {
-            var doc1 = new XmlDocument();
-            doc1.LoadXml(Xml1);
-            XPathNavigator nav1 = doc1.CreateNavigator();
-
-            XPathNodeIterator iter1 = nav1.Select("//items/*");
-            XPathNodeIterator iter2 = nav1.Select("//items/*");
-
-            Assert.AreEqual(6, iter1.Count);
-
-            XmlNode node1 = doc1.SelectSingleNode("//item2");
-            Assert.IsNotNull(node1);
-            XmlNode parent1 = node1.ParentNode;
-            Assert.IsNotNull(parent1);
-            parent1.RemoveChild(node1);
-
-            // iterator partially sees the change
-            Assert.AreEqual(6, iter1.Count); // has been cached, not updated
-            Assert.AreEqual(5, iter2.Count); // not calculated yet, correct value
-
-            int count = 0;
-            while (iter1.MoveNext())
-            {
-                count++;
-            }
-
-            Assert.AreEqual(5, count);
-        }
-
-        [Test]
-        public void OldFrameworkXPathBugIsFixed()
-        {
-            // see http://bytes.com/topic/net/answers/177129-reusing-xpathexpression-multiple-iterations
-            var doc = new XmlDocument();
-            doc.LoadXml("<root><a><a1/><a2/></a><b/></root>");
-
-            XPathNavigator nav = doc.CreateNavigator();
-            XPathExpression expr = nav.Compile("*");
-
-            nav.MoveToFirstChild(); // root
-            XPathNodeIterator iter1 = nav.Select(expr);
-            iter1.MoveNext(); // root/a
-            XPathNodeIterator iter2 = iter1.Current.Select(expr);
-            iter2.MoveNext(); // /root/a/a1
-            iter2.MoveNext(); // /root/a/a2
-
-            // used to fail because iter1 and iter2 would conflict
-            Assert.IsTrue(iter1.MoveNext()); // root/b
-        }
+        // used to fail because iter1 and iter2 would conflict
+        Assert.IsTrue(iter1.MoveNext()); // root/b
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs
index 90d999c01d..69d5c21ace 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/NavigableNavigatorTests.cs
@@ -16,32 +16,32 @@ using Umbraco.Cms.Core.Xml.XPath;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml;
+
+[TestFixture]
+public class NavigableNavigatorTests
 {
-    [TestFixture]
-    public class NavigableNavigatorTests
+    [Test]
+    public void NewNavigatorIsAtRoot()
     {
-        [Test]
-        public void NewNavigatorIsAtRoot()
-        {
-            const string xml = @"<root><item1 /><item2 /></root>";
-            XPathDocument doc = XmlHelper.CreateXPathDocument(xml);
-            XPathNavigator nav = doc.CreateNavigator();
+        const string xml = @"<root><item1 /><item2 /></root>";
+        var doc = XmlHelper.CreateXPathDocument(xml);
+        var nav = doc.CreateNavigator();
 
-            Assert.AreEqual(XPathNodeType.Root, nav.NodeType);
-            Assert.AreEqual(string.Empty, nav.Name);
+        Assert.AreEqual(XPathNodeType.Root, nav.NodeType);
+        Assert.AreEqual(string.Empty, nav.Name);
 
-            var source = new TestSource5();
-            nav = new NavigableNavigator(source);
+        var source = new TestSource5();
+        nav = new NavigableNavigator(source);
 
-            Assert.AreEqual(XPathNodeType.Root, nav.NodeType);
-            Assert.AreEqual(string.Empty, nav.Name);
-        }
+        Assert.AreEqual(XPathNodeType.Root, nav.NodeType);
+        Assert.AreEqual(string.Empty, nav.Name);
+    }
 
-        [Test]
-        public void NativeXmlValues()
-        {
-            const string xml = @"<root>
+    [Test]
+    public void NativeXmlValues()
+    {
+        const string xml = @"<root>
     <wrap>
         <item1 />
         <item2></item2>
@@ -61,213 +61,213 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
         ]]></item5>
     </wrap>
 </root>";
-            XPathDocument doc = XmlHelper.CreateXPathDocument(xml);
-            XPathNavigator nav = doc.CreateNavigator();
+        var doc = XmlHelper.CreateXPathDocument(xml);
+        var nav = doc.CreateNavigator();
 
-            NavigatorValues(nav, true);
-        }
+        NavigatorValues(nav, true);
+    }
 
-        [Test]
-        public void NavigableXmlValues()
-        {
-            var source = new TestSource6();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void NavigableXmlValues()
+    {
+        var source = new TestSource6();
+        var nav = new NavigableNavigator(source);
 
-            NavigatorValues(nav, false);
-        }
+        NavigatorValues(nav, false);
+    }
 
-        private static void NavigatorValues(XPathNavigator nav, bool native)
-        {
-            // in non-native we can't have Value dump everything, else
-            // we'd dump the entire database? Makes not much sense.
-            Assert.AreEqual(native ? "\n        blah\n            blah\n        bam\n        " : string.Empty, nav.Value.Lf()); // !!
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual("root", nav.Name);
-            Assert.AreEqual(native ? "\n        blah\n            blah\n        bam\n        " : string.Empty, nav.Value.Lf()); // !!
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual("wrap", nav.Name);
-            Assert.AreEqual(native ? "\n        blah\n            blah\n        bam\n        " : string.Empty, nav.Value.Lf()); // !!
+    private static void NavigatorValues(XPathNavigator nav, bool native)
+    {
+        // in non-native we can't have Value dump everything, else
+        // we'd dump the entire database? Makes not much sense.
+        Assert.AreEqual(native ? "\n        blah\n            blah\n        bam\n        " : string.Empty, nav.Value.Lf()); // !!
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual("root", nav.Name);
+        Assert.AreEqual(native ? "\n        blah\n            blah\n        bam\n        " : string.Empty, nav.Value.Lf()); // !!
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual("wrap", nav.Name);
+        Assert.AreEqual(native ? "\n        blah\n            blah\n        bam\n        " : string.Empty, nav.Value.Lf()); // !!
 
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual("item1", nav.Name);
-            Assert.AreEqual(string.Empty, nav.Value);
-            Assert.IsFalse(nav.MoveToFirstChild());
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual("item1", nav.Name);
+        Assert.AreEqual(string.Empty, nav.Value);
+        Assert.IsFalse(nav.MoveToFirstChild());
 
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item2", nav.Name);
-            Assert.AreEqual(string.Empty, nav.Value);
-            Assert.IsFalse(nav.MoveToFirstChild()); // !!
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item2", nav.Name);
+        Assert.AreEqual(string.Empty, nav.Value);
+        Assert.IsFalse(nav.MoveToFirstChild()); // !!
 
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item2a", nav.Name);
-            Assert.AreEqual(string.Empty, nav.Value);
-            Assert.IsFalse(nav.MoveToFirstChild()); // !!
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item2a", nav.Name);
+        Assert.AreEqual(string.Empty, nav.Value);
+        Assert.IsFalse(nav.MoveToFirstChild()); // !!
 
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item2b", nav.Name);
-            Assert.AreEqual(string.Empty, nav.Value);
-            Assert.IsFalse(nav.MoveToFirstChild()); // !!
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item2b", nav.Name);
+        Assert.AreEqual(string.Empty, nav.Value);
+        Assert.IsFalse(nav.MoveToFirstChild()); // !!
 
-            // we have no way to tell the navigable that a value is CDATA
-            // so the rule is, if it's null it's not there, anything else is there
-            // and the filtering has to be done when building the content
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item2c", nav.Name);
-            Assert.AreEqual("\n        ", nav.Value.Lf()); // ok since it's a property
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
-            Assert.AreEqual(string.Empty, nav.Name);
-            Assert.AreEqual("\n        ", nav.Value.Lf());
-            Assert.IsTrue(nav.MoveToParent());
+        // we have no way to tell the navigable that a value is CDATA
+        // so the rule is, if it's null it's not there, anything else is there
+        // and the filtering has to be done when building the content
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item2c", nav.Name);
+        Assert.AreEqual("\n        ", nav.Value.Lf()); // ok since it's a property
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
+        Assert.AreEqual(string.Empty, nav.Name);
+        Assert.AreEqual("\n        ", nav.Value.Lf());
+        Assert.IsTrue(nav.MoveToParent());
 
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item3", nav.Name);
-            Assert.AreEqual("blah", nav.Value); // ok since it's a property
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
-            Assert.AreEqual(string.Empty, nav.Name);
-            Assert.AreEqual("blah", nav.Value);
-            Assert.IsTrue(nav.MoveToParent());
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item3", nav.Name);
+        Assert.AreEqual("blah", nav.Value); // ok since it's a property
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
+        Assert.AreEqual(string.Empty, nav.Name);
+        Assert.AreEqual("blah", nav.Value);
+        Assert.IsTrue(nav.MoveToParent());
 
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item3a", nav.Name);
-            Assert.AreEqual("\n            blah\n        ", nav.Value.Lf()); // ok since it's a property
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
-            Assert.AreEqual(string.Empty, nav.Name);
-            Assert.AreEqual("\n            blah\n        ", nav.Value.Lf());
-            Assert.IsTrue(nav.MoveToParent());
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item3a", nav.Name);
+        Assert.AreEqual("\n            blah\n        ", nav.Value.Lf()); // ok since it's a property
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
+        Assert.AreEqual(string.Empty, nav.Name);
+        Assert.AreEqual("\n            blah\n        ", nav.Value.Lf());
+        Assert.IsTrue(nav.MoveToParent());
 
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item4", nav.Name);
-            Assert.AreEqual("bam", nav.Value); // ok since it's a property
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual("subitem", nav.Name);
-            Assert.AreEqual("bam", nav.Value); // ok since we're in a fragment
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
-            Assert.AreEqual(string.Empty, nav.Name);
-            Assert.AreEqual("bam", nav.Value);
-            Assert.IsFalse(nav.MoveToNext());
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual("subitem", nav.Name);
-            Assert.IsFalse(nav.MoveToNext());
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual("item4", nav.Name);
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item4", nav.Name);
+        Assert.AreEqual("bam", nav.Value); // ok since it's a property
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual("subitem", nav.Name);
+        Assert.AreEqual("bam", nav.Value); // ok since we're in a fragment
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
+        Assert.AreEqual(string.Empty, nav.Name);
+        Assert.AreEqual("bam", nav.Value);
+        Assert.IsFalse(nav.MoveToNext());
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual("subitem", nav.Name);
+        Assert.IsFalse(nav.MoveToNext());
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual("item4", nav.Name);
 
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("item5", nav.Name);
-            Assert.AreEqual("\n        ", nav.Value.Lf());
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
-            Assert.AreEqual("\n        ", nav.Value.Lf());
-        }
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("item5", nav.Name);
+        Assert.AreEqual("\n        ", nav.Value.Lf());
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(XPathNodeType.Text, nav.NodeType);
+        Assert.AreEqual("\n        ", nav.Value.Lf());
+    }
 
-        [Test]
-        public void Navigate()
-        {
-            var source = new TestSource1();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void Navigate()
+    {
+        var source = new TestSource1();
+        var nav = new NavigableNavigator(source);
 
-            nav.MoveToRoot();
-            Assert.AreEqual(string.Empty, nav.Name); // because we're at root
-            nav.MoveToFirstChild();
-            Assert.AreEqual("root", nav.Name);
-            nav.MoveToFirstChild();
-            Assert.AreEqual("type1", nav.Name); // our first content
-            nav.MoveToFirstAttribute();
-            Assert.AreEqual("id", nav.Name);
-            Assert.AreEqual("1", nav.Value);
-            nav.MoveToNextAttribute();
-            Assert.AreEqual("prop1", nav.Name);
-            Assert.AreEqual("1:p1", nav.Value);
-            nav.MoveToNextAttribute();
-            Assert.AreEqual("prop2", nav.Name);
-            Assert.AreEqual("1:p2", nav.Value);
-            Assert.IsFalse(nav.MoveToNextAttribute());
-            nav.MoveToParent();
-            nav.MoveToFirstChild();
-            Assert.AreEqual("prop3", nav.Name);
-            Assert.AreEqual("1:p3", nav.Value);
+        nav.MoveToRoot();
+        Assert.AreEqual(string.Empty, nav.Name); // because we're at root
+        nav.MoveToFirstChild();
+        Assert.AreEqual("root", nav.Name);
+        nav.MoveToFirstChild();
+        Assert.AreEqual("type1", nav.Name); // our first content
+        nav.MoveToFirstAttribute();
+        Assert.AreEqual("id", nav.Name);
+        Assert.AreEqual("1", nav.Value);
+        nav.MoveToNextAttribute();
+        Assert.AreEqual("prop1", nav.Name);
+        Assert.AreEqual("1:p1", nav.Value);
+        nav.MoveToNextAttribute();
+        Assert.AreEqual("prop2", nav.Name);
+        Assert.AreEqual("1:p2", nav.Value);
+        Assert.IsFalse(nav.MoveToNextAttribute());
+        nav.MoveToParent();
+        nav.MoveToFirstChild();
+        Assert.AreEqual("prop3", nav.Name);
+        Assert.AreEqual("1:p3", nav.Value);
 
-            Assert.IsFalse(nav.MoveToNext());
-        }
+        Assert.IsFalse(nav.MoveToNext());
+    }
 
-        [Test]
-        public void NavigateMixed()
-        {
-            var source = new TestSource2();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void NavigateMixed()
+    {
+        var source = new TestSource2();
+        var nav = new NavigableNavigator(source);
 
-            nav.MoveToRoot();
-            nav.MoveToFirstChild();
-            Assert.AreEqual("root", nav.Name);
-            nav.MoveToFirstChild();
-            Assert.AreEqual("type1", nav.Name); // our content
-            nav.MoveToFirstChild();
-            Assert.AreEqual("prop1", nav.Name); // our property
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            nav.MoveToFirstChild();
+        nav.MoveToRoot();
+        nav.MoveToFirstChild();
+        Assert.AreEqual("root", nav.Name);
+        nav.MoveToFirstChild();
+        Assert.AreEqual("type1", nav.Name); // our content
+        nav.MoveToFirstChild();
+        Assert.AreEqual("prop1", nav.Name); // our property
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        nav.MoveToFirstChild();
 
-            // "<data><item1>poo</item1><item2 xx=\"33\" /><item2 xx=\"34\" /></data>"
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            Assert.AreEqual("data", nav.Name);
+        // "<data><item1>poo</item1><item2 xx=\"33\" /><item2 xx=\"34\" /></data>"
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        Assert.AreEqual("data", nav.Name);
 
-            nav.MoveToFirstChild();
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            Assert.AreEqual("item1", nav.Name);
+        nav.MoveToFirstChild();
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        Assert.AreEqual("item1", nav.Name);
 
-            nav.MoveToNext();
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            Assert.AreEqual("item2", nav.Name);
+        nav.MoveToNext();
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        Assert.AreEqual("item2", nav.Name);
 
-            nav.MoveToParent();
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            Assert.AreEqual("data", nav.Name);
+        nav.MoveToParent();
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        Assert.AreEqual("data", nav.Name);
 
-            nav.MoveToParent();
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            Assert.AreEqual("prop1", nav.Name);
-        }
+        nav.MoveToParent();
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        Assert.AreEqual("prop1", nav.Name);
+    }
 
-        [Test]
-        public void OuterXmlBasic()
-        {
-            const string xml = @"<root id=""-1"" />";
+    [Test]
+    public void OuterXmlBasic()
+    {
+        const string xml = @"<root id=""-1"" />";
 
-            XPathDocument doc = XmlHelper.CreateXPathDocument(xml);
-            XPathNavigator nnav = doc.CreateNavigator();
-            Assert.AreEqual(xml, nnav.OuterXml);
+        var doc = XmlHelper.CreateXPathDocument(xml);
+        var nnav = doc.CreateNavigator();
+        Assert.AreEqual(xml, nnav.OuterXml);
 
-            var source = new TestSource0();
-            var nav = new NavigableNavigator(source);
-            Assert.AreEqual(xml, nav.OuterXml);
-        }
+        var source = new TestSource0();
+        var nav = new NavigableNavigator(source);
+        Assert.AreEqual(xml, nav.OuterXml);
+    }
 
-        [Test]
-        public void OuterXml()
-        {
-            var source = new TestSource1();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void OuterXml()
+    {
+        var source = new TestSource1();
+        var nav = new NavigableNavigator(source);
 
-            const string xml = @"<root id=""-1"" prop1="""" prop2="""">
+        const string xml = @"<root id=""-1"" prop1="""" prop2="""">
   <type1 id=""1"" prop1=""1:p1"" prop2=""1:p2"">
     <prop3>1:p3</prop3>
   </type1>
 </root>";
 
-            Assert.AreEqual(xml.Lf(), nav.OuterXml.Lf());
-        }
+        Assert.AreEqual(xml.Lf(), nav.OuterXml.Lf());
+    }
 
-        [Test]
-        public void OuterXmlMixed()
-        {
-            var source = new TestSource2();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void OuterXmlMixed()
+    {
+        var source = new TestSource2();
+        var nav = new NavigableNavigator(source);
 
-            nav.MoveToRoot();
+        nav.MoveToRoot();
 
-            const string outerXml = @"<root id=""-1"">
+        const string outerXml = @"<root id=""-1"">
   <type1 id=""1"">
     <prop1>
       <data>
@@ -279,416 +279,417 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
   </type1>
 </root>";
 
-            Assert.AreEqual(outerXml.Lf(), nav.OuterXml.Lf());
-        }
+        Assert.AreEqual(outerXml.Lf(), nav.OuterXml.Lf());
+    }
 
-        [Test]
-        public void Query()
-        {
-            var source = new TestSource1();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void Query()
+    {
+        var source = new TestSource1();
+        var nav = new NavigableNavigator(source);
 
-            XPathNodeIterator iterator = nav.Select("//type1");
-            Assert.AreEqual(1, iterator.Count);
-            iterator.MoveNext();
-            Assert.AreEqual("type1", iterator.Current.Name);
+        var iterator = nav.Select("//type1");
+        Assert.AreEqual(1, iterator.Count);
+        iterator.MoveNext();
+        Assert.AreEqual("type1", iterator.Current.Name);
 
-            iterator = nav.Select("//* [@prop1='1:p1']");
-            Assert.AreEqual(1, iterator.Count);
-            iterator.MoveNext();
-            Assert.AreEqual("type1", iterator.Current.Name);
-        }
+        iterator = nav.Select("//* [@prop1='1:p1']");
+        Assert.AreEqual(1, iterator.Count);
+        iterator.MoveNext();
+        Assert.AreEqual("type1", iterator.Current.Name);
+    }
 
-        [Test]
-        public void QueryMixed()
-        {
-            var source = new TestSource2();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void QueryMixed()
+    {
+        var source = new TestSource2();
+        var nav = new NavigableNavigator(source);
 
-            XPathDocument doc = XmlHelper.CreateXPathDocument("<data><item1>poo</item1><item2 xx=\"33\" /><item2 xx=\"34\" /></data>");
-            XPathNavigator docNav = doc.CreateNavigator();
-            XPathNodeIterator docIter = docNav.Select("//item2 [@xx=33]");
-            Assert.AreEqual(1, docIter.Count);
-            Assert.AreEqual(string.Empty, docIter.Current.Name);
-            docIter.MoveNext();
-            Assert.AreEqual("item2", docIter.Current.Name);
+        var doc = XmlHelper.CreateXPathDocument(
+            "<data><item1>poo</item1><item2 xx=\"33\" /><item2 xx=\"34\" /></data>");
+        var docNav = doc.CreateNavigator();
+        var docIter = docNav.Select("//item2 [@xx=33]");
+        Assert.AreEqual(1, docIter.Count);
+        Assert.AreEqual(string.Empty, docIter.Current.Name);
+        docIter.MoveNext();
+        Assert.AreEqual("item2", docIter.Current.Name);
 
-            XPathNodeIterator iterator = nav.Select("//item2 [@xx=33]");
-            Assert.AreEqual(1, iterator.Count);
-            Assert.AreEqual(string.Empty, iterator.Current.Name);
-            iterator.MoveNext();
-            Assert.AreEqual("item2", iterator.Current.Name);
-        }
+        var iterator = nav.Select("//item2 [@xx=33]");
+        Assert.AreEqual(1, iterator.Count);
+        Assert.AreEqual(string.Empty, iterator.Current.Name);
+        iterator.MoveNext();
+        Assert.AreEqual("item2", iterator.Current.Name);
+    }
 
-        [Test]
-        public void QueryWithVariables()
-        {
-            var source = new TestSource1();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void QueryWithVariables()
+    {
+        var source = new TestSource1();
+        var nav = new NavigableNavigator(source);
 
-            XPathNodeIterator iterator = nav.Select("//* [@prop1=$var]", new XPathVariable("var", "1:p1"));
-            Assert.AreEqual(1, iterator.Count);
-            iterator.MoveNext();
-            Assert.AreEqual("type1", iterator.Current.Name);
-        }
+        var iterator = nav.Select("//* [@prop1=$var]", new XPathVariable("var", "1:p1"));
+        Assert.AreEqual(1, iterator.Count);
+        iterator.MoveNext();
+        Assert.AreEqual("type1", iterator.Current.Name);
+    }
 
-        [Test]
-        public void QueryMixedWithVariables()
-        {
-            var source = new TestSource2();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void QueryMixedWithVariables()
+    {
+        var source = new TestSource2();
+        var nav = new NavigableNavigator(source);
 
-            XPathNodeIterator iterator = nav.Select("//item2 [@xx=$var]", new XPathVariable("var", "33"));
-            Assert.AreEqual(1, iterator.Count);
-            iterator.MoveNext();
-            Assert.AreEqual("item2", iterator.Current.Name);
-        }
+        var iterator = nav.Select("//item2 [@xx=$var]", new XPathVariable("var", "33"));
+        Assert.AreEqual(1, iterator.Count);
+        iterator.MoveNext();
+        Assert.AreEqual("item2", iterator.Current.Name);
+    }
 
-        [Test]
-        public void MixedWithNoValue()
-        {
-            var source = new TestSource4();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void MixedWithNoValue()
+    {
+        var source = new TestSource4();
+        var nav = new NavigableNavigator(source);
 
-            XPathDocument doc = XmlHelper.CreateXPathDocument(@"<root id=""-1"">
+        var doc = XmlHelper.CreateXPathDocument(@"<root id=""-1"">
                         <type1 id=""1""><prop1><data value=""value""/></prop1><prop2>dang</prop2></type1>
                         <type1 id=""2""><prop1 /><prop2></prop2></type1>
                         <type1 id=""3""><prop1 /><prop2 /></type1>
                     </root>");
-            XPathNavigator docNav = doc.CreateNavigator();
+        var docNav = doc.CreateNavigator();
 
-            docNav.MoveToRoot();
-            Assert.IsTrue(docNav.MoveToFirstChild());
-            Assert.AreEqual("root", docNav.Name);
-            Assert.IsTrue(docNav.MoveToFirstChild());
-            Assert.AreEqual("type1", docNav.Name);
-            Assert.IsTrue(docNav.MoveToNext());
-            Assert.AreEqual("type1", docNav.Name);
-            Assert.IsTrue(docNav.MoveToNext());
-            Assert.AreEqual("type1", docNav.Name);
-            Assert.IsFalse(docNav.MoveToNext());
+        docNav.MoveToRoot();
+        Assert.IsTrue(docNav.MoveToFirstChild());
+        Assert.AreEqual("root", docNav.Name);
+        Assert.IsTrue(docNav.MoveToFirstChild());
+        Assert.AreEqual("type1", docNav.Name);
+        Assert.IsTrue(docNav.MoveToNext());
+        Assert.AreEqual("type1", docNav.Name);
+        Assert.IsTrue(docNav.MoveToNext());
+        Assert.AreEqual("type1", docNav.Name);
+        Assert.IsFalse(docNav.MoveToNext());
 
-            docNav.MoveToRoot();
-            string docOuter = docNav.OuterXml;
+        docNav.MoveToRoot();
+        var docOuter = docNav.OuterXml;
 
-            nav.MoveToRoot();
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual("root", nav.Name);
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual("type1", nav.Name);
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("type1", nav.Name);
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual("type1", nav.Name);
-            Assert.IsFalse(nav.MoveToNext());
+        nav.MoveToRoot();
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual("root", nav.Name);
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual("type1", nav.Name);
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("type1", nav.Name);
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual("type1", nav.Name);
+        Assert.IsFalse(nav.MoveToNext());
 
-            nav.MoveToRoot();
-            string outer = nav.OuterXml;
+        nav.MoveToRoot();
+        var outer = nav.OuterXml;
 
-            Assert.AreEqual(docOuter, outer);
-        }
+        Assert.AreEqual(docOuter, outer);
+    }
 
-        [Test]
-        [Ignore("NavigableNavigator does not implement IHasXmlNode.")]
-        public void XmlNodeList()
-        {
-            var source = new TestSource1();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    [Ignore("NavigableNavigator does not implement IHasXmlNode.")]
+    public void XmlNodeList()
+    {
+        var source = new TestSource1();
+        var nav = new NavigableNavigator(source);
 
-            XPathNodeIterator iterator = nav.Select("/*");
+        var iterator = nav.Select("/*");
 
-            // but, that requires that the underlying navigator implements IHasXmlNode
-            // so it is possible to obtain nodes from the navigator - not possible yet
-            XmlNodeList nodes = XmlNodeListFactory.CreateNodeList(iterator);
+        // but, that requires that the underlying navigator implements IHasXmlNode
+        // so it is possible to obtain nodes from the navigator - not possible yet
+        var nodes = XmlNodeListFactory.CreateNodeList(iterator);
 
-            Assert.AreEqual(nodes.Count, 1);
-            XmlNode node = nodes[0];
+        Assert.AreEqual(nodes.Count, 1);
+        var node = nodes[0];
 
-            Assert.AreEqual(3, node.Attributes.Count);
-            Assert.AreEqual("1", node.Attributes["id"].Value);
-            Assert.AreEqual("1:p1", node.Attributes["prop1"].Value);
-            Assert.AreEqual("1:p2", node.Attributes["prop2"].Value);
-            Assert.AreEqual(1, node.ChildNodes.Count);
-            Assert.AreEqual("prop3", node.FirstChild.Name);
-            Assert.AreEqual("1:p3", node.FirstChild.Value);
-        }
+        Assert.AreEqual(3, node.Attributes.Count);
+        Assert.AreEqual("1", node.Attributes["id"].Value);
+        Assert.AreEqual("1:p1", node.Attributes["prop1"].Value);
+        Assert.AreEqual("1:p2", node.Attributes["prop2"].Value);
+        Assert.AreEqual(1, node.ChildNodes.Count);
+        Assert.AreEqual("prop3", node.FirstChild.Name);
+        Assert.AreEqual("1:p3", node.FirstChild.Value);
+    }
 
-        [Test]
-        public void CloneIsSafe()
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void CloneIsSafe()
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source);
 
-            Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual("root", nav.Name); // at -1
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.PropertyElement, nav.InternalState.Position);
-            Assert.AreEqual("prop1", nav.Name);
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual(NavigableNavigator.StatePosition.PropertyElement, nav.InternalState.Position);
-            Assert.AreEqual("prop2", nav.Name);
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
+        Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual("root", nav.Name); // at -1
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.PropertyElement, nav.InternalState.Position);
+        Assert.AreEqual("prop1", nav.Name);
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual(NavigableNavigator.StatePosition.PropertyElement, nav.InternalState.Position);
+        Assert.AreEqual("prop2", nav.Name);
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
 
-            // at that point nav is at /root/1/3
-            var clone = nav.Clone() as NavigableNavigator;
+        // at that point nav is at /root/1/3
+        var clone = nav.Clone() as NavigableNavigator;
 
-            // move nav to /root/1/5 and ensure that clone stays at /root/1/3
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(5, (nav.UnderlyingObject as TestContent).Id);
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, clone.InternalState.Position);
-            Assert.AreEqual(3, (clone.UnderlyingObject as TestContent).Id);
+        // move nav to /root/1/5 and ensure that clone stays at /root/1/3
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(5, (nav.UnderlyingObject as TestContent).Id);
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, clone.InternalState.Position);
+        Assert.AreEqual(3, (clone.UnderlyingObject as TestContent).Id);
 
-            // move nav to /root/2
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(2, (nav.UnderlyingObject as TestContent).Id);
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.PropertyElement, nav.InternalState.Position);
-            Assert.AreEqual("prop1", nav.Name);
-            Assert.AreEqual("p21", nav.Value);
+        // move nav to /root/2
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(2, (nav.UnderlyingObject as TestContent).Id);
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.PropertyElement, nav.InternalState.Position);
+        Assert.AreEqual("prop1", nav.Name);
+        Assert.AreEqual("p21", nav.Value);
 
-            // move clone to .. /root/1
-            Assert.IsTrue(clone.MoveToParent());
+        // move clone to .. /root/1
+        Assert.IsTrue(clone.MoveToParent());
 
-            // clone has not been corrupted by nav
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, clone.InternalState.Position);
-            Assert.AreEqual(1, (clone.UnderlyingObject as TestContent).Id);
-        }
+        // clone has not been corrupted by nav
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, clone.InternalState.Position);
+        Assert.AreEqual(1, (clone.UnderlyingObject as TestContent).Id);
+    }
 
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        public void SelectById(int id)
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source);
+    [TestCase(1)]
+    [TestCase(2)]
+    [TestCase(3)]
+    [TestCase(4)]
+    [TestCase(5)]
+    [TestCase(6)]
+    public void SelectById(int id)
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source);
 
-            XPathNodeIterator iter = nav.Select(string.Format("//* [@id={0}]", id));
-            Assert.IsTrue(iter.MoveNext());
-            var current = iter.Current as NavigableNavigator;
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, current.InternalState.Position);
-            Assert.AreEqual(id, (current.UnderlyingObject as TestContent).Id);
-        }
+        var iter = nav.Select(string.Format("//* [@id={0}]", id));
+        Assert.IsTrue(iter.MoveNext());
+        var current = iter.Current as NavigableNavigator;
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, current.InternalState.Position);
+        Assert.AreEqual(id, (current.UnderlyingObject as TestContent).Id);
+    }
 
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        [TestCase(6)]
-        public void SelectByIdWithVariable(int id)
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source);
+    [TestCase(1)]
+    [TestCase(2)]
+    [TestCase(3)]
+    [TestCase(4)]
+    [TestCase(5)]
+    [TestCase(6)]
+    public void SelectByIdWithVariable(int id)
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source);
 
-            XPathNodeIterator iter = nav.Select("//* [@id=$id]", new XPathVariable("id", id.ToString(CultureInfo.InvariantCulture)));
-            Assert.IsTrue(iter.MoveNext());
-            var current = iter.Current as NavigableNavigator;
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, current.InternalState.Position);
-            Assert.AreEqual(id, (current.UnderlyingObject as TestContent).Id);
-        }
+        var iter = nav.Select("//* [@id=$id]", new XPathVariable("id", id.ToString(CultureInfo.InvariantCulture)));
+        Assert.IsTrue(iter.MoveNext());
+        var current = iter.Current as NavigableNavigator;
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, current.InternalState.Position);
+        Assert.AreEqual(id, (current.UnderlyingObject as TestContent).Id);
+    }
 
-        [Test]
-        public void MoveToId()
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source);
+    [Test]
+    public void MoveToId()
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source);
 
-            // move to /root/1/3
-            Assert.IsTrue(nav.MoveToId("3"));
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
+        // move to /root/1/3
+        Assert.IsTrue(nav.MoveToId("3"));
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
 
-            // move to /root/1
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // move to /root/1
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // move to /root
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
+        // move to /root
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
 
-            // move up
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
-            Assert.IsFalse(nav.MoveToParent());
+        // move up
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
+        Assert.IsFalse(nav.MoveToParent());
 
-            // move to /root/1
-            Assert.IsTrue(nav.MoveToId("1"));
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // move to /root/1
+        Assert.IsTrue(nav.MoveToId("1"));
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // move to /root
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
+        // move to /root
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
 
-            // move up
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
-            Assert.IsFalse(nav.MoveToParent());
+        // move up
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
+        Assert.IsFalse(nav.MoveToParent());
 
-            // move to /root
-            Assert.IsTrue(nav.MoveToId("-1"));
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
+        // move to /root
+        Assert.IsTrue(nav.MoveToId("-1"));
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
 
-            // move up
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
-            Assert.IsFalse(nav.MoveToParent());
+        // move up
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
+        Assert.IsFalse(nav.MoveToParent());
 
-            // move to /root
-            Assert.IsTrue(nav.MoveToId("-1"));
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
+        // move to /root
+        Assert.IsTrue(nav.MoveToId("-1"));
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
 
-            // move down
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // move down
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // get lost
-            Assert.IsFalse(nav.MoveToId("666"));
-        }
+        // get lost
+        Assert.IsFalse(nav.MoveToId("666"));
+    }
 
-        [Test]
-        public void RootedNavigator1()
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source, rootId: 1);
+    [Test]
+    public void RootedNavigator1()
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source, 1);
 
-            // go to (/root) /1
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // go to (/root) /1
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // go to (/root) /1/prop1
-            Assert.IsTrue(nav.MoveToFirstChild());
+        // go to (/root) /1/prop1
+        Assert.IsTrue(nav.MoveToFirstChild());
 
-            // go to (/root) /1/prop2
-            Assert.IsTrue(nav.MoveToNext());
+        // go to (/root) /1/prop2
+        Assert.IsTrue(nav.MoveToNext());
 
-            // go to (/root) /1/3
-            Assert.IsTrue(nav.MoveToNext());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
+        // go to (/root) /1/3
+        Assert.IsTrue(nav.MoveToNext());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
 
-            // go to (/root) /1
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // go to (/root) /1
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // go to (/root) ie root
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
-            Assert.IsFalse(nav.MoveToParent());
+        // go to (/root) ie root
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
+        Assert.IsFalse(nav.MoveToParent());
 
-            // can't go there
-            Assert.IsFalse(nav.MoveToId("2"));
-        }
+        // can't go there
+        Assert.IsFalse(nav.MoveToId("2"));
+    }
 
-        [Test]
-        public void RootedNavigator2()
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source, rootId: 3);
+    [Test]
+    public void RootedNavigator2()
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source, 3);
 
-            // go to (/root/1) /3
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
+        // go to (/root/1) /3
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
 
-            // go to (/root/1)
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
-            Assert.IsFalse(nav.MoveToParent());
+        // go to (/root/1)
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
+        Assert.IsFalse(nav.MoveToParent());
 
-            // can't go there
-            Assert.IsFalse(nav.MoveToId("1"));
-        }
+        // can't go there
+        Assert.IsFalse(nav.MoveToId("1"));
+    }
 
-        [Test]
-        public void RootedMaxDepthNavigator()
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source, rootId: 1, maxDepth: 0);
+    [Test]
+    public void RootedMaxDepthNavigator()
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source, 1, 0);
 
-            // go to (/root) /1
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // go to (/root) /1
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // go to (/root)
-            Assert.IsTrue(nav.MoveToParent());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
-            Assert.IsFalse(nav.MoveToParent());
+        // go to (/root)
+        Assert.IsTrue(nav.MoveToParent());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position);
+        Assert.IsFalse(nav.MoveToParent());
 
-            // go to (/root) /1
-            Assert.IsTrue(nav.MoveToId("1"));
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // go to (/root) /1
+        Assert.IsTrue(nav.MoveToId("1"));
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // can't go there
-            Assert.IsFalse(nav.MoveToId("-1"));
-            Assert.IsFalse(nav.MoveToId("3"));
-        }
+        // can't go there
+        Assert.IsFalse(nav.MoveToId("-1"));
+        Assert.IsFalse(nav.MoveToId("3"));
+    }
 
-        [Test]
-        public void MaxDepthNavigator()
-        {
-            var source = new TestSource5();
-            var nav = new NavigableNavigator(source, maxDepth: 1);
+    [Test]
+    public void MaxDepthNavigator()
+    {
+        var source = new TestSource5();
+        var nav = new NavigableNavigator(source, maxDepth: 1);
 
-            // go to /root
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
+        // go to /root
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(-1, (nav.UnderlyingObject as TestContent).Id);
 
-            // go to /root/1
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
-            Assert.IsTrue(nav.MoveToId("1"));
-            Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        // go to /root/1
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
+        Assert.IsTrue(nav.MoveToId("1"));
+        Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        Assert.AreEqual(1, (nav.UnderlyingObject as TestContent).Id);
 
-            // go to /root/1/prop1
-            Assert.IsTrue(nav.MoveToFirstChild());
+        // go to /root/1/prop1
+        Assert.IsTrue(nav.MoveToFirstChild());
 
-            // go to /root/1/prop2
-            Assert.IsTrue(nav.MoveToNext());
+        // go to /root/1/prop2
+        Assert.IsTrue(nav.MoveToNext());
 
-            // can't go to /root/1/3
-            Assert.IsFalse(nav.MoveToNext());
-            Assert.IsFalse(nav.MoveToId("3"));
+        // can't go to /root/1/3
+        Assert.IsFalse(nav.MoveToNext());
+        Assert.IsFalse(nav.MoveToId("3"));
 
-            //// Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
-            //// Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
-        }
+        //// Assert.AreEqual(NavigableNavigator.StatePosition.Element, nav.InternalState.Position);
+        //// Assert.AreEqual(3, (nav.UnderlyingObject as TestContent).Id);
+    }
 
-        [TestCase(true, true)]
-        [TestCase(true, false)]
-        [TestCase(false, true)]
-        [TestCase(false, false)]
-        public void XsltDebugModeAndSortOrder(bool native, bool debug)
-        {
-            const string xml = @"<?xml version=""1.0"" encoding=""UTF-8""?>
+    [TestCase(true, true)]
+    [TestCase(true, false)]
+    [TestCase(false, true)]
+    [TestCase(false, false)]
+    public void XsltDebugModeAndSortOrder(bool native, bool debug)
+    {
+        const string xml = @"<?xml version=""1.0"" encoding=""UTF-8""?>
 <root>
     <node id=""1"" isDoc=""1"">
         <title>title-1</title>
@@ -717,7 +718,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
 </root>
 ";
 
-            const string xslt = @"<?xml version=""1.0"" encoding=""UTF-8""?>
+        const string xslt = @"<?xml version=""1.0"" encoding=""UTF-8""?>
 <!DOCTYPE xsl:stylesheet [
     <!ENTITY nbsp ""&#x00A0;"">
 ]>
@@ -750,7 +751,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
 
 </xsl:stylesheet>
 ";
-            const string expected = @"! title-1
+        const string expected = @"! title-1
 !! title-3
 !!! title-7
 !!! title-8
@@ -760,72 +761,66 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
 !! title-6
 ";
 
-            // see http://www.onenaught.com/posts/352/xslt-performance-tip-dont-indent-output
-            // why aren't we using an XmlWriter here?
-            var transform = new XslCompiledTransform(debug);
-            var xmlReader = new XmlTextReader(new StringReader(xslt))
-                {
-                    EntityHandling = EntityHandling.ExpandEntities
-                };
-            var xslResolver = new XmlUrlResolver
-                {
-                    Credentials = CredentialCache.DefaultCredentials
-                };
-            var args = new XsltArgumentList();
+        // see http://www.onenaught.com/posts/352/xslt-performance-tip-dont-indent-output
+        // why aren't we using an XmlWriter here?
+        var transform = new XslCompiledTransform(debug);
+        var xmlReader = new XmlTextReader(new StringReader(xslt)) { EntityHandling = EntityHandling.ExpandEntities };
+        var xslResolver = new XmlUrlResolver { Credentials = CredentialCache.DefaultCredentials };
+        var args = new XsltArgumentList();
 
-            // .Default is more restrictive than .TrustedXslt
-            transform.Load(xmlReader, XsltSettings.Default, xslResolver);
+        // .Default is more restrictive than .TrustedXslt
+        transform.Load(xmlReader, XsltSettings.Default, xslResolver);
 
-            XPathNavigator macro;
-            if (!native)
+        XPathNavigator macro;
+        if (!native)
+        {
+            var source = new TestSource7();
+            ////var nav = new NavigableNavigator(source);
+            ////args.AddParam("currentPage", string.Empty, nav.Clone());
+
+            var x = new XmlDocument();
+            x.LoadXml(xml);
+
+            macro = new MacroNavigator(new[]
             {
-                var source = new TestSource7();
-                ////var nav = new NavigableNavigator(source);
-                ////args.AddParam("currentPage", string.Empty, nav.Clone());
-
-                var x = new XmlDocument();
-                x.LoadXml(xml);
-
-                macro = new MacroNavigator(new[]
-                {
-                    // it even fails like that => macro nav. issue?
-                    new MacroNavigator.MacroParameter("nav", x.CreateNavigator()) // nav.Clone())
-                });
-            }
-            else
-            {
-                var doc = new XmlDocument();
-                doc.LoadXml("<macro />");
-                XmlElement nav = doc.CreateElement("nav");
-                doc.DocumentElement.AppendChild(nav);
-                var x = new XmlDocument();
-                x.LoadXml(xml);
-                nav.AppendChild(doc.ImportNode(x.DocumentElement, true));
-                macro = doc.CreateNavigator();
-            }
-
-            var writer = new StringWriter();
-            transform.Transform(macro, args, writer);
-
-            // this was working with native, debug and non-debug
-            // this was working with macro nav, non-debug
-            // but was NOT working (changing the order of nodes) with macro nav, debug
-            // was due to an issue with macro nav IsSamePosition, fixed
-
-            ////Debug.Print("--------");
-            ////Debug.Print(writer.ToString());
-            Assert.AreEqual(expected.Lf(), writer.ToString().Lf());
+                // it even fails like that => macro nav. issue?
+                new MacroNavigator.MacroParameter("nav", x.CreateNavigator()), // nav.Clone())
+            });
+        }
+        else
+        {
+            var doc = new XmlDocument();
+            doc.LoadXml("<macro />");
+            var nav = doc.CreateElement("nav");
+            doc.DocumentElement.AppendChild(nav);
+            var x = new XmlDocument();
+            x.LoadXml(xml);
+            nav.AppendChild(doc.ImportNode(x.DocumentElement, true));
+            macro = doc.CreateNavigator();
         }
 
-        [Test]
-        public void WhiteSpacesAndEmptyValues()
-        {
-            // "When Microsoft’s DOM builder receives a text node from the parser
-            // that contains only white space, it is thrown away." - so if it's ONLY
-            // spaces, it's nothing, but spaces are NOT trimmed.
+        var writer = new StringWriter();
+        transform.Transform(macro, args, writer);
 
-            // For attributes, spaces are preserved even when there's only spaces.
-            XPathDocument doc = XmlHelper.CreateXPathDocument(@"<root>
+        // this was working with native, debug and non-debug
+        // this was working with macro nav, non-debug
+        // but was NOT working (changing the order of nodes) with macro nav, debug
+        // was due to an issue with macro nav IsSamePosition, fixed
+
+        ////Debug.Print("--------");
+        ////Debug.Print(writer.ToString());
+        Assert.AreEqual(expected.Lf(), writer.ToString().Lf());
+    }
+
+    [Test]
+    public void WhiteSpacesAndEmptyValues()
+    {
+        // "When Microsoft’s DOM builder receives a text node from the parser
+        // that contains only white space, it is thrown away." - so if it's ONLY
+        // spaces, it's nothing, but spaces are NOT trimmed.
+
+        // For attributes, spaces are preserved even when there's only spaces.
+        var doc = XmlHelper.CreateXPathDocument(@"<root>
                         <item><prop/></item>
                         <item><prop></prop></item>
                         <item><prop> </prop></item>
@@ -838,10 +833,10 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
                         <item x="" ""/>
                     </root>");
 
-            XPathNavigator docNav = doc.CreateNavigator();
+        var docNav = doc.CreateNavigator();
 
-            Assert.AreEqual(
-                @"<root>
+        Assert.AreEqual(
+            @"<root>
   <item>
     <prop />
   </item>
@@ -864,30 +859,30 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
   <item x="""" />
   <item x="" "" />
 </root>".Lf(),
-                docNav.OuterXml.Lf());
+            docNav.OuterXml.Lf());
 
-            docNav.MoveToRoot();
-            Assert.IsTrue(docNav.MoveToFirstChild());
-            Assert.IsTrue(docNav.MoveToFirstChild());
-            Assert.IsTrue(docNav.MoveToFirstChild()); // prop
-            Assert.IsTrue(docNav.IsEmptyElement);
-            Assert.IsTrue(docNav.MoveToParent());
-            Assert.IsTrue(docNav.MoveToNext());
-            Assert.IsTrue(docNav.MoveToFirstChild()); // prop
-            Assert.IsFalse(docNav.IsEmptyElement);
-            Assert.AreEqual(string.Empty, docNav.Value); // contains an empty text node
-            Assert.IsTrue(docNav.MoveToParent());
-            Assert.IsTrue(docNav.MoveToNext());
-            Assert.IsTrue(docNav.MoveToFirstChild()); // prop
-            Assert.IsFalse(docNav.IsEmptyElement);
-            Assert.AreEqual(string.Empty, docNav.Value); // contains an empty text node
+        docNav.MoveToRoot();
+        Assert.IsTrue(docNav.MoveToFirstChild());
+        Assert.IsTrue(docNav.MoveToFirstChild());
+        Assert.IsTrue(docNav.MoveToFirstChild()); // prop
+        Assert.IsTrue(docNav.IsEmptyElement);
+        Assert.IsTrue(docNav.MoveToParent());
+        Assert.IsTrue(docNav.MoveToNext());
+        Assert.IsTrue(docNav.MoveToFirstChild()); // prop
+        Assert.IsFalse(docNav.IsEmptyElement);
+        Assert.AreEqual(string.Empty, docNav.Value); // contains an empty text node
+        Assert.IsTrue(docNav.MoveToParent());
+        Assert.IsTrue(docNav.MoveToNext());
+        Assert.IsTrue(docNav.MoveToFirstChild()); // prop
+        Assert.IsFalse(docNav.IsEmptyElement);
+        Assert.AreEqual(string.Empty, docNav.Value); // contains an empty text node
 
-            var source = new TestSource8();
-            var nav = new NavigableNavigator(source);
+        var source = new TestSource8();
+        var nav = new NavigableNavigator(source);
 
-            // shows how whitespaces are handled by NavigableNavigator
-            Assert.AreEqual(
-                @"<root id=""-1"" attr="""">
+        // shows how whitespaces are handled by NavigableNavigator
+        Assert.AreEqual(
+            @"<root id=""-1"" attr="""">
   <item id=""1"" attr="""">
     <prop />
   </item>
@@ -904,353 +899,354 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
   <item id=""5"" attr=""  ooo  "">
     <prop>   ooo   </prop>
   </item>
-</root>".Lf(), nav.OuterXml.Lf());
-        }
-    }
-
-    internal class TestPropertyType : INavigableFieldType
-    {
-        public TestPropertyType(string name, bool isXmlContent = false, Func<object, string> xmlStringConverter = null)
-        {
-            Name = name;
-            IsXmlContent = isXmlContent;
-            XmlStringConverter = xmlStringConverter;
-        }
-
-        public string Name { get; private set; }
-
-        public bool IsXmlContent { get; private set; }
-
-        public Func<object, string> XmlStringConverter { get; private set; }
-    }
-
-    internal class TestContentType : INavigableContentType
-    {
-        public TestContentType(TestSourceBase source, string name, params INavigableFieldType[] properties)
-        {
-            Source = source;
-            Name = name;
-            FieldTypes = properties;
-        }
-
-        public TestSourceBase Source { get; private set; }
-
-        public string Name { get; private set; }
-
-        public INavigableFieldType[] FieldTypes { get; protected set; }
-    }
-
-    internal class TestRootContentType : TestContentType
-    {
-        public TestRootContentType(TestSourceBase source, params INavigableFieldType[] properties)
-            : base(source, "root") => FieldTypes = properties;
-
-        public TestContentType CreateType(string name, params INavigableFieldType[] properties) => new TestContentType(Source, name, FieldTypes.Union(properties).ToArray());
-    }
-
-    internal class TestContent : INavigableContent
-    {
-        public TestContent(TestContentType type, int id, int parentId)
-        {
-            _type = type;
-            Id = id;
-            ParentId = parentId;
-        }
-
-        private readonly TestContentType _type;
-
-        public int Id { get; private set; }
-
-        public int ParentId { get; private set; }
-
-        public INavigableContentType Type => _type;
-
-        public IList<int> ChildIds { get; private set; }
-
-        public object Value(int id)
-        {
-            if (!(_type.FieldTypes[id] is TestPropertyType fieldType))
-            {
-                throw new Exception("Oops");
-            }
-
-            object value = FieldValues[id];
-            bool isAttr = id <= _type.Source.LastAttributeIndex;
-
-            // null => return null
-            if (value == null)
-            {
-                return null;
-            }
-
-            // attribute => return string value
-            if (isAttr)
-            {
-                return value.ToString();
-            }
-
-            // has a converter => use the converter
-            if (fieldType.XmlStringConverter != null)
-            {
-                return fieldType.XmlStringConverter(value);
-            }
-
-            // not a string => return value as a string
-            if (!(value is string s))
-            {
-                return value.ToString();
-            }
-
-            // xml content... try xml
-            if (fieldType.IsXmlContent)
-            {
-                if (XmlHelper.TryCreateXPathDocumentFromPropertyValue(s, out XPathDocument doc))
-                {
-                    return doc.CreateNavigator();
-                }
-            }
-
-            // return the string
-            // even if it's xml that can't be parsed...
-            return s;
-        }
-
-        // locals
-        public object[] FieldValues { get; private set; }
-
-        public TestContent WithChildren(params int[] childIds)
-        {
-            ChildIds = childIds;
-            return this;
-        }
-
-        public TestContent WithValues(params object[] values)
-        {
-            FieldValues = values ?? (new object[] { null });
-            return this;
-        }
-    }
-
-    internal class TestRootContent : TestContent
-    {
-        public TestRootContent(TestContentType type)
-            : base(type, -1, -1)
-        {
-        }
-    }
-
-    internal abstract class TestSourceBase : INavigableSource
-    {
-        protected readonly Dictionary<int, TestContent> Content = new Dictionary<int, TestContent>();
-
-        public INavigableContent Get(int id) => Content.ContainsKey(id) ? Content[id] : null;
-
-        public int LastAttributeIndex { get; protected set; }
-
-        public INavigableContent Root { get; protected set; }
-    }
-
-    internal class TestSource0 : TestSourceBase
-    {
-        public TestSource0()
-        {
-            LastAttributeIndex = -1;
-            var type = new TestRootContentType(this);
-            Root = new TestRootContent(type);
-        }
-    }
-
-    internal class TestSource1 : TestSourceBase
-    {
-        public TestSource1()
-        {
-            // last attribute index is 1 -  meaning properties 0 and 1 are attributes, 2+ are elements
-            // then, fieldValues must have adequate number of items
-            LastAttributeIndex = 1;
-
-            var prop1 = new TestPropertyType("prop1");
-            var prop2 = new TestPropertyType("prop2");
-            var prop3 = new TestPropertyType("prop3");
-            var type = new TestRootContentType(this, prop1, prop2);
-            TestContentType type1 = type.CreateType("type1", prop3);
-
-            Content[1] = new TestContent(type1, 1, -1).WithValues("1:p1", "1:p2", "1:p3");
-
-            Root = new TestRootContent(type).WithValues(string.Empty, string.Empty).WithChildren(1);
-        }
-    }
-
-    internal class TestSource2 : TestSourceBase
-    {
-        public TestSource2()
-        {
-            LastAttributeIndex = -1;
-
-            var prop1 = new TestPropertyType("prop1", true);
-            var type = new TestRootContentType(this);
-            TestContentType type1 = type.CreateType("type1", prop1);
-
-            const string xml = "<data><item1>poo</item1><item2 xx=\"33\" /><item2 xx=\"34\" /></data>";
-            Content[1] = new TestContent(type1, 1, 1).WithValues(xml);
-
-            Root = new TestRootContent(type).WithChildren(1);
-        }
-    }
-
-    internal class TestSource3 : TestSourceBase
-    {
-        public TestSource3()
-        {
-            LastAttributeIndex = 1;
-
-            var prop1 = new TestPropertyType("prop1");
-            var prop2 = new TestPropertyType("prop2");
-            var prop3 = new TestPropertyType("prop3");
-            var type = new TestRootContentType(this, prop1, prop2);
-            TestContentType type1 = type.CreateType("type1", prop3);
-
-            Content[1] = new TestContent(type1, 1, 1).WithValues("1:p1", "1:p2", "1:p3").WithChildren(2);
-            Content[2] = new TestContent(type1, 2, 1).WithValues("2:p1", "2:p2", "2:p3");
-
-            Root = new TestRootContent(type).WithChildren(1);
-        }
-    }
-
-    internal class TestSource4 : TestSourceBase
-    {
-        public TestSource4()
-        {
-            LastAttributeIndex = -1;
-
-            var prop1 = new TestPropertyType("prop1", true);
-            var prop2 = new TestPropertyType("prop2");
-            var type = new TestRootContentType(this);
-            TestContentType type1 = type.CreateType("type1", prop1, prop2);
-
-            Content[1] = new TestContent(type1, 1, -1).WithValues("<data value=\"value\"/>", "dang");
-            Content[2] = new TestContent(type1, 2, -1).WithValues(null, string.Empty);
-            Content[3] = new TestContent(type1, 3, -1).WithValues(null, null);
-
-            Root = new TestRootContent(type).WithChildren(1, 2, 3);
-        }
-    }
-
-    internal class TestSource5 : TestSourceBase
-    {
-        public TestSource5()
-        {
-            LastAttributeIndex = -1;
-
-            var prop1 = new TestPropertyType("prop1");
-            var prop2 = new TestPropertyType("prop2");
-            var type = new TestRootContentType(this);
-            TestContentType type1 = type.CreateType("type1", prop1, prop2);
-
-            Content[1] = new TestContent(type1, 1, -1).WithValues("p11", "p12").WithChildren(3, 5);
-            Content[2] = new TestContent(type1, 2, -1).WithValues("p21", "p22").WithChildren(4, 6);
-            Content[3] = new TestContent(type1, 3, 1).WithValues("p31", "p32");
-            Content[4] = new TestContent(type1, 4, 2).WithValues("p41", "p42");
-            Content[5] = new TestContent(type1, 5, 1).WithValues("p51", "p52");
-            Content[6] = new TestContent(type1, 6, 2).WithValues("p61", "p62");
-
-            Root = new TestRootContent(type).WithChildren(1, 2);
-        }
-    }
-
-    internal class TestSource6 : TestSourceBase
-    {
-        ////<root>
-        ////    <wrap>
-        ////        <item1 />
-        ////        <item2></item2>
-        ////        <item2a> </item2a>
-        ////        <item2b>
-        ////        </item2b>
-        ////        <item2c><![CDATA[
-        ////        ]]></item2c>
-        ////        <item3>blah</item3>
-        ////        <item4>
-        ////            <subitem x=""1"">bam</subitem>
-        ////        </item4>
-        ////        <item5>
-        ////        </item5>
-        ////    </wrap>
-        ////</root>
-
-        public TestSource6()
-        {
-            LastAttributeIndex = -1;
-
-            var type = new TestRootContentType(this);
-            TestContentType type1 = type.CreateType(
-                "wrap",
-                new TestPropertyType("item1"),
-                new TestPropertyType("item2"),
-                new TestPropertyType("item2a"),
-                new TestPropertyType("item2b"),
-                new TestPropertyType("item2c"),
-                new TestPropertyType("item3"),
-                new TestPropertyType("item3a"),
-                new TestPropertyType("item4", true),
-                new TestPropertyType("item5", true));
-
-            Content[1] = new TestContent(type1, 1, -1)
-                .WithValues(
-                    null,
-                    null,
-                    null,
-                    null,
-                    "\n        ",
-                    "blah",
-                    "\n            blah\n        ",
-                    "<subitem x=\"1\">bam</subitem>",
-                    "\n        ");
-
-            Root = new TestRootContent(type).WithChildren(1);
-        }
-    }
-
-    internal class TestSource7 : TestSourceBase
-    {
-        public TestSource7()
-        {
-            LastAttributeIndex = 0;
-
-            var prop1 = new TestPropertyType("isDoc");
-            var prop2 = new TestPropertyType("title");
-            var type = new TestRootContentType(this, prop1);
-            TestContentType type1 = type.CreateType("node", prop1, prop2);
-
-            Content[1] = new TestContent(type1, 1, -1).WithValues(1, "title-1").WithChildren(3, 5);
-            Content[2] = new TestContent(type1, 2, -1).WithValues(1, "title-2").WithChildren(4, 6);
-            Content[3] = new TestContent(type1, 3, 1).WithValues(1, "title-3").WithChildren(7, 8);
-            Content[4] = new TestContent(type1, 4, 2).WithValues(1, "title-4");
-            Content[5] = new TestContent(type1, 5, 1).WithValues(1, "title-5");
-            Content[6] = new TestContent(type1, 6, 2).WithValues(1, "title-6");
-
-            Content[7] = new TestContent(type1, 7, 3).WithValues(1, "title-7");
-            Content[8] = new TestContent(type1, 8, 3).WithValues(1, "title-8");
-
-            Root = new TestRootContent(type).WithValues(null).WithChildren(1, 2);
-        }
-    }
-
-    internal class TestSource8 : TestSourceBase
-    {
-        public TestSource8()
-        {
-            LastAttributeIndex = 0;
-
-            var attr = new TestPropertyType("attr");
-            var prop = new TestPropertyType("prop");
-            var type = new TestRootContentType(this, attr);
-            TestContentType type1 = type.CreateType("item", attr, prop);
-            Content[1] = new TestContent(type1, 1, -1).WithValues(null, null);
-            Content[2] = new TestContent(type1, 2, -1).WithValues(string.Empty, string.Empty);
-            Content[3] = new TestContent(type1, 3, -1).WithValues("   ", "   ");
-            Content[4] = new TestContent(type1, 4, -1).WithValues(string.Empty, "\n");
-            Content[5] = new TestContent(type1, 5, -1).WithValues("  ooo  ", "   ooo   ");
-            Root = new TestRootContent(type).WithValues(null).WithChildren(1, 2, 3, 4, 5);
-        }
+</root>".Lf(),
+            nav.OuterXml.Lf());
+    }
+}
+
+internal class TestPropertyType : INavigableFieldType
+{
+    public TestPropertyType(string name, bool isXmlContent = false, Func<object, string> xmlStringConverter = null)
+    {
+        Name = name;
+        IsXmlContent = isXmlContent;
+        XmlStringConverter = xmlStringConverter;
+    }
+
+    public bool IsXmlContent { get; }
+
+    public string Name { get; }
+
+    public Func<object, string> XmlStringConverter { get; }
+}
+
+internal class TestContentType : INavigableContentType
+{
+    public TestContentType(TestSourceBase source, string name, params INavigableFieldType[] properties)
+    {
+        Source = source;
+        Name = name;
+        FieldTypes = properties;
+    }
+
+    public TestSourceBase Source { get; }
+
+    public string Name { get; }
+
+    public INavigableFieldType[] FieldTypes { get; protected set; }
+}
+
+internal class TestRootContentType : TestContentType
+{
+    public TestRootContentType(TestSourceBase source, params INavigableFieldType[] properties)
+        : base(source, "root") => FieldTypes = properties;
+
+    public TestContentType CreateType(string name, params INavigableFieldType[] properties) =>
+        new(Source, name, FieldTypes.Union(properties).ToArray());
+}
+
+internal class TestContent : INavigableContent
+{
+    private readonly TestContentType _type;
+
+    public TestContent(TestContentType type, int id, int parentId)
+    {
+        _type = type;
+        Id = id;
+        ParentId = parentId;
+    }
+
+    // locals
+    public object[] FieldValues { get; private set; }
+
+    public int Id { get; }
+
+    public int ParentId { get; }
+
+    public INavigableContentType Type => _type;
+
+    public IList<int> ChildIds { get; private set; }
+
+    public object Value(int id)
+    {
+        if (!(_type.FieldTypes[id] is TestPropertyType fieldType))
+        {
+            throw new Exception("Oops");
+        }
+
+        var value = FieldValues[id];
+        var isAttr = id <= _type.Source.LastAttributeIndex;
+
+        // null => return null
+        if (value == null)
+        {
+            return null;
+        }
+
+        // attribute => return string value
+        if (isAttr)
+        {
+            return value.ToString();
+        }
+
+        // has a converter => use the converter
+        if (fieldType.XmlStringConverter != null)
+        {
+            return fieldType.XmlStringConverter(value);
+        }
+
+        // not a string => return value as a string
+        if (!(value is string s))
+        {
+            return value.ToString();
+        }
+
+        // xml content... try xml
+        if (fieldType.IsXmlContent)
+        {
+            if (XmlHelper.TryCreateXPathDocumentFromPropertyValue(s, out var doc))
+            {
+                return doc.CreateNavigator();
+            }
+        }
+
+        // return the string
+        // even if it's xml that can't be parsed...
+        return s;
+    }
+
+    public TestContent WithChildren(params int[] childIds)
+    {
+        ChildIds = childIds;
+        return this;
+    }
+
+    public TestContent WithValues(params object[] values)
+    {
+        FieldValues = values ?? new object[] { null };
+        return this;
+    }
+}
+
+internal class TestRootContent : TestContent
+{
+    public TestRootContent(TestContentType type)
+        : base(type, -1, -1)
+    {
+    }
+}
+
+internal abstract class TestSourceBase : INavigableSource
+{
+    protected readonly Dictionary<int, TestContent> Content = new();
+
+    public INavigableContent Get(int id) => Content.ContainsKey(id) ? Content[id] : null;
+
+    public int LastAttributeIndex { get; protected set; }
+
+    public INavigableContent Root { get; protected set; }
+}
+
+internal class TestSource0 : TestSourceBase
+{
+    public TestSource0()
+    {
+        LastAttributeIndex = -1;
+        var type = new TestRootContentType(this);
+        Root = new TestRootContent(type);
+    }
+}
+
+internal class TestSource1 : TestSourceBase
+{
+    public TestSource1()
+    {
+        // last attribute index is 1 -  meaning properties 0 and 1 are attributes, 2+ are elements
+        // then, fieldValues must have adequate number of items
+        LastAttributeIndex = 1;
+
+        var prop1 = new TestPropertyType("prop1");
+        var prop2 = new TestPropertyType("prop2");
+        var prop3 = new TestPropertyType("prop3");
+        var type = new TestRootContentType(this, prop1, prop2);
+        var type1 = type.CreateType("type1", prop3);
+
+        Content[1] = new TestContent(type1, 1, -1).WithValues("1:p1", "1:p2", "1:p3");
+
+        Root = new TestRootContent(type).WithValues(string.Empty, string.Empty).WithChildren(1);
+    }
+}
+
+internal class TestSource2 : TestSourceBase
+{
+    public TestSource2()
+    {
+        LastAttributeIndex = -1;
+
+        var prop1 = new TestPropertyType("prop1", true);
+        var type = new TestRootContentType(this);
+        var type1 = type.CreateType("type1", prop1);
+
+        const string xml = "<data><item1>poo</item1><item2 xx=\"33\" /><item2 xx=\"34\" /></data>";
+        Content[1] = new TestContent(type1, 1, 1).WithValues(xml);
+
+        Root = new TestRootContent(type).WithChildren(1);
+    }
+}
+
+internal class TestSource3 : TestSourceBase
+{
+    public TestSource3()
+    {
+        LastAttributeIndex = 1;
+
+        var prop1 = new TestPropertyType("prop1");
+        var prop2 = new TestPropertyType("prop2");
+        var prop3 = new TestPropertyType("prop3");
+        var type = new TestRootContentType(this, prop1, prop2);
+        var type1 = type.CreateType("type1", prop3);
+
+        Content[1] = new TestContent(type1, 1, 1).WithValues("1:p1", "1:p2", "1:p3").WithChildren(2);
+        Content[2] = new TestContent(type1, 2, 1).WithValues("2:p1", "2:p2", "2:p3");
+
+        Root = new TestRootContent(type).WithChildren(1);
+    }
+}
+
+internal class TestSource4 : TestSourceBase
+{
+    public TestSource4()
+    {
+        LastAttributeIndex = -1;
+
+        var prop1 = new TestPropertyType("prop1", true);
+        var prop2 = new TestPropertyType("prop2");
+        var type = new TestRootContentType(this);
+        var type1 = type.CreateType("type1", prop1, prop2);
+
+        Content[1] = new TestContent(type1, 1, -1).WithValues("<data value=\"value\"/>", "dang");
+        Content[2] = new TestContent(type1, 2, -1).WithValues(null, string.Empty);
+        Content[3] = new TestContent(type1, 3, -1).WithValues(null, null);
+
+        Root = new TestRootContent(type).WithChildren(1, 2, 3);
+    }
+}
+
+internal class TestSource5 : TestSourceBase
+{
+    public TestSource5()
+    {
+        LastAttributeIndex = -1;
+
+        var prop1 = new TestPropertyType("prop1");
+        var prop2 = new TestPropertyType("prop2");
+        var type = new TestRootContentType(this);
+        var type1 = type.CreateType("type1", prop1, prop2);
+
+        Content[1] = new TestContent(type1, 1, -1).WithValues("p11", "p12").WithChildren(3, 5);
+        Content[2] = new TestContent(type1, 2, -1).WithValues("p21", "p22").WithChildren(4, 6);
+        Content[3] = new TestContent(type1, 3, 1).WithValues("p31", "p32");
+        Content[4] = new TestContent(type1, 4, 2).WithValues("p41", "p42");
+        Content[5] = new TestContent(type1, 5, 1).WithValues("p51", "p52");
+        Content[6] = new TestContent(type1, 6, 2).WithValues("p61", "p62");
+
+        Root = new TestRootContent(type).WithChildren(1, 2);
+    }
+}
+
+internal class TestSource6 : TestSourceBase
+{
+    ////<root>
+    ////    <wrap>
+    ////        <item1 />
+    ////        <item2></item2>
+    ////        <item2a> </item2a>
+    ////        <item2b>
+    ////        </item2b>
+    ////        <item2c><![CDATA[
+    ////        ]]></item2c>
+    ////        <item3>blah</item3>
+    ////        <item4>
+    ////            <subitem x=""1"">bam</subitem>
+    ////        </item4>
+    ////        <item5>
+    ////        </item5>
+    ////    </wrap>
+    ////</root>
+
+    public TestSource6()
+    {
+        LastAttributeIndex = -1;
+
+        var type = new TestRootContentType(this);
+        var type1 = type.CreateType(
+            "wrap",
+            new TestPropertyType("item1"),
+            new TestPropertyType("item2"),
+            new TestPropertyType("item2a"),
+            new TestPropertyType("item2b"),
+            new TestPropertyType("item2c"),
+            new TestPropertyType("item3"),
+            new TestPropertyType("item3a"),
+            new TestPropertyType("item4", true),
+            new TestPropertyType("item5", true));
+
+        Content[1] = new TestContent(type1, 1, -1)
+            .WithValues(
+                null,
+                null,
+                null,
+                null,
+                "\n        ",
+                "blah",
+                "\n            blah\n        ",
+                "<subitem x=\"1\">bam</subitem>",
+                "\n        ");
+
+        Root = new TestRootContent(type).WithChildren(1);
+    }
+}
+
+internal class TestSource7 : TestSourceBase
+{
+    public TestSource7()
+    {
+        LastAttributeIndex = 0;
+
+        var prop1 = new TestPropertyType("isDoc");
+        var prop2 = new TestPropertyType("title");
+        var type = new TestRootContentType(this, prop1);
+        var type1 = type.CreateType("node", prop1, prop2);
+
+        Content[1] = new TestContent(type1, 1, -1).WithValues(1, "title-1").WithChildren(3, 5);
+        Content[2] = new TestContent(type1, 2, -1).WithValues(1, "title-2").WithChildren(4, 6);
+        Content[3] = new TestContent(type1, 3, 1).WithValues(1, "title-3").WithChildren(7, 8);
+        Content[4] = new TestContent(type1, 4, 2).WithValues(1, "title-4");
+        Content[5] = new TestContent(type1, 5, 1).WithValues(1, "title-5");
+        Content[6] = new TestContent(type1, 6, 2).WithValues(1, "title-6");
+
+        Content[7] = new TestContent(type1, 7, 3).WithValues(1, "title-7");
+        Content[8] = new TestContent(type1, 8, 3).WithValues(1, "title-8");
+
+        Root = new TestRootContent(type).WithValues(null).WithChildren(1, 2);
+    }
+}
+
+internal class TestSource8 : TestSourceBase
+{
+    public TestSource8()
+    {
+        LastAttributeIndex = 0;
+
+        var attr = new TestPropertyType("attr");
+        var prop = new TestPropertyType("prop");
+        var type = new TestRootContentType(this, attr);
+        var type1 = type.CreateType("item", attr, prop);
+        Content[1] = new TestContent(type1, 1, -1).WithValues(null, null);
+        Content[2] = new TestContent(type1, 2, -1).WithValues(string.Empty, string.Empty);
+        Content[3] = new TestContent(type1, 3, -1).WithValues("   ", "   ");
+        Content[4] = new TestContent(type1, 4, -1).WithValues(string.Empty, "\n");
+        Content[5] = new TestContent(type1, 5, -1).WithValues("  ooo  ", "   ooo   ");
+        Root = new TestRootContent(type).WithValues(null).WithChildren(1, 2, 3, 4, 5);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs
index 245d5f36a4..cacd29c3ee 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/CoreXml/RenamedRootNavigatorTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.Runtime.InteropServices;
@@ -8,113 +8,116 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Xml.XPath;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.CoreXml;
+
+[TestFixture]
+public class RenamedRootNavigatorTests
 {
-    [TestFixture]
-    public class RenamedRootNavigatorTests
+    [Test]
+    public void StandardNavigator()
     {
-        [Test]
-        public void StandardNavigator()
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(@"<root foo=""bar"">
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<root foo=""bar"">
   <a></a>
   <b x=""1""></b>
 </root>");
-            var nav = doc.CreateNavigator();
-            var xml = nav.OuterXml;
-            Assert.AreEqual(
-                EnsureNativeLineEndings(@"<root foo=""bar"">
+        var nav = doc.CreateNavigator();
+        var xml = nav.OuterXml;
+        Assert.AreEqual(
+            EnsureNativeLineEndings(@"<root foo=""bar"">
   <a></a>
   <b x=""1""></b>
-</root>"), xml);
-        }
+</root>"),
+            xml);
+    }
 
-        [Test]
-        public void StandardNavigatorWithNamespace()
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
+    [Test]
+    public void StandardNavigatorWithNamespace()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
   <a></a>
   <b x=""1""></b>
 </xx:root>");
-            var nav = doc.CreateNavigator();
-            var xml = nav.OuterXml;
-            Assert.AreEqual(
-                EnsureNativeLineEndings(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
+        var nav = doc.CreateNavigator();
+        var xml = nav.OuterXml;
+        Assert.AreEqual(
+            EnsureNativeLineEndings(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
   <a></a>
   <b x=""1""></b>
-</xx:root>"), xml);
-        }
+</xx:root>"),
+            xml);
+    }
 
-        [Test]
-        public void RenamedNavigator()
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(@"<root foo=""bar"">
+    [Test]
+    public void RenamedNavigator()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<root foo=""bar"">
   <a></a>
   <b x=""1""></b>
 </root>");
-            var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
-            var xml = nav.OuterXml;
-            Assert.AreEqual(
-                EnsureNativeLineEndings(@"<test foo=""bar"">
+        var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
+        var xml = nav.OuterXml;
+        Assert.AreEqual(
+            EnsureNativeLineEndings(@"<test foo=""bar"">
   <a></a>
   <b x=""1""></b>
-</test>"), xml);
-        }
+</test>"),
+            xml);
+    }
 
-        private string EnsureNativeLineEndings(string text)
-        {
-            var useCrLf = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
-            return useCrLf ? text.CrLf() : text.Lf();
-        }
+    private string EnsureNativeLineEndings(string text)
+    {
+        var useCrLf = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+        return useCrLf ? text.CrLf() : text.Lf();
+    }
 
-        [Test]
-        public void RenamedNavigatorWithNamespace()
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
+    [Test]
+    public void RenamedNavigatorWithNamespace()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
   <a></a>
   <b x=""1""></b>
 </xx:root>");
-            var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
-            var xml = nav.OuterXml;
-            Assert.AreEqual(
-                EnsureNativeLineEndings(@"<xx:test foo=""bar"" xmlns:xx=""uri"">
+        var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
+        var xml = nav.OuterXml;
+        Assert.AreEqual(
+            EnsureNativeLineEndings(@"<xx:test foo=""bar"" xmlns:xx=""uri"">
   <a></a>
   <b x=""1""></b>
-</xx:test>"), xml);
-        }
+</xx:test>"),
+            xml);
+    }
 
-        [Test]
-        public void RenamedNavigatorProperties()
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(@"<root foo=""bar"">
+    [Test]
+    public void RenamedNavigatorProperties()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<root foo=""bar"">
   <a></a>
   <b x=""1""></b>
 </root>");
-            var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            Assert.AreEqual("test", nav.Name);
-            Assert.AreEqual("test", nav.LocalName);
-        }
+        var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        Assert.AreEqual("test", nav.Name);
+        Assert.AreEqual("test", nav.LocalName);
+    }
 
-        [Test]
-        public void RenamedNavigatorWithNamespaceProperties()
-        {
-            var doc = new XmlDocument();
-            doc.LoadXml(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
+    [Test]
+    public void RenamedNavigatorWithNamespaceProperties()
+    {
+        var doc = new XmlDocument();
+        doc.LoadXml(@"<xx:root foo=""bar"" xmlns:xx=""uri"">
   <a></a>
   <b x=""1""></b>
 </xx:root>");
-            var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
-            Assert.IsTrue(nav.MoveToFirstChild());
-            Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
-            Assert.AreEqual("xx:test", nav.Name);
-            Assert.AreEqual("test", nav.LocalName);
-        }
+        var nav = new RenamedRootNavigator(doc.CreateNavigator(), "test");
+        Assert.IsTrue(nav.MoveToFirstChild());
+        Assert.AreEqual(XPathNodeType.Element, nav.NodeType);
+        Assert.AreEqual("xx:test", nav.Name);
+        Assert.AreEqual("test", nav.LocalName);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs
index c7a849cbc2..199f7ad6d5 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/DelegateExtensionsTests.cs
@@ -7,42 +7,41 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class DelegateExtensionsTests
 {
-    [TestFixture]
-    public class DelegateExtensionsTests
+    [Test]
+    public void Only_Executes_Specific_Count()
     {
-        [Test]
-        public void Only_Executes_Specific_Count()
-        {
-            const int maxTries = 5;
-            var totalTries = 0;
-            DelegateExtensions.RetryUntilSuccessOrMaxAttempts(
-                (currentTry) =>
-                {
-                    totalTries = currentTry;
-                    return Attempt<IndexWriter>.Fail();
-                },
-                5,
-                TimeSpan.FromMilliseconds(10));
+        const int maxTries = 5;
+        var totalTries = 0;
+        DelegateExtensions.RetryUntilSuccessOrMaxAttempts(
+            currentTry =>
+            {
+                totalTries = currentTry;
+                return Attempt<IndexWriter>.Fail();
+            },
+            5,
+            TimeSpan.FromMilliseconds(10));
 
-            Assert.AreEqual(maxTries, totalTries);
-        }
+        Assert.AreEqual(maxTries, totalTries);
+    }
 
-        [Test]
-        public void Quits_On_Success_Count()
-        {
-            var totalTries = 0;
-            DelegateExtensions.RetryUntilSuccessOrMaxAttempts(
-                (currentTry) =>
-                {
-                    totalTries = currentTry;
-                    return totalTries == 2 ? Attempt<string>.Succeed() : Attempt<string>.Fail();
-                },
-                5,
-                TimeSpan.FromMilliseconds(10));
+    [Test]
+    public void Quits_On_Success_Count()
+    {
+        var totalTries = 0;
+        DelegateExtensions.RetryUntilSuccessOrMaxAttempts(
+            currentTry =>
+            {
+                totalTries = currentTry;
+                return totalTries == 2 ? Attempt<string>.Succeed() : Attempt<string>.Fail();
+            },
+            5,
+            TimeSpan.FromMilliseconds(10));
 
-            Assert.AreEqual(2, totalTries);
-        }
+        Assert.AreEqual(2, totalTries);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs
index c4cd4f0c02..788fa63a6d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Deploy/ArtifactBaseTests.cs
@@ -9,61 +9,54 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Deploy;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Deploy
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Deploy;
+
+[TestFixture]
+public class ArtifactBaseTests
 {
-    [TestFixture]
-    public class ArtifactBaseTests
+    [Test]
+    public void CanSerialize()
     {
-        [Test]
-        public void CanSerialize()
+        var udi = new GuidUdi("test", Guid.Parse("3382d5433b5749d08919bc9961422a1f"));
+        var artifact = new TestArtifact(udi, new List<ArtifactDependency>()) { Name = "Test Name", Alias = "testAlias" };
+
+        var serialized = JsonConvert.SerializeObject(artifact);
+
+        var expected =
+            "{\"Udi\":\"umb://test/3382d5433b5749d08919bc9961422a1f\",\"Dependencies\":[],\"Name\":\"Test Name\",\"Alias\":\"testAlias\"}";
+        Assert.AreEqual(expected, serialized);
+    }
+
+    [Test]
+    public void Dependencies_Are_Correctly_Ordered()
+    {
+        // This test was introduced following: https://github.com/umbraco/Umbraco.Deploy.Issues/issues/72 to verify
+        // that consistent ordering rules are used across platforms.
+        var udi = new GuidUdi("test", Guid.Parse("3382d5433b5749d08919bc9961422a1f"));
+        var artifact = new TestArtifact(udi, new List<ArtifactDependency>()) { Name = "Test Name", Alias = "testAlias" };
+
+        var dependencies = new ArtifactDependencyCollection();
+
+        var dependencyUdi1 = new GuidUdi("template", Guid.Parse("d4651496fad24c1290a53ea4d55d945b"));
+        dependencies.Add(new ArtifactDependency(dependencyUdi1, true, ArtifactDependencyMode.Exist));
+
+        var dependencyUdi2 = new StringUdi(Constants.UdiEntityType.TemplateFile, "TestPage.cshtml");
+        dependencies.Add(new ArtifactDependency(dependencyUdi2, true, ArtifactDependencyMode.Exist));
+
+        artifact.Dependencies = dependencies;
+
+        Assert.AreEqual(
+            "umb://template-file/TestPage.cshtml,umb://template/d4651496fad24c1290a53ea4d55d945b",
+            string.Join(",", artifact.Dependencies.Select(x => x.Udi.ToString())));
+    }
+
+    private class TestArtifact : ArtifactBase<GuidUdi>
+    {
+        public TestArtifact(GuidUdi udi, IEnumerable<ArtifactDependency> dependencies = null)
+            : base(udi, dependencies)
         {
-            var udi = new GuidUdi("test", Guid.Parse("3382d5433b5749d08919bc9961422a1f"));
-            var artifact = new TestArtifact(udi, new List<ArtifactDependency>())
-            {
-                Name = "Test Name",
-                Alias = "testAlias",
-            };
-
-            var serialized = JsonConvert.SerializeObject(artifact);
-
-            var expected = "{\"Udi\":\"umb://test/3382d5433b5749d08919bc9961422a1f\",\"Dependencies\":[],\"Name\":\"Test Name\",\"Alias\":\"testAlias\"}";
-            Assert.AreEqual(expected, serialized);
         }
 
-        [Test]
-        public void Dependencies_Are_Correctly_Ordered()
-        {
-            // This test was introduced following: https://github.com/umbraco/Umbraco.Deploy.Issues/issues/72 to verify
-            // that consistent ordering rules are used across platforms.
-            var udi = new GuidUdi("test", Guid.Parse("3382d5433b5749d08919bc9961422a1f"));
-            var artifact = new TestArtifact(udi, new List<ArtifactDependency>())
-            {
-                Name = "Test Name",
-                Alias = "testAlias",
-            };
-
-            var dependencies = new ArtifactDependencyCollection();
-
-            var dependencyUdi1 = new GuidUdi("template", Guid.Parse("d4651496fad24c1290a53ea4d55d945b"));
-            dependencies.Add(new ArtifactDependency(dependencyUdi1, true, ArtifactDependencyMode.Exist));
-
-            var dependencyUdi2 = new StringUdi(Constants.UdiEntityType.TemplateFile, "TestPage.cshtml");
-            dependencies.Add(new ArtifactDependency(dependencyUdi2, true, ArtifactDependencyMode.Exist));
-
-            artifact.Dependencies = dependencies;
-
-            Assert.AreEqual(
-                "umb://template-file/TestPage.cshtml,umb://template/d4651496fad24c1290a53ea4d55d945b",
-                string.Join(",", artifact.Dependencies.Select(x => x.Udi.ToString())));
-        }
-
-        private class TestArtifact : ArtifactBase<GuidUdi>
-        {
-            public TestArtifact(GuidUdi udi, IEnumerable<ArtifactDependency> dependencies = null) : base(udi, dependencies)
-            {
-            }
-
-            protected override string GetChecksum() => "test checksum value";
-        }
+        protected override string GetChecksum() => "test checksum value";
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs
index 9b83c72804..aaa9b156e6 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EmbeddedResources/LanguageXmlTests.cs
@@ -5,32 +5,31 @@ using Microsoft.Extensions.FileProviders;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.EmbeddedResources
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.EmbeddedResources;
+
+[TestFixture]
+public class LanguageXmlTests
 {
-    [TestFixture]
-    public class LanguageXmlTests
+    [Test]
+    public void Can_Load_Language_Xml_Files()
     {
-        [Test]
-        public void Can_Load_Language_Xml_Files()
+        var readFilesCount = 0;
+        var xmlDocument = new XmlDocument();
+
+        var languageProvider = new EmbeddedFileProvider(typeof(IAssemblyProvider).Assembly, "Umbraco.Cms.Core.EmbeddedResources.Lang");
+        var files = languageProvider.GetDirectoryContents(string.Empty)
+            .Where(x => !x.IsDirectory && x.Name.EndsWith(".xml"));
+
+        foreach (var languageFile in files)
         {
-            var readFilesCount = 0;
-            var xmlDocument = new XmlDocument();
+            using var stream = new StreamReader(languageFile.CreateReadStream());
 
-            var languageProvider = new EmbeddedFileProvider(typeof(IAssemblyProvider).Assembly, "Umbraco.Cms.Core.EmbeddedResources.Lang");
-            var files = languageProvider.GetDirectoryContents(string.Empty)
-                                    .Where(x => !x.IsDirectory && x.Name.EndsWith(".xml"));
-
-            foreach (var languageFile in files)
-            {
-                using var stream = new StreamReader(languageFile.CreateReadStream());
-
-                // Load will throw an exception if the XML isn't valid.
-                xmlDocument.Load(stream);
-                readFilesCount++;
-            }
-
-            // Ensure that at least one file was read.
-            Assert.AreNotEqual(0, readFilesCount);
+            // Load will throw an exception if the XML isn't valid.
+            xmlDocument.Load(stream);
+            readFilesCount++;
         }
+
+        // Ensure that at least one file was read.
+        Assert.AreNotEqual(0, readFilesCount);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs
index ebb563bdf4..51435a2b19 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumExtensionsTests.cs
@@ -6,64 +6,63 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Trees;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class EnumExtensionsTests
 {
-    [TestFixture]
-    public class EnumExtensionsTests
+    [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
+    [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
+    [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
+    [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, false)]
+    public void HasFlagTest(TreeUse value, TreeUse test, bool expected)
     {
-        [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
-        [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
-        [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
-        [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, false)]
-        public void HasFlagTest(TreeUse value, TreeUse test, bool expected)
+        // The built-in Enum.HasFlag() method determines whether
+        // all bits from <test> are set (other bits can be set too).
+        if (expected)
         {
-            // The built-in Enum.HasFlag() method determines whether
-            // all bits from <test> are set (other bits can be set too).
-            if (expected)
-            {
-                Assert.IsTrue(value.HasFlag(test));
-            }
-            else
-            {
-                Assert.IsFalse(value.HasFlag(test));
-            }
+            Assert.IsTrue(value.HasFlag(test));
         }
-
-        [Obsolete]
-        [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
-        [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
-        [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
-        [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, false)]
-        public void HasFlagAllTest(TreeUse value, TreeUse test, bool expected)
+        else
         {
-            // The HasFlagAll() extension method determines whether
-            // all bits from <test> are set (other bits can be set too).
-            if (expected)
-            {
-                Assert.IsTrue(value.HasFlagAll(test));
-            }
-            else
-            {
-                Assert.IsFalse(value.HasFlagAll(test));
-            }
+            Assert.IsFalse(value.HasFlag(test));
         }
+    }
 
-        [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
-        [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
-        [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
-        [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, true)]
-        public void HasFlagAnyTest(TreeUse value, TreeUse test, bool expected)
+    [Obsolete]
+    [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
+    [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
+    [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
+    [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, false)]
+    public void HasFlagAllTest(TreeUse value, TreeUse test, bool expected)
+    {
+        // The HasFlagAll() extension method determines whether
+        // all bits from <test> are set (other bits can be set too).
+        if (expected)
         {
-            // The HasFlagAny() extension method determines whether
-            // at least one bit from <test> is set.
-            if (expected)
-            {
-                Assert.IsTrue(value.HasFlagAny(test));
-            }
-            else
-            {
-                Assert.IsFalse(value.HasFlagAny(test));
-            }
+            Assert.IsTrue(value.HasFlagAll(test));
+        }
+        else
+        {
+            Assert.IsFalse(value.HasFlagAll(test));
+        }
+    }
+
+    [TestCase(TreeUse.Dialog, TreeUse.Dialog, true)]
+    [TestCase(TreeUse.Dialog, TreeUse.Main, false)]
+    [TestCase(TreeUse.Dialog | TreeUse.Main, TreeUse.Dialog, true)]
+    [TestCase(TreeUse.Dialog, TreeUse.Dialog | TreeUse.Main, true)]
+    public void HasFlagAnyTest(TreeUse value, TreeUse test, bool expected)
+    {
+        // The HasFlagAny() extension method determines whether
+        // at least one bit from <test> is set.
+        if (expected)
+        {
+            Assert.IsTrue(value.HasFlagAny(test));
+        }
+        else
+        {
+            Assert.IsFalse(value.HasFlagAny(test));
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs
index a3e29c28aa..ffdf180442 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/EnumerableExtensionsTests.cs
@@ -7,186 +7,164 @@ using System.Linq;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class EnumerableExtensionsTests
 {
-    [TestFixture]
-    public class EnumerableExtensionsTests
+    [Test]
+    public void Unsorted_Sequence_Equal()
     {
-        [Test]
-        public void Unsorted_Sequence_Equal()
+        var list1 = new[] { 1, 2, 3, 4, 5, 6 };
+        var list2 = new[] { 6, 5, 3, 2, 1, 4 };
+        var list3 = new[] { 6, 5, 4, 3, 2, 2 };
+
+        Assert.IsTrue(list1.UnsortedSequenceEqual(list2));
+        Assert.IsTrue(list2.UnsortedSequenceEqual(list1));
+        Assert.IsFalse(list1.UnsortedSequenceEqual(list3));
+
+        Assert.IsTrue(((IEnumerable<object>)null).UnsortedSequenceEqual(null));
+        Assert.IsFalse(((IEnumerable<int>)null).UnsortedSequenceEqual(list1));
+        Assert.IsFalse(list1.UnsortedSequenceEqual(null));
+    }
+
+    [Test]
+    public void Contains_All()
+    {
+        var list1 = new[] { 1, 2, 3, 4, 5, 6 };
+        var list2 = new[] { 6, 5, 3, 2, 1, 4 };
+        var list3 = new[] { 6, 5, 4, 3 };
+
+        Assert.IsTrue(list1.ContainsAll(list2));
+        Assert.IsTrue(list2.ContainsAll(list1));
+        Assert.IsTrue(list1.ContainsAll(list3));
+        Assert.IsFalse(list3.ContainsAll(list1));
+    }
+
+    [Test]
+    public void SelectRecursive_2()
+    {
+        var hierarchy = new TestItem("1") { Children = new List<TestItem> { new("1.1"), new("1.2"), new("1.3") } };
+
+        var selectRecursive = hierarchy.Children.SelectRecursive(x => x.Children);
+
+        Assert.AreEqual(3, selectRecursive.Count());
+    }
+
+    [Test]
+    public void SelectRecursive()
+    {
+        var hierarchy = new TestItem("1")
         {
-            var list1 = new[] { 1, 2, 3, 4, 5, 6 };
-            var list2 = new[] { 6, 5, 3, 2, 1, 4 };
-            var list3 = new[] { 6, 5, 4, 3, 2, 2 };
-
-            Assert.IsTrue(list1.UnsortedSequenceEqual(list2));
-            Assert.IsTrue(list2.UnsortedSequenceEqual(list1));
-            Assert.IsFalse(list1.UnsortedSequenceEqual(list3));
-
-            Assert.IsTrue(((IEnumerable<object>)null).UnsortedSequenceEqual(null));
-            Assert.IsFalse(((IEnumerable<int>)null).UnsortedSequenceEqual(list1));
-            Assert.IsFalse(list1.UnsortedSequenceEqual(null));
-        }
-
-        [Test]
-        public void Contains_All()
-        {
-            var list1 = new[] { 1, 2, 3, 4, 5, 6 };
-            var list2 = new[] { 6, 5, 3, 2, 1, 4 };
-            var list3 = new[] { 6, 5, 4, 3 };
-
-            Assert.IsTrue(list1.ContainsAll(list2));
-            Assert.IsTrue(list2.ContainsAll(list1));
-            Assert.IsTrue(list1.ContainsAll(list3));
-            Assert.IsFalse(list3.ContainsAll(list1));
-        }
-
-        [Test]
-        public void SelectRecursive_2()
-        {
-            var hierarchy = new TestItem("1")
+            Children = new List<TestItem>
             {
-                Children = new List<TestItem>
+                new("1.1")
                 {
-                    new TestItem("1.1"),
-                    new TestItem("1.2"),
-                    new TestItem("1.3")
-                }
-            };
-
-            IEnumerable<TestItem> selectRecursive = hierarchy.Children.SelectRecursive(x => x.Children);
-
-            Assert.AreEqual(3, selectRecursive.Count());
-        }
-
-        [Test]
-        public void SelectRecursive()
-        {
-            var hierarchy = new TestItem("1")
-            {
-                Children = new List<TestItem>
-                {
-                    new TestItem("1.1")
+                    Children = new List<TestItem>
                     {
-                        Children = new List<TestItem>
+                        new("1.1.1")
                         {
-                            new TestItem("1.1.1")
+                            Children = new List<TestItem>
                             {
-                                Children = new List<TestItem>
+                                new("1.1.1.1")
                                 {
-                                    new TestItem("1.1.1.1")
+                                    Children = new List<TestItem>
                                     {
-                                        Children = new List<TestItem>
-                                        {
-                                            new TestItem("1.1.1.1.1"),
-                                            new TestItem("1.1.1.1.2")
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    },
-                    new TestItem("1.2")
-                    {
-                        Children = new List<TestItem>
-                        {
-                            new TestItem("1.2.1")
-                            {
-                                Children = new List<TestItem>
-                                {
-                                    new TestItem("1.2.1.1")
-                                    {
-                                        Children = new List<TestItem>()
-                                    }
-                                }
+                                        new("1.1.1.1.1"), new("1.1.1.1.2"),
+                                    },
+                                },
                             },
-                            new TestItem("1.2.2")
-                            {
-                                Children = new List<TestItem>
-                                {
-                                    new TestItem("1.2.2.1")
-                                    {
-                                        Children = new List<TestItem>()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-
-            IEnumerable<TestItem> selectRecursive = hierarchy.Children.SelectRecursive(x => x.Children);
-            Assert.AreEqual(10, selectRecursive.Count());
-        }
-
-        private class TestItem
-        {
-            public TestItem(string name)
-            {
-                Children = Enumerable.Empty<TestItem>();
-                Name = name;
-            }
-
-            public string Name { get; }
-
-            public IEnumerable<TestItem> Children { get; set; }
-        }
-
-        [Test]
-        public void InGroupsOf_ReturnsAllElements()
-        {
-            var integers = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
-
-            IEnumerable<int>[] groupsOfTwo = integers.InGroupsOf(2).ToArray();
-
-            var flattened = groupsOfTwo.SelectMany(x => x).ToArray();
-
-            Assert.That(groupsOfTwo.Length, Is.EqualTo(5));
-            Assert.That(flattened.Length, Is.EqualTo(integers.Length));
-            CollectionAssert.AreEquivalent(integers, flattened);
-
-            IEnumerable<int>[] groupsOfMassive = integers.InGroupsOf(100).ToArray();
-            Assert.That(groupsOfMassive.Length, Is.EqualTo(1));
-            flattened = groupsOfMassive.SelectMany(x => x).ToArray();
-            Assert.That(flattened.Length, Is.EqualTo(integers.Length));
-            CollectionAssert.AreEquivalent(integers, flattened);
-        }
-
-        [Test]
-        public void InGroupsOf_CanRepeat()
-        {
-            var integers = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
-            IEnumerable<IEnumerable<int>> inGroupsOf = integers.InGroupsOf(2);
-            Assert.AreEqual(5, inGroupsOf.Count());
-            Assert.AreEqual(5, inGroupsOf.Count()); // again
-        }
-
-        [TestCase]
-        public void DistinctBy_ReturnsDistinctElements_AndResetsIteratorCorrectly()
-        {
-            // Arrange
-            var tuple1 = new System.Tuple<string, string>("fruit", "apple");
-            var tuple2 = new System.Tuple<string, string>("fruit", "orange");
-            var tuple3 = new System.Tuple<string, string>("fruit", "banana");
-            var tuple4 = new System.Tuple<string, string>("fruit", "banana"); // Should be filtered out
-            var list = new List<System.Tuple<string, string>>()
+                        },
+                    },
+                },
+                new("1.2")
                 {
-                    tuple1,
-                    tuple2,
-                    tuple3,
-                    tuple4
-                };
+                    Children = new List<TestItem>
+                    {
+                        new("1.2.1")
+                        {
+                            Children = new List<TestItem>
+                            {
+                                new("1.2.1.1") { Children = new List<TestItem>() },
+                            },
+                        },
+                        new("1.2.2")
+                        {
+                            Children = new List<TestItem>
+                            {
+                                new("1.2.2.1") { Children = new List<TestItem>() },
+                            },
+                        },
+                    },
+                },
+            },
+        };
 
-            // Act
-            IEnumerable<Tuple<string, string>> iteratorSource = list.DistinctBy(x => x.Item2);
+        var selectRecursive = hierarchy.Children.SelectRecursive(x => x.Children);
+        Assert.AreEqual(10, selectRecursive.Count());
+    }
 
-            // Assert
-            // First check distinction
-            Assert.AreEqual(3, iteratorSource.Count());
-
-            // Check for iterator block mistakes - reset to original query first
-            iteratorSource = list.DistinctBy(x => x.Item2);
-            Assert.AreEqual(iteratorSource.Count(), iteratorSource.ToList().Count());
+    private class TestItem
+    {
+        public TestItem(string name)
+        {
+            Children = Enumerable.Empty<TestItem>();
+            Name = name;
         }
+
+        public string Name { get; }
+
+        public IEnumerable<TestItem> Children { get; set; }
+    }
+
+    [Test]
+    public void InGroupsOf_ReturnsAllElements()
+    {
+        var integers = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
+
+        var groupsOfTwo = integers.InGroupsOf(2).ToArray();
+
+        var flattened = groupsOfTwo.SelectMany(x => x).ToArray();
+
+        Assert.That(groupsOfTwo.Length, Is.EqualTo(5));
+        Assert.That(flattened.Length, Is.EqualTo(integers.Length));
+        CollectionAssert.AreEquivalent(integers, flattened);
+
+        var groupsOfMassive = integers.InGroupsOf(100).ToArray();
+        Assert.That(groupsOfMassive.Length, Is.EqualTo(1));
+        flattened = groupsOfMassive.SelectMany(x => x).ToArray();
+        Assert.That(flattened.Length, Is.EqualTo(integers.Length));
+        CollectionAssert.AreEquivalent(integers, flattened);
+    }
+
+    [Test]
+    public void InGroupsOf_CanRepeat()
+    {
+        var integers = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8 };
+        var inGroupsOf = integers.InGroupsOf(2);
+        Assert.AreEqual(5, inGroupsOf.Count());
+        Assert.AreEqual(5, inGroupsOf.Count()); // again
+    }
+
+    [TestCase]
+    public void DistinctBy_ReturnsDistinctElements_AndResetsIteratorCorrectly()
+    {
+        // Arrange
+        var tuple1 = new Tuple<string, string>("fruit", "apple");
+        var tuple2 = new Tuple<string, string>("fruit", "orange");
+        var tuple3 = new Tuple<string, string>("fruit", "banana");
+        var tuple4 = new Tuple<string, string>("fruit", "banana"); // Should be filtered out
+        var list = new List<Tuple<string, string>> { tuple1, tuple2, tuple3, tuple4 };
+
+        // Act
+        var iteratorSource = list.DistinctBy(x => x.Item2).ToArray();
+
+        // Assert
+        // First check distinction
+        Assert.AreEqual(3, iteratorSource.Count());
+
+        // Check for iterator block mistakes - reset to original query first
+        iteratorSource = list.DistinctBy(x => x.Item2).ToArray();
+        Assert.AreEqual(iteratorSource.Length, iteratorSource.ToList().Count);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs
index b747594fd1..4ca9a422e8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Events/EventAggregatorTests.cs
@@ -12,121 +12,113 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Events
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Events;
+
+[TestFixture]
+public class EventAggregatorTests
 {
-    [TestFixture]
-    public class EventAggregatorTests
+    [SetUp]
+    public void Setup()
     {
-        private const int A = 3;
-        private const int B = 5;
-        private const int C = 7;
-        private IUmbracoBuilder _builder;
+        var register = TestHelper.GetServiceCollection();
+        _builder = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+    }
 
-        [SetUp]
-        public void Setup()
+    private const int A = 3;
+    private const int B = 5;
+    private const int C = 7;
+    private IUmbracoBuilder _builder;
+
+    [Test]
+    public async Task CanPublishAsyncEvents()
+    {
+        _builder.Services.AddScoped<Adder>();
+        _builder.AddNotificationAsyncHandler<Notification, NotificationAsyncHandlerA>();
+        _builder.AddNotificationAsyncHandler<Notification, NotificationAsyncHandlerB>();
+        _builder.AddNotificationAsyncHandler<Notification, NotificationAsyncHandlerC>();
+        var provider = _builder.Services.BuildServiceProvider();
+
+        var notification = new Notification();
+        var aggregator = provider.GetService<IEventAggregator>();
+        await aggregator.PublishAsync(notification);
+
+        Assert.AreEqual(A + B + C, notification.SubscriberCount);
+    }
+
+    [Test]
+    public async Task CanPublishEvents()
+    {
+        _builder.Services.AddScoped<Adder>();
+        _builder.AddNotificationHandler<Notification, NotificationHandlerA>();
+        _builder.AddNotificationHandler<Notification, NotificationHandlerB>();
+        _builder.AddNotificationHandler<Notification, NotificationHandlerC>();
+        var provider = _builder.Services.BuildServiceProvider();
+
+        var notification = new Notification();
+        var aggregator = provider.GetService<IEventAggregator>();
+        await aggregator.PublishAsync(notification);
+
+        Assert.AreEqual(A + B + C, notification.SubscriberCount);
+    }
+
+    public class Notification : INotification
+    {
+        public int SubscriberCount { get; set; }
+    }
+
+    public class NotificationHandlerA : INotificationHandler<Notification>
+    {
+        public void Handle(Notification notification) => notification.SubscriberCount += A;
+    }
+
+    public class NotificationHandlerB : INotificationHandler<Notification>
+    {
+        public void Handle(Notification notification) => notification.SubscriberCount += B;
+    }
+
+    public class NotificationHandlerC : INotificationHandler<Notification>
+    {
+        private readonly Adder _adder;
+
+        public NotificationHandlerC(Adder adder) => _adder = adder;
+
+        public void Handle(Notification notification) =>
+            notification.SubscriberCount = _adder.Add(notification.SubscriberCount, C);
+    }
+
+    public class NotificationAsyncHandlerA : INotificationAsyncHandler<Notification>
+    {
+        public Task HandleAsync(Notification notification, CancellationToken cancellationToken)
         {
-            IServiceCollection register = TestHelper.GetServiceCollection();
-            _builder = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-        }
-
-        [Test]
-        public async Task CanPublishAsyncEvents()
-        {
-            _builder.Services.AddScoped<Adder>();
-            _builder.AddNotificationAsyncHandler<Notification, NotificationAsyncHandlerA>();
-            _builder.AddNotificationAsyncHandler<Notification, NotificationAsyncHandlerB>();
-            _builder.AddNotificationAsyncHandler<Notification, NotificationAsyncHandlerC>();
-            ServiceProvider provider = _builder.Services.BuildServiceProvider();
-
-            var notification = new Notification();
-            IEventAggregator aggregator = provider.GetService<IEventAggregator>();
-            await aggregator.PublishAsync(notification);
-
-            Assert.AreEqual(A + B + C, notification.SubscriberCount);
-        }
-
-        [Test]
-        public async Task CanPublishEvents()
-        {
-            _builder.Services.AddScoped<Adder>();
-            _builder.AddNotificationHandler<Notification, NotificationHandlerA>();
-            _builder.AddNotificationHandler<Notification, NotificationHandlerB>();
-            _builder.AddNotificationHandler<Notification, NotificationHandlerC>();
-            ServiceProvider provider = _builder.Services.BuildServiceProvider();
-
-            var notification = new Notification();
-            IEventAggregator aggregator = provider.GetService<IEventAggregator>();
-            await aggregator.PublishAsync(notification);
-
-            Assert.AreEqual(A + B + C, notification.SubscriberCount);
-        }
-
-        public class Notification : INotification
-        {
-            public int SubscriberCount { get; set; }
-        }
-
-        public class NotificationHandlerA : INotificationHandler<Notification>
-        {
-            public void Handle(Notification notification)
-            {
-                notification.SubscriberCount += A;
-            }
-        }
-
-        public class NotificationHandlerB : INotificationHandler<Notification>
-        {
-            public void Handle(Notification notification)
-            {
-                notification.SubscriberCount += B;
-            }
-        }
-
-        public class NotificationHandlerC : INotificationHandler<Notification>
-        {
-            private readonly Adder _adder;
-
-            public NotificationHandlerC(Adder adder) => _adder = adder;
-
-            public void Handle(Notification notification)
-            {
-                notification.SubscriberCount = _adder.Add(notification.SubscriberCount, C);
-            }
-        }
-
-           public class NotificationAsyncHandlerA : INotificationAsyncHandler<Notification>
-        {
-            public Task HandleAsync(Notification notification, CancellationToken cancellationToken)
-            {
-                notification.SubscriberCount += A;
-                return Task.CompletedTask;
-            }
-        }
-
-        public class NotificationAsyncHandlerB : INotificationAsyncHandler<Notification>
-        {
-            public Task HandleAsync(Notification notification, CancellationToken cancellationToken)
-            {
-                notification.SubscriberCount += B;
-                return Task.CompletedTask;
-            }
-        }
-
-        public class NotificationAsyncHandlerC : INotificationAsyncHandler<Notification>
-        {
-            private readonly Adder _adder;
-
-            public NotificationAsyncHandlerC(Adder adder) => _adder = adder;
-
-            public Task HandleAsync(Notification notification, CancellationToken cancellationToken)
-            {
-                notification.SubscriberCount = _adder.Add(notification.SubscriberCount, C);
-                return Task.CompletedTask;
-            }
-        }
-        public class Adder
-        {
-            public int Add(int a, int b) => a + b;
+            notification.SubscriberCount += A;
+            return Task.CompletedTask;
         }
     }
+
+    public class NotificationAsyncHandlerB : INotificationAsyncHandler<Notification>
+    {
+        public Task HandleAsync(Notification notification, CancellationToken cancellationToken)
+        {
+            notification.SubscriberCount += B;
+            return Task.CompletedTask;
+        }
+    }
+
+    public class NotificationAsyncHandlerC : INotificationAsyncHandler<Notification>
+    {
+        private readonly Adder _adder;
+
+        public NotificationAsyncHandlerC(Adder adder) => _adder = adder;
+
+        public Task HandleAsync(Notification notification, CancellationToken cancellationToken)
+        {
+            notification.SubscriberCount = _adder.Add(notification.SubscriberCount, C);
+            return Task.CompletedTask;
+        }
+    }
+
+    public class Adder
+    {
+        public int Add(int a, int b) => a + b;
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs
index f0ec8698ee..1b3d650223 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ClaimsPrincipalExtensionsTests.cs
@@ -8,82 +8,80 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions;
+
+[TestFixture]
+public class ClaimsPrincipalExtensionsTests
 {
-    [TestFixture]
-    public class ClaimsPrincipalExtensionsTests
+    [Test]
+    public void Get_Remaining_Ticket_Seconds()
     {
-        [Test]
-        public void Get_Remaining_Ticket_Seconds()
-        {
-            var backOfficeIdentity = new ClaimsIdentity();
-            backOfficeIdentity.AddRequiredClaims(
-                Constants.Security.SuperUserIdAsString,
-                "test",
-                "test",
-                Enumerable.Empty<int>(),
-                Enumerable.Empty<int>(),
-                "en-US",
-                Guid.NewGuid().ToString(),
-                Enumerable.Empty<string>(),
-                Enumerable.Empty<string>());
+        var backOfficeIdentity = new ClaimsIdentity();
+        backOfficeIdentity.AddRequiredClaims(
+            Constants.Security.SuperUserIdAsString,
+            "test",
+            "test",
+            Enumerable.Empty<int>(),
+            Enumerable.Empty<int>(),
+            "en-US",
+            Guid.NewGuid().ToString(),
+            Enumerable.Empty<string>(),
+            Enumerable.Empty<string>());
 
-            var principal = new ClaimsPrincipal(backOfficeIdentity);
+        var principal = new ClaimsPrincipal(backOfficeIdentity);
 
-            var expireSeconds = 99;
-            var elapsedSeconds = 3;
-            var remainingSeconds = expireSeconds - elapsedSeconds;
-            DateTimeOffset now = DateTimeOffset.Now;
-            DateTimeOffset then = now.AddSeconds(elapsedSeconds);
-            var expires = now.AddSeconds(expireSeconds).ToString("o");
+        var expireSeconds = 99;
+        var elapsedSeconds = 3;
+        var remainingSeconds = expireSeconds - elapsedSeconds;
+        var now = DateTimeOffset.Now;
+        var then = now.AddSeconds(elapsedSeconds);
+        var expires = now.AddSeconds(expireSeconds).ToString("o");
 
-            backOfficeIdentity.AddClaim(new Claim(
-                Constants.Security.TicketExpiresClaimType,
-                expires,
-                ClaimValueTypes.DateTime,
-                Constants.Security.BackOfficeAuthenticationType,
-                Constants.Security.BackOfficeAuthenticationType,
-                backOfficeIdentity));
+        backOfficeIdentity.AddClaim(new Claim(
+            Constants.Security.TicketExpiresClaimType,
+            expires,
+            ClaimValueTypes.DateTime,
+            Constants.Security.BackOfficeAuthenticationType,
+            Constants.Security.BackOfficeAuthenticationType,
+            backOfficeIdentity));
 
-            var ticketRemainingSeconds = principal.GetRemainingAuthSeconds(then);
+        var ticketRemainingSeconds = principal.GetRemainingAuthSeconds(then);
 
-            Assert.AreEqual(remainingSeconds, ticketRemainingSeconds);
-        }
+        Assert.AreEqual(remainingSeconds, ticketRemainingSeconds);
+    }
 
-        [Test]
-        public void AddOrUpdateClaim__Should_ensure_a_claim_is_not_added_twice()
-        {
-            var backOfficeIdentity = new ClaimsIdentity();
-            backOfficeIdentity.AddRequiredClaims(
-                Constants.Security.SuperUserIdAsString,
-                "test",
-                "test",
-                Enumerable.Empty<int>(),
-                Enumerable.Empty<int>(),
-                "en-US",
-                Guid.NewGuid().ToString(),
-                Enumerable.Empty<string>(),
-                Enumerable.Empty<string>());
+    [Test]
+    public void AddOrUpdateClaim__Should_ensure_a_claim_is_not_added_twice()
+    {
+        var backOfficeIdentity = new ClaimsIdentity();
+        backOfficeIdentity.AddRequiredClaims(
+            Constants.Security.SuperUserIdAsString,
+            "test",
+            "test",
+            Enumerable.Empty<int>(),
+            Enumerable.Empty<int>(),
+            "en-US",
+            Guid.NewGuid().ToString(),
+            Enumerable.Empty<string>(),
+            Enumerable.Empty<string>());
 
-            var expireSeconds = 99;
+        var expireSeconds = 99;
 
-            DateTimeOffset now = DateTimeOffset.Now;
+        var now = DateTimeOffset.Now;
 
-            var expires = now.AddSeconds(expireSeconds).ToString("o");
+        var expires = now.AddSeconds(expireSeconds).ToString("o");
 
+        var claim = new Claim(
+            Constants.Security.TicketExpiresClaimType,
+            expires,
+            ClaimValueTypes.DateTime,
+            Constants.Security.BackOfficeAuthenticationType,
+            Constants.Security.BackOfficeAuthenticationType,
+            backOfficeIdentity);
 
-            var claim = new Claim(
-                Constants.Security.TicketExpiresClaimType,
-                expires,
-                ClaimValueTypes.DateTime,
-                Constants.Security.BackOfficeAuthenticationType,
-                Constants.Security.BackOfficeAuthenticationType,
-                backOfficeIdentity);
+        backOfficeIdentity.AddOrUpdateClaim(claim);
+        backOfficeIdentity.AddOrUpdateClaim(claim);
 
-            backOfficeIdentity.AddOrUpdateClaim(claim);
-            backOfficeIdentity.AddOrUpdateClaim(claim);
-
-            Assert.AreEqual(1, backOfficeIdentity.Claims.Count(x=>x.Type == Constants.Security.TicketExpiresClaimType));
-        }
+        Assert.AreEqual(1, backOfficeIdentity.Claims.Count(x => x.Type == Constants.Security.TicketExpiresClaimType));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ConfigurationExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ConfigurationExtensionsTests.cs
index 94fbc6fcfa..11eb292ac2 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ConfigurationExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/ConfigurationExtensionsTests.cs
@@ -9,122 +9,126 @@ using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions;
+
+[TestFixture]
+public class ConfigurationExtensionsTests
 {
-    [TestFixture]
-    public class ConfigurationExtensionsTests
+    private const string DataDirectory = @"C:\Data";
+
+    [Test]
+    public void CanParseSqlServerConnectionString()
     {
-        private const string DataDirectory = @"C:\Data";
+        const string ConfiguredConnectionString = @"Server=.\SQLEXPRESS;Database=UmbracoCms;Integrated Security=true";
 
-        [Test]
-        public void CanParseSqlServerConnectionString()
-        {
-            const string ConfiguredConnectionString = @"Server=.\SQLEXPRESS;Database=UmbracoCms;Integrated Security=true";
+        var mockedConfig = CreateConfig(ConfiguredConnectionString);
 
-            Mock<IConfiguration> mockedConfig = CreateConfig(ConfiguredConnectionString);
+        var connectionString = mockedConfig.Object.GetUmbracoConnectionString(out var providerName);
 
-            string connectionString = mockedConfig.Object.GetUmbracoConnectionString(out string providerName);
+        AssertResults(
+            ConfiguredConnectionString,
+            "Microsoft.Data.SqlClient",
+            connectionString,
+            providerName);
+    }
 
-            AssertResults(
-                ConfiguredConnectionString,
-                "Microsoft.Data.SqlClient",
-                connectionString,
-                providerName);
-        }
+    [Test]
+    public void CanParseLocalDbConnectionString()
+    {
+        const string ConfiguredConnectionString = @"Server=(LocalDb)\MyInstance;Integrated Security=true;";
 
-        [Test]
-        public void CanParseLocalDbConnectionString()
-        {
-            const string ConfiguredConnectionString = @"Server=(LocalDb)\MyInstance;Integrated Security=true;";
+        var mockedConfig = CreateConfig(ConfiguredConnectionString);
 
-            Mock<IConfiguration> mockedConfig = CreateConfig(ConfiguredConnectionString);
+        var connectionString = mockedConfig.Object.GetUmbracoConnectionString(out var providerName);
 
-            string connectionString = mockedConfig.Object.GetUmbracoConnectionString(out string providerName);
+        AssertResults(
+            ConfiguredConnectionString,
+            "Microsoft.Data.SqlClient",
+            connectionString,
+            providerName);
+    }
 
-            AssertResults(
-                ConfiguredConnectionString,
-                "Microsoft.Data.SqlClient",
-                connectionString,
-                providerName);
-        }
+    [Test]
+    public void CanParseLocalDbConnectionStringWithDataDirectory()
+    {
+        const string ConfiguredConnectionString =
+            @"Data Source=(LocalDb)\MyInstance;Initial Catalog=UmbracoDb;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\Umbraco.mdf";
 
-        [Test]
-        public void CanParseLocalDbConnectionStringWithDataDirectory()
-        {
-            const string ConfiguredConnectionString = @"Data Source=(LocalDb)\MyInstance;Initial Catalog=UmbracoDb;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\Umbraco.mdf";
+        var mockedConfig = CreateConfig(ConfiguredConnectionString);
+        SetDataDirectory();
 
-            Mock<IConfiguration> mockedConfig = CreateConfig(ConfiguredConnectionString);
-            SetDataDirectory();
+        var connectionString = mockedConfig.Object.GetUmbracoConnectionString(out var providerName);
 
-            string connectionString = mockedConfig.Object.GetUmbracoConnectionString(out string providerName);
+        AssertResults(
+            @"Data Source=(LocalDb)\MyInstance;Initial Catalog=UmbracoDb;Integrated Security=SSPI;AttachDBFilename=C:\Data\Umbraco.mdf",
+            "Microsoft.Data.SqlClient",
+            connectionString,
+            providerName);
+    }
 
-            AssertResults(
-                @"Data Source=(LocalDb)\MyInstance;Initial Catalog=UmbracoDb;Integrated Security=SSPI;AttachDBFilename=C:\Data\Umbraco.mdf",
-                "Microsoft.Data.SqlClient",
-                connectionString,
-                providerName);
-        }
+    [Test]
+    public void CanParseSQLiteConnectionStringWithDataDirectory()
+    {
+        const string ConfiguredConnectionString =
+            "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True";
+        const string ConfiguredProviderName = "Microsoft.Data.SQLite";
 
-        [Test]
-        public void CanParseSQLiteConnectionStringWithDataDirectory()
-        {
-            const string ConfiguredConnectionString = "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True";
-            const string ConfiguredProviderName = "Microsoft.Data.SQLite";
+        var mockedConfig = CreateConfig(ConfiguredConnectionString, ConfiguredProviderName);
+        SetDataDirectory();
 
-            Mock<IConfiguration> mockedConfig = CreateConfig(ConfiguredConnectionString, ConfiguredProviderName);
-            SetDataDirectory();
+        var connectionString = mockedConfig.Object.GetUmbracoConnectionString(out var providerName);
 
-            string connectionString = mockedConfig.Object.GetUmbracoConnectionString(out string providerName);
+        AssertResults(
+            @"Data Source=C:\Data/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
+            "Microsoft.Data.SQLite",
+            connectionString,
+            providerName);
+    }
 
-            AssertResults(
-                @"Data Source=C:\Data/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
-                "Microsoft.Data.SQLite",
-                connectionString,
-                providerName);
-        }
+    [Test]
+    public void CanParseConnectionStringWithNamedProvider()
+    {
+        const string ConfiguredConnectionString = @"Server=.\SQLEXPRESS;Database=UmbracoCms;Integrated Security=true";
+        const string ConfiguredProviderName = "MyProvider";
 
-        [Test]
-        public void CanParseConnectionStringWithNamedProvider()
-        {
-            const string ConfiguredConnectionString = @"Server=.\SQLEXPRESS;Database=UmbracoCms;Integrated Security=true";
-            const string ConfiguredProviderName = "MyProvider";
+        var mockedConfig = CreateConfig(ConfiguredConnectionString, ConfiguredProviderName);
 
-            Mock<IConfiguration> mockedConfig = CreateConfig(ConfiguredConnectionString, ConfiguredProviderName);
+        var connectionString = mockedConfig.Object.GetUmbracoConnectionString(out var providerName);
 
-            string connectionString = mockedConfig.Object.GetUmbracoConnectionString(out string providerName);
+        AssertResults(
+            ConfiguredConnectionString,
+            ConfiguredProviderName,
+            connectionString,
+            providerName);
+    }
 
-            AssertResults(
-                ConfiguredConnectionString,
-                ConfiguredProviderName,
-                connectionString,
-                providerName);
-        }
+    private static Mock<IConfiguration> CreateConfig(string configuredConnectionString, string configuredProviderName = ConnectionStrings.DefaultProviderName)
+    {
+        var mockConfigSection = new Mock<IConfigurationSection>();
+        mockConfigSection
+            .SetupGet(m => m[It.Is<string>(s => s == Constants.System.UmbracoConnectionName)])
+            .Returns(configuredConnectionString);
+        mockConfigSection
+            .SetupGet(m =>
+                m[
+                    It.Is<string>(s =>
+                        s == $"{Constants.System.UmbracoConnectionName}{ConnectionStrings.ProviderNamePostfix}")])
+            .Returns(configuredProviderName);
 
-        private static Mock<IConfiguration> CreateConfig(string configuredConnectionString, string configuredProviderName = ConnectionStrings.DefaultProviderName)
-        {
-            var mockConfigSection = new Mock<IConfigurationSection>();
-            mockConfigSection
-                .SetupGet(m => m[It.Is<string>(s => s == Constants.System.UmbracoConnectionName)])
-                .Returns(configuredConnectionString);
-            mockConfigSection
-                .SetupGet(m => m[It.Is<string>(s => s == $"{Constants.System.UmbracoConnectionName}{ConnectionStrings.ProviderNamePostfix}")])
-                .Returns(configuredProviderName);
+        var mockedConfig = new Mock<IConfiguration>();
+        mockedConfig
+            .Setup(a => a.GetSection(It.Is<string>(s => s == "ConnectionStrings")))
+            .Returns(mockConfigSection.Object);
 
-            var mockedConfig = new Mock<IConfiguration>();
-            mockedConfig
-                .Setup(a => a.GetSection(It.Is<string>(s => s == "ConnectionStrings")))
-                .Returns(mockConfigSection.Object);
+        return mockedConfig;
+    }
 
-            return mockedConfig;
-        }
+    private static void SetDataDirectory() =>
+        AppDomain.CurrentDomain.SetData("DataDirectory", DataDirectory);
 
-        private static void SetDataDirectory() =>
-            AppDomain.CurrentDomain.SetData("DataDirectory", DataDirectory);
-
-        private static void AssertResults(string expectedConnectionString, string expectedProviderName, string connectionString, string providerName)
-        {
-            Assert.AreEqual(expectedConnectionString, connectionString);
-            Assert.AreEqual(expectedProviderName, providerName);
-        }
+    private static void AssertResults(string expectedConnectionString, string expectedProviderName, string connectionString, string providerName)
+    {
+        Assert.AreEqual(expectedConnectionString, connectionString);
+        Assert.AreEqual(expectedProviderName, providerName);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs
index aaaa16b68a..adb3d546c8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UmbracoBuilderExtensionsTests.cs
@@ -16,68 +16,86 @@ using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Notifications;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions;
+
+[TestFixture]
+public class UmbracoBuilderExtensionsTests
 {
-    [TestFixture]
-    public class UmbracoBuilderExtensionsTests
+    [Test]
+    [Customization]
+    public void AddNotificationsFromAssembly_Should_AddNotificationHandler_To_ServicesCollection(IUmbracoBuilder sut)
     {
-        [Test, Customization]
-        public void AddNotificationsFromAssembly_Should_AddNotificationHandler_To_ServicesCollection(IUmbracoBuilder sut)
-        {
-            sut.AddNotificationsFromAssembly<CustomizationAttribute>();
+        sut.AddNotificationsFromAssembly<CustomizationAttribute>();
 
-            var expectedHandlerType = typeof(INotificationHandler<ContentPublishedNotification>);
-            var handler = sut.Services.SingleOrDefault(x => x.ServiceType == expectedHandlerType);
-            Assert.NotNull(handler);
-            Assert.That(handler.ImplementationType, Is.EqualTo(typeof(StubNotificationHandler)));
+        var expectedHandlerType = typeof(INotificationHandler<ContentPublishedNotification>);
+        var handler = sut.Services.SingleOrDefault(x => x.ServiceType == expectedHandlerType);
+        Assert.NotNull(handler);
+        Assert.That(handler.ImplementationType, Is.EqualTo(typeof(StubNotificationHandler)));
+    }
+
+    [Test]
+    [Customization]
+    public void AddNotificationsFromAssembly_Should_AddAsyncNotificationHandler_To_ServicesCollection(
+        IUmbracoBuilder sut)
+    {
+        sut.AddNotificationsFromAssembly<CustomizationAttribute>();
+
+        var expectedHandlerType = typeof(INotificationAsyncHandler<ContentPublishedNotification>);
+        var handler = sut.Services.SingleOrDefault(x => x.ServiceType == expectedHandlerType);
+        Assert.NotNull(handler);
+        Assert.That(handler.ImplementationType, Is.EqualTo(typeof(StubNotificationHandler)));
+    }
+
+    private class CustomizationAttribute : AutoDataAttribute
+    {
+        public CustomizationAttribute()
+            : base(() =>
+        {
+            var fixture = new Fixture();
+
+            var stub = new UmbracoBuildStub();
+            fixture.Inject((IUmbracoBuilder)stub);
+
+            return fixture;
+        })
+        {
         }
+    }
 
-        [Test, Customization]
-        public void AddNotificationsFromAssembly_Should_AddAsyncNotificationHandler_To_ServicesCollection(IUmbracoBuilder sut)
+    private class UmbracoBuildStub : IUmbracoBuilder
+    {
+        public UmbracoBuildStub() => Services = new ServiceCollection();
+
+        public IServiceCollection Services { get; }
+
+        public IConfiguration Config { get; }
+
+        public TypeLoader TypeLoader { get; }
+
+        public ILoggerFactory BuilderLoggerFactory { get; }
+
+        public IHostingEnvironment BuilderHostingEnvironment { get; }
+
+        public IProfiler Profiler { get; }
+
+        public AppCaches AppCaches { get; }
+
+        public TBuilder WithCollectionBuilder<TBuilder>()
+            where TBuilder : ICollectionBuilder => default;
+
+        public void Build()
         {
-            sut.AddNotificationsFromAssembly<CustomizationAttribute>();
-
-            var expectedHandlerType = typeof(INotificationAsyncHandler<ContentPublishedNotification>);
-            var handler = sut.Services.SingleOrDefault(x => x.ServiceType == expectedHandlerType);
-            Assert.NotNull(handler);
-            Assert.That(handler.ImplementationType, Is.EqualTo(typeof(StubNotificationHandler)));
         }
+    }
 
-        private class CustomizationAttribute : AutoDataAttribute
+    private class StubNotificationHandler
+        : INotificationHandler<ContentPublishedNotification>,
+            INotificationAsyncHandler<ContentPublishedNotification>
+    {
+        public Task HandleAsync(ContentPublishedNotification notification, CancellationToken cancellationToken) => Task.CompletedTask;
+
+        public void Handle(ContentPublishedNotification notification)
         {
-            public CustomizationAttribute() : base(() => {
-                    var fixture = new Fixture();
-
-                    var stub = new UmbracoBuildStub();
-                    fixture.Inject((IUmbracoBuilder)stub);
-
-                    return fixture;
-                }){}
-        }
-
-        private class UmbracoBuildStub : IUmbracoBuilder
-        {
-            public IServiceCollection Services { get; }
-            public IConfiguration Config { get; }
-            public TypeLoader TypeLoader { get; }
-            public ILoggerFactory BuilderLoggerFactory { get; }
-            public IHostingEnvironment BuilderHostingEnvironment { get; }
-            public IProfiler Profiler { get; }
-            public AppCaches AppCaches { get; }
-            public TBuilder WithCollectionBuilder<TBuilder>() where TBuilder : ICollectionBuilder => default;
-
-            public UmbracoBuildStub() => Services = new ServiceCollection();
-
-            public void Build() {}
-        }
-
-        private class StubNotificationHandler
-            : INotificationHandler<ContentPublishedNotification>
-            , INotificationAsyncHandler<ContentPublishedNotification>
-        {
-            public void Handle(ContentPublishedNotification notification) { }
-
-            public Task HandleAsync(ContentPublishedNotification notification, CancellationToken cancellationToken) => Task.CompletedTask;
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs
index 80ffc4e2cb..3b95bcf724 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Extensions/UriExtensionsTests.cs
@@ -5,156 +5,154 @@ using System;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Extensions;
+
+[TestFixture]
+public class UriExtensionsTests
 {
-    [TestFixture]
-    public class UriExtensionsTests
+    [TestCase("http://www.domain.com/foo/bar", "/", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com/foo/bar#hop", "/", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com/foo/bar?q=2#hop", "/", "http://www.domain.com/?q=2")]
+    [TestCase("http://www.domain.com/foo/bar", "/path/to/page", "http://www.domain.com/path/to/page")]
+    [TestCase("http://www.domain.com/foo/bar", "/path/to/page/", "http://www.domain.com/path/to/page/")]
+    [TestCase("http://www.domain.com/", "/path/to/page/", "http://www.domain.com/path/to/page/")]
+    [TestCase("http://www.domain.com", "/path/to/page/", "http://www.domain.com/path/to/page/")]
+    [TestCase("http://www.domain.com/foo?q=3", "/path/to/page/", "http://www.domain.com/path/to/page/?q=3")]
+    [TestCase("http://www.domain.com/foo#bang", "/path/to/page/", "http://www.domain.com/path/to/page/")]
+    [TestCase("http://www.domain.com/foo?q=3#bang", "/path/to/page/", "http://www.domain.com/path/to/page/?q=3")]
+    public void RewritePath(string input, string path, string expected)
     {
+        var source = new Uri(input);
+        var output = source.Rewrite(path);
+        Assert.AreEqual(expected, output.ToString());
+    }
 
-        [TestCase("http://www.domain.com/foo/bar", "/", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com/foo/bar#hop", "/", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com/foo/bar?q=2#hop", "/", "http://www.domain.com/?q=2")]
-        [TestCase("http://www.domain.com/foo/bar", "/path/to/page", "http://www.domain.com/path/to/page")]
-        [TestCase("http://www.domain.com/foo/bar", "/path/to/page/", "http://www.domain.com/path/to/page/")]
-        [TestCase("http://www.domain.com/", "/path/to/page/", "http://www.domain.com/path/to/page/")]
-        [TestCase("http://www.domain.com", "/path/to/page/", "http://www.domain.com/path/to/page/")]
-        [TestCase("http://www.domain.com/foo?q=3", "/path/to/page/", "http://www.domain.com/path/to/page/?q=3")]
-        [TestCase("http://www.domain.com/foo#bang", "/path/to/page/", "http://www.domain.com/path/to/page/")]
-        [TestCase("http://www.domain.com/foo?q=3#bang", "/path/to/page/", "http://www.domain.com/path/to/page/?q=3")]
-        public void RewritePath(string input, string path, string expected)
+    [TestCase("http://www.domain.com/", "path/to/page/", typeof(ArgumentException))]
+    [TestCase("http://www.domain.com", "path/to/page/", typeof(ArgumentException))]
+    public void RewritePath_Exceptions(string input, string path, Type exception)
+    {
+        var source = new Uri(input);
+        Assert.Throws(exception, () =>
         {
-            var source = new Uri(input);
             var output = source.Rewrite(path);
-            Assert.AreEqual(expected, output.ToString());
-        }
+        });
+    }
 
-        [TestCase("http://www.domain.com/", "path/to/page/", typeof(ArgumentException))]
-        [TestCase("http://www.domain.com", "path/to/page/", typeof(ArgumentException))]
-        public void RewritePath_Exceptions(string input, string path, Type exception)
-        {
-            var source = new Uri(input);
-            Assert.Throws(exception, () =>
-                {
-                    var output = source.Rewrite(path);
-                });
-        }
+    [TestCase("http://www.domain.com/foo/bar", "/path/to/page", "", "http://www.domain.com/path/to/page")]
+    [TestCase("http://www.domain.com/foo/bar?k=3", "/path/to/page", "", "http://www.domain.com/path/to/page")]
+    [TestCase("http://www.domain.com/foo/bar?k=3#hop", "/path/to/page", "", "http://www.domain.com/path/to/page")]
+    [TestCase("http://www.domain.com/foo/bar", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
+    [TestCase("http://www.domain.com/foo/bar#hop", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
+    [TestCase("http://www.domain.com/foo/bar?k=3", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
+    [TestCase("http://www.domain.com/foo/bar?k=3#hop", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
+    public void RewritePathAndQuery(string input, string path, string query, string expected)
+    {
+        var source = new Uri(input);
+        var output = source.Rewrite(path, query);
+        Assert.AreEqual(expected, output.ToString());
+    }
 
-        [TestCase("http://www.domain.com/foo/bar", "/path/to/page", "", "http://www.domain.com/path/to/page")]
-        [TestCase("http://www.domain.com/foo/bar?k=3", "/path/to/page", "", "http://www.domain.com/path/to/page")]
-        [TestCase("http://www.domain.com/foo/bar?k=3#hop", "/path/to/page", "", "http://www.domain.com/path/to/page")]
-        [TestCase("http://www.domain.com/foo/bar", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
-        [TestCase("http://www.domain.com/foo/bar#hop", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
-        [TestCase("http://www.domain.com/foo/bar?k=3", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
-        [TestCase("http://www.domain.com/foo/bar?k=3#hop", "/path/to/page", "?x=12", "http://www.domain.com/path/to/page?x=12")]
-        public void RewritePathAndQuery(string input, string path, string query, string expected)
+    [TestCase("http://www.domain.com/", "path/to/page/", "", typeof(ArgumentException))]
+    [TestCase("http://www.domain.com/", "/path/to/page/", "x=27", typeof(ArgumentException))]
+    public void RewritePathAndQuery_Exceptions(string input, string path, string query, Type exception)
+    {
+        var source = new Uri(input);
+        Assert.Throws(exception, () =>
         {
-            var source = new Uri(input);
             var output = source.Rewrite(path, query);
-            Assert.AreEqual(expected, output.ToString());
-        }
+        });
+    }
 
-        [TestCase("http://www.domain.com/", "path/to/page/", "", typeof(ArgumentException))]
-        [TestCase("http://www.domain.com/", "/path/to/page/", "x=27", typeof(ArgumentException))]
-        public void RewritePathAndQuery_Exceptions(string input, string path, string query, Type exception)
-        {
-            var source = new Uri(input);
-            Assert.Throws(exception, () =>
-            {
-                var output = source.Rewrite(path, query);
-            });
-        }
+    [TestCase("http://www.domain.com", "/")]
+    [TestCase("http://www.domain.com/", "/")]
+    [TestCase("http://www.domain.com/foo", "/foo")]
+    [TestCase("http://www.domain.com/foo/", "/foo/")]
+    [TestCase("http://www.domain.com/foo/bar", "/foo/bar")]
+    [TestCase("http://www.domain.com/foo/bar%20nix", "/foo/bar%20nix")]
+    [TestCase("http://www.domain.com/foo/bar?q=7#hop", "/foo/bar")]
+    [TestCase("/", "/")]
+    [TestCase("/foo", "/foo")]
+    [TestCase("/foo/", "/foo/")]
+    [TestCase("/foo/bar", "/foo/bar")]
+    [TestCase("/foo/bar?q=7#hop", "/foo/bar")]
+    [TestCase("/foo%20bar/pof", "/foo%20bar/pof")]
+    public void GetSafeAbsolutePath(string input, string expected)
+    {
+        var source = new Uri(input, UriKind.RelativeOrAbsolute);
+        var output = source.GetSafeAbsolutePath();
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase("http://www.domain.com", "/")]
-        [TestCase("http://www.domain.com/", "/")]
-        [TestCase("http://www.domain.com/foo", "/foo")]
-        [TestCase("http://www.domain.com/foo/", "/foo/")]
-        [TestCase("http://www.domain.com/foo/bar", "/foo/bar")]
-        [TestCase("http://www.domain.com/foo/bar%20nix", "/foo/bar%20nix")]
-        [TestCase("http://www.domain.com/foo/bar?q=7#hop", "/foo/bar")]
-        [TestCase("/", "/")]
-        [TestCase("/foo", "/foo")]
-        [TestCase("/foo/", "/foo/")]
-        [TestCase("/foo/bar", "/foo/bar")]
-        [TestCase("/foo/bar?q=7#hop", "/foo/bar")]
-        [TestCase("/foo%20bar/pof", "/foo%20bar/pof")]
-        public void GetSafeAbsolutePath(string input, string expected)
-        {
-            var source = new Uri(input, UriKind.RelativeOrAbsolute);
-            var output = source.GetSafeAbsolutePath();
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("http://www.domain.com/foo/bar%20nix", "/foo/bar nix")]
+    public void GetAbsolutePathDecoded(string input, string expected)
+    {
+        var source = new Uri(input, UriKind.RelativeOrAbsolute);
+        var output = source.GetAbsolutePathDecoded();
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase("http://www.domain.com/foo/bar%20nix", "/foo/bar nix")]
-        public void GetAbsolutePathDecoded(string input, string expected)
-        {
-            var source = new Uri(input, UriKind.RelativeOrAbsolute);
-            var output = source.GetAbsolutePathDecoded();
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("http://www.domain.com/foo/bar%20nix", "/foo/bar nix")]
+    [TestCase("/foo%20bar/pof", "/foo bar/pof")]
+    public void GetSafeAbsolutePathDecoded(string input, string expected)
+    {
+        var source = new Uri(input, UriKind.RelativeOrAbsolute);
+        var output = source.GetSafeAbsolutePathDecoded();
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase("http://www.domain.com/foo/bar%20nix", "/foo/bar nix")]
-        [TestCase("/foo%20bar/pof", "/foo bar/pof")]
-        public void GetSafeAbsolutePathDecoded(string input, string expected)
-        {
-            var source = new Uri(input, UriKind.RelativeOrAbsolute);
-            var output = source.GetSafeAbsolutePathDecoded();
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("http://www.domain.com/path/to/page", "http://www.domain.com/path/to/page/")]
+    [TestCase("http://www.domain.com/path/to/", "http://www.domain.com/path/to/")]
+    [TestCase("http://www.domain.com/", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com/path/to?q=3#yop", "http://www.domain.com/path/to/?q=3")]
+    public void EndPathWithSlash(string input, string expected)
+    {
+        var source = new Uri(input);
+        var output = source.EndPathWithSlash();
+        Assert.AreEqual(expected, output.ToString());
+    }
 
-        [TestCase("http://www.domain.com/path/to/page", "http://www.domain.com/path/to/page/")]
-        [TestCase("http://www.domain.com/path/to/", "http://www.domain.com/path/to/")]
-        [TestCase("http://www.domain.com/", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com/path/to?q=3#yop", "http://www.domain.com/path/to/?q=3")]
-        public void EndPathWithSlash(string input, string expected)
-        {
-            var source = new Uri(input);
-            var output = source.EndPathWithSlash();
-            Assert.AreEqual(expected, output.ToString());
-        }
+    [TestCase("http://www.domain.com/path/to/page", "http://www.domain.com/path/to/page")]
+    [TestCase("http://www.domain.com/path/to/", "http://www.domain.com/path/to")]
+    [TestCase("http://www.domain.com/", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com/path/to/?q=3#yop", "http://www.domain.com/path/to?q=3")]
+    public void TrimPathEndSlash(string input, string expected)
+    {
+        var source = new Uri(input);
+        var output = source.TrimPathEndSlash();
+        Assert.AreEqual(expected, output.ToString());
+    }
 
-        [TestCase("http://www.domain.com/path/to/page", "http://www.domain.com/path/to/page")]
-        [TestCase("http://www.domain.com/path/to/", "http://www.domain.com/path/to")]
-        [TestCase("http://www.domain.com/", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com/path/to/?q=3#yop", "http://www.domain.com/path/to?q=3")]
-        public void TrimPathEndSlash(string input, string expected)
-        {
-            var source = new Uri(input);
-            var output = source.TrimPathEndSlash();
-            Assert.AreEqual(expected, output.ToString());
-        }
+    [TestCase("/foo/bar", "http://www.domain.com", "http://www.domain.com/foo/bar")]
+    [TestCase("/foo/bar", "http://www.domain.com/dang/dang", "http://www.domain.com/foo/bar")]
+    [TestCase("/", "http://www.domain.com/dang/dang", "http://www.domain.com/")]
+    [TestCase("/foo/bar", "http://www.domain.com/dang/dang?q=3#dang", "http://www.domain.com/foo/bar")]
+    [TestCase("/foo/bar?k=6#yop", "http://www.domain.com/dang/dang?q=3#dang", "http://www.domain.com/foo/bar?k=6")]
+    public void MakeAbsolute(string input, string reference, string expected)
+    {
+        var source = new Uri(input, UriKind.Relative);
+        var absolute = new Uri(reference);
+        var output = source.MakeAbsolute(absolute);
+        Assert.AreEqual(expected, output.ToString());
+    }
 
-        [TestCase("/foo/bar", "http://www.domain.com", "http://www.domain.com/foo/bar")]
-        [TestCase("/foo/bar", "http://www.domain.com/dang/dang", "http://www.domain.com/foo/bar")]
-        [TestCase("/", "http://www.domain.com/dang/dang", "http://www.domain.com/")]
-        [TestCase("/foo/bar", "http://www.domain.com/dang/dang?q=3#dang", "http://www.domain.com/foo/bar")]
-        [TestCase("/foo/bar?k=6#yop", "http://www.domain.com/dang/dang?q=3#dang", "http://www.domain.com/foo/bar?k=6")]
-        public void MakeAbsolute(string input, string reference, string expected)
-        {
-            var source = new Uri(input, UriKind.Relative);
-            var absolute = new Uri(reference);
-            var output = source.MakeAbsolute(absolute);
-            Assert.AreEqual(expected, output.ToString());
-        }
-
-        [TestCase("http://www.domain.com/path/to/page", "http://www.domain.com/path/to/page")]
-        [TestCase("http://www.domain.com/path/to/page/", "http://www.domain.com/path/to/page/")]
-        [TestCase("http://www.domain.com", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com/", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com/path/to?q=3#yop", "http://www.domain.com/path/to?q=3#yop")]
-        [TestCase("http://www.domain.com/path/to/?q=3#yop", "http://www.domain.com/path/to/?q=3#yop")]
-        [TestCase("http://www.domain.com:666/path/to/page", "http://www.domain.com/path/to/page")]
-        [TestCase("http://www.domain.com:666/path/to/page/", "http://www.domain.com/path/to/page/")]
-        [TestCase("http://www.domain.com:666", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com:666/", "http://www.domain.com/")]
-        [TestCase("http://www.domain.com:666/path/to?q=3#yop", "http://www.domain.com/path/to?q=3#yop")]
-        [TestCase("http://www.domain.com:666/path/to/?q=3#yop", "http://www.domain.com/path/to/?q=3#yop")]
-        public void WithoutPort(string input, string expected)
-        {
-            var source = new Uri(input);
-            var output = source.WithoutPort();
-            Assert.AreEqual(expected, output.ToString());
-        }
+    [TestCase("http://www.domain.com/path/to/page", "http://www.domain.com/path/to/page")]
+    [TestCase("http://www.domain.com/path/to/page/", "http://www.domain.com/path/to/page/")]
+    [TestCase("http://www.domain.com", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com/", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com/path/to?q=3#yop", "http://www.domain.com/path/to?q=3#yop")]
+    [TestCase("http://www.domain.com/path/to/?q=3#yop", "http://www.domain.com/path/to/?q=3#yop")]
+    [TestCase("http://www.domain.com:666/path/to/page", "http://www.domain.com/path/to/page")]
+    [TestCase("http://www.domain.com:666/path/to/page/", "http://www.domain.com/path/to/page/")]
+    [TestCase("http://www.domain.com:666", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com:666/", "http://www.domain.com/")]
+    [TestCase("http://www.domain.com:666/path/to?q=3#yop", "http://www.domain.com/path/to?q=3#yop")]
+    [TestCase("http://www.domain.com:666/path/to/?q=3#yop", "http://www.domain.com/path/to/?q=3#yop")]
+    public void WithoutPort(string input, string expected)
+    {
+        var source = new Uri(input);
+        var output = source.WithoutPort();
+        Assert.AreEqual(expected, output.ToString());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs
index da9865e72e..fbdc6b773e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/GuidUtilsTests.cs
@@ -1,43 +1,42 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+public class GuidUtilsTests
 {
-    public class GuidUtilsTests
+    [Test]
+    public void GuidCombineMethodsAreEqual()
     {
-        [Test]
-        public void GuidCombineMethodsAreEqual()
-        {
-            var a = Guid.NewGuid();
-            var b = Guid.NewGuid();
+        var a = Guid.NewGuid();
+        var b = Guid.NewGuid();
 
-            Assert.AreEqual(GuidUtils.Combine(a, b).ToByteArray(), Combine(a, b));
+        Assert.AreEqual(GuidUtils.Combine(a, b).ToByteArray(), Combine(a, b));
+    }
+
+    [Test]
+    public void GuidThingTest()
+    {
+        var guid = new Guid("f918382f-2bba-453f-a3e2-1f594016ed3b");
+        Assert.AreEqual("f22br4n0fm5fli5c", GuidUtils.ToBase32String(guid, 16));
+        Assert.AreEqual("f22br4n0f", GuidUtils.ToBase32String(guid, 9));
+    }
+
+    // Reference implementation taken from original code.
+    private static byte[] Combine(Guid guid1, Guid guid2)
+    {
+        var bytes1 = guid1.ToByteArray();
+        var bytes2 = guid2.ToByteArray();
+        var bytes = new byte[bytes1.Length];
+        for (var i = 0; i < bytes1.Length; i++)
+        {
+            bytes[i] = (byte)(bytes1[i] ^ bytes2[i]);
         }
 
-        [Test]
-        public void GuidThingTest()
-        {
-            var guid = new Guid("f918382f-2bba-453f-a3e2-1f594016ed3b");
-            Assert.AreEqual("f22br4n0fm5fli5c", GuidUtils.ToBase32String(guid, 16));
-            Assert.AreEqual("f22br4n0f", GuidUtils.ToBase32String(guid, 9));
-        }
-
-        // Reference implementation taken from original code.
-        private static byte[] Combine(Guid guid1, Guid guid2)
-        {
-            var bytes1 = guid1.ToByteArray();
-            var bytes2 = guid2.ToByteArray();
-            var bytes = new byte[bytes1.Length];
-            for (var i = 0; i < bytes1.Length; i++)
-            {
-                bytes[i] = (byte)(bytes1[i] ^ bytes2[i]);
-            }
-
-            return bytes;
-        }
+        return bytes;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs
index 416368b9b0..13499db2ea 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashCodeCombinerTests.cs
@@ -7,142 +7,141 @@ using System.Reflection;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class HashCodeCombinerTests
 {
-    [TestFixture]
-    public class HashCodeCombinerTests
+    private DirectoryInfo PrepareFolder()
     {
-        private DirectoryInfo PrepareFolder()
+        var assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
+        var dir = Directory.CreateDirectory(
+            Path.Combine(assDir.FullName, "HashCombiner", Guid.NewGuid().ToString("N")));
+        foreach (var f in dir.GetFiles())
         {
-            DirectoryInfo assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
-            DirectoryInfo dir = Directory.CreateDirectory(
-                Path.Combine(assDir.FullName, "HashCombiner", Guid.NewGuid().ToString("N")));
-            foreach (FileInfo f in dir.GetFiles())
-            {
-                f.Delete();
-            }
-
-            return dir;
+            f.Delete();
         }
 
-        [Test]
-        public void HashCombiner_Test_String()
+        return dir;
+    }
+
+    [Test]
+    public void HashCombiner_Test_String()
+    {
+        var combiner1 = new HashCodeCombiner();
+        combiner1.AddCaseInsensitiveString("Hello");
+
+        var combiner2 = new HashCodeCombiner();
+        combiner2.AddCaseInsensitiveString("hello");
+
+        Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+
+        combiner2.AddCaseInsensitiveString("world");
+
+        Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+    }
+
+    [Test]
+    public void HashCombiner_Test_Int()
+    {
+        var combiner1 = new HashCodeCombiner();
+        combiner1.AddInt(1234);
+
+        var combiner2 = new HashCodeCombiner();
+        combiner2.AddInt(1234);
+
+        Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+
+        combiner2.AddInt(1);
+
+        Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+    }
+
+    [Test]
+    public void HashCombiner_Test_DateTime()
+    {
+        var dt = DateTime.Now;
+        var combiner1 = new HashCodeCombiner();
+        combiner1.AddDateTime(dt);
+
+        var combiner2 = new HashCodeCombiner();
+        combiner2.AddDateTime(dt);
+
+        Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+
+        combiner2.AddDateTime(DateTime.Now);
+
+        Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+    }
+
+    [Test]
+    public void HashCombiner_Test_File()
+    {
+        var dir = PrepareFolder();
+        var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
+        File.Delete(file1Path);
+        using (var file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
         {
-            var combiner1 = new HashCodeCombiner();
-            combiner1.AddCaseInsensitiveString("Hello");
-
-            var combiner2 = new HashCodeCombiner();
-            combiner2.AddCaseInsensitiveString("hello");
-
-            Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
-
-            combiner2.AddCaseInsensitiveString("world");
-
-            Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+            file1.WriteLine("hello");
         }
 
-        [Test]
-        public void HashCombiner_Test_Int()
+        var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
+        File.Delete(file2Path);
+        using (var file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
         {
-            var combiner1 = new HashCodeCombiner();
-            combiner1.AddInt(1234);
-
-            var combiner2 = new HashCodeCombiner();
-            combiner2.AddInt(1234);
-
-            Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
-
-            combiner2.AddInt(1);
-
-            Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+            // even though files are the same, the dates are different
+            file2.WriteLine("hello");
         }
 
-        [Test]
-        public void HashCombiner_Test_DateTime()
+        var combiner1 = new HashCodeCombiner();
+        combiner1.AddFile(new FileInfo(file1Path));
+
+        var combiner2 = new HashCodeCombiner();
+        combiner2.AddFile(new FileInfo(file1Path));
+
+        var combiner3 = new HashCodeCombiner();
+        combiner3.AddFile(new FileInfo(file2Path));
+
+        Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+        Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner3.GetCombinedHashCode());
+
+        combiner2.AddFile(new FileInfo(file2Path));
+
+        Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+    }
+
+    [Test]
+    public void HashCombiner_Test_Folder()
+    {
+        var dir = PrepareFolder();
+        var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
+        File.Delete(file1Path);
+        using (var file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
         {
-            DateTime dt = DateTime.Now;
-            var combiner1 = new HashCodeCombiner();
-            combiner1.AddDateTime(dt);
-
-            var combiner2 = new HashCodeCombiner();
-            combiner2.AddDateTime(dt);
-
-            Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
-
-            combiner2.AddDateTime(DateTime.Now);
-
-            Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+            file1.WriteLine("hello");
         }
 
-        [Test]
-        public void HashCombiner_Test_File()
+        // first test the whole folder
+        var combiner1 = new HashCodeCombiner();
+        combiner1.AddFolder(dir);
+
+        var combiner2 = new HashCodeCombiner();
+        combiner2.AddFolder(dir);
+
+        Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+
+        // now add a file to the folder
+        var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
+        File.Delete(file2Path);
+        using (var file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
         {
-            DirectoryInfo dir = PrepareFolder();
-            var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
-            File.Delete(file1Path);
-            using (StreamWriter file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
-            {
-                file1.WriteLine("hello");
-            }
-
-            var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
-            File.Delete(file2Path);
-            using (StreamWriter file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
-            {
-                // even though files are the same, the dates are different
-                file2.WriteLine("hello");
-            }
-
-            var combiner1 = new HashCodeCombiner();
-            combiner1.AddFile(new FileInfo(file1Path));
-
-            var combiner2 = new HashCodeCombiner();
-            combiner2.AddFile(new FileInfo(file1Path));
-
-            var combiner3 = new HashCodeCombiner();
-            combiner3.AddFile(new FileInfo(file2Path));
-
-            Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
-            Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner3.GetCombinedHashCode());
-
-            combiner2.AddFile(new FileInfo(file2Path));
-
-            Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
+            // even though files are the same, the dates are different
+            file2.WriteLine("hello");
         }
 
-        [Test]
-        public void HashCombiner_Test_Folder()
-        {
-            DirectoryInfo dir = PrepareFolder();
-            var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
-            File.Delete(file1Path);
-            using (StreamWriter file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
-            {
-                file1.WriteLine("hello");
-            }
+        var combiner3 = new HashCodeCombiner();
+        combiner3.AddFolder(dir);
 
-            // first test the whole folder
-            var combiner1 = new HashCodeCombiner();
-            combiner1.AddFolder(dir);
-
-            var combiner2 = new HashCodeCombiner();
-            combiner2.AddFolder(dir);
-
-            Assert.AreEqual(combiner1.GetCombinedHashCode(), combiner2.GetCombinedHashCode());
-
-            // now add a file to the folder
-            var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
-            File.Delete(file2Path);
-            using (StreamWriter file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
-            {
-                // even though files are the same, the dates are different
-                file2.WriteLine("hello");
-            }
-
-            var combiner3 = new HashCodeCombiner();
-            combiner3.AddFolder(dir);
-
-            Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner3.GetCombinedHashCode());
-        }
+        Assert.AreNotEqual(combiner1.GetCombinedHashCode(), combiner3.GetCombinedHashCode());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs
index 1a6f77d2c8..f2008799a4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HashGeneratorTests.cs
@@ -7,178 +7,177 @@ using System.Reflection;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class HashGeneratorTests
 {
-    [TestFixture]
-    public class HashGeneratorTests
+    private string Generate(bool isCaseSensitive, params string[] strs)
     {
-        private string Generate(bool isCaseSensitive, params string[] strs)
+        using var generator = new HashGenerator();
+        foreach (var str in strs)
         {
-            using var generator = new HashGenerator();
-            foreach (var str in strs)
+            if (isCaseSensitive)
             {
-                if (isCaseSensitive)
-                {
-                    generator.AddString(str);
-                }
-                else
-                {
-                    generator.AddCaseInsensitiveString(str);
-                }
+                generator.AddString(str);
             }
-
-            return generator.GenerateHash();
-        }
-
-        [Test]
-        public void Generate_Hash_Multiple_Strings_Case_Sensitive()
-        {
-            var hash1 = Generate(true, "hello", "world");
-            var hash2 = Generate(true, "hello", "world");
-            var hashFalse1 = Generate(true, "hello", "worlD");
-            var hashFalse2 = Generate(true, "hEllo", "world");
-
-            Assert.AreEqual(hash1, hash2);
-            Assert.AreNotEqual(hash1, hashFalse1);
-            Assert.AreNotEqual(hash1, hashFalse2);
-        }
-
-        [Test]
-        public void Generate_Hash_Multiple_Strings_Case_Insensitive()
-        {
-            var hash1 = Generate(false, "hello", "world");
-            var hash2 = Generate(false, "hello", "world");
-            var hashFalse1 = Generate(false, "hello", "worlD");
-            var hashFalse2 = Generate(false, "hEllo", "world");
-
-            Assert.AreEqual(hash1, hash2);
-            Assert.AreEqual(hash1, hashFalse1);
-            Assert.AreEqual(hash1, hashFalse2);
-        }
-
-        private DirectoryInfo PrepareFolder()
-        {
-            DirectoryInfo assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
-            DirectoryInfo dir = Directory.CreateDirectory(
-                Path.Combine(assDir.FullName, "HashCombiner", Guid.NewGuid().ToString("N")));
-            foreach (FileInfo f in dir.GetFiles())
+            else
             {
-                f.Delete();
-            }
-
-            return dir;
-        }
-
-        [Test]
-        public void HashCombiner_Test_String()
-        {
-            using (var combiner1 = new HashGenerator())
-            using (var combiner2 = new HashGenerator())
-            {
-                combiner1.AddCaseInsensitiveString("Hello");
-                combiner2.AddCaseInsensitiveString("hello");
-                Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
-                combiner2.AddCaseInsensitiveString("world");
-                Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+                generator.AddCaseInsensitiveString(str);
             }
         }
 
-        [Test]
-        public void HashCombiner_Test_Int()
+        return generator.GenerateHash();
+    }
+
+    [Test]
+    public void Generate_Hash_Multiple_Strings_Case_Sensitive()
+    {
+        var hash1 = Generate(true, "hello", "world");
+        var hash2 = Generate(true, "hello", "world");
+        var hashFalse1 = Generate(true, "hello", "worlD");
+        var hashFalse2 = Generate(true, "hEllo", "world");
+
+        Assert.AreEqual(hash1, hash2);
+        Assert.AreNotEqual(hash1, hashFalse1);
+        Assert.AreNotEqual(hash1, hashFalse2);
+    }
+
+    [Test]
+    public void Generate_Hash_Multiple_Strings_Case_Insensitive()
+    {
+        var hash1 = Generate(false, "hello", "world");
+        var hash2 = Generate(false, "hello", "world");
+        var hashFalse1 = Generate(false, "hello", "worlD");
+        var hashFalse2 = Generate(false, "hEllo", "world");
+
+        Assert.AreEqual(hash1, hash2);
+        Assert.AreEqual(hash1, hashFalse1);
+        Assert.AreEqual(hash1, hashFalse2);
+    }
+
+    private DirectoryInfo PrepareFolder()
+    {
+        var assDir = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory;
+        var dir = Directory.CreateDirectory(
+            Path.Combine(assDir.FullName, "HashCombiner", Guid.NewGuid().ToString("N")));
+        foreach (var f in dir.GetFiles())
         {
-            using (var combiner1 = new HashGenerator())
-            using (var combiner2 = new HashGenerator())
-            {
-                combiner1.AddInt(1234);
-                combiner2.AddInt(1234);
-                Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
-                combiner2.AddInt(1);
-                Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
-            }
+            f.Delete();
         }
 
-        [Test]
-        public void HashCombiner_Test_DateTime()
+        return dir;
+    }
+
+    [Test]
+    public void HashCombiner_Test_String()
+    {
+        using (var combiner1 = new HashGenerator())
+        using (var combiner2 = new HashGenerator())
         {
-            using var combiner1 = new HashGenerator();
-            using var combiner2 = new HashGenerator();
-            DateTime dt = DateTime.Now;
-            combiner1.AddDateTime(dt);
-            combiner2.AddDateTime(dt);
+            combiner1.AddCaseInsensitiveString("Hello");
+            combiner2.AddCaseInsensitiveString("hello");
             Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
-            combiner2.AddDateTime(DateTime.Now);
+            combiner2.AddCaseInsensitiveString("world");
             Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
         }
-
-        [Test]
-        public void HashCombiner_Test_File()
-        {
-            using var combiner1 = new HashGenerator();
-            using var combiner2 = new HashGenerator();
-            using var combiner3 = new HashGenerator();
-            DirectoryInfo dir = PrepareFolder();
-            var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
-            File.Delete(file1Path);
-            using (StreamWriter file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
-            {
-                file1.WriteLine("hello");
-            }
-
-            var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
-            File.Delete(file2Path);
-            using (StreamWriter file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
-            {
-                // even though files are the same, the dates are different
-                file2.WriteLine("hello");
-            }
-
-            combiner1.AddFile(new FileInfo(file1Path));
-
-            combiner2.AddFile(new FileInfo(file1Path));
-
-            combiner3.AddFile(new FileInfo(file2Path));
-
-            Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
-            Assert.AreNotEqual(combiner1.GenerateHash(), combiner3.GenerateHash());
-
-            combiner2.AddFile(new FileInfo(file2Path));
-
-            Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
-        }
-
-        [Test]
-        public void HashCombiner_Test_Folder()
-        {
-            using var combiner1 = new HashGenerator();
-            using var combiner2 = new HashGenerator();
-            using var combiner3 = new HashGenerator();
-            DirectoryInfo dir = PrepareFolder();
-            var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
-            File.Delete(file1Path);
-            using (StreamWriter file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
-            {
-                file1.WriteLine("hello");
-            }
-
-            // first test the whole folder
-            combiner1.AddFolder(dir);
-
-            combiner2.AddFolder(dir);
-
-            Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
-
-            // now add a file to the folder
-            var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
-            File.Delete(file2Path);
-            using (StreamWriter file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
-            {
-                // even though files are the same, the dates are different
-                file2.WriteLine("hello");
-            }
-
-            combiner3.AddFolder(dir);
-
-            Assert.AreNotEqual(combiner1.GenerateHash(), combiner3.GenerateHash());
-        }
+    }
+
+    [Test]
+    public void HashCombiner_Test_Int()
+    {
+        using (var combiner1 = new HashGenerator())
+        using (var combiner2 = new HashGenerator())
+        {
+            combiner1.AddInt(1234);
+            combiner2.AddInt(1234);
+            Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+            combiner2.AddInt(1);
+            Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+        }
+    }
+
+    [Test]
+    public void HashCombiner_Test_DateTime()
+    {
+        using var combiner1 = new HashGenerator();
+        using var combiner2 = new HashGenerator();
+        var dt = DateTime.Now;
+        combiner1.AddDateTime(dt);
+        combiner2.AddDateTime(dt);
+        Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+        combiner2.AddDateTime(DateTime.Now);
+        Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+    }
+
+    [Test]
+    public void HashCombiner_Test_File()
+    {
+        using var combiner1 = new HashGenerator();
+        using var combiner2 = new HashGenerator();
+        using var combiner3 = new HashGenerator();
+        var dir = PrepareFolder();
+        var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
+        File.Delete(file1Path);
+        using (var file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
+        {
+            file1.WriteLine("hello");
+        }
+
+        var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
+        File.Delete(file2Path);
+        using (var file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
+        {
+            // even though files are the same, the dates are different
+            file2.WriteLine("hello");
+        }
+
+        combiner1.AddFile(new FileInfo(file1Path));
+
+        combiner2.AddFile(new FileInfo(file1Path));
+
+        combiner3.AddFile(new FileInfo(file2Path));
+
+        Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+        Assert.AreNotEqual(combiner1.GenerateHash(), combiner3.GenerateHash());
+
+        combiner2.AddFile(new FileInfo(file2Path));
+
+        Assert.AreNotEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+    }
+
+    [Test]
+    public void HashCombiner_Test_Folder()
+    {
+        using var combiner1 = new HashGenerator();
+        using var combiner2 = new HashGenerator();
+        using var combiner3 = new HashGenerator();
+        var dir = PrepareFolder();
+        var file1Path = Path.Combine(dir.FullName, "hastest1.txt");
+        File.Delete(file1Path);
+        using (var file1 = File.CreateText(Path.Combine(dir.FullName, "hastest1.txt")))
+        {
+            file1.WriteLine("hello");
+        }
+
+        // first test the whole folder
+        combiner1.AddFolder(dir);
+
+        combiner2.AddFolder(dir);
+
+        Assert.AreEqual(combiner1.GenerateHash(), combiner2.GenerateHash());
+
+        // now add a file to the folder
+        var file2Path = Path.Combine(dir.FullName, "hastest2.txt");
+        File.Delete(file2Path);
+        using (var file2 = File.CreateText(Path.Combine(dir.FullName, "hastest2.txt")))
+        {
+            // even though files are the same, the dates are different
+            file2.WriteLine("hello");
+        }
+
+        combiner3.AddFolder(dir);
+
+        Assert.AreNotEqual(combiner1.GenerateHash(), combiner3.GenerateHash());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs
index 22b43205a2..90ef482efb 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/HexEncoderTests.cs
@@ -6,70 +6,72 @@ using System.Text;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+public class HexEncoderTests
 {
-    public class HexEncoderTests
+    private static readonly char[] s_bytesToHexStringLookup =
     {
-        [Test]
-        public void ToHexStringCreatesCorrectValue()
-        {
-            var buffer = new byte[255];
-            var random = new Random();
-            random.NextBytes(buffer);
+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
+    };
 
-            var sb = new StringBuilder(buffer.Length * 2);
-            for (var i = 0; i < buffer.Length; i++)
+    [Test]
+    public void ToHexStringCreatesCorrectValue()
+    {
+        var buffer = new byte[255];
+        var random = new Random();
+        random.NextBytes(buffer);
+
+        var sb = new StringBuilder(buffer.Length * 2);
+        for (var i = 0; i < buffer.Length; i++)
+        {
+            sb.Append(buffer[i].ToString("X2"));
+        }
+
+        var expected = sb.ToString();
+
+        var actual = HexEncoder.Encode(buffer);
+        Assert.AreEqual(expected, actual);
+    }
+
+    [Test]
+    public void ToHexStringWithSeparatorCreatesCorrectValue()
+    {
+        var buffer = new byte[255];
+        var random = new Random();
+        random.NextBytes(buffer);
+
+        var expected = ToHexString(buffer, '/', 2, 4);
+        var actual = HexEncoder.Encode(buffer, '/', 2, 4);
+
+        Assert.AreEqual(expected, actual);
+    }
+
+    // Reference implementation taken from original extension method.
+    private static string ToHexString(byte[] bytes, char separator, int blockSize, int blockCount)
+    {
+        int p = 0, bytesLength = bytes.Length, count = 0, size = 0;
+        var chars = new char[(bytesLength * 2) + blockCount];
+        for (var i = 0; i < bytesLength; i++)
+        {
+            var b = bytes[i];
+            chars[p++] = s_bytesToHexStringLookup[b / 0x10];
+            chars[p++] = s_bytesToHexStringLookup[b % 0x10];
+            if (count == blockCount)
             {
-                sb.Append(buffer[i].ToString("X2"));
+                continue;
             }
 
-            var expected = sb.ToString();
-
-            var actual = HexEncoder.Encode(buffer);
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void ToHexStringWithSeparatorCreatesCorrectValue()
-        {
-            var buffer = new byte[255];
-            var random = new Random();
-            random.NextBytes(buffer);
-
-            var expected = ToHexString(buffer, '/', 2, 4);
-            var actual = HexEncoder.Encode(buffer, '/', 2, 4);
-
-            Assert.AreEqual(expected, actual);
-        }
-
-        private static readonly char[] s_bytesToHexStringLookup = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-
-        // Reference implementation taken from original extension method.
-        private static string ToHexString(byte[] bytes, char separator, int blockSize, int blockCount)
-        {
-            int p = 0, bytesLength = bytes.Length, count = 0, size = 0;
-            var chars = new char[(bytesLength * 2) + blockCount];
-            for (var i = 0; i < bytesLength; i++)
+            if (++size < blockSize)
             {
-                var b = bytes[i];
-                chars[p++] = s_bytesToHexStringLookup[b / 0x10];
-                chars[p++] = s_bytesToHexStringLookup[b % 0x10];
-                if (count == blockCount)
-                {
-                    continue;
-                }
-
-                if (++size < blockSize)
-                {
-                    continue;
-                }
-
-                chars[p++] = separator;
-                size = 0;
-                count++;
+                continue;
             }
 
-            return new string(chars, 0, chars.Length);
+            chars[p++] = separator;
+            size = 0;
+            count++;
         }
+
+        return new string(chars, 0, chars.Length);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs
index 4f700e1b0c..597d5c0f84 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/AbstractFileSystemTests.cs
@@ -2,189 +2,186 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using NUnit.Framework;
 using Umbraco.Cms.Core.IO;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.IO
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.IO;
+
+[TestFixture]
+public abstract class AbstractFileSystemTests
 {
-    [TestFixture]
-    public abstract class AbstractFileSystemTests
+    protected IFileSystem _fileSystem;
+
+    protected AbstractFileSystemTests(IFileSystem fileSystem) => _fileSystem = fileSystem;
+
+    [Test]
+    public void Can_Create_And_Delete_Files()
     {
-        protected IFileSystem _fileSystem;
+        _fileSystem.AddFile("test.txt", CreateStream());
 
-        protected AbstractFileSystemTests(IFileSystem fileSystem) => _fileSystem = fileSystem;
+        Assert.IsTrue(_fileSystem.FileExists("test.txt"));
 
-        [Test]
-        public void Can_Create_And_Delete_Files()
-        {
-            _fileSystem.AddFile("test.txt", CreateStream());
+        _fileSystem.DeleteFile("test.txt");
 
-            Assert.IsTrue(_fileSystem.FileExists("test.txt"));
-
-            _fileSystem.DeleteFile("test.txt");
-
-            Assert.IsFalse(_fileSystem.FileExists("test.txt"));
-        }
-
-        [Test]
-        public void Can_Overwrite_File()
-        {
-            _fileSystem.AddFile("test/test.txt", CreateStream());
-            _fileSystem.AddFile("test/test.txt", CreateStream());
-
-            IEnumerable<string> files = _fileSystem.GetFiles("test");
-
-            Assert.AreEqual(1, files.Count());
-
-            foreach (var file in files)
-            {
-                _fileSystem.DeleteFile(file);
-            }
-
-            _fileSystem.DeleteDirectory("test", true);
-        }
-
-        [Test]
-        public void Cant_Overwrite_File() =>
-            Assert.Throws<InvalidOperationException>(() =>
-                {
-                    _fileSystem.AddFile("test.txt", CreateStream());
-                    _fileSystem.AddFile("test.txt", CreateStream(), false);
-
-                    _fileSystem.DeleteFile("test.txt");
-                });
-
-        [Test]
-        public void Can_Get_Files()
-        {
-            _fileSystem.AddFile("test/test1.txt", CreateStream());
-            _fileSystem.AddFile("test/test2.txt", CreateStream());
-            _fileSystem.AddFile("test/test3.txt", CreateStream());
-            _fileSystem.AddFile("test/test4.bak", CreateStream());
-
-            IEnumerable<string> files = _fileSystem.GetFiles("test");
-
-            Assert.AreEqual(4, files.Count());
-
-            files = _fileSystem.GetFiles("test", "*.txt");
-
-            Assert.AreEqual(3, files.Count());
-
-            _fileSystem.DeleteDirectory("test", true);
-        }
-
-        [Test]
-        public void Can_Read_File()
-        {
-            _fileSystem.AddFile("test.txt", CreateStream("hello world"));
-
-            Stream stream = _fileSystem.OpenFile("test.txt");
-            var reader = new StreamReader(stream);
-            var contents = reader.ReadToEnd();
-            reader.Close();
-
-            Assert.AreEqual("hello world", contents);
-
-            _fileSystem.DeleteFile("test.txt");
-        }
-
-        [Test]
-        public void Can_Get_Directories()
-        {
-            _fileSystem.AddFile("test/sub1/test.txt", CreateStream());
-            _fileSystem.AddFile("test/sub2/test.txt", CreateStream());
-            _fileSystem.AddFile("test/sub3/test.txt", CreateStream());
-
-            IEnumerable<string> dirs = _fileSystem.GetDirectories("test");
-
-            Assert.AreEqual(3, dirs.Count());
-            Assert.IsTrue(_fileSystem.DirectoryExists("test/sub1"));
-            Assert.IsTrue(_fileSystem.DirectoryExists("test/sub2"));
-            Assert.IsTrue(_fileSystem.DirectoryExists("test/sub3"));
-
-            _fileSystem.DeleteDirectory("test", true);
-        }
-
-        [Test]
-        public void Can_Get_File_Dates()
-        {
-            _fileSystem.DeleteFile("test.txt");
-
-            _fileSystem.AddFile("test.txt", CreateStream());
-
-            DateTimeOffset created = _fileSystem.GetCreated("test.txt");
-            DateTimeOffset modified = _fileSystem.GetLastModified("test.txt");
-
-            Assert.AreEqual(DateTime.UtcNow.Year, created.Year);
-            Assert.AreEqual(DateTime.UtcNow.Month, created.Month);
-            Assert.AreEqual(DateTime.UtcNow.Date, created.Date);
-
-            Assert.AreEqual(DateTime.UtcNow.Year, modified.Year);
-            Assert.AreEqual(DateTime.UtcNow.Month, modified.Month);
-            Assert.AreEqual(DateTime.UtcNow.Date, modified.Date);
-
-            _fileSystem.DeleteFile("test.txt");
-        }
-
-        [Test]
-        public void Can_Get_File_Url()
-        {
-            _fileSystem.AddFile("test.txt", CreateStream());
-
-            var url = _fileSystem.GetUrl("test.txt");
-
-            Assert.AreEqual(ConstructUrl("test.txt"), url);
-
-            _fileSystem.DeleteFile("test.txt");
-        }
-
-        [Test]
-        public void Can_Convert_Full_Path_And_Url_To_Relative_Path()
-        {
-            _fileSystem.AddFile("test.txt", CreateStream());
-
-            var url = _fileSystem.GetUrl("test.txt");
-            var fullPath = _fileSystem.GetFullPath("test.txt");
-
-            Assert.AreNotEqual("test.txt", url);
-            Assert.AreNotEqual("test.txt", fullPath);
-
-            Assert.AreEqual("test.txt", _fileSystem.GetRelativePath(url));
-            Assert.AreEqual("test.txt", _fileSystem.GetRelativePath(fullPath));
-
-            _fileSystem.DeleteFile("test.txt");
-        }
-
-        [Test]
-        public void Can_Get_Size()
-        {
-            Stream stream = CreateStream();
-            var streamLength = stream.Length;
-            _fileSystem.AddFile("test.txt", stream);
-
-            Assert.AreEqual(streamLength, _fileSystem.GetSize("test.txt"));
-
-            _fileSystem.DeleteFile("test.txt");
-        }
-
-        protected Stream CreateStream(string contents = null)
-        {
-            if (string.IsNullOrEmpty(contents))
-            {
-                contents = "test";
-            }
-
-            var bytes = Encoding.UTF8.GetBytes(contents);
-            var stream = new MemoryStream(bytes);
-
-            return stream;
-        }
-
-        protected abstract string ConstructUrl(string path);
+        Assert.IsFalse(_fileSystem.FileExists("test.txt"));
     }
+
+    [Test]
+    public void Can_Overwrite_File()
+    {
+        _fileSystem.AddFile("test/test.txt", CreateStream());
+        _fileSystem.AddFile("test/test.txt", CreateStream());
+
+        var files = _fileSystem.GetFiles("test").ToArray();
+
+        Assert.AreEqual(1, files.Count());
+
+        foreach (var file in files)
+        {
+            _fileSystem.DeleteFile(file);
+        }
+
+        _fileSystem.DeleteDirectory("test", true);
+    }
+
+    [Test]
+    public void Cant_Overwrite_File() =>
+        Assert.Throws<InvalidOperationException>(() =>
+        {
+            _fileSystem.AddFile("test.txt", CreateStream());
+            _fileSystem.AddFile("test.txt", CreateStream(), false);
+
+            _fileSystem.DeleteFile("test.txt");
+        });
+
+    [Test]
+    public void Can_Get_Files()
+    {
+        _fileSystem.AddFile("test/test1.txt", CreateStream());
+        _fileSystem.AddFile("test/test2.txt", CreateStream());
+        _fileSystem.AddFile("test/test3.txt", CreateStream());
+        _fileSystem.AddFile("test/test4.bak", CreateStream());
+
+        var files = _fileSystem.GetFiles("test");
+
+        Assert.AreEqual(4, files.Count());
+
+        files = _fileSystem.GetFiles("test", "*.txt");
+
+        Assert.AreEqual(3, files.Count());
+
+        _fileSystem.DeleteDirectory("test", true);
+    }
+
+    [Test]
+    public void Can_Read_File()
+    {
+        _fileSystem.AddFile("test.txt", CreateStream("hello world"));
+
+        var stream = _fileSystem.OpenFile("test.txt");
+        var reader = new StreamReader(stream);
+        var contents = reader.ReadToEnd();
+        reader.Close();
+
+        Assert.AreEqual("hello world", contents);
+
+        _fileSystem.DeleteFile("test.txt");
+    }
+
+    [Test]
+    public void Can_Get_Directories()
+    {
+        _fileSystem.AddFile("test/sub1/test.txt", CreateStream());
+        _fileSystem.AddFile("test/sub2/test.txt", CreateStream());
+        _fileSystem.AddFile("test/sub3/test.txt", CreateStream());
+
+        var dirs = _fileSystem.GetDirectories("test");
+
+        Assert.AreEqual(3, dirs.Count());
+        Assert.IsTrue(_fileSystem.DirectoryExists("test/sub1"));
+        Assert.IsTrue(_fileSystem.DirectoryExists("test/sub2"));
+        Assert.IsTrue(_fileSystem.DirectoryExists("test/sub3"));
+
+        _fileSystem.DeleteDirectory("test", true);
+    }
+
+    [Test]
+    public void Can_Get_File_Dates()
+    {
+        _fileSystem.DeleteFile("test.txt");
+
+        _fileSystem.AddFile("test.txt", CreateStream());
+
+        var created = _fileSystem.GetCreated("test.txt");
+        var modified = _fileSystem.GetLastModified("test.txt");
+
+        Assert.AreEqual(DateTime.UtcNow.Year, created.Year);
+        Assert.AreEqual(DateTime.UtcNow.Month, created.Month);
+        Assert.AreEqual(DateTime.UtcNow.Date, created.Date);
+
+        Assert.AreEqual(DateTime.UtcNow.Year, modified.Year);
+        Assert.AreEqual(DateTime.UtcNow.Month, modified.Month);
+        Assert.AreEqual(DateTime.UtcNow.Date, modified.Date);
+
+        _fileSystem.DeleteFile("test.txt");
+    }
+
+    [Test]
+    public void Can_Get_File_Url()
+    {
+        _fileSystem.AddFile("test.txt", CreateStream());
+
+        var url = _fileSystem.GetUrl("test.txt");
+
+        Assert.AreEqual(ConstructUrl("test.txt"), url);
+
+        _fileSystem.DeleteFile("test.txt");
+    }
+
+    [Test]
+    public void Can_Convert_Full_Path_And_Url_To_Relative_Path()
+    {
+        _fileSystem.AddFile("test.txt", CreateStream());
+
+        var url = _fileSystem.GetUrl("test.txt");
+        var fullPath = _fileSystem.GetFullPath("test.txt");
+
+        Assert.AreNotEqual("test.txt", url);
+        Assert.AreNotEqual("test.txt", fullPath);
+
+        Assert.AreEqual("test.txt", _fileSystem.GetRelativePath(url));
+        Assert.AreEqual("test.txt", _fileSystem.GetRelativePath(fullPath));
+
+        _fileSystem.DeleteFile("test.txt");
+    }
+
+    [Test]
+    public void Can_Get_Size()
+    {
+        var stream = CreateStream();
+        var streamLength = stream.Length;
+        _fileSystem.AddFile("test.txt", stream);
+
+        Assert.AreEqual(streamLength, _fileSystem.GetSize("test.txt"));
+
+        _fileSystem.DeleteFile("test.txt");
+    }
+
+    protected Stream CreateStream(string contents = null)
+    {
+        if (string.IsNullOrEmpty(contents))
+        {
+            contents = "test";
+        }
+
+        var bytes = Encoding.UTF8.GetBytes(contents);
+        var stream = new MemoryStream(bytes);
+
+        return stream;
+    }
+
+    protected abstract string ConstructUrl(string path);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs
index 28328044bd..59f8fcd45c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/IO/PhysicalFileSystemTests.cs
@@ -4,120 +4,123 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Threading;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.IO
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.IO;
+
+[TestFixture]
+public class PhysicalFileSystemTests : AbstractFileSystemTests
 {
-    [TestFixture]
-    public class PhysicalFileSystemTests : AbstractFileSystemTests
+    [SetUp]
+    public void Setup()
     {
-        public PhysicalFileSystemTests()
-            : base(new PhysicalFileSystem(TestHelper.IOHelper, TestHelper.GetHostingEnvironment(), Mock.Of<ILogger<PhysicalFileSystem>>(), Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests"), "/Media/"))
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests");
+        if (Directory.Exists(path) == false)
         {
+            return;
         }
 
-        [SetUp]
-        public void Setup()
+        var files = Directory.GetFiles(path);
+        foreach (var f in files)
         {
+            File.Delete(f);
         }
 
-        [TearDown]
-        public void TearDown()
+        Directory.Delete(path, true);
+    }
+
+    public PhysicalFileSystemTests()
+        : base(new PhysicalFileSystem(
+            TestHelper.IOHelper,
+            TestHelper.GetHostingEnvironment(),
+            Mock.Of<ILogger<PhysicalFileSystem>>(),
+            Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests"),
+            "/Media/"))
+    {
+    }
+
+    protected override string ConstructUrl(string path) => "/Media/" + path;
+
+    private string Repeat(string pattern, int count)
+    {
+        var text = new StringBuilder();
+        for (var i = 0; i < count; i++)
         {
-            var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests");
-            if (Directory.Exists(path) == false)
-            {
-                return;
-            }
-
-            var files = Directory.GetFiles(path);
-            foreach (var f in files)
-            {
-                File.Delete(f);
-            }
-
-            Directory.Delete(path, true);
+            text.Append(pattern);
         }
 
-        protected override string ConstructUrl(string path) => "/Media/" + path;
+        return text.ToString();
+    }
 
-        private string Repeat(string pattern, int count)
+    [Test]
+    public void SaveFileTest()
+    {
+        var basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests");
+
+        using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
         {
-            var text = new StringBuilder();
-            for (var i = 0; i < count; i++)
-            {
-                text.Append(pattern);
-            }
-
-            return text.ToString();
+            _fileSystem.AddFile("sub/f3.txt", ms);
         }
 
-        [Test]
-        public void SaveFileTest()
+        Assert.IsTrue(File.Exists(Path.Combine(basePath, "sub/f3.txt")));
+
+        var path = Repeat("bah/bah/", 50);
+        Assert.Less(260, path.Length);
+
+        Assert.Throws<PathTooLongException>(() =>
         {
-            var basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests");
+            using var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo"));
+            _fileSystem.AddFile(path + "f3.txt", ms);
+        });
+    }
 
-            using (var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo")))
-            {
-                _fileSystem.AddFile("sub/f3.txt", ms);
-            }
+    [Test]
+    public void GetFullPathTest()
+    {
+        // outside of tests, one initializes the PhysicalFileSystem with eg ~/Dir
+        // and then, rootPath = /path/to/Dir and rootUrl = /Dir/
+        // here we initialize the PhysicalFileSystem with
+        // rootPath = /path/to/FileSysTests
+        // rootUrl = /Media/
+        var basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests");
 
-            Assert.IsTrue(File.Exists(Path.Combine(basePath, "sub/f3.txt")));
+        // ensure that GetFullPath
+        // - does return the proper full path
+        // - does properly normalize separators
+        // - does throw on invalid paths
+        // works
+        var path = _fileSystem.GetFullPath("foo.tmp");
+        Assert.AreEqual(Path.Combine(basePath, @"foo.tmp"), path);
 
-            var path = Repeat("bah/bah/", 50);
-            Assert.Less(260, path.Length);
+        // a very long relative path, which ends up being a short path, works
+        path = Repeat("bah/../", 50);
+        Assert.Less(260, path.Length);
+        path = _fileSystem.GetFullPath(path + "foo.tmp");
+        Assert.AreEqual(Path.Combine(basePath, @"foo.tmp"), path);
 
-            Assert.Throws<PathTooLongException>(() =>
-            {
-                using var ms = new MemoryStream(Encoding.UTF8.GetBytes("foo"));
-                _fileSystem.AddFile(path + "f3.txt", ms);
-            });
-        }
+        // works too
+        path = _fileSystem.GetFullPath("foo/bar.tmp");
+        Assert.AreEqual(Path.Combine(basePath, @$"foo{Path.DirectorySeparatorChar}bar.tmp"), path);
 
-        [Test]
-        public void GetFullPathTest()
+        // that path is invalid as it would be outside the root directory
+        Assert.Throws<UnauthorizedAccessException>(() => _fileSystem.GetFullPath("../../foo.tmp"));
+
+        // a very long path, which ends up being very long, works
+        path = Repeat("bah/bah/", 50);
+        Assert.Less(260, path.Length);
+        Assert.Throws<PathTooLongException>(() =>
         {
-            // outside of tests, one initializes the PhysicalFileSystem with eg ~/Dir
-            // and then, rootPath = /path/to/Dir and rootUrl = /Dir/
-            // here we initialize the PhysicalFileSystem with
-            // rootPath = /path/to/FileSysTests
-            // rootUrl = /Media/
-            var basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FileSysTests");
-
-            // ensure that GetFullPath
-            // - does return the proper full path
-            // - does properly normalize separators
-            // - does throw on invalid paths
-            // works
-            var path = _fileSystem.GetFullPath("foo.tmp");
-            Assert.AreEqual(Path.Combine(basePath, @"foo.tmp"), path);
-
-            // a very long relative path, which ends up being a short path, works
-            path = Repeat("bah/../", 50);
-            Assert.Less(260, path.Length);
             path = _fileSystem.GetFullPath(path + "foo.tmp");
-            Assert.AreEqual(Path.Combine(basePath, @"foo.tmp"), path);
-
-            // works too
-            path = _fileSystem.GetFullPath("foo/bar.tmp");
-            Assert.AreEqual(Path.Combine(basePath, @$"foo{Path.DirectorySeparatorChar}bar.tmp"), path);
-
-            // that path is invalid as it would be outside the root directory
-            Assert.Throws<UnauthorizedAccessException>(() => _fileSystem.GetFullPath("../../foo.tmp"));
-
-            // a very long path, which ends up being very long, works
-            path = Repeat("bah/bah/", 50);
-            Assert.Less(260, path.Length);
-            Assert.Throws<PathTooLongException>(() =>
-            {
-                path = _fileSystem.GetFullPath(path + "foo.tmp");
-                Assert.Less(260, path.Length); // gets a >260 path and it's fine (but Windows will not like it)
-            });
-        }
+            Assert.Less(260, path.Length); // gets a >260 path and it's fine (but Windows will not like it)
+        });
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs
index 8cd8dc85ab..350c1f1944 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestContentAppTests.cs
@@ -8,80 +8,81 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Manifest;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest;
+
+[TestFixture]
+public class ManifestContentAppTests
 {
-    [TestFixture]
-    public class ManifestContentAppTests
+    [Test]
+    public void Test()
     {
-        [Test]
-        public void Test()
+        var contentType = Mock.Of<IContentType>();
+        Mock.Get(contentType).Setup(x => x.Alias).Returns("type1");
+        var content = Mock.Of<IContent>();
+        Mock.Get(content).Setup(x => x.ContentType).Returns(new SimpleContentType(contentType));
+
+        var group1 = Mock.Of<IReadOnlyUserGroup>();
+        Mock.Get(group1).Setup(x => x.Alias).Returns("group1");
+        var group2 = Mock.Of<IReadOnlyUserGroup>();
+        Mock.Get(group2).Setup(x => x.Alias).Returns("group2");
+
+        // no rule = ok
+        AssertDefinition(content, true, Array.Empty<string>(), new[] { group1, group2 });
+
+        // wildcards = ok
+        AssertDefinition(content, true, new[] { "+content/*" }, new[] { group1, group2 });
+        AssertDefinition(content, false, new[] { "+media/*" }, new[] { group1, group2 });
+
+        // explicitly enabling / disabling
+        AssertDefinition(content, true, new[] { "+content/type1" }, new[] { group1, group2 });
+        AssertDefinition(content, false, new[] { "-content/type1" }, new[] { group1, group2 });
+
+        // when there are type rules, failing to approve the type = no app
+        AssertDefinition(content, false, new[] { "+content/type2" }, new[] { group1, group2 });
+        AssertDefinition(content, false, new[] { "+media/type1" }, new[] { group1, group2 });
+
+        // can have multiple rule, first one that matches = end
+        AssertDefinition(content, false, new[] { "-content/type1", "+content/*" }, new[] { group1, group2 });
+        AssertDefinition(content, true, new[] { "-content/type2", "+content/*" }, new[] { group1, group2 });
+        AssertDefinition(content, true, new[] { "+content/*", "-content/type1" }, new[] { group1, group2 });
+
+        // when there are role rules, failing to approve a role = no app
+        AssertDefinition(content, false, new[] { "+role/group33" }, new[] { group1, group2 });
+
+        // wildcards = ok
+        AssertDefinition(content, true, new[] { "+role/*" }, new[] { group1, group2 });
+
+        // explicitly enabling / disabling
+        AssertDefinition(content, true, new[] { "+role/group1" }, new[] { group1, group2 });
+        AssertDefinition(content, false, new[] { "-role/group1" }, new[] { group1, group2 });
+
+        // can have multiple rule, first one that matches = end
+        AssertDefinition(content, true, new[] { "+role/group1", "-role/group2" }, new[] { group1, group2 });
+
+        // mixed type and role rules, both are evaluated and need to match
+        AssertDefinition(content, true, new[] { "+role/group1", "+content/type1" }, new[] { group1, group2 });
+        AssertDefinition(content, false, new[] { "+role/group1", "+content/type2" }, new[] { group1, group2 });
+        AssertDefinition(content, false, new[] { "+role/group33", "+content/type1" }, new[] { group1, group2 });
+    }
+
+    private void AssertDefinition(object source, bool expected, string[] show, IReadOnlyUserGroup[] groups)
+    {
+        var definition = JsonConvert.DeserializeObject<ManifestContentAppDefinition>("{" +
+            (show.Length == 0
+                ? string.Empty
+                : " \"show\": [" + string.Join(",", show.Select(x => "\"" + x + "\"")) + "] ") + "}");
+        var factory = new ManifestContentAppFactory(definition, TestHelper.IOHelper);
+        var app = factory.GetContentAppFor(source, groups);
+        if (expected)
         {
-            IContentType contentType = Mock.Of<IContentType>();
-            Mock.Get(contentType).Setup(x => x.Alias).Returns("type1");
-            IContent content = Mock.Of<IContent>();
-            Mock.Get(content).Setup(x => x.ContentType).Returns(new SimpleContentType(contentType));
-
-            IReadOnlyUserGroup group1 = Mock.Of<IReadOnlyUserGroup>();
-            Mock.Get(group1).Setup(x => x.Alias).Returns("group1");
-            IReadOnlyUserGroup group2 = Mock.Of<IReadOnlyUserGroup>();
-            Mock.Get(group2).Setup(x => x.Alias).Returns("group2");
-
-            // no rule = ok
-            AssertDefinition(content, true, Array.Empty<string>(), new[] { group1, group2 });
-
-            // wildcards = ok
-            AssertDefinition(content, true, new[] { "+content/*" }, new[] { group1, group2 });
-            AssertDefinition(content, false, new[] { "+media/*" }, new[] { group1, group2 });
-
-            // explicitly enabling / disabling
-            AssertDefinition(content, true, new[] { "+content/type1" }, new[] { group1, group2 });
-            AssertDefinition(content, false, new[] { "-content/type1" }, new[] { group1, group2 });
-
-            // when there are type rules, failing to approve the type = no app
-            AssertDefinition(content, false, new[] { "+content/type2" }, new[] { group1, group2 });
-            AssertDefinition(content, false, new[] { "+media/type1" }, new[] { group1, group2 });
-
-            // can have multiple rule, first one that matches = end
-            AssertDefinition(content, false, new[] { "-content/type1", "+content/*" }, new[] { group1, group2 });
-            AssertDefinition(content, true, new[] { "-content/type2", "+content/*" }, new[] { group1, group2 });
-            AssertDefinition(content, true, new[] { "+content/*", "-content/type1" }, new[] { group1, group2 });
-
-            // when there are role rules, failing to approve a role = no app
-            AssertDefinition(content, false, new[] { "+role/group33" }, new[] { group1, group2 });
-
-            // wildcards = ok
-            AssertDefinition(content, true, new[] { "+role/*" }, new[] { group1, group2 });
-
-            // explicitly enabling / disabling
-            AssertDefinition(content, true, new[] { "+role/group1" }, new[] { group1, group2 });
-            AssertDefinition(content, false, new[] { "-role/group1" }, new[] { group1, group2 });
-
-            // can have multiple rule, first one that matches = end
-            AssertDefinition(content, true, new[] { "+role/group1", "-role/group2" }, new[] { group1, group2 });
-
-            // mixed type and role rules, both are evaluated and need to match
-            AssertDefinition(content, true, new[] { "+role/group1", "+content/type1" }, new[] { group1, group2 });
-            AssertDefinition(content, false, new[] { "+role/group1", "+content/type2" }, new[] { group1, group2 });
-            AssertDefinition(content, false, new[] { "+role/group33", "+content/type1" }, new[] { group1, group2 });
+            Assert.IsNotNull(app);
         }
-
-        private void AssertDefinition(object source, bool expected, string[] show, IReadOnlyUserGroup[] groups)
+        else
         {
-            ManifestContentAppDefinition definition = JsonConvert.DeserializeObject<ManifestContentAppDefinition>("{" + (show.Length == 0 ? string.Empty : " \"show\": [" + string.Join(",", show.Select(x => "\"" + x + "\"")) + "] ") + "}");
-            var factory = new ManifestContentAppFactory(definition, TestHelper.IOHelper);
-            ContentApp app = factory.GetContentAppFor(source, groups);
-            if (expected)
-            {
-                Assert.IsNotNull(app);
-            }
-            else
-            {
-                Assert.IsNull(app);
-            }
+            Assert.IsNull(app);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
index fda216e51a..43c0460511 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/ManifestParserTests.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Microsoft.Extensions.Logging;
@@ -12,11 +11,9 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Dashboards;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Manifest;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.PropertyEditors.Validators;
 using Umbraco.Cms.Core.Services;
@@ -24,42 +21,42 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest;
+
+[TestFixture]
+public class ManifestParserTests
 {
-    [TestFixture]
-    public class ManifestParserTests
+    [SetUp]
+    public void Setup()
     {
-        private ManifestParser _parser;
-        private IIOHelper _ioHelper;
-
-        [SetUp]
-        public void Setup()
+        var validators = new IManifestValueValidator[]
         {
-            var validators = new IManifestValueValidator[]
-            {
-                new RequiredValidator(Mock.Of<ILocalizedTextService>()),
-                new RegexValidator(Mock.Of<ILocalizedTextService>(), null),
-                new DelimitedValueValidator(),
-            };
-            _ioHelper = TestHelper.IOHelper;
-            NullLoggerFactory loggerFactory = NullLoggerFactory.Instance;
-            _parser = new ManifestParser(
-                AppCaches.Disabled,
-                new ManifestValueValidatorCollection(() => validators),
-                new ManifestFilterCollection(() => Enumerable.Empty<IManifestFilter>()),
-                loggerFactory.CreateLogger<ManifestParser>(),
-                _ioHelper,
-                TestHelper.GetHostingEnvironment(),
-                new JsonNetSerializer(),
-                Mock.Of<ILocalizedTextService>(),
-                Mock.Of<IShortStringHelper>(),
-                Mock.Of<IDataValueEditorFactory>());
-        }
+            new RequiredValidator(Mock.Of<ILocalizedTextService>()),
+            new RegexValidator(Mock.Of<ILocalizedTextService>(), null),
+            new DelimitedValueValidator(),
+        };
+        _ioHelper = TestHelper.IOHelper;
+        var loggerFactory = NullLoggerFactory.Instance;
+        _parser = new ManifestParser(
+            AppCaches.Disabled,
+            new ManifestValueValidatorCollection(() => validators),
+            new ManifestFilterCollection(() => Enumerable.Empty<IManifestFilter>()),
+            loggerFactory.CreateLogger<ManifestParser>(),
+            _ioHelper,
+            TestHelper.GetHostingEnvironment(),
+            new JsonNetSerializer(),
+            Mock.Of<ILocalizedTextService>(),
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IDataValueEditorFactory>());
+    }
 
-        [Test]
-        public void DelimitedValueValidator()
-        {
-            const string json = @"{'propertyEditors': [
+    private ManifestParser _parser;
+    private IIOHelper _ioHelper;
+
+    [Test]
+    public void DelimitedValueValidator()
+    {
+        const string json = @"{'propertyEditors': [
     {
         alias: 'Test.Test2',
         name: 'Test 2',
@@ -78,23 +75,23 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest
     }
 ]}";
 
-            PackageManifest manifest = _parser.ParseManifest(json);
+        var manifest = _parser.ParseManifest(json);
 
-            Assert.AreEqual(1, manifest.ParameterEditors.Length);
-            Assert.AreEqual(1, manifest.ParameterEditors[0].GetValueEditor().Validators.Count);
+        Assert.AreEqual(1, manifest.ParameterEditors.Length);
+        Assert.AreEqual(1, manifest.ParameterEditors[0].GetValueEditor().Validators.Count);
 
-            Assert.IsTrue(manifest.ParameterEditors[0].GetValueEditor().Validators[0] is DelimitedValueValidator);
-            var validator = manifest.ParameterEditors[0].GetValueEditor().Validators[0] as DelimitedValueValidator;
+        Assert.IsTrue(manifest.ParameterEditors[0].GetValueEditor().Validators[0] is DelimitedValueValidator);
+        var validator = manifest.ParameterEditors[0].GetValueEditor().Validators[0] as DelimitedValueValidator;
 
-            Assert.IsNotNull(validator.Configuration);
-            Assert.AreEqual(",", validator.Configuration.Delimiter);
-            Assert.AreEqual("^[a-zA-Z]*$", validator.Configuration.Pattern);
-        }
+        Assert.IsNotNull(validator.Configuration);
+        Assert.AreEqual(",", validator.Configuration.Delimiter);
+        Assert.AreEqual("^[a-zA-Z]*$", validator.Configuration.Pattern);
+    }
 
-        [Test]
-        public void CanParseComments()
-        {
-            const string json1 = @"
+    [Test]
+    public void CanParseComments()
+    {
+        const string json1 = @"
 // this is a single-line comment
 {
     ""x"": 2, // this is an end-of-line comment
@@ -105,78 +102,80 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Manifest
 }
 ";
 
-            var jobject = (JObject)JsonConvert.DeserializeObject(json1);
-            Assert.AreEqual("2", jobject.Property("x").Value.ToString());
-            Assert.AreEqual("3", jobject.Property("y").Value.ToString());
-            Assert.AreEqual("4", jobject.Property("z").Value.ToString());
-            Assert.AreEqual("this is /* comment */ a string", jobject.Property("t").Value.ToString());
-            Assert.AreEqual("this is // more comment in a string", jobject.Property("u").Value.ToString());
-        }
+        var jobject = (JObject)JsonConvert.DeserializeObject(json1);
+        Assert.AreEqual("2", jobject.Property("x").Value.ToString());
+        Assert.AreEqual("3", jobject.Property("y").Value.ToString());
+        Assert.AreEqual("4", jobject.Property("z").Value.ToString());
+        Assert.AreEqual("this is /* comment */ a string", jobject.Property("t").Value.ToString());
+        Assert.AreEqual("this is // more comment in a string", jobject.Property("u").Value.ToString());
+    }
 
-        [Test]
-        public void ThrowOnJsonError()
-        {
-            // invalid json, missing the final ']' on javascript
-            const string json = @"{
+    [Test]
+    public void ThrowOnJsonError()
+    {
+        // invalid json, missing the final ']' on javascript
+        const string json = @"{
 propertyEditors: []/*we have empty property editors**/,
 javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2.js' }";
 
-            // parsing fails
-            Assert.Throws<JsonReaderException>(() => _parser.ParseManifest(json));
-        }
+        // parsing fails
+        Assert.Throws<JsonReaderException>(() => _parser.ParseManifest(json));
+    }
 
-        [Test]
-        public void CanParseManifest_ScriptsAndStylesheets()
-        {
-            string json = "{}";
-            PackageManifest manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(0, manifest.Scripts.Length);
+    [Test]
+    public void CanParseManifest_ScriptsAndStylesheets()
+    {
+        var json = "{}";
+        var manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(0, manifest.Scripts.Length);
 
-            json = "{javascript: []}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(0, manifest.Scripts.Length);
+        json = "{javascript: []}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(0, manifest.Scripts.Length);
 
-            json = "{javascript: ['~/test.js', '~/test2.js']}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.Scripts.Length);
+        json = "{javascript: ['~/test.js', '~/test2.js']}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.Scripts.Length);
 
-            json = "{propertyEditors: [], javascript: ['~/test.js', '~/test2.js']}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.Scripts.Length);
+        json = "{propertyEditors: [], javascript: ['~/test.js', '~/test2.js']}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.Scripts.Length);
 
-            Assert.AreEqual(_ioHelper.ResolveUrl("/test.js"), manifest.Scripts[0]);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/test2.js"), manifest.Scripts[1]);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/test.js"), manifest.Scripts[0]);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/test2.js"), manifest.Scripts[1]);
 
-            // kludge is gone - must filter before parsing
-            json = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()) + "{propertyEditors: [], javascript: ['~/test.js', '~/test2.js']}";
-            Assert.Throws<JsonReaderException>(() => _parser.ParseManifest(json));
+        // kludge is gone - must filter before parsing
+        json = Encoding.UTF8.GetString(Encoding.UTF8.GetPreamble()) +
+               "{propertyEditors: [], javascript: ['~/test.js', '~/test2.js']}";
+        Assert.Throws<JsonReaderException>(() => _parser.ParseManifest(json));
 
-            json = "{}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(0, manifest.Stylesheets.Length);
+        json = "{}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(0, manifest.Stylesheets.Length);
 
-            json = "{css: []}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(0, manifest.Stylesheets.Length);
+        json = "{css: []}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(0, manifest.Stylesheets.Length);
 
-            json = "{css: ['~/style.css', '~/folder-name/sdsdsd/stylesheet.css']}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.Stylesheets.Length);
+        json = "{css: ['~/style.css', '~/folder-name/sdsdsd/stylesheet.css']}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.Stylesheets.Length);
 
-            json = "{propertyEditors: [], css: ['~/stylesheet.css', '~/random-long-name.css']}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.Stylesheets.Length);
+        json = "{propertyEditors: [], css: ['~/stylesheet.css', '~/random-long-name.css']}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.Stylesheets.Length);
 
-            json = "{propertyEditors: [], javascript: ['~/test.js', '~/test2.js'], css: ['~/stylesheet.css', '~/random-long-name.css']}";
-            manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.Scripts.Length);
-            Assert.AreEqual(2, manifest.Stylesheets.Length);
-        }
+        json =
+            "{propertyEditors: [], javascript: ['~/test.js', '~/test2.js'], css: ['~/stylesheet.css', '~/random-long-name.css']}";
+        manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.Scripts.Length);
+        Assert.AreEqual(2, manifest.Stylesheets.Length);
+    }
 
-        [Test]
-        public void CanParseManifest_PropertyEditors()
-        {
-            const string json = @"{'propertyEditors': [
+    [Test]
+    public void CanParseManifest_PropertyEditors()
+    {
+        const string json = @"{'propertyEditors': [
     {
         alias: 'Test.Test1',
         name: 'Test 1',
@@ -223,73 +222,73 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2
     }
 ]}";
 
-            PackageManifest manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.PropertyEditors.Length);
+        var manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.PropertyEditors.Length);
 
-            IDataEditor editor = manifest.PropertyEditors[1];
-            Assert.IsTrue((editor.Type & EditorType.MacroParameter) > 0);
-            Assert.IsNotEmpty(editor.DefaultConfiguration);
-            Assert.AreEqual("some default val", editor.DefaultConfiguration["key1"]);
+        var editor = manifest.PropertyEditors[1];
+        Assert.IsTrue((editor.Type & EditorType.MacroParameter) > 0);
+        Assert.IsNotEmpty(editor.DefaultConfiguration);
+        Assert.AreEqual("some default val", editor.DefaultConfiguration["key1"]);
 
-            editor = manifest.PropertyEditors[0];
-            Assert.AreEqual("Test.Test1", editor.Alias);
-            Assert.AreEqual("Test 1", editor.Name);
-            Assert.IsFalse((editor.Type & EditorType.MacroParameter) > 0);
+        editor = manifest.PropertyEditors[0];
+        Assert.AreEqual("Test.Test1", editor.Alias);
+        Assert.AreEqual("Test 1", editor.Name);
+        Assert.IsFalse((editor.Type & EditorType.MacroParameter) > 0);
 
-            IDataValueEditor valueEditor = editor.GetValueEditor();
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/MyEditor.html"), valueEditor.View);
-            Assert.AreEqual("int", valueEditor.ValueType);
-            Assert.IsTrue(valueEditor.HideLabel);
+        var valueEditor = editor.GetValueEditor();
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/MyEditor.html"), valueEditor.View);
+        Assert.AreEqual("int", valueEditor.ValueType);
+        Assert.IsTrue(valueEditor.HideLabel);
 
-            // these two don't make much sense here
-            //// valueEditor.RegexValidator;
-            //// valueEditor.RequiredValidator;
+        // these two don't make much sense here
+        //// valueEditor.RegexValidator;
+        //// valueEditor.RequiredValidator;
 
-            List<IValueValidator> validators = valueEditor.Validators;
-            Assert.AreEqual(2, validators.Count);
-            IValueValidator validator = validators[0];
-            var v1 = validator as RequiredValidator;
-            Assert.IsNotNull(v1);
-            Assert.AreEqual("Required", v1.ValidationName);
-            validator = validators[1];
-            var v2 = validator as RegexValidator;
-            Assert.IsNotNull(v2);
-            Assert.AreEqual("Regex", v2.ValidationName);
-            Assert.AreEqual("\\d*", v2.Configuration);
+        var validators = valueEditor.Validators;
+        Assert.AreEqual(2, validators.Count);
+        var validator = validators[0];
+        var v1 = validator as RequiredValidator;
+        Assert.IsNotNull(v1);
+        Assert.AreEqual("Required", v1.ValidationName);
+        validator = validators[1];
+        var v2 = validator as RegexValidator;
+        Assert.IsNotNull(v2);
+        Assert.AreEqual("Regex", v2.ValidationName);
+        Assert.AreEqual("\\d*", v2.Configuration);
 
-            // this is not part of the manifest
-            IDictionary<string, object> preValues = editor.GetConfigurationEditor().DefaultConfiguration;
-            Assert.IsEmpty(preValues);
+        // this is not part of the manifest
+        var preValues = editor.GetConfigurationEditor().DefaultConfiguration;
+        Assert.IsEmpty(preValues);
 
-            IConfigurationEditor preValueEditor = editor.GetConfigurationEditor();
-            Assert.IsNotNull(preValueEditor);
-            Assert.IsNotNull(preValueEditor.Fields);
-            Assert.AreEqual(2, preValueEditor.Fields.Count);
+        var preValueEditor = editor.GetConfigurationEditor();
+        Assert.IsNotNull(preValueEditor);
+        Assert.IsNotNull(preValueEditor.Fields);
+        Assert.AreEqual(2, preValueEditor.Fields.Count);
 
-            ConfigurationField f = preValueEditor.Fields[0];
-            Assert.AreEqual("key1", f.Key);
-            Assert.AreEqual("Some config 1", f.Name);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/Views/pre-val1.html"), f.View);
-            List<IValueValidator> fvalidators = f.Validators;
-            Assert.IsNotNull(fvalidators);
-            Assert.AreEqual(1, fvalidators.Count);
-            var fv = fvalidators[0] as RequiredValidator;
-            Assert.IsNotNull(fv);
-            Assert.AreEqual("Required", fv.ValidationName);
+        var f = preValueEditor.Fields[0];
+        Assert.AreEqual("key1", f.Key);
+        Assert.AreEqual("Some config 1", f.Name);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/Views/pre-val1.html"), f.View);
+        var fvalidators = f.Validators;
+        Assert.IsNotNull(fvalidators);
+        Assert.AreEqual(1, fvalidators.Count);
+        var fv = fvalidators[0] as RequiredValidator;
+        Assert.IsNotNull(fv);
+        Assert.AreEqual("Required", fv.ValidationName);
 
-            f = preValueEditor.Fields[1];
-            Assert.AreEqual("key2", f.Key);
-            Assert.AreEqual("Some config 2", f.Name);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/Views/pre-val2.html"), f.View);
-            fvalidators = f.Validators;
-            Assert.IsNotNull(fvalidators);
-            Assert.AreEqual(0, fvalidators.Count);
-        }
+        f = preValueEditor.Fields[1];
+        Assert.AreEqual("key2", f.Key);
+        Assert.AreEqual("Some config 2", f.Name);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/Views/pre-val2.html"), f.View);
+        fvalidators = f.Validators;
+        Assert.IsNotNull(fvalidators);
+        Assert.AreEqual(0, fvalidators.Count);
+    }
 
-        [Test]
-        public void CanParseManifest_ParameterEditors()
-        {
-            const string json = @"{'parameterEditors': [
+    [Test]
+    public void CanParseManifest_ParameterEditors()
+    {
+        const string json = @"{'parameterEditors': [
     {
         alias: 'parameter1',
         name: 'My Parameter',
@@ -307,34 +306,34 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2
     }
 ]}";
 
-            PackageManifest manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(3, manifest.ParameterEditors.Length);
+        var manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(3, manifest.ParameterEditors.Length);
 
-            Assert.IsTrue(manifest.ParameterEditors.All(x => (x.Type & EditorType.MacroParameter) > 0));
+        Assert.IsTrue(manifest.ParameterEditors.All(x => (x.Type & EditorType.MacroParameter) > 0));
 
-            IDataEditor editor = manifest.ParameterEditors[1];
-            Assert.AreEqual("parameter2", editor.Alias);
-            Assert.AreEqual("Another parameter", editor.Name);
+        var editor = manifest.ParameterEditors[1];
+        Assert.AreEqual("parameter2", editor.Alias);
+        Assert.AreEqual("Another parameter", editor.Name);
 
-            IDictionary<string, object> config = editor.DefaultConfiguration;
-            Assert.AreEqual(1, config.Count);
-            Assert.IsTrue(config.ContainsKey("key1"));
-            Assert.AreEqual("some config val", config["key1"]);
+        var config = editor.DefaultConfiguration;
+        Assert.AreEqual(1, config.Count);
+        Assert.IsTrue(config.ContainsKey("key1"));
+        Assert.AreEqual("some config val", config["key1"]);
 
-            IDataValueEditor valueEditor = editor.GetValueEditor();
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/CsvEditor.html"), valueEditor.View);
+        var valueEditor = editor.GetValueEditor();
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/PropertyEditors/CsvEditor.html"), valueEditor.View);
 
-            editor = manifest.ParameterEditors[2];
-            Assert.Throws<InvalidOperationException>(() =>
-            {
-                IDataValueEditor valueEditor = editor.GetValueEditor();
-            });
-        }
-
-        [Test]
-        public void CanParseManifest_GridEditors()
+        editor = manifest.ParameterEditors[2];
+        Assert.Throws<InvalidOperationException>(() =>
         {
-            const string json = @"{
+            var valueEditor = editor.GetValueEditor();
+        });
+    }
+
+    [Test]
+    public void CanParseManifest_GridEditors()
+    {
+        const string json = @"{
     'javascript': [    ],
     'css': [     ],
     'gridEditors': [
@@ -366,32 +365,32 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2
         }
     ]
 }";
-            PackageManifest manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.GridEditors.Length);
+        var manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.GridEditors.Length);
 
-            GridEditor editor = manifest.GridEditors[0];
-            Assert.AreEqual("small-hero", editor.Alias);
-            Assert.AreEqual("Small Hero", editor.Name);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPlugin/small-hero/editortemplate.html"), editor.View);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/Views/Partials/Grid/Editors/SmallHero.cshtml"), editor.Render);
-            Assert.AreEqual("icon-presentation", editor.Icon);
+        var editor = manifest.GridEditors[0];
+        Assert.AreEqual("small-hero", editor.Alias);
+        Assert.AreEqual("Small Hero", editor.Name);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPlugin/small-hero/editortemplate.html"), editor.View);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/Views/Partials/Grid/Editors/SmallHero.cshtml"), editor.Render);
+        Assert.AreEqual("icon-presentation", editor.Icon);
 
-            IDictionary<string, object> config = editor.Config;
-            Assert.AreEqual(2, config.Count);
-            Assert.IsTrue(config.ContainsKey("image"));
-            object c = config["image"];
-            Assert.IsInstanceOf<JObject>(c); // FIXME: is this what we want?
-            Assert.IsTrue(config.ContainsKey("link"));
-            c = config["link"];
-            Assert.IsInstanceOf<JObject>(c); // FIXME: is this what we want?
+        var config = editor.Config;
+        Assert.AreEqual(2, config.Count);
+        Assert.IsTrue(config.ContainsKey("image"));
+        var c = config["image"];
+        Assert.IsInstanceOf<JObject>(c); // FIXME: is this what we want?
+        Assert.IsTrue(config.ContainsKey("link"));
+        c = config["link"];
+        Assert.IsInstanceOf<JObject>(c); // FIXME: is this what we want?
 
-            // FIXME: should we resolveUrl in configs?
-        }
+        // FIXME: should we resolveUrl in configs?
+    }
 
-        [Test]
-        public void CanParseManifest_ContentApps()
-        {
-            const string json = @"{'contentApps': [
+    [Test]
+    public void CanParseManifest_ContentApps()
+    {
+        const string json = @"{'contentApps': [
     {
         alias: 'myPackageApp1',
         name: 'My App1',
@@ -407,28 +406,28 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2
     }
 ]}";
 
-            PackageManifest manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.ContentApps.Length);
+        var manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.ContentApps.Length);
 
-            Assert.IsInstanceOf<ManifestContentAppDefinition>(manifest.ContentApps[0]);
-            var app0 = (ManifestContentAppDefinition)manifest.ContentApps[0];
-            Assert.AreEqual("myPackageApp1", app0.Alias);
-            Assert.AreEqual("My App1", app0.Name);
-            Assert.AreEqual("icon-foo", app0.Icon);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/ContentApps/MyApp1.html"), app0.View);
+        Assert.IsInstanceOf<ManifestContentAppDefinition>(manifest.ContentApps[0]);
+        var app0 = manifest.ContentApps[0];
+        Assert.AreEqual("myPackageApp1", app0.Alias);
+        Assert.AreEqual("My App1", app0.Name);
+        Assert.AreEqual("icon-foo", app0.Icon);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/ContentApps/MyApp1.html"), app0.View);
 
-            Assert.IsInstanceOf<ManifestContentAppDefinition>(manifest.ContentApps[1]);
-            var app1 = (ManifestContentAppDefinition)manifest.ContentApps[1];
-            Assert.AreEqual("myPackageApp2", app1.Alias);
-            Assert.AreEqual("My App2", app1.Name);
-            Assert.AreEqual("icon-bar", app1.Icon);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/ContentApps/MyApp2.html"), app1.View);
-        }
+        Assert.IsInstanceOf<ManifestContentAppDefinition>(manifest.ContentApps[1]);
+        var app1 = manifest.ContentApps[1];
+        Assert.AreEqual("myPackageApp2", app1.Alias);
+        Assert.AreEqual("My App2", app1.Name);
+        Assert.AreEqual("icon-bar", app1.Icon);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/ContentApps/MyApp2.html"), app1.View);
+    }
 
-        [Test]
-        public void CanParseManifest_Dashboards()
-        {
-            const string json = @"{'dashboards': [
+    [Test]
+    public void CanParseManifest_Dashboards()
+    {
+        const string json = @"{'dashboards': [
     {
         'alias': 'something',
         'view': '~/App_Plugins/MyPackage/Dashboards/one.html',
@@ -444,67 +443,66 @@ javascript: ['~/test.js',/*** some note about stuff asd09823-4**09234*/ '~/test2
     }
 ]}";
 
-            PackageManifest manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.Dashboards.Length);
+        var manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.Dashboards.Length);
 
-            Assert.IsInstanceOf<ManifestDashboard>(manifest.Dashboards[0]);
-            ManifestDashboard db0 = manifest.Dashboards[0];
-            Assert.AreEqual("something", db0.Alias);
-            Assert.AreEqual(100, db0.Weight);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/Dashboards/one.html"), db0.View);
-            Assert.AreEqual(1, db0.Sections.Length);
-            Assert.AreEqual("content", db0.Sections[0]);
-            Assert.AreEqual(2, db0.AccessRules.Length);
-            Assert.AreEqual(AccessRuleType.Grant, db0.AccessRules[0].Type);
-            Assert.AreEqual("user", db0.AccessRules[0].Value);
-            Assert.AreEqual(AccessRuleType.Deny, db0.AccessRules[1].Type);
-            Assert.AreEqual("foo", db0.AccessRules[1].Value);
+        Assert.IsInstanceOf<ManifestDashboard>(manifest.Dashboards[0]);
+        var db0 = manifest.Dashboards[0];
+        Assert.AreEqual("something", db0.Alias);
+        Assert.AreEqual(100, db0.Weight);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/Dashboards/one.html"), db0.View);
+        Assert.AreEqual(1, db0.Sections.Length);
+        Assert.AreEqual("content", db0.Sections[0]);
+        Assert.AreEqual(2, db0.AccessRules.Length);
+        Assert.AreEqual(AccessRuleType.Grant, db0.AccessRules[0].Type);
+        Assert.AreEqual("user", db0.AccessRules[0].Value);
+        Assert.AreEqual(AccessRuleType.Deny, db0.AccessRules[1].Type);
+        Assert.AreEqual("foo", db0.AccessRules[1].Value);
 
-            Assert.IsInstanceOf<ManifestDashboard>(manifest.Dashboards[1]);
-            ManifestDashboard db1 = manifest.Dashboards[1];
-            Assert.AreEqual("something.else", db1.Alias);
-            Assert.AreEqual(-1, db1.Weight);
-            Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/Dashboards/two.html"), db1.View);
-            Assert.AreEqual(1, db1.Sections.Length);
-            Assert.AreEqual("forms", db1.Sections[0]);
-        }
+        Assert.IsInstanceOf<ManifestDashboard>(manifest.Dashboards[1]);
+        var db1 = manifest.Dashboards[1];
+        Assert.AreEqual("something.else", db1.Alias);
+        Assert.AreEqual(-1, db1.Weight);
+        Assert.AreEqual(_ioHelper.ResolveUrl("/App_Plugins/MyPackage/Dashboards/two.html"), db1.View);
+        Assert.AreEqual(1, db1.Sections.Length);
+        Assert.AreEqual("forms", db1.Sections[0]);
+    }
 
-        [Test]
-        public void CanParseManifest_Sections()
-        {
-            const string json = @"{'sections': [
+    [Test]
+    public void CanParseManifest_Sections()
+    {
+        const string json = @"{'sections': [
     { ""alias"": ""content"", ""name"": ""Content"" },
     { ""alias"": ""hello"", ""name"": ""World"" }
 ]}";
 
-            PackageManifest manifest = _parser.ParseManifest(json);
-            Assert.AreEqual(2, manifest.Sections.Length);
-            Assert.AreEqual("content", manifest.Sections[0].Alias);
-            Assert.AreEqual("hello", manifest.Sections[1].Alias);
-            Assert.AreEqual("Content", manifest.Sections[0].Name);
-            Assert.AreEqual("World", manifest.Sections[1].Name);
-        }
+        var manifest = _parser.ParseManifest(json);
+        Assert.AreEqual(2, manifest.Sections.Length);
+        Assert.AreEqual("content", manifest.Sections[0].Alias);
+        Assert.AreEqual("hello", manifest.Sections[1].Alias);
+        Assert.AreEqual("Content", manifest.Sections[0].Name);
+        Assert.AreEqual("World", manifest.Sections[1].Name);
+    }
 
-        [Test]
-        public void CanParseManifest_Version()
+    [Test]
+    public void CanParseManifest_Version()
+    {
+        const string json = @"{""name"": ""VersionPackage"", ""version"": ""1.0.0""}";
+        var manifest = _parser.ParseManifest(json);
+
+        Assert.Multiple(() =>
         {
-            const string json = @"{""name"": ""VersionPackage"", ""version"": ""1.0.0""}";
-            PackageManifest manifest = _parser.ParseManifest(json);
+            Assert.AreEqual("VersionPackage", manifest.PackageName);
+            Assert.AreEqual("1.0.0", manifest.Version);
+        });
+    }
 
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual("VersionPackage", manifest.PackageName);
-                Assert.AreEqual("1.0.0", manifest.Version);
-            });
-        }
+    [Test]
+    public void CanParseManifest_TrackingAllowed()
+    {
+        const string json = @"{""allowPackageTelemetry"": false }";
+        var manifest = _parser.ParseManifest(json);
 
-        [Test]
-        public void CanParseManifest_TrackingAllowed()
-        {
-            const string json = @"{""allowPackageTelemetry"": false }";
-            PackageManifest manifest = _parser.ParseManifest(json);
-
-            Assert.IsFalse(manifest.AllowPackageTelemetry);
-        }
+        Assert.IsFalse(manifest.AllowPackageTelemetry);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs
index 6c4a0e2828..a817a08b0a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/Item.cs
@@ -10,218 +10,234 @@ using System.Runtime.Serialization;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections;
+
+public abstract class Item : IEntity, ICanBeDirty
 {
-    public abstract class Item : IEntity, ICanBeDirty
+    /// <summary>
+    ///     Tracks the properties that have changed
+    /// </summary>
+    private readonly IDictionary<string, bool> _propertyChangedInfo;
+
+    private bool _hasIdentity;
+    private int _id;
+    private Guid _key;
+    private bool _withChanges = true; // should we track changes?
+
+    protected Item() => _propertyChangedInfo = new Dictionary<string, bool>();
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether some action against an entity was cancelled through some event.
+    ///     This only exists so we have a way to check if an event was cancelled through
+    ///     the new api, which also needs to take effect in the legacy api.
+    /// </summary>
+    [IgnoreDataMember]
+    internal bool WasCancelled { get; set; }
+
+    /// <summary>
+    ///     Property changed event
+    /// </summary>
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    /// <summary>
+    ///     Indicates whether a specific property on the current entity is dirty.
+    /// </summary>
+    /// <param name="propertyName">Name of the property to check</param>
+    /// <returns>True if Property is dirty, otherwise False</returns>
+    public virtual bool IsPropertyDirty(string propertyName) => _propertyChangedInfo.Any(x => x.Key == propertyName);
+
+    public virtual IEnumerable<string> GetDirtyProperties() => _propertyChangedInfo.Keys;
+
+    /// <summary>
+    ///     Indicates whether the current entity is dirty.
+    /// </summary>
+    /// <returns>True if entity is dirty, otherwise False</returns>
+    public virtual bool IsDirty() => _propertyChangedInfo.Any();
+
+    /// <summary>
+    ///     Resets dirty properties by clearing the dictionary used to track changes.
+    /// </summary>
+    /// <remarks>
+    ///     Please note that resetting the dirty properties could potentially
+    ///     obstruct the saving of a new or updated entity.
+    /// </remarks>
+    public virtual void ResetDirtyProperties() => _propertyChangedInfo.Clear();
+
+    /// <summary>
+    ///     Disables change tracking.
+    /// </summary>
+    public void DisableChangeTracking() => _withChanges = false;
+
+    /// <summary>
+    ///     Enables change tracking.
+    /// </summary>
+    public void EnableChangeTracking() => _withChanges = true;
+
+    /// <summary>
+    ///     Gets or sets the integer Id
+    /// </summary>
+    [DataMember]
+    public int Id
     {
-        private bool _withChanges = true; // should we track changes?
-        private bool _hasIdentity;
-        private int _id;
-        private Guid _key;
-
-        protected Item() => _propertyChangedInfo = new Dictionary<string, bool>();
-
-        /// <summary>
-        /// Gets or sets the integer Id
-        /// </summary>
-        [DataMember]
-        public int Id
+        get => _id;
+        set
         {
-            get => _id;
-            set
-            {
-                _id = value;
-                HasIdentity = true;
-            }
+            _id = value;
+            HasIdentity = true;
+        }
+    }
+
+    /// <summary>
+    ///     Gets or sets the Guid based Id
+    /// </summary>
+    /// <remarks>
+    ///     The key is currectly used to store the Unique Id from the
+    ///     umbracoNode table, which many of the entities are based on.
+    /// </remarks>
+    [DataMember]
+    public Guid Key
+    {
+        get => _key == Guid.Empty ? _id.ToGuid() : _key;
+        set => _key = value;
+    }
+
+    /// <summary>
+    ///     Gets or sets the Created Date
+    /// </summary>
+    [DataMember]
+    public DateTime CreateDate { get; set; }
+
+    /// <summary>
+    ///     Gets or sets the Modified Date
+    /// </summary>
+    [DataMember]
+    public DateTime UpdateDate { get; set; }
+
+    /// <summary>
+    ///     Gets or sets the Deleted Date
+    /// </summary>
+    [DataMember]
+    public DateTime? DeleteDate { get; set; }
+
+    public virtual void ResetIdentity()
+    {
+        _hasIdentity = false;
+        _id = default;
+    }
+
+    /// <summary>
+    ///     Gets or sets a value indicating whether the current entity has an identity, eg. Id.
+    /// </summary>
+    public virtual bool HasIdentity
+    {
+        get => _hasIdentity;
+        protected set => _hasIdentity = value;
+    }
+
+    /*public virtual bool SameIdentityAs(IEntity other)
+    {
+        if (ReferenceEquals(null, other))
+            return false;
+        if (ReferenceEquals(this, other))
+            return true;
+
+        return SameIdentityAs(other as Entity);
+    }
+
+    public virtual bool Equals(Entity other)
+    {
+        if (ReferenceEquals(null, other))
+            return false;
+        if (ReferenceEquals(this, other))
+            return true;
+
+        return SameIdentityAs(other);
+    }
+
+    public virtual Type GetRealType()
+    {
+        return GetType();
+    }
+
+    public virtual bool SameIdentityAs(Entity other)
+    {
+        if (ReferenceEquals(null, other))
+            return false;
+
+        if (ReferenceEquals(this, other))
+            return true;
+
+        if (GetType() == other.GetRealType() && HasIdentity && other.HasIdentity)
+            return other.Id.Equals(Id);
+
+        return false;
+    }
+
+    public override bool Equals(object obj)
+    {
+        if (ReferenceEquals(null, obj))
+            return false;
+        if (ReferenceEquals(this, obj))
+            return true;
+
+        return SameIdentityAs(obj as IEntity);
+    }
+
+    public override int GetHashCode()
+    {
+        if (!_hash.HasValue)
+            _hash = !HasIdentity ? new int?(base.GetHashCode()) : new int?(Id.GetHashCode() * 397 ^ GetType().GetHashCode());
+        return _hash.Value;
+    }*/
+
+    public object DeepClone() => MemberwiseClone();
+
+    /// <summary>
+    ///     Method to call on a property setter.
+    /// </summary>
+    /// <param name="propertyInfo">The property info.</param>
+    protected virtual void OnPropertyChanged(PropertyInfo propertyInfo)
+    {
+        if (_withChanges == false)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Gets or sets the Guid based Id
-        /// </summary>
-        /// <remarks>The key is currectly used to store the Unique Id from the
-        /// umbracoNode table, which many of the entities are based on.</remarks>
-        [DataMember]
-        public Guid Key
+        _propertyChangedInfo[propertyInfo.Name] = true;
+
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyInfo.Name));
+    }
+
+    /// <summary>
+    ///     Method to call on entity saved when first added
+    /// </summary>
+    internal virtual void AddingEntity()
+    {
+        CreateDate = DateTime.Now;
+        UpdateDate = DateTime.Now;
+    }
+
+    /// <summary>
+    ///     Method to call on entity saved/updated
+    /// </summary>
+    internal virtual void UpdatingEntity() => UpdateDate = DateTime.Now;
+
+    public static bool operator ==(Item left, Item right) => ReferenceEquals(left, right);
+
+    public static bool operator !=(Item left, Item right) => !(left == right);
+
+    public override bool Equals(object obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            get => _key == Guid.Empty ? _id.ToGuid() : _key;
-            set => _key = value;
+            return true;
         }
 
-        /// <summary>
-        /// Gets or sets the Created Date
-        /// </summary>
-        [DataMember]
-        public DateTime CreateDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Modified Date
-        /// </summary>
-        [DataMember]
-        public DateTime UpdateDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Deleted Date
-        /// </summary>
-        [DataMember]
-        public DateTime? DeleteDate { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether some action against an entity was cancelled through some event.
-        /// This only exists so we have a way to check if an event was cancelled through
-        /// the new api, which also needs to take effect in the legacy api.
-        /// </summary>
-        [IgnoreDataMember]
-        internal bool WasCancelled { get; set; }
-
-        /// <summary>
-        /// Property changed event
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        /// <summary>
-        /// Method to call on a property setter.
-        /// </summary>
-        /// <param name="propertyInfo">The property info.</param>
-        protected virtual void OnPropertyChanged(PropertyInfo propertyInfo)
+        if (ReferenceEquals(obj, null))
         {
-            if (_withChanges == false)
-            {
-                return;
-            }
-
-            _propertyChangedInfo[propertyInfo.Name] = true;
-
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyInfo.Name));
-        }
-
-        public virtual void ResetIdentity()
-        {
-            _hasIdentity = false;
-            _id = default;
-        }
-
-        /// <summary>
-        /// Method to call on entity saved when first added
-        /// </summary>
-        internal virtual void AddingEntity()
-        {
-            CreateDate = DateTime.Now;
-            UpdateDate = DateTime.Now;
-        }
-
-        /// <summary>
-        /// Method to call on entity saved/updated
-        /// </summary>
-        internal virtual void UpdatingEntity() => UpdateDate = DateTime.Now;
-
-        /// <summary>
-        /// Tracks the properties that have changed
-        /// </summary>
-        private readonly IDictionary<string, bool> _propertyChangedInfo;
-
-        /// <summary>
-        /// Indicates whether a specific property on the current entity is dirty.
-        /// </summary>
-        /// <param name="propertyName">Name of the property to check</param>
-        /// <returns>True if Property is dirty, otherwise False</returns>
-        public virtual bool IsPropertyDirty(string propertyName) => _propertyChangedInfo.Any(x => x.Key == propertyName);
-
-        public virtual IEnumerable<string> GetDirtyProperties() => _propertyChangedInfo.Keys;
-
-        /// <summary>
-        /// Indicates whether the current entity is dirty.
-        /// </summary>
-        /// <returns>True if entity is dirty, otherwise False</returns>
-        public virtual bool IsDirty() => _propertyChangedInfo.Any();
-
-        /// <summary>
-        /// Resets dirty properties by clearing the dictionary used to track changes.
-        /// </summary>
-        /// <remarks>
-        /// Please note that resetting the dirty properties could potentially
-        /// obstruct the saving of a new or updated entity.
-        /// </remarks>
-        public virtual void ResetDirtyProperties() => _propertyChangedInfo.Clear();
-
-        /// <summary>
-        /// Disables change tracking.
-        /// </summary>
-        public void DisableChangeTracking() => _withChanges = false;
-
-        /// <summary>
-        /// Enables change tracking.
-        /// </summary>
-        public void EnableChangeTracking() => _withChanges = true;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the current entity has an identity, eg. Id.
-        /// </summary>
-        public virtual bool HasIdentity
-        {
-            get => _hasIdentity;
-            protected set => _hasIdentity = value;
-        }
-
-        public static bool operator ==(Item left, Item right) => ReferenceEquals(left, right);
-
-        public static bool operator !=(Item left, Item right) => !(left == right);
-
-        /*public virtual bool SameIdentityAs(IEntity other)
-        {
-            if (ReferenceEquals(null, other))
-                return false;
-            if (ReferenceEquals(this, other))
-                return true;
-
-            return SameIdentityAs(other as Entity);
-        }
-
-        public virtual bool Equals(Entity other)
-        {
-            if (ReferenceEquals(null, other))
-                return false;
-            if (ReferenceEquals(this, other))
-                return true;
-
-            return SameIdentityAs(other);
-        }
-
-        public virtual Type GetRealType()
-        {
-            return GetType();
-        }
-
-        public virtual bool SameIdentityAs(Entity other)
-        {
-            if (ReferenceEquals(null, other))
-                return false;
-
-            if (ReferenceEquals(this, other))
-                return true;
-
-            if (GetType() == other.GetRealType() && HasIdentity && other.HasIdentity)
-                return other.Id.Equals(Id);
-
             return false;
         }
 
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj))
-                return false;
-            if (ReferenceEquals(this, obj))
-                return true;
-
-            return SameIdentityAs(obj as IEntity);
-        }
-
-        public override int GetHashCode()
-        {
-            if (!_hash.HasValue)
-                _hash = !HasIdentity ? new int?(base.GetHashCode()) : new int?(Id.GetHashCode() * 397 ^ GetType().GetHashCode());
-            return _hash.Value;
-        }*/
-
-        public object DeepClone() => this.MemberwiseClone();
+        throw new NotImplementedException();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs
index bb9129951e..82a5ef9ff3 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/OrderItem.cs
@@ -3,46 +3,45 @@
 
 using System;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections;
+
+public class OrderItem : Item
 {
-    public class OrderItem : Item
+    public readonly string Description;
+    public readonly int PartNumber;
+    public readonly double UnitPrice;
+
+    private int _quantity;
+
+    public OrderItem(int partNumber, string description, int quantity, double unitPrice)
     {
-        public readonly int PartNumber;
-        public readonly string Description;
-        public readonly double UnitPrice;
-
-        private int _quantity = 0;
-
-        public OrderItem(int partNumber, string description, int quantity, double unitPrice)
-        {
-            PartNumber = partNumber;
-            Description = description;
-            Quantity = quantity;
-            UnitPrice = unitPrice;
-        }
-
-        public int Quantity
-        {
-            get => _quantity;
-
-            set
-            {
-                if (value < 0)
-                {
-                    throw new ArgumentException("Quantity cannot be negative.");
-                }
-
-                _quantity = value;
-            }
-        }
-
-        public override string ToString() =>
-            string.Format(
-                "{0,9} {1,6} {2,-12} at {3,8:#,###.00} = {4,10:###,###.00}",
-                PartNumber,
-                _quantity,
-                Description,
-                UnitPrice,
-                UnitPrice * _quantity);
+        PartNumber = partNumber;
+        Description = description;
+        Quantity = quantity;
+        UnitPrice = unitPrice;
     }
+
+    public int Quantity
+    {
+        get => _quantity;
+
+        set
+        {
+            if (value < 0)
+            {
+                throw new ArgumentException("Quantity cannot be negative.");
+            }
+
+            _quantity = value;
+        }
+    }
+
+    public override string ToString() =>
+        string.Format(
+            "{0,9} {1,6} {2,-12} at {3,8:#,###.00} = {4,10:###,###.00}",
+            PartNumber,
+            _quantity,
+            Description,
+            UnitPrice,
+            UnitPrice * _quantity);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs
index 580774b43a..8fbf3792c6 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/PropertyCollectionTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.Collections.Generic;
@@ -9,86 +9,85 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections;
+
+[TestFixture]
+public class PropertyCollectionTests
 {
-    [TestFixture]
-    public class PropertyCollectionTests
+    [Test]
+    public void Property_Adds_Case_Insensitive_Compare()
     {
-        [Test]
-        public void Property_Adds_Case_Insensitive_Compare()
+        var collection = new PropertyCollection
         {
-            var collection = new PropertyCollection
-            {
-                new Property(new PropertyType(TestHelper.ShortStringHelper, "propEditor", ValueStorageType.Nvarchar, "test")),
-                new Property(new PropertyType(TestHelper.ShortStringHelper, "propEditor", ValueStorageType.Nvarchar, "Test"))
-            };
+            new Property(new PropertyType(TestHelper.ShortStringHelper, "propEditor", ValueStorageType.Nvarchar, "test")),
+            new Property(new PropertyType(TestHelper.ShortStringHelper, "propEditor", ValueStorageType.Nvarchar, "Test")),
+        };
 
-            Assert.AreEqual(1, collection.Count);
-        }
+        Assert.AreEqual(1, collection.Count);
+    }
 
-        [Test]
-        public void Property_Contains_Case_Insensitive_Compare()
+    [Test]
+    public void Property_Contains_Case_Insensitive_Compare()
+    {
+        var collection = new PropertyCollection
         {
-            var collection = new PropertyCollection
-            {
-                new Property(new PropertyType(TestHelper.ShortStringHelper, "propEditor", ValueStorageType.Nvarchar, "test"))
-            };
+            new Property(new PropertyType(TestHelper.ShortStringHelper, "propEditor", ValueStorageType.Nvarchar, "test")),
+        };
 
-            Assert.IsTrue(collection.Contains("Test"));
-        }
+        Assert.IsTrue(collection.Contains("Test"));
+    }
 
-        [Test]
-        public void SimpleOrder_Returns_Null_On_FirstOrDefault_When_Empty()
-        {
-            var orders = new SimpleOrder();
-            var item = orders.FirstOrDefault();
+    [Test]
+    public void SimpleOrder_Returns_Null_On_FirstOrDefault_When_Empty()
+    {
+        var orders = new SimpleOrder();
+        var item = orders.FirstOrDefault();
 
-            Assert.That(item == null, Is.True);
-        }
+        Assert.That(item == null, Is.True);
+    }
 
-        [Test]
-        public void PropertyCollection_Returns_Null_On_FirstOrDefault_When_Empty()
-        {
-            var list = new List<Property>();
-            var collection = new PropertyCollection(list);
+    [Test]
+    public void PropertyCollection_Returns_Null_On_FirstOrDefault_When_Empty()
+    {
+        var list = new List<Property>();
+        var collection = new PropertyCollection(list);
 
-            var first = collection.FirstOrDefault();
-            var second = collection.FirstOrDefault(x => x.Alias.InvariantEquals("Test"));
+        var first = collection.FirstOrDefault();
+        var second = collection.FirstOrDefault(x => x.Alias.InvariantEquals("Test"));
 
-            Assert.That(first, Is.Null);
-            Assert.That(first == null, Is.True);
-            Assert.That(second == null, Is.True);
-        }
+        Assert.That(first, Is.Null);
+        Assert.That(first == null, Is.True);
+        Assert.That(second == null, Is.True);
+    }
 
-        [Test]
-        public void PropertyTypeCollection_Returns_Null_On_FirstOrDefault_When_Empty()
-        {
-            var list = new List<PropertyType>();
-            var collection = new PropertyTypeCollection(false, list);
+    [Test]
+    public void PropertyTypeCollection_Returns_Null_On_FirstOrDefault_When_Empty()
+    {
+        var list = new List<PropertyType>();
+        var collection = new PropertyTypeCollection(false, list);
 
-            Assert.That(collection.FirstOrDefault(), Is.Null);
-            Assert.That(collection.FirstOrDefault(x => x.Alias.InvariantEquals("Test")) == null, Is.True);
-        }
+        Assert.That(collection.FirstOrDefault(), Is.Null);
+        Assert.That(collection.FirstOrDefault(x => x.Alias.InvariantEquals("Test")) == null, Is.True);
+    }
 
-        [Test]
-        public void PropertyGroupCollection_Returns_Null_On_FirstOrDefault_When_Empty()
-        {
-            var list = new List<PropertyGroup>();
-            var collection = new PropertyGroupCollection(list);
+    [Test]
+    public void PropertyGroupCollection_Returns_Null_On_FirstOrDefault_When_Empty()
+    {
+        var list = new List<PropertyGroup>();
+        var collection = new PropertyGroupCollection(list);
 
-            Assert.That(collection.FirstOrDefault(), Is.Null);
-            Assert.That(collection.FirstOrDefault(x => x.Name.InvariantEquals("Test")) == null, Is.True);
-        }
+        Assert.That(collection.FirstOrDefault(), Is.Null);
+        Assert.That(collection.FirstOrDefault(x => x.Name.InvariantEquals("Test")) == null, Is.True);
+    }
 
-        [Test]
-        public void PropertyGroups_Collection_FirstOrDefault_Returns_Null()
-        {
-            var contentType = ContentTypeBuilder.CreateTextPageContentType();
+    [Test]
+    public void PropertyGroups_Collection_FirstOrDefault_Returns_Null()
+    {
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
 
-            Assert.That(contentType.PropertyGroups, Is.Not.Null);
-            Assert.That(contentType.PropertyGroups.FirstOrDefault(x => x.Name.InvariantEquals("Content")) == null, Is.False);
-            Assert.That(contentType.PropertyGroups.FirstOrDefault(x => x.Name.InvariantEquals("Test")) == null, Is.True);
-            Assert.That(contentType.PropertyGroups.Any(x => x.Name.InvariantEquals("Test")), Is.False);
-        }
+        Assert.That(contentType.PropertyGroups, Is.Not.Null);
+        Assert.That(contentType.PropertyGroups.FirstOrDefault(x => x.Name.InvariantEquals("Content")) == null, Is.False);
+        Assert.That(contentType.PropertyGroups.FirstOrDefault(x => x.Name.InvariantEquals("Test")) == null, Is.True);
+        Assert.That(contentType.PropertyGroups.Any(x => x.Name.InvariantEquals("Test")), Is.False);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs
index 5bd6389b23..2009f3c9b4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/Collections/SimpleOrder.cs
@@ -6,71 +6,70 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models.Collections;
+
+public class SimpleOrder : KeyedCollection<int, OrderItem>, INotifyCollectionChanged
 {
-    public class SimpleOrder : KeyedCollection<int, OrderItem>, INotifyCollectionChanged
+    // The parameterless constructor of the base class creates a
+    // KeyedCollection with an internal dictionary. For this code
+    // example, no other constructors are exposed.
+    public SimpleOrder()
     {
-        // The parameterless constructor of the base class creates a
-        // KeyedCollection with an internal dictionary. For this code
-        // example, no other constructors are exposed.
-        public SimpleOrder()
-            : base()
-        {
-        }
-
-        public SimpleOrder(IEnumerable<OrderItem> properties) => Reset(properties);
-
-        // This is the only method that absolutely must be overridden,
-        // because without it the KeyedCollection cannot extract the
-        // keys from the items. The input parameter type is the
-        // second generic type argument, in this case OrderItem, and
-        // the return value type is the first generic type argument,
-        // in this case int.
-        protected override int GetKeyForItem(OrderItem item) =>
-
-            // In this example, the key is the part number.
-            item.PartNumber;
-
-        internal void Reset(IEnumerable<OrderItem> properties)
-        {
-            Clear();
-            foreach (OrderItem property in properties)
-            {
-                Add(property);
-            }
-
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-        }
-
-        protected override void SetItem(int index, OrderItem item)
-        {
-            base.SetItem(index, item);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item, index));
-        }
-
-        protected override void RemoveItem(int index)
-        {
-            OrderItem removed = this[index];
-            base.RemoveItem(index);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, removed));
-        }
-
-        protected override void InsertItem(int index, OrderItem item)
-        {
-            base.InsertItem(index, item);
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item));
-        }
-
-        protected override void ClearItems()
-        {
-            base.ClearItems();
-            OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-        }
-
-        public new bool Contains(int partNumber) => this.Any(x => x.PartNumber == partNumber);
-
-        public event NotifyCollectionChangedEventHandler CollectionChanged;
-
-        protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs args) => CollectionChanged?.Invoke(this, args);
     }
+
+    public SimpleOrder(IEnumerable<OrderItem> properties) => Reset(properties);
+
+    public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+    // This is the only method that absolutely must be overridden,
+    // because without it the KeyedCollection cannot extract the
+    // keys from the items. The input parameter type is the
+    // second generic type argument, in this case OrderItem, and
+    // the return value type is the first generic type argument,
+    // in this case int.
+    protected override int GetKeyForItem(OrderItem item) =>
+
+        // In this example, the key is the part number.
+        item.PartNumber;
+
+    internal void Reset(IEnumerable<OrderItem> properties)
+    {
+        Clear();
+        foreach (var property in properties)
+        {
+            Add(property);
+        }
+
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+    }
+
+    protected override void SetItem(int index, OrderItem item)
+    {
+        base.SetItem(index, item);
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item, index));
+    }
+
+    protected override void RemoveItem(int index)
+    {
+        var removed = this[index];
+        base.RemoveItem(index);
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, removed));
+    }
+
+    protected override void InsertItem(int index, OrderItem item)
+    {
+        base.InsertItem(index, item);
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, item));
+    }
+
+    protected override void ClearItems()
+    {
+        base.ClearItems();
+        OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+    }
+
+    public new bool Contains(int partNumber) => this.Any(x => x.PartNumber == partNumber);
+
+    protected virtual void OnCollectionChanged(NotifyCollectionChangedEventArgs args) =>
+        CollectionChanged?.Invoke(this, args);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs
index abe7c1d08e..c2f3d9af79 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentExtensionsTests.cs
@@ -10,194 +10,200 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class ContentExtensionsTests
 {
-    [TestFixture]
-    public class ContentExtensionsTests
+    [Test]
+    public void DirtyProperty_Reset_Clears_SavedPublishedState()
     {
-        [Test]
-        public void DirtyProperty_Reset_Clears_SavedPublishedState()
-        {
-            IContentTypeService contentTypeService = Mock.Of<IContentTypeService>();
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+        var contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
 
-            content.PublishedState = PublishedState.Publishing;
-            Assert.IsFalse(content.Published);
-            content.ResetDirtyProperties(false); // resets
-            Assert.AreEqual(PublishedState.Unpublished, content.PublishedState);
-            Assert.IsFalse(content.Published);
-        }
+        content.PublishedState = PublishedState.Publishing;
+        Assert.IsFalse(content.Published);
+        content.ResetDirtyProperties(false); // resets
+        Assert.AreEqual(PublishedState.Unpublished, content.PublishedState);
+        Assert.IsFalse(content.Published);
+    }
 
-        [Test]
-        public void DirtyProperty_OnlyIfActuallyChanged_Content()
-        {
-            IContentTypeService contentTypeService = Mock.Of<IContentTypeService>();
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+    [Test]
+    public void DirtyProperty_OnlyIfActuallyChanged_Content()
+    {
+        var contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
 
-            // if you assign a content property with its value it is not dirty
-            // if you assign it with another value then back, it is dirty
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsPropertyDirty("Published"));
-            content.Published = true;
-            Assert.IsTrue(content.IsPropertyDirty("Published"));
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsPropertyDirty("Published"));
-            content.Published = true;
-            Assert.IsFalse(content.IsPropertyDirty("Published"));
-            content.Published = false;
-            content.Published = true;
-            Assert.IsTrue(content.IsPropertyDirty("Published"));
-        }
+        // if you assign a content property with its value it is not dirty
+        // if you assign it with another value then back, it is dirty
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsPropertyDirty("Published"));
+        content.Published = true;
+        Assert.IsTrue(content.IsPropertyDirty("Published"));
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsPropertyDirty("Published"));
+        content.Published = true;
+        Assert.IsFalse(content.IsPropertyDirty("Published"));
+        content.Published = false;
+        content.Published = true;
+        Assert.IsTrue(content.IsPropertyDirty("Published"));
+    }
 
-        [Test]
-        public void DirtyProperty_OnlyIfActuallyChanged_User()
-        {
-            IContentTypeService contentTypeService = Mock.Of<IContentTypeService>();
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+    [Test]
+    public void DirtyProperty_OnlyIfActuallyChanged_User()
+    {
+        var contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            IProperty prop = content.Properties.First();
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        var prop = content.Properties.First();
 
-            // if you assign a user property with its value it is not dirty
-            // if you assign it with another value then back, it is dirty
-            prop.SetValue("A");
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(prop.IsDirty());
-            prop.SetValue("B");
-            Assert.IsTrue(prop.IsDirty());
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(prop.IsDirty());
-            prop.SetValue("B");
-            Assert.IsFalse(prop.IsDirty());
-            prop.SetValue("A");
-            prop.SetValue("B");
-            Assert.IsTrue(prop.IsDirty());
-        }
+        // if you assign a user property with its value it is not dirty
+        // if you assign it with another value then back, it is dirty
+        prop.SetValue("A");
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(prop.IsDirty());
+        prop.SetValue("B");
+        Assert.IsTrue(prop.IsDirty());
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(prop.IsDirty());
+        prop.SetValue("B");
+        Assert.IsFalse(prop.IsDirty());
+        prop.SetValue("A");
+        prop.SetValue("B");
+        Assert.IsTrue(prop.IsDirty());
+    }
 
-        [Test]
-        public void DirtyProperty_UpdateDate()
-        {
-            IContentTypeService contentTypeService = Mock.Of<IContentTypeService>();
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+    [Test]
+    public void DirtyProperty_UpdateDate()
+    {
+        var contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            IProperty prop = content.Properties.First();
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        var prop = content.Properties.First();
 
-            content.ResetDirtyProperties(false);
-            DateTime d = content.UpdateDate;
-            prop.SetValue("A");
-            Assert.IsTrue(content.IsAnyUserPropertyDirty());
-            Assert.IsFalse(content.IsEntityDirty());
-            Assert.AreEqual(d, content.UpdateDate);
+        content.ResetDirtyProperties(false);
+        var d = content.UpdateDate;
+        prop.SetValue("A");
+        Assert.IsTrue(content.IsAnyUserPropertyDirty());
+        Assert.IsFalse(content.IsEntityDirty());
+        Assert.AreEqual(d, content.UpdateDate);
 
-            content.UpdateDate = DateTime.Now;
-            Assert.IsTrue(content.IsEntityDirty());
-            Assert.AreNotEqual(d, content.UpdateDate);
+        content.UpdateDate = DateTime.Now;
+        Assert.IsTrue(content.IsEntityDirty());
+        Assert.AreNotEqual(d, content.UpdateDate);
 
-            // so... changing UpdateDate would count as a content property being changed
-            // however in ContentRepository.PersistUpdatedItem, we change UpdateDate AFTER
-            // we've tested for RequiresSaving & RequiresNewVersion so it's OK
-        }
+        // so... changing UpdateDate would count as a content property being changed
+        // however in ContentRepository.PersistUpdatedItem, we change UpdateDate AFTER
+        // we've tested for RequiresSaving & RequiresNewVersion so it's OK
+    }
 
-        [Test]
-        public void DirtyProperty_WasDirty_ContentProperty()
-        {
-            IContentTypeService contentTypeService = Mock.Of<IContentTypeService>();
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+    [Test]
+    public void DirtyProperty_WasDirty_ContentProperty()
+    {
+        var contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            content.Published = false;
-            content.Published = true;
-            Assert.IsTrue(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            content.Published = false;
-            content.Published = true;
-            content.ResetDirtyProperties(true); // what PersistUpdatedItem does
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsTrue(content.WasDirty());
-            content.Published = false;
-            content.Published = true;
-            content.ResetDirtyProperties(); // what PersistUpdatedItem does
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsTrue(content.WasDirty());
-        }
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        content.Published = false;
+        content.Published = true;
+        Assert.IsTrue(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        content.Published = false;
+        content.Published = true;
+        content.ResetDirtyProperties(true); // what PersistUpdatedItem does
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsTrue(content.WasDirty());
+        content.Published = false;
+        content.Published = true;
+        content.ResetDirtyProperties(); // what PersistUpdatedItem does
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsTrue(content.WasDirty());
+    }
 
-        [Test]
-        public void DirtyProperty_WasDirty_ContentSortOrder()
-        {
-            IContentTypeService contentTypeService = Mock.Of<IContentTypeService>();
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+    [Test]
+    public void DirtyProperty_WasDirty_ContentSortOrder()
+    {
+        var contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            content.SortOrder = 0;
-            content.SortOrder = 1;
-            Assert.IsTrue(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            content.SortOrder = 0;
-            content.SortOrder = 1;
-            content.ResetDirtyProperties(true); // what PersistUpdatedItem does
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsTrue(content.WasDirty());
-            content.SortOrder = 0;
-            content.SortOrder = 1;
-            content.ResetDirtyProperties(); // what PersistUpdatedItem does
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsTrue(content.WasDirty());
-        }
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        content.SortOrder = 0;
+        content.SortOrder = 1;
+        Assert.IsTrue(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        content.SortOrder = 0;
+        content.SortOrder = 1;
+        content.ResetDirtyProperties(true); // what PersistUpdatedItem does
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsTrue(content.WasDirty());
+        content.SortOrder = 0;
+        content.SortOrder = 1;
+        content.ResetDirtyProperties(); // what PersistUpdatedItem does
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsTrue(content.WasDirty());
+    }
 
-        [Test]
-        public void DirtyProperty_WasDirty_UserProperty()
-        {
-            IContentTypeService contentTypeService = Mock.Of<IContentTypeService>();
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+    [Test]
+    public void DirtyProperty_WasDirty_UserProperty()
+    {
+        var contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            IProperty prop = content.Properties.First();
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            prop.SetValue("a");
-            prop.SetValue("b");
-            Assert.IsTrue(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            content.ResetDirtyProperties(false);
-            Assert.IsFalse(content.IsDirty());
-            Assert.IsFalse(content.WasDirty());
-            prop.SetValue("a");
-            prop.SetValue("b");
-            content.ResetDirtyProperties(true); // what PersistUpdatedItem does
-            Assert.IsFalse(content.IsDirty());
-            //// Assert.IsFalse(content.WasDirty()); // not impacted by user properties
-            Assert.IsTrue(content.WasDirty()); // now it is!
-            prop.SetValue("a");
-            prop.SetValue("b");
-            content.ResetDirtyProperties(); // what PersistUpdatedItem does
-            Assert.IsFalse(content.IsDirty());
-            //// Assert.IsFalse(content.WasDirty()); // not impacted by user properties
-            Assert.IsTrue(content.WasDirty()); // now it is!
-        }
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        var prop = content.Properties.First();
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        prop.SetValue("a");
+        prop.SetValue("b");
+        Assert.IsTrue(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        content.ResetDirtyProperties(false);
+        Assert.IsFalse(content.IsDirty());
+        Assert.IsFalse(content.WasDirty());
+        prop.SetValue("a");
+        prop.SetValue("b");
+        content.ResetDirtyProperties(true); // what PersistUpdatedItem does
+        Assert.IsFalse(content.IsDirty());
+        //// Assert.IsFalse(content.WasDirty()); // not impacted by user properties
+        Assert.IsTrue(content.WasDirty()); // now it is!
+        prop.SetValue("a");
+        prop.SetValue("b");
+        content.ResetDirtyProperties(); // what PersistUpdatedItem does
+        Assert.IsFalse(content.IsDirty());
+        //// Assert.IsFalse(content.WasDirty()); // not impacted by user properties
+        Assert.IsTrue(content.WasDirty()); // now it is!
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs
index 81aecc94e7..2408672744 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentScheduleTests.cs
@@ -2,109 +2,107 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class ContentScheduleTests
 {
-    [TestFixture]
-    public class ContentScheduleTests
+    [Test]
+    public void Release_Date_Less_Than_Expire_Date()
     {
-        [Test]
-        public void Release_Date_Less_Than_Expire_Date()
-        {
-            DateTime now = DateTime.Now;
-            var schedule = new ContentScheduleCollection();
-            Assert.IsFalse(schedule.Add(now, now));
-        }
+        var now = DateTime.Now;
+        var schedule = new ContentScheduleCollection();
+        Assert.IsFalse(schedule.Add(now, now));
+    }
 
-        [Test]
-        public void Cannot_Add_Duplicate_Dates_Invariant()
-        {
-            DateTime now = DateTime.Now;
-            var schedule = new ContentScheduleCollection();
-            schedule.Add(now, null);
-            Assert.Throws<ArgumentException>(() => schedule.Add(null, now));
-        }
+    [Test]
+    public void Cannot_Add_Duplicate_Dates_Invariant()
+    {
+        var now = DateTime.Now;
+        var schedule = new ContentScheduleCollection();
+        schedule.Add(now, null);
+        Assert.Throws<ArgumentException>(() => schedule.Add(null, now));
+    }
 
-        [Test]
-        public void Cannot_Add_Duplicate_Dates_Variant()
-        {
-            DateTime now = DateTime.Now;
-            var schedule = new ContentScheduleCollection();
-            schedule.Add(now, null);
-            schedule.Add("en-US", now, null);
-            Assert.Throws<ArgumentException>(() => schedule.Add("en-US", null, now));
-            Assert.Throws<ArgumentException>(() => schedule.Add(null, now));
-        }
+    [Test]
+    public void Cannot_Add_Duplicate_Dates_Variant()
+    {
+        var now = DateTime.Now;
+        var schedule = new ContentScheduleCollection();
+        schedule.Add(now, null);
+        schedule.Add("en-US", now, null);
+        Assert.Throws<ArgumentException>(() => schedule.Add("en-US", null, now));
+        Assert.Throws<ArgumentException>(() => schedule.Add(null, now));
+    }
 
-        [Test]
-        public void Can_Remove_Invariant()
-        {
-            DateTime now = DateTime.Now;
-            var schedule = new ContentScheduleCollection();
-            schedule.Add(now, null);
-            IEnumerable<ContentSchedule> invariantSched = schedule.GetSchedule(string.Empty);
-            schedule.Remove(invariantSched.First());
-            Assert.AreEqual(0, schedule.FullSchedule.Count());
-        }
+    [Test]
+    public void Can_Remove_Invariant()
+    {
+        var now = DateTime.Now;
+        var schedule = new ContentScheduleCollection();
+        schedule.Add(now, null);
+        var invariantSched = schedule.GetSchedule(string.Empty);
+        schedule.Remove(invariantSched.First());
+        Assert.AreEqual(0, schedule.FullSchedule.Count());
+    }
 
-        [Test]
-        public void Can_Remove_Variant()
-        {
-            DateTime now = DateTime.Now;
-            var schedule = new ContentScheduleCollection();
-            schedule.Add(now, null);
-            schedule.Add("en-US", now, null);
-            IEnumerable<ContentSchedule> invariantSched = schedule.GetSchedule(string.Empty);
-            schedule.Remove(invariantSched.First());
-            Assert.AreEqual(0, schedule.GetSchedule(string.Empty).Count());
-            Assert.AreEqual(1, schedule.FullSchedule.Count());
-            IEnumerable<ContentSchedule> variantSched = schedule.GetSchedule("en-US");
-            schedule.Remove(variantSched.First());
-            Assert.AreEqual(0, schedule.GetSchedule("en-US").Count());
-            Assert.AreEqual(0, schedule.FullSchedule.Count());
-        }
+    [Test]
+    public void Can_Remove_Variant()
+    {
+        var now = DateTime.Now;
+        var schedule = new ContentScheduleCollection();
+        schedule.Add(now, null);
+        schedule.Add("en-US", now, null);
+        var invariantSched = schedule.GetSchedule(string.Empty);
+        schedule.Remove(invariantSched.First());
+        Assert.AreEqual(0, schedule.GetSchedule(string.Empty).Count());
+        Assert.AreEqual(1, schedule.FullSchedule.Count());
+        var variantSched = schedule.GetSchedule("en-US");
+        schedule.Remove(variantSched.First());
+        Assert.AreEqual(0, schedule.GetSchedule("en-US").Count());
+        Assert.AreEqual(0, schedule.FullSchedule.Count());
+    }
 
-        [Test]
-        public void Can_Clear_Start_Invariant()
-        {
-            DateTime now = DateTime.Now;
-            var schedule = new ContentScheduleCollection();
-            schedule.Add(now, now.AddDays(1));
+    [Test]
+    public void Can_Clear_Start_Invariant()
+    {
+        var now = DateTime.Now;
+        var schedule = new ContentScheduleCollection();
+        schedule.Add(now, now.AddDays(1));
 
-            schedule.Clear(ContentScheduleAction.Release);
+        schedule.Clear(ContentScheduleAction.Release);
 
-            Assert.AreEqual(0, schedule.GetSchedule(ContentScheduleAction.Release).Count());
-            Assert.AreEqual(1, schedule.GetSchedule(ContentScheduleAction.Expire).Count());
-            Assert.AreEqual(1, schedule.FullSchedule.Count());
-        }
+        Assert.AreEqual(0, schedule.GetSchedule(ContentScheduleAction.Release).Count());
+        Assert.AreEqual(1, schedule.GetSchedule(ContentScheduleAction.Expire).Count());
+        Assert.AreEqual(1, schedule.FullSchedule.Count());
+    }
 
-        [Test]
-        public void Can_Clear_End_Variant()
-        {
-            DateTime now = DateTime.Now;
-            var schedule = new ContentScheduleCollection();
-            schedule.Add(now, now.AddDays(1));
-            schedule.Add("en-US", now, now.AddDays(1));
+    [Test]
+    public void Can_Clear_End_Variant()
+    {
+        var now = DateTime.Now;
+        var schedule = new ContentScheduleCollection();
+        schedule.Add(now, now.AddDays(1));
+        schedule.Add("en-US", now, now.AddDays(1));
 
-            schedule.Clear(ContentScheduleAction.Expire);
+        schedule.Clear(ContentScheduleAction.Expire);
 
-            Assert.AreEqual(0, schedule.GetSchedule(ContentScheduleAction.Expire).Count());
-            Assert.AreEqual(1, schedule.GetSchedule(ContentScheduleAction.Release).Count());
-            Assert.AreEqual(1, schedule.GetSchedule("en-US", ContentScheduleAction.Expire).Count());
-            Assert.AreEqual(1, schedule.GetSchedule("en-US", ContentScheduleAction.Release).Count());
-            Assert.AreEqual(3, schedule.FullSchedule.Count());
+        Assert.AreEqual(0, schedule.GetSchedule(ContentScheduleAction.Expire).Count());
+        Assert.AreEqual(1, schedule.GetSchedule(ContentScheduleAction.Release).Count());
+        Assert.AreEqual(1, schedule.GetSchedule("en-US", ContentScheduleAction.Expire).Count());
+        Assert.AreEqual(1, schedule.GetSchedule("en-US", ContentScheduleAction.Release).Count());
+        Assert.AreEqual(3, schedule.FullSchedule.Count());
 
-            schedule.Clear("en-US", ContentScheduleAction.Expire);
+        schedule.Clear("en-US", ContentScheduleAction.Expire);
 
-            Assert.AreEqual(0, schedule.GetSchedule(ContentScheduleAction.Expire).Count());
-            Assert.AreEqual(1, schedule.GetSchedule(ContentScheduleAction.Release).Count());
-            Assert.AreEqual(0, schedule.GetSchedule("en-US", ContentScheduleAction.Expire).Count());
-            Assert.AreEqual(1, schedule.GetSchedule("en-US", ContentScheduleAction.Release).Count());
-            Assert.AreEqual(2, schedule.FullSchedule.Count());
-        }
+        Assert.AreEqual(0, schedule.GetSchedule(ContentScheduleAction.Expire).Count());
+        Assert.AreEqual(1, schedule.GetSchedule(ContentScheduleAction.Release).Count());
+        Assert.AreEqual(0, schedule.GetSchedule("en-US", ContentScheduleAction.Expire).Count());
+        Assert.AreEqual(1, schedule.GetSchedule("en-US", ContentScheduleAction.Release).Count());
+        Assert.AreEqual(2, schedule.FullSchedule.Count());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs
index e2281c9585..a2da904889 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTests.cs
@@ -23,1009 +23,1009 @@ using Umbraco.Cms.Tests.Common.Extensions;
 using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class ContentTests
 {
-    [TestFixture]
-    public class ContentTests
+    private readonly IContentTypeService _contentTypeService = Mock.Of<IContentTypeService>();
+
+    [Test]
+    public void Variant_Culture_Names_Track_Dirty_Changes()
     {
-        private readonly IContentTypeService _contentTypeService = Mock.Of<IContentTypeService>();
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("contentType")
+            .WithContentVariation(ContentVariation.Culture)
+            .Build();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
 
-        [Test]
-        public void Variant_Culture_Names_Track_Dirty_Changes()
+        var content = new ContentBuilder()
+            .WithId(1)
+            .WithVersionId(1)
+            .WithName("content")
+            .WithContentType(contentType)
+            .Build();
+
+        const string langFr = "fr-FR";
+
+        Assert.IsFalse(content.IsPropertyDirty("CultureInfos")); // hasn't been changed
+
+        Thread.Sleep(500); // The "Date" wont be dirty if the test runs too fast since it will be the same date
+        content.SetCultureName("name-fr", langFr);
+        Assert.IsTrue(
+            content.IsPropertyDirty("CultureInfos")); // now it will be changed since the collection has changed
+        var frCultureName = content.CultureInfos[langFr];
+        Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
+
+        content.ResetDirtyProperties();
+
+        Assert.IsFalse(content.IsPropertyDirty("CultureInfos")); // it's been reset
+        Assert.IsTrue(content.WasPropertyDirty("CultureInfos"));
+
+        Thread.Sleep(500); // The "Date" wont be dirty if the test runs too fast since it will be the same date
+        content.SetCultureName("name-fr", langFr);
+        Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
+        Assert.IsTrue(content.IsPropertyDirty("CultureInfos")); // it's true now since we've updated a name
+    }
+
+    [Test]
+    public void Variant_Published_Culture_Names_Track_Dirty_Changes()
+    {
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("contentType")
+            .WithContentVariation(ContentVariation.Culture)
+            .Build();
+        var content = new ContentBuilder()
+            .WithId(1)
+            .WithVersionId(1)
+            .WithName("content")
+            .WithContentType(contentType)
+            .Build();
+
+        const string langFr = "fr-FR";
+
+        content.ChangeContentType(contentType);
+
+        Assert.IsFalse(content.IsPropertyDirty("PublishCultureInfos")); // hasn't been changed
+
+        Thread.Sleep(500); // The "Date" wont be dirty if the test runs too fast since it will be the same date
+        content.SetCultureName("name-fr", langFr);
+        content.PublishCulture(CultureImpact.Explicit(langFr, false)); // we've set the name, now we're publishing it
+        Assert.IsTrue(
+            content.IsPropertyDirty("PublishCultureInfos")); // now it will be changed since the collection has changed
+        var frCultureName = content.PublishCultureInfos[langFr];
+        Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
+
+        content.ResetDirtyProperties();
+
+        Assert.IsFalse(content.IsPropertyDirty("PublishCultureInfos")); // it's been reset
+        Assert.IsTrue(content.WasPropertyDirty("PublishCultureInfos"));
+
+        Thread.Sleep(500); // The "Date" wont be dirty if the test runs too fast since it will be the same date
+        content.SetCultureName("name-fr", langFr);
+        content.PublishCulture(CultureImpact.Explicit(langFr, false)); // we've set the name, now we're publishing it
+        Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
+        Assert.IsTrue(content.IsPropertyDirty("PublishCultureInfos")); // it's true now since we've updated a name
+    }
+
+    [Test]
+    public void Get_Non_Grouped_Properties()
+    {
+        var contentType = ContentTypeBuilder.CreateSimpleContentType();
+
+        // Add non-grouped properties
+        var pt1 = new PropertyTypeBuilder()
+            .WithAlias("nonGrouped1")
+            .WithName("Non Grouped 1")
+            .Build();
+        var pt2 = new PropertyTypeBuilder()
+            .WithAlias("nonGrouped2")
+            .WithName("Non Grouped 2")
+            .Build();
+        contentType.AddPropertyType(pt1);
+        contentType.AddPropertyType(pt2);
+
+        // Ensure that nothing is marked as dirty
+        contentType.ResetDirtyProperties(false);
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateSimpleContent(contentType);
+
+        var nonGrouped = content.GetNonGroupedProperties();
+
+        Assert.AreEqual(2, nonGrouped.Count());
+        Assert.AreEqual(5, content.Properties.Count());
+    }
+
+    [Test]
+    public void All_Dirty_Properties_Get_Reset()
+    {
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        content.ResetDirtyProperties(false);
+
+        Assert.IsFalse(content.IsDirty());
+        foreach (var prop in content.Properties)
         {
-            IContentType contentType = new ContentTypeBuilder()
-                .WithAlias("contentType")
-                .WithContentVariation(ContentVariation.Culture)
-                .Build();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = new ContentBuilder()
-                .WithId(1)
-                .WithVersionId(1)
-                .WithName("content")
-                .WithContentType(contentType)
-                .Build();
-
-            const string langFr = "fr-FR";
-
-            Assert.IsFalse(content.IsPropertyDirty("CultureInfos"));    // hasn't been changed
-
-            Thread.Sleep(500);                                          // The "Date" wont be dirty if the test runs too fast since it will be the same date
-            content.SetCultureName("name-fr", langFr);
-            Assert.IsTrue(content.IsPropertyDirty("CultureInfos"));     // now it will be changed since the collection has changed
-            ContentCultureInfos frCultureName = content.CultureInfos[langFr];
-            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
-
-            content.ResetDirtyProperties();
-
-            Assert.IsFalse(content.IsPropertyDirty("CultureInfos"));    // it's been reset
-            Assert.IsTrue(content.WasPropertyDirty("CultureInfos"));
-
-            Thread.Sleep(500);                                          // The "Date" wont be dirty if the test runs too fast since it will be the same date
-            content.SetCultureName("name-fr", langFr);
-            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
-            Assert.IsTrue(content.IsPropertyDirty("CultureInfos"));     // it's true now since we've updated a name
-        }
-
-        [Test]
-        public void Variant_Published_Culture_Names_Track_Dirty_Changes()
-        {
-            IContentType contentType = new ContentTypeBuilder()
-                .WithAlias("contentType")
-                .WithContentVariation(ContentVariation.Culture)
-                .Build();
-            Content content = new ContentBuilder()
-                .WithId(1)
-                .WithVersionId(1)
-                .WithName("content")
-                .WithContentType(contentType)
-                .Build();
-
-            const string langFr = "fr-FR";
-
-            content.ChangeContentType(contentType);
-
-            Assert.IsFalse(content.IsPropertyDirty("PublishCultureInfos"));    // hasn't been changed
-
-            Thread.Sleep(500);                                          // The "Date" wont be dirty if the test runs too fast since it will be the same date
-            content.SetCultureName("name-fr", langFr);
-            content.PublishCulture(CultureImpact.Explicit(langFr, false));                             // we've set the name, now we're publishing it
-            Assert.IsTrue(content.IsPropertyDirty("PublishCultureInfos"));     // now it will be changed since the collection has changed
-            ContentCultureInfos frCultureName = content.PublishCultureInfos[langFr];
-            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
-
-            content.ResetDirtyProperties();
-
-            Assert.IsFalse(content.IsPropertyDirty("PublishCultureInfos"));    // it's been reset
-            Assert.IsTrue(content.WasPropertyDirty("PublishCultureInfos"));
-
-            Thread.Sleep(500);                                          // The "Date" wont be dirty if the test runs too fast since it will be the same date
-            content.SetCultureName("name-fr", langFr);
-            content.PublishCulture(CultureImpact.Explicit(langFr, false));                             // we've set the name, now we're publishing it
-            Assert.IsTrue(frCultureName.IsPropertyDirty("Date"));
-            Assert.IsTrue(content.IsPropertyDirty("PublishCultureInfos"));     // it's true now since we've updated a name
-        }
-
-        [Test]
-        public void Get_Non_Grouped_Properties()
-        {
-            ContentType contentType = ContentTypeBuilder.CreateSimpleContentType();
-
-            // Add non-grouped properties
-            PropertyType pt1 = new PropertyTypeBuilder()
-                .WithAlias("nonGrouped1")
-                .WithName("Non Grouped 1")
-                .Build();
-            PropertyType pt2 = new PropertyTypeBuilder()
-                .WithAlias("nonGrouped2")
-                .WithName("Non Grouped 2")
-                .Build();
-            contentType.AddPropertyType(pt1);
-            contentType.AddPropertyType(pt2);
-
-            // Ensure that nothing is marked as dirty
-            contentType.ResetDirtyProperties(false);
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateSimpleContent(contentType);
-
-            IEnumerable<IProperty> nonGrouped = content.GetNonGroupedProperties();
-
-            Assert.AreEqual(2, nonGrouped.Count());
-            Assert.AreEqual(5, content.Properties.Count());
-        }
-
-        [Test]
-        public void All_Dirty_Properties_Get_Reset()
-        {
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            content.ResetDirtyProperties(false);
-
-            Assert.IsFalse(content.IsDirty());
-            foreach (IProperty prop in content.Properties)
-            {
-                Assert.IsFalse(prop.IsDirty());
-            }
-        }
-
-        [Test]
-        public void Can_Verify_Mocked_Content()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-
-            // Assert
-            Assert.That(content, Is.Not.Null);
-        }
-
-        [Test]
-        public void Can_Change_Property_Value()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            content.Properties["title"].SetValue("This is the new title");
-
-            // Assert
-            Assert.That(content.Properties.Any(), Is.True);
-            Assert.That(content.Properties["title"], Is.Not.Null);
-            Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("This is the new title"));
-        }
-
-        [Test]
-        public void Can_Set_Property_Value_As_String()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            content.SetValue("title", "This is the new title");
-
-            // Assert
-            Assert.That(content.Properties.Any(), Is.True);
-            Assert.That(content.Properties["title"], Is.Not.Null);
-            Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("This is the new title"));
-        }
-
-        [Test]
-        public void Can_Clone_Content_With_Reset_Identity()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            content.Id = 10;
-            content.Key = new Guid("29181B97-CB8F-403F-86DE-5FEB497F4800");
-
-            // Act
-            IContent clone = content.DeepCloneWithResetIdentities();
-
-            // Assert
-            Assert.AreNotSame(clone, content);
-            Assert.AreNotSame(clone.Id, content.Id);
-            Assert.AreNotSame(clone.VersionId, content.VersionId);
-            Assert.That(clone.HasIdentity, Is.False);
-
-            Assert.AreNotSame(content.Properties, clone.Properties);
-        }
-
-        private static IProfilingLogger GetTestProfilingLogger()
-        {
-            ILogger<ProfilingLogger> logger = NullLoggerFactory.Instance.CreateLogger<ProfilingLogger>();
-            var profiler = new TestProfiler();
-            return new ProfilingLogger(logger, profiler);
-        }
-
-        [Ignore("fixme - ignored test")]
-        [Test]
-        public void Can_Deep_Clone_Perf_Test()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.Id = 99;
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            int i = 200;
-            foreach (IProperty property in content.Properties)
-            {
-                property.Id = ++i;
-            }
-
-            content.Id = 10;
-            content.CreateDate = DateTime.Now;
-            content.CreatorId = 22;
-            content.Key = Guid.NewGuid();
-            content.Level = 3;
-            content.Path = "-1,4,10";
-            content.SortOrder = 5;
-            content.TemplateId = 88;
-            content.Trashed = false;
-            content.UpdateDate = DateTime.Now;
-            content.WriterId = 23;
-
-            var runtimeCache = new ObjectCacheAppCache();
-            runtimeCache.Insert(content.Id.ToString(CultureInfo.InvariantCulture), () => content);
-
-            IProfilingLogger proflog = GetTestProfilingLogger();
-
-            using (proflog.DebugDuration<ContentTests>("STARTING PERF TEST WITH RUNTIME CACHE"))
-            {
-                for (int j = 0; j < 1000; j++)
-                {
-                    object clone = runtimeCache.Get(content.Id.ToString(CultureInfo.InvariantCulture));
-                }
-            }
-
-            using (proflog.DebugDuration<ContentTests>("STARTING PERF TEST WITHOUT RUNTIME CACHE"))
-            {
-                for (int j = 0; j < 1000; j++)
-                {
-                    var clone = (ContentType)contentType.DeepClone();
-                }
-            }
-        }
-
-        [Test]
-        public void Can_Deep_Clone()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.Id = 99;
-            contentType.Variations = ContentVariation.Culture;
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            content.SetCultureName("Hello", "en-US");
-            content.SetCultureName("World", "es-ES");
-            content.PublishCulture(CultureImpact.All);
-
-            // should not try to clone something that's not Published or Unpublished
-            // (and in fact it will not work)
-            // but we cannot directly set the state to Published - hence this trick
-            // content.ChangePublishedState(PublishedState.Publishing);
-            content.ResetDirtyProperties(false); // => .Published
-
-            int i = 200;
-            foreach (IProperty property in content.Properties)
-            {
-                property.Id = ++i;
-            }
-
-            content.Id = 10;
-            content.CreateDate = DateTime.Now;
-            content.CreatorId = 22;
-            content.Key = Guid.NewGuid();
-            content.Level = 3;
-            content.Path = "-1,4,10";
-            content.SortOrder = 5;
-            content.TemplateId = 88;
-            content.Trashed = false;
-            content.UpdateDate = DateTime.Now;
-            content.WriterId = 23;
-
-            // Act
-            var clone = (Content)content.DeepClone();
-
-            // Assert
-            Assert.AreNotSame(clone, content);
-            Assert.AreEqual(clone, content);
-            Assert.AreEqual(clone.Id, content.Id);
-            Assert.AreEqual(clone.VersionId, content.VersionId);
-            Assert.AreEqual(clone.ContentType, content.ContentType);
-            Assert.AreEqual(clone.ContentTypeId, content.ContentTypeId);
-            Assert.AreEqual(clone.CreateDate, content.CreateDate);
-            Assert.AreEqual(clone.CreatorId, content.CreatorId);
-            Assert.AreEqual(clone.Key, content.Key);
-            Assert.AreEqual(clone.Level, content.Level);
-            Assert.AreEqual(clone.Path, content.Path);
-            Assert.AreEqual(clone.Published, content.Published);
-            Assert.AreEqual(clone.PublishedState, content.PublishedState);
-            Assert.AreEqual(clone.SortOrder, content.SortOrder);
-            Assert.AreEqual(clone.PublishedState, content.PublishedState);
-            Assert.AreNotSame(clone.TemplateId, content.TemplateId);
-            Assert.AreEqual(clone.TemplateId, content.TemplateId);
-            Assert.AreEqual(clone.Trashed, content.Trashed);
-            Assert.AreEqual(clone.UpdateDate, content.UpdateDate);
-            Assert.AreEqual(clone.VersionId, content.VersionId);
-            Assert.AreEqual(clone.WriterId, content.WriterId);
-            Assert.AreNotSame(clone.Properties, content.Properties);
-            Assert.AreEqual(clone.Properties.Count(), content.Properties.Count());
-            for (int index = 0; index < content.Properties.Count; index++)
-            {
-                Assert.AreNotSame(clone.Properties[index], content.Properties[index]);
-                Assert.AreEqual(clone.Properties[index], content.Properties[index]);
-            }
-
-            Assert.AreNotSame(clone.PublishCultureInfos, content.PublishCultureInfos);
-            Assert.AreEqual(clone.PublishCultureInfos.Count, content.PublishCultureInfos.Count);
-            foreach (string key in content.PublishCultureInfos.Keys)
-            {
-                Assert.AreNotSame(clone.PublishCultureInfos[key], content.PublishCultureInfos[key]);
-                Assert.AreEqual(clone.PublishCultureInfos[key], content.PublishCultureInfos[key]);
-            }
-
-            Assert.AreNotSame(clone.CultureInfos, content.CultureInfos);
-            Assert.AreEqual(clone.CultureInfos.Count, content.CultureInfos.Count);
-            foreach (string key in content.CultureInfos.Keys)
-            {
-                Assert.AreNotSame(clone.CultureInfos[key], content.CultureInfos[key]);
-                Assert.AreEqual(clone.CultureInfos[key], content.CultureInfos[key]);
-            }
-
-            // This double verifies by reflection
-            System.Reflection.PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (System.Reflection.PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(content, null));
-            }
-
-            // Need to ensure the event handlers are wired
-            var asDirty = (ICanBeDirty)clone;
-
-            Assert.IsFalse(asDirty.IsPropertyDirty("Properties"));
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("blah")
-                .Build();
-            IProperty newProperty = new PropertyBuilder()
-                .WithId(1)
-                .WithPropertyType(propertyType)
-                .Build();
-            newProperty.SetValue("blah");
-            clone.Properties.Add(newProperty);
-
-            Assert.IsTrue(asDirty.IsPropertyDirty("Properties"));
-        }
-
-        [Test]
-        public void Remember_Dirty_Properties()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.Id = 99;
-            contentType.Variations = ContentVariation.Culture;
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            content.SetCultureName("Hello", "en-US");
-            content.SetCultureName("World", "es-ES");
-            content.PublishCulture(CultureImpact.All);
-
-            int i = 200;
-            foreach (IProperty property in content.Properties)
-            {
-                property.Id = ++i;
-            }
-
-            content.Id = 10;
-            content.CreateDate = DateTime.Now;
-            content.CreatorId = 22;
-            content.Key = Guid.NewGuid();
-            content.Level = 3;
-            content.Path = "-1,4,10";
-            content.SortOrder = 5;
-            content.TemplateId = 88;
-            content.Trashed = true;
-            content.UpdateDate = DateTime.Now;
-            content.WriterId = 23;
-
-            // Act
-            content.ResetDirtyProperties();
-
-            // Assert
-            Assert.IsTrue(content.WasDirty());
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Id)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.CreateDate)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.CreatorId)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Key)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Level)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Path)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.SortOrder)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.TemplateId)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Trashed)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.UpdateDate)));
-            Assert.IsTrue(content.WasPropertyDirty(nameof(Content.WriterId)));
-            foreach (IProperty prop in content.Properties)
-            {
-                Assert.IsTrue(prop.WasDirty());
-                Assert.IsTrue(prop.WasPropertyDirty("Id"));
-            }
-
-            Assert.IsTrue(content.WasPropertyDirty("CultureInfos"));
-            foreach (ContentCultureInfos culture in content.CultureInfos)
-            {
-                Assert.IsTrue(culture.WasDirty());
-                Assert.IsTrue(culture.WasPropertyDirty("Name"));
-                Assert.IsTrue(culture.WasPropertyDirty("Date"));
-            }
-
-            Assert.IsTrue(content.WasPropertyDirty("PublishCultureInfos"));
-            foreach (ContentCultureInfos culture in content.PublishCultureInfos)
-            {
-                Assert.IsTrue(culture.WasDirty());
-                Assert.IsTrue(culture.WasPropertyDirty("Name"));
-                Assert.IsTrue(culture.WasPropertyDirty("Date"));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.Id = 99;
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-            int i = 200;
-            foreach (IProperty property in content.Properties)
-            {
-                property.Id = ++i;
-            }
-
-            content.Id = 10;
-            content.CreateDate = DateTime.Now;
-            content.CreatorId = 22;
-            content.Key = Guid.NewGuid();
-            content.Level = 3;
-            content.Path = "-1,4,10";
-            content.SortOrder = 5;
-            content.TemplateId = 88;
-            content.Trashed = false;
-            content.UpdateDate = DateTime.Now;
-            content.WriterId = 23;
-
-            string json = JsonConvert.SerializeObject(content);
-            Debug.Print(json);
-        }
-
-        /*[Test]
-        public void Cannot_Change_Property_With_Invalid_Value()
-        {
-            // Arrange
-            var contentType = ContentTypeBuilder.CreateTextpageContentType();
-            var content = ContentBuilder.CreateTextpageContent(contentType);
-
-            // Act
-            var model = new TestEditorModel
-                            {
-                                TestDateTime = DateTime.Now,
-                                TestDouble = 1.2,
-                                TestInt = 2,
-                                TestReadOnly = "Read-only string",
-                                TestString = "This is a test string"
-                            };
-
-            // Assert
-            Assert.Throws<Exception>(() => content.Properties["title"].Value = model);
-        }*/
-
-        [Test]
-        public void Can_Change_Property_Value_Through_Anonymous_Object()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            content.PropertyValues(new { title = "This is the new title" });
-
-            // Assert
-            Assert.That(content.Properties.Any(), Is.True);
-            Assert.That(content.Properties["title"], Is.Not.Null);
-            Assert.That(content.Properties["title"].Alias, Is.EqualTo("title"));
-            Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("This is the new title"));
-            Assert.That(content.Properties["description"].GetValue(), Is.EqualTo("This is the meta description for a textpage"));
-        }
-
-        [Test]
-        public void Can_Verify_Dirty_Property_On_Content()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            content.ResetDirtyProperties();
-            content.Name = "New Home";
-
-            // Assert
-            Assert.That(content.Name, Is.EqualTo("New Home"));
-            Assert.That(content.IsPropertyDirty("Name"), Is.True);
-        }
-
-        [Test]
-        public void Can_Add_PropertyGroup_On_ContentType()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-
-            // Act
-            contentType.PropertyGroups.Add(new PropertyGroup(true)
-            {
-                Alias = "testGroup",
-                Name = "Test Group",
-                SortOrder = 3
-            });
-
-            // Assert
-            Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(3));
-        }
-
-        [Test]
-        public void Can_Remove_PropertyGroup_From_ContentType()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.ResetDirtyProperties();
-
-            // Act
-            contentType.PropertyGroups.Remove("content");
-
-            // Assert
-            Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(1));
-            //// Assert.That(contentType.IsPropertyDirty("PropertyGroups"), Is.True);
-        }
-
-        [Test]
-        public void Can_Add_PropertyType_To_Group_On_ContentType()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-
-            // Act
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("subtitle")
-                .WithName("Subtitle")
-                .Build();
-            contentType.PropertyGroups["content"].PropertyTypes.Add(propertyType);
-
-            // Assert
-            Assert.That(contentType.PropertyGroups["content"].PropertyTypes.Count, Is.EqualTo(3));
-        }
-
-        [Test]
-        public void Can_Add_New_Property_To_New_PropertyType()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("subtitle")
-                .WithName("Subtitle")
-                .Build();
-            contentType.PropertyGroups["content"].PropertyTypes.Add(propertyType);
-            var newProperty = new Property(propertyType);
-            newProperty.SetValue("This is a subtitle Test");
-            content.Properties.Add(newProperty);
-
-            // Assert
-            Assert.That(content.Properties.Contains("subtitle"), Is.True);
-            Assert.That(content.Properties["subtitle"].GetValue(), Is.EqualTo("This is a subtitle Test"));
-        }
-
-        [Test]
-        public void Can_Add_New_Property_To_New_PropertyType_In_New_PropertyGroup()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("subtitle")
-                .WithName("Subtitle")
-                .Build();
-            var propertyGroup = new PropertyGroup(true)
-            {
-                Alias = "testGroup",
-                Name = "Test Group",
-                SortOrder = 3
-            };
-            propertyGroup.PropertyTypes.Add(propertyType);
-            contentType.PropertyGroups.Add(propertyGroup);
-            var newProperty = new Property(propertyType);
-            newProperty.SetValue("Subtitle Test");
-            content.Properties.Add(newProperty);
-
-            // Assert
-            Assert.That(content.Properties.Count, Is.EqualTo(5));
-            Assert.That(content.Properties["subtitle"].GetValue(), Is.EqualTo("Subtitle Test"));
-            Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("Textpage textpage"));
-        }
-
-        [Test]
-        public void Can_Update_PropertyType_Through_Content_Properties()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act - note that the PropertyType's properties like SortOrder is not updated through the Content object
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("title")
-                .WithName("Title")
-                .Build();
-            content.Properties.Add(new Property(propertyType));
-
-            // Assert
-            Assert.That(content.Properties.Count, Is.EqualTo(4));
-            Assert.That(contentType.PropertyTypes.First(x => x.Alias == "title").SortOrder, Is.EqualTo(1));
-            Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("Textpage textpage"));
-        }
-
-        [Test]
-        public void Can_Change_ContentType_On_Content()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            ContentType simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            content.ChangeContentType(simpleContentType);
-
-            // Assert
-            Assert.That(content.Properties.Contains("author"), Is.True);
-
-            // Note: There were 4 properties, after changing ContentType 1 has been added (no properties are deleted).
-            Assert.That(content.Properties.Count, Is.EqualTo(5));
-        }
-
-        [Test]
-        public void Can_Change_ContentType_On_Content_And_Set_Property_Value()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            ContentType simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            content.ChangeContentType(simpleContentType);
-            content.SetValue("author", "John Doe");
-
-            // Assert
-            Assert.That(content.Properties.Contains("author"), Is.True);
-            Assert.That(content.Properties["author"].GetValue(), Is.EqualTo("John Doe"));
-        }
-
-        [Test]
-        public void Can_Change_ContentType_On_Content_And_Still_Get_Old_Properties()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            ContentType simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            // Act
-            content.ChangeContentType(simpleContentType);
-
-            // Assert
-            Assert.That(content.Properties.Contains("author"), Is.True);
-            Assert.That(content.Properties.Contains("keywords"), Is.True);
-            Assert.That(content.Properties.Contains("description"), Is.True);
-            Assert.That(content.Properties["keywords"].GetValue(), Is.EqualTo("text,page,meta"));
-            Assert.That(content.Properties["description"].GetValue(), Is.EqualTo("This is the meta description for a textpage"));
-        }
-
-        [Test]
-        [Ignore("Need to reimplement this logic for v8")]
-        public void Can_Change_ContentType_On_Content_And_Clear_Old_PropertyTypes()
-        {
-            throw new NotImplementedException();
-
-            //// Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            ////// Arrange
-            //// var contentType = ContentTypeBuilder.CreateTextPageContentType();
-            //// var simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
-            //// var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            ////// Act
-            //// content.ChangeContentType(simpleContentType, true);
-
-            ////// Assert
-            //// Assert.That(content.Properties.Contains("author"), Is.True);
-            //// Assert.That(content.Properties.Contains("keywords"), Is.False);
-            //// Assert.That(content.Properties.Contains("description"), Is.False);
-        }
-
-        [Test]
-        public void Can_Verify_Content_Is_Published()
-        {
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
-
-            content.ResetDirtyProperties();
-            content.PublishedState = PublishedState.Publishing;
-
-            Assert.IsFalse(content.IsPropertyDirty("Published"));
-            Assert.IsFalse(content.Published);
-            Assert.IsFalse(content.IsPropertyDirty("Name"));
-            Assert.AreEqual(PublishedState.Publishing, content.PublishedState);
-
-            // the repo would do
-            content.Published = true;
-
-            // and then
-            Assert.IsTrue(content.IsPropertyDirty("Published"));
-            Assert.IsTrue(content.Published);
-            Assert.IsFalse(content.IsPropertyDirty("Name"));
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-
-            // and before returning,
-            content.ResetDirtyProperties();
-
-            // and then
-            Assert.IsFalse(content.IsPropertyDirty("Published"));
-            Assert.IsTrue(content.Published);
-            Assert.IsFalse(content.IsPropertyDirty("Name"));
-            Assert.AreEqual(PublishedState.Published, content.PublishedState);
-        }
-
-        [Test]
-        public void Adding_PropertyGroup_To_ContentType_Results_In_Dirty_Entity()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.ResetDirtyProperties();
-
-            // Act
-            var propertyGroup = new PropertyGroup(true)
-            {
-                Alias = "testGroup",
-                Name = "Test Group",
-                SortOrder = 3
-            };
-            contentType.PropertyGroups.Add(propertyGroup);
-
-            // Assert
-            Assert.That(contentType.IsDirty(), Is.True);
-            Assert.That(contentType.PropertyGroups.Any(x => x.Name == "Test Group"), Is.True);
-            //// Assert.That(contentType.IsPropertyDirty("PropertyGroups"), Is.True);
-        }
-
-        [Test]
-        public void After_Committing_Changes_Was_Dirty_Is_True()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.ResetDirtyProperties(); // reset
-
-            // Act
-            contentType.Alias = "newAlias";
-            contentType.ResetDirtyProperties(); // this would be like committing the entity
-
-            // Assert
-            Assert.That(contentType.IsDirty(), Is.False);
-            Assert.That(contentType.WasDirty(), Is.True);
-            Assert.That(contentType.WasPropertyDirty("Alias"), Is.True);
-        }
-
-        [Test]
-        public void After_Committing_Changes_Was_Dirty_Is_True_On_Changed_Property()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.ResetDirtyProperties(); // reset
-            Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
-
-            Content content = ContentBuilder.CreateTextpageContent(contentType, "test", -1);
-            content.ResetDirtyProperties();
-
-            // Act
-            content.SetValue("title", "new title");
-            Assert.That(content.IsEntityDirty(), Is.False);
-            Assert.That(content.IsDirty(), Is.True);
-            Assert.That(content.IsPropertyDirty("title"), Is.True);
-            Assert.That(content.IsAnyUserPropertyDirty(), Is.True);
-            Assert.That(content.GetDirtyUserProperties().Count(), Is.EqualTo(1));
-            Assert.That(content.Properties[0].IsDirty(), Is.True);
-            Assert.That(content.Properties["title"].IsDirty(), Is.True);
-
-            content.ResetDirtyProperties(); // this would be like committing the entity
-
-            // Assert
-            Assert.That(content.WasDirty(), Is.True);
-            Assert.That(content.Properties[0].WasDirty(), Is.True);
-
-            Assert.That(content.WasPropertyDirty("title"), Is.True);
-            Assert.That(content.Properties["title"].IsDirty(), Is.False);
-            Assert.That(content.Properties["title"].WasDirty(), Is.True);
-        }
-
-        [Test]
-        public void If_Not_Committed_Was_Dirty_Is_False()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-
-            // Act
-            contentType.Alias = "newAlias";
-
-            // Assert
-            Assert.That(contentType.IsDirty(), Is.True);
-            Assert.That(contentType.WasDirty(), Is.False);
-        }
-
-        [Test]
-        public void Detect_That_A_Property_Is_Removed()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            Assert.That(contentType.WasPropertyDirty("HasPropertyTypeBeenRemoved"), Is.False);
-
-            // Act
-            contentType.RemovePropertyType("title");
-
-            // Assert
-            Assert.That(contentType.IsPropertyDirty("HasPropertyTypeBeenRemoved"), Is.True);
-        }
-
-        [Test]
-        public void Adding_PropertyType_To_PropertyGroup_On_ContentType_Results_In_Dirty_Entity()
-        {
-            // Arrange
-            ContentType contentType = ContentTypeBuilder.CreateTextPageContentType();
-            contentType.ResetDirtyProperties();
-
-            // Act
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("subtitle")
-                .WithName("Subtitle")
-                .Build();
-            contentType.PropertyGroups["content"].PropertyTypes.Add(propertyType);
-
-            // Assert
-            Assert.That(contentType.PropertyGroups["content"].IsDirty(), Is.True);
-            Assert.That(contentType.PropertyGroups["content"].IsPropertyDirty("PropertyTypes"), Is.True);
-            Assert.That(contentType.PropertyGroups.Any(x => x.IsDirty()), Is.True);
-        }
-
-        [Test]
-        public void Can_Compose_Composite_ContentType_Collection()
-        {
-            // Arrange
-            ContentType simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("coauthor")
-                .WithName("Co-author")
-                .Build();
-            ContentType simple2ContentType = ContentTypeBuilder.CreateSimpleContentType(
-                "anotherSimple",
-                "Another Simple Page",
-                propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType }));
-
-            // Act
-            bool added = simpleContentType.AddContentType(simple2ContentType);
-            IEnumerable<PropertyGroup> compositionPropertyGroups = simpleContentType.CompositionPropertyGroups;
-            IEnumerable<IPropertyType> compositionPropertyTypes = simpleContentType.CompositionPropertyTypes;
-
-            // Assert
-            Assert.That(added, Is.True);
-            Assert.That(compositionPropertyGroups.Count(), Is.EqualTo(1));
-            Assert.That(compositionPropertyTypes.Count(), Is.EqualTo(4));
-        }
-
-        [Test]
-        public void Can_Compose_Nested_Composite_ContentType_Collection()
-        {
-            // Arrange
-            ContentType metaContentType = ContentTypeBuilder.CreateMetaContentType();
-            ContentType simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("coauthor")
-                .WithName("Co-author")
-                .Build();
-            ContentType simple2ContentType = ContentTypeBuilder.CreateSimpleContentType(
-                "anotherSimple",
-                "Another Simple Page",
-                propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType }));
-
-            // Act
-            bool addedMeta = simple2ContentType.AddContentType(metaContentType);
-            bool added = simpleContentType.AddContentType(simple2ContentType);
-            IEnumerable<PropertyGroup> compositionPropertyGroups = simpleContentType.CompositionPropertyGroups;
-            IEnumerable<IPropertyType> compositionPropertyTypes = simpleContentType.CompositionPropertyTypes;
-
-            // Assert
-            Assert.That(addedMeta, Is.True);
-            Assert.That(added, Is.True);
-            Assert.That(compositionPropertyGroups.Count(), Is.EqualTo(2));
-            Assert.That(compositionPropertyTypes.Count(), Is.EqualTo(6));
-            Assert.That(simpleContentType.ContentTypeCompositionExists("meta"), Is.True);
-        }
-
-        [Test]
-        public void Can_Avoid_Circular_Dependencies_In_Composition()
-        {
-            ContentType textPage = ContentTypeBuilder.CreateTextPageContentType();
-            ContentType parent = ContentTypeBuilder.CreateSimpleContentType("parent", "Parent", null, randomizeAliases: true);
-            ContentType meta = ContentTypeBuilder.CreateMetaContentType();
-            PropertyType propertyType1 = new PropertyTypeBuilder()
-                .WithAlias("coauthor")
-                .WithName("Co-author")
-                .Build();
-            ContentType mixin1 = ContentTypeBuilder.CreateSimpleContentType(
-                "mixin1",
-                "Mixin1",
-                propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType1 }));
-            PropertyType propertyType2 = new PropertyTypeBuilder()
-                .WithAlias("author")
-                .WithName("Author")
-                .Build();
-            ContentType mixin2 = ContentTypeBuilder.CreateSimpleContentType(
-                "mixin2",
-                "Mixin2",
-                propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType2 }));
-
-            // Act
-            bool addedMetaMixin2 = mixin2.AddContentType(meta);
-            bool addedMixin2 = mixin1.AddContentType(mixin2);
-            bool addedMeta = parent.AddContentType(meta);
-
-            bool addedMixin1 = parent.AddContentType(mixin1);
-
-            bool addedMixin1Textpage = textPage.AddContentType(mixin1);
-            bool addedTextpageParent = parent.AddContentType(textPage);
-
-            IEnumerable<string> aliases = textPage.CompositionAliases();
-            IEnumerable<IPropertyType> propertyTypes = textPage.CompositionPropertyTypes;
-            IEnumerable<PropertyGroup> propertyGroups = textPage.CompositionPropertyGroups;
-
-            // Assert
-            Assert.That(mixin2.ContentTypeCompositionExists("meta"), Is.True);
-            Assert.That(mixin1.ContentTypeCompositionExists("meta"), Is.True);
-            Assert.That(parent.ContentTypeCompositionExists("meta"), Is.True);
-            Assert.That(textPage.ContentTypeCompositionExists("meta"), Is.True);
-
-            Assert.That(aliases.Count(), Is.EqualTo(3));
-            Assert.That(propertyTypes.Count(), Is.EqualTo(8));
-            Assert.That(propertyGroups.Count(), Is.EqualTo(2));
-
-            Assert.That(addedMeta, Is.True);
-            Assert.That(addedMetaMixin2, Is.True);
-            Assert.That(addedMixin2, Is.True);
-            Assert.That(addedMixin1, Is.False);
-            Assert.That(addedMixin1Textpage, Is.True);
-            Assert.That(addedTextpageParent, Is.False);
+            Assert.IsFalse(prop.IsDirty());
         }
     }
+
+    [Test]
+    public void Can_Verify_Mocked_Content()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+
+        // Assert
+        Assert.That(content, Is.Not.Null);
+    }
+
+    [Test]
+    public void Can_Change_Property_Value()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        content.Properties["title"].SetValue("This is the new title");
+
+        // Assert
+        Assert.That(content.Properties.Any(), Is.True);
+        Assert.That(content.Properties["title"], Is.Not.Null);
+        Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("This is the new title"));
+    }
+
+    [Test]
+    public void Can_Set_Property_Value_As_String()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        content.SetValue("title", "This is the new title");
+
+        // Assert
+        Assert.That(content.Properties.Any(), Is.True);
+        Assert.That(content.Properties["title"], Is.Not.Null);
+        Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("This is the new title"));
+    }
+
+    [Test]
+    public void Can_Clone_Content_With_Reset_Identity()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        content.Id = 10;
+        content.Key = new Guid("29181B97-CB8F-403F-86DE-5FEB497F4800");
+
+        // Act
+        var clone = content.DeepCloneWithResetIdentities();
+
+        // Assert
+        Assert.AreNotSame(clone, content);
+        Assert.AreNotSame(clone.Id, content.Id);
+        Assert.AreNotSame(clone.VersionId, content.VersionId);
+        Assert.That(clone.HasIdentity, Is.False);
+
+        Assert.AreNotSame(content.Properties, clone.Properties);
+    }
+
+    private static IProfilingLogger GetTestProfilingLogger()
+    {
+        var logger = NullLoggerFactory.Instance.CreateLogger<ProfilingLogger>();
+        var profiler = new TestProfiler();
+        return new ProfilingLogger(logger, profiler);
+    }
+
+    [Ignore("fixme - ignored test")]
+    [Test]
+    public void Can_Deep_Clone_Perf_Test()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.Id = 99;
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        var i = 200;
+        foreach (var property in content.Properties)
+        {
+            property.Id = ++i;
+        }
+
+        content.Id = 10;
+        content.CreateDate = DateTime.Now;
+        content.CreatorId = 22;
+        content.Key = Guid.NewGuid();
+        content.Level = 3;
+        content.Path = "-1,4,10";
+        content.SortOrder = 5;
+        content.TemplateId = 88;
+        content.Trashed = false;
+        content.UpdateDate = DateTime.Now;
+        content.WriterId = 23;
+
+        var runtimeCache = new ObjectCacheAppCache();
+        runtimeCache.Insert(content.Id.ToString(CultureInfo.InvariantCulture), () => content);
+
+        var proflog = GetTestProfilingLogger();
+
+        using (proflog.DebugDuration<ContentTests>("STARTING PERF TEST WITH RUNTIME CACHE"))
+        {
+            for (var j = 0; j < 1000; j++)
+            {
+                var clone = runtimeCache.Get(content.Id.ToString(CultureInfo.InvariantCulture));
+            }
+        }
+
+        using (proflog.DebugDuration<ContentTests>("STARTING PERF TEST WITHOUT RUNTIME CACHE"))
+        {
+            for (var j = 0; j < 1000; j++)
+            {
+                var clone = (ContentType)contentType.DeepClone();
+            }
+        }
+    }
+
+    [Test]
+    public void Can_Deep_Clone()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.Id = 99;
+        contentType.Variations = ContentVariation.Culture;
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        content.SetCultureName("Hello", "en-US");
+        content.SetCultureName("World", "es-ES");
+        content.PublishCulture(CultureImpact.All);
+
+        // should not try to clone something that's not Published or Unpublished
+        // (and in fact it will not work)
+        // but we cannot directly set the state to Published - hence this trick
+        // content.ChangePublishedState(PublishedState.Publishing);
+        content.ResetDirtyProperties(false); // => .Published
+
+        var i = 200;
+        foreach (var property in content.Properties)
+        {
+            property.Id = ++i;
+        }
+
+        content.Id = 10;
+        content.CreateDate = DateTime.Now;
+        content.CreatorId = 22;
+        content.Key = Guid.NewGuid();
+        content.Level = 3;
+        content.Path = "-1,4,10";
+        content.SortOrder = 5;
+        content.TemplateId = 88;
+        content.Trashed = false;
+        content.UpdateDate = DateTime.Now;
+        content.WriterId = 23;
+
+        // Act
+        var clone = (Content)content.DeepClone();
+
+        // Assert
+        Assert.AreNotSame(clone, content);
+        Assert.AreEqual(clone, content);
+        Assert.AreEqual(clone.Id, content.Id);
+        Assert.AreEqual(clone.VersionId, content.VersionId);
+        Assert.AreEqual(clone.ContentType, content.ContentType);
+        Assert.AreEqual(clone.ContentTypeId, content.ContentTypeId);
+        Assert.AreEqual(clone.CreateDate, content.CreateDate);
+        Assert.AreEqual(clone.CreatorId, content.CreatorId);
+        Assert.AreEqual(clone.Key, content.Key);
+        Assert.AreEqual(clone.Level, content.Level);
+        Assert.AreEqual(clone.Path, content.Path);
+        Assert.AreEqual(clone.Published, content.Published);
+        Assert.AreEqual(clone.PublishedState, content.PublishedState);
+        Assert.AreEqual(clone.SortOrder, content.SortOrder);
+        Assert.AreEqual(clone.PublishedState, content.PublishedState);
+        Assert.AreNotSame(clone.TemplateId, content.TemplateId);
+        Assert.AreEqual(clone.TemplateId, content.TemplateId);
+        Assert.AreEqual(clone.Trashed, content.Trashed);
+        Assert.AreEqual(clone.UpdateDate, content.UpdateDate);
+        Assert.AreEqual(clone.VersionId, content.VersionId);
+        Assert.AreEqual(clone.WriterId, content.WriterId);
+        Assert.AreNotSame(clone.Properties, content.Properties);
+        Assert.AreEqual(clone.Properties.Count(), content.Properties.Count());
+        for (var index = 0; index < content.Properties.Count; index++)
+        {
+            Assert.AreNotSame(clone.Properties[index], content.Properties[index]);
+            Assert.AreEqual(clone.Properties[index], content.Properties[index]);
+        }
+
+        Assert.AreNotSame(clone.PublishCultureInfos, content.PublishCultureInfos);
+        Assert.AreEqual(clone.PublishCultureInfos.Count, content.PublishCultureInfos.Count);
+        foreach (var key in content.PublishCultureInfos.Keys)
+        {
+            Assert.AreNotSame(clone.PublishCultureInfos[key], content.PublishCultureInfos[key]);
+            Assert.AreEqual(clone.PublishCultureInfos[key], content.PublishCultureInfos[key]);
+        }
+
+        Assert.AreNotSame(clone.CultureInfos, content.CultureInfos);
+        Assert.AreEqual(clone.CultureInfos.Count, content.CultureInfos.Count);
+        foreach (var key in content.CultureInfos.Keys)
+        {
+            Assert.AreNotSame(clone.CultureInfos[key], content.CultureInfos[key]);
+            Assert.AreEqual(clone.CultureInfos[key], content.CultureInfos[key]);
+        }
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
+        {
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(content, null));
+        }
+
+        // Need to ensure the event handlers are wired
+        var asDirty = (ICanBeDirty)clone;
+
+        Assert.IsFalse(asDirty.IsPropertyDirty("Properties"));
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("blah")
+            .Build();
+        var newProperty = new PropertyBuilder()
+            .WithId(1)
+            .WithPropertyType(propertyType)
+            .Build();
+        newProperty.SetValue("blah");
+        clone.Properties.Add(newProperty);
+
+        Assert.IsTrue(asDirty.IsPropertyDirty("Properties"));
+    }
+
+    [Test]
+    public void Remember_Dirty_Properties()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.Id = 99;
+        contentType.Variations = ContentVariation.Culture;
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        content.SetCultureName("Hello", "en-US");
+        content.SetCultureName("World", "es-ES");
+        content.PublishCulture(CultureImpact.All);
+
+        var i = 200;
+        foreach (var property in content.Properties)
+        {
+            property.Id = ++i;
+        }
+
+        content.Id = 10;
+        content.CreateDate = DateTime.Now;
+        content.CreatorId = 22;
+        content.Key = Guid.NewGuid();
+        content.Level = 3;
+        content.Path = "-1,4,10";
+        content.SortOrder = 5;
+        content.TemplateId = 88;
+        content.Trashed = true;
+        content.UpdateDate = DateTime.Now;
+        content.WriterId = 23;
+
+        // Act
+        content.ResetDirtyProperties();
+
+        // Assert
+        Assert.IsTrue(content.WasDirty());
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Id)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.CreateDate)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.CreatorId)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Key)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Level)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Path)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.SortOrder)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.TemplateId)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.Trashed)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.UpdateDate)));
+        Assert.IsTrue(content.WasPropertyDirty(nameof(Content.WriterId)));
+        foreach (var prop in content.Properties)
+        {
+            Assert.IsTrue(prop.WasDirty());
+            Assert.IsTrue(prop.WasPropertyDirty("Id"));
+        }
+
+        Assert.IsTrue(content.WasPropertyDirty("CultureInfos"));
+        foreach (var culture in content.CultureInfos)
+        {
+            Assert.IsTrue(culture.WasDirty());
+            Assert.IsTrue(culture.WasPropertyDirty("Name"));
+            Assert.IsTrue(culture.WasPropertyDirty("Date"));
+        }
+
+        Assert.IsTrue(content.WasPropertyDirty("PublishCultureInfos"));
+        foreach (var culture in content.PublishCultureInfos)
+        {
+            Assert.IsTrue(culture.WasDirty());
+            Assert.IsTrue(culture.WasPropertyDirty("Name"));
+            Assert.IsTrue(culture.WasPropertyDirty("Date"));
+        }
+    }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.Id = 99;
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+        var i = 200;
+        foreach (var property in content.Properties)
+        {
+            property.Id = ++i;
+        }
+
+        content.Id = 10;
+        content.CreateDate = DateTime.Now;
+        content.CreatorId = 22;
+        content.Key = Guid.NewGuid();
+        content.Level = 3;
+        content.Path = "-1,4,10";
+        content.SortOrder = 5;
+        content.TemplateId = 88;
+        content.Trashed = false;
+        content.UpdateDate = DateTime.Now;
+        content.WriterId = 23;
+
+        var json = JsonConvert.SerializeObject(content);
+        Debug.Print(json);
+    }
+
+    /*[Test]
+    public void Cannot_Change_Property_With_Invalid_Value()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextpageContentType();
+        var content = ContentBuilder.CreateTextpageContent(contentType);
+
+        // Act
+        var model = new TestEditorModel
+                        {
+                            TestDateTime = DateTime.Now,
+                            TestDouble = 1.2,
+                            TestInt = 2,
+                            TestReadOnly = "Read-only string",
+                            TestString = "This is a test string"
+                        };
+
+        // Assert
+        Assert.Throws<Exception>(() => content.Properties["title"].Value = model);
+    }*/
+
+    [Test]
+    public void Can_Change_Property_Value_Through_Anonymous_Object()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        content.PropertyValues(new { title = "This is the new title" });
+
+        // Assert
+        Assert.That(content.Properties.Any(), Is.True);
+        Assert.That(content.Properties["title"], Is.Not.Null);
+        Assert.That(content.Properties["title"].Alias, Is.EqualTo("title"));
+        Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("This is the new title"));
+        Assert.That(content.Properties["description"].GetValue(), Is.EqualTo("This is the meta description for a textpage"));
+    }
+
+    [Test]
+    public void Can_Verify_Dirty_Property_On_Content()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        content.ResetDirtyProperties();
+        content.Name = "New Home";
+
+        // Assert
+        Assert.That(content.Name, Is.EqualTo("New Home"));
+        Assert.That(content.IsPropertyDirty("Name"), Is.True);
+    }
+
+    [Test]
+    public void Can_Add_PropertyGroup_On_ContentType()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+
+        // Act
+        contentType.PropertyGroups.Add(
+            new PropertyGroup(true) { Alias = "testGroup", Name = "Test Group", SortOrder = 3 });
+
+        // Assert
+        Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(3));
+    }
+
+    [Test]
+    public void Can_Remove_PropertyGroup_From_ContentType()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.ResetDirtyProperties();
+
+        // Act
+        contentType.PropertyGroups.Remove("content");
+
+        // Assert
+        Assert.That(contentType.PropertyGroups.Count, Is.EqualTo(1));
+        //// Assert.That(contentType.IsPropertyDirty("PropertyGroups"), Is.True);
+    }
+
+    [Test]
+    public void Can_Add_PropertyType_To_Group_On_ContentType()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+
+        // Act
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("subtitle")
+            .WithName("Subtitle")
+            .Build();
+        contentType.PropertyGroups["content"].PropertyTypes.Add(propertyType);
+
+        // Assert
+        Assert.That(contentType.PropertyGroups["content"].PropertyTypes.Count, Is.EqualTo(3));
+    }
+
+    [Test]
+    public void Can_Add_New_Property_To_New_PropertyType()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("subtitle")
+            .WithName("Subtitle")
+            .Build();
+        contentType.PropertyGroups["content"].PropertyTypes.Add(propertyType);
+        var newProperty = new Property(propertyType);
+        newProperty.SetValue("This is a subtitle Test");
+        content.Properties.Add(newProperty);
+
+        // Assert
+        Assert.That(content.Properties.Contains("subtitle"), Is.True);
+        Assert.That(content.Properties["subtitle"].GetValue(), Is.EqualTo("This is a subtitle Test"));
+    }
+
+    [Test]
+    public void Can_Add_New_Property_To_New_PropertyType_In_New_PropertyGroup()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("subtitle")
+            .WithName("Subtitle")
+            .Build();
+        var propertyGroup = new PropertyGroup(true) { Alias = "testGroup", Name = "Test Group", SortOrder = 3 };
+        propertyGroup.PropertyTypes.Add(propertyType);
+        contentType.PropertyGroups.Add(propertyGroup);
+        var newProperty = new Property(propertyType);
+        newProperty.SetValue("Subtitle Test");
+        content.Properties.Add(newProperty);
+
+        // Assert
+        Assert.That(content.Properties.Count, Is.EqualTo(5));
+        Assert.That(content.Properties["subtitle"].GetValue(), Is.EqualTo("Subtitle Test"));
+        Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("Textpage textpage"));
+    }
+
+    [Test]
+    public void Can_Update_PropertyType_Through_Content_Properties()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act - note that the PropertyType's properties like SortOrder is not updated through the Content object
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("title")
+            .WithName("Title")
+            .Build();
+        content.Properties.Add(new Property(propertyType));
+
+        // Assert
+        Assert.That(content.Properties.Count, Is.EqualTo(4));
+        Assert.That(contentType.PropertyTypes.First(x => x.Alias == "title").SortOrder, Is.EqualTo(1));
+        Assert.That(content.Properties["title"].GetValue(), Is.EqualTo("Textpage textpage"));
+    }
+
+    [Test]
+    public void Can_Change_ContentType_On_Content()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        content.ChangeContentType(simpleContentType);
+
+        // Assert
+        Assert.That(content.Properties.Contains("author"), Is.True);
+
+        // Note: There were 4 properties, after changing ContentType 1 has been added (no properties are deleted).
+        Assert.That(content.Properties.Count, Is.EqualTo(5));
+    }
+
+    [Test]
+    public void Can_Change_ContentType_On_Content_And_Set_Property_Value()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        content.ChangeContentType(simpleContentType);
+        content.SetValue("author", "John Doe");
+
+        // Assert
+        Assert.That(content.Properties.Contains("author"), Is.True);
+        Assert.That(content.Properties["author"].GetValue(), Is.EqualTo("John Doe"));
+    }
+
+    [Test]
+    public void Can_Change_ContentType_On_Content_And_Still_Get_Old_Properties()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        // Act
+        content.ChangeContentType(simpleContentType);
+
+        // Assert
+        Assert.That(content.Properties.Contains("author"), Is.True);
+        Assert.That(content.Properties.Contains("keywords"), Is.True);
+        Assert.That(content.Properties.Contains("description"), Is.True);
+        Assert.That(content.Properties["keywords"].GetValue(), Is.EqualTo("text,page,meta"));
+        Assert.That(content.Properties["description"].GetValue(), Is.EqualTo("This is the meta description for a textpage"));
+    }
+
+    [Test]
+    [Ignore("Need to reimplement this logic for v8")]
+    public void Can_Change_ContentType_On_Content_And_Clear_Old_PropertyTypes() => throw new NotImplementedException();
+
+    //// Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>())).Returns(contentType);
+    ////// Arrange
+    //// var contentType = ContentTypeBuilder.CreateTextPageContentType();
+    //// var simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
+    //// var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+    ////// Act
+    //// content.ChangeContentType(simpleContentType, true);
+    ////// Assert
+    //// Assert.That(content.Properties.Contains("author"), Is.True);
+    //// Assert.That(content.Properties.Contains("keywords"), Is.False);
+    //// Assert.That(content.Properties.Contains("description"), Is.False);
+    [Test]
+    public void Can_Verify_Content_Is_Published()
+    {
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "Textpage", -1);
+
+        content.ResetDirtyProperties();
+        content.PublishedState = PublishedState.Publishing;
+
+        Assert.IsFalse(content.IsPropertyDirty("Published"));
+        Assert.IsFalse(content.Published);
+        Assert.IsFalse(content.IsPropertyDirty("Name"));
+        Assert.AreEqual(PublishedState.Publishing, content.PublishedState);
+
+        // the repo would do
+        content.Published = true;
+
+        // and then
+        Assert.IsTrue(content.IsPropertyDirty("Published"));
+        Assert.IsTrue(content.Published);
+        Assert.IsFalse(content.IsPropertyDirty("Name"));
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+
+        // and before returning,
+        content.ResetDirtyProperties();
+
+        // and then
+        Assert.IsFalse(content.IsPropertyDirty("Published"));
+        Assert.IsTrue(content.Published);
+        Assert.IsFalse(content.IsPropertyDirty("Name"));
+        Assert.AreEqual(PublishedState.Published, content.PublishedState);
+    }
+
+    [Test]
+    public void Adding_PropertyGroup_To_ContentType_Results_In_Dirty_Entity()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.ResetDirtyProperties();
+
+        // Act
+        var propertyGroup = new PropertyGroup(true) { Alias = "testGroup", Name = "Test Group", SortOrder = 3 };
+        contentType.PropertyGroups.Add(propertyGroup);
+
+        // Assert
+        Assert.That(contentType.IsDirty(), Is.True);
+        Assert.That(contentType.PropertyGroups.Any(x => x.Name == "Test Group"), Is.True);
+        //// Assert.That(contentType.IsPropertyDirty("PropertyGroups"), Is.True);
+    }
+
+    [Test]
+    public void After_Committing_Changes_Was_Dirty_Is_True()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.ResetDirtyProperties(); // reset
+
+        // Act
+        contentType.Alias = "newAlias";
+        contentType.ResetDirtyProperties(); // this would be like committing the entity
+
+        // Assert
+        Assert.That(contentType.IsDirty(), Is.False);
+        Assert.That(contentType.WasDirty(), Is.True);
+        Assert.That(contentType.WasPropertyDirty("Alias"), Is.True);
+    }
+
+    [Test]
+    public void After_Committing_Changes_Was_Dirty_Is_True_On_Changed_Property()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.ResetDirtyProperties(); // reset
+        Mock.Get(_contentTypeService).As<IContentTypeBaseService>().Setup(x => x.Get(It.IsAny<int>()))
+            .Returns(contentType);
+
+        var content = ContentBuilder.CreateTextpageContent(contentType, "test", -1);
+        content.ResetDirtyProperties();
+
+        // Act
+        content.SetValue("title", "new title");
+        Assert.That(content.IsEntityDirty(), Is.False);
+        Assert.That(content.IsDirty(), Is.True);
+        Assert.That(content.IsPropertyDirty("title"), Is.True);
+        Assert.That(content.IsAnyUserPropertyDirty(), Is.True);
+        Assert.That(content.GetDirtyUserProperties().Count(), Is.EqualTo(1));
+        Assert.That(content.Properties[0].IsDirty(), Is.True);
+        Assert.That(content.Properties["title"].IsDirty(), Is.True);
+
+        content.ResetDirtyProperties(); // this would be like committing the entity
+
+        // Assert
+        Assert.That(content.WasDirty(), Is.True);
+        Assert.That(content.Properties[0].WasDirty(), Is.True);
+
+        Assert.That(content.WasPropertyDirty("title"), Is.True);
+        Assert.That(content.Properties["title"].IsDirty(), Is.False);
+        Assert.That(content.Properties["title"].WasDirty(), Is.True);
+    }
+
+    [Test]
+    public void If_Not_Committed_Was_Dirty_Is_False()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+
+        // Act
+        contentType.Alias = "newAlias";
+
+        // Assert
+        Assert.That(contentType.IsDirty(), Is.True);
+        Assert.That(contentType.WasDirty(), Is.False);
+    }
+
+    [Test]
+    public void Detect_That_A_Property_Is_Removed()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        Assert.That(contentType.WasPropertyDirty("HasPropertyTypeBeenRemoved"), Is.False);
+
+        // Act
+        contentType.RemovePropertyType("title");
+
+        // Assert
+        Assert.That(contentType.IsPropertyDirty("HasPropertyTypeBeenRemoved"), Is.True);
+    }
+
+    [Test]
+    public void Adding_PropertyType_To_PropertyGroup_On_ContentType_Results_In_Dirty_Entity()
+    {
+        // Arrange
+        var contentType = ContentTypeBuilder.CreateTextPageContentType();
+        contentType.ResetDirtyProperties();
+
+        // Act
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("subtitle")
+            .WithName("Subtitle")
+            .Build();
+        contentType.PropertyGroups["content"].PropertyTypes.Add(propertyType);
+
+        // Assert
+        Assert.That(contentType.PropertyGroups["content"].IsDirty(), Is.True);
+        Assert.That(contentType.PropertyGroups["content"].IsPropertyDirty("PropertyTypes"), Is.True);
+        Assert.That(contentType.PropertyGroups.Any(x => x.IsDirty()), Is.True);
+    }
+
+    [Test]
+    public void Can_Compose_Composite_ContentType_Collection()
+    {
+        // Arrange
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("coauthor")
+            .WithName("Co-author")
+            .Build();
+        var simple2ContentType = ContentTypeBuilder.CreateSimpleContentType(
+            "anotherSimple",
+            "Another Simple Page",
+            propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType }));
+
+        // Act
+        var added = simpleContentType.AddContentType(simple2ContentType);
+        var compositionPropertyGroups = simpleContentType.CompositionPropertyGroups;
+        var compositionPropertyTypes = simpleContentType.CompositionPropertyTypes;
+
+        // Assert
+        Assert.That(added, Is.True);
+        Assert.That(compositionPropertyGroups.Count(), Is.EqualTo(1));
+        Assert.That(compositionPropertyTypes.Count(), Is.EqualTo(4));
+    }
+
+    [Test]
+    public void Can_Compose_Nested_Composite_ContentType_Collection()
+    {
+        // Arrange
+        var metaContentType = ContentTypeBuilder.CreateMetaContentType();
+        var simpleContentType = ContentTypeBuilder.CreateSimpleContentType();
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("coauthor")
+            .WithName("Co-author")
+            .Build();
+        var simple2ContentType = ContentTypeBuilder.CreateSimpleContentType(
+            "anotherSimple",
+            "Another Simple Page",
+            propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType }));
+
+        // Act
+        var addedMeta = simple2ContentType.AddContentType(metaContentType);
+        var added = simpleContentType.AddContentType(simple2ContentType);
+        var compositionPropertyGroups = simpleContentType.CompositionPropertyGroups;
+        var compositionPropertyTypes = simpleContentType.CompositionPropertyTypes;
+
+        // Assert
+        Assert.That(addedMeta, Is.True);
+        Assert.That(added, Is.True);
+        Assert.That(compositionPropertyGroups.Count(), Is.EqualTo(2));
+        Assert.That(compositionPropertyTypes.Count(), Is.EqualTo(6));
+        Assert.That(simpleContentType.ContentTypeCompositionExists("meta"), Is.True);
+    }
+
+    [Test]
+    public void Can_Avoid_Circular_Dependencies_In_Composition()
+    {
+        var textPage = ContentTypeBuilder.CreateTextPageContentType();
+        var parent = ContentTypeBuilder.CreateSimpleContentType("parent", "Parent", null, randomizeAliases: true);
+        var meta = ContentTypeBuilder.CreateMetaContentType();
+        var propertyType1 = new PropertyTypeBuilder()
+            .WithAlias("coauthor")
+            .WithName("Co-author")
+            .Build();
+        var mixin1 = ContentTypeBuilder.CreateSimpleContentType(
+            "mixin1",
+            "Mixin1",
+            propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType1 }));
+        var propertyType2 = new PropertyTypeBuilder()
+            .WithAlias("author")
+            .WithName("Author")
+            .Build();
+        var mixin2 = ContentTypeBuilder.CreateSimpleContentType(
+            "mixin2",
+            "Mixin2",
+            propertyTypeCollection: new PropertyTypeCollection(true, new List<PropertyType> { propertyType2 }));
+
+        // Act
+        var addedMetaMixin2 = mixin2.AddContentType(meta);
+        var addedMixin2 = mixin1.AddContentType(mixin2);
+        var addedMeta = parent.AddContentType(meta);
+
+        var addedMixin1 = parent.AddContentType(mixin1);
+
+        var addedMixin1Textpage = textPage.AddContentType(mixin1);
+        var addedTextpageParent = parent.AddContentType(textPage);
+
+        var aliases = textPage.CompositionAliases();
+        var propertyTypes = textPage.CompositionPropertyTypes;
+        var propertyGroups = textPage.CompositionPropertyGroups;
+
+        // Assert
+        Assert.That(mixin2.ContentTypeCompositionExists("meta"), Is.True);
+        Assert.That(mixin1.ContentTypeCompositionExists("meta"), Is.True);
+        Assert.That(parent.ContentTypeCompositionExists("meta"), Is.True);
+        Assert.That(textPage.ContentTypeCompositionExists("meta"), Is.True);
+
+        Assert.That(aliases.Count(), Is.EqualTo(3));
+        Assert.That(propertyTypes.Count(), Is.EqualTo(8));
+        Assert.That(propertyGroups.Count(), Is.EqualTo(2));
+
+        Assert.That(addedMeta, Is.True);
+        Assert.That(addedMetaMixin2, Is.True);
+        Assert.That(addedMixin2, Is.True);
+        Assert.That(addedMixin1, Is.False);
+        Assert.That(addedMixin1Textpage, Is.True);
+        Assert.That(addedTextpageParent, Is.False);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeHistoryCleanupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeHistoryCleanupTests.cs
index 1a9d293527..5462db364d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeHistoryCleanupTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeHistoryCleanupTests.cs
@@ -1,105 +1,104 @@
-using System.Linq;
+using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Tests.Common.Builders;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class ContentTypeHistoryCleanupTests
 {
-    [TestFixture]
-    public class ContentTypeHistoryCleanupTests
+    [Test]
+    public void Changing_Keep_all_Makes_ContentType_Dirty()
     {
-        [Test]
-        public void Changing_Keep_all_Makes_ContentType_Dirty()
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        Assert.IsFalse(contentType.IsDirty());
+
+        var newValue = 2;
+        contentType.HistoryCleanup.KeepAllVersionsNewerThanDays = newValue;
+        Assert.IsTrue(contentType.IsDirty());
+        Assert.AreEqual(newValue, contentType.HistoryCleanup.KeepAllVersionsNewerThanDays);
+    }
+
+    [Test]
+    public void Changing_Keep_latest_Makes_ContentType_Dirty()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        Assert.IsFalse(contentType.IsDirty());
+
+        var newValue = 2;
+        contentType.HistoryCleanup.KeepLatestVersionPerDayForDays = newValue;
+        Assert.IsTrue(contentType.IsDirty());
+        Assert.AreEqual(newValue, contentType.HistoryCleanup.KeepLatestVersionPerDayForDays);
+    }
+
+    [Test]
+    public void Changing_Prevent_Cleanup_Makes_ContentType_Dirty()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        Assert.IsFalse(contentType.IsDirty());
+
+        var newValue = true;
+        contentType.HistoryCleanup.PreventCleanup = newValue;
+        Assert.IsTrue(contentType.IsDirty());
+        Assert.AreEqual(newValue, contentType.HistoryCleanup.PreventCleanup);
+    }
+
+    [Test]
+    public void Replacing_History_Cleanup_Registers_As_Dirty()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        Assert.IsFalse(contentType.IsDirty());
+
+        contentType.HistoryCleanup = new HistoryCleanup();
+
+        Assert.IsTrue(contentType.IsDirty());
+        Assert.IsTrue(contentType.IsPropertyDirty(nameof(contentType.HistoryCleanup)));
+    }
+
+    [Test]
+    public void Replacing_History_Cleanup_Removes_Old_Dirty_History_Properties()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+
+        contentType.Alias = "NewValue";
+        contentType.HistoryCleanup.KeepAllVersionsNewerThanDays = 2;
+
+        contentType.PropertyChanged += (sender, args) =>
         {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
+            // Ensure that property changed is only invoked for history cleanup
+            Assert.AreEqual(nameof(contentType.HistoryCleanup), args.PropertyName);
+        };
 
-            Assert.IsFalse(contentType.IsDirty());
+        // Since we're replacing the entire HistoryCleanup the changed property is no longer dirty, the entire HistoryCleanup is
+        contentType.HistoryCleanup = new HistoryCleanup();
 
-            var newValue = 2;
-            contentType.HistoryCleanup.KeepAllVersionsNewerThanDays = newValue;
+        Assert.Multiple(() =>
+        {
             Assert.IsTrue(contentType.IsDirty());
-            Assert.AreEqual(newValue, contentType.HistoryCleanup.KeepAllVersionsNewerThanDays);
-        }
-
-        [Test]
-        public void Changing_Keep_latest_Makes_ContentType_Dirty()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-
-            Assert.IsFalse(contentType.IsDirty());
-
-            var newValue = 2;
-            contentType.HistoryCleanup.KeepLatestVersionPerDayForDays = newValue;
-            Assert.IsTrue(contentType.IsDirty());
-            Assert.AreEqual(newValue, contentType.HistoryCleanup.KeepLatestVersionPerDayForDays);
-        }
-
-        [Test]
-        public void Changing_Prevent_Cleanup_Makes_ContentType_Dirty()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-
-            Assert.IsFalse(contentType.IsDirty());
-
-            var newValue = true;
-            contentType.HistoryCleanup.PreventCleanup = newValue;
-            Assert.IsTrue(contentType.IsDirty());
-            Assert.AreEqual(newValue, contentType.HistoryCleanup.PreventCleanup);
-        }
-
-        [Test]
-        public void Replacing_History_Cleanup_Registers_As_Dirty()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-            Assert.IsFalse(contentType.IsDirty());
-
-            contentType.HistoryCleanup = new HistoryCleanup();
-
-            Assert.IsTrue(contentType.IsDirty());
-            Assert.IsTrue(contentType.IsPropertyDirty(nameof(contentType.HistoryCleanup)));
-        }
-
-        [Test]
-        public void Replacing_History_Cleanup_Removes_Old_Dirty_History_Properties()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-
-            contentType.Alias = "NewValue";
-            contentType.HistoryCleanup.KeepAllVersionsNewerThanDays = 2;
-
-            contentType.PropertyChanged += (sender, args) =>
-            {
-                // Ensure that property changed is only invoked for history cleanup
-                Assert.AreEqual(nameof(contentType.HistoryCleanup), args.PropertyName);
-            };
-
-            // Since we're replacing the entire HistoryCleanup the changed property is no longer dirty, the entire HistoryCleanup is
-            contentType.HistoryCleanup = new HistoryCleanup();
-
-            Assert.Multiple(() =>
-            {
-                Assert.IsTrue(contentType.IsDirty());
-                Assert.IsFalse(contentType.WasDirty());
-                Assert.AreEqual(2, contentType.GetDirtyProperties().Count());
-                Assert.IsTrue(contentType.IsPropertyDirty(nameof(contentType.HistoryCleanup)));
-                Assert.IsTrue(contentType.IsPropertyDirty(nameof(contentType.Alias)));
-            });
-        }
-
-        [Test]
-        public void Old_History_Cleanup_Reference_Doesnt_Make_Content_Type_Dirty()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-            var oldHistoryCleanup = contentType.HistoryCleanup;
-
-            contentType.HistoryCleanup = new HistoryCleanup();
-            contentType.ResetDirtyProperties();
-            contentType.ResetWereDirtyProperties();
-
-            oldHistoryCleanup.KeepAllVersionsNewerThanDays = 2;
-
-            Assert.IsFalse(contentType.IsDirty());
             Assert.IsFalse(contentType.WasDirty());
-        }
+            Assert.AreEqual(2, contentType.GetDirtyProperties().Count());
+            Assert.IsTrue(contentType.IsPropertyDirty(nameof(contentType.HistoryCleanup)));
+            Assert.IsTrue(contentType.IsPropertyDirty(nameof(contentType.Alias)));
+        });
+    }
+
+    [Test]
+    public void Old_History_Cleanup_Reference_Doesnt_Make_Content_Type_Dirty()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        var oldHistoryCleanup = contentType.HistoryCleanup;
+
+        contentType.HistoryCleanup = new HistoryCleanup();
+        contentType.ResetDirtyProperties();
+        contentType.ResetWereDirtyProperties();
+
+        oldHistoryCleanup.KeepAllVersionsNewerThanDays = 2;
+
+        Assert.IsFalse(contentType.IsDirty());
+        Assert.IsFalse(contentType.WasDirty());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs
index 84d44133d2..53157fd5ea 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/ContentTypeTests.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
@@ -12,335 +11,334 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class ContentTypeTests
 {
-    [TestFixture]
-    public class ContentTypeTests
+    [Test]
+    [Ignore("Ignoring this test until we actually enforce this, see comments in ContentTypeBase.PropertyTypesChanged")]
+    public void Cannot_Add_Duplicate_Property_Aliases()
     {
-        [Test]
-        [Ignore("Ignoring this test until we actually enforce this, see comments in ContentTypeBase.PropertyTypesChanged")]
-        public void Cannot_Add_Duplicate_Property_Aliases()
+        var contentType = BuildContentType();
+
+        var propertyTypeBuilder = new PropertyTypeBuilder();
+        var additionalPropertyType = propertyTypeBuilder
+            .WithAlias("title")
+            .Build();
+
+        Assert.Throws<InvalidOperationException>(() =>
+            contentType.PropertyTypeCollection.Add(additionalPropertyType));
+    }
+
+    [Test]
+    [Ignore("Ignoring this test until we actually enforce this, see comments in ContentTypeBase.PropertyTypesChanged")]
+    public void Cannot_Update_Duplicate_Property_Aliases()
+    {
+        var contentType = BuildContentType();
+
+        var propertyTypeBuilder = new PropertyTypeBuilder();
+        var additionalPropertyType = propertyTypeBuilder
+            .WithAlias("title")
+            .Build();
+
+        contentType.PropertyTypeCollection.Add(additionalPropertyType);
+
+        var toUpdate = contentType.PropertyTypeCollection["myPropertyType2"];
+
+        Assert.Throws<InvalidOperationException>(() => toUpdate.Alias = "myPropertyType");
+    }
+
+    [Test]
+    public void Can_Deep_Clone_Content_Type_Sort()
+    {
+        var contentType = BuildContentTypeSort();
+        var clone = (ContentTypeSort)contentType.DeepClone();
+        Assert.AreNotSame(clone, contentType);
+        Assert.AreEqual(clone, contentType);
+        Assert.AreEqual(clone.Id.Value, contentType.Id.Value);
+        Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
+        Assert.AreEqual(clone.Alias, contentType.Alias);
+    }
+
+    private ContentTypeSort BuildContentTypeSort()
+    {
+        var builder = new ContentTypeSortBuilder();
+        return builder
+            .WithId(3)
+            .WithSortOrder(4)
+            .WithAlias("test")
+            .Build();
+    }
+
+    [Test]
+    public void Can_Deep_Clone_Content_Type_With_Reset_Identities()
+    {
+        var contentType = BuildContentType();
+
+        var clone = (ContentType)contentType.DeepCloneWithResetIdentities("newAlias");
+
+        Assert.AreEqual("newAlias", clone.Alias);
+        Assert.AreNotEqual("newAlias", contentType.Alias);
+        Assert.IsFalse(clone.HasIdentity);
+
+        foreach (var propertyGroup in clone.PropertyGroups)
         {
-            ContentType contentType = BuildContentType();
-
-            var propertyTypeBuilder = new PropertyTypeBuilder();
-            PropertyType additionalPropertyType = propertyTypeBuilder
-                .WithAlias("title")
-                .Build();
-
-            Assert.Throws<InvalidOperationException>(() =>
-                contentType.PropertyTypeCollection.Add(additionalPropertyType));
-        }
-
-        [Test]
-        [Ignore("Ignoring this test until we actually enforce this, see comments in ContentTypeBase.PropertyTypesChanged")]
-        public void Cannot_Update_Duplicate_Property_Aliases()
-        {
-            ContentType contentType = BuildContentType();
-
-            var propertyTypeBuilder = new PropertyTypeBuilder();
-            PropertyType additionalPropertyType = propertyTypeBuilder
-                .WithAlias("title")
-                .Build();
-
-            contentType.PropertyTypeCollection.Add(additionalPropertyType);
-
-            IPropertyType toUpdate = contentType.PropertyTypeCollection["myPropertyType2"];
-
-            Assert.Throws<InvalidOperationException>(() => toUpdate.Alias = "myPropertyType");
-        }
-
-        [Test]
-        public void Can_Deep_Clone_Content_Type_Sort()
-        {
-            ContentTypeSort contentType = BuildContentTypeSort();
-            var clone = (ContentTypeSort)contentType.DeepClone();
-            Assert.AreNotSame(clone, contentType);
-            Assert.AreEqual(clone, contentType);
-            Assert.AreEqual(clone.Id.Value, contentType.Id.Value);
-            Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
-            Assert.AreEqual(clone.Alias, contentType.Alias);
-        }
-
-        private ContentTypeSort BuildContentTypeSort()
-        {
-            var builder = new ContentTypeSortBuilder();
-            return builder
-                .WithId(3)
-                .WithSortOrder(4)
-                .WithAlias("test")
-                .Build();
-        }
-
-        [Test]
-        public void Can_Deep_Clone_Content_Type_With_Reset_Identities()
-        {
-            ContentType contentType = BuildContentType();
-
-            var clone = (ContentType)contentType.DeepCloneWithResetIdentities("newAlias");
-
-            Assert.AreEqual("newAlias", clone.Alias);
-            Assert.AreNotEqual("newAlias", contentType.Alias);
-            Assert.IsFalse(clone.HasIdentity);
-
-            foreach (PropertyGroup propertyGroup in clone.PropertyGroups)
-            {
-                Assert.IsFalse(propertyGroup.HasIdentity);
-                foreach (IPropertyType propertyType in propertyGroup.PropertyTypes)
-                {
-                    Assert.IsFalse(propertyType.HasIdentity);
-                }
-            }
-
-            foreach (IPropertyType propertyType in clone.PropertyTypes.Where(x => x.HasIdentity))
+            Assert.IsFalse(propertyGroup.HasIdentity);
+            foreach (var propertyType in propertyGroup.PropertyTypes)
             {
                 Assert.IsFalse(propertyType.HasIdentity);
             }
         }
 
-        [Test]
-        public void Can_Deep_Clone_Content_Type()
+        foreach (var propertyType in clone.PropertyTypes.Where(x => x.HasIdentity))
         {
-            // Arrange
-            ContentType contentType = BuildContentType();
-
-            // Act
-            var clone = (ContentType)contentType.DeepClone();
-
-            // Assert
-            Assert.AreNotSame(clone, contentType);
-            Assert.AreEqual(clone, contentType);
-            Assert.AreEqual(clone.Id, contentType.Id);
-            Assert.AreEqual(clone.AllowedTemplates.Count(), contentType.AllowedTemplates.Count());
-            for (var index = 0; index < contentType.AllowedTemplates.Count(); index++)
-            {
-                Assert.AreNotSame(clone.AllowedTemplates.ElementAt(index), contentType.AllowedTemplates.ElementAt(index));
-                Assert.AreEqual(clone.AllowedTemplates.ElementAt(index), contentType.AllowedTemplates.ElementAt(index));
-            }
-
-            Assert.AreNotSame(clone.PropertyGroups, contentType.PropertyGroups);
-            Assert.AreEqual(clone.PropertyGroups.Count, contentType.PropertyGroups.Count);
-            for (var index = 0; index < contentType.PropertyGroups.Count; index++)
-            {
-                Assert.AreNotSame(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
-                Assert.AreEqual(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
-            }
-
-            Assert.AreNotSame(clone.PropertyTypes, contentType.PropertyTypes);
-            Assert.AreEqual(clone.PropertyTypes.Count(), contentType.PropertyTypes.Count());
-            Assert.AreEqual(0, clone.NoGroupPropertyTypes.Count());
-            for (var index = 0; index < contentType.PropertyTypes.Count(); index++)
-            {
-                Assert.AreNotSame(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
-                Assert.AreEqual(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
-            }
-
-            Assert.AreEqual(clone.CreateDate, contentType.CreateDate);
-            Assert.AreEqual(clone.CreatorId, contentType.CreatorId);
-            Assert.AreEqual(clone.Key, contentType.Key);
-            Assert.AreEqual(clone.Level, contentType.Level);
-            Assert.AreEqual(clone.Path, contentType.Path);
-            Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
-            Assert.AreNotSame(clone.DefaultTemplate, contentType.DefaultTemplate);
-            Assert.AreEqual(clone.DefaultTemplate, contentType.DefaultTemplate);
-            Assert.AreEqual(clone.DefaultTemplateId, contentType.DefaultTemplateId);
-            Assert.AreEqual(clone.Trashed, contentType.Trashed);
-            Assert.AreEqual(clone.UpdateDate, contentType.UpdateDate);
-            Assert.AreEqual(clone.Thumbnail, contentType.Thumbnail);
-            Assert.AreEqual(clone.Icon, contentType.Icon);
-            Assert.AreEqual(clone.IsContainer, contentType.IsContainer);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(contentType, null));
-            }
-
-            // Need to ensure the event handlers are wired
-            var asDirty = (ICanBeDirty)clone;
-
-            Assert.IsFalse(asDirty.IsPropertyDirty("PropertyTypes"));
-
-            var propertyTypeBuilder = new PropertyTypeBuilder();
-            PropertyType additionalPropertyType = propertyTypeBuilder
-                .WithAlias("blah")
-                .Build();
-
-            clone.AddPropertyType(additionalPropertyType);
-            Assert.IsTrue(asDirty.IsPropertyDirty("PropertyTypes"));
-            Assert.IsFalse(asDirty.IsPropertyDirty("PropertyGroups"));
-            clone.AddPropertyGroup("hello", "hello");
-            Assert.IsTrue(asDirty.IsPropertyDirty("PropertyGroups"));
-        }
-
-        [Test]
-        public void Can_Serialize_Content_Type_Without_Error()
-        {
-            // Arrange
-            ContentType contentType = BuildContentType();
-
-            var json = JsonConvert.SerializeObject(contentType);
-            Debug.Print(json);
-        }
-
-        private static ContentType BuildContentType()
-        {
-            var builder = new ContentTypeBuilder();
-            return builder.BuildSimpleContentType();
-        }
-
-        [Test]
-        public void Can_Deep_Clone_Media_Type()
-        {
-            // Arrange
-            MediaType contentType = BuildMediaType();
-
-            // Act
-            var clone = (MediaType)contentType.DeepClone();
-
-            // Assert
-            Assert.AreNotSame(clone, contentType);
-            Assert.AreEqual(clone, contentType);
-            Assert.AreEqual(clone.Id, contentType.Id);
-            Assert.AreEqual(clone.PropertyGroups.Count, contentType.PropertyGroups.Count);
-            for (var index = 0; index < contentType.PropertyGroups.Count; index++)
-            {
-                Assert.AreNotSame(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
-                Assert.AreEqual(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
-            }
-
-            Assert.AreEqual(clone.PropertyTypes.Count(), contentType.PropertyTypes.Count());
-            for (var index = 0; index < contentType.PropertyTypes.Count(); index++)
-            {
-                Assert.AreNotSame(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
-                Assert.AreEqual(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
-            }
-
-            Assert.AreEqual(clone.CreateDate, contentType.CreateDate);
-            Assert.AreEqual(clone.CreatorId, contentType.CreatorId);
-            Assert.AreEqual(clone.Key, contentType.Key);
-            Assert.AreEqual(clone.Level, contentType.Level);
-            Assert.AreEqual(clone.Path, contentType.Path);
-            Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
-            Assert.AreEqual(clone.Trashed, contentType.Trashed);
-            Assert.AreEqual(clone.UpdateDate, contentType.UpdateDate);
-            Assert.AreEqual(clone.Thumbnail, contentType.Thumbnail);
-            Assert.AreEqual(clone.Icon, contentType.Icon);
-            Assert.AreEqual(clone.IsContainer, contentType.IsContainer);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(contentType, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Media_Type_Without_Error()
-        {
-            // Arrange
-            MediaType contentType = BuildMediaType();
-
-            var json = JsonConvert.SerializeObject(contentType);
-            Debug.Print(json);
-        }
-
-        private static MediaType BuildMediaType()
-        {
-            var builder = new MediaTypeBuilder();
-            return builder.BuildImageMediaType();
-        }
-
-        [Test]
-        public void Can_Deep_Clone_Member_Type()
-        {
-            // Arrange
-            MemberType contentType = BuildMemberType();
-
-            // Act
-            var clone = (MemberType)contentType.DeepClone();
-
-            // Assert
-            Assert.AreNotSame(clone, contentType);
-            Assert.AreEqual(clone, contentType);
-            Assert.AreEqual(clone.Id, contentType.Id);
-            Assert.AreEqual(clone.PropertyGroups.Count, contentType.PropertyGroups.Count);
-            for (var index = 0; index < contentType.PropertyGroups.Count; index++)
-            {
-                Assert.AreNotSame(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
-                Assert.AreEqual(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
-            }
-
-            Assert.AreEqual(clone.PropertyTypes.Count(), contentType.PropertyTypes.Count());
-            for (var index = 0; index < contentType.PropertyTypes.Count(); index++)
-            {
-                Assert.AreNotSame(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
-                Assert.AreEqual(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
-            }
-
-            Assert.AreEqual(clone.CreateDate, contentType.CreateDate);
-            Assert.AreEqual(clone.CreatorId, contentType.CreatorId);
-            Assert.AreEqual(clone.Key, contentType.Key);
-            Assert.AreEqual(clone.Level, contentType.Level);
-            Assert.AreEqual(clone.Path, contentType.Path);
-            Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
-            Assert.AreEqual(clone.Trashed, contentType.Trashed);
-            Assert.AreEqual(clone.UpdateDate, contentType.UpdateDate);
-            Assert.AreEqual(clone.Thumbnail, contentType.Thumbnail);
-            Assert.AreEqual(clone.Icon, contentType.Icon);
-            Assert.AreEqual(clone.IsContainer, contentType.IsContainer);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(contentType, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Member_Type_Without_Error()
-        {
-            // Arrange
-            MemberType contentType = BuildMemberType();
-
-            var json = JsonConvert.SerializeObject(contentType);
-            Debug.Print(json);
-        }
-
-        [Test]
-        [TestCase(false, false, false)]
-        [TestCase(true, false, false)]
-        [TestCase(true, true, false)]
-        [TestCase(true, true, true)]
-        public void Can_Set_Is_Member_Specific_Property_Type_Options(bool isSensitive, bool canView, bool canEdit)
-        {
-            var propertyTypeAlias = "testType";
-            MemberType memberType = BuildMemberType();
-            var propertyType = new PropertyTypeBuilder()
-                .WithAlias("testType")
-                .Build();
-
-            memberType.AddPropertyType(propertyType);
-
-            memberType.SetIsSensitiveProperty(propertyTypeAlias, isSensitive);
-            memberType.SetMemberCanViewProperty(propertyTypeAlias, canView);
-            memberType.SetMemberCanEditProperty(propertyTypeAlias, canEdit);
-
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(isSensitive, memberType.IsSensitiveProperty(propertyTypeAlias));
-                Assert.AreEqual(canView, memberType.MemberCanViewProperty(propertyTypeAlias));
-                Assert.AreEqual(canEdit, memberType.MemberCanEditProperty(propertyTypeAlias));
-            });
-        }
-
-        private static MemberType BuildMemberType()
-        {
-            var builder = new MemberTypeBuilder();
-            return builder.BuildSimpleMemberType();
+            Assert.IsFalse(propertyType.HasIdentity);
         }
     }
+
+    [Test]
+    public void Can_Deep_Clone_Content_Type()
+    {
+        // Arrange
+        var contentType = BuildContentType();
+
+        // Act
+        var clone = (ContentType)contentType.DeepClone();
+
+        // Assert
+        Assert.AreNotSame(clone, contentType);
+        Assert.AreEqual(clone, contentType);
+        Assert.AreEqual(clone.Id, contentType.Id);
+        Assert.AreEqual(clone.AllowedTemplates.Count(), contentType.AllowedTemplates.Count());
+        for (var index = 0; index < contentType.AllowedTemplates.Count(); index++)
+        {
+            Assert.AreNotSame(clone.AllowedTemplates.ElementAt(index), contentType.AllowedTemplates.ElementAt(index));
+            Assert.AreEqual(clone.AllowedTemplates.ElementAt(index), contentType.AllowedTemplates.ElementAt(index));
+        }
+
+        Assert.AreNotSame(clone.PropertyGroups, contentType.PropertyGroups);
+        Assert.AreEqual(clone.PropertyGroups.Count, contentType.PropertyGroups.Count);
+        for (var index = 0; index < contentType.PropertyGroups.Count; index++)
+        {
+            Assert.AreNotSame(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
+            Assert.AreEqual(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
+        }
+
+        Assert.AreNotSame(clone.PropertyTypes, contentType.PropertyTypes);
+        Assert.AreEqual(clone.PropertyTypes.Count(), contentType.PropertyTypes.Count());
+        Assert.AreEqual(0, clone.NoGroupPropertyTypes.Count());
+        for (var index = 0; index < contentType.PropertyTypes.Count(); index++)
+        {
+            Assert.AreNotSame(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
+            Assert.AreEqual(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
+        }
+
+        Assert.AreEqual(clone.CreateDate, contentType.CreateDate);
+        Assert.AreEqual(clone.CreatorId, contentType.CreatorId);
+        Assert.AreEqual(clone.Key, contentType.Key);
+        Assert.AreEqual(clone.Level, contentType.Level);
+        Assert.AreEqual(clone.Path, contentType.Path);
+        Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
+        Assert.AreNotSame(clone.DefaultTemplate, contentType.DefaultTemplate);
+        Assert.AreEqual(clone.DefaultTemplate, contentType.DefaultTemplate);
+        Assert.AreEqual(clone.DefaultTemplateId, contentType.DefaultTemplateId);
+        Assert.AreEqual(clone.Trashed, contentType.Trashed);
+        Assert.AreEqual(clone.UpdateDate, contentType.UpdateDate);
+        Assert.AreEqual(clone.Thumbnail, contentType.Thumbnail);
+        Assert.AreEqual(clone.Icon, contentType.Icon);
+        Assert.AreEqual(clone.IsContainer, contentType.IsContainer);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
+        {
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(contentType, null));
+        }
+
+        // Need to ensure the event handlers are wired
+        var asDirty = (ICanBeDirty)clone;
+
+        Assert.IsFalse(asDirty.IsPropertyDirty("PropertyTypes"));
+
+        var propertyTypeBuilder = new PropertyTypeBuilder();
+        var additionalPropertyType = propertyTypeBuilder
+            .WithAlias("blah")
+            .Build();
+
+        clone.AddPropertyType(additionalPropertyType);
+        Assert.IsTrue(asDirty.IsPropertyDirty("PropertyTypes"));
+        Assert.IsFalse(asDirty.IsPropertyDirty("PropertyGroups"));
+        clone.AddPropertyGroup("hello", "hello");
+        Assert.IsTrue(asDirty.IsPropertyDirty("PropertyGroups"));
+    }
+
+    [Test]
+    public void Can_Serialize_Content_Type_Without_Error()
+    {
+        // Arrange
+        var contentType = BuildContentType();
+
+        var json = JsonConvert.SerializeObject(contentType);
+        Debug.Print(json);
+    }
+
+    private static ContentType BuildContentType()
+    {
+        var builder = new ContentTypeBuilder();
+        return builder.BuildSimpleContentType();
+    }
+
+    [Test]
+    public void Can_Deep_Clone_Media_Type()
+    {
+        // Arrange
+        var contentType = BuildMediaType();
+
+        // Act
+        var clone = (MediaType)contentType.DeepClone();
+
+        // Assert
+        Assert.AreNotSame(clone, contentType);
+        Assert.AreEqual(clone, contentType);
+        Assert.AreEqual(clone.Id, contentType.Id);
+        Assert.AreEqual(clone.PropertyGroups.Count, contentType.PropertyGroups.Count);
+        for (var index = 0; index < contentType.PropertyGroups.Count; index++)
+        {
+            Assert.AreNotSame(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
+            Assert.AreEqual(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
+        }
+
+        Assert.AreEqual(clone.PropertyTypes.Count(), contentType.PropertyTypes.Count());
+        for (var index = 0; index < contentType.PropertyTypes.Count(); index++)
+        {
+            Assert.AreNotSame(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
+            Assert.AreEqual(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
+        }
+
+        Assert.AreEqual(clone.CreateDate, contentType.CreateDate);
+        Assert.AreEqual(clone.CreatorId, contentType.CreatorId);
+        Assert.AreEqual(clone.Key, contentType.Key);
+        Assert.AreEqual(clone.Level, contentType.Level);
+        Assert.AreEqual(clone.Path, contentType.Path);
+        Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
+        Assert.AreEqual(clone.Trashed, contentType.Trashed);
+        Assert.AreEqual(clone.UpdateDate, contentType.UpdateDate);
+        Assert.AreEqual(clone.Thumbnail, contentType.Thumbnail);
+        Assert.AreEqual(clone.Icon, contentType.Icon);
+        Assert.AreEqual(clone.IsContainer, contentType.IsContainer);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
+        {
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(contentType, null));
+        }
+    }
+
+    [Test]
+    public void Can_Serialize_Media_Type_Without_Error()
+    {
+        // Arrange
+        var contentType = BuildMediaType();
+
+        var json = JsonConvert.SerializeObject(contentType);
+        Debug.Print(json);
+    }
+
+    private static MediaType BuildMediaType()
+    {
+        var builder = new MediaTypeBuilder();
+        return builder.BuildImageMediaType();
+    }
+
+    [Test]
+    public void Can_Deep_Clone_Member_Type()
+    {
+        // Arrange
+        var contentType = BuildMemberType();
+
+        // Act
+        var clone = (MemberType)contentType.DeepClone();
+
+        // Assert
+        Assert.AreNotSame(clone, contentType);
+        Assert.AreEqual(clone, contentType);
+        Assert.AreEqual(clone.Id, contentType.Id);
+        Assert.AreEqual(clone.PropertyGroups.Count, contentType.PropertyGroups.Count);
+        for (var index = 0; index < contentType.PropertyGroups.Count; index++)
+        {
+            Assert.AreNotSame(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
+            Assert.AreEqual(clone.PropertyGroups[index], contentType.PropertyGroups[index]);
+        }
+
+        Assert.AreEqual(clone.PropertyTypes.Count(), contentType.PropertyTypes.Count());
+        for (var index = 0; index < contentType.PropertyTypes.Count(); index++)
+        {
+            Assert.AreNotSame(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
+            Assert.AreEqual(clone.PropertyTypes.ElementAt(index), contentType.PropertyTypes.ElementAt(index));
+        }
+
+        Assert.AreEqual(clone.CreateDate, contentType.CreateDate);
+        Assert.AreEqual(clone.CreatorId, contentType.CreatorId);
+        Assert.AreEqual(clone.Key, contentType.Key);
+        Assert.AreEqual(clone.Level, contentType.Level);
+        Assert.AreEqual(clone.Path, contentType.Path);
+        Assert.AreEqual(clone.SortOrder, contentType.SortOrder);
+        Assert.AreEqual(clone.Trashed, contentType.Trashed);
+        Assert.AreEqual(clone.UpdateDate, contentType.UpdateDate);
+        Assert.AreEqual(clone.Thumbnail, contentType.Thumbnail);
+        Assert.AreEqual(clone.Icon, contentType.Icon);
+        Assert.AreEqual(clone.IsContainer, contentType.IsContainer);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
+        {
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(contentType, null));
+        }
+    }
+
+    [Test]
+    public void Can_Serialize_Member_Type_Without_Error()
+    {
+        // Arrange
+        var contentType = BuildMemberType();
+
+        var json = JsonConvert.SerializeObject(contentType);
+        Debug.Print(json);
+    }
+
+    [Test]
+    [TestCase(false, false, false)]
+    [TestCase(true, false, false)]
+    [TestCase(true, true, false)]
+    [TestCase(true, true, true)]
+    public void Can_Set_Is_Member_Specific_Property_Type_Options(bool isSensitive, bool canView, bool canEdit)
+    {
+        var propertyTypeAlias = "testType";
+        var memberType = BuildMemberType();
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("testType")
+            .Build();
+
+        memberType.AddPropertyType(propertyType);
+
+        memberType.SetIsSensitiveProperty(propertyTypeAlias, isSensitive);
+        memberType.SetMemberCanViewProperty(propertyTypeAlias, canView);
+        memberType.SetMemberCanEditProperty(propertyTypeAlias, canEdit);
+
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual(isSensitive, memberType.IsSensitiveProperty(propertyTypeAlias));
+            Assert.AreEqual(canView, memberType.MemberCanViewProperty(propertyTypeAlias));
+            Assert.AreEqual(canEdit, memberType.MemberCanEditProperty(propertyTypeAlias));
+        });
+    }
+
+    private static MemberType BuildMemberType()
+    {
+        var builder = new MemberTypeBuilder();
+        return builder.BuildSimpleMemberType();
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs
index a6a71b3c6e..a4159f482a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/CultureImpactTests.cs
@@ -5,161 +5,160 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class CultureImpactTests
 {
-    [TestFixture]
-    public class CultureImpactTests
+    [Test]
+    public void Get_Culture_For_Invariant_Errors()
     {
-        [Test]
-        public void Get_Culture_For_Invariant_Errors()
-        {
-            var result = CultureImpact.GetCultureForInvariantErrors(
-                Mock.Of<IContent>(x => x.Published == true),
-                new[] { "en-US", "fr-FR" },
-                "en-US");
-            Assert.AreEqual("en-US", result); // default culture is being saved so use it
+        var result = CultureImpact.GetCultureForInvariantErrors(
+            Mock.Of<IContent>(x => x.Published == true),
+            new[] { "en-US", "fr-FR" },
+            "en-US");
+        Assert.AreEqual("en-US", result); // default culture is being saved so use it
 
-            result = CultureImpact.GetCultureForInvariantErrors(
-                Mock.Of<IContent>(x => x.Published == false),
-                new[] { "fr-FR" },
-                "en-US");
-            Assert.AreEqual("fr-FR", result); // default culture not being saved with not published version, use the first culture being saved
+        result = CultureImpact.GetCultureForInvariantErrors(
+            Mock.Of<IContent>(x => x.Published == false),
+            new[] { "fr-FR" },
+            "en-US");
+        Assert.AreEqual("fr-FR", result); // default culture not being saved with not published version, use the first culture being saved
 
-            result = CultureImpact.GetCultureForInvariantErrors(
-                Mock.Of<IContent>(x => x.Published == true),
-                new[] { "fr-FR" },
-                "en-US");
-            Assert.AreEqual(null, result); // default culture not being saved with published version, use null
-        }
+        result = CultureImpact.GetCultureForInvariantErrors(
+            Mock.Of<IContent>(x => x.Published == true),
+            new[] { "fr-FR" },
+            "en-US");
+        Assert.AreEqual(null, result); // default culture not being saved with published version, use null
+    }
 
-        [Test]
-        public void All_Cultures()
-        {
-            CultureImpact impact = CultureImpact.All;
+    [Test]
+    public void All_Cultures()
+    {
+        var impact = CultureImpact.All;
 
-            Assert.AreEqual(impact.Culture, "*");
+        Assert.AreEqual(impact.Culture, "*");
 
-            Assert.IsTrue(impact.ImpactsInvariantProperties);
-            Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
-            Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
-            Assert.IsFalse(impact.ImpactsExplicitCulture);
-            Assert.IsTrue(impact.ImpactsAllCultures);
-            Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
-        }
+        Assert.IsTrue(impact.ImpactsInvariantProperties);
+        Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
+        Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
+        Assert.IsFalse(impact.ImpactsExplicitCulture);
+        Assert.IsTrue(impact.ImpactsAllCultures);
+        Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
+    }
 
-        [Test]
-        public void Invariant_Culture()
-        {
-            CultureImpact impact = CultureImpact.Invariant;
+    [Test]
+    public void Invariant_Culture()
+    {
+        var impact = CultureImpact.Invariant;
 
-            Assert.AreEqual(impact.Culture, null);
+        Assert.AreEqual(impact.Culture, null);
 
-            Assert.IsTrue(impact.ImpactsInvariantProperties);
-            Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
-            Assert.IsTrue(impact.ImpactsOnlyInvariantCulture);
-            Assert.IsFalse(impact.ImpactsExplicitCulture);
-            Assert.IsFalse(impact.ImpactsAllCultures);
-            Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
-        }
+        Assert.IsTrue(impact.ImpactsInvariantProperties);
+        Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
+        Assert.IsTrue(impact.ImpactsOnlyInvariantCulture);
+        Assert.IsFalse(impact.ImpactsExplicitCulture);
+        Assert.IsFalse(impact.ImpactsAllCultures);
+        Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
+    }
 
-        [Test]
-        public void Explicit_Default_Culture()
-        {
-            var impact = CultureImpact.Explicit("en-US", true);
+    [Test]
+    public void Explicit_Default_Culture()
+    {
+        var impact = CultureImpact.Explicit("en-US", true);
 
-            Assert.AreEqual(impact.Culture, "en-US");
+        Assert.AreEqual(impact.Culture, "en-US");
 
-            Assert.IsTrue(impact.ImpactsInvariantProperties);
-            Assert.IsTrue(impact.ImpactsAlsoInvariantProperties);
-            Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
-            Assert.IsTrue(impact.ImpactsExplicitCulture);
-            Assert.IsFalse(impact.ImpactsAllCultures);
-            Assert.IsTrue(impact.ImpactsOnlyDefaultCulture);
-        }
+        Assert.IsTrue(impact.ImpactsInvariantProperties);
+        Assert.IsTrue(impact.ImpactsAlsoInvariantProperties);
+        Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
+        Assert.IsTrue(impact.ImpactsExplicitCulture);
+        Assert.IsFalse(impact.ImpactsAllCultures);
+        Assert.IsTrue(impact.ImpactsOnlyDefaultCulture);
+    }
 
-        [Test]
-        public void Explicit_NonDefault_Culture()
-        {
-            var impact = CultureImpact.Explicit("en-US", false);
+    [Test]
+    public void Explicit_NonDefault_Culture()
+    {
+        var impact = CultureImpact.Explicit("en-US", false);
 
-            Assert.AreEqual(impact.Culture, "en-US");
+        Assert.AreEqual(impact.Culture, "en-US");
 
-            Assert.IsFalse(impact.ImpactsInvariantProperties);
-            Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
-            Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
-            Assert.IsTrue(impact.ImpactsExplicitCulture);
-            Assert.IsFalse(impact.ImpactsAllCultures);
-            Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
-        }
+        Assert.IsFalse(impact.ImpactsInvariantProperties);
+        Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
+        Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
+        Assert.IsTrue(impact.ImpactsExplicitCulture);
+        Assert.IsFalse(impact.ImpactsAllCultures);
+        Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
+    }
 
-        [Test]
-        public void TryCreate_Explicit_Default_Culture()
-        {
-            var success = CultureImpact.TryCreate("en-US", true, ContentVariation.Culture, false, out CultureImpact impact);
-            Assert.IsTrue(success);
+    [Test]
+    public void TryCreate_Explicit_Default_Culture()
+    {
+        var success = CultureImpact.TryCreate("en-US", true, ContentVariation.Culture, false, out var impact);
+        Assert.IsTrue(success);
 
-            Assert.AreEqual(impact.Culture, "en-US");
+        Assert.AreEqual(impact.Culture, "en-US");
 
-            Assert.IsTrue(impact.ImpactsInvariantProperties);
-            Assert.IsTrue(impact.ImpactsAlsoInvariantProperties);
-            Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
-            Assert.IsTrue(impact.ImpactsExplicitCulture);
-            Assert.IsFalse(impact.ImpactsAllCultures);
-            Assert.IsTrue(impact.ImpactsOnlyDefaultCulture);
-        }
+        Assert.IsTrue(impact.ImpactsInvariantProperties);
+        Assert.IsTrue(impact.ImpactsAlsoInvariantProperties);
+        Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
+        Assert.IsTrue(impact.ImpactsExplicitCulture);
+        Assert.IsFalse(impact.ImpactsAllCultures);
+        Assert.IsTrue(impact.ImpactsOnlyDefaultCulture);
+    }
 
-        [Test]
-        public void TryCreate_Explicit_NonDefault_Culture()
-        {
-            var success = CultureImpact.TryCreate("en-US", false, ContentVariation.Culture, false, out CultureImpact impact);
-            Assert.IsTrue(success);
+    [Test]
+    public void TryCreate_Explicit_NonDefault_Culture()
+    {
+        var success = CultureImpact.TryCreate("en-US", false, ContentVariation.Culture, false, out var impact);
+        Assert.IsTrue(success);
 
-            Assert.AreEqual(impact.Culture, "en-US");
+        Assert.AreEqual(impact.Culture, "en-US");
 
-            Assert.IsFalse(impact.ImpactsInvariantProperties);
-            Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
-            Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
-            Assert.IsTrue(impact.ImpactsExplicitCulture);
-            Assert.IsFalse(impact.ImpactsAllCultures);
-            Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
-        }
+        Assert.IsFalse(impact.ImpactsInvariantProperties);
+        Assert.IsFalse(impact.ImpactsAlsoInvariantProperties);
+        Assert.IsFalse(impact.ImpactsOnlyInvariantCulture);
+        Assert.IsTrue(impact.ImpactsExplicitCulture);
+        Assert.IsFalse(impact.ImpactsAllCultures);
+        Assert.IsFalse(impact.ImpactsOnlyDefaultCulture);
+    }
 
-        [Test]
-        public void TryCreate_AllCultures_For_Invariant()
-        {
-            var success = CultureImpact.TryCreate("*", false, ContentVariation.Nothing, false, out CultureImpact impact);
-            Assert.IsTrue(success);
+    [Test]
+    public void TryCreate_AllCultures_For_Invariant()
+    {
+        var success = CultureImpact.TryCreate("*", false, ContentVariation.Nothing, false, out var impact);
+        Assert.IsTrue(success);
 
-            Assert.AreEqual(impact.Culture, null);
+        Assert.AreEqual(impact.Culture, null);
 
-            Assert.AreSame(CultureImpact.Invariant, impact);
-        }
+        Assert.AreSame(CultureImpact.Invariant, impact);
+    }
 
-        [Test]
-        public void TryCreate_AllCultures_For_Variant()
-        {
-            var success = CultureImpact.TryCreate("*", false, ContentVariation.Culture, false, out CultureImpact impact);
-            Assert.IsTrue(success);
+    [Test]
+    public void TryCreate_AllCultures_For_Variant()
+    {
+        var success = CultureImpact.TryCreate("*", false, ContentVariation.Culture, false, out var impact);
+        Assert.IsTrue(success);
 
-            Assert.AreEqual(impact.Culture, "*");
+        Assert.AreEqual(impact.Culture, "*");
 
-            Assert.AreSame(CultureImpact.All, impact);
-        }
+        Assert.AreSame(CultureImpact.All, impact);
+    }
 
-        [Test]
-        public void TryCreate_Invariant_For_Variant()
-        {
-            var success = CultureImpact.TryCreate(null, false, ContentVariation.Culture, false, out CultureImpact impact);
-            Assert.IsFalse(success);
-        }
+    [Test]
+    public void TryCreate_Invariant_For_Variant()
+    {
+        var success = CultureImpact.TryCreate(null, false, ContentVariation.Culture, false, out var impact);
+        Assert.IsFalse(success);
+    }
 
-        [Test]
-        public void TryCreate_Invariant_For_Invariant()
-        {
-            var success = CultureImpact.TryCreate(null, false, ContentVariation.Nothing, false, out CultureImpact impact);
-            Assert.IsTrue(success);
+    [Test]
+    public void TryCreate_Invariant_For_Invariant()
+    {
+        var success = CultureImpact.TryCreate(null, false, ContentVariation.Nothing, false, out var impact);
+        Assert.IsTrue(success);
 
-            Assert.AreSame(CultureImpact.Invariant, impact);
-        }
+        Assert.AreSame(CultureImpact.Invariant, impact);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs
index 07b25965e9..3e360846a7 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DeepCloneHelperTests.cs
@@ -7,230 +7,207 @@ using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class DeepCloneHelperTests
 {
-    [TestFixture]
-    public class DeepCloneHelperTests
+    [Test]
+    public void Deep_Clone_Ref_Properties()
     {
-        [Test]
-        public void Deep_Clone_Ref_Properties()
+        var test1 = new Test1 { MyTest1 = new Test1(), MyTest2 = new Test2() };
+
+        var clone = (Test1)test1.DeepClone();
+
+        Assert.AreNotSame(test1, clone);
+        Assert.AreNotSame(test1.MyTest1, clone.MyTest1);
+        Assert.AreSame(test1.MyTest2, clone.MyTest2);
+    }
+
+    [Test]
+    public void Deep_Clone_Array_Property()
+    {
+        var test1 = new Test3 { MyTest1 = new object[] { new Test1(), new Test1() } };
+
+        var clone = (Test3)test1.DeepClone();
+
+        Assert.AreNotSame(test1, clone);
+        Assert.AreEqual(test1.MyTest1.Length, clone.MyTest1.Length);
+        for (var i = 0; i < test1.MyTest1.Length; i++)
         {
-            var test1 = new Test1()
+            Assert.IsNotNull(clone.MyTest1.ElementAt(i));
+            Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void Deep_Clone_Typed_Array_Property()
+    {
+        var test1 = new Test4 { MyTest1 = new[] { new Test1(), new Test1() } };
+
+        var clone = (Test4)test1.DeepClone();
+
+        Assert.AreNotSame(test1, clone);
+        Assert.AreEqual(test1.MyTest1.Length, clone.MyTest1.Length);
+        for (var i = 0; i < test1.MyTest1.Length; i++)
+        {
+            Assert.IsNotNull(clone.MyTest1.ElementAt(i));
+            Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void Deep_Clone_Enumerable_Property()
+    {
+        var test1 = new Test5 { MyTest1 = new[] { new Test1(), new Test1() } };
+
+        var clone = (Test5)test1.DeepClone();
+
+        Assert.AreNotSame(test1, clone);
+
+        Assert.AreEqual(test1.MyTest1.Cast<object>().Count(), clone.MyTest1.Cast<object>().Count());
+        for (var i = 0; i < test1.MyTest1.Cast<object>().Count(); i++)
+        {
+            Assert.IsNotNull(clone.MyTest1.Cast<object>().ElementAt(i));
+            Assert.AreNotSame(clone.MyTest1.Cast<object>().ElementAt(i), test1.MyTest1.Cast<object>().ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void Deep_Clone_Typed_Enumerable_Property()
+    {
+        var test1 = new Test6 { MyTest1 = new[] { new Test1(), new Test1() } };
+
+        var clone = (Test6)test1.DeepClone();
+
+        Assert.AreNotSame(test1, clone);
+        Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count());
+        for (var i = 0; i < test1.MyTest1.Count(); i++)
+        {
+            Assert.IsNotNull(clone.MyTest1.ElementAt(i));
+            Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void Deep_Clone_Custom_Enumerable_Property()
+    {
+        var test1 = new Test7 { MyTest1 = new List<Test1> { new(), new() } };
+
+        var clone = (Test7)test1.DeepClone();
+
+        Assert.AreNotSame(test1, clone);
+        Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count());
+        for (var i = 0; i < test1.MyTest1.Count(); i++)
+        {
+            Assert.IsNotNull(clone.MyTest1.ElementAt(i));
+            Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void Deep_Clone_Custom_Enumerable_Interface_Property()
+    {
+        var test1 = new Test8 { MyTest1 = new List<Test1> { new(), new() } };
+
+        var clone = (Test8)test1.DeepClone();
+
+        Assert.AreNotSame(test1, clone);
+        Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count());
+        for (var i = 0; i < test1.MyTest1.Count(); i++)
+        {
+            Assert.IsNotNull(clone.MyTest1.ElementAt(i));
+            Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
+        }
+    }
+
+    [Test]
+    public void Cannot_Deep_Clone_Collection_Properties_That_Are_Not_Cloneable()
+    {
+        var test1 = new Test3
+        {
+            MyTest1 = new object[]
             {
-                MyTest1 = new Test1(),
-                MyTest2 = new Test2()
-            };
+                new Test1(), "hello",
 
-            var clone = (Test1)test1.DeepClone();
+                // Not cloneable so this property will get skipped.
+                new Test2(),
+            },
+        };
 
-            Assert.AreNotSame(test1, clone);
-            Assert.AreNotSame(test1.MyTest1, clone.MyTest1);
-            Assert.AreSame(test1.MyTest2, clone.MyTest2);
-        }
+        var clone = (Test3)test1.DeepClone();
 
-        [Test]
-        public void Deep_Clone_Array_Property()
+        // It skipped this property so these will now be the same.
+        Assert.AreSame(clone.MyTest1, test1.MyTest1);
+    }
+
+    public class Test1 : BaseCloneable
+    {
+        public string Name { get; set; }
+
+        public int Age { get; set; }
+
+        public Test1 MyTest1 { get; set; }
+
+        public Test2 MyTest2 { get; set; }
+    }
+
+    public class Test2
+    {
+        public string Name { get; set; }
+
+        public Test1 MyTest1 { get; set; }
+    }
+
+    public class Test3 : BaseCloneable
+    {
+        public string Name { get; set; }
+
+        public object[] MyTest1 { get; set; }
+    }
+
+    public class Test4 : BaseCloneable
+    {
+        public string Name { get; set; }
+
+        public Test1[] MyTest1 { get; set; }
+    }
+
+    public class Test5 : BaseCloneable
+    {
+        public string Name { get; set; }
+
+        public IEnumerable MyTest1 { get; set; }
+    }
+
+    public class Test6 : BaseCloneable
+    {
+        public string Name { get; set; }
+
+        public IEnumerable<Test1> MyTest1 { get; set; }
+    }
+
+    public class Test7 : BaseCloneable
+    {
+        public string Name { get; set; }
+
+        public List<Test1> MyTest1 { get; set; }
+    }
+
+    public class Test8 : BaseCloneable
+    {
+        public string Name { get; set; }
+
+        public ICollection<Test1> MyTest1 { get; set; }
+    }
+
+    public abstract class BaseCloneable : IDeepCloneable
+    {
+        public object DeepClone()
         {
-            var test1 = new Test3()
-            {
-                MyTest1 = new object[] { new Test1(), new Test1() }
-            };
-
-            var clone = (Test3)test1.DeepClone();
-
-            Assert.AreNotSame(test1, clone);
-            Assert.AreEqual(test1.MyTest1.Length, clone.MyTest1.Length);
-            for (var i = 0; i < test1.MyTest1.Length; i++)
-            {
-                Assert.IsNotNull(clone.MyTest1.ElementAt(i));
-                Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void Deep_Clone_Typed_Array_Property()
-        {
-            var test1 = new Test4()
-            {
-                MyTest1 = new[] { new Test1(), new Test1() }
-            };
-
-            var clone = (Test4)test1.DeepClone();
-
-            Assert.AreNotSame(test1, clone);
-            Assert.AreEqual(test1.MyTest1.Length, clone.MyTest1.Length);
-            for (var i = 0; i < test1.MyTest1.Length; i++)
-            {
-                Assert.IsNotNull(clone.MyTest1.ElementAt(i));
-                Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void Deep_Clone_Enumerable_Property()
-        {
-            var test1 = new Test5()
-            {
-                MyTest1 = new[] { new Test1(), new Test1() }
-            };
-
-            var clone = (Test5)test1.DeepClone();
-
-            Assert.AreNotSame(test1, clone);
-
-            Assert.AreEqual(test1.MyTest1.Cast<object>().Count(), clone.MyTest1.Cast<object>().Count());
-            for (var i = 0; i < test1.MyTest1.Cast<object>().Count(); i++)
-            {
-                Assert.IsNotNull(clone.MyTest1.Cast<object>().ElementAt(i));
-                Assert.AreNotSame(clone.MyTest1.Cast<object>().ElementAt(i), test1.MyTest1.Cast<object>().ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void Deep_Clone_Typed_Enumerable_Property()
-        {
-            var test1 = new Test6()
-            {
-                MyTest1 = new[] { new Test1(), new Test1() }
-            };
-
-            var clone = (Test6)test1.DeepClone();
-
-            Assert.AreNotSame(test1, clone);
-            Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count());
-            for (var i = 0; i < test1.MyTest1.Count(); i++)
-            {
-                Assert.IsNotNull(clone.MyTest1.ElementAt(i));
-                Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void Deep_Clone_Custom_Enumerable_Property()
-        {
-            var test1 = new Test7()
-            {
-                MyTest1 = new List<Test1> { new Test1(), new Test1() }
-            };
-
-            var clone = (Test7)test1.DeepClone();
-
-            Assert.AreNotSame(test1, clone);
-            Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count());
-            for (var i = 0; i < test1.MyTest1.Count(); i++)
-            {
-                Assert.IsNotNull(clone.MyTest1.ElementAt(i));
-                Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void Deep_Clone_Custom_Enumerable_Interface_Property()
-        {
-            var test1 = new Test8()
-            {
-                MyTest1 = new List<Test1> { new Test1(), new Test1() }
-            };
-
-            var clone = (Test8)test1.DeepClone();
-
-            Assert.AreNotSame(test1, clone);
-            Assert.AreEqual(test1.MyTest1.Count(), clone.MyTest1.Count());
-            for (var i = 0; i < test1.MyTest1.Count(); i++)
-            {
-                Assert.IsNotNull(clone.MyTest1.ElementAt(i));
-                Assert.AreNotSame(clone.MyTest1.ElementAt(i), test1.MyTest1.ElementAt(i));
-            }
-        }
-
-        [Test]
-        public void Cannot_Deep_Clone_Collection_Properties_That_Are_Not_Cloneable()
-        {
-            var test1 = new Test3()
-            {
-                MyTest1 = new object[]
-                {
-                    new Test1(), "hello",
-
-                    // Not cloneable so this property will get skipped.
-                    new Test2()
-                }
-            };
-
-            var clone = (Test3)test1.DeepClone();
-
-            // It skipped this property so these will now be the same.
-            Assert.AreSame(clone.MyTest1, test1.MyTest1);
-        }
-
-        public class Test1 : BaseCloneable
-        {
-            public string Name { get; set; }
-
-            public int Age { get; set; }
-
-            public Test1 MyTest1 { get; set; }
-
-            public Test2 MyTest2 { get; set; }
-        }
-
-        public class Test2
-        {
-            public string Name { get; set; }
-
-            public Test1 MyTest1 { get; set; }
-        }
-
-        public class Test3 : BaseCloneable
-        {
-            public string Name { get; set; }
-
-            public object[] MyTest1 { get; set; }
-        }
-
-        public class Test4 : BaseCloneable
-        {
-            public string Name { get; set; }
-
-            public Test1[] MyTest1 { get; set; }
-        }
-
-        public class Test5 : BaseCloneable
-        {
-            public string Name { get; set; }
-
-            public IEnumerable MyTest1 { get; set; }
-        }
-
-        public class Test6 : BaseCloneable
-        {
-            public string Name { get; set; }
-
-            public IEnumerable<Test1> MyTest1 { get; set; }
-        }
-
-        public class Test7 : BaseCloneable
-        {
-            public string Name { get; set; }
-
-            public List<Test1> MyTest1 { get; set; }
-        }
-
-        public class Test8 : BaseCloneable
-        {
-            public string Name { get; set; }
-
-            public ICollection<Test1> MyTest1 { get; set; }
-        }
-
-        public abstract class BaseCloneable : IDeepCloneable
-        {
-            public object DeepClone()
-            {
-                var clone = (IDeepCloneable)MemberwiseClone();
-                DeepCloneHelper.DeepCloneRefProperties(this, clone);
-                return clone;
-            }
+            var clone = (IDeepCloneable)MemberwiseClone();
+            DeepCloneHelper.DeepCloneRefProperties(this, clone);
+            return clone;
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs
index 17d06deafa..e0c6307f25 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryItemTests.cs
@@ -2,62 +2,60 @@
 // See LICENSE for more details.
 
 using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class DictionaryItemTests
 {
-    [TestFixture]
-    public class DictionaryItemTests
+    [SetUp]
+    public void SetUp() => _builder = new DictionaryItemBuilder();
+
+    private DictionaryItemBuilder _builder = new();
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private DictionaryItemBuilder _builder = new DictionaryItemBuilder();
+        var item = _builder
+            .WithRandomTranslations(2)
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new DictionaryItemBuilder();
+        var clone = (DictionaryItem)item.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, item);
+        Assert.AreEqual(clone, item);
+        Assert.AreEqual(clone.CreateDate, item.CreateDate);
+        Assert.AreEqual(clone.Id, item.Id);
+        Assert.AreEqual(clone.ItemKey, item.ItemKey);
+        Assert.AreEqual(clone.Key, item.Key);
+        Assert.AreEqual(clone.ParentId, item.ParentId);
+        Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
+        Assert.AreEqual(clone.Translations.Count(), item.Translations.Count());
+        for (var i = 0; i < item.Translations.Count(); i++)
         {
-            DictionaryItem item = _builder
-                .WithRandomTranslations(2)
-                .Build();
-
-            var clone = (DictionaryItem)item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.ItemKey, item.ItemKey);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.ParentId, item.ParentId);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-            Assert.AreEqual(clone.Translations.Count(), item.Translations.Count());
-            for (var i = 0; i < item.Translations.Count(); i++)
-            {
-                Assert.AreNotSame(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
-                Assert.AreEqual(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
-            }
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
+            Assert.AreNotSame(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
+            Assert.AreEqual(clone.Translations.ElementAt(i), item.Translations.ElementAt(i));
         }
 
-        [Test]
-        public void Can_Serialize_Without_Error()
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            DictionaryItem item = _builder
-                .WithRandomTranslations(2)
-                .Build();
-
-            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
         }
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var item = _builder
+            .WithRandomTranslations(2)
+            .Build();
+
+        Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs
index ef8dda0ba8..ec81a4638f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DictionaryTranslationTests.cs
@@ -3,67 +3,65 @@
 
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class DictionaryTranslationTests
 {
-    [TestFixture]
-    public class DictionaryTranslationTests
+    [SetUp]
+    public void SetUp() => _builder = new DictionaryTranslationBuilder();
+
+    private DictionaryTranslationBuilder _builder = new();
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private DictionaryTranslationBuilder _builder = new DictionaryTranslationBuilder();
+        var item = BuildDictionaryTranslation();
 
-        [SetUp]
-        public void SetUp() => _builder = new DictionaryTranslationBuilder();
+        var clone = (DictionaryTranslation)item.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, item);
+        Assert.AreEqual(clone, item);
+        Assert.AreEqual(clone.CreateDate, item.CreateDate);
+        Assert.AreEqual(clone.Id, item.Id);
+        Assert.AreEqual(clone.Key, item.Key);
+        Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
+        Assert.AreNotSame(clone.Language, item.Language);
+
+        // This is null because we are ignoring it from cloning due to caching/cloning issues - we don't really want
+        // this entity attached to this item but we're stuck with it for now
+        Assert.IsNull(clone.Language);
+        Assert.AreEqual(clone.LanguageId, item.LanguageId);
+        Assert.AreEqual(clone.Value, item.Value);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps.Where(x => x.Name != "Language"))
         {
-            IDictionaryTranslation item = BuildDictionaryTranslation();
-
-            var clone = (DictionaryTranslation)item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-            Assert.AreNotSame(clone.Language, item.Language);
-
-            // This is null because we are ignoring it from cloning due to caching/cloning issues - we don't really want
-            // this entity attached to this item but we're stuck with it for now
-            Assert.IsNull(clone.Language);
-            Assert.AreEqual(clone.LanguageId, item.LanguageId);
-            Assert.AreEqual(clone.Value, item.Value);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps.Where(x => x.Name != "Language"))
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
         }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            IDictionaryTranslation item = BuildDictionaryTranslation();
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-
-        private IDictionaryTranslation BuildDictionaryTranslation() =>
-            _builder
-                .AddLanguage()
-                    .WithCultureInfo("en-AU")
-                    .Done()
-                .WithValue("colour")
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var item = BuildDictionaryTranslation();
+
+        var json = JsonConvert.SerializeObject(item);
+        Debug.Print(json);
+    }
+
+    private IDictionaryTranslation BuildDictionaryTranslation() =>
+        _builder
+            .AddLanguage()
+            .WithCultureInfo("en-AU")
+            .Done()
+            .WithValue("colour")
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs
index 6ede1a5bf3..24ccc5898b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/DocumentEntityTests.cs
@@ -4,43 +4,41 @@
 using System.Diagnostics;
 using Newtonsoft.Json;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class DocumentEntityTests
 {
-    [TestFixture]
-    public class DocumentEntityTests
+    [SetUp]
+    public void SetUp() => _builder = new DocumentEntitySlimBuilder();
+
+    private DocumentEntitySlimBuilder _builder;
+
+    [Test]
+    public void Can_Serialize_Without_Error()
     {
-        private DocumentEntitySlimBuilder _builder;
+        var item = _builder
+            .WithId(3)
+            .WithCreatorId(4)
+            .WithName("Test")
+            .WithParentId(5)
+            .WithSortOrder(6)
+            .WithLevel(7)
+            .WithContentTypeAlias("test1")
+            .WithContentTypeIcon("icon")
+            .WithContentTypeThumbnail("thumb")
+            .WithHasChildren(true)
+            .WithPublished(true)
+            .AddAdditionalData()
+            .WithKeyValue("test1", 3)
+            .WithKeyValue("test2", "value")
+            .Done()
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new DocumentEntitySlimBuilder();
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            DocumentEntitySlim item = _builder
-                .WithId(3)
-                .WithCreatorId(4)
-                .WithName("Test")
-                .WithParentId(5)
-                .WithSortOrder(6)
-                .WithLevel(7)
-                .WithContentTypeAlias("test1")
-                .WithContentTypeIcon("icon")
-                .WithContentTypeThumbnail("thumb")
-                .WithHasChildren(true)
-                .WithPublished(true)
-                .AddAdditionalData()
-                    .WithKeyValue("test1", 3)
-                    .WithKeyValue("test2", "value")
-                    .Done()
-                .Build();
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
+        var json = JsonConvert.SerializeObject(item);
+        Debug.Print(json);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs
index 4f2d70a407..87fe779cae 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/LanguageTests.cs
@@ -1,54 +1,52 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class LanguageTests
 {
-    [TestFixture]
-    public class LanguageTests
+    [SetUp]
+    public void SetUp() => _builder = new LanguageBuilder();
+
+    private LanguageBuilder _builder = new();
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private LanguageBuilder _builder = new LanguageBuilder();
+        var item = _builder
+            .WithId(1)
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new LanguageBuilder();
+        var clone = (Language)item.DeepClone();
+        Assert.AreNotSame(clone, item);
+        Assert.AreEqual(clone, item);
+        Assert.AreEqual(clone.CreateDate, item.CreateDate);
+        Assert.AreEqual(clone.CultureName, item.CultureName);
+        Assert.AreEqual(clone.Id, item.Id);
+        Assert.AreEqual(clone.IsoCode, item.IsoCode);
+        Assert.AreEqual(clone.Key, item.Key);
+        Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
 
-        [Test]
-        public void Can_Deep_Clone()
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            ILanguage item = _builder
-                .WithId(1)
-                .Build();
-
-            var clone = (Language)item.DeepClone();
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.CultureName, item.CultureName);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.IsoCode, item.IsoCode);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            ILanguage item = _builder.Build();
-
-            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
         }
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var item = _builder.Build();
+
+        Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs
index cfdb08e7f4..63a3002ebe 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MacroTests.cs
@@ -3,78 +3,76 @@
 
 using System;
 using System.Linq;
-using System.Reflection;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class MacroTests
 {
-    [TestFixture]
-    public class MacroTests
+    [SetUp]
+    public void SetUp() => _builder = new MacroBuilder();
+
+    private MacroBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private MacroBuilder _builder;
+        var macro = _builder
+            .WithId(1)
+            .WithUseInEditor(true)
+            .WithCacheDuration(3)
+            .WithAlias("test")
+            .WithName("Test")
+            .WithSource("~/script.cshtml")
+            .WithCacheByMember(true)
+            .WithDontRender(true)
+            .AddProperty()
+            .WithId(6)
+            .WithAlias("rewq")
+            .WithName("REWQ")
+            .WithSortOrder(1)
+            .WithEditorAlias("asdfasdf")
+            .Done()
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new MacroBuilder();
+        var clone = (Macro)macro.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, macro);
+        Assert.AreEqual(clone, macro);
+        Assert.AreEqual(clone.Id, macro.Id);
+
+        Assert.AreEqual(clone.Properties.Count, macro.Properties.Count);
+
+        for (var i = 0; i < clone.Properties.Count; i++)
         {
-            Macro macro = _builder
-                .WithId(1)
-                .WithUseInEditor(true)
-                .WithCacheDuration(3)
-                .WithAlias("test")
-                .WithName("Test")
-                .WithSource("~/script.cshtml")
-                .WithCacheByMember(true)
-                .WithDontRender(true)
-                .AddProperty()
-                    .WithId(6)
-                    .WithAlias("rewq")
-                    .WithName("REWQ")
-                    .WithSortOrder(1)
-                    .WithEditorAlias("asdfasdf")
-                    .Done()
-                .Build();
-
-            var clone = (Macro)macro.DeepClone();
-
-            Assert.AreNotSame(clone, macro);
-            Assert.AreEqual(clone, macro);
-            Assert.AreEqual(clone.Id, macro.Id);
-
-            Assert.AreEqual(clone.Properties.Count, macro.Properties.Count);
-
-            for (var i = 0; i < clone.Properties.Count; i++)
-            {
-                Assert.AreEqual(clone.Properties[i], macro.Properties[i]);
-                Assert.AreNotSame(clone.Properties[i], macro.Properties[i]);
-            }
-
-            Assert.AreNotSame(clone.Properties, macro.Properties);
-            Assert.AreNotSame(clone.AddedProperties, macro.AddedProperties);
-            Assert.AreNotSame(clone.RemovedProperties, macro.RemovedProperties);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(macro, null));
-            }
-
-            // Need to ensure the event handlers are wired.
-            var asDirty = (ICanBeDirty)clone;
-
-            Assert.IsFalse(asDirty.IsPropertyDirty("Properties"));
-            clone.Properties.Add(new MacroProperty(3, Guid.NewGuid(), "asdf", "SDF", 3, "asdfasdf"));
-            Assert.IsTrue(asDirty.IsPropertyDirty("Properties"));
-            Assert.AreEqual(1, clone.AddedProperties.Count());
-            clone.Properties.Remove("rewq");
-            Assert.AreEqual(1, clone.RemovedProperties.Count());
+            Assert.AreEqual(clone.Properties[i], macro.Properties[i]);
+            Assert.AreNotSame(clone.Properties[i], macro.Properties[i]);
         }
+
+        Assert.AreNotSame(clone.Properties, macro.Properties);
+        Assert.AreNotSame(clone.AddedProperties, macro.AddedProperties);
+        Assert.AreNotSame(clone.RemovedProperties, macro.RemovedProperties);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
+        {
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(macro, null));
+        }
+
+        // Need to ensure the event handlers are wired.
+        var asDirty = (ICanBeDirty)clone;
+
+        Assert.IsFalse(asDirty.IsPropertyDirty("Properties"));
+        clone.Properties.Add(new MacroProperty(3, Guid.NewGuid(), "asdf", "SDF", 3, "asdfasdf"));
+        Assert.IsTrue(asDirty.IsPropertyDirty("Properties"));
+        Assert.AreEqual(1, clone.AddedProperties.Count());
+        clone.Properties.Remove("rewq");
+        Assert.AreEqual(1, clone.RemovedProperties.Count());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs
index cffe093c09..dce4f77906 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberGroupTests.cs
@@ -3,73 +3,71 @@
 
 using System;
 using System.Diagnostics;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class MemberGroupTests
 {
-    [TestFixture]
-    public class MemberGroupTests
+    [SetUp]
+    public void SetUp() => _builder = new MemberGroupBuilder();
+
+    private MemberGroupBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private MemberGroupBuilder _builder;
+        // Arrange
+        var group = BuildMemberGroup();
 
-        [SetUp]
-        public void SetUp() => _builder = new MemberGroupBuilder();
+        // Act
+        var clone = (MemberGroup)group.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        // Assert
+        Assert.AreNotSame(clone, group);
+        Assert.AreEqual(clone, group);
+        Assert.AreEqual(clone.Id, group.Id);
+        Assert.AreEqual(clone.AdditionalData, group.AdditionalData);
+        Assert.AreEqual(clone.AdditionalData.Count, group.AdditionalData.Count);
+        Assert.AreEqual(clone.CreateDate, group.CreateDate);
+        Assert.AreEqual(clone.CreatorId, group.CreatorId);
+        Assert.AreEqual(clone.Key, group.Key);
+        Assert.AreEqual(clone.UpdateDate, group.UpdateDate);
+        Assert.AreEqual(clone.Name, group.Name);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            // Arrange
-            MemberGroup group = BuildMemberGroup();
-
-            // Act
-            var clone = (MemberGroup)group.DeepClone();
-
-            // Assert
-            Assert.AreNotSame(clone, group);
-            Assert.AreEqual(clone, group);
-            Assert.AreEqual(clone.Id, group.Id);
-            Assert.AreEqual(clone.AdditionalData, group.AdditionalData);
-            Assert.AreEqual(clone.AdditionalData.Count, group.AdditionalData.Count);
-            Assert.AreEqual(clone.CreateDate, group.CreateDate);
-            Assert.AreEqual(clone.CreatorId, group.CreatorId);
-            Assert.AreEqual(clone.Key, group.Key);
-            Assert.AreEqual(clone.UpdateDate, group.UpdateDate);
-            Assert.AreEqual(clone.Name, group.Name);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(group, null));
-            }
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(group, null));
         }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            MemberGroup group = BuildMemberGroup();
-
-            var json = JsonConvert.SerializeObject(group);
-            Debug.Print(json);
-        }
-
-        private MemberGroup BuildMemberGroup() =>
-            _builder
-                .WithId(6)
-                .WithKey(Guid.NewGuid())
-                .WithName("Test Group")
-                .WithCreatorId(4)
-                .WithCreateDate(DateTime.Now)
-                .WithUpdateDate(DateTime.Now)
-                .AddAdditionalData()
-                    .WithKeyValue("test1", 123)
-                    .WithKeyValue("test2", "hello")
-                    .Done()
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var group = BuildMemberGroup();
+
+        var json = JsonConvert.SerializeObject(group);
+        Debug.Print(json);
+    }
+
+    private MemberGroup BuildMemberGroup() =>
+        _builder
+            .WithId(6)
+            .WithKey(Guid.NewGuid())
+            .WithName("Test Group")
+            .WithCreatorId(4)
+            .WithCreateDate(DateTime.Now)
+            .WithUpdateDate(DateTime.Now)
+            .AddAdditionalData()
+            .WithKeyValue("test1", 123)
+            .WithKeyValue("test2", "hello")
+            .Done()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs
index 83dbe0a266..dd433df347 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/MemberTests.cs
@@ -3,138 +3,136 @@
 
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class MemberTests
 {
-    [TestFixture]
-    public class MemberTests
+    [SetUp]
+    public void SetUp() => _builder = new MemberBuilder();
+
+    private MemberBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private MemberBuilder _builder;
+        // Arrange
+        var member = BuildMember();
 
-        [SetUp]
-        public void SetUp() => _builder = new MemberBuilder();
+        // Act
+        var clone = (Member)member.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        // Assert
+        Assert.AreNotSame(clone, member);
+        Assert.AreEqual(clone, member);
+        Assert.AreEqual(clone.Id, member.Id);
+        Assert.AreEqual(clone.VersionId, member.VersionId);
+        Assert.AreEqual(clone.AdditionalData, member.AdditionalData);
+        Assert.AreEqual(clone.ContentType, member.ContentType);
+        Assert.AreEqual(clone.ContentTypeId, member.ContentTypeId);
+        Assert.AreEqual(clone.CreateDate, member.CreateDate);
+        Assert.AreEqual(clone.CreatorId, member.CreatorId);
+        Assert.AreEqual(clone.Comments, member.Comments);
+        Assert.AreEqual(clone.Key, member.Key);
+        Assert.AreEqual(clone.FailedPasswordAttempts, member.FailedPasswordAttempts);
+        Assert.AreEqual(clone.Level, member.Level);
+        Assert.AreEqual(clone.Path, member.Path);
+        Assert.AreEqual(clone.Groups, member.Groups);
+        Assert.AreEqual(clone.Groups.Count(), member.Groups.Count());
+        Assert.AreEqual(clone.IsApproved, member.IsApproved);
+        Assert.AreEqual(clone.IsLockedOut, member.IsLockedOut);
+        Assert.AreEqual(clone.SortOrder, member.SortOrder);
+        Assert.AreEqual(clone.LastLockoutDate, member.LastLockoutDate);
+        Assert.AreNotSame(clone.LastLoginDate, member.LastLoginDate);
+        Assert.AreEqual(clone.LastPasswordChangeDate, member.LastPasswordChangeDate);
+        Assert.AreEqual(clone.Trashed, member.Trashed);
+        Assert.AreEqual(clone.UpdateDate, member.UpdateDate);
+        Assert.AreEqual(clone.VersionId, member.VersionId);
+        Assert.AreEqual(clone.RawPasswordValue, member.RawPasswordValue);
+        Assert.AreNotSame(clone.Properties, member.Properties);
+        Assert.AreEqual(clone.Properties.Count(), member.Properties.Count());
+        for (var index = 0; index < member.Properties.Count; index++)
         {
-            // Arrange
-            Member member = BuildMember();
-
-            // Act
-            var clone = (Member)member.DeepClone();
-
-            // Assert
-            Assert.AreNotSame(clone, member);
-            Assert.AreEqual(clone, member);
-            Assert.AreEqual(clone.Id, member.Id);
-            Assert.AreEqual(clone.VersionId, member.VersionId);
-            Assert.AreEqual(clone.AdditionalData, member.AdditionalData);
-            Assert.AreEqual(clone.ContentType, member.ContentType);
-            Assert.AreEqual(clone.ContentTypeId, member.ContentTypeId);
-            Assert.AreEqual(clone.CreateDate, member.CreateDate);
-            Assert.AreEqual(clone.CreatorId, member.CreatorId);
-            Assert.AreEqual(clone.Comments, member.Comments);
-            Assert.AreEqual(clone.Key, member.Key);
-            Assert.AreEqual(clone.FailedPasswordAttempts, member.FailedPasswordAttempts);
-            Assert.AreEqual(clone.Level, member.Level);
-            Assert.AreEqual(clone.Path, member.Path);
-            Assert.AreEqual(clone.Groups, member.Groups);
-            Assert.AreEqual(clone.Groups.Count(), member.Groups.Count());
-            Assert.AreEqual(clone.IsApproved, member.IsApproved);
-            Assert.AreEqual(clone.IsLockedOut, member.IsLockedOut);
-            Assert.AreEqual(clone.SortOrder, member.SortOrder);
-            Assert.AreEqual(clone.LastLockoutDate, member.LastLockoutDate);
-            Assert.AreNotSame(clone.LastLoginDate, member.LastLoginDate);
-            Assert.AreEqual(clone.LastPasswordChangeDate, member.LastPasswordChangeDate);
-            Assert.AreEqual(clone.Trashed, member.Trashed);
-            Assert.AreEqual(clone.UpdateDate, member.UpdateDate);
-            Assert.AreEqual(clone.VersionId, member.VersionId);
-            Assert.AreEqual(clone.RawPasswordValue, member.RawPasswordValue);
-            Assert.AreNotSame(clone.Properties, member.Properties);
-            Assert.AreEqual(clone.Properties.Count(), member.Properties.Count());
-            for (var index = 0; index < member.Properties.Count; index++)
-            {
-                Assert.AreNotSame(clone.Properties[index], member.Properties[index]);
-                Assert.AreEqual(clone.Properties[index], member.Properties[index]);
-            }
-
-            // this can be the same, it is immutable
-            Assert.AreSame(clone.ContentType, member.ContentType);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(member, null));
-            }
+            Assert.AreNotSame(clone.Properties[index], member.Properties[index]);
+            Assert.AreEqual(clone.Properties[index], member.Properties[index]);
         }
 
-        [Test]
-        public void Can_Serialize_Without_Error()
+        // this can be the same, it is immutable
+        Assert.AreSame(clone.ContentType, member.ContentType);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            Member member = BuildMember();
-
-            var json = JsonConvert.SerializeObject(member);
-            Debug.Print(json);
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(member, null));
         }
-
-        private Member BuildMember() =>
-            _builder
-                .AddMemberType()
-                    .WithId(99)
-                    .WithAlias("memberType")
-                    .WithName("Member Type")
-                    .WithMembershipPropertyGroup()
-                    .AddPropertyGroup()
-                        .WithName("Content")
-                        .AddPropertyType()
-                            .WithAlias("title")
-                            .WithName("Title")
-                            .WithSortOrder(1)
-                            .Done()
-                        .AddPropertyType()
-                            .WithValueStorageType(ValueStorageType.Ntext)
-                            .WithAlias("bodyText")
-                            .WithName("Body text")
-                            .WithSortOrder(2)
-                            .WithDataTypeId(-87)
-                            .Done()
-                        .AddPropertyType()
-                            .WithAlias("author")
-                            .WithName("Author")
-                            .WithDescription("Name of the author")
-                            .WithSortOrder(3)
-                            .Done()
-                        .Done()
-                    .Done()
-                .WithId(10)
-                .WithName("Fred")
-                .WithLogin("fred", "raw pass")
-                .WithEmail("email@email.com")
-                .WithFailedPasswordAttempts(22)
-                .WithIsApproved(true)
-                .WithIsLockedOut(true)
-                .WithTrashed(false)
-                .AddMemberGroups()
-                    .WithValue("Group 1")
-                    .WithValue("Group 2")
-                    .Done()
-                .AddAdditionalData()
-                    .WithKeyValue("test1", 123)
-                    .WithKeyValue("test2", "hello")
-                    .Done()
-                .WithPropertyIdsIncrementingFrom(200)
-                .AddPropertyData()
-                    .WithKeyValue("title", "Name member")
-                    .WithKeyValue("bodyText", "This is a subpage")
-                    .WithKeyValue("author", "John Doe")
-                    .Done()
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var member = BuildMember();
+
+        var json = JsonConvert.SerializeObject(member);
+        Debug.Print(json);
+    }
+
+    private Member BuildMember() =>
+        _builder
+            .AddMemberType()
+            .WithId(99)
+            .WithAlias("memberType")
+            .WithName("Member Type")
+            .WithMembershipPropertyGroup()
+            .AddPropertyGroup()
+            .WithName("Content")
+            .AddPropertyType()
+            .WithAlias("title")
+            .WithName("Title")
+            .WithSortOrder(1)
+            .Done()
+            .AddPropertyType()
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias("bodyText")
+            .WithName("Body text")
+            .WithSortOrder(2)
+            .WithDataTypeId(-87)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("author")
+            .WithName("Author")
+            .WithDescription("Name of the author")
+            .WithSortOrder(3)
+            .Done()
+            .Done()
+            .Done()
+            .WithId(10)
+            .WithName("Fred")
+            .WithLogin("fred", "raw pass")
+            .WithEmail("email@email.com")
+            .WithFailedPasswordAttempts(22)
+            .WithIsApproved(true)
+            .WithIsLockedOut(true)
+            .WithTrashed(false)
+            .AddMemberGroups()
+            .WithValue("Group 1")
+            .WithValue("Group 2")
+            .Done()
+            .AddAdditionalData()
+            .WithKeyValue("test1", 123)
+            .WithKeyValue("test2", "hello")
+            .Done()
+            .WithPropertyIdsIncrementingFrom(200)
+            .AddPropertyData()
+            .WithKeyValue("title", "Name member")
+            .WithKeyValue("bodyText", "This is a subpage")
+            .WithKeyValue("author", "John Doe")
+            .Done()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs
index 80a3391787..6d114d1ab7 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyGroupTests.cs
@@ -2,82 +2,80 @@
 // See LICENSE for more details.
 
 using System.Diagnostics;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class PropertyGroupTests
 {
-    [TestFixture]
-    public class PropertyGroupTests
+    [SetUp]
+    public void SetUp() => _builder = new PropertyGroupBuilder();
+
+    private PropertyGroupBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private PropertyGroupBuilder _builder;
+        var pg = BuildPropertyGroup();
 
-        [SetUp]
-        public void SetUp() => _builder = new PropertyGroupBuilder();
+        var clone = (PropertyGroup)pg.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, pg);
+        Assert.AreEqual(clone, pg);
+        Assert.AreEqual(clone.Id, pg.Id);
+        Assert.AreEqual(clone.CreateDate, pg.CreateDate);
+        Assert.AreEqual(clone.Key, pg.Key);
+        Assert.AreEqual(clone.Name, pg.Name);
+        Assert.AreEqual(clone.SortOrder, pg.SortOrder);
+        Assert.AreEqual(clone.UpdateDate, pg.UpdateDate);
+        Assert.AreNotSame(clone.PropertyTypes, pg.PropertyTypes);
+        Assert.AreEqual(clone.PropertyTypes, pg.PropertyTypes);
+        Assert.AreEqual(clone.PropertyTypes.Count, pg.PropertyTypes.Count);
+        for (var i = 0; i < pg.PropertyTypes.Count; i++)
         {
-            PropertyGroup pg = BuildPropertyGroup();
-
-            var clone = (PropertyGroup)pg.DeepClone();
-
-            Assert.AreNotSame(clone, pg);
-            Assert.AreEqual(clone, pg);
-            Assert.AreEqual(clone.Id, pg.Id);
-            Assert.AreEqual(clone.CreateDate, pg.CreateDate);
-            Assert.AreEqual(clone.Key, pg.Key);
-            Assert.AreEqual(clone.Name, pg.Name);
-            Assert.AreEqual(clone.SortOrder, pg.SortOrder);
-            Assert.AreEqual(clone.UpdateDate, pg.UpdateDate);
-            Assert.AreNotSame(clone.PropertyTypes, pg.PropertyTypes);
-            Assert.AreEqual(clone.PropertyTypes, pg.PropertyTypes);
-            Assert.AreEqual(clone.PropertyTypes.Count, pg.PropertyTypes.Count);
-            for (var i = 0; i < pg.PropertyTypes.Count; i++)
-            {
-                Assert.AreNotSame(clone.PropertyTypes[i], pg.PropertyTypes[i]);
-                Assert.AreEqual(clone.PropertyTypes[i], pg.PropertyTypes[i]);
-            }
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(pg, null));
-            }
+            Assert.AreNotSame(clone.PropertyTypes[i], pg.PropertyTypes[i]);
+            Assert.AreEqual(clone.PropertyTypes[i], pg.PropertyTypes[i]);
         }
 
-        [Test]
-        public void Can_Serialize_Without_Error()
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            PropertyGroup pg = BuildPropertyGroup();
-
-            var json = JsonConvert.SerializeObject(pg);
-            Debug.Print(json);
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(pg, null));
         }
-
-        private PropertyGroup BuildPropertyGroup() =>
-            _builder
-                .WithId(77)
-                .WithName("Group1")
-                .AddPropertyType()
-                    .WithId(3)
-                    .WithAlias("test")
-                    .WithName("Test")
-                    .WithDescription("testing")
-                    .WithPropertyGroupId(11)
-                    .WithMandatory(true)
-                    .WithValidationRegExp("xxxx")
-                    .Done()
-                .AddPropertyType()
-                    .WithId(4)
-                    .WithAlias("test2")
-                    .WithName("Test2")
-                    .Done()
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var pg = BuildPropertyGroup();
+
+        var json = JsonConvert.SerializeObject(pg);
+        Debug.Print(json);
+    }
+
+    private PropertyGroup BuildPropertyGroup() =>
+        _builder
+            .WithId(77)
+            .WithName("Group1")
+            .AddPropertyType()
+            .WithId(3)
+            .WithAlias("test")
+            .WithName("Test")
+            .WithDescription("testing")
+            .WithPropertyGroupId(11)
+            .WithMandatory(true)
+            .WithValidationRegExp("xxxx")
+            .Done()
+            .AddPropertyType()
+            .WithId(4)
+            .WithAlias("test2")
+            .WithName("Test2")
+            .Done()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs
index d9cfe3e0d5..c57eb5dfc9 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTests.cs
@@ -2,63 +2,61 @@
 // See LICENSE for more details.
 
 using System.Linq;
-using System.Reflection;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class PropertyTests
 {
-    [TestFixture]
-    public class PropertyTests
+    [SetUp]
+    public void SetUp() => _builder = new PropertyBuilder();
+
+    private PropertyBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private PropertyBuilder _builder;
+        var property = BuildProperty();
 
-        [SetUp]
-        public void SetUp() => _builder = new PropertyBuilder();
+        property.SetValue("hello");
+        property.PublishValues();
 
-        [Test]
-        public void Can_Deep_Clone()
+        var clone = (Property)property.DeepClone();
+
+        Assert.AreNotSame(clone, property);
+        Assert.AreNotSame(clone.Values, property.Values);
+        Assert.AreNotSame(property.PropertyType, clone.PropertyType);
+        for (var i = 0; i < property.Values.Count; i++)
         {
-            IProperty property = BuildProperty();
-
-            property.SetValue("hello");
-            property.PublishValues();
-
-            var clone = (Property)property.DeepClone();
-
-            Assert.AreNotSame(clone, property);
-            Assert.AreNotSame(clone.Values, property.Values);
-            Assert.AreNotSame(property.PropertyType, clone.PropertyType);
-            for (var i = 0; i < property.Values.Count; i++)
-            {
-                Assert.AreNotSame(property.Values.ElementAt(i), clone.Values.ElementAt(i));
-            }
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(property, null));
-            }
+            Assert.AreNotSame(property.Values.ElementAt(i), clone.Values.ElementAt(i));
         }
 
-        private IProperty BuildProperty() =>
-            _builder
-                .WithId(4)
-                .AddPropertyType()
-                    .WithId(3)
-                    .WithPropertyEditorAlias("TestPropertyEditor")
-                    .WithAlias("test")
-                    .WithName("Test")
-                    .WithSortOrder(9)
-                    .WithDataTypeId(5)
-                    .WithDescription("testing")
-                    .WithPropertyGroupId(11)
-                    .WithMandatory(true)
-                    .WithValidationRegExp("xxxx")
-                    .Done()
-                .Build();
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
+        {
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(property, null));
+        }
     }
+
+    private IProperty BuildProperty() =>
+        _builder
+            .WithId(4)
+            .AddPropertyType()
+            .WithId(3)
+            .WithPropertyEditorAlias("TestPropertyEditor")
+            .WithAlias("test")
+            .WithName("Test")
+            .WithSortOrder(9)
+            .WithDataTypeId(5)
+            .WithDescription("testing")
+            .WithPropertyGroupId(11)
+            .WithMandatory(true)
+            .WithValidationRegExp("xxxx")
+            .Done()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs
index b5127715ff..148821175d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/PropertyTypeTests.cs
@@ -11,77 +11,76 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class PropertyTypeTests
 {
-    [TestFixture]
-    public class PropertyTypeTests
+    [SetUp]
+    public void SetUp() => _builder = new PropertyTypeBuilder();
+
+    private PropertyTypeBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private PropertyTypeBuilder _builder;
+        var pt = BuildPropertyType();
 
-        [SetUp]
-        public void SetUp() => _builder = new PropertyTypeBuilder();
+        var clone = (PropertyType)pt.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, pt);
+        Assert.AreEqual(clone, pt);
+        Assert.AreEqual(clone.Id, pt.Id);
+        Assert.AreEqual(clone.Alias, pt.Alias);
+        Assert.AreEqual(clone.CreateDate, pt.CreateDate);
+        Assert.AreEqual(clone.DataTypeId, pt.DataTypeId);
+        Assert.AreEqual(clone.DataTypeId, pt.DataTypeId);
+        Assert.AreEqual(clone.Description, pt.Description);
+        Assert.AreEqual(clone.Key, pt.Key);
+        Assert.AreEqual(clone.Mandatory, pt.Mandatory);
+        Assert.AreEqual(clone.Name, pt.Name);
+        Assert.AreEqual(clone.PropertyGroupId.Value, pt.PropertyGroupId.Value);
+        Assert.AreEqual(clone.SortOrder, pt.SortOrder);
+        Assert.AreEqual(clone.UpdateDate, pt.UpdateDate);
+        Assert.AreEqual(clone.ValidationRegExp, pt.ValidationRegExp);
+        Assert.AreEqual(clone.ValueStorageType, pt.ValueStorageType);
+
+        // This double verifies by reflection (don't test properties marked with [DoNotClone]
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps.Where(p => p.GetCustomAttribute<DoNotCloneAttribute>(false) == null))
         {
-            PropertyType pt = BuildPropertyType();
-
-            var clone = (PropertyType)pt.DeepClone();
-
-            Assert.AreNotSame(clone, pt);
-            Assert.AreEqual(clone, pt);
-            Assert.AreEqual(clone.Id, pt.Id);
-            Assert.AreEqual(clone.Alias, pt.Alias);
-            Assert.AreEqual(clone.CreateDate, pt.CreateDate);
-            Assert.AreEqual(clone.DataTypeId, pt.DataTypeId);
-            Assert.AreEqual(clone.DataTypeId, pt.DataTypeId);
-            Assert.AreEqual(clone.Description, pt.Description);
-            Assert.AreEqual(clone.Key, pt.Key);
-            Assert.AreEqual(clone.Mandatory, pt.Mandatory);
-            Assert.AreEqual(clone.Name, pt.Name);
-            Assert.AreEqual(clone.PropertyGroupId.Value, pt.PropertyGroupId.Value);
-            Assert.AreEqual(clone.SortOrder, pt.SortOrder);
-            Assert.AreEqual(clone.UpdateDate, pt.UpdateDate);
-            Assert.AreEqual(clone.ValidationRegExp, pt.ValidationRegExp);
-            Assert.AreEqual(clone.ValueStorageType, pt.ValueStorageType);
-
-            // This double verifies by reflection (don't test properties marked with [DoNotClone]
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps.Where(p => p.GetCustomAttribute<DoNotCloneAttribute>(false) == null))
+            var expected = propertyInfo.GetValue(pt, null);
+            var actual = propertyInfo.GetValue(clone, null);
+            if (propertyInfo.PropertyType == typeof(Lazy<int>))
             {
-                var expected = propertyInfo.GetValue(pt, null);
-                var actual = propertyInfo.GetValue(clone, null);
-                if (propertyInfo.PropertyType == typeof(Lazy<int>))
-                {
-                    expected = ((Lazy<int>)expected).Value;
-                    actual = ((Lazy<int>)actual).Value;
-                }
-
-                Assert.AreEqual(expected, actual, $"Value of propery: '{propertyInfo.Name}': {expected} != {actual}");
+                expected = ((Lazy<int>)expected).Value;
+                actual = ((Lazy<int>)actual).Value;
             }
+
+            Assert.AreEqual(expected, actual, $"Value of propery: '{propertyInfo.Name}': {expected} != {actual}");
         }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            PropertyType pt = BuildPropertyType();
-
-            var json = JsonConvert.SerializeObject(pt);
-            Debug.Print(json);
-        }
-
-        private PropertyType BuildPropertyType() =>
-            _builder
-                .WithId(3)
-                .WithPropertyEditorAlias("TestPropertyEditor")
-                .WithAlias("test")
-                .WithName("Test")
-                .WithSortOrder(9)
-                .WithDataTypeId(5)
-                .WithDescription("testing")
-                .WithPropertyGroupId(11)
-                .WithMandatory(true)
-                .WithValidationRegExp("xxxx")
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var pt = BuildPropertyType();
+
+        var json = JsonConvert.SerializeObject(pt);
+        Debug.Print(json);
+    }
+
+    private PropertyType BuildPropertyType() =>
+        _builder
+            .WithId(3)
+            .WithPropertyEditorAlias("TestPropertyEditor")
+            .WithAlias("test")
+            .WithName("Test")
+            .WithSortOrder(9)
+            .WithDataTypeId(5)
+            .WithDescription("testing")
+            .WithPropertyGroupId(11)
+            .WithMandatory(true)
+            .WithValidationRegExp("xxxx")
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs
index c76f8dc7e5..b510f6e0da 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RangeTests.cs
@@ -1,179 +1,110 @@
-using System.Globalization;
+using System.Globalization;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class RangeTests
 {
-    [TestFixture]
-    public class RangeTests
-    {
-        [TestCase(0, 0, "0,0")]
-        [TestCase(0, 1, "0,1")]
-        [TestCase(1, 1, "1,1")]
-        public void RangeInt32_ToString(int minimum, int maximum, string expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.ToString());
-        }
+    [TestCase(0, 0, "0,0")]
+    [TestCase(0, 1, "0,1")]
+    [TestCase(1, 1, "1,1")]
+    public void RangeInt32_ToString(int minimum, int maximum, string expected) =>
+        Assert.AreEqual(expected, new Range<int> { Minimum = minimum, Maximum = maximum }.ToString());
 
-        [TestCase(0, 0.5, "0,0.5")]
-        [TestCase(0.5, 0.5, "0.5,0.5")]
-        [TestCase(0.5, 1, "0.5,1")]
-        public void RangeDouble_ToString(double minimum, double maximum, string expected)
-        {
-            Assert.AreEqual(expected, new Range<double>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.ToString());
-        }
+    [TestCase(0, 0.5, "0,0.5")]
+    [TestCase(0.5, 0.5, "0.5,0.5")]
+    [TestCase(0.5, 1, "0.5,1")]
+    public void RangeDouble_ToString(double minimum, double maximum, string expected) =>
+        Assert.AreEqual(expected, new Range<double> { Minimum = minimum, Maximum = maximum }.ToString());
 
-        [TestCase(0, 0, "0")]
-        [TestCase(0, 1, "0,1")]
-        [TestCase(1, 1, "1")]
-        public void RangeInt32_ToStringFormatRange(int minimum, int maximum, string expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.ToString("{0}", "{0},{1}", CultureInfo.InvariantCulture));
-        }
+    [TestCase(0, 0, "0")]
+    [TestCase(0, 1, "0,1")]
+    [TestCase(1, 1, "1")]
+    public void RangeInt32_ToStringFormatRange(int minimum, int maximum, string expected) =>
+        Assert.AreEqual(expected, new Range<int> { Minimum = minimum, Maximum = maximum }.ToString("{0}", "{0},{1}", CultureInfo.InvariantCulture));
 
-        [TestCase(0, 0.5, "0,0.5")]
-        [TestCase(0.5, 0.5, "0.5")]
-        [TestCase(0.5, 1, "0.5,1")]
-        public void RangeDouble_ToStringFormatRange(double minimum, double maximum, string expected)
-        {
-            Assert.AreEqual(expected, new Range<double>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.ToString("{0}", "{0},{1}", CultureInfo.InvariantCulture));
-        }
+    [TestCase(0, 0.5, "0,0.5")]
+    [TestCase(0.5, 0.5, "0.5")]
+    [TestCase(0.5, 1, "0.5,1")]
+    public void RangeDouble_ToStringFormatRange(double minimum, double maximum, string expected) =>
+        Assert.AreEqual(expected, new Range<double> { Minimum = minimum, Maximum = maximum }.ToString("{0}", "{0},{1}", CultureInfo.InvariantCulture));
 
-        [TestCase(0, 0, "0,0")]
-        [TestCase(0, 1, "0,1")]
-        [TestCase(1, 1, "1,1")]
-        public void RangeInt32_ToStringFormat(int minimum, int maximum, string expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.ToString("{0},{1}", CultureInfo.InvariantCulture));
-        }
+    [TestCase(0, 0, "0,0")]
+    [TestCase(0, 1, "0,1")]
+    [TestCase(1, 1, "1,1")]
+    public void RangeInt32_ToStringFormat(int minimum, int maximum, string expected) =>
+        Assert.AreEqual(expected, new Range<int> { Minimum = minimum, Maximum = maximum }.ToString("{0},{1}", CultureInfo.InvariantCulture));
 
-        [TestCase(0, 0.5, "0,0.5")]
-        [TestCase(0.5, 0.5, "0.5,0.5")]
-        [TestCase(0.5, 1, "0.5,1")]
-        public void RangeDouble_ToStringFormat(double minimum, double maximum, string expected)
-        {
-            Assert.AreEqual(expected, new Range<double>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.ToString("{0},{1}", CultureInfo.InvariantCulture));
-        }
+    [TestCase(0, 0.5, "0,0.5")]
+    [TestCase(0.5, 0.5, "0.5,0.5")]
+    [TestCase(0.5, 1, "0.5,1")]
+    public void RangeDouble_ToStringFormat(double minimum, double maximum, string expected) =>
+        Assert.AreEqual(expected, new Range<double> { Minimum = minimum, Maximum = maximum }.ToString("{0},{1}", CultureInfo.InvariantCulture));
 
-        [TestCase(0, 0, true)]
-        [TestCase(0, 1, true)]
-        [TestCase(-1, 1, true)]
-        [TestCase(1, 0, false)]
-        [TestCase(0, -1, false)]
-        public void RangeInt32_IsValid(int minimum, int maximum, bool expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.IsValid());
-        }
+    [TestCase(0, 0, true)]
+    [TestCase(0, 1, true)]
+    [TestCase(-1, 1, true)]
+    [TestCase(1, 0, false)]
+    [TestCase(0, -1, false)]
+    public void RangeInt32_IsValid(int minimum, int maximum, bool expected) =>
+        Assert.AreEqual(expected, new Range<int> { Minimum = minimum, Maximum = maximum }.IsValid());
 
-        [TestCase(0, 0, 0, true)]
-        [TestCase(0, 1, 0, true)]
-        [TestCase(0, 1, 1, true)]
-        [TestCase(-1, 1, 0, true)]
-        [TestCase(0, 0, 1, false)]
-        [TestCase(0, 0, -1, false)]
-        public void RangeInt32_ContainsValue(int minimum, int maximum, int value, bool expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum,
-                Maximum = maximum
-            }.ContainsValue(value));
-        }
+    [TestCase(0, 0, 0, true)]
+    [TestCase(0, 1, 0, true)]
+    [TestCase(0, 1, 1, true)]
+    [TestCase(-1, 1, 0, true)]
+    [TestCase(0, 0, 1, false)]
+    [TestCase(0, 0, -1, false)]
+    public void RangeInt32_ContainsValue(int minimum, int maximum, int value, bool expected) =>
+        Assert.AreEqual(expected, new Range<int> { Minimum = minimum, Maximum = maximum }.ContainsValue(value));
 
-        [TestCase(0, 0, 0, 0, true)]
-        [TestCase(0, 1, 0, 1, true)]
-        [TestCase(0, 1, 1, 1, false)]
-        [TestCase(-1, 1, 0, 0, false)]
-        [TestCase(0, 0, 1, 1, false)]
-        [TestCase(0, 0, -1, 1, true)]
-        public void RangeInt32_IsInsideRange(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum1,
-                Maximum = maximum1
-            }.IsInsideRange(new Range<int>()
+    [TestCase(0, 0, 0, 0, true)]
+    [TestCase(0, 1, 0, 1, true)]
+    [TestCase(0, 1, 1, 1, false)]
+    [TestCase(-1, 1, 0, 0, false)]
+    [TestCase(0, 0, 1, 1, false)]
+    [TestCase(0, 0, -1, 1, true)]
+    public void RangeInt32_IsInsideRange(int minimum1, int maximum1, int minimum2, int maximum2, bool expected) =>
+        Assert.AreEqual(expected, new Range<int> { Minimum = minimum1, Maximum = maximum1 }.IsInsideRange(new Range<int>
             {
                 Minimum = minimum2,
-                Maximum = maximum2
+                Maximum = maximum2,
             }));
-        }
 
-        [TestCase(0, 0, 0, 0, true)]
-        [TestCase(0, 1, 0, 1, true)]
-        [TestCase(0, 1, 1, 1, true)]
-        [TestCase(-1, 1, 0, 0, true)]
-        [TestCase(0, 0, 1, 1, false)]
-        [TestCase(0, 0, -1, 1, false)]
-        public void RangeInt32_ContainsRange(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum1,
-                Maximum = maximum1
-            }.ContainsRange(new Range<int>()
+    [TestCase(0, 0, 0, 0, true)]
+    [TestCase(0, 1, 0, 1, true)]
+    [TestCase(0, 1, 1, 1, true)]
+    [TestCase(-1, 1, 0, 0, true)]
+    [TestCase(0, 0, 1, 1, false)]
+    [TestCase(0, 0, -1, 1, false)]
+    public void RangeInt32_ContainsRange(int minimum1, int maximum1, int minimum2, int maximum2, bool expected) =>
+        Assert.AreEqual(
+            expected,
+            new Range<int> { Minimum = minimum1, Maximum = maximum1 }.ContainsRange(new Range<int>
             {
                 Minimum = minimum2,
-                Maximum = maximum2
+                Maximum = maximum2,
             }));
-        }
 
-        [TestCase(0, 0, 0, 0, true)]
-        [TestCase(0, 1, 0, 1, true)]
-        [TestCase(0, 1, 1, 1, false)]
-        [TestCase(0, 0, 1, 1, false)]
-        public void RangeInt32_Equals(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum1,
-                Maximum = maximum1
-            }.Equals(new Range<int>()
+    [TestCase(0, 0, 0, 0, true)]
+    [TestCase(0, 1, 0, 1, true)]
+    [TestCase(0, 1, 1, 1, false)]
+    [TestCase(0, 0, 1, 1, false)]
+    public void RangeInt32_Equals(int minimum1, int maximum1, int minimum2, int maximum2, bool expected) =>
+        Assert.AreEqual(
+            expected,
+            new Range<int> { Minimum = minimum1, Maximum = maximum1 }.Equals(new Range<int>
             {
                 Minimum = minimum2,
-                Maximum = maximum2
+                Maximum = maximum2,
             }));
-        }
 
-        [TestCase(0, 0, 0, 0, true)]
-        [TestCase(0, 1, 0, 1, true)]
-        [TestCase(0, 1, 1, 1, false)]
-        [TestCase(0, 0, 1, 1, false)]
-        public void RangeInt32_EqualsValues(int minimum1, int maximum1, int minimum2, int maximum2, bool expected)
-        {
-            Assert.AreEqual(expected, new Range<int>()
-            {
-                Minimum = minimum1,
-                Maximum = maximum1
-            }.Equals(minimum2, maximum2));
-        }
-    }
+    [TestCase(0, 0, 0, 0, true)]
+    [TestCase(0, 1, 0, 1, true)]
+    [TestCase(0, 1, 1, 1, false)]
+    [TestCase(0, 0, 1, 1, false)]
+    public void RangeInt32_EqualsValues(int minimum1, int maximum1, int minimum2, int maximum2, bool expected) =>
+        Assert.AreEqual(expected, new Range<int> { Minimum = minimum1, Maximum = maximum1 }.Equals(minimum2, maximum2));
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs
index 81f1c4c49e..0b44273e37 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTests.cs
@@ -3,76 +3,74 @@
 
 using System;
 using System.Diagnostics;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class RelationTests
 {
-    [TestFixture]
-    public class RelationTests
+    [SetUp]
+    public void SetUp() => _builder = new RelationBuilder();
+
+    private RelationBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private RelationBuilder _builder;
+        var relation = BuildRelation();
 
-        [SetUp]
-        public void SetUp() => _builder = new RelationBuilder();
+        var clone = (Relation)relation.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, relation);
+        Assert.AreEqual(clone, relation);
+        Assert.AreEqual(clone.ChildId, relation.ChildId);
+        Assert.AreEqual(clone.Comment, relation.Comment);
+        Assert.AreEqual(clone.CreateDate, relation.CreateDate);
+        Assert.AreEqual(clone.Id, relation.Id);
+        Assert.AreEqual(clone.Key, relation.Key);
+        Assert.AreEqual(clone.ParentId, relation.ParentId);
+        Assert.AreNotSame(clone.RelationType, relation.RelationType);
+        Assert.AreEqual(clone.RelationType, relation.RelationType);
+        Assert.AreEqual(clone.RelationTypeId, relation.RelationTypeId);
+        Assert.AreEqual(clone.UpdateDate, relation.UpdateDate);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            Relation relation = BuildRelation();
-
-            var clone = (Relation)relation.DeepClone();
-
-            Assert.AreNotSame(clone, relation);
-            Assert.AreEqual(clone, relation);
-            Assert.AreEqual(clone.ChildId, relation.ChildId);
-            Assert.AreEqual(clone.Comment, relation.Comment);
-            Assert.AreEqual(clone.CreateDate, relation.CreateDate);
-            Assert.AreEqual(clone.Id, relation.Id);
-            Assert.AreEqual(clone.Key, relation.Key);
-            Assert.AreEqual(clone.ParentId, relation.ParentId);
-            Assert.AreNotSame(clone.RelationType, relation.RelationType);
-            Assert.AreEqual(clone.RelationType, relation.RelationType);
-            Assert.AreEqual(clone.RelationTypeId, relation.RelationTypeId);
-            Assert.AreEqual(clone.UpdateDate, relation.UpdateDate);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(relation, null));
-            }
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(relation, null));
         }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            Relation relation = BuildRelation();
-
-            var json = JsonConvert.SerializeObject(relation);
-            Debug.Print(json);
-        }
-
-        private Relation BuildRelation() =>
-            _builder
-                .BetweenIds(9, 8)
-                .WithId(4)
-                .WithComment("test comment")
-                .WithCreateDate(DateTime.Now)
-                .WithUpdateDate(DateTime.Now)
-                .WithKey(Guid.NewGuid())
-                .AddRelationType()
-                    .WithId(66)
-                    .WithAlias("test")
-                    .WithName("Test")
-                    .WithIsBidirectional(false)
-                    .WithParentObjectType(Guid.NewGuid())
-                    .WithChildObjectType(Guid.NewGuid())
-                    .Done()
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var relation = BuildRelation();
+
+        var json = JsonConvert.SerializeObject(relation);
+        Debug.Print(json);
+    }
+
+    private Relation BuildRelation() =>
+        _builder
+            .BetweenIds(9, 8)
+            .WithId(4)
+            .WithComment("test comment")
+            .WithCreateDate(DateTime.Now)
+            .WithUpdateDate(DateTime.Now)
+            .WithKey(Guid.NewGuid())
+            .AddRelationType()
+            .WithId(66)
+            .WithAlias("test")
+            .WithName("Test")
+            .WithIsBidirectional(false)
+            .WithParentObjectType(Guid.NewGuid())
+            .WithChildObjectType(Guid.NewGuid())
+            .Done()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs
index 77195a9d49..f5f01cd2f9 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/RelationTypeTests.cs
@@ -2,60 +2,58 @@
 // See LICENSE for more details.
 
 using System;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class RelationTypeTests
 {
-    [TestFixture]
-    public class RelationTypeTests
+    [SetUp]
+    public void SetUp() => _builder = new RelationTypeBuilder();
+
+    private RelationTypeBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private RelationTypeBuilder _builder;
+        IRelationType item = _builder
+            .WithId(1)
+            .WithParentObjectType(Guid.NewGuid())
+            .WithChildObjectType(Guid.NewGuid())
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new RelationTypeBuilder();
+        var clone = (RelationType)item.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, item);
+        Assert.AreEqual(clone, item);
+        Assert.AreEqual(clone.Alias, item.Alias);
+        Assert.AreEqual(clone.ChildObjectType, item.ChildObjectType);
+        Assert.AreEqual(clone.ParentObjectType, item.ParentObjectType);
+        Assert.AreEqual(clone.IsBidirectional, item.IsBidirectional);
+        Assert.AreEqual(clone.Id, item.Id);
+        Assert.AreEqual(clone.Key, item.Key);
+        Assert.AreEqual(clone.Name, item.Name);
+        Assert.AreEqual(clone.CreateDate, item.CreateDate);
+        Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            IRelationType item = _builder
-                .WithId(1)
-                .WithParentObjectType(Guid.NewGuid())
-                .WithChildObjectType(Guid.NewGuid())
-                .Build();
-
-            var clone = (RelationType)item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-            Assert.AreEqual(clone.Alias, item.Alias);
-            Assert.AreEqual(clone.ChildObjectType, item.ChildObjectType);
-            Assert.AreEqual(clone.ParentObjectType, item.ParentObjectType);
-            Assert.AreEqual(clone.IsBidirectional, item.IsBidirectional);
-            Assert.AreEqual(clone.Id, item.Id);
-            Assert.AreEqual(clone.Key, item.Key);
-            Assert.AreEqual(clone.Name, item.Name);
-            Assert.AreEqual(clone.CreateDate, item.CreateDate);
-            Assert.AreEqual(clone.UpdateDate, item.UpdateDate);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            IRelationType item = _builder.Build();
-
-            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
         }
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        IRelationType item = _builder.Build();
+
+        Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs
index dc163ab39f..5987f2e087 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/StylesheetTests.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using Newtonsoft.Json;
@@ -10,129 +9,132 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class StylesheetTests
 {
-    [TestFixture]
-    public class StylesheetTests
+    [SetUp]
+    public void SetUp() => _builder = new StylesheetBuilder();
+
+    private StylesheetBuilder _builder;
+
+    [Test]
+    public void Can_Create_Stylesheet()
     {
-        private StylesheetBuilder _builder;
+        // Arrange
+        // Act
+        var stylesheet = _builder
+            .WithPath("/css/styles.css")
+            .WithContent(@"body { color:#000; } .bold {font-weight:bold;}")
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new StylesheetBuilder();
+        // Assert
+        Assert.That(stylesheet.Name, Is.EqualTo("styles.css"));
+        Assert.That(stylesheet.Alias, Is.EqualTo("styles"));
+    }
 
-        [Test]
-        public void Can_Create_Stylesheet()
-        {
-            // Arrange
-            // Act
-            Stylesheet stylesheet = _builder
-                .WithPath("/css/styles.css")
-                .WithContent(@"body { color:#000; } .bold {font-weight:bold;}")
-                .Build();
+    [Test]
+    public void Can_Add_Property()
+    {
+        // Arrange
+        var stylesheet = _builder
+            .WithPath("/css/styles.css")
+            .WithContent(@"body { color:#000; } .bold {font-weight:bold;}")
+            .Build();
 
-            // Assert
-            Assert.That(stylesheet.Name, Is.EqualTo("styles.css"));
-            Assert.That(stylesheet.Alias, Is.EqualTo("styles"));
-        }
+        // Act
+        stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-weight:bold; font-family:Arial;"));
 
-        [Test]
-        public void Can_Add_Property()
-        {
-            // Arrange
-            Stylesheet stylesheet = _builder
-                .WithPath("/css/styles.css")
-                .WithContent(@"body { color:#000; } .bold {font-weight:bold;}")
-                .Build();
+        // Assert
+        Assert.AreEqual(1, stylesheet.Properties.Count());
+        Assert.AreEqual("Test", stylesheet.Properties.Single().Name);
+        Assert.AreEqual("p", stylesheet.Properties.Single().Alias);
+        Assert.AreEqual("font-weight:bold;" + Environment.NewLine + "font-family:Arial;", stylesheet.Properties.Single().Value);
+    }
 
-            // Act
-            stylesheet.AddProperty(new StylesheetProperty("Test", "p", "font-weight:bold; font-family:Arial;"));
+    [Test]
+    public void Can_Remove_Property()
+    {
+        // Arrange
+        var stylesheet = _builder
+            .WithPath("/css/styles.css")
+            .WithContent(@"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}")
+            .Build();
+        Assert.AreEqual(1, stylesheet.Properties.Count());
 
-            // Assert
-            Assert.AreEqual(1, stylesheet.Properties.Count());
-            Assert.AreEqual("Test", stylesheet.Properties.Single().Name);
-            Assert.AreEqual("p", stylesheet.Properties.Single().Alias);
-            Assert.AreEqual("font-weight:bold;" + Environment.NewLine + "font-family:Arial;", stylesheet.Properties.Single().Value);
-        }
+        // Act
+        stylesheet.RemoveProperty("Hello");
 
-        [Test]
-        public void Can_Remove_Property()
-        {
-            // Arrange
-            Stylesheet stylesheet = _builder
-                .WithPath("/css/styles.css")
-                .WithContent(@"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}")
-                .Build();
-            Assert.AreEqual(1, stylesheet.Properties.Count());
+        // Assert
+        Assert.AreEqual(0, stylesheet.Properties.Count());
+        Assert.AreEqual(@"body { color:#000; }  .bold {font-weight:bold;}", stylesheet.Content);
+    }
 
-            // Act
-            stylesheet.RemoveProperty("Hello");
+    [Test]
+    public void Can_Update_Property()
+    {
+        // Arrange
+        var stylesheet = _builder
+            .WithPath("/css/styles.css")
+            .WithContent(@"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}")
+            .Build();
 
-            // Assert
-            Assert.AreEqual(0, stylesheet.Properties.Count());
-            Assert.AreEqual(@"body { color:#000; }  .bold {font-weight:bold;}", stylesheet.Content);
-        }
+        // Act
+        var prop = stylesheet.Properties.Single();
+        prop.Alias = "li";
+        prop.Value = "font-size:5em;";
 
-        [Test]
-        public void Can_Update_Property()
-        {
-            // Arrange
-            Stylesheet stylesheet = _builder
-                .WithPath("/css/styles.css")
-                .WithContent(@"body { color:#000; } /**umb_name:Hello*/p{font-size:2em;} .bold {font-weight:bold;}")
-                .Build();
+        // - re-get
+        prop = stylesheet.Properties.Single();
 
-            // Act
-            IStylesheetProperty prop = stylesheet.Properties.Single();
-            prop.Alias = "li";
-            prop.Value = "font-size:5em;";
+        // Assert
+        Assert.AreEqual("li", prop.Alias);
+        Assert.AreEqual("font-size:5em;", prop.Value);
+        Assert.AreEqual(
+            "body { color:#000; } /**umb_name:Hello*/" + Environment.NewLine + "li {" + Environment.NewLine +
+            "\tfont-size:5em;" + Environment.NewLine + "} .bold {font-weight:bold;}",
+            stylesheet.Content);
+    }
 
-            // - re-get
-            prop = stylesheet.Properties.Single();
+    [Test]
+    public void Can_Get_Properties_From_Css()
+    {
+        // Arrange
+        var stylesheet = _builder
+            .WithPath("/css/styles.css")
+            .WithContent(
+                @"body { color:#000; } .bold {font-weight:bold;} /**umb_name:Hello */ p { font-size: 1em; } /**umb_name:testing123*/ li:first-child {padding:0px;}")
+            .Build();
 
-            // Assert
-            Assert.AreEqual("li", prop.Alias);
-            Assert.AreEqual("font-size:5em;", prop.Value);
-            Assert.AreEqual("body { color:#000; } /**umb_name:Hello*/" + Environment.NewLine + "li {" + Environment.NewLine + "\tfont-size:5em;" + Environment.NewLine + "} .bold {font-weight:bold;}", stylesheet.Content);
-        }
+        // Act
+        var properties = stylesheet.Properties;
 
-        [Test]
-        public void Can_Get_Properties_From_Css()
-        {
-            // Arrange
-            Stylesheet stylesheet = _builder
-                .WithPath("/css/styles.css")
-                .WithContent(@"body { color:#000; } .bold {font-weight:bold;} /**umb_name:Hello */ p { font-size: 1em; } /**umb_name:testing123*/ li:first-child {padding:0px;}")
-                .Build();
+        // Assert
+        Assert.AreEqual(2, properties.Count());
+        Assert.AreEqual("Hello", properties.First().Name);
+        Assert.AreEqual("font-size: 1em;", properties.First().Value);
+        Assert.AreEqual("p", properties.First().Alias);
+        Assert.AreEqual("testing123", properties.Last().Name);
+        Assert.AreEqual("padding:0px;", properties.Last().Value);
+        Assert.AreEqual("li:first-child", properties.Last().Alias);
+    }
 
-            // Act
-            IEnumerable<IStylesheetProperty> properties = stylesheet.Properties;
-
-            // Assert
-            Assert.AreEqual(2, properties.Count());
-            Assert.AreEqual("Hello", properties.First().Name);
-            Assert.AreEqual("font-size: 1em;", properties.First().Value);
-            Assert.AreEqual("p", properties.First().Alias);
-            Assert.AreEqual("testing123", properties.Last().Name);
-            Assert.AreEqual("padding:0px;", properties.Last().Value);
-            Assert.AreEqual("li:first-child", properties.Last().Alias);
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            // Arrange
-            Stylesheet stylesheet = _builder
-                .WithPath("/css/styles.css")
-                .WithContent(@"@media screen and (min-width: 600px) and (min-width: 900px) {
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        // Arrange
+        var stylesheet = _builder
+            .WithPath("/css/styles.css")
+            .WithContent(@"@media screen and (min-width: 600px) and (min-width: 900px) {
                                     .class {
                                     background: #666;
                                     }
                                 }")
-                .Build();
+            .Build();
 
-            // Act
-            var json = JsonConvert.SerializeObject(stylesheet);
-            Debug.Print(json);
-        }
+        // Act
+        var json = JsonConvert.SerializeObject(stylesheet);
+        Debug.Print(json);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs
index a2d6f95f6c..b555d9d037 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/TemplateTests.cs
@@ -11,70 +11,69 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class TemplateTests
 {
-    [TestFixture]
-    public class TemplateTests
+    [SetUp]
+    public void SetUp() => _builder = new TemplateBuilder();
+
+    private TemplateBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private TemplateBuilder _builder;
+        var template = BuildTemplate();
 
-        [SetUp]
-        public void SetUp() => _builder = new TemplateBuilder();
+        var clone = (Template)template.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, template);
+        Assert.AreEqual(clone, template);
+        Assert.AreEqual(clone.Path, template.Path);
+        Assert.AreEqual(clone.IsMasterTemplate, template.IsMasterTemplate);
+        Assert.AreEqual(clone.CreateDate, template.CreateDate);
+        Assert.AreEqual(clone.Alias, template.Alias);
+        Assert.AreEqual(clone.Id, template.Id);
+        Assert.AreEqual(clone.Key, template.Key);
+        Assert.AreEqual(clone.MasterTemplateAlias, template.MasterTemplateAlias);
+        Assert.AreEqual(clone.MasterTemplateId.Value, ((Template)template).MasterTemplateId.Value);
+        Assert.AreEqual(clone.Name, template.Name);
+        Assert.AreEqual(clone.UpdateDate, template.UpdateDate);
+
+        // clone.Content should be null but getting it would lazy-load
+        var type = clone.GetType();
+        var contentField = type.BaseType.GetField("_content", BindingFlags.Instance | BindingFlags.NonPublic);
+        var value = contentField.GetValue(clone);
+        Assert.IsNull(value);
+
+        // this double verifies by reflection
+        // need to exclude content else it would lazy-load
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps.Where(x => x.Name != "Content"))
         {
-            ITemplate template = BuildTemplate();
-
-            var clone = (Template)template.DeepClone();
-
-            Assert.AreNotSame(clone, template);
-            Assert.AreEqual(clone, template);
-            Assert.AreEqual(clone.Path, template.Path);
-            Assert.AreEqual(clone.IsMasterTemplate, template.IsMasterTemplate);
-            Assert.AreEqual(clone.CreateDate, template.CreateDate);
-            Assert.AreEqual(clone.Alias, template.Alias);
-            Assert.AreEqual(clone.Id, template.Id);
-            Assert.AreEqual(clone.Key, template.Key);
-            Assert.AreEqual(clone.MasterTemplateAlias, template.MasterTemplateAlias);
-            Assert.AreEqual(clone.MasterTemplateId.Value, ((Template)template).MasterTemplateId.Value);
-            Assert.AreEqual(clone.Name, template.Name);
-            Assert.AreEqual(clone.UpdateDate, template.UpdateDate);
-
-            // clone.Content should be null but getting it would lazy-load
-            Type type = clone.GetType();
-            FieldInfo contentField = type.BaseType.GetField("_content", BindingFlags.Instance | BindingFlags.NonPublic);
-            var value = contentField.GetValue(clone);
-            Assert.IsNull(value);
-
-            // this double verifies by reflection
-            // need to exclude content else it would lazy-load
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps.Where(x => x.Name != "Content"))
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(template, null));
-            }
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(template, null));
         }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            ITemplate template = BuildTemplate();
-
-            var json = JsonConvert.SerializeObject(template);
-            Debug.Print(json);
-        }
-
-        private ITemplate BuildTemplate() =>
-            _builder
-                .WithId(3)
-                .WithAlias("test")
-                .WithName("Test")
-                .WithCreateDate(DateTime.Now)
-                .WithUpdateDate(DateTime.Now)
-                .WithKey(Guid.NewGuid())
-                .WithContent("blah")
-                .AsMasterTemplate("master", 88)
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var template = BuildTemplate();
+
+        var json = JsonConvert.SerializeObject(template);
+        Debug.Print(json);
+    }
+
+    private ITemplate BuildTemplate() =>
+        _builder
+            .WithId(3)
+            .WithAlias("test")
+            .WithName("Test")
+            .WithCreateDate(DateTime.Now)
+            .WithUpdateDate(DateTime.Now)
+            .WithKey(Guid.NewGuid())
+            .WithContent("blah")
+            .AsMasterTemplate("master", 88)
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
index bb6267aebd..66c5867c98 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserExtensionsTests.cs
@@ -12,111 +12,107 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
-using User = Umbraco.Cms.Core.Models.Membership.User;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class UserExtensionsTests
 {
-    [TestFixture]
-    public class UserExtensionsTests
+    [SetUp]
+    public void SetUp() => _userBuilder = new UserBuilder();
+
+    private UserBuilder _userBuilder;
+
+    [TestCase(-1, "-1", "-1,1,2,3,4,5", true)] // below root start node
+    [TestCase(2, "-1,1,2", "-1,1,2,3,4,5", true)] // below start node
+    [TestCase(5, "-1,1,2,3,4,5", "-1,1,2,3,4,5", true)] // at start node
+    [TestCase(6, "-1,1,2,3,4,5,6", "-1,1,2,3,4,5", false)] // above start node
+    [TestCase(-1, "-1", "-1,-20,1,2,3,4,5", true)] // below root start node, bin
+    [TestCase(1, "-1,-20,1", "-1,-20,1,2,3,4,5", false)] // below bin start node
+    public void Determines_Path_Based_Access_To_Content(int startNodeId, string startNodePath, string contentPath, bool outcome)
     {
-        private UserBuilder _userBuilder;
+        var user = _userBuilder
+            .WithStartContentIds(new[] { startNodeId })
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _userBuilder = new UserBuilder();
+        var content = Mock.Of<IContent>(c => c.Path == contentPath && c.Id == 5);
 
-        [TestCase(-1, "-1", "-1,1,2,3,4,5", true)] // below root start node
-        [TestCase(2, "-1,1,2", "-1,1,2,3,4,5", true)] // below start node
-        [TestCase(5, "-1,1,2,3,4,5", "-1,1,2,3,4,5", true)] // at start node
+        var esmock = new Mock<IEntityService>();
+        esmock
+            .Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns<UmbracoObjectTypes, int[]>((type, ids) =>
+                new[] { new TreeEntityPath { Id = startNodeId, Path = startNodePath } });
 
-        [TestCase(6, "-1,1,2,3,4,5,6", "-1,1,2,3,4,5", false)] // above start node
+        Assert.AreEqual(outcome, user.HasPathAccess(content, esmock.Object, AppCaches.Disabled));
+    }
 
-        [TestCase(-1, "-1", "-1,-20,1,2,3,4,5", true)] // below root start node, bin
-        [TestCase(1, "-1,-20,1", "-1,-20,1,2,3,4,5", false)] // below bin start node
-
-        public void Determines_Path_Based_Access_To_Content(int startNodeId, string startNodePath, string contentPath, bool outcome)
+    [TestCase("", "1", "1")] // single user start, top level
+    [TestCase("", "4", "4")] // single user start, deeper level
+    [TestCase("", "2,3", "2,3")] // many user starts
+    [TestCase("", "2,3,4", "3,4")] // many user starts, de-duplicate to deepest
+    [TestCase("1", "", "1")] // single group start, top level
+    [TestCase("4", "", "4")] // single group start, deeper leve
+    [TestCase("2,3", "", "2,3")] // many group starts
+    [TestCase("2,3,4", "", "2,3")] // many group starts, de-duplicate to upmost
+    [TestCase("3", "2", "3,2")] // user and group start, combine
+    [TestCase("3", "2,5", "2,5")] // user and group start, restrict
+    [TestCase("3", "2,1", "2,1")] // user and group start, expand
+    [TestCase("3,8", "2,6", "3,2")] // exclude bin
+    [TestCase("", "6", "")] // exclude bin
+    [TestCase("1,-1", "1", "1")] // was an issue
+    [TestCase("-1,1", "1", "1")] // was an issue
+    [TestCase("-1", "", "-1")]
+    [TestCase("", "-1", "-1")]
+    public void CombineStartNodes(string groupSn, string userSn, string expected)
+    {
+        // 1
+        //  3
+        //   5
+        // 2
+        //  4
+        // bin
+        //  6
+        //  7
+        //   8
+        var paths = new Dictionary<int, string>
         {
-            User user = _userBuilder
-                .WithStartContentIds(new[] { startNodeId })
-                .Build();
+            { 1, "-1,1" },
+            { 2, "-1,2" },
+            { 3, "-1,1,3" },
+            { 4, "-1,2,4" },
+            { 5, "-1,1,3,5" },
+            { 6, "-1,-20,6" },
+            { 7, "-1,-20,7" },
+            { 8, "-1,-20,7,8" },
+        };
 
-            IContent content = Mock.Of<IContent>(c => c.Path == contentPath && c.Id == 5);
+        var esmock = new Mock<IEntityService>();
+        esmock
+            .Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns<UmbracoObjectTypes, int[]>((type, ids) =>
+                paths.Where(x => ids.Contains(x.Key)).Select(x => new TreeEntityPath { Id = x.Key, Path = x.Value }));
 
-            var esmock = new Mock<IEntityService>();
-            esmock
-                .Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns<UmbracoObjectTypes, int[]>((type, ids) => new[] { new TreeEntityPath { Id = startNodeId, Path = startNodePath } });
+        var comma = new[] { ',' };
 
-            Assert.AreEqual(outcome, user.HasPathAccess(content, esmock.Object, AppCaches.Disabled));
+        var groupSnA = groupSn.Split(comma, StringSplitOptions.RemoveEmptyEntries)
+            .Select(x => int.Parse(x, CultureInfo.InvariantCulture)).ToArray();
+        var userSnA = userSn.Split(comma, StringSplitOptions.RemoveEmptyEntries)
+            .Select(x => int.Parse(x, CultureInfo.InvariantCulture)).ToArray();
+        var combinedA = UserExtensions.CombineStartNodes(UmbracoObjectTypes.Document, groupSnA, userSnA, esmock.Object)
+            .OrderBy(x => x).ToArray();
+        var expectedA = expected.Split(comma, StringSplitOptions.RemoveEmptyEntries)
+            .Select(x => int.Parse(x, CultureInfo.InvariantCulture)).OrderBy(x => x).ToArray();
+
+        var ok = combinedA.Length == expectedA.Length;
+        if (ok)
+        {
+            ok = expectedA.Where((t, i) => t != combinedA[i]).Any() == false;
         }
 
-        [TestCase("", "1", "1")] // single user start, top level
-        [TestCase("", "4", "4")] // single user start, deeper level
-        [TestCase("", "2,3", "2,3")] // many user starts
-        [TestCase("", "2,3,4", "3,4")] // many user starts, de-duplicate to deepest
-
-        [TestCase("1", "", "1")] // single group start, top level
-        [TestCase("4", "", "4")] // single group start, deeper leve
-        [TestCase("2,3", "", "2,3")] // many group starts
-        [TestCase("2,3,4", "", "2,3")] // many group starts, de-duplicate to upmost
-
-        [TestCase("3", "2", "3,2")] // user and group start, combine
-        [TestCase("3", "2,5", "2,5")] // user and group start, restrict
-        [TestCase("3", "2,1", "2,1")] // user and group start, expand
-
-        [TestCase("3,8", "2,6", "3,2")] // exclude bin
-        [TestCase("", "6", "")] // exclude bin
-
-        [TestCase("1,-1", "1", "1")] // was an issue
-        [TestCase("-1,1", "1", "1")] // was an issue
-
-        [TestCase("-1", "", "-1")]
-        [TestCase("", "-1", "-1")]
-
-        public void CombineStartNodes(string groupSn, string userSn, string expected)
+        if (ok == false)
         {
-            // 1
-            //  3
-            //   5
-            // 2
-            //  4
-            // bin
-            //  6
-            //  7
-            //   8
-            var paths = new Dictionary<int, string>
-            {
-                { 1, "-1,1" },
-                { 2, "-1,2" },
-                { 3, "-1,1,3" },
-                { 4, "-1,2,4" },
-                { 5, "-1,1,3,5" },
-                { 6, "-1,-20,6" },
-                { 7, "-1,-20,7" },
-                { 8, "-1,-20,7,8" },
-            };
-
-            var esmock = new Mock<IEntityService>();
-            esmock
-                .Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns<UmbracoObjectTypes, int[]>((type, ids) => paths.Where(x => ids.Contains(x.Key)).Select(x => new TreeEntityPath { Id = x.Key, Path = x.Value }));
-
-            var comma = new[] { ',' };
-
-            var groupSnA = groupSn.Split(comma, StringSplitOptions.RemoveEmptyEntries).Select(x=>int.Parse(x, CultureInfo.InvariantCulture)).ToArray();
-            var userSnA = userSn.Split(comma, StringSplitOptions.RemoveEmptyEntries).Select(x=>int.Parse(x, CultureInfo.InvariantCulture)).ToArray();
-            var combinedA = UserExtensions.CombineStartNodes(UmbracoObjectTypes.Document, groupSnA, userSnA, esmock.Object).OrderBy(x => x).ToArray();
-            var expectedA = expected.Split(comma, StringSplitOptions.RemoveEmptyEntries).Select(x=>int.Parse(x, CultureInfo.InvariantCulture)).OrderBy(x => x).ToArray();
-
-            var ok = combinedA.Length == expectedA.Length;
-            if (ok)
-            {
-                ok = expectedA.Where((t, i) => t != combinedA[i]).Any() == false;
-            }
-
-            if (ok == false)
-            {
-                Assert.Fail("Expected \"" + string.Join(",", expectedA) + "\" but got \"" + string.Join(",", combinedA) + "\".");
-            }
+            Assert.Fail("Expected \"" + string.Join(",", expectedA) + "\" but got \"" + string.Join(",", combinedA) +
+                        "\".");
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs
index eccd20c182..bd4c0d8dc4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserGroupTests.cs
@@ -1,65 +1,59 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class UserGroupTests
 {
-    [TestFixture]
-    public class UserGroupTests
+    [SetUp]
+    public void SetUp() => _builder = new UserGroupBuilder();
+
+    private UserGroupBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private UserGroupBuilder _builder;
+        var item = Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new UserGroupBuilder();
+        var clone = (IUserGroup)item.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        var x = clone.Equals(item);
+        Assert.AreNotSame(clone, item);
+        Assert.AreEqual(clone, item);
+
+        Assert.AreEqual(clone.AllowedSections.Count(), item.AllowedSections.Count());
+        Assert.AreNotSame(clone.AllowedSections, item.AllowedSections);
+
+        // Verify normal properties with reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            IUserGroup item = Build();
-
-            var clone = (IUserGroup)item.DeepClone();
-
-            var x = clone.Equals(item);
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-
-            Assert.AreEqual(clone.AllowedSections.Count(), item.AllowedSections.Count());
-            Assert.AreNotSame(clone.AllowedSections, item.AllowedSections);
-
-            // Verify normal properties with reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
         }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            IUserGroup item = Build();
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-
-        private IUserGroup Build() =>
-            _builder
-                .WithId(3)
-                .WithAllowedSections(new List<string>(){"A", "B"})
-                .Build();
-
-
     }
 
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var item = Build();
 
+        var json = JsonConvert.SerializeObject(item);
+        Debug.Print(json);
+    }
+
+    private IUserGroup Build() =>
+        _builder
+            .WithId(3)
+            .WithAllowedSections(new List<string> { "A", "B" })
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs
index a0383bd2ca..8534ba6586 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/UserTests.cs
@@ -3,65 +3,63 @@
 
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class UserTests
 {
-    [TestFixture]
-    public class UserTests
+    [SetUp]
+    public void SetUp() => _builder = new UserBuilder();
+
+    private UserBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private UserBuilder _builder;
+        var item = BuildUser();
 
-        [SetUp]
-        public void SetUp() => _builder = new UserBuilder();
+        var clone = (User)item.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, item);
+        Assert.AreEqual(clone, item);
+
+        Assert.AreEqual(clone.AllowedSections.Count(), item.AllowedSections.Count());
+
+        // Verify normal properties with reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            User item = BuildUser();
-
-            var clone = (User)item.DeepClone();
-
-            Assert.AreNotSame(clone, item);
-            Assert.AreEqual(clone, item);
-
-            Assert.AreEqual(clone.AllowedSections.Count(), item.AllowedSections.Count());
-
-            // Verify normal properties with reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
-            }
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(item, null));
         }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            User item = BuildUser();
-
-            var json = JsonConvert.SerializeObject(item);
-            Debug.Print(json);
-        }
-
-        private User BuildUser() =>
-            _builder
-                .WithId(3)
-                .WithLogin("username", "test pass")
-                .WithName("Test")
-                .WithEmail("test@test.com")
-                .WithFailedPasswordAttempts(3)
-                .WithIsApproved(true)
-                .WithIsLockedOut(true)
-                .WithComments("comments")
-                .WithSessionTimeout(5)
-                .WithStartContentIds(new[] { 3 })
-                .WithStartMediaIds(new[] { 8 })
-                .Build();
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var item = BuildUser();
+
+        var json = JsonConvert.SerializeObject(item);
+        Debug.Print(json);
+    }
+
+    private User BuildUser() =>
+        _builder
+            .WithId(3)
+            .WithLogin("username", "test pass")
+            .WithName("Test")
+            .WithEmail("test@test.com")
+            .WithFailedPasswordAttempts(3)
+            .WithIsApproved(true)
+            .WithIsLockedOut(true)
+            .WithComments("comments")
+            .WithSessionTimeout(5)
+            .WithStartContentIds(new[] { 3 })
+            .WithStartMediaIds(new[] { 8 })
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs
index 026b0bfe16..7226895784 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Models/VariationTests.cs
@@ -2,18 +2,14 @@
 // See LICENSE for more details.
 
 using System;
-using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Tests.Common.Builders;
@@ -21,593 +17,602 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Models;
+
+[TestFixture]
+public class VariationTests
 {
-    [TestFixture]
-    public class VariationTests
+    [Test]
+    public void ValidateVariationTests()
     {
-        [Test]
-        public void ValidateVariationTests()
-        {
-            // All tests:
-            // 1. if exact is set to true: culture cannot be null when the ContentVariation.Culture flag is set
-            // 2. if wildcards is set to false: fail when "*" is passed in as either culture or segment.
-            // 3. ContentVariation flag is ignored when wildcards are used.
-            // 4. Empty string is considered the same as null
-            AssertForNovariation();
-            AssertForCultureVariation();
-            AssertForSegmentVariation();
-            AssertForCultureAndSegmentVariation();
-        }
-
-        private static void AssertForNovariation()
-        {
-            Assert4A(ContentVariation.Nothing, null, null, true);
-            Assert4A(ContentVariation.Nothing, null, string.Empty, true);
-            Assert4B(ContentVariation.Nothing, null, "*", true, false, false, true);
-            Assert4A(ContentVariation.Nothing, null, "segment", false);
-            Assert4A(ContentVariation.Nothing, string.Empty, null, true);
-            Assert4A(ContentVariation.Nothing, string.Empty, string.Empty, true);
-            Assert4B(ContentVariation.Nothing, string.Empty, "*", true, false, false, true);
-            Assert4A(ContentVariation.Nothing, string.Empty, "segment", false);
-            Assert4B(ContentVariation.Nothing, "*", null, true, false, false, true);
-            Assert4B(ContentVariation.Nothing, "*", string.Empty, true, false, false, true);
-            Assert4B(ContentVariation.Nothing, "*", "*", true, false, false, true);
-            Assert4A(ContentVariation.Nothing, "*", "segment", false);
-            Assert4A(ContentVariation.Nothing, "culture", null, false);
-            Assert4A(ContentVariation.Nothing, "culture", string.Empty, false);
-            Assert4A(ContentVariation.Nothing, "culture", "*", false);
-            Assert4A(ContentVariation.Nothing, "culture", "segment", false);
-        }
-
-        private static void AssertForCultureVariation()
-        {
-            Assert4B(ContentVariation.Culture, null, null, false, true, false, true);
-            Assert4B(ContentVariation.Culture, null, string.Empty, false, true, false, true);
-            Assert4B(ContentVariation.Culture, null, "*", false, false, false, true);
-            Assert4A(ContentVariation.Culture, null, "segment", false);
-            Assert4B(ContentVariation.Culture, string.Empty, null, false, true, false, true);
-            Assert4B(ContentVariation.Culture, string.Empty, string.Empty, false, true, false, true);
-            Assert4B(ContentVariation.Culture, string.Empty, "*", false, false, false, true);
-            Assert4A(ContentVariation.Culture, string.Empty, "segment", false);
-            Assert4B(ContentVariation.Culture, "*", null, true, false, false, true);
-            Assert4B(ContentVariation.Culture, "*", string.Empty, true, false, false, true);
-            Assert4B(ContentVariation.Culture, "*", "*", true, false, false, true);
-            Assert4A(ContentVariation.Culture, "*", "segment", false);
-            Assert4A(ContentVariation.Culture, "culture", null, true);
-            Assert4A(ContentVariation.Culture, "culture", string.Empty, true);
-            Assert4B(ContentVariation.Culture, "culture", "*", true, false, false, true);
-            Assert4A(ContentVariation.Culture, "culture", "segment", false);
-        }
-
-        private static void AssertForSegmentVariation()
-        {
-            Assert4B(ContentVariation.Segment, null, null, true, true, true, true);
-            Assert4B(ContentVariation.Segment, null, string.Empty, true, true, true, true);
-            Assert4B(ContentVariation.Segment, null, "*", true, false, false, true);
-            Assert4A(ContentVariation.Segment, null, "segment", true);
-            Assert4B(ContentVariation.Segment, string.Empty, null, true, true, true, true);
-            Assert4B(ContentVariation.Segment, string.Empty, string.Empty, true, true, true, true);
-            Assert4B(ContentVariation.Segment, string.Empty, "*", true, false, false, true);
-            Assert4A(ContentVariation.Segment, string.Empty, "segment", true);
-            Assert4B(ContentVariation.Segment, "*", null, true, false, false, true);
-            Assert4B(ContentVariation.Segment, "*", string.Empty, true, false, false, true);
-            Assert4B(ContentVariation.Segment, "*", "*", true, false, false, true);
-            Assert4B(ContentVariation.Segment, "*", "segment", true, false, false, true);
-            Assert4A(ContentVariation.Segment, "culture", null, false);
-            Assert4A(ContentVariation.Segment, "culture", string.Empty, false);
-            Assert4A(ContentVariation.Segment, "culture", "*", false);
-            Assert4A(ContentVariation.Segment, "culture", "segment", false);
-        }
-
-        private static void AssertForCultureAndSegmentVariation()
-        {
-            Assert4B(ContentVariation.CultureAndSegment, null, null, false, true, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, null, string.Empty, false, true, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, null, "*", false, false, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, null, "segment", false, true, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, string.Empty, null, false, true, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, string.Empty, string.Empty, false, true, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, string.Empty, "*", false, false, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, string.Empty, "segment", false, true, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, "*", null, true, false, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, "*", string.Empty, true, false, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, "*", "*", true, false, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, "*", "segment", true, false, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, "culture", null, true, true, true, true);
-            Assert4B(ContentVariation.CultureAndSegment, "culture", string.Empty, true, true, true, true);
-            Assert4B(ContentVariation.CultureAndSegment, "culture", "*", true, false, false, true);
-            Assert4B(ContentVariation.CultureAndSegment, "culture", "segment", true, true, true, true);
-        }
-
-        /// <summary>
-        /// Asserts the result of <see cref="ContentVariationExtensions.ValidateVariation"/>
-        /// </summary>
-        /// <param name="exactAndWildcards">Validate using Exact + Wildcards flags</param>
-        /// <param name="nonExactAndNoWildcards">Validate using non Exact + no Wildcard flags</param>
-        /// <param name="exactAndNoWildcards">Validate using Exact + no Wildcard flags</param>
-        /// <param name="nonExactAndWildcards">Validate using non Exact + Wildcard flags</param>
-        private static void Assert4B(
-            ContentVariation variation,
-            string culture,
-            string segment,
-            bool exactAndWildcards,
-            bool nonExactAndNoWildcards,
-            bool exactAndNoWildcards,
-            bool nonExactAndWildcards)
-        {
-            Assert.AreEqual(exactAndWildcards, variation.ValidateVariation(culture, segment, true, true, false));
-            Assert.AreEqual(nonExactAndNoWildcards, variation.ValidateVariation(culture, segment, false, false, false));
-            Assert.AreEqual(exactAndNoWildcards, variation.ValidateVariation(culture, segment, true, false, false));
-            Assert.AreEqual(nonExactAndWildcards, variation.ValidateVariation(culture, segment, false, true, false));
-        }
-
-        /// <summary>
-        /// Asserts the result of <see cref="ContentVariationExtensions.ValidateVariation(ContentVariation, string, string, bool, bool, bool)"/>
-        /// where expectedResult matches all combinations of Exact + Wildcard
-        /// </summary>
-        private static void Assert4A(ContentVariation variation, string culture, string segment, bool expectedResult) =>
-            Assert4B(variation, culture, segment, expectedResult, expectedResult, expectedResult, expectedResult);
-
-        [Test]
-        public void PropertyTests()
-        {
-            var propertyType = new PropertyType(TestHelper.ShortStringHelper, "editor", ValueStorageType.Nvarchar) { Alias = "prop" };
-            var prop = new Property(propertyType);
-
-            const string langFr = "fr-FR";
-
-            // can set value
-            // and get edited and published value
-            // because non-publishing
-            prop.SetValue("a");
-            Assert.AreEqual("a", prop.GetValue());
-            Assert.AreEqual("a", prop.GetValue(published: true));
-
-            // illegal, 'cos non-publishing
-            Assert.Throws<NotSupportedException>(() => prop.PublishValues());
-
-            // change
-            propertyType.SupportsPublishing = true;
-
-            // can get value
-            // and now published value is null
-            Assert.AreEqual("a", prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-
-            // cannot set non-supported variation value
-            Assert.Throws<NotSupportedException>(() => prop.SetValue("x", langFr));
-            Assert.IsNull(prop.GetValue(langFr));
-
-            // can publish value
-            // and get edited and published values
-            prop.PublishValues();
-            Assert.AreEqual("a", prop.GetValue());
-            Assert.AreEqual("a", prop.GetValue(published: true));
-
-            // can set value
-            // and get edited and published values
-            prop.SetValue("b");
-            Assert.AreEqual("b", prop.GetValue());
-            Assert.AreEqual("a", prop.GetValue(published: true));
-
-            // can clear value
-            prop.UnpublishValues();
-            Assert.AreEqual("b", prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-
-            // change - now we vary by culture
-            propertyType.Variations |= ContentVariation.Culture;
-
-            // can set value
-            // and get values
-            prop.SetValue("c", langFr);
-            Assert.IsNull(prop.GetValue()); // there is no invariant value anymore
-            Assert.IsNull(prop.GetValue(published: true));
-            Assert.AreEqual("c", prop.GetValue(langFr));
-            Assert.IsNull(prop.GetValue(langFr, published: true));
-
-            // can publish value
-            // and get edited and published values
-            prop.PublishValues(langFr);
-            Assert.IsNull(prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-            Assert.AreEqual("c", prop.GetValue(langFr));
-            Assert.AreEqual("c", prop.GetValue(langFr, published: true));
-
-            // can clear all
-            prop.UnpublishValues("*");
-            Assert.IsNull(prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-            Assert.AreEqual("c", prop.GetValue(langFr));
-            Assert.IsNull(prop.GetValue(langFr, published: true));
-
-            // can publish all
-            prop.PublishValues("*");
-            Assert.IsNull(prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-            Assert.AreEqual("c", prop.GetValue(langFr));
-            Assert.AreEqual("c", prop.GetValue(langFr, published: true));
-
-            // same for culture
-            prop.UnpublishValues(langFr);
-            Assert.AreEqual("c", prop.GetValue(langFr));
-            Assert.IsNull(prop.GetValue(langFr, published: true));
-            prop.PublishValues(langFr);
-            Assert.AreEqual("c", prop.GetValue(langFr));
-            Assert.AreEqual("c", prop.GetValue(langFr, published: true));
-
-            prop.UnpublishValues(); // does not throw, internal, content item throws
-            Assert.IsNull(prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-            prop.PublishValues(); // does not throw, internal, content item throws
-            Assert.IsNull(prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-        }
-
-        [Test]
-        public void ContentNames()
-        {
-            IContentType contentType = new ContentTypeBuilder()
-                .WithAlias("contentType")
-                .Build();
-            Content content = CreateContent(contentType);
-
-            const string langFr = "fr-FR";
-            const string langUk = "en-UK";
-
-            // throws if the content type does not support the variation
-            Assert.Throws<NotSupportedException>(() => content.SetCultureName("name-fr", langFr));
-
-            // now it will work
-            contentType.Variations = ContentVariation.Culture;
-
-            // recreate content to re-capture content type variations
-            content = CreateContent(contentType);
-
-            // invariant name works
-            content.Name = "name";
-            Assert.AreEqual("name", content.GetCultureName(null));
-            content.SetCultureName("name2", null);
-            Assert.AreEqual("name2", content.Name);
-            Assert.AreEqual("name2", content.GetCultureName(null));
-
-            // variant names work
-            content.SetCultureName("name-fr", langFr);
-            content.SetCultureName("name-uk", langUk);
-            Assert.AreEqual("name-fr", content.GetCultureName(langFr));
-            Assert.AreEqual("name-uk", content.GetCultureName(langUk));
-
-            // variant dictionary of names work
-            Assert.AreEqual(2, content.CultureInfos.Count);
-            Assert.IsTrue(content.CultureInfos.ContainsKey(langFr));
-            Assert.AreEqual("name-fr", content.CultureInfos[langFr].Name);
-            Assert.IsTrue(content.CultureInfos.ContainsKey(langUk));
-            Assert.AreEqual("name-uk", content.CultureInfos[langUk].Name);
-        }
-
-        [Test]
-        public void ContentPublishValues()
-        {
-            const string langFr = "fr-FR";
-
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("prop")
-                .Build();
-            IContentType contentType = new ContentTypeBuilder()
-                .WithAlias("contentType")
-                .Build();
-            contentType.AddPropertyType(propertyType);
-
-            Content content = CreateContent(contentType);
-
-            // can set value
-            // and get edited value, published is null
-            // because publishing
-            content.SetValue("prop", "a");
-            Assert.AreEqual("a", content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-
-            // cannot set non-supported variation value
-            Assert.Throws<NotSupportedException>(() => content.SetValue("prop", "x", langFr));
-            Assert.IsNull(content.GetValue("prop", langFr));
-
-            // can publish value
-            // and get edited and published values
-            Assert.IsTrue(content.PublishCulture(CultureImpact.All));
-            Assert.AreEqual("a", content.GetValue("prop"));
-            Assert.AreEqual("a", content.GetValue("prop", published: true));
-
-            // can set value
-            // and get edited and published values
-            content.SetValue("prop", "b");
-            Assert.AreEqual("b", content.GetValue("prop"));
-            Assert.AreEqual("a", content.GetValue("prop", published: true));
-
-            // can clear value
-            content.UnpublishCulture();
-            Assert.AreEqual("b", content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-
-            // change - now we vary by culture
-            contentType.Variations |= ContentVariation.Culture;
-            propertyType.Variations |= ContentVariation.Culture;
-            content.ChangeContentType(contentType);
-
-            // can set value
-            // and get values
-            content.SetValue("prop", "c", langFr);
-            Assert.IsNull(content.GetValue("prop")); // there is no invariant value anymore
-            Assert.IsNull(content.GetValue("prop", published: true));
-            Assert.AreEqual("c", content.GetValue("prop", langFr));
-            Assert.IsNull(content.GetValue("prop", langFr, published: true));
-
-            // can publish value
-            // and get edited and published values
-            Assert.IsFalse(content.PublishCulture(CultureImpact.Explicit(langFr, false))); // no name
-            content.SetCultureName("name-fr", langFr);
-            Assert.IsTrue(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
-            Assert.IsNull(content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-            Assert.AreEqual("c", content.GetValue("prop", langFr));
-            Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
-
-            // can clear all
-            content.UnpublishCulture("*");
-            Assert.IsNull(content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-            Assert.AreEqual("c", content.GetValue("prop", langFr));
-            Assert.IsNull(content.GetValue("prop", langFr, published: true));
-
-            // can publish all
-            Assert.IsTrue(content.PublishCulture(CultureImpact.All));
-            Assert.IsNull(content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-            Assert.AreEqual("c", content.GetValue("prop", langFr));
-            Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
-
-            // same for culture
-            content.UnpublishCulture(langFr);
-            Assert.AreEqual("c", content.GetValue("prop", langFr));
-            Assert.IsNull(content.GetValue("prop", langFr, published: true));
-            Assert.IsTrue(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
-            Assert.AreEqual("c", content.GetValue("prop", langFr));
-            Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
-
-            content.UnpublishCulture(); // clears invariant props if any
-            Assert.IsNull(content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-            Assert.IsTrue(content.PublishCulture(CultureImpact.All)); // publishes invariant props if any
-            Assert.IsNull(content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-
-            Content other = CreateContent(contentType, 2, "other");
-
-            Assert.Throws<NotSupportedException>(() => other.SetValue("prop", "o")); // don't even try
-            other.SetValue("prop", "o1", langFr);
-
-            // can copy other's edited value
-            content.CopyFrom(other);
-            Assert.IsNull(content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-            Assert.AreEqual("o1", content.GetValue("prop", langFr));
-            Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
-
-            // can copy self's published value
-            content.CopyFrom(content);
-            Assert.IsNull(content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-            Assert.AreEqual("c", content.GetValue("prop", langFr));
-            Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
-        }
-
-        [Test]
-        public void ContentPublishValuesWithMixedPropertyTypeVariations()
-        {
-            PropertyValidationService propertyValidationService = GetPropertyValidationService();
-            const string langFr = "fr-FR";
-
-            // content type varies by Culture
-            // prop1 varies by Culture
-            // prop2 is invariant
-            IContentType contentType = new ContentTypeBuilder()
-                .WithAlias("contentType")
-                .Build();
-            contentType.Variations |= ContentVariation.Culture;
-
-            PropertyType variantPropType = new PropertyTypeBuilder()
-                .WithAlias("prop1")
-                .WithVariations(ContentVariation.Culture)
-                .WithMandatory(true)
-                .Build();
-            PropertyType invariantPropType = new PropertyTypeBuilder()
-                .WithAlias("prop2")
-                .WithVariations(ContentVariation.Nothing)
-                .WithMandatory(true)
-                .Build();
-            contentType.AddPropertyType(variantPropType);
-            contentType.AddPropertyType(invariantPropType);
-
-            Content content = CreateContent(contentType);
-
-            content.SetCultureName("hello", langFr);
-
-            // for this test we'll make the french culture the default one - this is needed for publishing invariant property values
-            var langFrImpact = CultureImpact.Explicit(langFr, true);
-
-            Assert.IsTrue(content.PublishCulture(langFrImpact)); // succeeds because names are ok (not validating properties here)
-            Assert.IsFalse(propertyValidationService.IsPropertyDataValid(content, out _, langFrImpact)); // fails because prop1 is mandatory
-
-            content.SetValue("prop1", "a", langFr);
-            Assert.IsTrue(content.PublishCulture(langFrImpact)); // succeeds because names are ok (not validating properties here)
-
-            // Fails because prop2 is mandatory and invariant and the item isn't published.
-            // Invariant is validated against the default language except when there isn't a published version, in that case it's always validated.
-            Assert.IsFalse(propertyValidationService.IsPropertyDataValid(content, out _, langFrImpact));
-            content.SetValue("prop2", "x");
-            Assert.IsTrue(content.PublishCulture(langFrImpact)); // still ok...
-            Assert.IsTrue(propertyValidationService.IsPropertyDataValid(content, out _, langFrImpact)); // now it's ok
-
-            Assert.AreEqual("a", content.GetValue("prop1", langFr, published: true));
-            Assert.AreEqual("x", content.GetValue("prop2", published: true));
-        }
-
-        [Test]
-        public void ContentPublishVariations()
-        {
-            const string langFr = "fr-FR";
-            const string langUk = "en-UK";
-            const string langEs = "es-ES";
-
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("prop")
-                .Build();
-            IContentType contentType = new ContentTypeBuilder()
-                .WithAlias("contentType")
-                .Build();
-            contentType.AddPropertyType(propertyType);
-
-            Content content = CreateContent(contentType);
-
-            // change - now we vary by culture
-            contentType.Variations |= ContentVariation.Culture;
-            propertyType.Variations |= ContentVariation.Culture;
-
-            content.ChangeContentType(contentType);
-
-            Assert.Throws<NotSupportedException>(() => content.SetValue("prop", "a")); // invariant = no
-            content.SetValue("prop", "a-fr", langFr);
-            content.SetValue("prop", "a-uk", langUk);
-            content.SetValue("prop", "a-es", langEs);
-
-            // cannot publish without a name
-            Assert.IsFalse(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
-
-            // works with a name
-            // and then FR is available, and published
-            content.SetCultureName("name-fr", langFr);
-            Assert.IsTrue(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
-
-            // now UK is available too
-            content.SetCultureName("name-uk", langUk);
-
-            // test available, published
-            Assert.IsTrue(content.IsCultureAvailable(langFr));
-            Assert.IsTrue(content.IsCulturePublished(langFr));
-            Assert.AreEqual("name-fr", content.GetPublishName(langFr));
-            Assert.AreNotEqual(DateTime.MinValue, content.GetPublishDate(langFr));
-            Assert.IsFalse(content.IsCultureEdited(langFr)); // once published, edited is *wrong* until saved
-
-            Assert.IsTrue(content.IsCultureAvailable(langUk));
-            Assert.IsFalse(content.IsCulturePublished(langUk));
-            Assert.IsNull(content.GetPublishName(langUk));
-            Assert.IsNull(content.GetPublishDate(langUk)); // not published
-
-            Assert.IsFalse(content.IsCultureAvailable(langEs));
-            Assert.IsFalse(content.IsCultureEdited(langEs)); // not avail, so... not edited
-            Assert.IsFalse(content.IsCulturePublished(langEs));
-
-            // not published!
-            Assert.IsNull(content.GetPublishName(langEs));
-            Assert.IsNull(content.GetPublishDate(langEs));
-
-            // cannot test IsCultureEdited here - as that requires the content service and repository
-            // see: ContentServiceTests.Can_SaveRead_Variations
-        }
-
-        [Test]
-        public void IsDirtyTests()
-        {
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("prop")
-                .Build();
-            var prop = new Property(propertyType);
-            IContentType contentType = new ContentTypeBuilder()
-                .WithAlias("contentType")
-                .Build();
-            contentType.AddPropertyType(propertyType);
-
-            Content content = CreateContent(contentType);
-
-            prop.SetValue("a");
-            Assert.AreEqual("a", prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-
-            Assert.IsTrue(prop.IsDirty());
-
-            content.SetValue("prop", "a");
-            Assert.AreEqual("a", content.GetValue("prop"));
-            Assert.IsNull(content.GetValue("prop", published: true));
-
-            Assert.IsTrue(content.IsDirty());
-            Assert.IsTrue(content.IsAnyUserPropertyDirty());
-            //// how can we tell which variation was dirty?
-        }
-
-        [Test]
-        public void ValidationTests()
-        {
-            PropertyType propertyType = new PropertyTypeBuilder()
-                .WithAlias("prop")
-                .WithSupportsPublishing(true)
-                .Build();
-
-            var prop = new Property(propertyType);
-
-            prop.SetValue("a");
-            Assert.AreEqual("a", prop.GetValue());
-            Assert.IsNull(prop.GetValue(published: true));
-            PropertyValidationService propertyValidationService = GetPropertyValidationService();
-
-            Assert.IsTrue(propertyValidationService.IsPropertyValid(prop));
-
-            propertyType.Mandatory = true;
-            Assert.IsTrue(propertyValidationService.IsPropertyValid(prop));
-
-            prop.SetValue(null);
-            Assert.IsFalse(propertyValidationService.IsPropertyValid(prop));
-
-            // can publish, even though invalid
-            prop.PublishValues();
-        }
-
-        private static Content CreateContent(IContentType contentType, int id = 1, string name = "content") =>
-            new ContentBuilder()
-                .WithId(id)
-                .WithVersionId(1)
-                .WithName(name)
-                .WithContentType(contentType)
-                .Build();
-
-        private static PropertyValidationService GetPropertyValidationService()
-        {
-            IIOHelper ioHelper = Mock.Of<IIOHelper>();
-            IDataTypeService dataTypeService = Mock.Of<IDataTypeService>();
-            ILocalizedTextService localizedTextService = Mock.Of<ILocalizedTextService>();
-            IEditorConfigurationParser editorConfigurationParser = Mock.Of<IEditorConfigurationParser>();
-
-            var attribute = new DataEditorAttribute("a", "a", "a");
-            IDataValueEditorFactory dataValueEditorFactory = Mock.Of<IDataValueEditorFactory>(x
-                => x.Create<TextOnlyValueEditor>(It.IsAny<DataEditorAttribute>()) == new TextOnlyValueEditor(attribute, localizedTextService, Mock.Of<IShortStringHelper>(), new JsonNetSerializer(), Mock.Of<IIOHelper>()));
-
-
-            var textBoxEditor = new TextboxPropertyEditor(
-                dataValueEditorFactory,
-                ioHelper,
-                editorConfigurationParser);
-
-            var serializer = new ConfigurationEditorJsonSerializer();
-
-            var mockDataTypeService = new Mock<IDataTypeService>();
-            Mock.Get(dataTypeService).Setup(x => x.GetDataType(It.Is<int>(y => y == Constants.DataTypes.Textbox)))
-                .Returns(new DataType(textBoxEditor, serializer));
-
-            var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(() => new[] { textBoxEditor }));
-            return new PropertyValidationService(
-                propertyEditorCollection,
-                dataTypeService,
+        // All tests:
+        // 1. if exact is set to true: culture cannot be null when the ContentVariation.Culture flag is set
+        // 2. if wildcards is set to false: fail when "*" is passed in as either culture or segment.
+        // 3. ContentVariation flag is ignored when wildcards are used.
+        // 4. Empty string is considered the same as null
+        AssertForNovariation();
+        AssertForCultureVariation();
+        AssertForSegmentVariation();
+        AssertForCultureAndSegmentVariation();
+    }
+
+    private static void AssertForNovariation()
+    {
+        Assert4A(ContentVariation.Nothing, null, null, true);
+        Assert4A(ContentVariation.Nothing, null, string.Empty, true);
+        Assert4B(ContentVariation.Nothing, null, "*", true, false, false, true);
+        Assert4A(ContentVariation.Nothing, null, "segment", false);
+        Assert4A(ContentVariation.Nothing, string.Empty, null, true);
+        Assert4A(ContentVariation.Nothing, string.Empty, string.Empty, true);
+        Assert4B(ContentVariation.Nothing, string.Empty, "*", true, false, false, true);
+        Assert4A(ContentVariation.Nothing, string.Empty, "segment", false);
+        Assert4B(ContentVariation.Nothing, "*", null, true, false, false, true);
+        Assert4B(ContentVariation.Nothing, "*", string.Empty, true, false, false, true);
+        Assert4B(ContentVariation.Nothing, "*", "*", true, false, false, true);
+        Assert4A(ContentVariation.Nothing, "*", "segment", false);
+        Assert4A(ContentVariation.Nothing, "culture", null, false);
+        Assert4A(ContentVariation.Nothing, "culture", string.Empty, false);
+        Assert4A(ContentVariation.Nothing, "culture", "*", false);
+        Assert4A(ContentVariation.Nothing, "culture", "segment", false);
+    }
+
+    private static void AssertForCultureVariation()
+    {
+        Assert4B(ContentVariation.Culture, null, null, false, true, false, true);
+        Assert4B(ContentVariation.Culture, null, string.Empty, false, true, false, true);
+        Assert4B(ContentVariation.Culture, null, "*", false, false, false, true);
+        Assert4A(ContentVariation.Culture, null, "segment", false);
+        Assert4B(ContentVariation.Culture, string.Empty, null, false, true, false, true);
+        Assert4B(ContentVariation.Culture, string.Empty, string.Empty, false, true, false, true);
+        Assert4B(ContentVariation.Culture, string.Empty, "*", false, false, false, true);
+        Assert4A(ContentVariation.Culture, string.Empty, "segment", false);
+        Assert4B(ContentVariation.Culture, "*", null, true, false, false, true);
+        Assert4B(ContentVariation.Culture, "*", string.Empty, true, false, false, true);
+        Assert4B(ContentVariation.Culture, "*", "*", true, false, false, true);
+        Assert4A(ContentVariation.Culture, "*", "segment", false);
+        Assert4A(ContentVariation.Culture, "culture", null, true);
+        Assert4A(ContentVariation.Culture, "culture", string.Empty, true);
+        Assert4B(ContentVariation.Culture, "culture", "*", true, false, false, true);
+        Assert4A(ContentVariation.Culture, "culture", "segment", false);
+    }
+
+    private static void AssertForSegmentVariation()
+    {
+        Assert4B(ContentVariation.Segment, null, null, true, true, true, true);
+        Assert4B(ContentVariation.Segment, null, string.Empty, true, true, true, true);
+        Assert4B(ContentVariation.Segment, null, "*", true, false, false, true);
+        Assert4A(ContentVariation.Segment, null, "segment", true);
+        Assert4B(ContentVariation.Segment, string.Empty, null, true, true, true, true);
+        Assert4B(ContentVariation.Segment, string.Empty, string.Empty, true, true, true, true);
+        Assert4B(ContentVariation.Segment, string.Empty, "*", true, false, false, true);
+        Assert4A(ContentVariation.Segment, string.Empty, "segment", true);
+        Assert4B(ContentVariation.Segment, "*", null, true, false, false, true);
+        Assert4B(ContentVariation.Segment, "*", string.Empty, true, false, false, true);
+        Assert4B(ContentVariation.Segment, "*", "*", true, false, false, true);
+        Assert4B(ContentVariation.Segment, "*", "segment", true, false, false, true);
+        Assert4A(ContentVariation.Segment, "culture", null, false);
+        Assert4A(ContentVariation.Segment, "culture", string.Empty, false);
+        Assert4A(ContentVariation.Segment, "culture", "*", false);
+        Assert4A(ContentVariation.Segment, "culture", "segment", false);
+    }
+
+    private static void AssertForCultureAndSegmentVariation()
+    {
+        Assert4B(ContentVariation.CultureAndSegment, null, null, false, true, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, null, string.Empty, false, true, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, null, "*", false, false, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, null, "segment", false, true, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, string.Empty, null, false, true, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, string.Empty, string.Empty, false, true, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, string.Empty, "*", false, false, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, string.Empty, "segment", false, true, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, "*", null, true, false, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, "*", string.Empty, true, false, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, "*", "*", true, false, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, "*", "segment", true, false, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, "culture", null, true, true, true, true);
+        Assert4B(ContentVariation.CultureAndSegment, "culture", string.Empty, true, true, true, true);
+        Assert4B(ContentVariation.CultureAndSegment, "culture", "*", true, false, false, true);
+        Assert4B(ContentVariation.CultureAndSegment, "culture", "segment", true, true, true, true);
+    }
+
+    /// <summary>
+    ///     Asserts the result of <see cref="ContentVariationExtensions.ValidateVariation" />
+    /// </summary>
+    /// <param name="exactAndWildcards">Validate using Exact + Wildcards flags</param>
+    /// <param name="nonExactAndNoWildcards">Validate using non Exact + no Wildcard flags</param>
+    /// <param name="exactAndNoWildcards">Validate using Exact + no Wildcard flags</param>
+    /// <param name="nonExactAndWildcards">Validate using non Exact + Wildcard flags</param>
+    private static void Assert4B(
+        ContentVariation variation,
+        string culture,
+        string segment,
+        bool exactAndWildcards,
+        bool nonExactAndNoWildcards,
+        bool exactAndNoWildcards,
+        bool nonExactAndWildcards)
+    {
+        Assert.AreEqual(exactAndWildcards, variation.ValidateVariation(culture, segment, true, true, false));
+        Assert.AreEqual(nonExactAndNoWildcards, variation.ValidateVariation(culture, segment, false, false, false));
+        Assert.AreEqual(exactAndNoWildcards, variation.ValidateVariation(culture, segment, true, false, false));
+        Assert.AreEqual(nonExactAndWildcards, variation.ValidateVariation(culture, segment, false, true, false));
+    }
+
+    /// <summary>
+    ///     Asserts the result of
+    ///     <see cref="ContentVariationExtensions.ValidateVariation(ContentVariation, string, string, bool, bool, bool)" />
+    ///     where expectedResult matches all combinations of Exact + Wildcard
+    /// </summary>
+    private static void Assert4A(ContentVariation variation, string culture, string segment, bool expectedResult) =>
+        Assert4B(variation, culture, segment, expectedResult, expectedResult, expectedResult, expectedResult);
+
+    [Test]
+    public void PropertyTests()
+    {
+        var propertyType =
+            new PropertyType(TestHelper.ShortStringHelper, "editor", ValueStorageType.Nvarchar) { Alias = "prop" };
+        var prop = new Property(propertyType);
+
+        const string langFr = "fr-FR";
+
+        // can set value
+        // and get edited and published value
+        // because non-publishing
+        prop.SetValue("a");
+        Assert.AreEqual("a", prop.GetValue());
+        Assert.AreEqual("a", prop.GetValue(published: true));
+
+        // illegal, 'cos non-publishing
+        Assert.Throws<NotSupportedException>(() => prop.PublishValues());
+
+        // change
+        propertyType.SupportsPublishing = true;
+
+        // can get value
+        // and now published value is null
+        Assert.AreEqual("a", prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+
+        // cannot set non-supported variation value
+        Assert.Throws<NotSupportedException>(() => prop.SetValue("x", langFr));
+        Assert.IsNull(prop.GetValue(langFr));
+
+        // can publish value
+        // and get edited and published values
+        prop.PublishValues();
+        Assert.AreEqual("a", prop.GetValue());
+        Assert.AreEqual("a", prop.GetValue(published: true));
+
+        // can set value
+        // and get edited and published values
+        prop.SetValue("b");
+        Assert.AreEqual("b", prop.GetValue());
+        Assert.AreEqual("a", prop.GetValue(published: true));
+
+        // can clear value
+        prop.UnpublishValues();
+        Assert.AreEqual("b", prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+
+        // change - now we vary by culture
+        propertyType.Variations |= ContentVariation.Culture;
+
+        // can set value
+        // and get values
+        prop.SetValue("c", langFr);
+        Assert.IsNull(prop.GetValue()); // there is no invariant value anymore
+        Assert.IsNull(prop.GetValue(published: true));
+        Assert.AreEqual("c", prop.GetValue(langFr));
+        Assert.IsNull(prop.GetValue(langFr, published: true));
+
+        // can publish value
+        // and get edited and published values
+        prop.PublishValues(langFr);
+        Assert.IsNull(prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+        Assert.AreEqual("c", prop.GetValue(langFr));
+        Assert.AreEqual("c", prop.GetValue(langFr, published: true));
+
+        // can clear all
+        prop.UnpublishValues();
+        Assert.IsNull(prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+        Assert.AreEqual("c", prop.GetValue(langFr));
+        Assert.IsNull(prop.GetValue(langFr, published: true));
+
+        // can publish all
+        prop.PublishValues();
+        Assert.IsNull(prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+        Assert.AreEqual("c", prop.GetValue(langFr));
+        Assert.AreEqual("c", prop.GetValue(langFr, published: true));
+
+        // same for culture
+        prop.UnpublishValues(langFr);
+        Assert.AreEqual("c", prop.GetValue(langFr));
+        Assert.IsNull(prop.GetValue(langFr, published: true));
+        prop.PublishValues(langFr);
+        Assert.AreEqual("c", prop.GetValue(langFr));
+        Assert.AreEqual("c", prop.GetValue(langFr, published: true));
+
+        prop.UnpublishValues(); // does not throw, internal, content item throws
+        Assert.IsNull(prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+        prop.PublishValues(); // does not throw, internal, content item throws
+        Assert.IsNull(prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+    }
+
+    [Test]
+    public void ContentNames()
+    {
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("contentType")
+            .Build();
+        var content = CreateContent(contentType);
+
+        const string langFr = "fr-FR";
+        const string langUk = "en-UK";
+
+        // throws if the content type does not support the variation
+        Assert.Throws<NotSupportedException>(() => content.SetCultureName("name-fr", langFr));
+
+        // now it will work
+        contentType.Variations = ContentVariation.Culture;
+
+        // recreate content to re-capture content type variations
+        content = CreateContent(contentType);
+
+        // invariant name works
+        content.Name = "name";
+        Assert.AreEqual("name", content.GetCultureName(null));
+        content.SetCultureName("name2", null);
+        Assert.AreEqual("name2", content.Name);
+        Assert.AreEqual("name2", content.GetCultureName(null));
+
+        // variant names work
+        content.SetCultureName("name-fr", langFr);
+        content.SetCultureName("name-uk", langUk);
+        Assert.AreEqual("name-fr", content.GetCultureName(langFr));
+        Assert.AreEqual("name-uk", content.GetCultureName(langUk));
+
+        // variant dictionary of names work
+        Assert.AreEqual(2, content.CultureInfos.Count);
+        Assert.IsTrue(content.CultureInfos.ContainsKey(langFr));
+        Assert.AreEqual("name-fr", content.CultureInfos[langFr].Name);
+        Assert.IsTrue(content.CultureInfos.ContainsKey(langUk));
+        Assert.AreEqual("name-uk", content.CultureInfos[langUk].Name);
+    }
+
+    [Test]
+    public void ContentPublishValues()
+    {
+        const string langFr = "fr-FR";
+
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("prop")
+            .Build();
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("contentType")
+            .Build();
+        contentType.AddPropertyType(propertyType);
+
+        var content = CreateContent(contentType);
+
+        // can set value
+        // and get edited value, published is null
+        // because publishing
+        content.SetValue("prop", "a");
+        Assert.AreEqual("a", content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+
+        // cannot set non-supported variation value
+        Assert.Throws<NotSupportedException>(() => content.SetValue("prop", "x", langFr));
+        Assert.IsNull(content.GetValue("prop", langFr));
+
+        // can publish value
+        // and get edited and published values
+        Assert.IsTrue(content.PublishCulture(CultureImpact.All));
+        Assert.AreEqual("a", content.GetValue("prop"));
+        Assert.AreEqual("a", content.GetValue("prop", published: true));
+
+        // can set value
+        // and get edited and published values
+        content.SetValue("prop", "b");
+        Assert.AreEqual("b", content.GetValue("prop"));
+        Assert.AreEqual("a", content.GetValue("prop", published: true));
+
+        // can clear value
+        content.UnpublishCulture();
+        Assert.AreEqual("b", content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+
+        // change - now we vary by culture
+        contentType.Variations |= ContentVariation.Culture;
+        propertyType.Variations |= ContentVariation.Culture;
+        content.ChangeContentType(contentType);
+
+        // can set value
+        // and get values
+        content.SetValue("prop", "c", langFr);
+        Assert.IsNull(content.GetValue("prop")); // there is no invariant value anymore
+        Assert.IsNull(content.GetValue("prop", published: true));
+        Assert.AreEqual("c", content.GetValue("prop", langFr));
+        Assert.IsNull(content.GetValue("prop", langFr, published: true));
+
+        // can publish value
+        // and get edited and published values
+        Assert.IsFalse(content.PublishCulture(CultureImpact.Explicit(langFr, false))); // no name
+        content.SetCultureName("name-fr", langFr);
+        Assert.IsTrue(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
+        Assert.IsNull(content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+        Assert.AreEqual("c", content.GetValue("prop", langFr));
+        Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
+
+        // can clear all
+        content.UnpublishCulture();
+        Assert.IsNull(content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+        Assert.AreEqual("c", content.GetValue("prop", langFr));
+        Assert.IsNull(content.GetValue("prop", langFr, published: true));
+
+        // can publish all
+        Assert.IsTrue(content.PublishCulture(CultureImpact.All));
+        Assert.IsNull(content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+        Assert.AreEqual("c", content.GetValue("prop", langFr));
+        Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
+
+        // same for culture
+        content.UnpublishCulture(langFr);
+        Assert.AreEqual("c", content.GetValue("prop", langFr));
+        Assert.IsNull(content.GetValue("prop", langFr, published: true));
+        Assert.IsTrue(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
+        Assert.AreEqual("c", content.GetValue("prop", langFr));
+        Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
+
+        content.UnpublishCulture(); // clears invariant props if any
+        Assert.IsNull(content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+        Assert.IsTrue(content.PublishCulture(CultureImpact.All)); // publishes invariant props if any
+        Assert.IsNull(content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+
+        var other = CreateContent(contentType, 2, "other");
+
+        Assert.Throws<NotSupportedException>(() => other.SetValue("prop", "o")); // don't even try
+        other.SetValue("prop", "o1", langFr);
+
+        // can copy other's edited value
+        content.CopyFrom(other);
+        Assert.IsNull(content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+        Assert.AreEqual("o1", content.GetValue("prop", langFr));
+        Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
+
+        // can copy self's published value
+        content.CopyFrom(content);
+        Assert.IsNull(content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+        Assert.AreEqual("c", content.GetValue("prop", langFr));
+        Assert.AreEqual("c", content.GetValue("prop", langFr, published: true));
+    }
+
+    [Test]
+    public void ContentPublishValuesWithMixedPropertyTypeVariations()
+    {
+        var propertyValidationService = GetPropertyValidationService();
+        const string langFr = "fr-FR";
+
+        // content type varies by Culture
+        // prop1 varies by Culture
+        // prop2 is invariant
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("contentType")
+            .Build();
+        contentType.Variations |= ContentVariation.Culture;
+
+        var variantPropType = new PropertyTypeBuilder()
+            .WithAlias("prop1")
+            .WithVariations(ContentVariation.Culture)
+            .WithMandatory(true)
+            .Build();
+        var invariantPropType = new PropertyTypeBuilder()
+            .WithAlias("prop2")
+            .WithVariations(ContentVariation.Nothing)
+            .WithMandatory(true)
+            .Build();
+        contentType.AddPropertyType(variantPropType);
+        contentType.AddPropertyType(invariantPropType);
+
+        var content = CreateContent(contentType);
+
+        content.SetCultureName("hello", langFr);
+
+        // for this test we'll make the french culture the default one - this is needed for publishing invariant property values
+        var langFrImpact = CultureImpact.Explicit(langFr, true);
+
+        Assert.IsTrue(
+            content.PublishCulture(langFrImpact)); // succeeds because names are ok (not validating properties here)
+        Assert.IsFalse(
+            propertyValidationService.IsPropertyDataValid(content, out _, langFrImpact)); // fails because prop1 is mandatory
+
+        content.SetValue("prop1", "a", langFr);
+        Assert.IsTrue(
+            content.PublishCulture(langFrImpact)); // succeeds because names are ok (not validating properties here)
+
+        // Fails because prop2 is mandatory and invariant and the item isn't published.
+        // Invariant is validated against the default language except when there isn't a published version, in that case it's always validated.
+        Assert.IsFalse(propertyValidationService.IsPropertyDataValid(content, out _, langFrImpact));
+        content.SetValue("prop2", "x");
+        Assert.IsTrue(content.PublishCulture(langFrImpact)); // still ok...
+        Assert.IsTrue(propertyValidationService.IsPropertyDataValid(content, out _, langFrImpact)); // now it's ok
+
+        Assert.AreEqual("a", content.GetValue("prop1", langFr, published: true));
+        Assert.AreEqual("x", content.GetValue("prop2", published: true));
+    }
+
+    [Test]
+    public void ContentPublishVariations()
+    {
+        const string langFr = "fr-FR";
+        const string langUk = "en-UK";
+        const string langEs = "es-ES";
+
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("prop")
+            .Build();
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("contentType")
+            .Build();
+        contentType.AddPropertyType(propertyType);
+
+        var content = CreateContent(contentType);
+
+        // change - now we vary by culture
+        contentType.Variations |= ContentVariation.Culture;
+        propertyType.Variations |= ContentVariation.Culture;
+
+        content.ChangeContentType(contentType);
+
+        Assert.Throws<NotSupportedException>(() => content.SetValue("prop", "a")); // invariant = no
+        content.SetValue("prop", "a-fr", langFr);
+        content.SetValue("prop", "a-uk", langUk);
+        content.SetValue("prop", "a-es", langEs);
+
+        // cannot publish without a name
+        Assert.IsFalse(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
+
+        // works with a name
+        // and then FR is available, and published
+        content.SetCultureName("name-fr", langFr);
+        Assert.IsTrue(content.PublishCulture(CultureImpact.Explicit(langFr, false)));
+
+        // now UK is available too
+        content.SetCultureName("name-uk", langUk);
+
+        // test available, published
+        Assert.IsTrue(content.IsCultureAvailable(langFr));
+        Assert.IsTrue(content.IsCulturePublished(langFr));
+        Assert.AreEqual("name-fr", content.GetPublishName(langFr));
+        Assert.AreNotEqual(DateTime.MinValue, content.GetPublishDate(langFr));
+        Assert.IsFalse(content.IsCultureEdited(langFr)); // once published, edited is *wrong* until saved
+
+        Assert.IsTrue(content.IsCultureAvailable(langUk));
+        Assert.IsFalse(content.IsCulturePublished(langUk));
+        Assert.IsNull(content.GetPublishName(langUk));
+        Assert.IsNull(content.GetPublishDate(langUk)); // not published
+
+        Assert.IsFalse(content.IsCultureAvailable(langEs));
+        Assert.IsFalse(content.IsCultureEdited(langEs)); // not avail, so... not edited
+        Assert.IsFalse(content.IsCulturePublished(langEs));
+
+        // not published!
+        Assert.IsNull(content.GetPublishName(langEs));
+        Assert.IsNull(content.GetPublishDate(langEs));
+
+        // cannot test IsCultureEdited here - as that requires the content service and repository
+        // see: ContentServiceTests.Can_SaveRead_Variations
+    }
+
+    [Test]
+    public void IsDirtyTests()
+    {
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("prop")
+            .Build();
+        var prop = new Property(propertyType);
+        var contentType = new ContentTypeBuilder()
+            .WithAlias("contentType")
+            .Build();
+        contentType.AddPropertyType(propertyType);
+
+        var content = CreateContent(contentType);
+
+        prop.SetValue("a");
+        Assert.AreEqual("a", prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+
+        Assert.IsTrue(prop.IsDirty());
+
+        content.SetValue("prop", "a");
+        Assert.AreEqual("a", content.GetValue("prop"));
+        Assert.IsNull(content.GetValue("prop", published: true));
+
+        Assert.IsTrue(content.IsDirty());
+        Assert.IsTrue(content.IsAnyUserPropertyDirty());
+        //// how can we tell which variation was dirty?
+    }
+
+    [Test]
+    public void ValidationTests()
+    {
+        var propertyType = new PropertyTypeBuilder()
+            .WithAlias("prop")
+            .WithSupportsPublishing(true)
+            .Build();
+
+        var prop = new Property(propertyType);
+
+        prop.SetValue("a");
+        Assert.AreEqual("a", prop.GetValue());
+        Assert.IsNull(prop.GetValue(published: true));
+        var propertyValidationService = GetPropertyValidationService();
+
+        Assert.IsTrue(propertyValidationService.IsPropertyValid(prop));
+
+        propertyType.Mandatory = true;
+        Assert.IsTrue(propertyValidationService.IsPropertyValid(prop));
+
+        prop.SetValue(null);
+        Assert.IsFalse(propertyValidationService.IsPropertyValid(prop));
+
+        // can publish, even though invalid
+        prop.PublishValues();
+    }
+
+    private static Content CreateContent(IContentType contentType, int id = 1, string name = "content") =>
+        new ContentBuilder()
+            .WithId(id)
+            .WithVersionId(1)
+            .WithName(name)
+            .WithContentType(contentType)
+            .Build();
+
+    private static PropertyValidationService GetPropertyValidationService()
+    {
+        var ioHelper = Mock.Of<IIOHelper>();
+        var dataTypeService = Mock.Of<IDataTypeService>();
+        var localizedTextService = Mock.Of<ILocalizedTextService>();
+        var editorConfigurationParser = Mock.Of<IEditorConfigurationParser>();
+
+        var attribute = new DataEditorAttribute("a", "a", "a");
+        var dataValueEditorFactory = Mock.Of<IDataValueEditorFactory>(x
+            => x.Create<TextOnlyValueEditor>(It.IsAny<DataEditorAttribute>()) == new TextOnlyValueEditor(
+                attribute,
                 localizedTextService,
-                new ValueEditorCache());
-        }
+                Mock.Of<IShortStringHelper>(),
+                new JsonNetSerializer(),
+                Mock.Of<IIOHelper>()));
+
+        var textBoxEditor = new TextboxPropertyEditor(
+            dataValueEditorFactory,
+            ioHelper,
+            editorConfigurationParser);
+
+        var serializer = new ConfigurationEditorJsonSerializer();
+
+        var mockDataTypeService = new Mock<IDataTypeService>();
+        Mock.Get(dataTypeService).Setup(x => x.GetDataType(It.Is<int>(y => y == Constants.DataTypes.Textbox)))
+            .Returns(new DataType(textBoxEditor, serializer));
+
+        var propertyEditorCollection =
+            new PropertyEditorCollection(new DataEditorCollection(() => new[] { textBoxEditor }));
+        return new PropertyValidationService(
+            propertyEditorCollection,
+            dataTypeService,
+            localizedTextService,
+            new ValueEditorCache());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs
index 119b95d545..06acacf372 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Packaging/PendingPackageMigrationsTests.cs
@@ -6,79 +6,76 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Packaging;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Packaging
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Packaging;
+
+[TestFixture]
+public class PendingPackageMigrationsTests
 {
-    [TestFixture]
-    public class PendingPackageMigrationsTests
+    private static readonly Guid s_step1 = Guid.NewGuid();
+    private static readonly Guid s_step2 = Guid.NewGuid();
+    private const string TestPackageName = "Test1";
+
+    private class TestPackageMigrationPlan : PackageMigrationPlan
     {
-        private static readonly Guid s_step1 = Guid.NewGuid();
-        private static readonly Guid s_step2 = Guid.NewGuid();
-        private const string TestPackageName = "Test1";
-
-        private class TestPackageMigrationPlan : PackageMigrationPlan
+        public TestPackageMigrationPlan()
+            : base(TestPackageName)
         {
-            public TestPackageMigrationPlan() : base(TestPackageName)
-            {
-            }
-
-            protected override void DefinePlan()
-            {
-                To(s_step1);
-                To(s_step2);
-            }
         }
 
-        private PendingPackageMigrations GetPendingPackageMigrations()
-            => new PendingPackageMigrations(
-                Mock.Of<ILogger<PendingPackageMigrations>>(),
-                new PackageMigrationPlanCollection(() => new[]
-                {
-                    new TestPackageMigrationPlan()
-                }));
-
-        [Test]
-        public void GivenNoRegisteredMigrations_ThenPlanIsReturned()
+        protected override void DefinePlan()
         {
-            PendingPackageMigrations pendingPackageMigrations = GetPendingPackageMigrations();
-            var registeredMigrations = new Dictionary<string, string>();
-            IReadOnlyList<string> pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
-            Assert.AreEqual(1, pending.Count);
-        }
-
-        [Test]
-        public void GivenRegisteredMigration_WhenFinalStepMatched_ThenNoneAreReturned()
-        {
-            PendingPackageMigrations pendingPackageMigrations = GetPendingPackageMigrations();
-            var registeredMigrations = new Dictionary<string, string>
-            {
-                [Constants.Conventions.Migrations.KeyValuePrefix + TestPackageName] = s_step2.ToString()
-            };
-            IReadOnlyList<string> pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
-            Assert.AreEqual(0, pending.Count);
-        }
-
-        [Test]
-        public void GivenRegisteredMigration_WhenNonFinalStepMatched_ThenPlanIsReturned()
-        {
-            PendingPackageMigrations pendingPackageMigrations = GetPendingPackageMigrations();
-            var registeredMigrations = new Dictionary<string, string>
-            {
-                [Constants.Conventions.Migrations.KeyValuePrefix + TestPackageName] = s_step1.ToString()
-            };
-            IReadOnlyList<string> pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
-            Assert.AreEqual(1, pending.Count);
-        }
-
-        [Test]
-        public void GivenRegisteredMigration_WhenStepIsDifferentCase_ThenPlanIsReturned()
-        {
-            PendingPackageMigrations pendingPackageMigrations = GetPendingPackageMigrations();
-            var registeredMigrations = new Dictionary<string, string>
-            {
-                [Constants.Conventions.Migrations.KeyValuePrefix + TestPackageName] = s_step1.ToString().ToUpper()
-            };
-            IReadOnlyList<string> pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
-            Assert.AreEqual(1, pending.Count);
+            To(s_step1);
+            To(s_step2);
         }
     }
+
+    private PendingPackageMigrations GetPendingPackageMigrations()
+        => new(
+            Mock.Of<ILogger<PendingPackageMigrations>>(),
+            new PackageMigrationPlanCollection(() => new[] { new TestPackageMigrationPlan() }));
+
+    [Test]
+    public void GivenNoRegisteredMigrations_ThenPlanIsReturned()
+    {
+        var pendingPackageMigrations = GetPendingPackageMigrations();
+        var registeredMigrations = new Dictionary<string, string>();
+        var pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
+        Assert.AreEqual(1, pending.Count);
+    }
+
+    [Test]
+    public void GivenRegisteredMigration_WhenFinalStepMatched_ThenNoneAreReturned()
+    {
+        var pendingPackageMigrations = GetPendingPackageMigrations();
+        var registeredMigrations = new Dictionary<string, string>
+        {
+            [Constants.Conventions.Migrations.KeyValuePrefix + TestPackageName] = s_step2.ToString(),
+        };
+        var pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
+        Assert.AreEqual(0, pending.Count);
+    }
+
+    [Test]
+    public void GivenRegisteredMigration_WhenNonFinalStepMatched_ThenPlanIsReturned()
+    {
+        var pendingPackageMigrations = GetPendingPackageMigrations();
+        var registeredMigrations = new Dictionary<string, string>
+        {
+            [Constants.Conventions.Migrations.KeyValuePrefix + TestPackageName] = s_step1.ToString(),
+        };
+        var pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
+        Assert.AreEqual(1, pending.Count);
+    }
+
+    [Test]
+    public void GivenRegisteredMigration_WhenStepIsDifferentCase_ThenPlanIsReturned()
+    {
+        var pendingPackageMigrations = GetPendingPackageMigrations();
+        var registeredMigrations = new Dictionary<string, string>
+        {
+            [Constants.Conventions.Migrations.KeyValuePrefix + TestPackageName] = s_step1.ToString().ToUpper(),
+        };
+        var pending = pendingPackageMigrations.GetPendingPackageMigrations(registeredMigrations);
+        Assert.AreEqual(1, pending.Count);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs
index efd753296a..c92b98562c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockEditorComponentTests.cs
@@ -11,181 +11,196 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class BlockEditorComponentTests
 {
-    [TestFixture]
-    public class BlockEditorComponentTests
+    private readonly JsonSerializerSettings _serializerSettings = new()
     {
-        private readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings
+        Formatting = Formatting.None,
+        NullValueHandling = NullValueHandling.Ignore,
+    };
+
+    private const string ContentGuid1 = "036ce82586a64dfba2d523a99ed80f58";
+    private const string ContentGuid2 = "48288c21a38a40ef82deb3eda90a58f6";
+    private const string SettingsGuid1 = "ffd35c4e2eea4900abfa5611b67b2492";
+    private const string SubContentGuid1 = "4c44ce6b3a5c4f5f8f15e3dc24819a9e";
+    private const string SubContentGuid2 = "a062c06d6b0b44ac892b35d90309c7f8";
+    private const string SubSettingsGuid1 = "4d998d980ffa4eee8afdc23c4abd6d29";
+
+    private static readonly ILogger<BlockEditorPropertyHandler> s_logger =
+        Mock.Of<ILogger<BlockEditorPropertyHandler>>();
+
+    [Test]
+    public void Cannot_Have_Null_Udi()
+    {
+        var component = new BlockEditorPropertyHandler(s_logger);
+        var json = GetBlockListJson(null, string.Empty);
+        Assert.Throws<FormatException>(() => component.ReplaceBlockListUdis(json));
+    }
+
+    [Test]
+    public void No_Nesting()
+    {
+        var guids = Enumerable.Range(0, 3).Select(x => Guid.NewGuid()).ToList();
+        var guidCounter = 0;
+
+        Guid GuidFactory()
         {
-            Formatting = Formatting.None,
-            NullValueHandling = NullValueHandling.Ignore
-        };
-
-        private const string ContentGuid1 = "036ce82586a64dfba2d523a99ed80f58";
-        private const string ContentGuid2 = "48288c21a38a40ef82deb3eda90a58f6";
-        private const string SettingsGuid1 = "ffd35c4e2eea4900abfa5611b67b2492";
-        private const string SubContentGuid1 = "4c44ce6b3a5c4f5f8f15e3dc24819a9e";
-        private const string SubContentGuid2 = "a062c06d6b0b44ac892b35d90309c7f8";
-        private const string SubSettingsGuid1 = "4d998d980ffa4eee8afdc23c4abd6d29";
-        private static readonly ILogger<BlockEditorPropertyHandler> s_logger = Mock.Of<ILogger<BlockEditorPropertyHandler>>();
-
-
-
-
-        [Test]
-        public void Cannot_Have_Null_Udi()
-        {
-            var component = new BlockEditorPropertyHandler(s_logger);
-            var json = GetBlockListJson(null, string.Empty);
-            Assert.Throws<FormatException>(() => component.ReplaceBlockListUdis(json));
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void No_Nesting()
+        var json = GetBlockListJson(null);
+
+        var expected = ReplaceGuids(json, guids, ContentGuid1, ContentGuid2, SettingsGuid1);
+
+        var component = new BlockEditorPropertyHandler(s_logger);
+        var result = component.ReplaceBlockListUdis(json, GuidFactory);
+
+        var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+        var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+        Console.WriteLine(expectedJson);
+        Console.WriteLine(resultJson);
+        Assert.AreEqual(expectedJson, resultJson);
+    }
+
+    [Test]
+    public void One_Level_Nesting_Escaped()
+    {
+        var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
+
+        var guidCounter = 0;
+
+        Guid GuidFactory()
         {
-            var guids = Enumerable.Range(0, 3).Select(x => Guid.NewGuid()).ToList();
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            var json = GetBlockListJson(null);
-
-            var expected = ReplaceGuids(json, guids, ContentGuid1, ContentGuid2, SettingsGuid1);
-
-            var component = new BlockEditorPropertyHandler(s_logger);
-            var result = component.ReplaceBlockListUdis(json, GuidFactory);
-
-            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
-            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
-            Console.WriteLine(expectedJson);
-            Console.WriteLine(resultJson);
-            Assert.AreEqual(expectedJson, resultJson);
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void One_Level_Nesting_Escaped()
+        var innerJson = GetBlockListJson(null, SubContentGuid1, SubContentGuid2, SubSettingsGuid1);
+
+        // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+        // and this is how to do that, the result will also include quotes around it.
+        var innerJsonEscaped = JsonConvert.ToString(innerJson);
+
+        // get the json with the subFeatures as escaped
+        var json = GetBlockListJson(innerJsonEscaped);
+
+        var component = new BlockEditorPropertyHandler(s_logger);
+        var result = component.ReplaceBlockListUdis(json, GuidFactory);
+
+        // the expected result is that the subFeatures data is no longer escaped
+        var expected = ReplaceGuids(
+            GetBlockListJson(innerJson),
+            guids,
+            ContentGuid1,
+            ContentGuid2,
+            SettingsGuid1,
+            SubContentGuid1,
+            SubContentGuid2,
+            SubSettingsGuid1);
+
+        var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+        var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+        Console.WriteLine(expectedJson);
+        Console.WriteLine(resultJson);
+        Assert.AreEqual(expectedJson, resultJson);
+    }
+
+    [Test]
+    public void One_Level_Nesting_Unescaped()
+    {
+        var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
+        var guidCounter = 0;
+
+        Guid GuidFactory()
         {
-            var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
-
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            var innerJson = GetBlockListJson(null, SubContentGuid1, SubContentGuid2, SubSettingsGuid1);
-
-            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
-            // and this is how to do that, the result will also include quotes around it.
-            var innerJsonEscaped = JsonConvert.ToString(innerJson);
-
-            // get the json with the subFeatures as escaped
-            var json = GetBlockListJson(innerJsonEscaped);
-
-            var component = new BlockEditorPropertyHandler(s_logger);
-            var result = component.ReplaceBlockListUdis(json, GuidFactory);
-
-            // the expected result is that the subFeatures data is no longer escaped
-            var expected = ReplaceGuids(
-                GetBlockListJson(innerJson),
-                guids,
-                ContentGuid1,
-                ContentGuid2,
-                SettingsGuid1,
-                SubContentGuid1,
-                SubContentGuid2,
-                SubSettingsGuid1);
-
-            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
-            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
-            Console.WriteLine(expectedJson);
-            Console.WriteLine(resultJson);
-            Assert.AreEqual(expectedJson, resultJson);
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void One_Level_Nesting_Unescaped()
+        // nested blocks without property value escaping used in the conversion
+        var innerJson = GetBlockListJson(null, SubContentGuid1, SubContentGuid2, SubSettingsGuid1);
+
+        // get the json with the subFeatures as unescaped
+        var json = GetBlockListJson(innerJson);
+
+        var expected = ReplaceGuids(
+            GetBlockListJson(innerJson),
+            guids,
+            ContentGuid1,
+            ContentGuid2,
+            SettingsGuid1,
+            SubContentGuid1,
+            SubContentGuid2,
+            SubSettingsGuid1);
+
+        var component = new BlockEditorPropertyHandler(s_logger);
+        var result = component.ReplaceBlockListUdis(json, GuidFactory);
+
+        var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+        var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+        Console.WriteLine(expectedJson);
+        Console.WriteLine(resultJson);
+        Assert.AreEqual(expectedJson, resultJson);
+    }
+
+    [Test]
+    public void Nested_In_Complex_Editor_Escaped()
+    {
+        var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
+        var guidCounter = 0;
+
+        Guid GuidFactory()
         {
-            var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            // nested blocks without property value escaping used in the conversion
-            var innerJson = GetBlockListJson(null, SubContentGuid1, SubContentGuid2, SubSettingsGuid1);
-
-            // get the json with the subFeatures as unescaped
-            var json = GetBlockListJson(innerJson);
-
-            var expected = ReplaceGuids(
-                GetBlockListJson(innerJson),
-                guids,
-                ContentGuid1,
-                ContentGuid2,
-                SettingsGuid1,
-                SubContentGuid1,
-                SubContentGuid2,
-                SubSettingsGuid1);
-
-            var component = new BlockEditorPropertyHandler(s_logger);
-            var result = component.ReplaceBlockListUdis(json, GuidFactory);
-
-            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
-            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
-            Console.WriteLine(expectedJson);
-            Console.WriteLine(resultJson);
-            Assert.AreEqual(expectedJson, resultJson);
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void Nested_In_Complex_Editor_Escaped()
-        {
-            var guids = Enumerable.Range(0, 6).Select(x => Guid.NewGuid()).ToList();
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
+        var innerJson = GetBlockListJson(null, SubContentGuid1, SubContentGuid2, SubSettingsGuid1);
 
-            var innerJson = GetBlockListJson(null, SubContentGuid1, SubContentGuid2, SubSettingsGuid1);
+        // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+        // and this is how to do that, the result will also include quotes around it.
+        var innerJsonEscaped = JsonConvert.ToString(innerJson);
 
-            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
-            // and this is how to do that, the result will also include quotes around it.
-            var innerJsonEscaped = JsonConvert.ToString(innerJson);
+        // Complex editor such as the grid
+        var complexEditorJsonEscaped = GetGridJson(innerJsonEscaped);
 
-            // Complex editor such as the grid
-            var complexEditorJsonEscaped = GetGridJson(innerJsonEscaped);
+        var json = GetBlockListJson(complexEditorJsonEscaped);
 
-            var json = GetBlockListJson(complexEditorJsonEscaped);
+        var component = new BlockEditorPropertyHandler(s_logger);
+        var result = component.ReplaceBlockListUdis(json, GuidFactory);
 
-            var component = new BlockEditorPropertyHandler(s_logger);
-            var result = component.ReplaceBlockListUdis(json, GuidFactory);
+        // the expected result is that the subFeatures data is no longer escaped
+        var expected = ReplaceGuids(
+            GetBlockListJson(GetGridJson(innerJson)),
+            guids,
+            ContentGuid1,
+            ContentGuid2,
+            SettingsGuid1,
+            SubContentGuid1,
+            SubContentGuid2,
+            SubSettingsGuid1);
 
-            // the expected result is that the subFeatures data is no longer escaped
-            var expected = ReplaceGuids(
-                GetBlockListJson(GetGridJson(innerJson)),
-                guids,
-                ContentGuid1,
-                ContentGuid2,
-                SettingsGuid1,
-                SubContentGuid1,
-                SubContentGuid2,
-                SubSettingsGuid1);
+        var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
+        var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
+        Console.WriteLine(expectedJson);
+        Console.WriteLine(resultJson);
+        Assert.AreEqual(expectedJson, resultJson);
+    }
 
-            var expectedJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(expected, _serializerSettings), _serializerSettings);
-            var resultJson = JsonConvert.SerializeObject(JsonConvert.DeserializeObject(result, _serializerSettings), _serializerSettings);
-            Console.WriteLine(expectedJson);
-            Console.WriteLine(resultJson);
-            Assert.AreEqual(expectedJson, resultJson);
-        }
-
-        private string GetBlockListJson(
-            string subFeatures,
-            string contentGuid1 = ContentGuid1,
-            string contentGuid2 = ContentGuid2,
-            string settingsGuid1 = SettingsGuid1)
-        {
-            return @"{
+    private string GetBlockListJson(
+        string subFeatures,
+        string contentGuid1 = ContentGuid1,
+        string contentGuid2 = ContentGuid2,
+        string settingsGuid1 = SettingsGuid1) =>
+        @"{
     ""layout"":
     {
         ""Umbraco.BlockList"": [
             {
-                ""contentUdi"": """ + (contentGuid1.IsNullOrWhiteSpace() ? string.Empty : GuidUdi.Create(Constants.UdiEntityType.Element, Guid.Parse(contentGuid1)).ToString()) + @"""
+                ""contentUdi"": """ + (contentGuid1.IsNullOrWhiteSpace()
+            ? string.Empty
+            : Udi.Create(Constants.UdiEntityType.Element, Guid.Parse(contentGuid1)).ToString()) + @"""
             },
             {
                 ""contentUdi"": ""umb://element/" + contentGuid2 + @""",
@@ -196,7 +211,9 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
     ""contentData"": [
         {
             ""contentTypeKey"": ""d6ce4a86-91a2-45b3-a99c-8691fc1fb020"",
-            ""udi"": """ + (contentGuid1.IsNullOrWhiteSpace() ? string.Empty : GuidUdi.Create(Constants.UdiEntityType.Element, Guid.Parse(contentGuid1)).ToString()) + @""",
+            ""udi"": """ + (contentGuid1.IsNullOrWhiteSpace()
+            ? string.Empty
+            : Udi.Create(Constants.UdiEntityType.Element, Guid.Parse(contentGuid1)).ToString()) + @""",
             ""featureName"": ""Hello"",
             ""featureDetails"": ""World""
         },
@@ -204,7 +221,8 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
             ""contentTypeKey"": ""d6ce4a86-91a2-45b3-a99c-8691fc1fb020"",
             ""udi"": ""umb://element/" + contentGuid2 + @""",
             ""featureName"": ""Another"",
-            ""featureDetails"": ""Feature""" + (subFeatures == null ? string.Empty : (@", ""subFeatures"": " + subFeatures)) + @"
+            ""featureDetails"": ""Feature""" +
+        (subFeatures == null ? string.Empty : @", ""subFeatures"": " + subFeatures) + @"
         }
     ],
     ""settingsData"": [
@@ -216,11 +234,9 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
         },
     ]
 }";
-        }
 
-        private string GetGridJson(string subBlockList)
-        {
-            return @"{
+    private string GetGridJson(string subBlockList) =>
+        @"{
   ""name"": ""1 column layout"",
   ""sections"": [
     {
@@ -274,17 +290,15 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
         }]
     }]
 }";
-        }
 
-        private string ReplaceGuids(string json, List<Guid> newGuids, params string[] oldGuids)
+    private string ReplaceGuids(string json, List<Guid> newGuids, params string[] oldGuids)
+    {
+        for (var i = 0; i < oldGuids.Length; i++)
         {
-            for (var i = 0; i < oldGuids.Length; i++)
-            {
-                var old = oldGuids[i];
-                json = json.Replace(old, newGuids[i].ToString("N"));
-            }
-
-            return json;
+            var old = oldGuids[i];
+            json = json.Replace(old, newGuids[i].ToString("N"));
         }
+
+        return json;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs
index 084bf03370..ce7b767473 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/BlockListPropertyValueConverterTests.cs
@@ -11,183 +11,183 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Cms.Core.PublishedCache;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class BlockListPropertyValueConverterTests
 {
-    [TestFixture]
-    public class BlockListPropertyValueConverterTests
+    private readonly Guid _contentKey1 = Guid.NewGuid();
+    private readonly Guid _contentKey2 = Guid.NewGuid();
+    private const string ContentAlias1 = "Test1";
+    private const string ContentAlias2 = "Test2";
+    private readonly Guid _settingKey1 = Guid.NewGuid();
+    private readonly Guid _settingKey2 = Guid.NewGuid();
+    private const string SettingAlias1 = "Setting1";
+    private const string SettingAlias2 = "Setting2";
+
+    /// <summary>
+    ///     Setup mocks for IPublishedSnapshotAccessor
+    /// </summary>
+    private IPublishedSnapshotAccessor GetPublishedSnapshotAccessor()
     {
-        private readonly Guid _contentKey1 = Guid.NewGuid();
-        private readonly Guid _contentKey2 = Guid.NewGuid();
-        private const string ContentAlias1 = "Test1";
-        private const string ContentAlias2 = "Test2";
-        private readonly Guid _settingKey1 = Guid.NewGuid();
-        private readonly Guid _settingKey2 = Guid.NewGuid();
-        private const string SettingAlias1 = "Setting1";
-        private const string SettingAlias2 = "Setting2";
+        var test1ContentType = Mock.Of<IPublishedContentType>(x =>
+            x.IsElement == true
+            && x.Key == _contentKey1
+            && x.Alias == ContentAlias1);
+        var test2ContentType = Mock.Of<IPublishedContentType>(x =>
+            x.IsElement == true
+            && x.Key == _contentKey2
+            && x.Alias == ContentAlias2);
+        var test3ContentType = Mock.Of<IPublishedContentType>(x =>
+            x.IsElement == true
+            && x.Key == _settingKey1
+            && x.Alias == SettingAlias1);
+        var test4ContentType = Mock.Of<IPublishedContentType>(x =>
+            x.IsElement == true
+            && x.Key == _settingKey2
+            && x.Alias == SettingAlias2);
+        var contentCache = new Mock<IPublishedContentCache>();
+        contentCache.Setup(x => x.GetContentType(_contentKey1)).Returns(test1ContentType);
+        contentCache.Setup(x => x.GetContentType(_contentKey2)).Returns(test2ContentType);
+        contentCache.Setup(x => x.GetContentType(_settingKey1)).Returns(test3ContentType);
+        contentCache.Setup(x => x.GetContentType(_settingKey2)).Returns(test4ContentType);
+        var publishedSnapshot = Mock.Of<IPublishedSnapshot>(x => x.Content == contentCache.Object);
+        var publishedSnapshotAccessor =
+            Mock.Of<IPublishedSnapshotAccessor>(x => x.TryGetPublishedSnapshot(out publishedSnapshot));
+        return publishedSnapshotAccessor;
+    }
 
-        /// <summary>
-        /// Setup mocks for IPublishedSnapshotAccessor
-        /// </summary>
-        private IPublishedSnapshotAccessor GetPublishedSnapshotAccessor()
-        {
-            IPublishedContentType test1ContentType = Mock.Of<IPublishedContentType>(x =>
-                x.IsElement == true
-                && x.Key == _contentKey1
-                && x.Alias == ContentAlias1);
-            IPublishedContentType test2ContentType = Mock.Of<IPublishedContentType>(x =>
-                x.IsElement == true
-                && x.Key == _contentKey2
-                && x.Alias == ContentAlias2);
-            IPublishedContentType test3ContentType = Mock.Of<IPublishedContentType>(x =>
-                x.IsElement == true
-                && x.Key == _settingKey1
-                && x.Alias == SettingAlias1);
-            IPublishedContentType test4ContentType = Mock.Of<IPublishedContentType>(x =>
-                x.IsElement == true
-                && x.Key == _settingKey2
-                && x.Alias == SettingAlias2);
-            var contentCache = new Mock<IPublishedContentCache>();
-            contentCache.Setup(x => x.GetContentType(_contentKey1)).Returns(test1ContentType);
-            contentCache.Setup(x => x.GetContentType(_contentKey2)).Returns(test2ContentType);
-            contentCache.Setup(x => x.GetContentType(_settingKey1)).Returns(test3ContentType);
-            contentCache.Setup(x => x.GetContentType(_settingKey2)).Returns(test4ContentType);
-            IPublishedSnapshot publishedSnapshot = Mock.Of<IPublishedSnapshot>(x => x.Content == contentCache.Object);
-            IPublishedSnapshotAccessor publishedSnapshotAccessor = Mock.Of<IPublishedSnapshotAccessor>(x => x.TryGetPublishedSnapshot(out publishedSnapshot));
-            return publishedSnapshotAccessor;
-        }
+    private BlockListPropertyValueConverter CreateConverter()
+    {
+        var publishedSnapshotAccessor = GetPublishedSnapshotAccessor();
+        var publishedModelFactory = new NoopPublishedModelFactory();
+        var editor = new BlockListPropertyValueConverter(
+            Mock.Of<IProfilingLogger>(),
+            new BlockEditorConverter(publishedSnapshotAccessor, publishedModelFactory));
+        return editor;
+    }
 
-        private BlockListPropertyValueConverter CreateConverter()
+    private BlockListConfiguration ConfigForMany() => new()
+    {
+        Blocks = new[]
         {
-            IPublishedSnapshotAccessor publishedSnapshotAccessor = GetPublishedSnapshotAccessor();
-            var publishedModelFactory = new NoopPublishedModelFactory();
-            var editor = new BlockListPropertyValueConverter(
-                Mock.Of<IProfilingLogger>(),
-                new BlockEditorConverter(publishedSnapshotAccessor, publishedModelFactory));
-            return editor;
-        }
-
-        private BlockListConfiguration ConfigForMany() => new BlockListConfiguration
-        {
-            Blocks = new[]
+            new BlockListConfiguration.BlockConfiguration
             {
-                new BlockListConfiguration.BlockConfiguration
-                {
-                    ContentElementTypeKey = _contentKey1,
-                    SettingsElementTypeKey = _settingKey2
-                },
-                new BlockListConfiguration.BlockConfiguration
-                {
-                    ContentElementTypeKey = _contentKey2,
-                    SettingsElementTypeKey = _settingKey1
-                }
-            }
-        };
-
-        private BlockListConfiguration ConfigForSingle() => new BlockListConfiguration
-        {
-            Blocks = new[]
+                ContentElementTypeKey = _contentKey1,
+                SettingsElementTypeKey = _settingKey2,
+            },
+            new BlockListConfiguration.BlockConfiguration
             {
-                new BlockListConfiguration.BlockConfiguration
-                {
-                    ContentElementTypeKey = _contentKey1
-                }
-            }
-        };
+                ContentElementTypeKey = _contentKey2,
+                SettingsElementTypeKey = _settingKey1,
+            },
+        },
+    };
 
-        private IPublishedPropertyType GetPropertyType(BlockListConfiguration config)
-        {
-            var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
-            IPublishedPropertyType propertyType = Mock.Of<IPublishedPropertyType>(x =>
-                x.EditorAlias == Constants.PropertyEditors.Aliases.BlockList
-                && x.DataType == dataType);
-            return propertyType;
-        }
+    private BlockListConfiguration ConfigForSingle() => new()
+    {
+        Blocks = new[] { new BlockListConfiguration.BlockConfiguration { ContentElementTypeKey = _contentKey1 } },
+    };
 
-        [Test]
-        public void Is_Converter_For()
-        {
-            BlockListPropertyValueConverter editor = CreateConverter();
-            Assert.IsTrue(editor.IsConverter(Mock.Of<IPublishedPropertyType>(x => x.EditorAlias == Constants.PropertyEditors.Aliases.BlockList)));
-            Assert.IsFalse(editor.IsConverter(Mock.Of<IPublishedPropertyType>(x => x.EditorAlias == Constants.PropertyEditors.Aliases.NestedContent)));
-        }
+    private IPublishedPropertyType GetPropertyType(BlockListConfiguration config)
+    {
+        var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
+        var propertyType = Mock.Of<IPublishedPropertyType>(x =>
+            x.EditorAlias == Constants.PropertyEditors.Aliases.BlockList
+            && x.DataType == dataType);
+        return propertyType;
+    }
 
-        [Test]
-        public void Get_Value_Type_Multiple()
-        {
-            BlockListPropertyValueConverter editor = CreateConverter();
-            BlockListConfiguration config = ConfigForMany();
+    [Test]
+    public void Is_Converter_For()
+    {
+        var editor = CreateConverter();
+        Assert.IsTrue(editor.IsConverter(
+            Mock.Of<IPublishedPropertyType>(x => x.EditorAlias == Constants.PropertyEditors.Aliases.BlockList)));
+        Assert.IsFalse(editor.IsConverter(Mock.Of<IPublishedPropertyType>(x =>
+            x.EditorAlias == Constants.PropertyEditors.Aliases.NestedContent)));
+    }
 
-            var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
-            IPublishedPropertyType propType = Mock.Of<IPublishedPropertyType>(x => x.DataType == dataType);
+    [Test]
+    public void Get_Value_Type_Multiple()
+    {
+        var editor = CreateConverter();
+        var config = ConfigForMany();
 
-            Type valueType = editor.GetPropertyValueType(propType);
+        var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
+        var propType = Mock.Of<IPublishedPropertyType>(x => x.DataType == dataType);
 
-            // the result is always block list model
-            Assert.AreEqual(typeof(BlockListModel), valueType);
-        }
+        var valueType = editor.GetPropertyValueType(propType);
 
-        [Test]
-        public void Get_Value_Type_Single()
-        {
-            BlockListPropertyValueConverter editor = CreateConverter();
-            BlockListConfiguration config = ConfigForSingle();
+        // the result is always block list model
+        Assert.AreEqual(typeof(BlockListModel), valueType);
+    }
 
-            var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
-            IPublishedPropertyType propType = Mock.Of<IPublishedPropertyType>(x => x.DataType == dataType);
+    [Test]
+    public void Get_Value_Type_Single()
+    {
+        var editor = CreateConverter();
+        var config = ConfigForSingle();
 
-            Type valueType = editor.GetPropertyValueType(propType);
+        var dataType = new PublishedDataType(1, "test", new Lazy<object>(() => config));
+        var propType = Mock.Of<IPublishedPropertyType>(x => x.DataType == dataType);
 
-            // the result is always block list model
-            Assert.AreEqual(typeof(BlockListModel), valueType);
-        }
+        var valueType = editor.GetPropertyValueType(propType);
 
-        [Test]
-        public void Convert_Null_Empty()
-        {
-            BlockListPropertyValueConverter editor = CreateConverter();
-            BlockListConfiguration config = ConfigForMany();
-            IPublishedPropertyType propertyType = GetPropertyType(config);
-            IPublishedElement publishedElement = Mock.Of<IPublishedElement>();
+        // the result is always block list model
+        Assert.AreEqual(typeof(BlockListModel), valueType);
+    }
 
-            string json = null;
-            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+    [Test]
+    public void Convert_Null_Empty()
+    {
+        var editor = CreateConverter();
+        var config = ConfigForMany();
+        var propertyType = GetPropertyType(config);
+        var publishedElement = Mock.Of<IPublishedElement>();
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(0, converted.Count);
+        string json = null;
+        var converted =
+            editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
+                BlockListModel;
 
-            json = string.Empty;
-            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(0, converted.Count);
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(0, converted.Count);
-        }
+        json = string.Empty;
+        converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
 
-        [Test]
-        public void Convert_Valid_Empty_Json()
-        {
-            BlockListPropertyValueConverter editor = CreateConverter();
-            BlockListConfiguration config = ConfigForMany();
-            IPublishedPropertyType propertyType = GetPropertyType(config);
-            IPublishedElement publishedElement = Mock.Of<IPublishedElement>();
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(0, converted.Count);
+    }
 
-            string json = "{}";
-            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+    [Test]
+    public void Convert_Valid_Empty_Json()
+    {
+        var editor = CreateConverter();
+        var config = ConfigForMany();
+        var propertyType = GetPropertyType(config);
+        var publishedElement = Mock.Of<IPublishedElement>();
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(0, converted.Count);
+        var json = "{}";
+        var converted =
+            editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
+                BlockListModel;
 
-            json = @"{
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(0, converted.Count);
+
+        json = @"{
 layout: {},
 data: []}";
-            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(0, converted.Count);
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(0, converted.Count);
 
-            // Even though there is a layout, there is no data, so the conversion will result in zero elements in total
-            json = @"
+        // Even though there is a layout, there is no data, so the conversion will result in zero elements in total
+        json = @"
 {
     layout: {
         '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
@@ -199,13 +199,13 @@ data: []}";
     contentData: []
 }";
 
-            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(0, converted.Count);
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(0, converted.Count);
 
-            // Even though there is a layout and data, the data is invalid (missing required keys) so the conversion will result in zero elements in total
-            json = @"
+        // Even though there is a layout and data, the data is invalid (missing required keys) so the conversion will result in zero elements in total
+        json = @"
 {
     layout: {
         '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
@@ -221,13 +221,13 @@ data: []}";
     ]
 }";
 
-            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(0, converted.Count);
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(0, converted.Count);
 
-            // Everthing is ok except the udi reference in the layout doesn't match the data so it will be empty
-            json = @"
+        // Everthing is ok except the udi reference in the layout doesn't match the data so it will be empty
+        json = @"
 {
     layout: {
         '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
@@ -244,21 +244,21 @@ data: []}";
     ]
 }";
 
-            converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(0, converted.Count);
-        }
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(0, converted.Count);
+    }
 
-        [Test]
-        public void Convert_Valid_Json()
-        {
-            BlockListPropertyValueConverter editor = CreateConverter();
-            BlockListConfiguration config = ConfigForMany();
-            IPublishedPropertyType propertyType = GetPropertyType(config);
-            IPublishedElement publishedElement = Mock.Of<IPublishedElement>();
+    [Test]
+    public void Convert_Valid_Json()
+    {
+        var editor = CreateConverter();
+        var config = ConfigForMany();
+        var propertyType = GetPropertyType(config);
+        var publishedElement = Mock.Of<IPublishedElement>();
 
-            string json = @"
+        var json = @"
 {
     layout: {
         '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
@@ -274,26 +274,28 @@ data: []}";
         }
     ]
 }";
-            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        var converted =
+            editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
+                BlockListModel;
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(1, converted.Count);
-            IPublishedElement item0 = converted[0].Content;
-            Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Key);
-            Assert.AreEqual("Test1", item0.ContentType.Alias);
-            Assert.IsNull(converted[0].Settings);
-            Assert.AreEqual(UdiParser.Parse("umb://element/1304E1DDAC87439684FE8A399231CB3D"), converted[0].ContentUdi);
-        }
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(1, converted.Count);
+        var item0 = converted[0].Content;
+        Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Key);
+        Assert.AreEqual("Test1", item0.ContentType.Alias);
+        Assert.IsNull(converted[0].Settings);
+        Assert.AreEqual(UdiParser.Parse("umb://element/1304E1DDAC87439684FE8A399231CB3D"), converted[0].ContentUdi);
+    }
 
-        [Test]
-        public void Get_Data_From_Layout_Item()
-        {
-            BlockListPropertyValueConverter editor = CreateConverter();
-            BlockListConfiguration config = ConfigForMany();
-            IPublishedPropertyType propertyType = GetPropertyType(config);
-            IPublishedElement publishedElement = Mock.Of<IPublishedElement>();
+    [Test]
+    public void Get_Data_From_Layout_Item()
+    {
+        var editor = CreateConverter();
+        var config = ConfigForMany();
+        var propertyType = GetPropertyType(config);
+        var publishedElement = Mock.Of<IPublishedElement>();
 
-            string json = @"
+        var json = @"
 {
     layout: {
         '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
@@ -337,47 +339,49 @@ data: []}";
     ],
 }";
 
-            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        var converted =
+            editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
+                BlockListModel;
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(2, converted.Count);
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(2, converted.Count);
 
-            BlockListItem item0 = converted[0];
-            Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Content.Key);
-            Assert.AreEqual("Test1", item0.Content.ContentType.Alias);
-            Assert.AreEqual(Guid.Parse("1F613E26CE274898908A561437AF5100"), item0.Settings.Key);
-            Assert.AreEqual("Setting2", item0.Settings.ContentType.Alias);
+        var item0 = converted[0];
+        Assert.AreEqual(Guid.Parse("1304E1DD-AC87-4396-84FE-8A399231CB3D"), item0.Content.Key);
+        Assert.AreEqual("Test1", item0.Content.ContentType.Alias);
+        Assert.AreEqual(Guid.Parse("1F613E26CE274898908A561437AF5100"), item0.Settings.Key);
+        Assert.AreEqual("Setting2", item0.Settings.ContentType.Alias);
 
-            BlockListItem item1 = converted[1];
-            Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item1.Content.Key);
-            Assert.AreEqual("Test2", item1.Content.ContentType.Alias);
-            Assert.AreEqual(Guid.Parse("63027539B0DB45E7B70459762D4E83DD"), item1.Settings.Key);
-            Assert.AreEqual("Setting1", item1.Settings.ContentType.Alias);
-        }
+        var item1 = converted[1];
+        Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item1.Content.Key);
+        Assert.AreEqual("Test2", item1.Content.ContentType.Alias);
+        Assert.AreEqual(Guid.Parse("63027539B0DB45E7B70459762D4E83DD"), item1.Settings.Key);
+        Assert.AreEqual("Setting1", item1.Settings.ContentType.Alias);
+    }
 
-        [Test]
-        public void Data_Item_Removed_If_Removed_From_Config()
+    [Test]
+    public void Data_Item_Removed_If_Removed_From_Config()
+    {
+        var editor = CreateConverter();
+
+        // The data below expects that ContentKey1 + ContentKey2 + SettingsKey1 + SettingsKey2 exist but only ContentKey2 exists so
+        // the data should all be filtered.
+        var config = new BlockListConfiguration
         {
-            BlockListPropertyValueConverter editor = CreateConverter();
-
-            // The data below expects that ContentKey1 + ContentKey2 + SettingsKey1 + SettingsKey2 exist but only ContentKey2 exists so
-            // the data should all be filtered.
-            var config = new BlockListConfiguration
+            Blocks = new[]
             {
-                Blocks = new[]
+                new BlockListConfiguration.BlockConfiguration
                 {
-                    new BlockListConfiguration.BlockConfiguration
-                    {
-                        ContentElementTypeKey = _contentKey2,
-                        SettingsElementTypeKey = null
-                    }
-                }
-            };
+                    ContentElementTypeKey = _contentKey2,
+                    SettingsElementTypeKey = null,
+                },
+            },
+        };
 
-            IPublishedPropertyType propertyType = GetPropertyType(config);
-            IPublishedElement publishedElement = Mock.Of<IPublishedElement>();
+        var propertyType = GetPropertyType(config);
+        var publishedElement = Mock.Of<IPublishedElement>();
 
-            string json = @"
+        var json = @"
 {
     layout: {
         '" + Constants.PropertyEditors.Aliases.BlockList + @"': [
@@ -421,15 +425,16 @@ data: []}";
     ],
 }";
 
-            var converted = editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as BlockListModel;
+        var converted =
+            editor.ConvertIntermediateToObject(publishedElement, propertyType, PropertyCacheLevel.None, json, false) as
+                BlockListModel;
 
-            Assert.IsNotNull(converted);
-            Assert.AreEqual(1, converted.Count);
+        Assert.IsNotNull(converted);
+        Assert.AreEqual(1, converted.Count);
 
-            BlockListItem item0 = converted[0];
-            Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item0.Content.Key);
-            Assert.AreEqual("Test2", item0.Content.ContentType.Alias);
-            Assert.IsNull(item0.Settings);
-        }
+        var item0 = converted[0];
+        Assert.AreEqual(Guid.Parse("0A4A416E-547D-464F-ABCC-6F345C17809A"), item0.Content.Key);
+        Assert.AreEqual("Test2", item0.Content.ContentType.Alias);
+        Assert.IsNull(item0.Settings);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
index da7f22716a..fb16320bfe 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ColorListValidatorTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -12,60 +10,58 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class ColorListValidatorTest
 {
-    [TestFixture]
-    public class ColorListValidatorTest
+    private readonly ILoggerFactory _loggerFactory = NullLoggerFactory.Instance;
+
+    private ColorPickerPropertyEditor ColorPickerPropertyEditor => new(
+        Mock.Of<IDataValueEditorFactory>(),
+        Mock.Of<IIOHelper>(),
+        new JsonNetSerializer(),
+        Mock.Of<IEditorConfigurationParser>());
+
+    [Test]
+    public void Only_Tests_On_JArray()
     {
-        private readonly ILoggerFactory _loggerFactory = NullLoggerFactory.Instance;
+        var validator = new ColorPickerConfigurationEditor.ColorListValidator();
+        var result =
+            validator.Validate(
+                "hello",
+                null,
+                ColorPickerPropertyEditor);
+        Assert.AreEqual(0, result.Count());
+    }
 
-        private ColorPickerPropertyEditor ColorPickerPropertyEditor => new ColorPickerPropertyEditor(
-            Mock.Of<IDataValueEditorFactory>(),
-            Mock.Of<IIOHelper>(),
-            new JsonNetSerializer(),
-            Mock.Of<IEditorConfigurationParser>());
+    [Test]
+    public void Only_Tests_On_JArray_Of_Item_JObject()
+    {
+        var validator = new ColorPickerConfigurationEditor.ColorListValidator();
+        var result =
+            validator.Validate(
+                new JArray("hello", "world"),
+                null,
+                ColorPickerPropertyEditor);
+        Assert.AreEqual(0, result.Count());
+    }
 
-        [Test]
-        public void Only_Tests_On_JArray()
-        {
-            var validator = new ColorPickerConfigurationEditor.ColorListValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    "hello",
-                    null,
-                    ColorPickerPropertyEditor);
-            Assert.AreEqual(0, result.Count());
-        }
-
-        [Test]
-        public void Only_Tests_On_JArray_Of_Item_JObject()
-        {
-            var validator = new ColorPickerConfigurationEditor.ColorListValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    new JArray("hello", "world"),
-                    null,
-                    ColorPickerPropertyEditor);
-            Assert.AreEqual(0, result.Count());
-        }
-
-        [Test]
-        public void Validates_Color_Vals()
-        {
-            var validator = new ColorPickerConfigurationEditor.ColorListValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    new JArray(
-                        JObject.FromObject(new { value = "CC0000" }),
-                        JObject.FromObject(new { value = "zxcvzxcvxzcv" }),
-                        JObject.FromObject(new { value = "ABC" }),
-                        JObject.FromObject(new { value = "1234567" })),
-                    null,
-                    ColorPickerPropertyEditor);
-            Assert.AreEqual(2, result.Count());
-        }
+    [Test]
+    public void Validates_Color_Vals()
+    {
+        var validator = new ColorPickerConfigurationEditor.ColorListValidator();
+        var result =
+            validator.Validate(
+                new JArray(
+                    JObject.FromObject(new { value = "CC0000" }),
+                    JObject.FromObject(new { value = "zxcvzxcvxzcv" }),
+                    JObject.FromObject(new { value = "ABC" }),
+                    JObject.FromObject(new { value = "1234567" })),
+                null,
+                ColorPickerPropertyEditor);
+        Assert.AreEqual(2, result.Count());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
index 28875852f2..d15659c77a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/ConvertersTests.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.DependencyInjection;
@@ -16,200 +15,201 @@ using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.PublishedCache.Internal;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Tests.Common.Published;
-using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class ConvertersTests
 {
-    [TestFixture]
-    public class ConvertersTests
+    [Test]
+    public void SimpleConverter3Test()
     {
-        [Test]
-        public void SimpleConverter3Test()
+        var register = new ServiceCollection();
+
+        var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
+
+        composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
+            .Append<SimpleConverter3A>()
+            .Append<SimpleConverter3B>();
+
+        IPublishedModelFactory factory = new PublishedModelFactory(
+            new[]
+            {
+                typeof(PublishedSnapshotTestObjects.TestElementModel1),
+                typeof(PublishedSnapshotTestObjects.TestElementModel2),
+                typeof(PublishedSnapshotTestObjects.TestContentModel1),
+                typeof(PublishedSnapshotTestObjects.TestContentModel2),
+            },
+            Mock.Of<IPublishedValueFallback>());
+        register.AddTransient(f => factory);
+
+        var cacheMock = new Mock<IPublishedContentCache>();
+        var cacheContent = new Dictionary<int, IPublishedContent>();
+        cacheMock.Setup(x => x.GetById(It.IsAny<int>())).Returns<int>(id =>
+            cacheContent.TryGetValue(id, out var content) ? content : null);
+        var publishedSnapshotMock = new Mock<IPublishedSnapshot>();
+        publishedSnapshotMock.Setup(x => x.Content).Returns(cacheMock.Object);
+        var publishedSnapshotAccessorMock = new Mock<IPublishedSnapshotAccessor>();
+        var localPublishedSnapshot = publishedSnapshotMock.Object;
+        publishedSnapshotAccessorMock.Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot)).Returns(true);
+        register.AddTransient(f => publishedSnapshotAccessorMock.Object);
+
+        var registerFactory = composition.CreateServiceProvider();
+        var converters =
+            registerFactory.GetRequiredService<PropertyValueConverterCollection>();
+
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        var dataType1 = new DataType(
+            new VoidEditor(
+                Mock.Of<IDataValueEditorFactory>()),
+            serializer)
+        { Id = 1 };
+        var dataType2 = new DataType(
+            new VoidEditor(
+                "2",
+                Mock.Of<IDataValueEditorFactory>()),
+            serializer)
+        { Id = 2 };
+
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(new[] { dataType1, dataType2 });
+
+        var contentTypeFactory = new PublishedContentTypeFactory(factory, converters, dataTypeServiceMock.Object);
+
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType, int i)
         {
-            var register = new ServiceCollection();
-
-            var composition = new UmbracoBuilder(register, Mock.Of<IConfiguration>(), TestHelper.GetMockedTypeLoader());
-
-            composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>()
-                .Append<SimpleConverter3A>()
-                .Append<SimpleConverter3B>();
-
-            IPublishedModelFactory factory = new PublishedModelFactory(
-                new[]
-                {
-                    typeof(PublishedSnapshotTestObjects.TestElementModel1),
-                    typeof(PublishedSnapshotTestObjects.TestElementModel2),
-                    typeof(PublishedSnapshotTestObjects.TestContentModel1),
-                    typeof(PublishedSnapshotTestObjects.TestContentModel2)
-                }, Mock.Of<IPublishedValueFallback>());
-            register.AddTransient(f => factory);
-
-            var cacheMock = new Mock<IPublishedContentCache>();
-            var cacheContent = new Dictionary<int, IPublishedContent>();
-            cacheMock.Setup(x => x.GetById(It.IsAny<int>())).Returns<int>(id =>
-                cacheContent.TryGetValue(id, out IPublishedContent content) ? content : null);
-            var publishedSnapshotMock = new Mock<IPublishedSnapshot>();
-            publishedSnapshotMock.Setup(x => x.Content).Returns(cacheMock.Object);
-            var publishedSnapshotAccessorMock = new Mock<IPublishedSnapshotAccessor>();
-            var localPublishedSnapshot = publishedSnapshotMock.Object;
-            publishedSnapshotAccessorMock.Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot)).Returns(true);
-            register.AddTransient(f => publishedSnapshotAccessorMock.Object);
-
-            IServiceProvider registerFactory = composition.CreateServiceProvider();
-            PropertyValueConverterCollection converters =
-                registerFactory.GetRequiredService<PropertyValueConverterCollection>();
-
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            var dataType1 = new DataType(
-                new VoidEditor(
-                    Mock.Of<IDataValueEditorFactory>()),
-                serializer) { Id = 1 };
-            var dataType2 = new DataType(
-                new VoidEditor(
-                    "2",
-                    Mock.Of<IDataValueEditorFactory>()),
-                serializer) { Id = 2 };
-
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(new[] { dataType1, dataType2 });
-
-            var contentTypeFactory = new PublishedContentTypeFactory(factory, converters, dataTypeServiceMock.Object);
-
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType, int i)
-            {
-                yield return contentTypeFactory.CreatePropertyType(contentType, "prop" + i, i);
-            }
-
-            IPublishedContentType elementType1 =
-                contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", t => CreatePropertyTypes(t, 1));
-            IPublishedContentType elementType2 =
-                contentTypeFactory.CreateContentType(Guid.NewGuid(), 1001, "element2", t => CreatePropertyTypes(t, 2));
-            IPublishedContentType contentType1 =
-                contentTypeFactory.CreateContentType(Guid.NewGuid(), 1002, "content1", t => CreatePropertyTypes(t, 1));
-            IPublishedContentType contentType2 =
-                contentTypeFactory.CreateContentType(Guid.NewGuid(), 1003, "content2", t => CreatePropertyTypes(t, 2));
-
-            var element1 = new PublishedElement(
-                elementType1,
-                Guid.NewGuid(),
-                new Dictionary<string, object> { { "prop1", "val1" } },
-                false);
-            var element2 = new PublishedElement(
-                elementType2,
-                Guid.NewGuid(),
-                new Dictionary<string, object> { { "prop2", "1003" } },
-                false);
-            var cnt1 = new InternalPublishedContent(contentType1)
-            {
-                Id = 1003,
-                Properties = new[]
-                {
-                    new InternalPublishedProperty { Alias = "prop1", SolidHasValue = true, SolidValue = "val1" }
-                }
-            };
-            var cnt2 = new InternalPublishedContent(contentType1)
-            {
-                Id = 1004,
-                Properties = new[]
-                {
-                    new InternalPublishedProperty { Alias = "prop2", SolidHasValue = true, SolidValue = "1003" }
-                }
-            };
-
-            IPublishedModelFactory publishedModelFactory = registerFactory.GetRequiredService<IPublishedModelFactory>();
-            cacheContent[cnt1.Id] = cnt1.CreateModel(publishedModelFactory);
-            cacheContent[cnt2.Id] = cnt2.CreateModel(publishedModelFactory);
-
-            // can get the actual property Clr type
-            // ie ModelType gets properly mapped by IPublishedContentModelFactory
-            // must test ModelClrType with special equals 'cos they are not ref-equals
-            Assert.IsTrue(ModelType.Equals(
-                typeof(IEnumerable<>).MakeGenericType(ModelType.For("content1")),
-                contentType2.GetPropertyType("prop2").ModelClrType));
-            Assert.AreEqual(
-                typeof(IEnumerable<PublishedSnapshotTestObjects.TestContentModel1>),
-                contentType2.GetPropertyType("prop2").ClrType);
-
-            // can create a model for an element
-            IPublishedElement model1 = factory.CreateModel(element1);
-            Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestElementModel1>(model1);
-            Assert.AreEqual("val1", ((PublishedSnapshotTestObjects.TestElementModel1)model1).Prop1);
-
-            // can create a model for a published content
-            IPublishedElement model2 = factory.CreateModel(element2);
-            Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestElementModel2>(model2);
-            var mmodel2 = (PublishedSnapshotTestObjects.TestElementModel2)model2;
-
-            // and get direct property
-            Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestContentModel1[]>(
-                model2.Value(Mock.Of<IPublishedValueFallback>(), "prop2"));
-            Assert.AreEqual(
-                1,
-                ((PublishedSnapshotTestObjects.TestContentModel1[])model2.Value(Mock.Of<IPublishedValueFallback>(), "prop2")).Length);
-
-            // and get model property
-            Assert.IsInstanceOf<IEnumerable<PublishedSnapshotTestObjects.TestContentModel1>>(mmodel2.Prop2);
-            Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestContentModel1[]>(mmodel2.Prop2);
-            PublishedSnapshotTestObjects.TestContentModel1 mmodel1 = mmodel2.Prop2.First();
-
-            // and we get what we want
-            Assert.AreSame(cacheContent[mmodel1.Id], mmodel1);
+            yield return contentTypeFactory.CreatePropertyType(contentType, "prop" + i, i);
         }
 
-        public class SimpleConverter3A : PropertyValueConverterBase
+        var elementType1 =
+            contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", t => CreatePropertyTypes(t, 1));
+        var elementType2 =
+            contentTypeFactory.CreateContentType(Guid.NewGuid(), 1001, "element2", t => CreatePropertyTypes(t, 2));
+        var contentType1 =
+            contentTypeFactory.CreateContentType(Guid.NewGuid(), 1002, "content1", t => CreatePropertyTypes(t, 1));
+        var contentType2 =
+            contentTypeFactory.CreateContentType(Guid.NewGuid(), 1003, "content2", t => CreatePropertyTypes(t, 2));
+
+        var element1 = new PublishedElement(
+            elementType1,
+            Guid.NewGuid(),
+            new Dictionary<string, object> { { "prop1", "val1" } },
+            false);
+        var element2 = new PublishedElement(
+            elementType2,
+            Guid.NewGuid(),
+            new Dictionary<string, object> { { "prop2", "1003" } },
+            false);
+        var cnt1 = new InternalPublishedContent(contentType1)
         {
-            public override bool IsConverter(IPublishedPropertyType propertyType)
-                => propertyType.EditorAlias == "Umbraco.Void";
+            Id = 1003,
+            Properties = new[]
+            {
+                new InternalPublishedProperty { Alias = "prop1", SolidHasValue = true, SolidValue = "val1" },
+            },
+        };
+        var cnt2 = new InternalPublishedContent(contentType1)
+        {
+            Id = 1004,
+            Properties = new[]
+            {
+                new InternalPublishedProperty { Alias = "prop2", SolidHasValue = true, SolidValue = "1003" },
+            },
+        };
 
-            public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
-                => typeof(string);
+        var publishedModelFactory = registerFactory.GetRequiredService<IPublishedModelFactory>();
+        cacheContent[cnt1.Id] = cnt1.CreateModel(publishedModelFactory);
+        cacheContent[cnt2.Id] = cnt2.CreateModel(publishedModelFactory);
 
-            public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
-                => PropertyCacheLevel.Element;
+        // can get the actual property Clr type
+        // ie ModelType gets properly mapped by IPublishedContentModelFactory
+        // must test ModelClrType with special equals 'cos they are not ref-equals
+        Assert.IsTrue(ModelType.Equals(
+            typeof(IEnumerable<>).MakeGenericType(ModelType.For("content1")),
+            contentType2.GetPropertyType("prop2").ModelClrType));
+        Assert.AreEqual(
+            typeof(IEnumerable<PublishedSnapshotTestObjects.TestContentModel1>),
+            contentType2.GetPropertyType("prop2").ClrType);
+
+        // can create a model for an element
+        var model1 = factory.CreateModel(element1);
+        Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestElementModel1>(model1);
+        Assert.AreEqual("val1", ((PublishedSnapshotTestObjects.TestElementModel1)model1).Prop1);
+
+        // can create a model for a published content
+        var model2 = factory.CreateModel(element2);
+        Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestElementModel2>(model2);
+        var mmodel2 = (PublishedSnapshotTestObjects.TestElementModel2)model2;
+
+        // and get direct property
+        Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestContentModel1[]>(
+            model2.Value(Mock.Of<IPublishedValueFallback>(), "prop2"));
+        Assert.AreEqual(
+            1,
+            ((PublishedSnapshotTestObjects.TestContentModel1[])model2.Value(Mock.Of<IPublishedValueFallback>(), "prop2")).Length);
+
+        // and get model property
+        Assert.IsInstanceOf<IEnumerable<PublishedSnapshotTestObjects.TestContentModel1>>(mmodel2.Prop2);
+        Assert.IsInstanceOf<PublishedSnapshotTestObjects.TestContentModel1[]>(mmodel2.Prop2);
+        var mmodel1 = mmodel2.Prop2.First();
+
+        // and we get what we want
+        Assert.AreSame(cacheContent[mmodel1.Id], mmodel1);
+    }
+
+    public class SimpleConverter3A : PropertyValueConverterBase
+    {
+        public override bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.EditorAlias == "Umbraco.Void";
+
+        public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
+            => typeof(string);
+
+        public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => PropertyCacheLevel.Element;
+    }
+
+    public class SimpleConverter3B : PropertyValueConverterBase
+    {
+        private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+
+        public SimpleConverter3B(IPublishedSnapshotAccessor publishedSnapshotAccessor) =>
+            _publishedSnapshotAccessor = publishedSnapshotAccessor;
+
+        public override bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.EditorAlias == "Umbraco.Void.2";
+
+        public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
+            => typeof(IEnumerable<>).MakeGenericType(ModelType.For("content1"));
+
+        public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => PropertyCacheLevel.Elements;
+
+        public override object ConvertSourceToIntermediate(
+            IPublishedElement owner,
+            IPublishedPropertyType propertyType,
+            object source,
+            bool preview)
+        {
+            var s = source as string;
+            return s?.Split(',').Select(int.Parse).ToArray() ?? Array.Empty<int>();
         }
 
-        public class SimpleConverter3B : PropertyValueConverterBase
+        public override object ConvertIntermediateToObject(
+            IPublishedElement owner,
+            IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel,
+            object inter,
+            bool preview)
         {
-            private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
-
-            public SimpleConverter3B(IPublishedSnapshotAccessor publishedSnapshotAccessor) =>
-                _publishedSnapshotAccessor = publishedSnapshotAccessor;
-
-            public override bool IsConverter(IPublishedPropertyType propertyType)
-                => propertyType.EditorAlias == "Umbraco.Void.2";
-
-            public override Type GetPropertyValueType(IPublishedPropertyType propertyType)
-                => typeof(IEnumerable<>).MakeGenericType(ModelType.For("content1"));
-
-            public override PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
-                => PropertyCacheLevel.Elements;
-
-            public override object ConvertSourceToIntermediate(
-                IPublishedElement owner,
-                IPublishedPropertyType propertyType,
-                object source,
-                bool preview)
-            {
-                var s = source as string;
-                return s?.Split(',').Select(int.Parse).ToArray() ?? Array.Empty<int>();
-            }
-
-            public override object ConvertIntermediateToObject(
-                IPublishedElement owner,
-                IPublishedPropertyType propertyType,
-                PropertyCacheLevel referenceCacheLevel,
-                object inter,
-                bool preview) {
-                var publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
-                return ((int[])inter).Select(x =>
+            var publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
+            return ((int[])inter).Select(x =>
                 (PublishedSnapshotTestObjects.TestContentModel1)publishedSnapshot.Content
                     .GetById(x)).ToArray();
-            } 
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs
index 7ccfa14e81..46ed8af979 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/DataValueReferenceFactoryCollectionTests.cs
@@ -4,12 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Composing;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Editors;
@@ -20,245 +17,184 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Models.Property;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class DataValueReferenceFactoryCollectionTests
 {
-    [TestFixture]
-    public class DataValueReferenceFactoryCollectionTests
+    private IDataValueEditorFactory DataValueEditorFactory { get; } = Mock.Of<IDataValueEditorFactory>(
+        x => x.Create<MediaPickerPropertyEditor.MediaPickerPropertyValueEditor>(It.IsAny<DataEditorAttribute>())
+             ==
+             new MediaPickerPropertyEditor.MediaPickerPropertyValueEditor(
+                 Mock.Of<ILocalizedTextService>(),
+                 Mock.Of<IShortStringHelper>(),
+                 Mock.Of<IJsonSerializer>(),
+                 Mock.Of<IIOHelper>(),
+                 new DataEditorAttribute("a", "a", "a")));
+
+    private IIOHelper IOHelper { get; } = Mock.Of<IIOHelper>();
+
+    private IShortStringHelper ShortStringHelper { get; } = Mock.Of<IShortStringHelper>();
+
+    private IEditorConfigurationParser EditorConfigurationParser { get; } = Mock.Of<IEditorConfigurationParser>();
+
+    [Test]
+    public void GetAllReferences_All_Variants_With_IDataValueReferenceFactory()
     {
-        private IDataValueEditorFactory DataValueEditorFactory { get; } = Mock.Of<IDataValueEditorFactory>(
-            x=>x.Create<MediaPickerPropertyEditor.MediaPickerPropertyValueEditor>(It.IsAny<DataEditorAttribute>())
-                == new MediaPickerPropertyEditor.MediaPickerPropertyValueEditor(Mock.Of<ILocalizedTextService>(), Mock.Of<IShortStringHelper>(), Mock.Of<IJsonSerializer>(), Mock.Of<IIOHelper>(), new DataEditorAttribute("a", "a", "a")));
-        private IIOHelper IOHelper { get; } = Mock.Of<IIOHelper>();
+        var collection = new DataValueReferenceFactoryCollection(() => new TestDataValueReferenceFactory().Yield());
 
-        private IShortStringHelper ShortStringHelper { get; } = Mock.Of<IShortStringHelper>();
-
-        private IEditorConfigurationParser EditorConfigurationParser { get; } = Mock.Of<IEditorConfigurationParser>();
-
-        [Test]
-        public void GetAllReferences_All_Variants_With_IDataValueReferenceFactory()
-        {
-            var collection = new DataValueReferenceFactoryCollection(() => new TestDataValueReferenceFactory().Yield());
-
-            // label does not implement IDataValueReference
-            var labelEditor = new LabelPropertyEditor(
-                DataValueEditorFactory,
-                IOHelper,
-                EditorConfigurationParser);
-            var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => labelEditor.Yield()));
-            var trackedUdi1 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi2 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi3 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi4 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var property = new Property(new PropertyType(ShortStringHelper, new DataType(labelEditor, serializer))
-            {
-                Variations = ContentVariation.CultureAndSegment
-            })
+        // label does not implement IDataValueReference
+        var labelEditor = new LabelPropertyEditor(
+            DataValueEditorFactory,
+            IOHelper,
+            EditorConfigurationParser);
+        var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => labelEditor.Yield()));
+        var trackedUdi1 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi2 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi3 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi4 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var property =
+            new Property(
+                new PropertyType(ShortStringHelper, new DataType(labelEditor, serializer))
+                {
+                    Variations = ContentVariation.CultureAndSegment,
+                })
             {
                 Values = new List<PropertyValue>
                 {
                     // Ignored (no culture)
-                    new PropertyValue
-                    {
-                        EditedValue = trackedUdi1
-                    },
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        EditedValue = trackedUdi2
-                    },
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        Segment = "A",
-                        EditedValue = trackedUdi3
-                    },
+                    new() { EditedValue = trackedUdi1 },
+                    new() { Culture = "en-US", EditedValue = trackedUdi2 },
+                    new() { Culture = "en-US", Segment = "A", EditedValue = trackedUdi3 },
 
                     // Ignored (no culture)
-                    new PropertyValue
-                    {
-                        Segment = "A",
-                        EditedValue = trackedUdi4
-                    },
+                    new() { Segment = "A", EditedValue = trackedUdi4 },
 
                     // Duplicate
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        Segment = "B",
-                        EditedValue = trackedUdi3
-                    }
-                }
+                    new() { Culture = "en-US", Segment = "B", EditedValue = trackedUdi3 },
+                },
             };
-            var properties = new PropertyCollection
-            {
-                property
-            };
-            IEnumerable<UmbracoEntityReference> result = collection.GetAllReferences(properties, propertyEditors);
+        var properties = new PropertyCollection { property };
+        var result = collection.GetAllReferences(properties, propertyEditors).ToArray();
 
-            Assert.AreEqual(2, result.Count());
-            Assert.AreEqual(trackedUdi2, result.ElementAt(0).Udi.ToString());
-            Assert.AreEqual(trackedUdi3, result.ElementAt(1).Udi.ToString());
-        }
+        Assert.AreEqual(2, result.Count());
+        Assert.AreEqual(trackedUdi2, result.ElementAt(0).Udi.ToString());
+        Assert.AreEqual(trackedUdi3, result.ElementAt(1).Udi.ToString());
+    }
 
-        [Test]
-        public void GetAllReferences_All_Variants_With_IDataValueReference_Editor()
-        {
-            var collection = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
+    [Test]
+    public void GetAllReferences_All_Variants_With_IDataValueReference_Editor()
+    {
+        var collection = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
 
-            // mediaPicker does implement IDataValueReference
-            var mediaPicker = new MediaPickerPropertyEditor(
-                DataValueEditorFactory,
-                IOHelper,
-                EditorConfigurationParser);
-            var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => mediaPicker.Yield()));
-            var trackedUdi1 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi2 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi3 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi4 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var property = new Property(new PropertyType(ShortStringHelper, new DataType(mediaPicker, serializer))
-            {
-                Variations = ContentVariation.CultureAndSegment
-            })
+        // mediaPicker does implement IDataValueReference
+        var mediaPicker = new MediaPickerPropertyEditor(
+            DataValueEditorFactory,
+            IOHelper,
+            EditorConfigurationParser);
+        var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => mediaPicker.Yield()));
+        var trackedUdi1 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi2 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi3 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi4 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var property =
+            new Property(
+                new PropertyType(ShortStringHelper, new DataType(mediaPicker, serializer))
+                {
+                    Variations = ContentVariation.CultureAndSegment,
+                })
             {
                 Values = new List<PropertyValue>
                 {
                     // Ignored (no culture)
-                    new PropertyValue
-                    {
-                        EditedValue = trackedUdi1
-                    },
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        EditedValue = trackedUdi2
-                    },
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        Segment = "A",
-                        EditedValue = trackedUdi3
-                    },
+                    new() { EditedValue = trackedUdi1 },
+                    new() { Culture = "en-US", EditedValue = trackedUdi2 },
+                    new() { Culture = "en-US", Segment = "A", EditedValue = trackedUdi3 },
 
                     // Ignored (no culture)
-                    new PropertyValue
-                    {
-                        Segment = "A",
-                        EditedValue = trackedUdi4
-                    },
+                    new() { Segment = "A", EditedValue = trackedUdi4 },
 
                     // Duplicate
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        Segment = "B",
-                        EditedValue = trackedUdi3
-                    }
-                }
+                    new() { Culture = "en-US", Segment = "B", EditedValue = trackedUdi3 },
+                },
             };
-            var properties = new PropertyCollection
+        var properties = new PropertyCollection { property };
+        var result = collection.GetAllReferences(properties, propertyEditors).ToArray();
+
+        Assert.AreEqual(2, result.Count());
+        Assert.AreEqual(trackedUdi2, result.ElementAt(0).Udi.ToString());
+        Assert.AreEqual(trackedUdi3, result.ElementAt(1).Udi.ToString());
+    }
+
+    [Test]
+    public void GetAllReferences_Invariant_With_IDataValueReference_Editor()
+    {
+        var collection = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
+
+        // mediaPicker does implement IDataValueReference
+        var mediaPicker = new MediaPickerPropertyEditor(
+            DataValueEditorFactory,
+            IOHelper,
+            EditorConfigurationParser);
+        var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => mediaPicker.Yield()));
+        var trackedUdi1 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi2 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi3 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var trackedUdi4 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var property =
+            new Property(new PropertyType(ShortStringHelper, new DataType(mediaPicker, serializer))
             {
-                property
-            };
-            IEnumerable<UmbracoEntityReference> result = collection.GetAllReferences(properties, propertyEditors);
-
-            Assert.AreEqual(2, result.Count());
-            Assert.AreEqual(trackedUdi2, result.ElementAt(0).Udi.ToString());
-            Assert.AreEqual(trackedUdi3, result.ElementAt(1).Udi.ToString());
-        }
-
-        [Test]
-        public void GetAllReferences_Invariant_With_IDataValueReference_Editor()
-        {
-            var collection = new DataValueReferenceFactoryCollection(() => Enumerable.Empty<IDataValueReferenceFactory>());
-
-            // mediaPicker does implement IDataValueReference
-            var mediaPicker = new MediaPickerPropertyEditor(
-                DataValueEditorFactory,
-                IOHelper,
-                EditorConfigurationParser);
-            var propertyEditors = new PropertyEditorCollection(new DataEditorCollection(() => mediaPicker.Yield()));
-            var trackedUdi1 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi2 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi3 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var trackedUdi4 = Udi.Create(Constants.UdiEntityType.Media, Guid.NewGuid()).ToString();
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var property = new Property(new PropertyType(ShortStringHelper, new DataType(mediaPicker, serializer))
-            {
-                Variations = ContentVariation.Nothing | ContentVariation.Segment
+                Variations = ContentVariation.Nothing | ContentVariation.Segment,
             })
             {
                 Values = new List<PropertyValue>
                 {
-                    new PropertyValue
-                    {
-                        EditedValue = trackedUdi1
-                    },
+                    new() { EditedValue = trackedUdi1 },
 
                     // Ignored (has culture)
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        EditedValue = trackedUdi2
-                    },
+                    new() { Culture = "en-US", EditedValue = trackedUdi2 },
 
                     // Ignored (has culture)
-                    new PropertyValue
-                    {
-                        Culture = "en-US",
-                        Segment = "A",
-                        EditedValue = trackedUdi3
-                    },
-                    new PropertyValue
-                    {
-                        Segment = "A",
-                        EditedValue = trackedUdi4
-                    },
+                    new() { Culture = "en-US", Segment = "A", EditedValue = trackedUdi3 },
+                    new() { Segment = "A", EditedValue = trackedUdi4 },
 
                     // Duplicate
-                    new PropertyValue
-                    {
-                        Segment = "B",
-                        EditedValue = trackedUdi4
-                    }
-                }
+                    new() { Segment = "B", EditedValue = trackedUdi4 },
+                },
             };
-            var properties = new PropertyCollection
-            {
-                property
-            };
-            IEnumerable<UmbracoEntityReference> result = collection.GetAllReferences(properties, propertyEditors);
+        var properties = new PropertyCollection { property };
+        var result = collection.GetAllReferences(properties, propertyEditors).ToArray();
 
-            Assert.AreEqual(2, result.Count());
-            Assert.AreEqual(trackedUdi1, result.ElementAt(0).Udi.ToString());
-            Assert.AreEqual(trackedUdi4, result.ElementAt(1).Udi.ToString());
-        }
+        Assert.AreEqual(2, result.Count());
+        Assert.AreEqual(trackedUdi1, result.ElementAt(0).Udi.ToString());
+        Assert.AreEqual(trackedUdi4, result.ElementAt(1).Udi.ToString());
+    }
 
-        private class TestDataValueReferenceFactory : IDataValueReferenceFactory
+    private class TestDataValueReferenceFactory : IDataValueReferenceFactory
+    {
+        public IDataValueReference GetDataValueReference() => new TestMediaDataValueReference();
+
+        public bool IsForEditor(IDataEditor dataEditor) => dataEditor.Alias == Constants.PropertyEditors.Aliases.Label;
+
+        private class TestMediaDataValueReference : IDataValueReference
         {
-            public IDataValueReference GetDataValueReference() => new TestMediaDataValueReference();
-
-            public bool IsForEditor(IDataEditor dataEditor) => dataEditor.Alias == Constants.PropertyEditors.Aliases.Label;
-
-            private class TestMediaDataValueReference : IDataValueReference
+            public IEnumerable<UmbracoEntityReference> GetReferences(object value)
             {
-                public IEnumerable<UmbracoEntityReference> GetReferences(object value)
+                // This is the same as the media picker, it will just try to parse the value directly as a UDI.
+                var asString = value is string str ? str : value?.ToString();
+
+                if (string.IsNullOrEmpty(asString))
                 {
-                    // This is the same as the media picker, it will just try to parse the value directly as a UDI.
-                    var asString = value is string str ? str : value?.ToString();
+                    yield break;
+                }
 
-                    if (string.IsNullOrEmpty(asString))
-                    {
-                        yield break;
-                    }
-
-                    if (UdiParser.TryParse(asString, out Udi udi))
-                    {
-                        yield return new UmbracoEntityReference(udi);
-                    }
+                if (UdiParser.TryParse(asString, out var udi))
+                {
+                    yield return new UmbracoEntityReference(udi);
                 }
             }
         }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
index da264a216a..5afcf793de 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/EnsureUniqueValuesValidatorTest.cs
@@ -1,8 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -12,92 +10,90 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class EnsureUniqueValuesValidatorTest
 {
-    [TestFixture]
-    public class EnsureUniqueValuesValidatorTest
+    private readonly ILoggerFactory _loggerFactory = NullLoggerFactory.Instance;
+
+    private ColorPickerPropertyEditor ColorPickerPropertyEditor => new(
+        Mock.Of<IDataValueEditorFactory>(),
+        Mock.Of<IIOHelper>(),
+        new JsonNetSerializer(),
+        Mock.Of<IEditorConfigurationParser>());
+
+    [Test]
+    public void Only_Tests_On_JArray()
     {
-        private readonly ILoggerFactory _loggerFactory = NullLoggerFactory.Instance;
+        var validator = new ValueListUniqueValueValidator();
+        var result =
+            validator.Validate(
+                "hello",
+                null,
+                new ColorPickerPropertyEditor(
+                    Mock.Of<IDataValueEditorFactory>(),
+                    Mock.Of<IIOHelper>(),
+                    new JsonNetSerializer(),
+                    Mock.Of<IEditorConfigurationParser>()));
+        Assert.AreEqual(0, result.Count());
+    }
 
+    [Test]
+    public void Only_Tests_On_JArray_Of_Item_JObject()
+    {
+        var validator = new ValueListUniqueValueValidator();
+        var result =
+            validator.Validate(
+                new JArray("hello", "world"),
+                null,
+                ColorPickerPropertyEditor);
+        Assert.AreEqual(0, result.Count());
+    }
 
-        private ColorPickerPropertyEditor ColorPickerPropertyEditor => new ColorPickerPropertyEditor(
-            Mock.Of<IDataValueEditorFactory>(),
-            Mock.Of<IIOHelper>(),
-            new JsonNetSerializer(),
-            Mock.Of<IEditorConfigurationParser>());
-        [Test]
-        public void Only_Tests_On_JArray()
-        {
-            var validator = new ValueListUniqueValueValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    "hello",
-                    null,
-                    new ColorPickerPropertyEditor(
-                        Mock.Of<IDataValueEditorFactory>(),
-                        Mock.Of<IIOHelper>(),
-                        new JsonNetSerializer(),
-                        Mock.Of<IEditorConfigurationParser>()));
-            Assert.AreEqual(0, result.Count());
-        }
+    [Test]
+    public void Allows_Unique_Values()
+    {
+        var validator = new ValueListUniqueValueValidator();
+        var result =
+            validator.Validate(
+                new JArray(
+                    JObject.FromObject(new { value = "hello" }),
+                    JObject.FromObject(new { value = "world" })),
+                null,
+                ColorPickerPropertyEditor);
+        Assert.AreEqual(0, result.Count());
+    }
 
-        [Test]
-        public void Only_Tests_On_JArray_Of_Item_JObject()
-        {
-            var validator = new ValueListUniqueValueValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    new JArray("hello", "world"),
-                    null,
-                    ColorPickerPropertyEditor);
-            Assert.AreEqual(0, result.Count());
-        }
+    [Test]
+    public void Does_Not_Allow_Multiple_Values()
+    {
+        var validator = new ValueListUniqueValueValidator();
+        var result =
+            validator.Validate(
+                new JArray(
+                    JObject.FromObject(new { value = "hello" }),
+                    JObject.FromObject(new { value = "hello" })),
+                null,
+                ColorPickerPropertyEditor);
+        Assert.AreEqual(1, result.Count());
+    }
 
-        [Test]
-        public void Allows_Unique_Values()
-        {
-            var validator = new ValueListUniqueValueValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    new JArray(
-                        JObject.FromObject(new { value = "hello" }),
-                        JObject.FromObject(new { value = "world" })),
-                    null,
-                    ColorPickerPropertyEditor);
-            Assert.AreEqual(0, result.Count());
-        }
-
-        [Test]
-        public void Does_Not_Allow_Multiple_Values()
-        {
-            var validator = new ValueListUniqueValueValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    new JArray(
-                        JObject.FromObject(new { value = "hello" }),
-                        JObject.FromObject(new { value = "hello" })),
-                    null,
-                    ColorPickerPropertyEditor);
-            Assert.AreEqual(1, result.Count());
-        }
-
-        [Test]
-        public void Validates_Multiple_Duplicate_Values()
-        {
-            var validator = new ValueListUniqueValueValidator();
-            IEnumerable<ValidationResult> result =
-                validator.Validate(
-                    new JArray(
-                        JObject.FromObject(new { value = "hello" }),
-                        JObject.FromObject(new { value = "hello" }),
-                        JObject.FromObject(new { value = "world" }),
-                        JObject.FromObject(new { value = "world" })),
-                    null,
-                    ColorPickerPropertyEditor);
-            Assert.AreEqual(2, result.Count());
-        }
+    [Test]
+    public void Validates_Multiple_Duplicate_Values()
+    {
+        var validator = new ValueListUniqueValueValidator();
+        var result =
+            validator.Validate(
+                new JArray(
+                    JObject.FromObject(new { value = "hello" }),
+                    JObject.FromObject(new { value = "hello" }),
+                    JObject.FromObject(new { value = "world" }),
+                    JObject.FromObject(new { value = "world" })),
+                null,
+                ColorPickerPropertyEditor);
+        Assert.AreEqual(2, result.Count());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
index a38d23eb0e..faa9e449cb 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/MultiValuePropertyEditorTests.cs
@@ -3,12 +3,10 @@
 
 using System.Collections.Generic;
 using System.Globalization;
-using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
@@ -17,138 +15,162 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+/// <summary>
+///     Tests for the base classes of ValueEditors and PreValueEditors that are used for Property Editors that edit
+///     multiple values such as the drop down list, check box list, color picker, etc....
+/// </summary>
+/// <remarks>
+///     Mostly this used to test the we'd store INT Ids in the Db but publish STRING values or sometimes the INT values
+///     to cache. Now we always just deal with strings and we'll keep the tests that show that.
+/// </remarks>
+[TestFixture]
+public class MultiValuePropertyEditorTests
 {
-    /// <summary>
-    /// Tests for the base classes of ValueEditors and PreValueEditors that are used for Property Editors that edit
-    /// multiple values such as the drop down list, check box list, color picker, etc....
-    /// </summary>
-    /// <remarks>
-    /// Mostly this used to test the we'd store INT Ids in the Db but publish STRING values or sometimes the INT values
-    /// to cache. Now we always just deal with strings and we'll keep the tests that show that.
-    /// </remarks>
-    [TestFixture]
-    public class MultiValuePropertyEditorTests
+    [Test]
+    public void DropDownMultipleValueEditor_Format_Data_For_Cache()
     {
-        [Test]
-        public void DropDownMultipleValueEditor_Format_Data_For_Cache()
+        var dataValueEditorFactoryMock = new Mock<IDataValueEditorFactory>();
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var checkBoxListPropertyEditor = new CheckBoxListPropertyEditor(
+            dataValueEditorFactoryMock.Object,
+            Mock.Of<ILocalizedTextService>(),
+            Mock.Of<IIOHelper>(),
+            Mock.Of<IEditorConfigurationParser>());
+        var dataType = new DataType(checkBoxListPropertyEditor, serializer)
         {
-            var dataValueEditorFactoryMock = new Mock<IDataValueEditorFactory>();
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var checkBoxListPropertyEditor = new CheckBoxListPropertyEditor(dataValueEditorFactoryMock.Object, Mock.Of<ILocalizedTextService>(),Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>());
-            var dataType = new DataType(checkBoxListPropertyEditor, serializer)
-            {
-                Configuration = new ValueListConfiguration
-                {
-                    Items = new List<ValueListConfiguration.ValueListItem>
-                    {
-                        new ValueListConfiguration.ValueListItem { Id = 4567, Value = "Value 1" },
-                        new ValueListConfiguration.ValueListItem { Id = 1234, Value = "Value 2" },
-                        new ValueListConfiguration.ValueListItem { Id = 8910, Value = "Value 3" }
-                    }
-                },
-                Id = 1
-            };
-
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            dataTypeServiceMock
-                .Setup(x => x.GetDataType(It.IsAny<int>()))
-                .Returns(dataType);
-
-            //TODO use builders instead of this mess
-            var multipleValueEditor = new MultipleValueEditor(Mock.Of<ILocalizedTextService>(), Mock.Of<IShortStringHelper>(), Mock.Of<IJsonSerializer>(), Mock.Of<IIOHelper>(), new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"));
-            dataValueEditorFactoryMock
-                .Setup(x => x.Create<MultipleValueEditor>(It.IsAny<DataEditorAttribute>()))
-                .Returns(multipleValueEditor);
-
-            var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), dataType));
-            prop.SetValue("Value 1,Value 2,Value 3");
-
-            IDataValueEditor valueEditor = dataType.Editor.GetValueEditor();
-            ((DataValueEditor)valueEditor).Configuration = dataType.Configuration;
-            var result = valueEditor.ConvertDbToString(prop.PropertyType, prop.GetValue());
-
-            Assert.AreEqual("Value 1,Value 2,Value 3", result);
-        }
-
-        [Test]
-        public void DropDownValueEditor_Format_Data_For_Cache()
-        {
-            var dataValueEditorFactoryMock = new Mock<IDataValueEditorFactory>();
-
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var checkBoxListPropertyEditor = new CheckBoxListPropertyEditor(dataValueEditorFactoryMock.Object, Mock.Of<ILocalizedTextService>(),Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>());
-            var dataType = new DataType(checkBoxListPropertyEditor, serializer)
-            {
-                Configuration = new ValueListConfiguration
-                {
-                    Items = new List<ValueListConfiguration.ValueListItem>
-                    {
-                        new ValueListConfiguration.ValueListItem { Id = 10, Value = "Value 1" },
-                        new ValueListConfiguration.ValueListItem { Id = 1234, Value = "Value 2" },
-                        new ValueListConfiguration.ValueListItem { Id = 11, Value = "Value 3" }
-                    }
-                },
-                Id = 1
-            };
-
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            dataTypeServiceMock
-                .Setup(x => x.GetDataType(It.IsAny<int>()))
-                .Returns(dataType);
-
-            //TODO use builders instead of this mess
-            var multipleValueEditor = new MultipleValueEditor(Mock.Of<ILocalizedTextService>(), Mock.Of<IShortStringHelper>(), Mock.Of<IJsonSerializer>(), Mock.Of<IIOHelper>(), new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"));
-            dataValueEditorFactoryMock
-                .Setup(x => x.Create<MultipleValueEditor>(It.IsAny<DataEditorAttribute>()))
-                .Returns(multipleValueEditor);
-
-            var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), dataType));
-            prop.SetValue("Value 2");
-
-            var result = dataType.Editor.GetValueEditor().ConvertDbToString(prop.PropertyType, prop.GetValue());
-
-            Assert.AreEqual("Value 2", result);
-        }
-
-        [Test]
-        public void DropDownPreValueEditor_Format_Data_For_Editor()
-        {
-            // editor wants ApplicationContext.Current.Services.TextService
-            // (that should be fixed with proper injection)
-            var textService = new Mock<ILocalizedTextService>();
-            textService.Setup(x => x.Localize(It.IsAny<string>(), It.IsAny<string>(),It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>())).Returns("blah");
-
-            //// var appContext = new ApplicationContext(
-            ////    new DatabaseContext(TestObjects.GetIDatabaseFactoryMock(), logger, Mock.Of<IRuntimeState>(), Mock.Of<IMigrationEntryService>()),
-            ////    new ServiceContext(
-            ////        localizedTextService: textService.Object
-            ////    ),
-            ////    Mock.Of<CacheHelper>(),
-            ////    new ProfilingLogger(logger, Mock.Of<IProfiler>()))
-            //// {
-            ////    //IsReady = true
-            //// };
-            //// Current.ApplicationContext = appContext;
-
-            var configuration = new ValueListConfiguration
+            Configuration = new ValueListConfiguration
             {
                 Items = new List<ValueListConfiguration.ValueListItem>
                 {
-                    new ValueListConfiguration.ValueListItem { Id = 1, Value = "Item 1" },
-                    new ValueListConfiguration.ValueListItem { Id = 2, Value = "Item 2" },
-                    new ValueListConfiguration.ValueListItem { Id = 3, Value = "Item 3" }
-                }
-            };
+                    new() { Id = 4567, Value = "Value 1" },
+                    new() { Id = 1234, Value = "Value 2" },
+                    new() { Id = 8910, Value = "Value 3" },
+                },
+            },
+            Id = 1,
+        };
 
-            var editor = new ValueListConfigurationEditor(Mock.Of<ILocalizedTextService>(), Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>());
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        dataTypeServiceMock
+            .Setup(x => x.GetDataType(It.IsAny<int>()))
+            .Returns(dataType);
 
-            Dictionary<string, object> result = editor.ToConfigurationEditor(configuration);
+        // TODO use builders instead of this mess
+        var multipleValueEditor = new MultipleValueEditor(
+            Mock.Of<ILocalizedTextService>(),
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IJsonSerializer>(),
+            Mock.Of<IIOHelper>(),
+            new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"));
+        dataValueEditorFactoryMock
+            .Setup(x => x.Create<MultipleValueEditor>(It.IsAny<DataEditorAttribute>()))
+            .Returns(multipleValueEditor);
 
-            // 'result' is meant to be serialized, is built with anonymous objects
-            // so we cannot really test what's in it - but by serializing it
-            var json = JsonConvert.SerializeObject(result);
-            Assert.AreEqual("{\"items\":{\"1\":{\"value\":\"Item 1\",\"sortOrder\":1},\"2\":{\"value\":\"Item 2\",\"sortOrder\":2},\"3\":{\"value\":\"Item 3\",\"sortOrder\":3}}}", json);
-        }
+        var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), dataType));
+        prop.SetValue("Value 1,Value 2,Value 3");
+
+        var valueEditor = dataType.Editor.GetValueEditor();
+        ((DataValueEditor)valueEditor).Configuration = dataType.Configuration;
+        var result = valueEditor.ConvertDbToString(prop.PropertyType, prop.GetValue());
+
+        Assert.AreEqual("Value 1,Value 2,Value 3", result);
+    }
+
+    [Test]
+    public void DropDownValueEditor_Format_Data_For_Cache()
+    {
+        var dataValueEditorFactoryMock = new Mock<IDataValueEditorFactory>();
+
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var checkBoxListPropertyEditor = new CheckBoxListPropertyEditor(
+            dataValueEditorFactoryMock.Object,
+            Mock.Of<ILocalizedTextService>(),
+            Mock.Of<IIOHelper>(),
+            Mock.Of<IEditorConfigurationParser>());
+        var dataType = new DataType(checkBoxListPropertyEditor, serializer)
+        {
+            Configuration = new ValueListConfiguration
+            {
+                Items = new List<ValueListConfiguration.ValueListItem>
+                {
+                    new() { Id = 10, Value = "Value 1" },
+                    new() { Id = 1234, Value = "Value 2" },
+                    new() { Id = 11, Value = "Value 3" },
+                },
+            },
+            Id = 1,
+        };
+
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        dataTypeServiceMock
+            .Setup(x => x.GetDataType(It.IsAny<int>()))
+            .Returns(dataType);
+
+        // TODO use builders instead of this mess
+        var multipleValueEditor = new MultipleValueEditor(
+            Mock.Of<ILocalizedTextService>(),
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IJsonSerializer>(),
+            Mock.Of<IIOHelper>(),
+            new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"));
+        dataValueEditorFactoryMock
+            .Setup(x => x.Create<MultipleValueEditor>(It.IsAny<DataEditorAttribute>()))
+            .Returns(multipleValueEditor);
+
+        var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), dataType));
+        prop.SetValue("Value 2");
+
+        var result = dataType.Editor.GetValueEditor().ConvertDbToString(prop.PropertyType, prop.GetValue());
+
+        Assert.AreEqual("Value 2", result);
+    }
+
+    [Test]
+    public void DropDownPreValueEditor_Format_Data_For_Editor()
+    {
+        // editor wants ApplicationContext.Current.Services.TextService
+        // (that should be fixed with proper injection)
+        var textService = new Mock<ILocalizedTextService>();
+        textService.Setup(x => x.Localize(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<CultureInfo>(),
+                It.IsAny<IDictionary<string, string>>()))
+            .Returns("blah");
+
+        //// var appContext = new ApplicationContext(
+        ////    new DatabaseContext(TestObjects.GetIDatabaseFactoryMock(), logger, Mock.Of<IRuntimeState>(), Mock.Of<IMigrationEntryService>()),
+        ////    new ServiceContext(
+        ////        localizedTextService: textService.Object
+        ////    ),
+        ////    Mock.Of<CacheHelper>(),
+        ////    new ProfilingLogger(logger, Mock.Of<IProfiler>()))
+        //// {
+        ////    //IsReady = true
+        //// };
+        //// Current.ApplicationContext = appContext;
+
+        var configuration = new ValueListConfiguration
+        {
+            Items = new List<ValueListConfiguration.ValueListItem>
+            {
+                new() { Id = 1, Value = "Item 1" },
+                new() { Id = 2, Value = "Item 2" },
+                new() { Id = 3, Value = "Item 3" },
+            },
+        };
+
+        var editor = new ValueListConfigurationEditor(Mock.Of<ILocalizedTextService>(), Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>());
+
+        var result = editor.ToConfigurationEditor(configuration);
+
+        // 'result' is meant to be serialized, is built with anonymous objects
+        // so we cannot really test what's in it - but by serializing it
+        var json = JsonConvert.SerializeObject(result);
+        Assert.AreEqual(
+            "{\"items\":{\"1\":{\"value\":\"Item 1\",\"sortOrder\":1},\"2\":{\"value\":\"Item 2\",\"sortOrder\":2},\"3\":{\"value\":\"Item 3\",\"sortOrder\":3}}}",
+            json);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs
index f32f252633..8e9743ee84 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/NestedContentPropertyComponentTests.cs
@@ -7,53 +7,59 @@ using Newtonsoft.Json.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.PropertyEditors;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class NestedContentPropertyComponentTests
 {
-    [TestFixture]
-    public class NestedContentPropertyComponentTests
+    private static void AreEqualJson(string expected, string actual) =>
+        Assert.AreEqual(JToken.Parse(expected), JToken.Parse(actual));
+
+    [Test]
+    public void Invalid_Json()
     {
-        private static void AreEqualJson(string expected, string actual)
-        {
-            Assert.AreEqual(JToken.Parse(expected), JToken.Parse(actual));
-        }
-        
-        [Test]
-        public void Invalid_Json()
-        {
-            var component = new NestedContentPropertyHandler();
+        var component = new NestedContentPropertyHandler();
 
-            Assert.DoesNotThrow(() => component.CreateNestedContentKeys("this is not json", true));
+        Assert.DoesNotThrow(() => component.CreateNestedContentKeys("this is not json", true));
+    }
+
+    [Test]
+    public void No_Nesting()
+    {
+        Guid[] guids = { Guid.NewGuid(), Guid.NewGuid() };
+        var guidCounter = 0;
+
+        Guid GuidFactory()
+        {
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void No_Nesting()
-        {
-            Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid() };
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            var json = @"[
+        var json = @"[
               {""key"":""04a6dba8-813c-4144-8aca-86a3f24ebf08"",""name"":""Item 1"",""ncContentTypeAlias"":""nested"",""text"":""woot""},
               {""key"":""d8e214d8-c5a5-4b45-9b51-4050dd47f5fa"",""name"":""Item 2"",""ncContentTypeAlias"":""nested"",""text"":""zoot""}
             ]";
-            var expected = json
-                .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
-                .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString());
+        var expected = json
+            .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
+            .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString());
 
-            var component = new NestedContentPropertyHandler();
-            var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
+        var component = new NestedContentPropertyHandler();
+        var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
 
-            AreEqualJson(expected, actual);
+        AreEqualJson(expected, actual);
+    }
+
+    [Test]
+    public void One_Level_Nesting_Unescaped()
+    {
+        Guid[] guids = { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
+        var guidCounter = 0;
+
+        Guid GuidFactory()
+        {
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void One_Level_Nesting_Unescaped()
-        {
-            Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            var json = @"[{
+        var json = @"[{
 		        ""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
 		        ""name"": ""Item 1"",
 		        ""ncContentTypeAlias"": ""text"",
@@ -76,28 +82,32 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 			    }]
 	        }]";
 
-            var expected = json
-                .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
-                .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
-                .Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
-                .Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
+        var expected = json
+            .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
+            .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
+            .Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
+            .Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
 
-            var component = new NestedContentPropertyHandler();
-            var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
+        var component = new NestedContentPropertyHandler();
+        var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
 
-            AreEqualJson(expected, actual);
+        AreEqualJson(expected, actual);
+    }
+
+    [Test]
+    public void One_Level_Nesting_Escaped()
+    {
+        Guid[] guids = { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
+        var guidCounter = 0;
+
+        Guid GuidFactory()
+        {
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void One_Level_Nesting_Escaped()
-        {
-            Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
-            // and this is how to do that, the result will also include quotes around it.
-            var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"
+        // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+        // and this is how to do that, the result will also include quotes around it.
+        var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"
             [{
 				""key"": ""dccf550c-3a05-469e-95e1-a8f560f788c2"",
 				""name"": ""Item 1"",
@@ -111,7 +121,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 			}
 		]").ToString(Formatting.None));
 
-            var json = @"[{
+        var json = @"[{
 		        ""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
 		        ""name"": ""Item 1"",
 		        ""ncContentTypeAlias"": ""text"",
@@ -125,28 +135,32 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 	        }
         ]";
 
-            var expected = json
-                .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
-                .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
-                .Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
-                .Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
+        var expected = json
+            .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
+            .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
+            .Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
+            .Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
 
-            var component = new NestedContentPropertyHandler();
-            var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
+        var component = new NestedContentPropertyHandler();
+        var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
 
-            AreEqualJson(expected, actual);
+        AreEqualJson(expected, actual);
+    }
+
+    [Test]
+    public void Nested_In_Complex_Editor_Escaped()
+    {
+        Guid[] guids = { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
+        var guidCounter = 0;
+
+        Guid GuidFactory()
+        {
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void Nested_In_Complex_Editor_Escaped()
-        {
-            Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
-            // and this is how to do that, the result will also include quotes around it.
-            var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
+        // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+        // and this is how to do that, the result will also include quotes around it.
+        var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
 				""key"": ""dccf550c-3a05-469e-95e1-a8f560f788c2"",
 				""name"": ""Item 1"",
 				""ncContentTypeAlias"": ""text"",
@@ -159,8 +173,8 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 			}
 		]").ToString(Formatting.None));
 
-            // Complex editor such as the grid
-            var complexEditorJsonEscaped = @"{
+        // Complex editor such as the grid
+        var complexEditorJsonEscaped = @"{
   ""name"": ""1 column layout"",
   ""sections"": [
     {
@@ -215,7 +229,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
     }]
 }";
 
-            var json = @"[{
+        var json = @"[{
 		""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
 		""name"": ""Item 1"",
 		""ncContentTypeAlias"": ""text"",
@@ -229,50 +243,58 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 	}
 ]";
 
-            var expected = json
-                .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
-                .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
-                .Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
-                .Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
+        var expected = json
+            .Replace("04a6dba8-813c-4144-8aca-86a3f24ebf08", guids[0].ToString())
+            .Replace("d8e214d8-c5a5-4b45-9b51-4050dd47f5fa", guids[1].ToString())
+            .Replace("dccf550c-3a05-469e-95e1-a8f560f788c2", guids[2].ToString())
+            .Replace("fbde4288-8382-4e13-8933-ed9c160de050", guids[3].ToString());
 
-            var component = new NestedContentPropertyHandler();
-            var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
+        var component = new NestedContentPropertyHandler();
+        var actual = component.CreateNestedContentKeys(json, false, GuidFactory);
 
-            AreEqualJson(expected, actual);
+        AreEqualJson(expected, actual);
+    }
+
+    [Test]
+    public void No_Nesting_Generates_Keys_For_Missing_Items()
+    {
+        Guid[] guids = { Guid.NewGuid() };
+        var guidCounter = 0;
+
+        Guid GuidFactory()
+        {
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void No_Nesting_Generates_Keys_For_Missing_Items()
-        {
-            Guid[] guids = new[] { Guid.NewGuid() };
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            var json = @"[
+        var json = @"[
   {""key"":""04a6dba8-813c-4144-8aca-86a3f24ebf08"",""name"":""Item 1 my key wont change"",""ncContentTypeAlias"":""nested"",""text"":""woot""},
   {""name"":""Item 2 was copied and has no key prop"",""ncContentTypeAlias"":""nested"",""text"":""zoot""}
 ]";
 
-            var component = new NestedContentPropertyHandler();
-            var result = component.CreateNestedContentKeys(json, true, GuidFactory);
+        var component = new NestedContentPropertyHandler();
+        var result = component.CreateNestedContentKeys(json, true, GuidFactory);
 
-            // Ensure the new GUID is put in a key into the JSON
-            Assert.IsTrue(result.Contains(guids[0].ToString()));
+        // Ensure the new GUID is put in a key into the JSON
+        Assert.IsTrue(result.Contains(guids[0].ToString()));
 
-            // Ensure that the original key is NOT changed/modified & still exists
-            Assert.IsTrue(result.Contains("04a6dba8-813c-4144-8aca-86a3f24ebf08"));
+        // Ensure that the original key is NOT changed/modified & still exists
+        Assert.IsTrue(result.Contains("04a6dba8-813c-4144-8aca-86a3f24ebf08"));
+    }
+
+    [Test]
+    public void One_Level_Nesting_Escaped_Generates_Keys_For_Missing_Items()
+    {
+        Guid[] guids = { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
+        var guidCounter = 0;
+
+        Guid GuidFactory()
+        {
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void One_Level_Nesting_Escaped_Generates_Keys_For_Missing_Items()
-        {
-            Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid(), Guid.NewGuid() };
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
-            // and this is how to do that, the result will also include quotes around it.
-            var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
+        // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+        // and this is how to do that, the result will also include quotes around it.
+        var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
 				""name"": ""Item 1"",
 				""ncContentTypeAlias"": ""text"",
 				""text"": ""woot""
@@ -283,7 +305,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 			}
 		]").ToString(Formatting.None));
 
-            var json = @"[{
+        var json = @"[{
 		""name"": ""Item 1 was copied and has no key"",
 		""ncContentTypeAlias"": ""text"",
 		""text"": ""woot""
@@ -296,25 +318,29 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 	}
 ]";
 
-            var component = new NestedContentPropertyHandler();
-            var result = component.CreateNestedContentKeys(json, true, GuidFactory);
+        var component = new NestedContentPropertyHandler();
+        var result = component.CreateNestedContentKeys(json, true, GuidFactory);
 
-            // Ensure the new GUID is put in a key into the JSON for each item
-            Assert.IsTrue(result.Contains(guids[0].ToString()));
-            Assert.IsTrue(result.Contains(guids[1].ToString()));
-            Assert.IsTrue(result.Contains(guids[2].ToString()));
+        // Ensure the new GUID is put in a key into the JSON for each item
+        Assert.IsTrue(result.Contains(guids[0].ToString()));
+        Assert.IsTrue(result.Contains(guids[1].ToString()));
+        Assert.IsTrue(result.Contains(guids[2].ToString()));
+    }
+
+    [Test]
+    public void Nested_In_Complex_Editor_Escaped_Generates_Keys_For_Missing_Items()
+    {
+        Guid[] guids = { Guid.NewGuid(), Guid.NewGuid() };
+        var guidCounter = 0;
+
+        Guid GuidFactory()
+        {
+            return guids[guidCounter++];
         }
 
-        [Test]
-        public void Nested_In_Complex_Editor_Escaped_Generates_Keys_For_Missing_Items()
-        {
-            Guid[] guids = new[] { Guid.NewGuid(), Guid.NewGuid() };
-            var guidCounter = 0;
-            Guid GuidFactory() => guids[guidCounter++];
-
-            // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
-            // and this is how to do that, the result will also include quotes around it.
-            var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
+        // we need to ensure the escaped json is consistent with how it will be re-escaped after parsing
+        // and this is how to do that, the result will also include quotes around it.
+        var subJsonEscaped = JsonConvert.ToString(JToken.Parse(@"[{
 				""key"": ""dccf550c-3a05-469e-95e1-a8f560f788c2"",
 				""name"": ""Item 1"",
 				""ncContentTypeAlias"": ""text"",
@@ -326,8 +352,8 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 			}
 		]").ToString(Formatting.None));
 
-            // Complex editor such as the grid
-            var complexEditorJsonEscaped = @"{
+        // Complex editor such as the grid
+        var complexEditorJsonEscaped = @"{
   ""name"": ""1 column layout"",
   ""sections"": [
     {
@@ -382,7 +408,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
     }]
 }";
 
-            var json = @"[{
+        var json = @"[{
 		""key"": ""04a6dba8-813c-4144-8aca-86a3f24ebf08"",
 		""name"": ""Item 1"",
 		""ncContentTypeAlias"": ""text"",
@@ -395,12 +421,11 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
 	}
 ]";
 
-            var component = new NestedContentPropertyHandler();
-            var result = component.CreateNestedContentKeys(json, true, GuidFactory);
+        var component = new NestedContentPropertyHandler();
+        var result = component.CreateNestedContentKeys(json, true, GuidFactory);
 
-            // Ensure the new GUID is put in a key into the JSON for each item
-            Assert.IsTrue(result.Contains(guids[0].ToString()));
-            Assert.IsTrue(result.Contains(guids[1].ToString()));
-        }
+        // Ensure the new GUID is put in a key into the JSON for each item
+        Assert.IsTrue(result.Contains(guids[0].ToString()));
+        Assert.IsTrue(result.Contains(guids[1].ToString()));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs
index f6edb2a105..ccc46e5423 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueConverterTests.cs
@@ -13,125 +13,125 @@ using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class PropertyEditorValueConverterTests
 {
-    [TestFixture]
-    public class PropertyEditorValueConverterTests
+    // see notes in the converter
+    // only ONE date format is expected here
+
+    // [TestCase("2012-11-10", true)]
+    // [TestCase("2012/11/10", true)]
+    // [TestCase("10/11/2012", true)]
+    // [TestCase("11/10/2012", false)]
+    // [TestCase("Sat 10, Nov 2012", true)]
+    // [TestCase("Saturday 10, Nov 2012", true)]
+    // [TestCase("Sat 10, November 2012", true)]
+    // [TestCase("Saturday 10, November 2012", true)]
+    // [TestCase("2012-11-10 13:14:15", true)]
+    [TestCase("2012-11-10 13:14:15", true)]
+    [TestCase("2012-11-10T13:14:15", true)]
+    [TestCase("", false)]
+    public void CanConvertDatePickerPropertyEditor(string date, bool expected)
     {
-        // see notes in the converter
-        // only ONE date format is expected here
+        var converter = new DatePickerValueConverter();
+        var dateTime = new DateTime(2012, 11, 10, 13, 14, 15);
+        var result = converter.ConvertSourceToIntermediate(null, null, date, false); // does not use type for conversion
 
-        // [TestCase("2012-11-10", true)]
-        // [TestCase("2012/11/10", true)]
-        // [TestCase("10/11/2012", true)]
-        // [TestCase("11/10/2012", false)]
-        // [TestCase("Sat 10, Nov 2012", true)]
-        // [TestCase("Saturday 10, Nov 2012", true)]
-        // [TestCase("Sat 10, November 2012", true)]
-        // [TestCase("Saturday 10, November 2012", true)]
-        // [TestCase("2012-11-10 13:14:15", true)]
-        [TestCase("2012-11-10 13:14:15", true)]
-        [TestCase("2012-11-10T13:14:15", true)]
-        [TestCase("", false)]
-        public void CanConvertDatePickerPropertyEditor(string date, bool expected)
+        if (expected)
         {
-            var converter = new DatePickerValueConverter();
-            var dateTime = new DateTime(2012, 11, 10, 13, 14, 15);
-            var result = converter.ConvertSourceToIntermediate(null, null, date, false); // does not use type for conversion
-
-            if (expected)
-            {
-                Assert.AreEqual(dateTime.Date, ((DateTime)result).Date);
-            }
-            else
-            {
-                Assert.AreNotEqual(dateTime.Date, ((DateTime)result).Date);
-            }
+            Assert.AreEqual(dateTime.Date, ((DateTime)result).Date);
         }
-
-        [TestCase("TRUE", true)]
-        [TestCase("True", true)]
-        [TestCase("true", true)]
-        [TestCase("1", true)]
-        [TestCase(1, true)]
-        [TestCase(true, true)]
-        [TestCase("FALSE", false)]
-        [TestCase("False", false)]
-        [TestCase("false", false)]
-        [TestCase("0", false)]
-        [TestCase(0, false)]
-        [TestCase(false, false)]
-        [TestCase("", false)]
-        [TestCase(null, false)]
-        [TestCase("blah", false)]
-        public void CanConvertYesNoPropertyEditor(object value, bool expected)
+        else
         {
-            var converter = new YesNoValueConverter();
-            var result = converter.ConvertSourceToIntermediate(null, null, value, false); // does not use type for conversion
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestCase("[\"apples\"]", new[] { "apples" })]
-        [TestCase("[\"apples\",\"oranges\"]", new[] { "apples", "oranges" })]
-        [TestCase("[\"apples\",\"oranges\",\"pears\"]", new[] { "apples", "oranges", "pears" })]
-        [TestCase("", new string[] { })]
-        [TestCase(null, new string[] { })]
-        public void CanConvertCheckboxListPropertyEditor(object value, IEnumerable<string> expected)
-        {
-            var converter = new CheckboxListValueConverter(new JsonNetSerializer());
-            var result = converter.ConvertIntermediateToObject(null, null, PropertyCacheLevel.Unknown, value, false);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestCase("[\"apples\"]", new[] { "apples" })]
-        [TestCase("[\"apples\",\"oranges\"]", new[] { "apples", "oranges" })]
-        [TestCase("[\"apples\",\"oranges\",\"pears\"]", new[] { "apples", "oranges", "pears" })]
-        [TestCase("", new string[] { })]
-        [TestCase(null, new string[] { })]
-        public void CanConvertDropdownListMultiplePropertyEditor(object value, IEnumerable<string> expected)
-        {
-            var mockPublishedContentTypeFactory = new Mock<IPublishedContentTypeFactory>();
-            mockPublishedContentTypeFactory.Setup(x => x.GetDataType(123))
-                .Returns(new PublishedDataType(123, "test", new Lazy<object>(() => new DropDownFlexibleConfiguration
-                    {
-                        Multiple = true
-                    })));
-
-            var publishedPropType = new PublishedPropertyType(
-                new PublishedContentType(Guid.NewGuid(), 1234, "test", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing),
-                new PropertyType(Mock.Of<IShortStringHelper>(),  "test", ValueStorageType.Nvarchar) { DataTypeId = 123 },
-                new PropertyValueConverterCollection(() => Enumerable.Empty<IPropertyValueConverter>()),
-                Mock.Of<IPublishedModelFactory>(),
-                mockPublishedContentTypeFactory.Object);
-
-            var converter = new FlexibleDropdownPropertyValueConverter();
-            var inter = converter.ConvertSourceToIntermediate(null, publishedPropType, value, false);
-            var result = converter.ConvertIntermediateToObject(null, publishedPropType, PropertyCacheLevel.Unknown, inter, false);
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestCase("1", 1)]
-        [TestCase("1", 1)]
-        [TestCase("0", 0)]
-        [TestCase("0", 0)]
-        [TestCase(null, 0)]
-        [TestCase(null, 0)]
-        [TestCase("-1", -1)]
-        [TestCase("-1", -1)]
-        [TestCase("1.65", 1.65)]
-        [TestCase("1.65", 1.65)]
-        [TestCase("-1.65", -1.65)]
-        [TestCase("-1.65", -1.65)]
-        public void CanConvertDecimalAliasPropertyEditor(object value, double expected)
-        {
-            var converter = new DecimalValueConverter();
-            var inter = converter.ConvertSourceToIntermediate(null, null, value, false);
-            var result = converter.ConvertIntermediateToObject(null, null, PropertyCacheLevel.Unknown, inter, false);
-
-            Assert.AreEqual(expected, result);
+            Assert.AreNotEqual(dateTime.Date, ((DateTime)result).Date);
         }
     }
+
+    [TestCase("TRUE", true)]
+    [TestCase("True", true)]
+    [TestCase("true", true)]
+    [TestCase("1", true)]
+    [TestCase(1, true)]
+    [TestCase(true, true)]
+    [TestCase("FALSE", false)]
+    [TestCase("False", false)]
+    [TestCase("false", false)]
+    [TestCase("0", false)]
+    [TestCase(0, false)]
+    [TestCase(false, false)]
+    [TestCase("", false)]
+    [TestCase(null, false)]
+    [TestCase("blah", false)]
+    public void CanConvertYesNoPropertyEditor(object value, bool expected)
+    {
+        var converter = new YesNoValueConverter();
+        var result =
+            converter.ConvertSourceToIntermediate(null, null, value, false); // does not use type for conversion
+
+        Assert.AreEqual(expected, result);
+    }
+
+    [TestCase("[\"apples\"]", new[] { "apples" })]
+    [TestCase("[\"apples\",\"oranges\"]", new[] { "apples", "oranges" })]
+    [TestCase("[\"apples\",\"oranges\",\"pears\"]", new[] { "apples", "oranges", "pears" })]
+    [TestCase("", new string[] { })]
+    [TestCase(null, new string[] { })]
+    public void CanConvertCheckboxListPropertyEditor(object value, IEnumerable<string> expected)
+    {
+        var converter = new CheckboxListValueConverter(new JsonNetSerializer());
+        var result = converter.ConvertIntermediateToObject(null, null, PropertyCacheLevel.Unknown, value, false);
+
+        Assert.AreEqual(expected, result);
+    }
+
+    [TestCase("[\"apples\"]", new[] { "apples" })]
+    [TestCase("[\"apples\",\"oranges\"]", new[] { "apples", "oranges" })]
+    [TestCase("[\"apples\",\"oranges\",\"pears\"]", new[] { "apples", "oranges", "pears" })]
+    [TestCase("", new string[] { })]
+    [TestCase(null, new string[] { })]
+    public void CanConvertDropdownListMultiplePropertyEditor(object value, IEnumerable<string> expected)
+    {
+        var mockPublishedContentTypeFactory = new Mock<IPublishedContentTypeFactory>();
+        mockPublishedContentTypeFactory.Setup(x => x.GetDataType(123))
+            .Returns(new PublishedDataType(123, "test",
+                new Lazy<object>(() => new DropDownFlexibleConfiguration { Multiple = true })));
+
+        var publishedPropType = new PublishedPropertyType(
+            new PublishedContentType(Guid.NewGuid(), 1234, "test", PublishedItemType.Content,
+                Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing),
+            new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Nvarchar) { DataTypeId = 123 },
+            new PropertyValueConverterCollection(() => Enumerable.Empty<IPropertyValueConverter>()),
+            Mock.Of<IPublishedModelFactory>(),
+            mockPublishedContentTypeFactory.Object);
+
+        var converter = new FlexibleDropdownPropertyValueConverter();
+        var inter = converter.ConvertSourceToIntermediate(null, publishedPropType, value, false);
+        var result =
+            converter.ConvertIntermediateToObject(null, publishedPropType, PropertyCacheLevel.Unknown, inter, false);
+
+        Assert.AreEqual(expected, result);
+    }
+
+    [TestCase("1", 1)]
+    [TestCase("1", 1)]
+    [TestCase("0", 0)]
+    [TestCase("0", 0)]
+    [TestCase(null, 0)]
+    [TestCase(null, 0)]
+    [TestCase("-1", -1)]
+    [TestCase("-1", -1)]
+    [TestCase("1.65", 1.65)]
+    [TestCase("1.65", 1.65)]
+    [TestCase("-1.65", -1.65)]
+    [TestCase("-1.65", -1.65)]
+    public void CanConvertDecimalAliasPropertyEditor(object value, double expected)
+    {
+        var converter = new DecimalValueConverter();
+        var inter = converter.ConvertSourceToIntermediate(null, null, value, false);
+        var result = converter.ConvertIntermediateToObject(null, null, PropertyCacheLevel.Unknown, inter, false);
+
+        Assert.AreEqual(expected, result);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs
index 4248120b5e..e8eda1e595 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs
@@ -4,141 +4,139 @@
 using System;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors;
+
+[TestFixture]
+public class PropertyEditorValueEditorTests
 {
-    [TestFixture]
-    public class PropertyEditorValueEditorTests
+    [TestCase("{prop1: 'val1', prop2: 'val2'}", true)]
+    [TestCase("{1,2,3,4}", false)]
+    [TestCase("[1,2,3,4]", true)]
+    [TestCase("hello world", false)]
+    public void Value_Editor_Can_Convert_To_Json_Object_For_Editor(string value, bool isOk)
     {
-        [TestCase("{prop1: 'val1', prop2: 'val2'}", true)]
-        [TestCase("{1,2,3,4}", false)]
-        [TestCase("[1,2,3,4]", true)]
-        [TestCase("hello world", false)]
-        public void Value_Editor_Can_Convert_To_Json_Object_For_Editor(string value, bool isOk)
-        {
-            var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Nvarchar));
-            prop.SetValue(value);
+        var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Nvarchar));
+        prop.SetValue(value);
 
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.String);
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.String);
 
-            object result = valueEditor.ToEditor(prop);
-            Assert.AreEqual(isOk, !(result is string));
-        }
+        var result = valueEditor.ToEditor(prop);
+        Assert.AreEqual(isOk, !(result is string));
+    }
 
-        [TestCase("STRING", "hello", "hello")]
-        [TestCase("TEXT", "hello", "hello")]
-        [TestCase("INT", "123", 123)]
-        [TestCase("INT", "", null)] // test empty string for int
-        [TestCase("DATETIME", "", null)] // test empty string for date
-        public void Value_Editor_Can_Convert_To_Clr_Type(string valueType, string val, object expected)
-        {
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(valueType);
+    [TestCase("STRING", "hello", "hello")]
+    [TestCase("TEXT", "hello", "hello")]
+    [TestCase("INT", "123", 123)]
+    [TestCase("INT", "", null)] // test empty string for int
+    [TestCase("DATETIME", "", null)] // test empty string for date
+    public void Value_Editor_Can_Convert_To_Clr_Type(string valueType, string val, object expected)
+    {
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(valueType);
 
-            Attempt<object> result = valueEditor.TryConvertValueToCrlType(val);
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(expected, result.Result);
-        }
+        var result = valueEditor.TryConvertValueToCrlType(val);
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(expected, result.Result);
+    }
 
-        // The following decimal tests have not been added as [TestCase]s
-        // as the decimal type cannot be used as an attribute parameter
-        [Test]
-        public void Value_Editor_Can_Convert_To_Decimal_Clr_Type()
-        {
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
+    // The following decimal tests have not been added as [TestCase]s
+    // as the decimal type cannot be used as an attribute parameter
+    [Test]
+    public void Value_Editor_Can_Convert_To_Decimal_Clr_Type()
+    {
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
 
-            Attempt<object> result = valueEditor.TryConvertValueToCrlType("12.34");
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(12.34M, result.Result);
-        }
+        var result = valueEditor.TryConvertValueToCrlType("12.34");
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(12.34M, result.Result);
+    }
 
-        [Test]
-        public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Other_Separator()
-        {
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
+    [Test]
+    public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Other_Separator()
+    {
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
 
-            Attempt<object> result = valueEditor.TryConvertValueToCrlType("12,34");
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(12.34M, result.Result);
-        }
+        var result = valueEditor.TryConvertValueToCrlType("12,34");
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(12.34M, result.Result);
+    }
 
-        [Test]
-        public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Empty_String()
-        {
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
+    [Test]
+    public void Value_Editor_Can_Convert_To_Decimal_Clr_Type_With_Empty_String()
+    {
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
 
-            Attempt<object> result = valueEditor.TryConvertValueToCrlType(string.Empty);
-            Assert.IsTrue(result.Success);
-            Assert.IsNull(result.Result);
-        }
+        var result = valueEditor.TryConvertValueToCrlType(string.Empty);
+        Assert.IsTrue(result.Success);
+        Assert.IsNull(result.Result);
+    }
 
-        [Test]
-        public void Value_Editor_Can_Convert_To_Date_Clr_Type()
-        {
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Date);
+    [Test]
+    public void Value_Editor_Can_Convert_To_Date_Clr_Type()
+    {
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Date);
 
-            Attempt<object> result = valueEditor.TryConvertValueToCrlType("2010-02-05");
-            Assert.IsTrue(result.Success);
-            Assert.AreEqual(new DateTime(2010, 2, 5), result.Result);
-        }
+        var result = valueEditor.TryConvertValueToCrlType("2010-02-05");
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(new DateTime(2010, 2, 5), result.Result);
+    }
 
-        [TestCase(ValueTypes.String, "hello", "hello")]
-        [TestCase(ValueTypes.Text, "hello", "hello")]
-        [TestCase(ValueTypes.Integer, 123, "123")]
-        [TestCase(ValueTypes.Integer, "", "")] // test empty string for int
-        [TestCase(ValueTypes.DateTime, "", "")] // test empty string for date
-        public void Value_Editor_Can_Serialize_Value(string valueType, object val, string expected)
-        {
-            var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Nvarchar));
-            prop.SetValue(val);
+    [TestCase(ValueTypes.String, "hello", "hello")]
+    [TestCase(ValueTypes.Text, "hello", "hello")]
+    [TestCase(ValueTypes.Integer, 123, "123")]
+    [TestCase(ValueTypes.Integer, "", "")] // test empty string for int
+    [TestCase(ValueTypes.DateTime, "", "")] // test empty string for date
+    public void Value_Editor_Can_Serialize_Value(string valueType, object val, string expected)
+    {
+        var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Nvarchar));
+        prop.SetValue(val);
 
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(valueType);
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(valueType);
 
-            object result = valueEditor.ToEditor(prop);
-            Assert.AreEqual(expected, result);
-        }
+        var result = valueEditor.ToEditor(prop);
+        Assert.AreEqual(expected, result);
+    }
 
-        [Test]
-        public void Value_Editor_Can_Serialize_Decimal_Value()
-        {
-            decimal value = 12.34M;
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
+    [Test]
+    public void Value_Editor_Can_Serialize_Decimal_Value()
+    {
+        var value = 12.34M;
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
 
-            var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Decimal));
-            prop.SetValue(value);
+        var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Decimal));
+        prop.SetValue(value);
 
-            object result = valueEditor.ToEditor(prop);
-            Assert.AreEqual("12.34", result);
-        }
+        var result = valueEditor.ToEditor(prop);
+        Assert.AreEqual("12.34", result);
+    }
 
-        [Test]
-        public void Value_Editor_Can_Serialize_Decimal_Value_With_Empty_String()
-        {
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
+    [Test]
+    public void Value_Editor_Can_Serialize_Decimal_Value_With_Empty_String()
+    {
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Decimal);
 
-            var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Decimal));
-            prop.SetValue(string.Empty);
+        var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Decimal));
+        prop.SetValue(string.Empty);
 
-            object result = valueEditor.ToEditor(prop);
-            Assert.AreEqual(string.Empty, result);
-        }
+        var result = valueEditor.ToEditor(prop);
+        Assert.AreEqual(string.Empty, result);
+    }
 
-        [Test]
-        public void Value_Editor_Can_Serialize_Date_Value()
-        {
-            DateTime now = DateTime.Now;
-            DataValueEditor valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Date);
+    [Test]
+    public void Value_Editor_Can_Serialize_Date_Value()
+    {
+        var now = DateTime.Now;
+        var valueEditor = MockedValueEditors.CreateDataValueEditor(ValueTypes.Date);
 
-            var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Date));
-            prop.SetValue(now);
+        var prop = new Property(1, new PropertyType(Mock.Of<IShortStringHelper>(), "test", ValueStorageType.Date));
+        prop.SetValue(now);
 
-            object result = valueEditor.ToEditor(prop);
-            Assert.AreEqual(now.ToIsoString(), result);
-        }
+        var result = valueEditor.ToEditor(prop);
+        Assert.AreEqual(now.ToIsoString(), result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs
index 0585923cdd..bb21e04633 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ConvertersTests.cs
@@ -15,166 +15,174 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published;
+
+[TestFixture]
+public class ConvertersTests
 {
-    [TestFixture]
-    public class ConvertersTests
+    [Test]
+    public void SimpleConverter1Test()
     {
-        [Test]
-        public void SimpleConverter1Test()
+        var converters =
+            new PropertyValueConverterCollection(() => new IPropertyValueConverter[] { new SimpleConverter1() });
+
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        var dataType = new DataType(
+            new VoidEditor(Mock.Of<IDataValueEditorFactory>()), serializer)
+        { Id = 1 };
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
+
+        var contentTypeFactory =
+            new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
+
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
         {
-            var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
-            {
-                new SimpleConverter1(),
-            });
-
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            var dataType = new DataType(
-                new VoidEditor(
-                    Mock.Of<IDataValueEditorFactory>()), serializer)
-                { Id = 1 };
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
-
-            var contentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
-
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
-            {
-                yield return contentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
-            }
-
-            IPublishedContentType elementType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", CreatePropertyTypes);
-
-            var element1 = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
-
-            Assert.AreEqual(1234, element1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
-
-            // 'null' would be considered a 'missing' value by the default, magic logic
-            var e = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", null } }, false);
-            Assert.IsFalse(e.HasValue("prop1"));
-
-            // '0' would not - it's a valid integer - but the converter knows better
-            e = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "0" } }, false);
-            Assert.IsFalse(e.HasValue("prop1"));
+            yield return contentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
         }
 
-        private class SimpleConverter1 : IPropertyValueConverter
+        var elementType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", CreatePropertyTypes);
+
+        var element1 = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
+
+        Assert.AreEqual(1234, element1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+
+        // 'null' would be considered a 'missing' value by the default, magic logic
+        var e = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", null } }, false);
+        Assert.IsFalse(e.HasValue("prop1"));
+
+        // '0' would not - it's a valid integer - but the converter knows better
+        e = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "0" } }, false);
+        Assert.IsFalse(e.HasValue("prop1"));
+    }
+
+    private class SimpleConverter1 : IPropertyValueConverter
+    {
+        public bool? IsValue(object value, PropertyValueLevel level)
         {
-            public bool? IsValue(object value, PropertyValueLevel level)
+            switch (level)
             {
-                switch (level)
-                {
-                    case PropertyValueLevel.Source:
-                        return null;
-                    case PropertyValueLevel.Inter:
-                        return value is int ivalue && ivalue != 0;
-                    default:
-                        throw new NotSupportedException($"Invalid level: {level}.");
-                }
+                case PropertyValueLevel.Source:
+                    return null;
+                case PropertyValueLevel.Inter:
+                    return value is int ivalue && ivalue != 0;
+                default:
+                    throw new NotSupportedException($"Invalid level: {level}.");
             }
-
-            public bool IsConverter(IPublishedPropertyType propertyType)
-                => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
-
-            public Type GetPropertyValueType(IPublishedPropertyType propertyType)
-                => typeof(int);
-
-            public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
-                => PropertyCacheLevel.Element;
-
-            public object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
-                => int.TryParse(source as string, out int i) ? i : 0;
-
-            public object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => (int)inter;
-
-            public object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => ((int)inter).ToString();
         }
 
-        [Test]
-        public void SimpleConverter2Test()
+        public bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
+
+        public Type GetPropertyValueType(IPublishedPropertyType propertyType)
+            => typeof(int);
+
+        public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => PropertyCacheLevel.Element;
+
+        public object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
+            => int.TryParse(source as string, out var i) ? i : 0;
+
+        public object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
+            => (int)inter;
+
+        public object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
+            => ((int)inter).ToString();
+    }
+
+    [Test]
+    public void SimpleConverter2Test()
+    {
+        var cacheMock = new Mock<IPublishedContentCache>();
+        var cacheContent = new Dictionary<int, IPublishedContent>();
+        cacheMock.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns<int>(id => cacheContent.TryGetValue(id, out var content) ? content : null);
+        var publishedSnapshotMock = new Mock<IPublishedSnapshot>();
+        publishedSnapshotMock.Setup(x => x.Content).Returns(cacheMock.Object);
+        var publishedSnapshotAccessorMock = new Mock<IPublishedSnapshotAccessor>();
+        var localPublishedSnapshot = publishedSnapshotMock.Object;
+        publishedSnapshotAccessorMock.Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot)).Returns(true);
+        var publishedSnapshotAccessor = publishedSnapshotAccessorMock.Object;
+
+        var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
         {
-            var cacheMock = new Mock<IPublishedContentCache>();
-            var cacheContent = new Dictionary<int, IPublishedContent>();
-            cacheMock.Setup(x => x.GetById(It.IsAny<int>())).Returns<int>(id => cacheContent.TryGetValue(id, out IPublishedContent content) ? content : null);
-            var publishedSnapshotMock = new Mock<IPublishedSnapshot>();
-            publishedSnapshotMock.Setup(x => x.Content).Returns(cacheMock.Object);
-            var publishedSnapshotAccessorMock = new Mock<IPublishedSnapshotAccessor>();
-            var localPublishedSnapshot = publishedSnapshotMock.Object;
-            publishedSnapshotAccessorMock.Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot)).Returns(true);
-            IPublishedSnapshotAccessor publishedSnapshotAccessor = publishedSnapshotAccessorMock.Object;
+            new SimpleConverter2(publishedSnapshotAccessor),
+        });
 
-            var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
-            {
-                new SimpleConverter2(publishedSnapshotAccessor),
-            });
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        var dataType = new DataType(
+            new VoidEditor(Mock.Of<IDataValueEditorFactory>()), serializer)
+        { Id = 1 };
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
 
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            var dataType = new DataType(
-                new VoidEditor(
-                    Mock.Of<IDataValueEditorFactory>()), serializer)
-                { Id = 1 };
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
+        var contentTypeFactory =
+            new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
 
-            var contentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
-
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
-            {
-                yield return contentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
-            }
-
-            IPublishedContentType elementType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", CreatePropertyTypes);
-
-            var element1 = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
-
-            IPublishedContentType cntType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1001, "cnt1", t => Enumerable.Empty<PublishedPropertyType>());
-            var cnt1 = new InternalPublishedContent(cntType1) { Id = 1234 };
-            cacheContent[cnt1.Id] = cnt1;
-
-            Assert.AreSame(cnt1, element1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
+        {
+            yield return contentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
         }
 
-        private class SimpleConverter2 : IPropertyValueConverter
+        var elementType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "element1", CreatePropertyTypes);
+
+        var element1 = new PublishedElement(elementType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
+
+        var cntType1 = contentTypeFactory.CreateContentType(Guid.NewGuid(), 1001, "cnt1", t => Enumerable.Empty<PublishedPropertyType>());
+        var cnt1 = new InternalPublishedContent(cntType1) { Id = 1234 };
+        cacheContent[cnt1.Id] = cnt1;
+
+        Assert.AreSame(cnt1, element1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+    }
+
+    private class SimpleConverter2 : IPropertyValueConverter
+    {
+        private readonly PropertyCacheLevel _cacheLevel;
+        private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
+
+        public SimpleConverter2(IPublishedSnapshotAccessor publishedSnapshotAccessor, PropertyCacheLevel cacheLevel = PropertyCacheLevel.None)
         {
-            private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor;
-            private readonly PropertyCacheLevel _cacheLevel;
-
-            public SimpleConverter2(IPublishedSnapshotAccessor publishedSnapshotAccessor, PropertyCacheLevel cacheLevel = PropertyCacheLevel.None)
-            {
-                _publishedSnapshotAccessor = publishedSnapshotAccessor;
-                _cacheLevel = cacheLevel;
-            }
-
-            public bool? IsValue(object value, PropertyValueLevel level)
-                => value != null && (!(value is string) || string.IsNullOrWhiteSpace((string)value) == false);
-
-            public bool IsConverter(IPublishedPropertyType propertyType)
-                => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
-
-            public Type GetPropertyValueType(IPublishedPropertyType propertyType)
-
-                // The first version would be the "generic" version, but say we want to be more precise
-                // and return: whatever Clr type is generated for content type with alias "cnt1" -- which
-                // we cannot really typeof() at the moment because it has not been generated, hence ModelType.
-                // => typeof(IPublishedContent);
-                => ModelType.For("cnt1");
-
-            public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
-                => _cacheLevel;
-
-            public object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
-                => int.TryParse(source as string, out int i) ? i : -1;
-
-            public object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-            {
-                var publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
-                return publishedSnapshot.Content.GetById((int)inter);
-            }
-
-            public object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => ((int)inter).ToString();
+            _publishedSnapshotAccessor = publishedSnapshotAccessor;
+            _cacheLevel = cacheLevel;
         }
+
+        public bool? IsValue(object value, PropertyValueLevel level)
+            => value != null && (!(value is string) || string.IsNullOrWhiteSpace((string)value) == false);
+
+        public bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
+
+        public Type GetPropertyValueType(IPublishedPropertyType propertyType)
+
+            // The first version would be the "generic" version, but say we want to be more precise
+            // and return: whatever Clr type is generated for content type with alias "cnt1" -- which
+            // we cannot really typeof() at the moment because it has not been generated, hence ModelType.
+            // => typeof(IPublishedContent);
+            => ModelType.For("cnt1");
+
+        public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => _cacheLevel;
+
+        public object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
+            => int.TryParse(source as string, out var i) ? i : -1;
+
+        public object ConvertIntermediateToObject(
+            IPublishedElement owner,
+            IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel,
+            object inter,
+            bool preview)
+        {
+            var publishedSnapshot = _publishedSnapshotAccessor.GetRequiredPublishedSnapshot();
+            return publishedSnapshot.Content.GetById((int)inter);
+        }
+
+        public object ConvertIntermediateToXPath(
+            IPublishedElement owner,
+            IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel,
+            object inter,
+            bool preview)
+            => ((int)inter).ToString();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs
index eca6efce18..1176b7f571 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/ModelTypeTests.cs
@@ -7,67 +7,70 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Tests.Common.Published;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published;
+
+[TestFixture]
+public class ModelTypeTests
 {
-    [TestFixture]
-    public class ModelTypeTests
+    [Test]
+    public void ModelTypeEqualityTests()
     {
-        [Test]
-        public void ModelTypeEqualityTests()
+        Assert.AreNotEqual(ModelType.For("alias1"), ModelType.For("alias1"));
+
+        Assert.IsTrue(ModelType.Equals(ModelType.For("alias1"), ModelType.For("alias1")));
+        Assert.IsFalse(ModelType.Equals(ModelType.For("alias1"), ModelType.For("alias2")));
+
+        Assert.IsTrue(ModelType.Equals(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1")), typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1"))));
+        Assert.IsFalse(ModelType.Equals(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1")), typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias2"))));
+
+        Assert.IsTrue(
+            ModelType.Equals(ModelType.For("alias1").MakeArrayType(), ModelType.For("alias1").MakeArrayType()));
+        Assert.IsFalse(ModelType.Equals(ModelType.For("alias1").MakeArrayType(), ModelType.For("alias2").MakeArrayType()));
+    }
+
+    [Test]
+    public void TypeToStringTests()
+    {
+        var type = typeof(int);
+        Assert.AreEqual("System.Int32", type.ToString());
+        Assert.AreEqual("System.Int32[]", type.MakeArrayType().ToString());
+        Assert.AreEqual("System.Collections.Generic.IEnumerable`1[System.Int32[]]", typeof(IEnumerable<>).MakeGenericType(type.MakeArrayType()).ToString());
+    }
+
+    [Test]
+    public void TypeFullNameTests()
+    {
+        var type = typeof(int);
+        Assert.AreEqual("System.Int32", type.FullName);
+        Assert.AreEqual("System.Int32[]", type.MakeArrayType().FullName);
+
+        // Note the inner assembly qualified name
+        Assert.AreEqual(
+            "System.Collections.Generic.IEnumerable`1[[System.Int32[], System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]",
+            typeof(IEnumerable<>).MakeGenericType(type.MakeArrayType()).FullName);
+    }
+
+    [Test]
+    public void ModelTypeMapTests()
+    {
+        var map = new Dictionary<string, Type>
         {
-            Assert.AreNotEqual(ModelType.For("alias1"), ModelType.For("alias1"));
+            { "alias1", typeof(PublishedSnapshotTestObjects.TestElementModel1) },
+            { "alias2", typeof(PublishedSnapshotTestObjects.TestElementModel2) },
+        };
 
-            Assert.IsTrue(ModelType.Equals(ModelType.For("alias1"), ModelType.For("alias1")));
-            Assert.IsFalse(ModelType.Equals(ModelType.For("alias1"), ModelType.For("alias2")));
-
-            Assert.IsTrue(ModelType.Equals(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1")), typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1"))));
-            Assert.IsFalse(ModelType.Equals(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1")), typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias2"))));
-
-            Assert.IsTrue(ModelType.Equals(ModelType.For("alias1").MakeArrayType(), ModelType.For("alias1").MakeArrayType()));
-            Assert.IsFalse(ModelType.Equals(ModelType.For("alias1").MakeArrayType(), ModelType.For("alias2").MakeArrayType()));
-        }
-
-        [Test]
-        public void TypeToStringTests()
-        {
-            Type type = typeof(int);
-            Assert.AreEqual("System.Int32", type.ToString());
-            Assert.AreEqual("System.Int32[]", type.MakeArrayType().ToString());
-            Assert.AreEqual("System.Collections.Generic.IEnumerable`1[System.Int32[]]", typeof(IEnumerable<>).MakeGenericType(type.MakeArrayType()).ToString());
-        }
-
-        [Test]
-        public void TypeFullNameTests()
-        {
-            Type type = typeof(int);
-            Assert.AreEqual("System.Int32", type.FullName);
-            Assert.AreEqual("System.Int32[]", type.MakeArrayType().FullName);
-
-            // Note the inner assembly qualified name
-            Assert.AreEqual("System.Collections.Generic.IEnumerable`1[[System.Int32[], System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", typeof(IEnumerable<>).MakeGenericType(type.MakeArrayType()).FullName);
-        }
-
-        [Test]
-        public void ModelTypeMapTests()
-        {
-            var map = new Dictionary<string, Type>
-            {
-                { "alias1", typeof(PublishedSnapshotTestObjects.TestElementModel1) },
-                { "alias2", typeof(PublishedSnapshotTestObjects.TestElementModel2) },
-            };
-
-            Assert.AreEqual(
-                "Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1",
-                ModelType.Map(ModelType.For("alias1"), map).ToString());
-            Assert.AreEqual(
-                "Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1[]",
-                ModelType.Map(ModelType.For("alias1").MakeArrayType(), map).ToString());
-            Assert.AreEqual(
-                "System.Collections.Generic.IEnumerable`1[Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1]",
-                ModelType.Map(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1")), map).ToString());
-            Assert.AreEqual(
-                "System.Collections.Generic.IEnumerable`1[Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1[]]",
-                ModelType.Map(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1").MakeArrayType()), map).ToString());
-        }
+        Assert.AreEqual(
+            "Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1",
+            ModelType.Map(ModelType.For("alias1"), map).ToString());
+        Assert.AreEqual(
+            "Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1[]",
+            ModelType.Map(ModelType.For("alias1").MakeArrayType(), map).ToString());
+        Assert.AreEqual(
+            "System.Collections.Generic.IEnumerable`1[Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1]",
+            ModelType.Map(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1")), map).ToString());
+        Assert.AreEqual(
+            "System.Collections.Generic.IEnumerable`1[Umbraco.Cms.Tests.Common.Published.PublishedSnapshotTestObjects+TestElementModel1[]]",
+            ModelType.Map(typeof(IEnumerable<>).MakeGenericType(ModelType.For("alias1").MakeArrayType()), map)
+                .ToString());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
index 4f2f018bfc..7109b9cbcc 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/NestedContentTests.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Extensions.Logging;
@@ -18,268 +17,260 @@ using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.PublishedCache.Internal;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
-using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published;
+
+[TestFixture]
+public class NestedContentTests
 {
-    [TestFixture]
-    public class NestedContentTests
+    private (IPublishedContentType, IPublishedContentType) CreateContentTypes()
     {
-        private (IPublishedContentType, IPublishedContentType) CreateContentTypes()
+        var logger = Mock.Of<ILogger<ProfilingLogger>>();
+        var loggerFactory = NullLoggerFactory.Instance;
+        var profiler = Mock.Of<IProfiler>();
+        var proflog = new ProfilingLogger(logger, profiler);
+        var localizationService = Mock.Of<ILocalizationService>();
+
+        PropertyEditorCollection editors = null;
+        var editor = new NestedContentPropertyEditor(Mock.Of<IDataValueEditorFactory>(), Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>());
+        editors = new PropertyEditorCollection(new DataEditorCollection(() => new DataEditor[] { editor }));
+
+        var serializer = new ConfigurationEditorJsonSerializer();
+
+        var dataType1 = new DataType(editor, serializer)
         {
-            ILogger<ProfilingLogger> logger = Mock.Of<ILogger<ProfilingLogger>>();
-            NullLoggerFactory loggerFactory = NullLoggerFactory.Instance;
-            IProfiler profiler = Mock.Of<IProfiler>();
-            var proflog = new ProfilingLogger(logger, profiler);
-            ILocalizationService localizationService = Mock.Of<ILocalizationService>();
-
-            PropertyEditorCollection editors = null;
-            var editor = new NestedContentPropertyEditor(Mock.Of<IDataValueEditorFactory>(),Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>());
-            editors = new PropertyEditorCollection(new DataEditorCollection(() => new DataEditor[] { editor }));
-
-            var serializer = new ConfigurationEditorJsonSerializer();
-
-            var dataType1 = new DataType(editor, serializer)
+            Id = 1,
+            Configuration = new NestedContentConfiguration
             {
-                Id = 1,
-                Configuration = new NestedContentConfiguration
+                MinItems = 1,
+                MaxItems = 1,
+                ContentTypes = new[] { new NestedContentConfiguration.ContentType { Alias = "contentN1" } },
+            },
+        };
+
+        var dataType2 = new DataType(editor, serializer)
+        {
+            Id = 2,
+            Configuration = new NestedContentConfiguration
+            {
+                MinItems = 1,
+                MaxItems = 99,
+                ContentTypes = new[] { new NestedContentConfiguration.ContentType { Alias = "contentN1" } },
+            },
+        };
+
+        var dataType3 =
+            new DataType(
+                new TextboxPropertyEditor(Mock.Of<IDataValueEditorFactory>(), Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>()), serializer)
+            { Id = 3 };
+
+        // mocked dataservice returns nested content preValues
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(new[] { dataType1, dataType2, dataType3 });
+
+        var publishedModelFactory = new Mock<IPublishedModelFactory>();
+
+        // mocked model factory returns model type
+        var modelTypes = new Dictionary<string, Type> { { "contentN1", typeof(TestElementModel) } };
+        publishedModelFactory
+            .Setup(x => x.MapModelType(It.IsAny<Type>()))
+            .Returns((Type type) => ModelType.Map(type, modelTypes));
+
+        // mocked model factory creates models
+        publishedModelFactory
+            .Setup(x => x.CreateModel(It.IsAny<IPublishedElement>()))
+            .Returns((IPublishedElement element) =>
+            {
+                if (element.ContentType.Alias.InvariantEquals("contentN1"))
                 {
-                    MinItems = 1,
-                    MaxItems = 1,
-                    ContentTypes = new[]
-                    {
-                        new NestedContentConfiguration.ContentType { Alias = "contentN1" }
-                    }
+                    return new TestElementModel(element, Mock.Of<IPublishedValueFallback>());
                 }
-            };
 
-            var dataType2 = new DataType(editor, serializer)
-            {
-                Id = 2,
-                Configuration = new NestedContentConfiguration
-                {
-                    MinItems = 1,
-                    MaxItems = 99,
-                    ContentTypes = new[]
-                    {
-                        new NestedContentConfiguration.ContentType { Alias = "contentN1" }
-                    }
-                }
-            };
-
-            var dataType3 = new DataType(new TextboxPropertyEditor(Mock.Of<IDataValueEditorFactory>(),Mock.Of<IIOHelper>(), Mock.Of<IEditorConfigurationParser>()), serializer)
-            {
-                Id = 3
-            };
-
-            // mocked dataservice returns nested content preValues
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(new[] { dataType1, dataType2, dataType3 });
-
-            var publishedModelFactory = new Mock<IPublishedModelFactory>();
-
-            // mocked model factory returns model type
-            var modelTypes = new Dictionary<string, Type>
-            {
-                { "contentN1", typeof(TestElementModel) }
-            };
-            publishedModelFactory
-                .Setup(x => x.MapModelType(It.IsAny<Type>()))
-                .Returns((Type type) => ModelType.Map(type, modelTypes));
-
-            // mocked model factory creates models
-            publishedModelFactory
-                .Setup(x => x.CreateModel(It.IsAny<IPublishedElement>()))
-                .Returns((IPublishedElement element) =>
-                {
-                    if (element.ContentType.Alias.InvariantEquals("contentN1"))
-                    {
-                        return new TestElementModel(element, Mock.Of<IPublishedValueFallback>());
-                    }
-
-                    return element;
-                });
-
-            // mocked model factory creates model lists
-            publishedModelFactory
-                .Setup(x => x.CreateModelList(It.IsAny<string>()))
-                .Returns((string alias) =>
-                    alias == "contentN1"
-                        ? (IList)new List<TestElementModel>()
-                        : (IList)new List<IPublishedElement>());
-
-            var contentCache = new Mock<IPublishedContentCache>();
-            var publishedSnapshot = new Mock<IPublishedSnapshot>();
-
-            // mocked published snapshot returns a content cache
-            publishedSnapshot
-                .Setup(x => x.Content)
-                .Returns(contentCache.Object);
-
-            var publishedSnapshotAccessor = new Mock<IPublishedSnapshotAccessor>();
-
-            // mocked published snapshot accessor returns a facade
-            var localPublishedSnapshot = publishedSnapshot.Object;
-            publishedSnapshotAccessor
-                .Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot))
-                .Returns(true);
-
-            var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
-            {
-                new NestedContentSingleValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog),
-                new NestedContentManyValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog),
+                return element;
             });
 
-            var factory = new PublishedContentTypeFactory(publishedModelFactory.Object, converters, dataTypeServiceMock.Object);
+        // mocked model factory creates model lists
+        publishedModelFactory
+            .Setup(x => x.CreateModelList(It.IsAny<string>()))
+            .Returns((string alias) =>
+                alias == "contentN1"
+                    ? new List<TestElementModel>()
+                    : new List<IPublishedElement>());
 
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes1(IPublishedContentType contentType)
-            {
-                yield return factory.CreatePropertyType(contentType, "property1", 1);
-            }
+        var contentCache = new Mock<IPublishedContentCache>();
+        var publishedSnapshot = new Mock<IPublishedSnapshot>();
 
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes2(IPublishedContentType contentType)
-            {
-                yield return factory.CreatePropertyType(contentType, "property2", 2);
-            }
+        // mocked published snapshot returns a content cache
+        publishedSnapshot
+            .Setup(x => x.Content)
+            .Returns(contentCache.Object);
 
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypesN1(IPublishedContentType contentType)
-            {
-                yield return factory.CreatePropertyType(contentType, "propertyN1", 3);
-            }
+        var publishedSnapshotAccessor = new Mock<IPublishedSnapshotAccessor>();
 
-            IPublishedContentType contentType1 = factory.CreateContentType(Guid.NewGuid(), 1, "content1", CreatePropertyTypes1);
-            IPublishedContentType contentType2 = factory.CreateContentType(Guid.NewGuid(), 2, "content2", CreatePropertyTypes2);
-            IPublishedContentType contentTypeN1 = factory.CreateContentType(Guid.NewGuid(), 2, "contentN1", CreatePropertyTypesN1, isElement: true);
+        // mocked published snapshot accessor returns a facade
+        var localPublishedSnapshot = publishedSnapshot.Object;
+        publishedSnapshotAccessor
+            .Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot))
+            .Returns(true);
 
-            // mocked content cache returns content types
-            contentCache
-                .Setup(x => x.GetContentType(It.IsAny<string>()))
-                .Returns((string alias) =>
-                {
-                    if (alias.InvariantEquals("contentN1"))
-                    {
-                        return contentTypeN1;
-                    }
+        var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
+        {
+            new NestedContentSingleValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog),
+            new NestedContentManyValueConverter(publishedSnapshotAccessor.Object, publishedModelFactory.Object, proflog),
+        });
 
-                    return null;
-                });
+        var factory =
+            new PublishedContentTypeFactory(publishedModelFactory.Object, converters, dataTypeServiceMock.Object);
 
-            return (contentType1, contentType2);
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes1(IPublishedContentType contentType)
+        {
+            yield return factory.CreatePropertyType(contentType, "property1", 1);
         }
 
-        [Test]
-        public void SingleNestedTest()
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes2(IPublishedContentType contentType)
         {
-            (IPublishedContentType contentType1, _) = CreateContentTypes();
+            yield return factory.CreatePropertyType(contentType, "property2", 2);
+        }
 
-            // nested single converter returns the proper value clr type TestModel, and cache level
-            Assert.AreEqual(typeof(TestElementModel), contentType1.GetPropertyType("property1").ClrType);
-            Assert.AreEqual(PropertyCacheLevel.Element, contentType1.GetPropertyType("property1").CacheLevel);
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypesN1(IPublishedContentType contentType)
+        {
+            yield return factory.CreatePropertyType(contentType, "propertyN1", 3);
+        }
 
-            var key = Guid.NewGuid();
-            var keyA = Guid.NewGuid();
-            var content = new InternalPublishedContent(contentType1)
+        var contentType1 = factory.CreateContentType(Guid.NewGuid(), 1, "content1", CreatePropertyTypes1);
+        var contentType2 = factory.CreateContentType(Guid.NewGuid(), 2, "content2", CreatePropertyTypes2);
+        var contentTypeN1 =
+            factory.CreateContentType(Guid.NewGuid(), 2, "contentN1", CreatePropertyTypesN1, isElement: true);
+
+        // mocked content cache returns content types
+        contentCache
+            .Setup(x => x.GetContentType(It.IsAny<string>()))
+            .Returns((string alias) =>
             {
-                Key = key,
-                Properties = new[]
+                if (alias.InvariantEquals("contentN1"))
                 {
-                    new TestPublishedProperty(
-                        contentType1.GetPropertyType("property1"), $@"[
-                    {{ ""key"": ""{keyA}"", ""propertyN1"": ""foo"", ""ncContentTypeAlias"": ""contentN1"" }}
-                ]")
+                    return contentTypeN1;
                 }
-            };
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "property1");
 
-            // nested single converter returns proper TestModel value
-            Assert.IsInstanceOf<TestElementModel>(value);
-            var valueM = (TestElementModel)value;
-            Assert.AreEqual("foo", valueM.PropValue);
-            Assert.AreEqual(keyA, valueM.Key);
-        }
+                return null;
+            });
 
-        [Test]
-        public void ManyNestedTest()
+        return (contentType1, contentType2);
+    }
+
+    [Test]
+    public void SingleNestedTest()
+    {
+        var (contentType1, _) = CreateContentTypes();
+
+        // nested single converter returns the proper value clr type TestModel, and cache level
+        Assert.AreEqual(typeof(TestElementModel), contentType1.GetPropertyType("property1").ClrType);
+        Assert.AreEqual(PropertyCacheLevel.Element, contentType1.GetPropertyType("property1").CacheLevel);
+
+        var key = Guid.NewGuid();
+        var keyA = Guid.NewGuid();
+        var content = new InternalPublishedContent(contentType1)
         {
-            (_, IPublishedContentType contentType2) = CreateContentTypes();
-
-            // nested many converter returns the proper value clr type IEnumerable<TestModel>, and cache level
-            Assert.AreEqual(typeof(IEnumerable<TestElementModel>), contentType2.GetPropertyType("property2").ClrType);
-            Assert.AreEqual(PropertyCacheLevel.Element, contentType2.GetPropertyType("property2").CacheLevel);
-
-            var key = Guid.NewGuid();
-            var keyA = Guid.NewGuid();
-            var keyB = Guid.NewGuid();
-            var content = new InternalPublishedContent(contentType2)
+            Key = key,
+            Properties = new[]
             {
-                Key = key,
-                Properties = new[]
-                {
-                    new TestPublishedProperty(contentType2.GetPropertyType("property2"), $@"[
+                new TestPublishedProperty(
+                    contentType1.GetPropertyType("property1"), $@"[
+                    {{ ""key"": ""{keyA}"", ""propertyN1"": ""foo"", ""ncContentTypeAlias"": ""contentN1"" }}
+                ]"),
+            },
+        };
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "property1");
+
+        // nested single converter returns proper TestModel value
+        Assert.IsInstanceOf<TestElementModel>(value);
+        var valueM = (TestElementModel)value;
+        Assert.AreEqual("foo", valueM.PropValue);
+        Assert.AreEqual(keyA, valueM.Key);
+    }
+
+    [Test]
+    public void ManyNestedTest()
+    {
+        var (_, contentType2) = CreateContentTypes();
+
+        // nested many converter returns the proper value clr type IEnumerable<TestModel>, and cache level
+        Assert.AreEqual(typeof(IEnumerable<TestElementModel>), contentType2.GetPropertyType("property2").ClrType);
+        Assert.AreEqual(PropertyCacheLevel.Element, contentType2.GetPropertyType("property2").CacheLevel);
+
+        var key = Guid.NewGuid();
+        var keyA = Guid.NewGuid();
+        var keyB = Guid.NewGuid();
+        var content = new InternalPublishedContent(contentType2)
+        {
+            Key = key,
+            Properties = new[]
+            {
+                new TestPublishedProperty(contentType2.GetPropertyType("property2"), $@"[
                     {{ ""key"": ""{keyA}"", ""propertyN1"": ""foo"", ""ncContentTypeAlias"": ""contentN1"" }},
                     {{ ""key"": ""{keyB}"", ""propertyN1"": ""bar"", ""ncContentTypeAlias"": ""contentN1"" }}
-                ]")
-                }
-            };
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "property2");
+                ]"),
+            },
+        };
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "property2");
 
-            // nested many converter returns proper IEnumerable<TestModel> value
-            Assert.IsInstanceOf<IEnumerable<IPublishedElement>>(value);
-            Assert.IsInstanceOf<IEnumerable<TestElementModel>>(value);
-            var valueM = ((IEnumerable<TestElementModel>)value).ToArray();
-            Assert.AreEqual("foo", valueM[0].PropValue);
-            Assert.AreEqual(keyA, valueM[0].Key);
-            Assert.AreEqual("bar", valueM[1].PropValue);
-            Assert.AreEqual(keyB, valueM[1].Key);
-        }
+        // nested many converter returns proper IEnumerable<TestModel> value
+        Assert.IsInstanceOf<IEnumerable<IPublishedElement>>(value);
+        Assert.IsInstanceOf<IEnumerable<TestElementModel>>(value);
+        var valueM = ((IEnumerable<TestElementModel>)value).ToArray();
+        Assert.AreEqual("foo", valueM[0].PropValue);
+        Assert.AreEqual(keyA, valueM[0].Key);
+        Assert.AreEqual("bar", valueM[1].PropValue);
+        Assert.AreEqual(keyB, valueM[1].Key);
+    }
 
-        public class TestElementModel : PublishedElementModel
+    public class TestElementModel : PublishedElementModel
+    {
+        public TestElementModel(IPublishedElement content, IPublishedValueFallback fallback)
+            : base(content, fallback)
         {
-            public TestElementModel(IPublishedElement content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
-
-            public string PropValue => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "propertyN1");
         }
 
-        public class TestPublishedProperty : PublishedPropertyBase
+        public string PropValue => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "propertyN1");
+    }
+
+    public class TestPublishedProperty : PublishedPropertyBase
+    {
+        private readonly bool _hasValue;
+        private readonly bool _preview;
+        private readonly object _sourceValue;
+        private IPublishedElement _owner;
+
+        public TestPublishedProperty(IPublishedPropertyType propertyType, object source)
+            : base(propertyType, PropertyCacheLevel.Element) // initial reference cache level always is .Content
         {
-            private readonly bool _preview;
-            private readonly object _sourceValue;
-            private readonly bool _hasValue;
-            private IPublishedElement _owner;
-
-            public TestPublishedProperty(IPublishedPropertyType propertyType, object source)
-                : base(propertyType, PropertyCacheLevel.Element) // initial reference cache level always is .Content
-            {
-                _sourceValue = source;
-                _hasValue = source != null && (!(source is string ssource) || !string.IsNullOrWhiteSpace(ssource));
-            }
-
-            public TestPublishedProperty(IPublishedPropertyType propertyType, IPublishedElement element, bool preview, PropertyCacheLevel referenceCacheLevel, object source)
-                : base(propertyType, referenceCacheLevel)
-            {
-                _sourceValue = source;
-                _hasValue = source != null && (!(source is string ssource) || !string.IsNullOrWhiteSpace(ssource));
-                _owner = element;
-                _preview = preview;
-            }
-
-            private object InterValue => PropertyType.ConvertSourceToInter(null, _sourceValue, false);
-
-            internal void SetOwner(IPublishedElement owner) => _owner = owner;
-
-            public override bool HasValue(string culture = null, string? segment = null) => _hasValue;
-
-            public override object GetSourceValue(string culture = null, string? segment = null) => _sourceValue;
-
-            public override object GetValue(string culture = null, string? segment = null) => PropertyType.ConvertInterToObject(_owner, ReferenceCacheLevel, InterValue, _preview);
-
-            public override object GetXPathValue(string culture = null, string? segment = null) => throw new InvalidOperationException("This method won't be implemented.");
+            _sourceValue = source;
+            _hasValue = source != null && (!(source is string ssource) || !string.IsNullOrWhiteSpace(ssource));
         }
+
+        public TestPublishedProperty(IPublishedPropertyType propertyType, IPublishedElement element, bool preview, PropertyCacheLevel referenceCacheLevel, object source)
+            : base(propertyType, referenceCacheLevel)
+        {
+            _sourceValue = source;
+            _hasValue = source != null && (!(source is string ssource) || !string.IsNullOrWhiteSpace(ssource));
+            _owner = element;
+            _preview = preview;
+        }
+
+        private object InterValue => PropertyType.ConvertSourceToInter(null, _sourceValue, false);
+
+        internal void SetOwner(IPublishedElement owner) => _owner = owner;
+
+        public override bool HasValue(string culture = null, string? segment = null) => _hasValue;
+
+        public override object GetSourceValue(string culture = null, string? segment = null) => _sourceValue;
+
+        public override object GetValue(string culture = null, string? segment = null) =>
+            PropertyType.ConvertInterToObject(_owner, ReferenceCacheLevel, InterValue, _preview);
+
+        public override object GetXPathValue(string culture = null, string? segment = null) =>
+            throw new InvalidOperationException("This method won't be implemented.");
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs
index 0f0ad8f2f6..cce1f0cf8c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Published/PropertyCacheLevelTests.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
@@ -12,257 +11,261 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Published;
+
+[TestFixture]
+public class PropertyCacheLevelTests
 {
-    [TestFixture]
-    public class PropertyCacheLevelTests
+    [TestCase(PropertyCacheLevel.None, 2)]
+    [TestCase(PropertyCacheLevel.Element, 1)]
+    [TestCase(PropertyCacheLevel.Elements, 1)]
+    [TestCase(PropertyCacheLevel.Snapshot, 1)]
+    public void CacheLevelTest(PropertyCacheLevel cacheLevel, int interConverts)
     {
-        [TestCase(PropertyCacheLevel.None, 2)]
-        [TestCase(PropertyCacheLevel.Element, 1)]
-        [TestCase(PropertyCacheLevel.Elements, 1)]
-        [TestCase(PropertyCacheLevel.Snapshot, 1)]
-        public void CacheLevelTest(PropertyCacheLevel cacheLevel, int interConverts)
+        var converter = new CacheConverter1(cacheLevel);
+
+        var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[] { converter });
+
+        var configurationEditorJsonSerializer = new ConfigurationEditorJsonSerializer();
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        var dataType = new DataType(
+            new VoidEditor(Mock.Of<IDataValueEditorFactory>()), configurationEditorJsonSerializer)
+        { Id = 1 };
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
+
+        var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
+
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
         {
-            var converter = new CacheConverter1(cacheLevel);
-
-            var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
-            {
-                converter,
-            });
-
-            var configurationEditorJsonSerializer = new ConfigurationEditorJsonSerializer();
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            var dataType = new DataType(
-                new VoidEditor(
-                    Mock.Of<IDataValueEditorFactory>()), configurationEditorJsonSerializer)
-                { Id = 1 };
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
-
-            var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
-
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
-            {
-                yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", dataType.Id);
-            }
-
-            IPublishedContentType setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
-
-            // PublishedElementPropertyBase.GetCacheLevels:
-            //
-            //   if property level is > reference level, or both are None
-            //     use None for property & new reference
-            //   else
-            //     use Content for property, & keep reference
-            //
-            // PublishedElement creates properties with reference being None
-            // if converter specifies None, keep using None
-            // anything else is not > None, use Content
-            //
-            // for standalone elements, it's only None or Content
-            var set1 = new PublishedElement(setType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
-
-            Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
-            Assert.AreEqual(1, converter.SourceConverts);
-            Assert.AreEqual(1, converter.InterConverts);
-
-            // source is always converted once and cached per content
-            // inter conversion depends on the specified cache level
-            Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
-            Assert.AreEqual(1, converter.SourceConverts);
-            Assert.AreEqual(interConverts, converter.InterConverts);
+            yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", dataType.Id);
         }
 
-        // property is not cached, converted cached at Content, exept
-        //  /None = not cached at all
-        [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Elements, 1, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Snapshot, 1, 0, 0, 0, 0)]
+        var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
 
-        // property is cached at element level, converted cached at
-        //  /None = not at all
-        //  /Element = in element
-        //  /Snapshot = in snapshot
-        //  /Elements = in elements
-        [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Elements, 1, 1, 0, 1, 0)]
-        [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Snapshot, 1, 0, 1, 0, 1)]
+        // PublishedElementPropertyBase.GetCacheLevels:
+        //
+        //   if property level is > reference level, or both are None
+        //     use None for property & new reference
+        //   else
+        //     use Content for property, & keep reference
+        //
+        // PublishedElement creates properties with reference being None
+        // if converter specifies None, keep using None
+        // anything else is not > None, use Content
+        //
+        // for standalone elements, it's only None or Content
+        var set1 = new PublishedElement(setType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
 
-        // property is cached at elements level, converted cached at Element, exept
-        //  /None = not cached at all
-        //  /Snapshot = cached in snapshot
-        [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Elements, 1, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Snapshot, 1, 0, 1, 0, 1)]
+        Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+        Assert.AreEqual(1, converter.SourceConverts);
+        Assert.AreEqual(1, converter.InterConverts);
 
-        // property is cached at snapshot level, converted cached at Element, exept
-        //  /None = not cached at all
-        [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.Elements, 1, 0, 0, 0, 0)]
-        [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.Snapshot, 1, 0, 0, 0, 0)]
+        // source is always converted once and cached per content
+        // inter conversion depends on the specified cache level
+        Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+        Assert.AreEqual(1, converter.SourceConverts);
+        Assert.AreEqual(interConverts, converter.InterConverts);
+    }
 
-        public void CachePublishedSnapshotTest(
+    // property is not cached, converted cached at Content, exept
+    //  /None = not cached at all
+    [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Elements, 1, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.None, PropertyCacheLevel.Snapshot, 1, 0, 0, 0, 0)]
+
+    // property is cached at element level, converted cached at
+    //  /None = not at all
+    //  /Element = in element
+    //  /Snapshot = in snapshot
+    //  /Elements = in elements
+    [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Elements, 1, 1, 0, 1, 0)]
+    [TestCase(PropertyCacheLevel.Element, PropertyCacheLevel.Snapshot, 1, 0, 1, 0, 1)]
+
+    // property is cached at elements level, converted cached at Element, exept
+    //  /None = not cached at all
+    //  /Snapshot = cached in snapshot
+    [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Elements, 1, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Elements, PropertyCacheLevel.Snapshot, 1, 0, 1, 0, 1)]
+
+    // property is cached at snapshot level, converted cached at Element, exept
+    //  /None = not cached at all
+    [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.None, 2, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.Element, 1, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.Elements, 1, 0, 0, 0, 0)]
+    [TestCase(PropertyCacheLevel.Snapshot, PropertyCacheLevel.Snapshot, 1, 0, 0, 0, 0)]
+    public void CachePublishedSnapshotTest(
+        PropertyCacheLevel referenceCacheLevel,
+        PropertyCacheLevel converterCacheLevel,
+        int interConverts,
+        int elementsCount1,
+        int snapshotCount1,
+        int elementsCount2,
+        int snapshotCount2)
+    {
+        var converter = new CacheConverter1(converterCacheLevel);
+
+        var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[] { converter });
+
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        var dataType = new DataType(
+            new VoidEditor(Mock.Of<IDataValueEditorFactory>()), new ConfigurationEditorJsonSerializer())
+        { Id = 1 };
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
+
+        var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
+
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
+        {
+            yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
+        }
+
+        var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
+
+        var elementsCache = new FastDictionaryAppCache();
+        var snapshotCache = new FastDictionaryAppCache();
+
+        var publishedSnapshot = new Mock<IPublishedSnapshot>();
+        publishedSnapshot.Setup(x => x.SnapshotCache).Returns(snapshotCache);
+        publishedSnapshot.Setup(x => x.ElementsCache).Returns(elementsCache);
+
+        var publishedSnapshotAccessor = new Mock<IPublishedSnapshotAccessor>();
+        var localPublishedSnapshot = publishedSnapshot.Object;
+        publishedSnapshotAccessor.Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot)).Returns(true);
+
+        // pretend we're creating this set as a value for a property
+        // referenceCacheLevel is the cache level for this fictious property
+        // converterCacheLevel is the cache level specified by the converter
+        var set1 = new PublishedElement(
+            setType1,
+            Guid.NewGuid(),
+            new Dictionary<string, object>
+            {
+                { "prop1", "1234" },
+            },
+            false,
+            referenceCacheLevel,
+            publishedSnapshotAccessor.Object);
+
+        Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+        Assert.AreEqual(1, converter.SourceConverts);
+        Assert.AreEqual(1, converter.InterConverts);
+
+        Assert.AreEqual(elementsCount1, elementsCache.Count);
+        Assert.AreEqual(snapshotCount1, snapshotCache.Count);
+
+        Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+        Assert.AreEqual(1, converter.SourceConverts);
+        Assert.AreEqual(interConverts, converter.InterConverts);
+
+        Assert.AreEqual(elementsCount2, elementsCache.Count);
+        Assert.AreEqual(snapshotCount2, snapshotCache.Count);
+
+        var oldSnapshotCache = snapshotCache;
+        snapshotCache.Clear();
+
+        Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+        Assert.AreEqual(1, converter.SourceConverts);
+
+        Assert.AreEqual(elementsCount2, elementsCache.Count);
+        Assert.AreEqual(snapshotCount2, snapshotCache.Count);
+        Assert.AreEqual(snapshotCount2, oldSnapshotCache.Count);
+
+        Assert.AreEqual((interConverts == 1 ? 1 : 3) + snapshotCache.Count, converter.InterConverts);
+
+        var oldElementsCache = elementsCache;
+        elementsCache.Clear();
+
+        Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
+        Assert.AreEqual(1, converter.SourceConverts);
+
+        Assert.AreEqual(elementsCount2, elementsCache.Count);
+        Assert.AreEqual(elementsCount2, oldElementsCache.Count);
+        Assert.AreEqual(snapshotCount2, snapshotCache.Count);
+
+        Assert.AreEqual((interConverts == 1 ? 1 : 4) + snapshotCache.Count + elementsCache.Count, converter.InterConverts);
+    }
+
+    [Test]
+    public void CacheUnknownTest()
+    {
+        var converter = new CacheConverter1(PropertyCacheLevel.Unknown);
+
+        var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[] { converter });
+
+        var dataTypeServiceMock = new Mock<IDataTypeService>();
+        var dataType = new DataType(
+            new VoidEditor(Mock.Of<IDataValueEditorFactory>()), new ConfigurationEditorJsonSerializer())
+        { Id = 1 };
+        dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
+
+        var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
+
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
+        {
+            yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
+        }
+
+        var setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
+
+        Assert.Throws<Exception>(() =>
+        {
+            var unused = new PublishedElement(setType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
+        });
+    }
+
+    private class CacheConverter1 : IPropertyValueConverter
+    {
+        private readonly PropertyCacheLevel _cacheLevel;
+
+        public CacheConverter1(PropertyCacheLevel cacheLevel) => _cacheLevel = cacheLevel;
+
+        public int SourceConverts { get; private set; }
+
+        public int InterConverts { get; private set; }
+
+        public bool? IsValue(object value, PropertyValueLevel level)
+            => value != null && (!(value is string) || string.IsNullOrWhiteSpace((string)value) == false);
+
+        public bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
+
+        public Type GetPropertyValueType(IPublishedPropertyType propertyType)
+            => typeof(int);
+
+        public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
+            => _cacheLevel;
+
+        public object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
+        {
+            SourceConverts++;
+            return int.TryParse(source as string, out var i) ? i : 0;
+        }
+
+        public object ConvertIntermediateToObject(
+            IPublishedElement owner,
+            IPublishedPropertyType propertyType,
             PropertyCacheLevel referenceCacheLevel,
-            PropertyCacheLevel converterCacheLevel,
-            int interConverts,
-            int elementsCount1,
-            int snapshotCount1,
-            int elementsCount2,
-            int snapshotCount2)
+            object inter,
+            bool preview)
         {
-            var converter = new CacheConverter1(converterCacheLevel);
-
-            var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
-            {
-                converter,
-            });
-
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            var dataType = new DataType(
-                new VoidEditor(
-                    Mock.Of<IDataValueEditorFactory>()), new ConfigurationEditorJsonSerializer())
-                { Id = 1 };
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
-
-            var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
-
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
-            {
-                yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
-            }
-
-            IPublishedContentType setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
-
-            var elementsCache = new FastDictionaryAppCache();
-            var snapshotCache = new FastDictionaryAppCache();
-
-            var publishedSnapshot = new Mock<IPublishedSnapshot>();
-            publishedSnapshot.Setup(x => x.SnapshotCache).Returns(snapshotCache);
-            publishedSnapshot.Setup(x => x.ElementsCache).Returns(elementsCache);
-
-            var publishedSnapshotAccessor = new Mock<IPublishedSnapshotAccessor>();
-            var localPublishedSnapshot = publishedSnapshot.Object;
-            publishedSnapshotAccessor.Setup(x => x.TryGetPublishedSnapshot(out localPublishedSnapshot)).Returns(true);
-
-            // pretend we're creating this set as a value for a property
-            // referenceCacheLevel is the cache level for this fictious property
-            // converterCacheLevel is the cache level specified by the converter
-            var set1 = new PublishedElement(setType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false, referenceCacheLevel, publishedSnapshotAccessor.Object);
-
-            Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
-            Assert.AreEqual(1, converter.SourceConverts);
-            Assert.AreEqual(1, converter.InterConverts);
-
-            Assert.AreEqual(elementsCount1, elementsCache.Count);
-            Assert.AreEqual(snapshotCount1, snapshotCache.Count);
-
-            Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
-            Assert.AreEqual(1, converter.SourceConverts);
-            Assert.AreEqual(interConverts, converter.InterConverts);
-
-            Assert.AreEqual(elementsCount2, elementsCache.Count);
-            Assert.AreEqual(snapshotCount2, snapshotCache.Count);
-
-            FastDictionaryAppCache oldSnapshotCache = snapshotCache;
-            snapshotCache.Clear();
-
-            Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
-            Assert.AreEqual(1, converter.SourceConverts);
-
-            Assert.AreEqual(elementsCount2, elementsCache.Count);
-            Assert.AreEqual(snapshotCount2, snapshotCache.Count);
-            Assert.AreEqual(snapshotCount2, oldSnapshotCache.Count);
-
-            Assert.AreEqual((interConverts == 1 ? 1 : 3) + snapshotCache.Count, converter.InterConverts);
-
-            FastDictionaryAppCache oldElementsCache = elementsCache;
-            elementsCache.Clear();
-
-            Assert.AreEqual(1234, set1.Value(Mock.Of<IPublishedValueFallback>(), "prop1"));
-            Assert.AreEqual(1, converter.SourceConverts);
-
-            Assert.AreEqual(elementsCount2, elementsCache.Count);
-            Assert.AreEqual(elementsCount2, oldElementsCache.Count);
-            Assert.AreEqual(snapshotCount2, snapshotCache.Count);
-
-            Assert.AreEqual((interConverts == 1 ? 1 : 4) + snapshotCache.Count + elementsCache.Count, converter.InterConverts);
+            InterConverts++;
+            return (int)inter;
         }
 
-        [Test]
-        public void CacheUnknownTest()
-        {
-            var converter = new CacheConverter1(PropertyCacheLevel.Unknown);
-
-            var converters = new PropertyValueConverterCollection(() => new IPropertyValueConverter[]
-            {
-                converter,
-            });
-
-            var dataTypeServiceMock = new Mock<IDataTypeService>();
-            var dataType = new DataType(
-                    new VoidEditor(
-                        Mock.Of<IDataValueEditorFactory>()), new ConfigurationEditorJsonSerializer())
-                { Id = 1 };
-            dataTypeServiceMock.Setup(x => x.GetAll()).Returns(dataType.Yield);
-
-            var publishedContentTypeFactory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), converters, dataTypeServiceMock.Object);
-
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
-            {
-                yield return publishedContentTypeFactory.CreatePropertyType(contentType, "prop1", 1);
-            }
-
-            IPublishedContentType setType1 = publishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 1000, "set1", CreatePropertyTypes);
-
-            Assert.Throws<Exception>(() =>
-            {
-                var unused = new PublishedElement(setType1, Guid.NewGuid(), new Dictionary<string, object> { { "prop1", "1234" } }, false);
-            });
-        }
-
-        private class CacheConverter1 : IPropertyValueConverter
-        {
-            private readonly PropertyCacheLevel _cacheLevel;
-
-            public CacheConverter1(PropertyCacheLevel cacheLevel) => _cacheLevel = cacheLevel;
-
-            public int SourceConverts { get; private set; }
-
-            public int InterConverts { get; private set; }
-
-            public bool? IsValue(object value, PropertyValueLevel level)
-                => value != null && (!(value is string) || string.IsNullOrWhiteSpace((string)value) == false);
-
-            public bool IsConverter(IPublishedPropertyType propertyType)
-                => propertyType.EditorAlias.InvariantEquals("Umbraco.Void");
-
-            public Type GetPropertyValueType(IPublishedPropertyType propertyType)
-                => typeof(int);
-
-            public PropertyCacheLevel GetPropertyCacheLevel(IPublishedPropertyType propertyType)
-                => _cacheLevel;
-
-            public object ConvertSourceToIntermediate(IPublishedElement owner, IPublishedPropertyType propertyType, object source, bool preview)
-            {
-                SourceConverts++;
-                return int.TryParse(source as string, out int i) ? i : 0;
-            }
-
-            public object ConvertIntermediateToObject(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-            {
-                InterConverts++;
-                return (int)inter;
-            }
-
-            public object ConvertIntermediateToXPath(IPublishedElement owner, IPublishedPropertyType propertyType, PropertyCacheLevel referenceCacheLevel, object inter, bool preview)
-                => ((int)inter).ToString();
-        }
+        public object ConvertIntermediateToXPath(
+            IPublishedElement owner,
+            IPublishedPropertyType propertyType,
+            PropertyCacheLevel referenceCacheLevel,
+            object inter,
+            bool preview)
+            => ((int)inter).ToString();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs
index 817bef62d4..e3dfce820f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionTests.cs
@@ -1,39 +1,37 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class ReflectionTests
 {
-    [TestFixture]
-    public class ReflectionTests
+    [Test]
+    public void GetBaseTypesIsOk()
     {
-        [Test]
-        public void GetBaseTypesIsOk()
-        {
-            // tests that the GetBaseTypes extension method works.
-            Type type = typeof(Class2);
-            Type[] types = type.GetBaseTypes(true).ToArray();
-            Assert.AreEqual(3, types.Length);
-            Assert.Contains(typeof(Class2), types);
-            Assert.Contains(typeof(Class1), types);
-            Assert.Contains(typeof(object), types);
+        // tests that the GetBaseTypes extension method works.
+        var type = typeof(Class2);
+        var types = type.GetBaseTypes(true).ToArray();
+        Assert.AreEqual(3, types.Length);
+        Assert.Contains(typeof(Class2), types);
+        Assert.Contains(typeof(Class1), types);
+        Assert.Contains(typeof(object), types);
 
-            types = type.GetBaseTypes(false).ToArray();
-            Assert.AreEqual(2, types.Length);
-            Assert.Contains(typeof(Class1), types);
-            Assert.Contains(typeof(object), types);
-        }
+        types = type.GetBaseTypes(false).ToArray();
+        Assert.AreEqual(2, types.Length);
+        Assert.Contains(typeof(Class1), types);
+        Assert.Contains(typeof(object), types);
+    }
 
-        private class Class1
-        {
-        }
+    private class Class1
+    {
+    }
 
-        private class Class2 : Class1
-        {
-        }
+    private class Class2 : Class1
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs
index 853adddef4..c29116c8bd 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ReflectionUtilitiesTests.cs
@@ -10,719 +10,754 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class ReflectionUtilitiesTests
 {
-    [TestFixture]
-    public class ReflectionUtilitiesTests
+    [Test]
+    public void EmitCtorEmits()
     {
-        [Test]
-        public void EmitCtorEmits()
-        {
-            Func<Class1> ctor1 = ReflectionUtilities.EmitConstructor<Func<Class1>>();
-            Assert.IsInstanceOf<Class1>(ctor1());
-
-            Func<object> ctor2 = ReflectionUtilities.EmitConstructor<Func<object>>(declaring: typeof(Class1));
-            Assert.IsInstanceOf<Class1>(ctor2());
-
-            Func<int, Class3> ctor3 = ReflectionUtilities.EmitConstructor<Func<int, Class3>>();
-            Assert.IsInstanceOf<Class3>(ctor3(42));
-
-            Func<int, object> ctor4 = ReflectionUtilities.EmitConstructor<Func<int, object>>(declaring: typeof(Class3));
-            Assert.IsInstanceOf<Class3>(ctor4(42));
-        }
-
-        [Test]
-        public void EmitCtorEmitsFromInfo()
-        {
-            ConstructorInfo ctorInfo = typeof(Class1).GetConstructor(BindingFlags.Public | BindingFlags.Instance, null, CallingConventions.Any, Array.Empty<Type>(), null);
-            Func<Class1> ctor1 = ReflectionUtilities.EmitConstructor<Func<Class1>>(ctorInfo);
-            Assert.IsInstanceOf<Class1>(ctor1());
-
-            ctorInfo = typeof(Class1).GetConstructor(BindingFlags.Public | BindingFlags.Instance, null, CallingConventions.Any, new[] { typeof(int) }, null);
-            Func<int, object> ctor3 = ReflectionUtilities.EmitConstructor<Func<int, object>>(ctorInfo);
-            Assert.IsInstanceOf<Class1>(ctor3(42));
-
-            Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitConstructor<Func<string, object>>(ctorInfo));
-        }
-
-        [Test]
-        public void EmitCtorEmitsPrivateCtor()
-        {
-            Func<string, Class3> ctor = ReflectionUtilities.EmitConstructor<Func<string, Class3>>();
-            Assert.IsInstanceOf<Class3>(ctor("foo"));
-        }
-
-        [Test]
-        public void EmitCtorThrowsIfNotFound() =>
-            Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitConstructor<Func<bool, Class3>>());
-
-        [Test]
-        public void EmitCtorThrowsIfInvalid()
-        {
-            ConstructorInfo ctorInfo = typeof(Class1).GetConstructor(BindingFlags.Public | BindingFlags.Instance, null, CallingConventions.Any, Array.Empty<Type>(), null);
-            Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitConstructor<Func<Class2>>(ctorInfo));
-        }
-
-        [Test]
-        public void EmitCtorReturnsNull() =>
-            Assert.IsNull(ReflectionUtilities.EmitConstructor<Func<bool, Class3>>(false));
-
-        [Test]
-        public void EmitMethodEmitsInstance()
-        {
-            var class1 = new Class1();
-
-            Action<Class1> method1 = ReflectionUtilities.EmitMethod<Action<Class1>>("Method1");
-            method1(class1);
-
-            Action<Class1, int> method2 = ReflectionUtilities.EmitMethod<Action<Class1, int>>("Method2");
-            method2(class1, 42);
-
-            Func<Class1, int> method3 = ReflectionUtilities.EmitMethod<Func<Class1, int>>("Method3");
-            Assert.AreEqual(42, method3(class1));
-
-            Func<Class1, string, int> method4 = ReflectionUtilities.EmitMethod<Func<Class1, string, int>>("Method4");
-            Assert.AreEqual(42, method4(class1, "42"));
-        }
-
-        [Test]
-        public void EmitMethodEmitsStatic()
-        {
-            Action method1 = ReflectionUtilities.EmitMethod<Class1, Action>("SMethod1");
-            method1();
-
-            Action<int> method2 = ReflectionUtilities.EmitMethod<Class1, Action<int>>("SMethod2");
-            method2(42);
-
-            Func<int> method3 = ReflectionUtilities.EmitMethod<Class1, Func<int>>("SMethod3");
-            Assert.AreEqual(42, method3());
-
-            Func<string, int> method4 = ReflectionUtilities.EmitMethod<Class1, Func<string, int>>("SMethod4");
-            Assert.AreEqual(42, method4("42"));
-        }
-
-        [Test]
-        public void EmitMethodEmitsStaticStatic()
-        {
-            Action method = ReflectionUtilities.EmitMethod<Action>(typeof(StaticClass1), "Method");
-            method();
-        }
-
-        [Test]
-        public void EmitMethodEmitsFromInfo()
-        {
-            var class1 = new Class1();
-
-            MethodInfo methodInfo = typeof(Class1).GetMethod("Method1", BindingFlags.Instance | BindingFlags.Public);
-            Action<Class1> method1 = ReflectionUtilities.EmitMethod<Action<Class1>>(methodInfo);
-            method1(class1);
-
-            methodInfo = typeof(Class1).GetMethod("Method2", BindingFlags.Instance | BindingFlags.Public, null, new[] { typeof(int) }, null);
-            Action<Class1, int> method2 = ReflectionUtilities.EmitMethod<Action<Class1, int>>(methodInfo);
-            method2(class1, 42);
-
-            methodInfo = typeof(Class1).GetMethod("Method3", BindingFlags.Instance | BindingFlags.Public);
-            Func<Class1, int> method3 = ReflectionUtilities.EmitMethod<Func<Class1, int>>(methodInfo);
-            Assert.AreEqual(42, method3(class1));
-
-            methodInfo = typeof(Class1).GetMethod("Method4", BindingFlags.Instance | BindingFlags.Public, null, new[] { typeof(string) }, null);
-            Func<Class1, string, int> method4 = ReflectionUtilities.EmitMethod<Func<Class1, string, int>>(methodInfo);
-            Assert.AreEqual(42, method4(class1, "42"));
-
-            methodInfo = typeof(Class1).GetMethod("SMethod1", BindingFlags.Static | BindingFlags.Public);
-            Action smethod1 = ReflectionUtilities.EmitMethod<Action>(methodInfo);
-            smethod1();
-
-            methodInfo = typeof(Class1).GetMethod("SMethod2", BindingFlags.Static | BindingFlags.Public, null, new[] { typeof(int) }, null);
-            Action<int> smethod2 = ReflectionUtilities.EmitMethod<Action<int>>(methodInfo);
-            smethod2(42);
-
-            methodInfo = typeof(Class1).GetMethod("SMethod3", BindingFlags.Static | BindingFlags.Public);
-            Func<int> smethod3 = ReflectionUtilities.EmitMethod<Func<int>>(methodInfo);
-            Assert.AreEqual(42, smethod3());
-
-            methodInfo = typeof(Class1).GetMethod("SMethod4", BindingFlags.Static | BindingFlags.Public, null, new[] { typeof(string) }, null);
-            Func<string, int> smethod4 = ReflectionUtilities.EmitMethod<Func<string, int>>(methodInfo);
-            Assert.AreEqual(42, smethod4("42"));
-
-            methodInfo = typeof(StaticClass1).GetMethod("Method", BindingFlags.Static | BindingFlags.Public);
-            Action method = ReflectionUtilities.EmitMethod<Action>(methodInfo);
-            method();
-        }
-
-        [Test]
-        public void EmitMethodEmitsPrivateMethod()
-        {
-            var class1 = new Class1();
-
-            Action<Class1> method1 = ReflectionUtilities.EmitMethod<Action<Class1>>("MethodP1");
-            method1(class1);
-
-            Action method2 = ReflectionUtilities.EmitMethod<Class1, Action>("SMethodP1");
-            method2();
-        }
-
-        [Test]
-        public void EmitMethodThrowsIfNotFound()
-        {
-            Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitMethod<Action<Class1>>("ZZZ"));
-            Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitMethod<Action<Class1, int, int>>("Method1"));
-        }
-
-        [Test]
-        public void EmitMethodThrowsIfInvalid()
-        {
-            MethodInfo methodInfo = typeof(Class1).GetMethod("Method1", BindingFlags.Instance | BindingFlags.Public);
-            Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitMethod<Action<Class1, int, int>>(methodInfo));
-        }
-
-        [Test]
-        public void EmitMethodReturnsNull()
-        {
-            Assert.IsNull(ReflectionUtilities.EmitMethod<Action<Class1>>("ZZZ", false));
-            Assert.IsNull(ReflectionUtilities.EmitMethod<Action<Class1, int, int>>("Method1", false));
-        }
-
-        [Test]
-        public void EmitPropertyEmits()
-        {
-            var class1 = new Class1();
-
-            Func<Class1, int> getter1 = ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value1");
-            Assert.AreEqual(42, getter1(class1));
-
-            Func<Class1, int> getter2 = ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value3");
-            Assert.AreEqual(42, getter2(class1));
-
-            Action<Class1, int> setter1 = ReflectionUtilities.EmitPropertySetter<Class1, int>("Value2");
-            setter1(class1, 42);
-
-            Action<Class1, int> setter2 = ReflectionUtilities.EmitPropertySetter<Class1, int>("Value3");
-            setter2(class1, 42);
-
-            (Func<Class1, int> getter3, Action<Class1, int> setter3) = ReflectionUtilities.EmitPropertyGetterAndSetter<Class1, int>("Value3");
-            Assert.AreEqual(42, getter3(class1));
-            setter3(class1, 42);
-        }
-
-        [Test]
-        public void EmitPropertyEmitsFromInfo()
-        {
-            var class1 = new Class1();
-
-            PropertyInfo propertyInfo = typeof(Class1).GetProperty("Value1");
-            Func<Class1, int> getter1 = ReflectionUtilities.EmitPropertyGetter<Class1, int>(propertyInfo);
-            Assert.AreEqual(42, getter1(class1));
-
-            propertyInfo = typeof(Class1).GetProperty("Value3");
-            Func<Class1, int> getter2 = ReflectionUtilities.EmitPropertyGetter<Class1, int>(propertyInfo);
-            Assert.AreEqual(42, getter2(class1));
-
-            propertyInfo = typeof(Class1).GetProperty("Value2");
-            Action<Class1, int> setter1 = ReflectionUtilities.EmitPropertySetter<Class1, int>(propertyInfo);
-            setter1(class1, 42);
-
-            propertyInfo = typeof(Class1).GetProperty("Value3");
-            Action<Class1, int> setter2 = ReflectionUtilities.EmitPropertySetter<Class1, int>(propertyInfo);
-            setter2(class1, 42);
-
-            (Func<Class1, int> getter3, Action<Class1, int> setter3) = ReflectionUtilities.EmitPropertyGetterAndSetter<Class1, int>(propertyInfo);
-            Assert.AreEqual(42, getter3(class1));
-            setter3(class1, 42);
-        }
-
-        [Test]
-        public void EmitPropertyEmitsPrivateProperty()
-        {
-            var class1 = new Class1();
-
-            Func<Class1, int> getter1 = ReflectionUtilities.EmitPropertyGetter<Class1, int>("ValueP1");
-            Assert.AreEqual(42, getter1(class1));
-        }
-
-        [Test]
-        public void EmitPropertyThrowsIfNotFound()
-        {
-            Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitPropertyGetter<Class1, int>("Zalue1"));
-            Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value2"));
-
-            PropertyInfo propertyInfo = typeof(Class1).GetProperty("Value1");
-            Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitPropertySetter<Class1, int>(propertyInfo));
-        }
-
-        [Test]
-        public void EmitPropertyThrowsIfInvalid() =>
-            Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitPropertyGetter<Class1, string>("Value1"));
-
-        [Test]
-        public void EmitPropertyReturnsNull()
-        {
-            Assert.IsNull(ReflectionUtilities.EmitPropertyGetter<Class1, int>("Zalue1", false));
-            Assert.IsNull(ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value2", false));
-        }
-
-        [Test]
-        public void PropertySetterCanCastUnsafeValue()
-        {
-            // test that we can emit property setters that cast from eg 'object'
-            Type type4 = typeof(Class4);
-            PropertyInfo propInt4 = type4.GetProperty("IntValue");
-            PropertyInfo propString4 = type4.GetProperty("StringValue");
-            PropertyInfo propClassA4 = type4.GetProperty("ClassAValue");
-
-            var object4 = new Class4();
-            var object2A = new Class2A();
-
-            // works with a string property
-            Assert.IsNotNull(propString4);
-            Action<Class4, object> setterString4 = ReflectionUtilities.EmitPropertySetterUnsafe<Class4, object>(propString4);
-            Assert.IsNotNull(setterString4);
-            setterString4(object4, "foo");
-            Assert.IsNotNull(object4.StringValue);
-            Assert.AreEqual("foo", object4.StringValue);
-
-            // unsafe is... unsafe
-            Assert.Throws<InvalidCastException>(() => setterString4(object4, new Class2()));
-
-            // works with a reference property
-            Assert.IsNotNull(propClassA4);
-            Action<Class4, object> setterClassA4 = ReflectionUtilities.EmitPropertySetterUnsafe<Class4, object>(propClassA4);
-            Assert.IsNotNull(setterClassA4);
-            setterClassA4(object4, object2A);
-            Assert.IsNotNull(object4.ClassAValue);
-            Assert.AreEqual(object2A, object4.ClassAValue);
-
-            // works with a boxed value type
-            Assert.IsNotNull(propInt4);
-            Action<Class4, object> setterInt4 = ReflectionUtilities.EmitPropertySetterUnsafe<Class4, object>(propInt4);
-            Assert.IsNotNull(setterInt4);
-
-            setterInt4(object4, 42);
-            Assert.AreEqual(42, object4.IntValue);
-
-            // FIXME: the code below runs fine with ReSharper test running within VisualStudio
-            // but it crashes when running via vstest.console.exe - unless some settings are required?
-
-            // converting works
-            setterInt4(object4, 42.0);
-            Assert.AreEqual(42, object4.IntValue);
-
-            // unsafe is... unsafe
-            Assert.Throws<FormatException>(() => setterInt4(object4, "foo"));
-        }
-
-        [Test]
-        public void PropertySetterCanCastObject()
-        {
-            // Class5 inherits from Class4 and ClassValue is defined on Class4
-            Type type5 = typeof(Class5);
-            PropertyInfo propClass4 = type5.GetProperty("ClassValue");
-
-            var object2 = new Class2();
-
-            // can cast the object type from Class5 to Class4
-            Action<Class5, Class2> setterClass4 = ReflectionUtilities.EmitPropertySetter<Class5, Class2>(propClass4);
-
-            var object4 = new Class5();
-            setterClass4(object4, object2);
-            Assert.IsNotNull(object4.ClassValue);
-            Assert.AreSame(object2, object4.ClassValue);
-        }
-
-        [Test]
-        public void PropertySetterCanCastUnsafeObject()
-        {
-            Type type5 = typeof(Class5);
-            PropertyInfo propClass4 = type5.GetProperty("ClassValue");
-
-            var object2 = new Class2();
-
-            // can cast the object type from object to Class4
-            Action<object, Class2> setterClass4 = ReflectionUtilities.EmitPropertySetterUnsafe<object, Class2>(propClass4);
-
-            var object4 = new Class5();
-            setterClass4(object4, object2);
-            Assert.IsNotNull(object4.ClassValue);
-            Assert.AreSame(object2, object4.ClassValue);
-        }
-
-        [Test]
-        public void PropertyGetterCanCastValue()
-        {
-            Type type4 = typeof(Class4);
-            PropertyInfo propClassA4 = type4.GetProperty("ClassAValue");
-            PropertyInfo propInt4 = type4.GetProperty("IntValue");
-
-            var object2A = new Class2A();
-            var object4 = new Class4 { ClassAValue = object2A, IntValue = 159 };
-
-            // can cast the return type from Class2A to Class2
-            Func<Class4, Class2> getterClassA4 = ReflectionUtilities.EmitPropertyGetter<Class4, Class2>(propClassA4);
-
-            Class2 valueClass4A = getterClassA4(object4);
-            Assert.IsNotNull(valueClass4A);
-            Assert.AreSame(object2A, valueClass4A);
-
-            // cannot cast the return type from Class2A to Class3!
-            Assert.Throws<ArgumentException>(()
-                => ReflectionUtilities.EmitPropertyGetter<Class4, Class3>(propClassA4));
-
-            // can cast and box the return type from int to object
-            Func<Class4, object> getterInt4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propInt4);
-
-            object valueInt4 = getterInt4(object4);
-            Assert.IsTrue(valueInt4 is int);
-            Assert.AreEqual(159, valueInt4);
-
-            // cannot cast the return type from int to Class3!
-            Assert.Throws<ArgumentException>(()
-                => ReflectionUtilities.EmitPropertyGetter<Class4, Class3>(propInt4));
-        }
-
-        [Test]
-        public void PropertyGetterCanCastObject()
-        {
-            Type type5 = typeof(Class5);
-            PropertyInfo propClass4 = type5.GetProperty("ClassValue");
-
-            var object2 = new Class2();
-            var object4 = new Class5 { ClassValue = object2 };
-
-            // can cast the object type from Class5 to Class4
-            Func<Class5, Class2> getterClass4 = ReflectionUtilities.EmitPropertyGetter<Class5, Class2>(propClass4);
-
-            Class2 valueClass4 = getterClass4(object4);
-            Assert.IsNotNull(valueClass4);
-            Assert.AreSame(object2, valueClass4);
-
-            // cannot cast the object type from Class3 to Class4!
-            Assert.Throws<ArgumentException>(()
-                => ReflectionUtilities.EmitPropertyGetter<Class3, Class2>(propClass4));
-        }
-
-        [Test]
-        public void EmitPropertyCastGetterEmits()
-        {
-            // test that we can emit property getters that cast the returned value to 'object'
-            // test simple class
-            Type type4 = typeof(Class4);
-
-            var object4 = new Class4
+        var ctor1 = ReflectionUtilities.EmitConstructor<Func<Class1>>();
+        Assert.IsInstanceOf<Class1>(ctor1());
+
+        var ctor2 = ReflectionUtilities.EmitConstructor<Func<object>>(declaring: typeof(Class1));
+        Assert.IsInstanceOf<Class1>(ctor2());
+
+        var ctor3 = ReflectionUtilities.EmitConstructor<Func<int, Class3>>();
+        Assert.IsInstanceOf<Class3>(ctor3(42));
+
+        var ctor4 = ReflectionUtilities.EmitConstructor<Func<int, object>>(declaring: typeof(Class3));
+        Assert.IsInstanceOf<Class3>(ctor4(42));
+    }
+
+    [Test]
+    public void EmitCtorEmitsFromInfo()
+    {
+        var ctorInfo = typeof(Class1).GetConstructor(
+            BindingFlags.Public | BindingFlags.Instance,
+            null,
+            CallingConventions.Any,
+            Array.Empty<Type>(),
+            null);
+        var ctor1 = ReflectionUtilities.EmitConstructor<Func<Class1>>(ctorInfo);
+        Assert.IsInstanceOf<Class1>(ctor1());
+
+        ctorInfo = typeof(Class1).GetConstructor(
+            BindingFlags.Public | BindingFlags.Instance,
+            null,
+            CallingConventions.Any,
+            new[]
             {
-                IntValue = 1,
-                StringValue = "foo",
-                ClassValue = new Class2(),
-            };
+                typeof(int),
+            },
+            null);
+        var ctor3 = ReflectionUtilities.EmitConstructor<Func<int, object>>(ctorInfo);
+        Assert.IsInstanceOf<Class1>(ctor3(42));
 
-            // works with a string property
-            PropertyInfo propString4 = type4.GetProperty("StringValue");
-            Assert.IsNotNull(propString4);
-            Func<Class4, object> getterString4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propString4);
-            Assert.IsNotNull(getterString4);
-            object valueString4 = getterString4(object4);
-            Assert.IsNotNull(valueString4);
-            Assert.AreEqual("foo", valueString4);
+        Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitConstructor<Func<string, object>>(ctorInfo));
+    }
 
-            // works with a reference property
-            PropertyInfo propClass4 = type4.GetProperty("ClassValue");
-            Assert.IsNotNull(propClass4);
-            Func<Class4, object> getterClass4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propClass4);
-            Assert.IsNotNull(getterClass4);
-            object valueClass4 = getterClass4(object4);
-            Assert.IsNotNull(valueClass4);
-            Assert.IsInstanceOf<Class2>(valueClass4);
+    [Test]
+    public void EmitCtorEmitsPrivateCtor()
+    {
+        var ctor = ReflectionUtilities.EmitConstructor<Func<string, Class3>>();
+        Assert.IsInstanceOf<Class3>(ctor("foo"));
+    }
 
-            // works with a value type property
-            PropertyInfo propInt4 = type4.GetProperty("IntValue");
-            Assert.IsNotNull(propInt4);
+    [Test]
+    public void EmitCtorThrowsIfNotFound() =>
+        Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitConstructor<Func<bool, Class3>>());
 
-            // ... if explicitly getting a value type
-            Func<Class4, int> getterInt4T = ReflectionUtilities.EmitPropertyGetter<Class4, int>(propInt4);
-            Assert.IsNotNull(getterInt4T);
-            int valueInt4T = getterInt4T(object4);
-            Assert.AreEqual(1, valueInt4T);
+    [Test]
+    public void EmitCtorThrowsIfInvalid()
+    {
+        var ctorInfo = typeof(Class1).GetConstructor(
+            BindingFlags.Public | BindingFlags.Instance,
+            null,
+            CallingConventions.Any,
+            Array.Empty<Type>(),
+            null);
+        Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitConstructor<Func<Class2>>(ctorInfo));
+    }
 
-            // ... if using a compiled getter
-            object valueInt4D = GetIntValue(object4);
-            Assert.IsNotNull(valueInt4D);
-            Assert.IsTrue(valueInt4D is int);
-            Assert.AreEqual(1, valueInt4D);
+    [Test]
+    public void EmitCtorReturnsNull() =>
+        Assert.IsNull(ReflectionUtilities.EmitConstructor<Func<bool, Class3>>(false));
 
-            // ... if getting a non-value type (emit adds a box)
-            Func<Class4, object> getterInt4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propInt4);
-            Assert.IsNotNull(getterInt4);
-            object valueInt4 = getterInt4(object4);
-            Assert.IsNotNull(valueInt4);
-            Assert.IsTrue(valueInt4 is int);
-            Assert.AreEqual(1, valueInt4);
+    [Test]
+    public void EmitMethodEmitsInstance()
+    {
+        var class1 = new Class1();
 
-            var getters4 = type4
-                .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy)
-                .ToDictionary(x => x.Name, x => (object)ReflectionUtilities.EmitPropertyGetter<Class4, object>(x));
+        var method1 = ReflectionUtilities.EmitMethod<Action<Class1>>("Method1");
+        method1(class1);
 
-            Console.WriteLine("Getting object4 values...");
-            var values4 = getters4.ToDictionary(kvp => kvp.Key, kvp => ((Func<Class4, object>)kvp.Value)(object4));
+        var method2 = ReflectionUtilities.EmitMethod<Action<Class1, int>>("Method2");
+        method2(class1, 42);
 
-            Console.WriteLine("Writing object4 values...");
-            foreach ((string name, object value) in values4)
+        var method3 = ReflectionUtilities.EmitMethod<Func<Class1, int>>("Method3");
+        Assert.AreEqual(42, method3(class1));
+
+        var method4 = ReflectionUtilities.EmitMethod<Func<Class1, string, int>>("Method4");
+        Assert.AreEqual(42, method4(class1, "42"));
+    }
+
+    [Test]
+    public void EmitMethodEmitsStatic()
+    {
+        var method1 = ReflectionUtilities.EmitMethod<Class1, Action>("SMethod1");
+        method1();
+
+        var method2 = ReflectionUtilities.EmitMethod<Class1, Action<int>>("SMethod2");
+        method2(42);
+
+        var method3 = ReflectionUtilities.EmitMethod<Class1, Func<int>>("SMethod3");
+        Assert.AreEqual(42, method3());
+
+        var method4 = ReflectionUtilities.EmitMethod<Class1, Func<string, int>>("SMethod4");
+        Assert.AreEqual(42, method4("42"));
+    }
+
+    [Test]
+    public void EmitMethodEmitsStaticStatic()
+    {
+        var method = ReflectionUtilities.EmitMethod<Action>(typeof(StaticClass1), "Method");
+        method();
+    }
+
+    [Test]
+    public void EmitMethodEmitsFromInfo()
+    {
+        var class1 = new Class1();
+
+        var methodInfo = typeof(Class1).GetMethod("Method1", BindingFlags.Instance | BindingFlags.Public);
+        var method1 = ReflectionUtilities.EmitMethod<Action<Class1>>(methodInfo);
+        method1(class1);
+
+        methodInfo = typeof(Class1).GetMethod(
+            "Method2",
+            BindingFlags.Instance | BindingFlags.Public,
+            null,
+            new[]
             {
-                Console.WriteLine($"{name}: {value}");
-            }
+                typeof(int),
+            },
+            null);
+        var method2 = ReflectionUtilities.EmitMethod<Action<Class1, int>>(methodInfo);
+        method2(class1, 42);
 
-            Assert.AreEqual(4, values4.Count);
-            Assert.AreEqual("foo", values4["StringValue"]);
-            Assert.IsInstanceOf<Class2>(values4["ClassValue"]);
-            Assert.AreEqual(1, values4["IntValue"]);
+        methodInfo = typeof(Class1).GetMethod("Method3", BindingFlags.Instance | BindingFlags.Public);
+        var method3 = ReflectionUtilities.EmitMethod<Func<Class1, int>>(methodInfo);
+        Assert.AreEqual(42, method3(class1));
 
-            // test hierarchy
-            Type type5 = typeof(Class5);
-
-            var getters5 = type5
-                .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy)
-                .ToDictionary(x => x.Name, x => (object)ReflectionUtilities.EmitPropertyGetter<Class5, object>(x));
-
-            var object5 = new Class5
+        methodInfo = typeof(Class1).GetMethod(
+            "Method4",
+            BindingFlags.Instance | BindingFlags.Public,
+            null,
+            new[]
             {
-                IntValue = 1,
-                IntValue2 = 1,
-                StringValue = "foo",
-                StringValue2 = "foo",
-                ClassValue = new Class2(),
-                ClassValue2 = new Class2()
-            };
+                typeof(string),
+            },
+            null);
+        var method4 = ReflectionUtilities.EmitMethod<Func<Class1, string, int>>(methodInfo);
+        Assert.AreEqual(42, method4(class1, "42"));
 
-            Console.WriteLine("Getting object5 values...");
-            var values5 = getters5.ToDictionary(kvp => kvp.Key, kvp => ((Func<Class5, object>)kvp.Value)(object5));
+        methodInfo = typeof(Class1).GetMethod("SMethod1", BindingFlags.Static | BindingFlags.Public);
+        var smethod1 = ReflectionUtilities.EmitMethod<Action>(methodInfo);
+        smethod1();
 
-            Console.WriteLine("Writing object5 values...");
-            foreach ((string name, object value) in values5)
-            {
-                Console.WriteLine($"{name}: {value}");
-            }
+        methodInfo = typeof(Class1).GetMethod("SMethod2", BindingFlags.Static | BindingFlags.Public, null, new[] { typeof(int) }, null);
+        var smethod2 = ReflectionUtilities.EmitMethod<Action<int>>(methodInfo);
+        smethod2(42);
 
-            Assert.AreEqual(7, values5.Count);
-            Assert.AreEqual("foo", values5["StringValue"]);
-            Assert.IsInstanceOf<Class2>(values5["ClassValue"]);
-            Assert.AreEqual(1, values5["IntValue"]);
-            Assert.AreEqual("foo", values5["StringValue2"]);
-            Assert.IsInstanceOf<Class2>(values5["ClassValue2"]);
-            Assert.AreEqual(1, values5["IntValue2"]);
+        methodInfo = typeof(Class1).GetMethod("SMethod3", BindingFlags.Static | BindingFlags.Public);
+        var smethod3 = ReflectionUtilities.EmitMethod<Func<int>>(methodInfo);
+        Assert.AreEqual(42, smethod3());
 
-            // test object extensions
-            Console.WriteLine("Getting object5D values...");
-            Dictionary<string, object> values5D = ObjectJsonExtensions.ToObjectDictionary(object5);
+        methodInfo = typeof(Class1).GetMethod(
+            "SMethod4",
+            BindingFlags.Static | BindingFlags.Public,
+            null,
+            new[] { typeof(string) },
+            null);
+        var smethod4 = ReflectionUtilities.EmitMethod<Func<string, int>>(methodInfo);
+        Assert.AreEqual(42, smethod4("42"));
 
-            Console.WriteLine("Writing object5D values...");
-            foreach ((string name, object value) in values5)
-            {
-                Console.WriteLine($"{name}: {value}");
-            }
+        methodInfo = typeof(StaticClass1).GetMethod("Method", BindingFlags.Static | BindingFlags.Public);
+        var method = ReflectionUtilities.EmitMethod<Action>(methodInfo);
+        method();
+    }
 
-            Assert.AreEqual(7, values5.Count);
-            Assert.AreEqual("foo", values5D["StringValue"]);
-            Assert.IsInstanceOf<Class2>(values5D["ClassValue"]);
-            Assert.AreEqual(1, values5D["IntValue"]);
-            Assert.AreEqual("foo", values5D["StringValue2"]);
-            Assert.IsInstanceOf<Class2>(values5D["ClassValue2"]);
-            Assert.AreEqual(1, values5D["intValue2"]); // JsonProperty changes property name
+    [Test]
+    public void EmitMethodEmitsPrivateMethod()
+    {
+        var class1 = new Class1();
+
+        var method1 = ReflectionUtilities.EmitMethod<Action<Class1>>("MethodP1");
+        method1(class1);
+
+        var method2 = ReflectionUtilities.EmitMethod<Class1, Action>("SMethodP1");
+        method2();
+    }
+
+    [Test]
+    public void EmitMethodThrowsIfNotFound()
+    {
+        Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitMethod<Action<Class1>>("ZZZ"));
+        Assert.Throws<InvalidOperationException>(() =>
+            ReflectionUtilities.EmitMethod<Action<Class1, int, int>>("Method1"));
+    }
+
+    [Test]
+    public void EmitMethodThrowsIfInvalid()
+    {
+        var methodInfo = typeof(Class1).GetMethod("Method1", BindingFlags.Instance | BindingFlags.Public);
+        Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitMethod<Action<Class1, int, int>>(methodInfo));
+    }
+
+    [Test]
+    public void EmitMethodReturnsNull()
+    {
+        Assert.IsNull(ReflectionUtilities.EmitMethod<Action<Class1>>("ZZZ", false));
+        Assert.IsNull(ReflectionUtilities.EmitMethod<Action<Class1, int, int>>("Method1", false));
+    }
+
+    [Test]
+    public void EmitPropertyEmits()
+    {
+        var class1 = new Class1();
+
+        var getter1 = ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value1");
+        Assert.AreEqual(42, getter1(class1));
+
+        var getter2 = ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value3");
+        Assert.AreEqual(42, getter2(class1));
+
+        var setter1 = ReflectionUtilities.EmitPropertySetter<Class1, int>("Value2");
+        setter1(class1, 42);
+
+        var setter2 = ReflectionUtilities.EmitPropertySetter<Class1, int>("Value3");
+        setter2(class1, 42);
+
+        (var getter3, var setter3) = ReflectionUtilities.EmitPropertyGetterAndSetter<Class1, int>("Value3");
+        Assert.AreEqual(42, getter3(class1));
+        setter3(class1, 42);
+    }
+
+    [Test]
+    public void EmitPropertyEmitsFromInfo()
+    {
+        var class1 = new Class1();
+
+        var propertyInfo = typeof(Class1).GetProperty("Value1");
+        var getter1 = ReflectionUtilities.EmitPropertyGetter<Class1, int>(propertyInfo);
+        Assert.AreEqual(42, getter1(class1));
+
+        propertyInfo = typeof(Class1).GetProperty("Value3");
+        var getter2 = ReflectionUtilities.EmitPropertyGetter<Class1, int>(propertyInfo);
+        Assert.AreEqual(42, getter2(class1));
+
+        propertyInfo = typeof(Class1).GetProperty("Value2");
+        var setter1 = ReflectionUtilities.EmitPropertySetter<Class1, int>(propertyInfo);
+        setter1(class1, 42);
+
+        propertyInfo = typeof(Class1).GetProperty("Value3");
+        var setter2 = ReflectionUtilities.EmitPropertySetter<Class1, int>(propertyInfo);
+        setter2(class1, 42);
+
+        (var getter3, var setter3) = ReflectionUtilities.EmitPropertyGetterAndSetter<Class1, int>(propertyInfo);
+        Assert.AreEqual(42, getter3(class1));
+        setter3(class1, 42);
+    }
+
+    [Test]
+    public void EmitPropertyEmitsPrivateProperty()
+    {
+        var class1 = new Class1();
+
+        var getter1 = ReflectionUtilities.EmitPropertyGetter<Class1, int>("ValueP1");
+        Assert.AreEqual(42, getter1(class1));
+    }
+
+    [Test]
+    public void EmitPropertyThrowsIfNotFound()
+    {
+        Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitPropertyGetter<Class1, int>("Zalue1"));
+        Assert.Throws<InvalidOperationException>(() => ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value2"));
+
+        var propertyInfo = typeof(Class1).GetProperty("Value1");
+        Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitPropertySetter<Class1, int>(propertyInfo));
+    }
+
+    [Test]
+    public void EmitPropertyThrowsIfInvalid() =>
+        Assert.Throws<ArgumentException>(() => ReflectionUtilities.EmitPropertyGetter<Class1, string>("Value1"));
+
+    [Test]
+    public void EmitPropertyReturnsNull()
+    {
+        Assert.IsNull(ReflectionUtilities.EmitPropertyGetter<Class1, int>("Zalue1", false));
+        Assert.IsNull(ReflectionUtilities.EmitPropertyGetter<Class1, int>("Value2", false));
+    }
+
+    [Test]
+    public void PropertySetterCanCastUnsafeValue()
+    {
+        // test that we can emit property setters that cast from eg 'object'
+        var type4 = typeof(Class4);
+        var propInt4 = type4.GetProperty("IntValue");
+        var propString4 = type4.GetProperty("StringValue");
+        var propClassA4 = type4.GetProperty("ClassAValue");
+
+        var object4 = new Class4();
+        var object2A = new Class2A();
+
+        // works with a string property
+        Assert.IsNotNull(propString4);
+        var setterString4 = ReflectionUtilities.EmitPropertySetterUnsafe<Class4, object>(propString4);
+        Assert.IsNotNull(setterString4);
+        setterString4(object4, "foo");
+        Assert.IsNotNull(object4.StringValue);
+        Assert.AreEqual("foo", object4.StringValue);
+
+        // unsafe is... unsafe
+        Assert.Throws<InvalidCastException>(() => setterString4(object4, new Class2()));
+
+        // works with a reference property
+        Assert.IsNotNull(propClassA4);
+        var setterClassA4 = ReflectionUtilities.EmitPropertySetterUnsafe<Class4, object>(propClassA4);
+        Assert.IsNotNull(setterClassA4);
+        setterClassA4(object4, object2A);
+        Assert.IsNotNull(object4.ClassAValue);
+        Assert.AreEqual(object2A, object4.ClassAValue);
+
+        // works with a boxed value type
+        Assert.IsNotNull(propInt4);
+        var setterInt4 = ReflectionUtilities.EmitPropertySetterUnsafe<Class4, object>(propInt4);
+        Assert.IsNotNull(setterInt4);
+
+        setterInt4(object4, 42);
+        Assert.AreEqual(42, object4.IntValue);
+
+        // FIXME: the code below runs fine with ReSharper test running within VisualStudio
+        // but it crashes when running via vstest.console.exe - unless some settings are required?
+
+        // converting works
+        setterInt4(object4, 42.0);
+        Assert.AreEqual(42, object4.IntValue);
+
+        // unsafe is... unsafe
+        Assert.Throws<FormatException>(() => setterInt4(object4, "foo"));
+    }
+
+    [Test]
+    public void PropertySetterCanCastObject()
+    {
+        // Class5 inherits from Class4 and ClassValue is defined on Class4
+        var type5 = typeof(Class5);
+        var propClass4 = type5.GetProperty("ClassValue");
+
+        var object2 = new Class2();
+
+        // can cast the object type from Class5 to Class4
+        var setterClass4 = ReflectionUtilities.EmitPropertySetter<Class5, Class2>(propClass4);
+
+        var object4 = new Class5();
+        setterClass4(object4, object2);
+        Assert.IsNotNull(object4.ClassValue);
+        Assert.AreSame(object2, object4.ClassValue);
+    }
+
+    [Test]
+    public void PropertySetterCanCastUnsafeObject()
+    {
+        var type5 = typeof(Class5);
+        var propClass4 = type5.GetProperty("ClassValue");
+
+        var object2 = new Class2();
+
+        // can cast the object type from object to Class4
+        var setterClass4 = ReflectionUtilities.EmitPropertySetterUnsafe<object, Class2>(propClass4);
+
+        var object4 = new Class5();
+        setterClass4(object4, object2);
+        Assert.IsNotNull(object4.ClassValue);
+        Assert.AreSame(object2, object4.ClassValue);
+    }
+
+    [Test]
+    public void PropertyGetterCanCastValue()
+    {
+        var type4 = typeof(Class4);
+        var propClassA4 = type4.GetProperty("ClassAValue");
+        var propInt4 = type4.GetProperty("IntValue");
+
+        var object2A = new Class2A();
+        var object4 = new Class4 { ClassAValue = object2A, IntValue = 159 };
+
+        // can cast the return type from Class2A to Class2
+        var getterClassA4 = ReflectionUtilities.EmitPropertyGetter<Class4, Class2>(propClassA4);
+
+        var valueClass4A = getterClassA4(object4);
+        Assert.IsNotNull(valueClass4A);
+        Assert.AreSame(object2A, valueClass4A);
+
+        // cannot cast the return type from Class2A to Class3!
+        Assert.Throws<ArgumentException>(()
+            => ReflectionUtilities.EmitPropertyGetter<Class4, Class3>(propClassA4));
+
+        // can cast and box the return type from int to object
+        var getterInt4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propInt4);
+
+        var valueInt4 = getterInt4(object4);
+        Assert.IsTrue(valueInt4 is int);
+        Assert.AreEqual(159, valueInt4);
+
+        // cannot cast the return type from int to Class3!
+        Assert.Throws<ArgumentException>(()
+            => ReflectionUtilities.EmitPropertyGetter<Class4, Class3>(propInt4));
+    }
+
+    [Test]
+    public void PropertyGetterCanCastObject()
+    {
+        var type5 = typeof(Class5);
+        var propClass4 = type5.GetProperty("ClassValue");
+
+        var object2 = new Class2();
+        var object4 = new Class5 { ClassValue = object2 };
+
+        // can cast the object type from Class5 to Class4
+        var getterClass4 = ReflectionUtilities.EmitPropertyGetter<Class5, Class2>(propClass4);
+
+        var valueClass4 = getterClass4(object4);
+        Assert.IsNotNull(valueClass4);
+        Assert.AreSame(object2, valueClass4);
+
+        // cannot cast the object type from Class3 to Class4!
+        Assert.Throws<ArgumentException>(()
+            => ReflectionUtilities.EmitPropertyGetter<Class3, Class2>(propClass4));
+    }
+
+    [Test]
+    public void EmitPropertyCastGetterEmits()
+    {
+        // test that we can emit property getters that cast the returned value to 'object'
+        // test simple class
+        var type4 = typeof(Class4);
+
+        var object4 = new Class4 { IntValue = 1, StringValue = "foo", ClassValue = new Class2() };
+
+        // works with a string property
+        var propString4 = type4.GetProperty("StringValue");
+        Assert.IsNotNull(propString4);
+        var getterString4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propString4);
+        Assert.IsNotNull(getterString4);
+        var valueString4 = getterString4(object4);
+        Assert.IsNotNull(valueString4);
+        Assert.AreEqual("foo", valueString4);
+
+        // works with a reference property
+        var propClass4 = type4.GetProperty("ClassValue");
+        Assert.IsNotNull(propClass4);
+        var getterClass4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propClass4);
+        Assert.IsNotNull(getterClass4);
+        var valueClass4 = getterClass4(object4);
+        Assert.IsNotNull(valueClass4);
+        Assert.IsInstanceOf<Class2>(valueClass4);
+
+        // works with a value type property
+        var propInt4 = type4.GetProperty("IntValue");
+        Assert.IsNotNull(propInt4);
+
+        // ... if explicitly getting a value type
+        var getterInt4T = ReflectionUtilities.EmitPropertyGetter<Class4, int>(propInt4);
+        Assert.IsNotNull(getterInt4T);
+        var valueInt4T = getterInt4T(object4);
+        Assert.AreEqual(1, valueInt4T);
+
+        // ... if using a compiled getter
+        var valueInt4D = GetIntValue(object4);
+        Assert.IsNotNull(valueInt4D);
+        Assert.IsTrue(valueInt4D is int);
+        Assert.AreEqual(1, valueInt4D);
+
+        // ... if getting a non-value type (emit adds a box)
+        var getterInt4 = ReflectionUtilities.EmitPropertyGetter<Class4, object>(propInt4);
+        Assert.IsNotNull(getterInt4);
+        var valueInt4 = getterInt4(object4);
+        Assert.IsNotNull(valueInt4);
+        Assert.IsTrue(valueInt4 is int);
+        Assert.AreEqual(1, valueInt4);
+
+        var getters4 = type4
+            .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy)
+            .ToDictionary(x => x.Name, x => (object)ReflectionUtilities.EmitPropertyGetter<Class4, object>(x));
+
+        Console.WriteLine("Getting object4 values...");
+        var values4 = getters4.ToDictionary(kvp => kvp.Key, kvp => ((Func<Class4, object>)kvp.Value)(object4));
+
+        Console.WriteLine("Writing object4 values...");
+        foreach ((var name, var value) in values4)
+        {
+            Console.WriteLine($"{name}: {value}");
         }
 
-        [Test]
-        public void EmitFieldGetterSetterEmits()
+        Assert.AreEqual(4, values4.Count);
+        Assert.AreEqual("foo", values4["StringValue"]);
+        Assert.IsInstanceOf<Class2>(values4["ClassValue"]);
+        Assert.AreEqual(1, values4["IntValue"]);
+
+        // test hierarchy
+        var type5 = typeof(Class5);
+
+        var getters5 = type5
+            .GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy)
+            .ToDictionary(x => x.Name, x => (object)ReflectionUtilities.EmitPropertyGetter<Class5, object>(x));
+
+        var object5 = new Class5
         {
-            Func<Class1, int> getter1 = ReflectionUtilities.EmitFieldGetter<Class1, int>("Field1");
-            Func<Class1, int> getter2 = ReflectionUtilities.EmitFieldGetter<Class1, int>("Field2");
-            var c = new Class1();
-            Assert.AreEqual(33, getter1(c));
-            Assert.AreEqual(66, getter2(c));
+            IntValue = 1,
+            IntValue2 = 1,
+            StringValue = "foo",
+            StringValue2 = "foo",
+            ClassValue = new Class2(),
+            ClassValue2 = new Class2(),
+        };
 
-            Action<Class1, int> setter2 = ReflectionUtilities.EmitFieldSetter<Class1, int>("Field2");
-            setter2(c, 99);
-            Assert.AreEqual(99, getter2(c));
+        Console.WriteLine("Getting object5 values...");
+        var values5 = getters5.ToDictionary(kvp => kvp.Key, kvp => ((Func<Class5, object>)kvp.Value)(object5));
 
-            // works on readonly fields!
-            (Func<Class1, int> getter3, Action<Class1, int> setter3) = ReflectionUtilities.EmitFieldGetterAndSetter<Class1, int>("Field3");
-            Assert.AreEqual(22, getter3(c));
-            setter3(c, 44);
-            Assert.AreEqual(44, getter3(c));
+        Console.WriteLine("Writing object5 values...");
+        foreach ((var name, var value) in values5)
+        {
+            Console.WriteLine($"{name}: {value}");
         }
 
-        // FIXME: missing tests specifying 'returned' on method, property
+        Assert.AreEqual(7, values5.Count);
+        Assert.AreEqual("foo", values5["StringValue"]);
+        Assert.IsInstanceOf<Class2>(values5["ClassValue"]);
+        Assert.AreEqual(1, values5["IntValue"]);
+        Assert.AreEqual("foo", values5["StringValue2"]);
+        Assert.IsInstanceOf<Class2>(values5["ClassValue2"]);
+        Assert.AreEqual(1, values5["IntValue2"]);
 
-        [Test]
-        public void DeconstructAnonymousType()
+        // test object extensions
+        Console.WriteLine("Getting object5D values...");
+        var values5D = ObjectJsonExtensions.ToObjectDictionary(object5);
+
+        Console.WriteLine("Writing object5D values...");
+        foreach ((var name, var value) in values5)
         {
-            var o = new { a = 1, b = "hello" };
-
-            var getters = new Dictionary<string, Func<object, object>>();
-            foreach (PropertyInfo prop in o.GetType().GetProperties())
-            {
-                getters[prop.Name] = ReflectionUtilities.EmitMethodUnsafe<Func<object, object>>(prop.GetMethod);
-            }
-
-            Assert.AreEqual(2, getters.Count);
-            Assert.IsTrue(getters.ContainsKey("a"));
-            Assert.IsTrue(getters.ContainsKey("b"));
-            Assert.AreEqual(1, getters["a"](o));
-            Assert.AreEqual("hello", getters["b"](o));
+            Console.WriteLine($"{name}: {value}");
         }
 
-        // these functions can be examined in eg DotPeek to understand IL works
+        Assert.AreEqual(7, values5.Count);
+        Assert.AreEqual("foo", values5D["StringValue"]);
+        Assert.IsInstanceOf<Class2>(values5D["ClassValue"]);
+        Assert.AreEqual(1, values5D["IntValue"]);
+        Assert.AreEqual("foo", values5D["StringValue2"]);
+        Assert.IsInstanceOf<Class2>(values5D["ClassValue2"]);
+        Assert.AreEqual(1, values5D["intValue2"]); // JsonProperty changes property name
+    }
 
-        // box          [mscorlib]System.Int32
-        public object GetIntValue(Class4 object4) => object4.IntValue;
+    [Test]
+    public void EmitFieldGetterSetterEmits()
+    {
+        var getter1 = ReflectionUtilities.EmitFieldGetter<Class1, int>("Field1");
+        var getter2 = ReflectionUtilities.EmitFieldGetter<Class1, int>("Field2");
+        var c = new Class1();
+        Assert.AreEqual(33, getter1(c));
+        Assert.AreEqual(66, getter2(c));
 
-        // unbox.any    [mscorlib]System.Int32
-        public void SetIntValue(Class4 object4, object i) => object4.IntValue = (int)i;
+        var setter2 = ReflectionUtilities.EmitFieldSetter<Class1, int>("Field2");
+        setter2(c, 99);
+        Assert.AreEqual(99, getter2(c));
 
-        // castclass    [mscorlib]System.String
-        public void SetStringValue(Class4 object4, object s) => object4.StringValue = (string)s;
+        // works on readonly fields!
+        (var getter3, var setter3) = ReflectionUtilities.EmitFieldGetterAndSetter<Class1, int>("Field3");
+        Assert.AreEqual(22, getter3(c));
+        setter3(c, 44);
+        Assert.AreEqual(44, getter3(c));
+    }
 
-        // conv.i4
-        public void SetIntValue(Class4 object4, double d) => object4.IntValue = (int)d;
+    // FIXME: missing tests specifying 'returned' on method, property
+    [Test]
+    public void DeconstructAnonymousType()
+    {
+        var o = new { a = 1, b = "hello" };
 
-        // unbox.any    [mscorlib]System.Double
-        // conv.i4
-        public void SetIntValue2(Class4 object4, object d) => object4.IntValue = (int)(double)d;
-
-        public void SetIntValue3(Class4 object4, object v)
+        var getters = new Dictionary<string, Func<object, object>>();
+        foreach (var prop in o.GetType().GetProperties())
         {
-            if (v is int i)
-            {
-                object4.IntValue = i;
-            }
-            else
-            {
-                object4.IntValue = Convert.ToInt32(v);
-            }
+            getters[prop.Name] = ReflectionUtilities.EmitMethodUnsafe<Func<object, object>>(prop.GetMethod);
         }
 
-        public void SetIntValue4(Class4 object4, object v)
+        Assert.AreEqual(2, getters.Count);
+        Assert.IsTrue(getters.ContainsKey("a"));
+        Assert.IsTrue(getters.ContainsKey("b"));
+        Assert.AreEqual(1, getters["a"](o));
+        Assert.AreEqual("hello", getters["b"](o));
+    }
+
+    // these functions can be examined in eg DotPeek to understand IL works
+
+    // box          [mscorlib]System.Int32
+    public object GetIntValue(Class4 object4) => object4.IntValue;
+
+    // unbox.any    [mscorlib]System.Int32
+    public void SetIntValue(Class4 object4, object i) => object4.IntValue = (int)i;
+
+    // castclass    [mscorlib]System.String
+    public void SetStringValue(Class4 object4, object s) => object4.StringValue = (string)s;
+
+    // conv.i4
+    public void SetIntValue(Class4 object4, double d) => object4.IntValue = (int)d;
+
+    // unbox.any    [mscorlib]System.Double
+    // conv.i4
+    public void SetIntValue2(Class4 object4, object d) => object4.IntValue = (int)(double)d;
+
+    public void SetIntValue3(Class4 object4, object v)
+    {
+        if (v is int i)
         {
-            if (v is int i)
-            {
-                object4.IntValue = i;
-            }
-            else
-            {
-                object4.IntValue = (int)Convert.ChangeType(v, typeof(int));
-            }
+            object4.IntValue = i;
         }
-
-        // get field
-        public int GetIntField(Class1 object1) => object1.Field1;
-
-        // set field
-        public void SetIntField(Class1 object1, int i) => object1.Field1 = i;
-
-        public static class StaticClass1
+        else
         {
-            public static void Method()
-            {
-            }
-        }
-
-        public class Class1
-        {
-            public Class1()
-            {
-            }
-
-            public Class1(int i)
-            {
-            }
-
-            public void Method1()
-            {
-            }
-
-            public void Method2(int i)
-            {
-            }
-
-            public int Method3() => 42;
-
-            public int Method4(string s) => int.Parse(s);
-
-            public string Method5() => "foo";
-
-            public static void SMethod1()
-            {
-            }
-
-            public static void SMethod2(int i)
-            {
-            }
-
-            public static int SMethod3() => 42;
-
-            public static int SMethod4(string s) => int.Parse(s);
-
-            private void MethodP1()
-            {
-            }
-
-            private static void SMethodP1()
-            {
-            }
-
-            public int Value1 => 42;
-
-            public int Value2
-            {
-                set { }
-            }
-
-            public int Value3
-            {
-                get => 42; set { }
-            }
-
-            private int ValueP1 => 42;
-
-            public int Field1 = 33;
-            private int Field2 = 66;
-            public readonly int Field3 = 22;
-        }
-
-        public class Class2
-        {
-        }
-
-        public class Class2A : Class2
-        {
-        }
-
-        public class Class3
-        {
-            public Class3(int i)
-            {
-            }
-
-            private Class3(string s)
-            {
-            }
-        }
-
-        public class Class4
-        {
-            public int IntValue { get; set; }
-
-            public string StringValue { get; set; }
-
-            public Class2 ClassValue { get; set; }
-
-            public Class2A ClassAValue { get; set; }
-        }
-
-        public class Class5 : Class4
-        {
-            [JsonProperty("intValue2")]
-            public int IntValue2 { get; set; }
-
-            public string StringValue2 { get; set; }
-
-            public Class2 ClassValue2 { get; set; }
+            object4.IntValue = Convert.ToInt32(v);
         }
     }
+
+    public void SetIntValue4(Class4 object4, object v)
+    {
+        if (v is int i)
+        {
+            object4.IntValue = i;
+        }
+        else
+        {
+            object4.IntValue = (int)Convert.ChangeType(v, typeof(int));
+        }
+    }
+
+    // get field
+    public int GetIntField(Class1 object1) => object1.Field1;
+
+    // set field
+    public void SetIntField(Class1 object1, int i) => object1.Field1 = i;
+
+    public static class StaticClass1
+    {
+        public static void Method()
+        {
+        }
+    }
+
+    public class Class1
+    {
+        public readonly int Field3 = 22;
+
+        public int Field1 = 33;
+        private readonly int Field2 = 66;
+
+        public Class1()
+        {
+        }
+
+        public Class1(int i)
+        {
+        }
+
+        public int Value1 => 42;
+
+        public int Value2
+        {
+            set { }
+        }
+
+        public int Value3
+        {
+            get => 42;
+            set { }
+        }
+
+        private int ValueP1 => 42;
+
+        public void Method1()
+        {
+        }
+
+        public void Method2(int i)
+        {
+        }
+
+        public int Method3() => 42;
+
+        public int Method4(string s) => int.Parse(s);
+
+        public string Method5() => "foo";
+
+        public static void SMethod1()
+        {
+        }
+
+        public static void SMethod2(int i)
+        {
+        }
+
+        public static int SMethod3() => 42;
+
+        public static int SMethod4(string s) => int.Parse(s);
+
+        private void MethodP1()
+        {
+        }
+
+        private static void SMethodP1()
+        {
+        }
+    }
+
+    public class Class2
+    {
+    }
+
+    public class Class2A : Class2
+    {
+    }
+
+    public class Class3
+    {
+        public Class3(int i)
+        {
+        }
+
+        private Class3(string s)
+        {
+        }
+    }
+
+    public class Class4
+    {
+        public int IntValue { get; set; }
+
+        public string StringValue { get; set; }
+
+        public Class2 ClassValue { get; set; }
+
+        public Class2A ClassAValue { get; set; }
+    }
+
+    public class Class5 : Class4
+    {
+        [JsonProperty("intValue2")]
+        public int IntValue2 { get; set; }
+
+        public string StringValue2 { get; set; }
+
+        public Class2 ClassValue2 { get; set; }
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasTests.cs
index 3404463dbf..954d09b68a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasTests.cs
@@ -1,56 +1,37 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Logging;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Tests.Common;
-using Umbraco.Cms.Tests.Common.Published;
-using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+// TODO: We should be able to decouple this from the base db tests since we're just mocking the services now
+[TestFixture]
+public class ContentFinderByAliasTests : UrlRoutingTestBase
 {
-    // TODO: We should be able to decouple this from the base db tests since we're just mocking the services now
-
-    [TestFixture]
-    public class ContentFinderByAliasTests : UrlRoutingTestBase
+    [TestCase("/this/is/my/alias", 1001)]
+    [TestCase("/anotheralias", 1001)]
+    [TestCase("/page2/alias", 10011)]
+    [TestCase("/2ndpagealias", 10011)]
+    [TestCase("/only/one/alias", 100111)]
+    [TestCase("/ONLY/one/Alias", 100111)]
+    [TestCase("/alias43", 100121)]
+    public async Task Lookup_By_Url_Alias(string urlAsString, int nodeMatch)
     {
+        var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
 
-        [TestCase("/this/is/my/alias", 1001)]
-        [TestCase("/anotheralias", 1001)]
-        [TestCase("/page2/alias", 10011)]
-        [TestCase("/2ndpagealias", 10011)]
-        [TestCase("/only/one/alias", 100111)]
-        [TestCase("/ONLY/one/Alias", 100111)]
-        [TestCase("/alias43", 100121)]
-        public async Task Lookup_By_Url_Alias(string urlAsString, int nodeMatch)
-        {
-            var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+        var lookup =
+            new ContentFinderByUrlAlias(Mock.Of<ILogger<ContentFinderByUrlAlias>>(), Mock.Of<IPublishedValueFallback>(), VariationContextAccessor, umbracoContextAccessor);
 
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
-            var lookup =
-                new ContentFinderByUrlAlias(Mock.Of<ILogger<ContentFinderByUrlAlias>>(), Mock.Of<IPublishedValueFallback>(), VariationContextAccessor, umbracoContextAccessor);
+        var result = await lookup.TryFindContent(frequest);
 
-            var result = await lookup.TryFindContent(frequest);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(frequest.PublishedContent.Id, nodeMatch);
-        }
+        Assert.IsTrue(result);
+        Assert.AreEqual(frequest.PublishedContent.Id, nodeMatch);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasWithDomainsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasWithDomainsTests.cs
index aa62f461ae..3f639965cd 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasWithDomainsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByAliasWithDomainsTests.cs
@@ -1,65 +1,58 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Tests.Common.Published;
-using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class ContentFinderByAliasWithDomainsTests : UrlRoutingTestBase
 {
-    [TestFixture]
-    public class ContentFinderByAliasWithDomainsTests : UrlRoutingTestBase
+    [TestCase("http://domain1.com/this/is/my/alias", "de-DE", -1001)] // alias to domain's page fails - no alias on domain's home
+    [TestCase("http://domain1.com/page2/alias", "de-DE", 10011)] // alias to sub-page works
+    [TestCase("http://domain1.com/en/flux", "en-US", -10011)] // alias to domain's page fails - no alias on domain's home
+    [TestCase("http://domain1.com/endanger", "de-DE", 10011)] // alias to sub-page works, even with "en..."
+    [TestCase("http://domain1.com/en/endanger", "en-US", -10011)] // no
+    [TestCase("http://domain1.com/only/one/alias", "de-DE", 100111)] // ok
+    [TestCase("http://domain1.com/entropy", "de-DE", 100111)] // ok
+    [TestCase("http://domain1.com/bar/foo", "de-DE", 100111)] // ok
+    [TestCase("http://domain1.com/en/bar/foo", "en-US", -100111)] // no, alias must include "en/"
+    [TestCase("http://domain1.com/en/bar/nil", "en-US", 100111)] // ok, alias includes "en/"
+    public async Task Lookup_By_Url_Alias_And_Domain(string inputUrl, string expectedCulture, int expectedNode)
     {
+        // SetDomains1();
+        var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
 
+        var request = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-        [TestCase("http://domain1.com/this/is/my/alias", "de-DE", -1001)] // alias to domain's page fails - no alias on domain's home
-        [TestCase("http://domain1.com/page2/alias", "de-DE", 10011)] // alias to sub-page works
-        [TestCase("http://domain1.com/en/flux", "en-US", -10011)] // alias to domain's page fails - no alias on domain's home
-        [TestCase("http://domain1.com/endanger", "de-DE", 10011)] // alias to sub-page works, even with "en..."
-        [TestCase("http://domain1.com/en/endanger", "en-US", -10011)] // no
-        [TestCase("http://domain1.com/only/one/alias", "de-DE", 100111)] // ok
-        [TestCase("http://domain1.com/entropy", "de-DE", 100111)] // ok
-        [TestCase("http://domain1.com/bar/foo", "de-DE", 100111)] // ok
-        [TestCase("http://domain1.com/en/bar/foo", "en-US", -100111)] // no, alias must include "en/"
-        [TestCase("http://domain1.com/en/bar/nil", "en-US", 100111)] // ok, alias includes "en/"
-        public async Task Lookup_By_Url_Alias_And_Domain(string inputUrl, string expectedCulture, int expectedNode)
+        // must lookup domain
+        publishedRouter.FindDomain(request);
+
+        if (expectedNode > 0)
         {
-            //SetDomains1();
-            var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+            Assert.AreEqual(expectedCulture, request.Culture);
+        }
 
-            var request = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
-            // must lookup domain
-            publishedRouter.FindDomain(request);
+        var finder = new ContentFinderByUrlAlias(
+            Mock.Of<ILogger<ContentFinderByUrlAlias>>(),
+            Mock.Of<IPublishedValueFallback>(),
+            VariationContextAccessor,
+            umbracoContextAccessor);
+        var result = await finder.TryFindContent(request);
 
-            if (expectedNode > 0)
-            {
-                Assert.AreEqual(expectedCulture, request.Culture);
-            }
-
-            var finder = new ContentFinderByUrlAlias(Mock.Of<ILogger<ContentFinderByUrlAlias>>(), Mock.Of<IPublishedValueFallback>(), VariationContextAccessor, umbracoContextAccessor);
-            var result = await finder.TryFindContent(request);
-
-            if (expectedNode > 0)
-            {
-                Assert.IsTrue(result);
-                Assert.AreEqual(request.PublishedContent.Id, expectedNode);
-            }
-            else
-            {
-                Assert.IsFalse(result);
-            }
+        if (expectedNode > 0)
+        {
+            Assert.IsTrue(result);
+            Assert.AreEqual(request.PublishedContent.Id, expectedNode);
+        }
+        else
+        {
+            Assert.IsFalse(result);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByIdTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByIdTests.cs
index caa335023c..d4f3074a27 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByIdTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByIdTests.cs
@@ -1,13 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure.PublishedCache;
@@ -15,45 +13,44 @@ using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class ContentFinderByIdTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class ContentFinderByIdTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        base.Setup();
 
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
+        InitializedCache(kits, contentTypes, dataTypes);
+    }
 
-        }
+    [TestCase("/1046", 1046)]
+    public async Task Lookup_By_Id(string urlAsString, int nodeMatch)
+    {
+        var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+        var webRoutingSettings = new WebRoutingSettings();
+        var lookup = new ContentFinderByIdPath(
+            Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings),
+            Mock.Of<ILogger<ContentFinderByIdPath>>(),
+            Mock.Of<IRequestAccessor>(),
+            umbracoContextAccessor);
 
-        [TestCase("/1046", 1046)]
-        public async Task Lookup_By_Id(string urlAsString, int nodeMatch)
-        {
-            var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
-            var webRoutingSettings = new WebRoutingSettings();
-            var lookup = new ContentFinderByIdPath(
-                Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x=>x.CurrentValue ==  webRoutingSettings),
-                Mock.Of<ILogger<ContentFinderByIdPath>>(), Mock.Of<IRequestAccessor>(), umbracoContextAccessor);
+        var result = await lookup.TryFindContent(frequest);
 
-
-            var result = await lookup.TryFindContent(frequest);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(frequest.PublishedContent.Id, nodeMatch);
-        }
+        Assert.IsTrue(result);
+        Assert.AreEqual(frequest.PublishedContent.Id, nodeMatch);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByPageIdQueryTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByPageIdQueryTests.cs
index b65d19e1bc..669b6b5dce 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByPageIdQueryTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByPageIdQueryTests.cs
@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using System.Web;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure.PublishedCache;
@@ -12,52 +11,50 @@ using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class ContentFinderByPageIdQueryTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class ContentFinderByPageIdQueryTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        base.Setup();
 
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
+        InitializedCache(kits, contentTypes, dataTypes);
+    }
 
-        }
+    [TestCase("/?umbPageId=1046", 1046)]
+    [TestCase("/?UMBPAGEID=1046", 1046)]
+    [TestCase("/default.aspx?umbPageId=1046", 1046)] // TODO: Should this match??
+    [TestCase("/some/other/page?umbPageId=1046", 1046)] // TODO: Should this match??
+    [TestCase("/some/other/page.aspx?umbPageId=1046", 1046)] // TODO: Should this match??
+    public async Task Lookup_By_Page_Id(string urlAsString, int nodeMatch)
+    {
+        var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-        [TestCase("/?umbPageId=1046", 1046)]
-        [TestCase("/?UMBPAGEID=1046", 1046)]
-        [TestCase("/default.aspx?umbPageId=1046", 1046)] // TODO: Should this match??
-        [TestCase("/some/other/page?umbPageId=1046", 1046)] // TODO: Should this match??
-        [TestCase("/some/other/page.aspx?umbPageId=1046", 1046)] // TODO: Should this match??
-        public async Task Lookup_By_Page_Id(string urlAsString, int nodeMatch)
-        {
-            var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+        var queryStrings = HttpUtility.ParseQueryString(umbracoContext.CleanedUmbracoUrl.Query);
 
-            var queryStrings = HttpUtility.ParseQueryString(umbracoContext.CleanedUmbracoUrl.Query);
+        var mockRequestAccessor = new Mock<IRequestAccessor>();
+        mockRequestAccessor.Setup(x => x.GetRequestValue("umbPageID"))
+            .Returns(queryStrings["umbPageID"]);
 
-            var mockRequestAccessor = new Mock<IRequestAccessor>();
-            mockRequestAccessor.Setup(x => x.GetRequestValue("umbPageID"))
-                .Returns(queryStrings["umbPageID"]);
+        var lookup = new ContentFinderByPageIdQuery(mockRequestAccessor.Object, umbracoContextAccessor);
 
-            var lookup = new ContentFinderByPageIdQuery(mockRequestAccessor.Object, umbracoContextAccessor);
+        var result = await lookup.TryFindContent(frequest);
 
-            var result = await lookup.TryFindContent(frequest);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(frequest.PublishedContent.Id, nodeMatch);
-        }
+        Assert.IsTrue(result);
+        Assert.AreEqual(frequest.PublishedContent.Id, nodeMatch);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs
index 8176071934..0ebd5ef955 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAliasTests.cs
@@ -11,54 +11,50 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class ContentFinderByUrlAliasTests
 {
-    [TestFixture]
-    public class ContentFinderByUrlAliasTests
+    [Test]
+    [InlineAutoMoqData("/this/is/my/alias", 1001)]
+    [InlineAutoMoqData("/anotheralias", 1001)]
+    [InlineAutoMoqData("/page2/alias", 10011)]
+    [InlineAutoMoqData("/2ndpagealias", 10011)]
+    [InlineAutoMoqData("/only/one/alias", 100111)]
+    [InlineAutoMoqData("/ONLY/one/Alias", 100111)]
+    [InlineAutoMoqData("/alias43", 100121)]
+    public async Task Lookup_By_Url_Alias(
+        string relativeUrl,
+        int nodeMatch,
+        [Frozen] IPublishedContentCache publishedContentCache,
+        [Frozen] IUmbracoContextAccessor umbracoContextAccessor,
+        [Frozen] IUmbracoContext umbracoContext,
+        [Frozen] IVariationContextAccessor variationContextAccessor,
+        IFileService fileService,
+        ContentFinderByUrlAlias sut,
+        IPublishedContent[] rootContents,
+        IPublishedProperty urlProperty)
     {
+        // Arrange
+        var absoluteUrl = "http://localhost" + relativeUrl;
+        var variationContext = new VariationContext();
 
-        [Test]
-        [InlineAutoMoqData("/this/is/my/alias", 1001)]
-        [InlineAutoMoqData("/anotheralias", 1001)]
-        [InlineAutoMoqData("/page2/alias", 10011)]
-        [InlineAutoMoqData("/2ndpagealias", 10011)]
-        [InlineAutoMoqData("/only/one/alias", 100111)]
-        [InlineAutoMoqData("/ONLY/one/Alias", 100111)]
-        [InlineAutoMoqData("/alias43", 100121)]
-        public async Task Lookup_By_Url_Alias (
-            string relativeUrl,
-            int nodeMatch,
-            [Frozen] IPublishedContentCache publishedContentCache,
-            [Frozen] IUmbracoContextAccessor umbracoContextAccessor,
-            [Frozen] IUmbracoContext umbracoContext,
-            [Frozen] IVariationContextAccessor variationContextAccessor,
-            IFileService fileService,
-            ContentFinderByUrlAlias sut,
-            IPublishedContent[] rootContents,
-            IPublishedProperty urlProperty
-            )
-        {
+        var contentItem = rootContents[0];
+        Mock.Get(umbracoContextAccessor).Setup(x => x.TryGetUmbracoContext(out umbracoContext)).Returns(true);
+        Mock.Get(umbracoContext).Setup(x => x.Content).Returns(publishedContentCache);
+        Mock.Get(publishedContentCache).Setup(x => x.GetAtRoot(null)).Returns(rootContents);
+        Mock.Get(contentItem).Setup(x => x.Id).Returns(nodeMatch);
+        Mock.Get(contentItem).Setup(x => x.GetProperty(Constants.Conventions.Content.UrlAlias)).Returns(urlProperty);
+        Mock.Get(urlProperty).Setup(x => x.GetValue(null, null)).Returns(relativeUrl);
 
+        Mock.Get(variationContextAccessor).Setup(x => x.VariationContext).Returns(variationContext);
+        var publishedRequestBuilder = new PublishedRequestBuilder(new Uri(absoluteUrl, UriKind.Absolute), fileService);
 
-            //Arrange
-            var absoluteUrl = "http://localhost" + relativeUrl;
-            VariationContext variationContext = new VariationContext();
+        // Act
+        var result = await sut.TryFindContent(publishedRequestBuilder);
 
-            var contentItem = rootContents[0];
-            Mock.Get(umbracoContextAccessor).Setup(x => x.TryGetUmbracoContext(out umbracoContext)).Returns(true);
-            Mock.Get(umbracoContext).Setup(x => x.Content).Returns(publishedContentCache);
-            Mock.Get(publishedContentCache).Setup(x => x.GetAtRoot(null)).Returns(rootContents);
-            Mock.Get(contentItem).Setup(x => x.Id).Returns(nodeMatch);
-            Mock.Get(contentItem).Setup(x => x.GetProperty(Constants.Conventions.Content.UrlAlias)).Returns(urlProperty);
-            Mock.Get(urlProperty).Setup(x => x.GetValue(null, null)).Returns(relativeUrl);
-
-            Mock.Get(variationContextAccessor).Setup(x => x.VariationContext).Returns(variationContext);
-            var publishedRequestBuilder = new PublishedRequestBuilder(new Uri(absoluteUrl, UriKind.Absolute), fileService);
-            //Act
-            var result = await sut.TryFindContent(publishedRequestBuilder);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(publishedRequestBuilder.PublishedContent.Id, nodeMatch);
-        }
+        Assert.IsTrue(result);
+        Assert.AreEqual(publishedRequestBuilder.PublishedContent.Id, nodeMatch);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAndTemplateTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAndTemplateTests.cs
index 47b93b0f01..fee2a334c3 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAndTemplateTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlAndTemplateTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -12,75 +11,73 @@ using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.Published;
-using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class ContentFinderByUrlAndTemplateTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class ContentFinderByUrlAndTemplateTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private IFileService _fileService;
+        base.Setup();
 
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
 
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        InitializedCache(kits, contentTypes, dataTypes);
+    }
 
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-        }
+    private IFileService _fileService;
 
-        protected override ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes, IDataType[] dataTypes)
-        {
-            var serviceContext = base.CreateServiceContext(contentTypes, mediaTypes, dataTypes);
+    protected override ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes, IDataType[] dataTypes)
+    {
+        var serviceContext = base.CreateServiceContext(contentTypes, mediaTypes, dataTypes);
 
-            var fileService = Mock.Get(serviceContext.FileService);
-            fileService.Setup(x => x.GetTemplate(It.IsAny<string>()))
-                .Returns((string alias) => new Template(ShortStringHelper, alias, alias));
+        var fileService = Mock.Get(serviceContext.FileService);
+        fileService.Setup(x => x.GetTemplate(It.IsAny<string>()))
+            .Returns((string alias) => new Template(ShortStringHelper, alias, alias));
 
-            _fileService = fileService.Object;
+        _fileService = fileService.Object;
 
-            return serviceContext;
-        }
+        return serviceContext;
+    }
 
-        [TestCase("/blah")]
-        [TestCase("/home/Sub1/blah")]
-        [TestCase("/Home/Sub1/Blah")] //different cases
-        public async Task Match_Document_By_Url_With_Template(string urlAsString)
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = false;
+    [TestCase("/blah")]
+    [TestCase("/home/Sub1/blah")]
+    [TestCase("/Home/Sub1/Blah")] // different cases
+    public async Task Match_Document_By_Url_With_Template(string urlAsString)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = false;
 
-            var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+        var umbracoContextAccessor = GetUmbracoContextAccessor(urlAsString);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-            var webRoutingSettings = new WebRoutingSettings();
-            var lookup = new ContentFinderByUrlAndTemplate(
-                Mock.Of<ILogger<ContentFinderByUrlAndTemplate>>(),
-                _fileService,
-                ContentTypeService,
-                umbracoContextAccessor,
-                Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x=>x.CurrentValue == webRoutingSettings));
+        var webRoutingSettings = new WebRoutingSettings();
+        var lookup = new ContentFinderByUrlAndTemplate(
+            Mock.Of<ILogger<ContentFinderByUrlAndTemplate>>(),
+            _fileService,
+            ContentTypeService,
+            umbracoContextAccessor,
+            Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings));
 
-            var result = await lookup.TryFindContent(frequest);
+        var result = await lookup.TryFindContent(frequest);
 
-            IPublishedRequest request = frequest.Build();
+        var request = frequest.Build();
 
-            Assert.IsTrue(result);
-            Assert.IsNotNull(frequest.PublishedContent);
-            var templateAlias = request.GetTemplateAlias();
-            Assert.IsNotNull(templateAlias);
-            Assert.AreEqual("blah".ToUpperInvariant(), templateAlias.ToUpperInvariant());
-        }
+        Assert.IsTrue(result);
+        Assert.IsNotNull(frequest.PublishedContent);
+        var templateAlias = request.GetTemplateAlias();
+        Assert.IsNotNull(templateAlias);
+        Assert.AreEqual("blah".ToUpperInvariant(), templateAlias.ToUpperInvariant());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs
index 95a47ec8bd..e877ace137 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlTests.cs
@@ -1,167 +1,165 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+[TestFixture]
+public class ContentFinderByUrlTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class ContentFinderByUrlTests : PublishedSnapshotServiceTestBase
+    private async Task<(ContentFinderByUrl finder, IPublishedRequestBuilder frequest)> GetContentFinder(
+        string urlString)
     {
-        private async Task<(ContentFinderByUrl finder, IPublishedRequestBuilder frequest)> GetContentFinder(string urlString)
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor(urlString);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+        var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
+        return (lookup, frequest);
+    }
+
+    [TestCase("/", 1046)]
+    [TestCase("/Sub1", 1173)]
+    [TestCase("/sub1", 1173)]
+    [TestCase("/home/sub1", -1)] // should fail
+
+    // these two are special. getNiceUrl(1046) returns "/" but getNiceUrl(1172) cannot also return "/" so
+    // we've made it return "/test-page" => we have to support that URL back in the lookup...
+    [TestCase("/home", 1046)]
+    [TestCase("/test-page", 1172)]
+    public async Task Match_Document_By_Url_Hide_Top_Level(string urlString, int expectedId)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = true;
+
+        var (finder, frequest) = await GetContentFinder(urlString);
+
+        Assert.IsTrue(GlobalSettings.HideTopLevelNodeFromPath);
+
+        // FIXME: debugging - going further down, the routes cache is NOT empty?!
+        if (urlString == "/home/sub1")
         {
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor(urlString);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
-            var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
-            return (lookup, frequest);
+            Debugger.Break();
         }
 
-        [TestCase("/", 1046)]
-        [TestCase("/Sub1", 1173)]
-        [TestCase("/sub1", 1173)]
-        [TestCase("/home/sub1", -1)] // should fail
+        var result = await finder.TryFindContent(frequest);
 
-        // these two are special. getNiceUrl(1046) returns "/" but getNiceUrl(1172) cannot also return "/" so
-        // we've made it return "/test-page" => we have to support that URL back in the lookup...
-        [TestCase("/home", 1046)]
-        [TestCase("/test-page", 1172)]
-        public async Task Match_Document_By_Url_Hide_Top_Level(string urlString, int expectedId)
+        if (expectedId > 0)
         {
-            GlobalSettings.HideTopLevelNodeFromPath = true;
-
-            var lookup = await GetContentFinder(urlString);
-
-            Assert.IsTrue(GlobalSettings.HideTopLevelNodeFromPath);
-
-            // FIXME: debugging - going further down, the routes cache is NOT empty?!
-            if (urlString == "/home/sub1")
-                System.Diagnostics.Debugger.Break();
-
-            var result = await lookup.finder.TryFindContent(lookup.frequest);
-
-            if (expectedId > 0)
-            {
-                Assert.IsTrue(result);
-                Assert.AreEqual(expectedId, lookup.frequest.PublishedContent.Id);
-            }
-            else
-            {
-                Assert.IsFalse(result);
-            }
-        }
-
-        [TestCase("/", 1046)]
-        [TestCase("/home", 1046)]
-        [TestCase("/home/Sub1", 1173)]
-        [TestCase("/Home/Sub1", 1173)] //different cases
-        public async Task Match_Document_By_Url(string urlString, int expectedId)
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var lookup = await GetContentFinder(urlString);
-
-            Assert.IsFalse(GlobalSettings.HideTopLevelNodeFromPath);
-
-            var result = await lookup.finder.TryFindContent(lookup.frequest);
-
             Assert.IsTrue(result);
-            Assert.AreEqual(expectedId, lookup.frequest.PublishedContent.Id);
+            Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
         }
-        /// <summary>
-        /// This test handles requests with special characters in the URL.
-        /// </summary>
-        /// <param name="urlString"></param>
-        /// <param name="expectedId"></param>
-        [TestCase("/", 1046)]
-        [TestCase("/home/sub1/custom-sub-3-with-accént-character", 1179)]
-        [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)]
-        public async Task Match_Document_By_Url_With_Special_Characters(string urlString, int expectedId)
+        else
         {
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var lookup = await GetContentFinder(urlString);
-
-            var result = await lookup.finder.TryFindContent(lookup.frequest);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(expectedId, lookup.frequest.PublishedContent.Id);
-        }
-
-        /// <summary>
-        /// This test handles requests with a hostname associated.
-        /// The logic for handling this goes through the DomainHelper and is a bit different
-        /// from what happens in a normal request - so it has a separate test with a mocked
-        /// hostname added.
-        /// </summary>
-        /// <param name="urlString"></param>
-        /// <param name="expectedId"></param>
-        [TestCase("/", 1046)]
-        [TestCase("/home/sub1/custom-sub-3-with-accént-character", 1179)]
-        [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)]
-        public async Task Match_Document_By_Url_With_Special_Characters_Using_Hostname(string urlString, int expectedId)
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var lookup = await GetContentFinder(urlString);
-
-            lookup.frequest.SetDomain(new DomainAndUri(new Domain(1, "mysite", -1, "en-US", false), new Uri("http://mysite/")));
-
-            var result = await lookup.finder.TryFindContent(lookup.frequest);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(expectedId, lookup.frequest.PublishedContent.Id);
-        }
-
-        /// <summary>
-        /// This test handles requests with a hostname with special characters associated.
-        /// The logic for handling this goes through the DomainHelper and is a bit different
-        /// from what happens in a normal request - so it has a separate test with a mocked
-        /// hostname added.
-        /// </summary>
-        /// <param name="urlString"></param>
-        /// <param name="expectedId"></param>
-        [TestCase("/æøå/", 1046)]
-        [TestCase("/æøå/home/sub1", 1173)]
-        [TestCase("/æøå/home/sub1/custom-sub-3-with-accént-character", 1179)]
-        [TestCase("/æøå/home/sub1/custom-sub-4-with-æøå", 1180)]
-        public async Task Match_Document_By_Url_With_Special_Characters_In_Hostname(string urlString, int expectedId)
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var lookup = await GetContentFinder(urlString);
-
-            lookup.frequest.SetDomain(new DomainAndUri(new Domain(1, "mysite/æøå", -1, "en-US", false), new Uri("http://mysite/æøå")));
-
-            var result = await lookup.finder.TryFindContent(lookup.frequest);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual(expectedId, lookup.frequest.PublishedContent.Id);
+            Assert.IsFalse(result);
         }
     }
+
+    [TestCase("/", 1046)]
+    [TestCase("/home", 1046)]
+    [TestCase("/home/Sub1", 1173)]
+    [TestCase("/Home/Sub1", 1173)] // different cases
+    public async Task Match_Document_By_Url(string urlString, int expectedId)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var (finder, frequest) = await GetContentFinder(urlString);
+
+        Assert.IsFalse(GlobalSettings.HideTopLevelNodeFromPath);
+
+        var result = await finder.TryFindContent(frequest);
+
+        Assert.IsTrue(result);
+        Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
+    }
+
+    /// <summary>
+    ///     This test handles requests with special characters in the URL.
+    /// </summary>
+    /// <param name="urlString"></param>
+    /// <param name="expectedId"></param>
+    [TestCase("/", 1046)]
+    [TestCase("/home/sub1/custom-sub-3-with-accént-character", 1179)]
+    [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)]
+    public async Task Match_Document_By_Url_With_Special_Characters(string urlString, int expectedId)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var (finder, frequest) = await GetContentFinder(urlString);
+
+        var result = await finder.TryFindContent(frequest);
+
+        Assert.IsTrue(result);
+        Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
+    }
+
+    /// <summary>
+    ///     This test handles requests with a hostname associated.
+    ///     The logic for handling this goes through the DomainHelper and is a bit different
+    ///     from what happens in a normal request - so it has a separate test with a mocked
+    ///     hostname added.
+    /// </summary>
+    /// <param name="urlString"></param>
+    /// <param name="expectedId"></param>
+    [TestCase("/", 1046)]
+    [TestCase("/home/sub1/custom-sub-3-with-accént-character", 1179)]
+    [TestCase("/home/sub1/custom-sub-4-with-æøå", 1180)]
+    public async Task Match_Document_By_Url_With_Special_Characters_Using_Hostname(string urlString, int expectedId)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var (finder, frequest) = await GetContentFinder(urlString);
+
+        frequest.SetDomain(new DomainAndUri(new Domain(1, "mysite", -1, "en-US", false), new Uri("http://mysite/")));
+
+        var result = await finder.TryFindContent(frequest);
+
+        Assert.IsTrue(result);
+        Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
+    }
+
+    /// <summary>
+    ///     This test handles requests with a hostname with special characters associated.
+    ///     The logic for handling this goes through the DomainHelper and is a bit different
+    ///     from what happens in a normal request - so it has a separate test with a mocked
+    ///     hostname added.
+    /// </summary>
+    /// <param name="urlString"></param>
+    /// <param name="expectedId"></param>
+    [TestCase("/æøå/", 1046)]
+    [TestCase("/æøå/home/sub1", 1173)]
+    [TestCase("/æøå/home/sub1/custom-sub-3-with-accént-character", 1179)]
+    [TestCase("/æøå/home/sub1/custom-sub-4-with-æøå", 1180)]
+    public async Task Match_Document_By_Url_With_Special_Characters_In_Hostname(string urlString, int expectedId)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var (finder, frequest) = await GetContentFinder(urlString);
+
+        frequest.SetDomain(new DomainAndUri(new Domain(1, "mysite/æøå", -1, "en-US", false), new Uri("http://mysite/æøå")));
+
+        var result = await finder.TryFindContent(frequest);
+
+        Assert.IsTrue(result);
+        Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlWithDomainsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlWithDomainsTests.cs
index 49e9698e2a..c9069046ac 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlWithDomainsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/ContentFinderByUrlWithDomainsTests.cs
@@ -1,191 +1,256 @@
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class ContentFinderByUrlWithDomainsTests : UrlRoutingTestBase
 {
-
-    [TestFixture]
-    public class ContentFinderByUrlWithDomainsTests : UrlRoutingTestBase
+    private void SetDomains3()
     {
-        private void SetDomains3()
-        {
-            var domainService = Mock.Get(DomainService);
+        var domainService = Mock.Get(DomainService);
 
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("domain1.com/")
                 {
-                    new UmbracoDomain("domain1.com/") {Id = 1, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE"}
-                });
-        }
+                    Id = 1, LanguageId = LangDeId, RootContentId = 1001,
+                    LanguageIsoCode = "de-DE",
+                },
+            });
+    }
 
-        private void SetDomains4()
-        {
-            var domainService = Mock.Get(DomainService);
+    private void SetDomains4()
+    {
+        var domainService = Mock.Get(DomainService);
 
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("domain1.com/")
                 {
-                    new UmbracoDomain("domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("domain1.com/en") {Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("domain1.com/fr") {Id = 3, LanguageId = LangFrId, RootContentId =  10012, LanguageIsoCode = "fr-FR"},
-                    new UmbracoDomain("http://domain3.com/") {Id = 4, LanguageId = LangEngId, RootContentId = 1003, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain3.com/en") {Id = 5, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain3.com/fr") {Id = 6, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR"}
-                });
-        }
+                    Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("domain1.com/en")
+                {
+                    Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("domain1.com/fr")
+                {
+                    Id = 3, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+                new UmbracoDomain("http://domain3.com/")
+                {
+                    Id = 4, LanguageId = LangEngId, RootContentId = 1003, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain3.com/en")
+                {
+                    Id = 5, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain3.com/fr")
+                {
+                    Id = 6, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
 
-        protected override string GetXmlContent(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    protected override string GetXmlContent(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Doc ANY>
 <!ATTLIST Doc id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
+    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
         <content><![CDATA[]]></content>
-        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
+        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
+            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
+            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
+                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
+                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
+        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
+            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
+            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
+                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
+                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
+        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
         </Doc>
     </Doc>
-    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
+    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
     </Doc>
-    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
+    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
         <content><![CDATA[]]></content>
-        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
+        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
+            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
+            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
+                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
+                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
+        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
+            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
+            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
+                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
+                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
+        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
         </Doc>
     </Doc>
 </root>";
 
-        [TestCase("http://domain1.com/", 1001)]
-        [TestCase("http://domain1.com/1001-1", 10011)]
-        [TestCase("http://domain1.com/1001-2/1001-2-1", 100121)]
+    [TestCase("http://domain1.com/", 1001)]
+    [TestCase("http://domain1.com/1001-1", 10011)]
+    [TestCase("http://domain1.com/1001-2/1001-2-1", 100121)]
+    public async Task Lookup_SingleDomain(string url, int expectedId)
+    {
+        SetDomains3();
 
-        public async Task Lookup_SingleDomain(string url, int expectedId)
-        {
-            SetDomains3();
+        GlobalSettings.HideTopLevelNodeFromPath = true;
 
-            GlobalSettings.HideTopLevelNodeFromPath = true;
+        var umbracoContextAccessor = GetUmbracoContextAccessor(url);
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-            var umbracoContextAccessor = GetUmbracoContextAccessor(url);
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+        // must lookup domain else lookup by URL fails
+        publishedRouter.FindDomain(frequest);
 
-            // must lookup domain else lookup by URL fails
-            publishedRouter.FindDomain(frequest);
+        var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
+        var result = await lookup.TryFindContent(frequest);
+        Assert.IsTrue(result);
+        Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
+    }
 
-            var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
-            var result = await lookup.TryFindContent(frequest);
-            Assert.IsTrue(result);
-            Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
-        }
+    [TestCase("http://domain1.com/", 1001, "en-US")]
+    [TestCase("http://domain1.com/en", 10011, "en-US")]
+    [TestCase("http://domain1.com/en/1001-1-1", 100111, "en-US")]
+    [TestCase("http://domain1.com/fr", 10012, "fr-FR")]
+    [TestCase("http://domain1.com/fr/1001-2-1", 100121, "fr-FR")]
+    [TestCase("http://domain1.com/1001-3", 10013, "en-US")]
+    [TestCase("http://domain2.com/1002", 1002, "")]
+    [TestCase("http://domain3.com/", 1003, "en-US")]
+    [TestCase("http://domain3.com/en", 10031, "en-US")]
+    [TestCase("http://domain3.com/en/1003-1-1", 100311, "en-US")]
+    [TestCase("http://domain3.com/fr", 10032, "fr-FR")]
+    [TestCase("http://domain3.com/fr/1003-2-1", 100321, "fr-FR")]
+    [TestCase("http://domain3.com/1003-3", 10033, "en-US")]
+    [TestCase("https://domain1.com/", 1001, "en-US")]
+    [TestCase("https://domain3.com/", 1001, "")] // because domain3 is explicitely set on http
+    public async Task Lookup_NestedDomains(string url, int expectedId, string expectedCulture)
+    {
+        SetDomains4();
 
-        [TestCase("http://domain1.com/", 1001, "en-US")]
-        [TestCase("http://domain1.com/en", 10011, "en-US")]
-        [TestCase("http://domain1.com/en/1001-1-1", 100111, "en-US")]
-        [TestCase("http://domain1.com/fr", 10012, "fr-FR")]
-        [TestCase("http://domain1.com/fr/1001-2-1", 100121, "fr-FR")]
-        [TestCase("http://domain1.com/1001-3", 10013, "en-US")]
+        // defaults depend on test environment
+        expectedCulture ??= Thread.CurrentThread.CurrentUICulture.Name;
 
-        [TestCase("http://domain2.com/1002", 1002, "")]
+        GlobalSettings.HideTopLevelNodeFromPath = true;
 
-        [TestCase("http://domain3.com/", 1003, "en-US")]
-        [TestCase("http://domain3.com/en", 10031, "en-US")]
-        [TestCase("http://domain3.com/en/1003-1-1", 100311, "en-US")]
-        [TestCase("http://domain3.com/fr", 10032, "fr-FR")]
-        [TestCase("http://domain3.com/fr/1003-2-1", 100321, "fr-FR")]
-        [TestCase("http://domain3.com/1003-3", 10033, "en-US")]
+        var umbracoContextAccessor = GetUmbracoContextAccessor(url);
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-        [TestCase("https://domain1.com/", 1001, "en-US")]
-        [TestCase("https://domain3.com/", 1001, "")] // because domain3 is explicitely set on http
+        // must lookup domain else lookup by URL fails
+        publishedRouter.FindDomain(frequest);
+        Assert.AreEqual(expectedCulture, frequest.Culture);
 
-        public async Task Lookup_NestedDomains(string url, int expectedId, string expectedCulture)
-        {
-            SetDomains4();
-
-            // defaults depend on test environment
-            expectedCulture ??= System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
-
-            GlobalSettings.HideTopLevelNodeFromPath = true;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor(url);
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
-
-            // must lookup domain else lookup by URL fails
-            publishedRouter.FindDomain(frequest);
-            Assert.AreEqual(expectedCulture, frequest.Culture);
-
-            var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
-            var result = await lookup.TryFindContent(frequest);
-            Assert.IsTrue(result);
-            Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
-        }
+        var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
+        var result = await lookup.TryFindContent(frequest);
+        Assert.IsTrue(result);
+        Assert.AreEqual(expectedId, frequest.PublishedContent.Id);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/DomainsAndCulturesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/DomainsAndCulturesTests.cs
index 3e6d427108..c54e540864 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/DomainsAndCulturesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/DomainsAndCulturesTests.cs
@@ -1,397 +1,359 @@
+using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class DomainsAndCulturesTests : UrlRoutingTestBase
 {
-    [TestFixture]
-    public class DomainsAndCulturesTests : UrlRoutingTestBase
+    private void SetDomains1()
     {
-        private void SetDomains1()
-        {
-            var domainService = Mock.Get(DomainService);
+        var domainService = Mock.Get(DomainService);
 
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("domain1.com/")
                 {
-                    new UmbracoDomain("domain1.com/")
-                    {
-                        Id = 1,
-                        LanguageId = LangDeId,
-                        RootContentId = 1001,
-                        LanguageIsoCode = "de-DE"
-                    },
-                    new UmbracoDomain("domain1.com/en")
-                    {
-                        Id = 2,
-                        LanguageId = LangEngId,
-                        RootContentId = 10011,
-                        LanguageIsoCode = "en-US"
-                    },
-                    new UmbracoDomain("domain1.com/fr")
-                    {
-                        Id = 3,
-                        LanguageId = LangFrId,
-                        RootContentId = 10012,
-                        LanguageIsoCode = "fr-FR"
-                    }
-                });
-        }
-
-        private void SetDomains2()
-        {
-            var domainService = Mock.Get(DomainService);
-
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+                    Id = 1, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE",
+                },
+                new UmbracoDomain("domain1.com/en")
                 {
-                    new UmbracoDomain("domain1.com/")
-                    {
-                        Id = 1,
-                        LanguageId = LangDeId,
-                        RootContentId = 1001,
-                        LanguageIsoCode = "de-DE"
-                    },
-                    new UmbracoDomain("domain1.com/en")
-                    {
-                        Id = 2,
-                        LanguageId = LangEngId,
-                        RootContentId = 10011,
-                        LanguageIsoCode = "en-US"
-                    },
-                    new UmbracoDomain("domain1.com/fr")
-                    {
-                        Id = 3,
-                        LanguageId = LangFrId,
-                        RootContentId = 10012,
-                        LanguageIsoCode = "fr-FR"
-                    },
-                    new UmbracoDomain("*1001")
-                    {
-                        Id = 4,
-                        LanguageId = LangDeId,
-                        RootContentId = 1001,
-                        LanguageIsoCode = "de-DE"
-                    },
-                    new UmbracoDomain("*10011")
-                    {
-                        Id = 5,
-                        LanguageId = LangCzId,
-                        RootContentId = 10011,
-                        LanguageIsoCode = "cs-CZ"
-                    },
-                    new UmbracoDomain("*100112")
-                    {
-                        Id = 6,
-                        LanguageId = LangNlId,
-                        RootContentId = 100112,
-                        LanguageIsoCode = "nl-NL"
-                    },
-                    new UmbracoDomain("*1001122")
-                    {
-                        Id = 7,
-                        LanguageId = LangDkId,
-                        RootContentId = 1001122,
-                        LanguageIsoCode = "da-DK"
-                    },
-                    new UmbracoDomain("*10012")
-                    {
-                        Id = 8,
-                        LanguageId = LangNlId,
-                        RootContentId = 10012,
-                        LanguageIsoCode = "nl-NL"
-                    },
-                    new UmbracoDomain("*10031")
-                    {
-                        Id = 9,
-                        LanguageId = LangNlId,
-                        RootContentId =10031,
-                        LanguageIsoCode = "nl-NL"
-                    }
-                });
-        }
-
-        // domains such as "/en" are natively supported, and when instanciating
-        // DomainAndUri for them, the host will come from the current request
-        //
-        private void SetDomains3()
-        {
-            var domainService = Mock.Get(DomainService);
-
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+                    Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("domain1.com/fr")
                 {
-                    new UmbracoDomain("/en")
-                    {
-                        Id = 1,
-                        LanguageId = LangEngId,
-                        RootContentId = 10011,
-                        LanguageIsoCode = "en-US"
-                    },
-                    new UmbracoDomain("/fr")
-                    {
-                        Id = 2,
-                        LanguageId = LangFrId,
-                        RootContentId = 10012,
-                        LanguageIsoCode = "fr-FR"
-                    }
-                });
-        }
+                    Id = 3, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
 
-        protected override string GetXmlContent(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private void SetDomains2()
+    {
+        var domainService = Mock.Get(DomainService);
+
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("domain1.com/")
+                {
+                    Id = 1, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE",
+                },
+                new UmbracoDomain("domain1.com/en")
+                {
+                    Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("domain1.com/fr")
+                {
+                    Id = 3, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+                new UmbracoDomain("*1001")
+                {
+                    Id = 4, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE",
+                },
+                new UmbracoDomain("*10011")
+                {
+                    Id = 5, LanguageId = LangCzId, RootContentId = 10011, LanguageIsoCode = "cs-CZ",
+                },
+                new UmbracoDomain("*100112")
+                {
+                    Id = 6, LanguageId = LangNlId, RootContentId = 100112, LanguageIsoCode = "nl-NL",
+                },
+                new UmbracoDomain("*1001122")
+                {
+                    Id = 7, LanguageId = LangDkId, RootContentId = 1001122, LanguageIsoCode = "da-DK",
+                },
+                new UmbracoDomain("*10012")
+                {
+                    Id = 8, LanguageId = LangNlId, RootContentId = 10012, LanguageIsoCode = "nl-NL",
+                },
+                new UmbracoDomain("*10031")
+                {
+                    Id = 9, LanguageId = LangNlId, RootContentId = 10031, LanguageIsoCode = "nl-NL",
+                },
+            });
+    }
+
+    // domains such as "/en" are natively supported, and when instanciating
+    // DomainAndUri for them, the host will come from the current request
+    private void SetDomains3()
+    {
+        var domainService = Mock.Get(DomainService);
+
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("/en")
+                {
+                    Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("/fr")
+                {
+                    Id = 2, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
+
+    protected override string GetXmlContent(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Doc ANY>
 <!ATTLIST Doc id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId +
-                   @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
+    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
         <content><![CDATA[]]></content>
         <umbracoUrlAlias><![CDATA[this/is/my/alias, anotheralias]]></umbracoUrlAlias>
         <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias, en/flux, endanger]]></umbracoUrlAlias>
             <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[only/one/alias, entropy, bar/foo, en/bar/nil]]></umbracoUrlAlias>
             </Doc>
             <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
                 <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
         <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[alias42]]></umbracoUrlAlias>
             <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[alias43]]></umbracoUrlAlias>
             </Doc>
             <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
                 <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
         <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
             <umbracoUrlAlias><![CDATA[alias42]]></umbracoUrlAlias>
         </Doc>
     </Doc>
-    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId +
-                   @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
+    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
     </Doc>
-    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId +
-                   @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
+    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
         <content><![CDATA[]]></content>
         <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
             <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
                 <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
         <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
             <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""0"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
                 <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
         <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
-                   templateId +
-                   @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
         </Doc>
     </Doc>
 </root>";
 
-        #region Cases
-        [TestCase("http://domain1.com/", "de-DE", 1001)]
-        [TestCase("http://domain1.com/1001-1", "de-DE", 10011)]
-        [TestCase("http://domain1.com/1001-1/1001-1-1", "de-DE", 100111)]
-        [TestCase("http://domain1.com/en", "en-US", 10011)]
-        [TestCase("http://domain1.com/en/1001-1-1", "en-US", 100111)]
-        [TestCase("http://domain1.com/fr", "fr-FR", 10012)]
-        [TestCase("http://domain1.com/fr/1001-2-1", "fr-FR", 100121)]
-        #endregion
-        public async Task DomainAndCulture(string inputUrl, string expectedCulture, int expectedNode)
-        {
-            SetDomains1();
+    #region Cases
 
-            GlobalSettings.HideTopLevelNodeFromPath = false;
+    [TestCase("http://domain1.com/", "de-DE", 1001)]
+    [TestCase("http://domain1.com/1001-1", "de-DE", 10011)]
+    [TestCase("http://domain1.com/1001-1/1001-1-1", "de-DE", 100111)]
+    [TestCase("http://domain1.com/en", "en-US", 10011)]
+    [TestCase("http://domain1.com/en/1001-1-1", "en-US", 100111)]
+    [TestCase("http://domain1.com/fr", "fr-FR", 10012)]
+    [TestCase("http://domain1.com/fr/1001-2-1", "fr-FR", 100121)]
 
-            var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+    #endregion
 
-            // lookup domain
-            publishedRouter.FindDomain(frequest);
+    public async Task DomainAndCulture(string inputUrl, string expectedCulture, int expectedNode)
+    {
+        SetDomains1();
 
-            Assert.AreEqual(expectedCulture, frequest.Culture);
+        GlobalSettings.HideTopLevelNodeFromPath = false;
 
-            var finder = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
-            var result = await finder.TryFindContent(frequest);
+        var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-            Assert.IsTrue(result);
-            Assert.AreEqual(frequest.PublishedContent.Id, expectedNode);
-        }
+        // lookup domain
+        publishedRouter.FindDomain(frequest);
 
-        #region Cases
-        [TestCase("http://domain1.com/", "de-DE", 1001)] // domain takes over local wildcard at 1001
-        [TestCase("http://domain1.com/1001-1", "cs-CZ", 10011)] // wildcard on 10011 applies
-        [TestCase("http://domain1.com/1001-1/1001-1-1", "cs-CZ", 100111)] // wildcard on 10011 applies
-        [TestCase("http://domain1.com/1001-1/1001-1-2", "nl-NL", 100112)] // wildcard on 100112 applies
-        [TestCase("http://domain1.com/1001-1/1001-1-2/1001-1-2-1", "nl-NL", 1001121)] // wildcard on 100112 applies
-        [TestCase("http://domain1.com/1001-1/1001-1-2/1001-1-2-2", "da-DK", 1001122)] // wildcard on 1001122 applies
+        Assert.AreEqual(expectedCulture, frequest.Culture);
 
-        [TestCase("http://domain1.com/1001-2", "nl-NL", 10012)] // wildcard on 10012 applies
-        [TestCase("http://domain1.com/1001-2/1001-2-1", "nl-NL", 100121)] // wildcard on 10012 applies
-        [TestCase("http://domain1.com/en", "en-US", 10011)] // domain takes over local wildcard at 10011
-        [TestCase("http://domain1.com/en/1001-1-1", "en-US", 100111)] // domain takes over local wildcard at 10011
-        [TestCase("http://domain1.com/en/1001-1-2", "nl-NL", 100112)] // wildcard on 100112 applies
-        [TestCase("http://domain1.com/en/1001-1-2/1001-1-2-1", "nl-NL", 1001121)] // wildcard on 100112 applies
-        [TestCase("http://domain1.com/en/1001-1-2/1001-1-2-2", "da-DK", 1001122)] // wildcard on 1001122 applies
+        var finder = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
+        var result = await finder.TryFindContent(frequest);
 
-        [TestCase("http://domain1.com/fr", "fr-FR", 10012)] // domain takes over local wildcard at 10012
-        [TestCase("http://domain1.com/fr/1001-2-1", "fr-FR", 100121)] // domain takes over local wildcard at 10012
+        Assert.IsTrue(result);
+        Assert.AreEqual(frequest.PublishedContent.Id, expectedNode);
+    }
 
-        [TestCase("/1003", "", 1003)] // default culture (no domain)
-        [TestCase("/1003/1003-1", "nl-NL", 10031)] // wildcard on 10031 applies
-        [TestCase("/1003/1003-1/1003-1-1", "nl-NL", 100311)] // wildcard on 10031 applies
-        #endregion
-        public async Task DomainAndCultureWithWildcards(string inputUrl, string expectedCulture, int expectedNode)
-        {
-            SetDomains2();
+    #region Cases
 
-            // defaults depend on test environment
-            expectedCulture ??= System.Threading.Thread.CurrentThread.CurrentUICulture.Name;
+    [TestCase("http://domain1.com/", "de-DE", 1001)] // domain takes over local wildcard at 1001
+    [TestCase("http://domain1.com/1001-1", "cs-CZ", 10011)] // wildcard on 10011 applies
+    [TestCase("http://domain1.com/1001-1/1001-1-1", "cs-CZ", 100111)] // wildcard on 10011 applies
+    [TestCase("http://domain1.com/1001-1/1001-1-2", "nl-NL", 100112)] // wildcard on 100112 applies
+    [TestCase("http://domain1.com/1001-1/1001-1-2/1001-1-2-1", "nl-NL", 1001121)] // wildcard on 100112 applies
+    [TestCase("http://domain1.com/1001-1/1001-1-2/1001-1-2-2", "da-DK", 1001122)] // wildcard on 1001122 applies
+    [TestCase("http://domain1.com/1001-2", "nl-NL", 10012)] // wildcard on 10012 applies
+    [TestCase("http://domain1.com/1001-2/1001-2-1", "nl-NL", 100121)] // wildcard on 10012 applies
+    [TestCase("http://domain1.com/en", "en-US", 10011)] // domain takes over local wildcard at 10011
+    [TestCase("http://domain1.com/en/1001-1-1", "en-US", 100111)] // domain takes over local wildcard at 10011
+    [TestCase("http://domain1.com/en/1001-1-2", "nl-NL", 100112)] // wildcard on 100112 applies
+    [TestCase("http://domain1.com/en/1001-1-2/1001-1-2-1", "nl-NL", 1001121)] // wildcard on 100112 applies
+    [TestCase("http://domain1.com/en/1001-1-2/1001-1-2-2", "da-DK", 1001122)] // wildcard on 1001122 applies
+    [TestCase("http://domain1.com/fr", "fr-FR", 10012)] // domain takes over local wildcard at 10012
+    [TestCase("http://domain1.com/fr/1001-2-1", "fr-FR", 100121)] // domain takes over local wildcard at 10012
+    [TestCase("/1003", "", 1003)] // default culture (no domain)
+    [TestCase("/1003/1003-1", "nl-NL", 10031)] // wildcard on 10031 applies
+    [TestCase("/1003/1003-1/1003-1-1", "nl-NL", 100311)] // wildcard on 10031 applies
 
-            GlobalSettings.HideTopLevelNodeFromPath = false;
+    #endregion
 
-            var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+    public async Task DomainAndCultureWithWildcards(string inputUrl, string expectedCulture, int expectedNode)
+    {
+        SetDomains2();
 
-            // lookup domain
-            publishedRouter.FindDomain(frequest);
+        // defaults depend on test environment
+        expectedCulture ??= Thread.CurrentThread.CurrentUICulture.Name;
 
-            // find document
-            var finder = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
-            var result = await finder.TryFindContent(frequest);
+        GlobalSettings.HideTopLevelNodeFromPath = false;
 
-            // apply wildcard domain
-            publishedRouter.HandleWildcardDomains(frequest);
+        var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-            Assert.IsTrue(result);
-            Assert.AreEqual(expectedCulture, frequest.Culture);
-            Assert.AreEqual(frequest.PublishedContent.Id, expectedNode);
-        }
+        // lookup domain
+        publishedRouter.FindDomain(frequest);
 
+        // find document
+        var finder = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
+        var result = await finder.TryFindContent(frequest);
 
-        #region Cases
-        [TestCase("http://domain1.com/en", "en-US", 10011)]
-        [TestCase("http://domain1.com/en/1001-1-1", "en-US", 100111)]
-        [TestCase("http://domain1.com/fr", "fr-FR", 10012)]
-        [TestCase("http://domain1.com/fr/1001-2-1", "fr-FR", 100121)]
-        #endregion
-        public async Task DomainGeneric(string inputUrl, string expectedCulture, int expectedNode)
-        {
-            SetDomains3();
+        // apply wildcard domain
+        publishedRouter.HandleWildcardDomains(frequest);
 
-            GlobalSettings.HideTopLevelNodeFromPath = false;
+        Assert.IsTrue(result);
+        Assert.AreEqual(expectedCulture, frequest.Culture);
+        Assert.AreEqual(frequest.PublishedContent.Id, expectedNode);
+    }
 
+    #region Cases
 
-            var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+    [TestCase("http://domain1.com/en", "en-US", 10011)]
+    [TestCase("http://domain1.com/en/1001-1-1", "en-US", 100111)]
+    [TestCase("http://domain1.com/fr", "fr-FR", 10012)]
+    [TestCase("http://domain1.com/fr/1001-2-1", "fr-FR", 100121)]
 
-            // lookup domain
-            publishedRouter.FindDomain(frequest);
-            Assert.IsNotNull(frequest.Domain);
+    #endregion
 
-            Assert.AreEqual(expectedCulture, frequest.Culture);
+    public async Task DomainGeneric(string inputUrl, string expectedCulture, int expectedNode)
+    {
+        SetDomains3();
 
-            var finder = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
-            var result = await finder.TryFindContent(frequest);
+        GlobalSettings.HideTopLevelNodeFromPath = false;
 
-            Assert.IsTrue(result);
-            Assert.AreEqual(frequest.PublishedContent.Id, expectedNode);
-        }
+        var umbracoContextAccessor = GetUmbracoContextAccessor(inputUrl);
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+
+        // lookup domain
+        publishedRouter.FindDomain(frequest);
+        Assert.IsNotNull(frequest.Domain);
+
+        Assert.AreEqual(expectedCulture, frequest.Culture);
+
+        var finder = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
+        var result = await finder.TryFindContent(frequest);
+
+        Assert.IsTrue(result);
+        Assert.AreEqual(frequest.PublishedContent.Id, expectedNode);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs
index 983d632aa9..b17e4ecfa0 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/GetContentUrlsTests.cs
@@ -6,210 +6,197 @@ using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class GetContentUrlsTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class GetContentUrlsTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private WebRoutingSettings _webRoutingSettings;
-        private RequestHandlerSettings _requestHandlerSettings;
+        base.Setup();
 
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        _webRoutingSettings = new WebRoutingSettings();
+        _requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
 
-            _webRoutingSettings = new WebRoutingSettings();
-            _requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
 
-            GlobalSettings.HideTopLevelNodeFromPath = false;
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
 
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        InitializedCache(kits, contentTypes, dataTypes);
+    }
 
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-        }
+    private WebRoutingSettings _webRoutingSettings;
+    private RequestHandlerSettings _requestHandlerSettings;
 
-        private ILocalizedTextService GetTextService()
-        {
-            var textService = new Mock<ILocalizedTextService>();
-            textService.Setup(x => x.Localize(
-                        It.IsAny<string>(),
-                        It.IsAny<string>(),
-                         It.IsAny<CultureInfo>(),
-                         It.IsAny<IDictionary<string, string>>()
-                         ))
-                .Returns((string key, string alias, CultureInfo culture, IDictionary<string, string> args)
+    private ILocalizedTextService GetTextService()
+    {
+        var textService = new Mock<ILocalizedTextService>();
+        textService.Setup(x => x.Localize(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<CultureInfo>(),
+                It.IsAny<IDictionary<string, string>>()))
+            .Returns((string key, string alias, CultureInfo culture, IDictionary<string, string> args)
                 => $"{key}/{alias}");
 
-            return textService.Object;
-        }
-
-        private ILocalizationService GetLangService(params string[] isoCodes)
-        {
-            var allLangs = isoCodes
-                .Select(CultureInfo.GetCultureInfo)
-                .Select(culture => new Language(culture.Name, culture.EnglishName)
-                {
-                    IsDefault = true,
-                    IsMandatory = true
-                }).ToArray();
-
-
-            var langServiceMock = new Mock<ILocalizationService>();
-            langServiceMock.Setup(x => x.GetAllLanguages()).Returns(allLangs);
-            langServiceMock.Setup(x => x.GetDefaultLanguageIsoCode()).Returns(allLangs.First(x=>x.IsDefault).IsoCode);
-
-            return langServiceMock.Object;
-        }
-
-        [Test]
-        public async Task Content_Not_Published()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-            var content = ContentBuilder.CreateBasicContent(contentType);
-            content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
-            content.Path = "-1,1046";
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
-            var publishedRouter = CreatePublishedRouter(
-                umbracoContextAccessor,
-                new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out UriUtility uriUtility);
-
-            var urls = (await content.GetContentUrlsAsync(
-                publishedRouter,
-                umbracoContext,
-                GetLangService("en-US", "fr-FR"),
-                GetTextService(),
-                Mock.Of<IContentService>(),
-                VariationContextAccessor,
-                Mock.Of<ILogger<IContent>>(),
-                uriUtility,
-                urlProvider)).ToList();
-
-            Assert.AreEqual(1, urls.Count);
-            Assert.AreEqual("content/itemNotPublished", urls[0].Text);
-            Assert.IsFalse(urls[0].IsUrl);
-        }
-
-        [Test]
-        public async Task Invariant_Root_Content_Published_No_Domains()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-            var content = ContentBuilder.CreateBasicContent(contentType);
-            content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
-            content.Path = "-1,1046";
-            content.Published = true;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
-            var publishedRouter = CreatePublishedRouter(
-                umbracoContextAccessor,
-                new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out UriUtility uriUtility);
-
-            var urls = (await content.GetContentUrlsAsync(
-                publishedRouter,
-                umbracoContext,
-                GetLangService("en-US", "fr-FR"),
-                GetTextService(),
-                Mock.Of<IContentService>(),
-                VariationContextAccessor,
-                Mock.Of<ILogger<IContent>>(),
-                uriUtility,
-                urlProvider)).ToList();
-
-
-            Assert.AreEqual(2, urls.Count);
-
-            var enUrl = urls.First(x => x.Culture == "en-US");
-
-            Assert.AreEqual("/home/", enUrl.Text);
-            Assert.AreEqual("en-US", enUrl.Culture);
-            Assert.IsTrue(enUrl.IsUrl);
-
-            var frUrl = urls.First(x => x.Culture == "fr-FR");
-
-            Assert.IsFalse(frUrl.IsUrl);
-        }
-
-        [Test]
-        public async Task Invariant_Child_Content_Published_No_Domains()
-        {
-            var contentType = ContentTypeBuilder.CreateBasicContentType();
-            var parent = ContentBuilder.CreateBasicContent(contentType);
-            parent.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
-            parent.Name = "home";
-            parent.Path = "-1,1046";
-            parent.Published = true;
-            var child = ContentBuilder.CreateBasicContent(contentType);
-            child.Name = "sub1";
-            child.Id = 1173; // FIXME: we are using this ID only because it's built into the test XML published cache
-            child.Path = "-1,1046,1173";
-            child.Published = true;
-
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
-            var publishedRouter = CreatePublishedRouter(
-                umbracoContextAccessor,
-                new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-
-
-            var localizationService = GetLangService("en-US", "fr-FR");
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out UriUtility uriUtility);
-
-            var urls = (await child.GetContentUrlsAsync(
-                publishedRouter,
-                umbracoContext,
-                localizationService,
-                GetTextService(),
-                Mock.Of<IContentService>(),
-                VariationContextAccessor,
-                Mock.Of<ILogger<IContent>>(),
-                uriUtility,
-                urlProvider)).ToList();
-
-            Assert.AreEqual(2, urls.Count);
-
-            var enUrl = urls.First(x => x.Culture == "en-US");
-
-            Assert.AreEqual("/home/sub1/", enUrl.Text);
-            Assert.AreEqual("en-US", enUrl.Culture);
-            Assert.IsTrue(enUrl.IsUrl);
-
-            var frUrl = urls.First(x => x.Culture == "fr-FR");
-
-            Assert.IsFalse(frUrl.IsUrl);
-        }
-
-        // TODO: We need a lot of tests here, the above was just to get started with being able to unit test this method
-        // * variant URLs without domains assigned, what happens?
-        // * variant URLs with domains assigned, but also having more languages installed than there are domains/cultures assigned
-        // * variant URLs with an ancestor culture unpublished
-        // * invariant URLs with ancestors as variants
-        // * ... probably a lot more
-
+        return textService.Object;
     }
+
+    private ILocalizationService GetLangService(params string[] isoCodes)
+    {
+        var allLangs = isoCodes
+            .Select(CultureInfo.GetCultureInfo)
+            .Select(culture => new Language(culture.Name, culture.EnglishName) { IsDefault = true, IsMandatory = true })
+            .ToArray();
+
+        var langServiceMock = new Mock<ILocalizationService>();
+        langServiceMock.Setup(x => x.GetAllLanguages()).Returns(allLangs);
+        langServiceMock.Setup(x => x.GetDefaultLanguageIsoCode()).Returns(allLangs.First(x => x.IsDefault).IsoCode);
+
+        return langServiceMock.Object;
+    }
+
+    [Test]
+    public async Task Content_Not_Published()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        var content = ContentBuilder.CreateBasicContent(contentType);
+        content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
+        content.Path = "-1,1046";
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
+        var publishedRouter = CreatePublishedRouter(
+            umbracoContextAccessor,
+            new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out var uriUtility);
+
+        var urls = (await content.GetContentUrlsAsync(
+            publishedRouter,
+            umbracoContext,
+            GetLangService("en-US", "fr-FR"),
+            GetTextService(),
+            Mock.Of<IContentService>(),
+            VariationContextAccessor,
+            Mock.Of<ILogger<IContent>>(),
+            uriUtility,
+            urlProvider)).ToList();
+
+        Assert.AreEqual(1, urls.Count);
+        Assert.AreEqual("content/itemNotPublished", urls[0].Text);
+        Assert.IsFalse(urls[0].IsUrl);
+    }
+
+    [Test]
+    public async Task Invariant_Root_Content_Published_No_Domains()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        var content = ContentBuilder.CreateBasicContent(contentType);
+        content.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
+        content.Path = "-1,1046";
+        content.Published = true;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
+        var publishedRouter = CreatePublishedRouter(
+            umbracoContextAccessor,
+            new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out var uriUtility);
+
+        var urls = (await content.GetContentUrlsAsync(
+            publishedRouter,
+            umbracoContext,
+            GetLangService("en-US", "fr-FR"),
+            GetTextService(),
+            Mock.Of<IContentService>(),
+            VariationContextAccessor,
+            Mock.Of<ILogger<IContent>>(),
+            uriUtility,
+            urlProvider)).ToList();
+
+        Assert.AreEqual(2, urls.Count);
+
+        var enUrl = urls.First(x => x.Culture == "en-US");
+
+        Assert.AreEqual("/home/", enUrl.Text);
+        Assert.AreEqual("en-US", enUrl.Culture);
+        Assert.IsTrue(enUrl.IsUrl);
+
+        var frUrl = urls.First(x => x.Culture == "fr-FR");
+
+        Assert.IsFalse(frUrl.IsUrl);
+    }
+
+    [Test]
+    public async Task Invariant_Child_Content_Published_No_Domains()
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        var parent = ContentBuilder.CreateBasicContent(contentType);
+        parent.Id = 1046; // FIXME: we are using this ID only because it's built into the test XML published cache
+        parent.Name = "home";
+        parent.Path = "-1,1046";
+        parent.Published = true;
+        var child = ContentBuilder.CreateBasicContent(contentType);
+        child.Name = "sub1";
+        child.Id = 1173; // FIXME: we are using this ID only because it's built into the test XML published cache
+        child.Path = "-1,1046,1173";
+        child.Published = true;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("http://localhost:8000");
+        var publishedRouter = CreatePublishedRouter(
+            umbracoContextAccessor,
+            new[] { new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor) });
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+
+        var localizationService = GetLangService("en-US", "fr-FR");
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, _requestHandlerSettings, _webRoutingSettings, out var uriUtility);
+
+        var urls = (await child.GetContentUrlsAsync(
+            publishedRouter,
+            umbracoContext,
+            localizationService,
+            GetTextService(),
+            Mock.Of<IContentService>(),
+            VariationContextAccessor,
+            Mock.Of<ILogger<IContent>>(),
+            uriUtility,
+            urlProvider)).ToList();
+
+        Assert.AreEqual(2, urls.Count);
+
+        var enUrl = urls.First(x => x.Culture == "en-US");
+
+        Assert.AreEqual("/home/sub1/", enUrl.Text);
+        Assert.AreEqual("en-US", enUrl.Culture);
+        Assert.IsTrue(enUrl.IsUrl);
+
+        var frUrl = urls.First(x => x.Culture == "fr-FR");
+
+        Assert.IsFalse(frUrl.IsUrl);
+    }
+
+    // TODO: We need a lot of tests here, the above was just to get started with being able to unit test this method
+    // * variant URLs without domains assigned, what happens?
+    // * variant URLs with domains assigned, but also having more languages installed than there are domains/cultures assigned
+    // * variant URLs with an ancestor culture unpublished
+    // * invariant URLs with ancestors as variants
+    // * ... probably a lot more
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/PublishedRouterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/PublishedRouterTests.cs
index 94de25dadb..4055cf9fde 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/PublishedRouterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/PublishedRouterTests.cs
@@ -17,73 +17,84 @@ using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class PublishedRouterTests
 {
-    [TestFixture]
-    public class PublishedRouterTests
+    private PublishedRouter CreatePublishedRouter(IUmbracoContextAccessor umbracoContextAccessor)
+        => new(
+            Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == new WebRoutingSettings()),
+            new ContentFinderCollection(() => Enumerable.Empty<IContentFinder>()),
+            new TestLastChanceFinder(),
+            new TestVariationContextAccessor(),
+            Mock.Of<IProfilingLogger>(),
+            Mock.Of<ILogger<PublishedRouter>>(),
+            Mock.Of<IPublishedUrlProvider>(),
+            Mock.Of<IRequestAccessor>(),
+            Mock.Of<IPublishedValueFallback>(),
+            Mock.Of<IFileService>(),
+            Mock.Of<IContentTypeService>(),
+            umbracoContextAccessor,
+            Mock.Of<IEventAggregator>());
+
+    private IUmbracoContextAccessor GetUmbracoContextAccessor()
     {
-        private PublishedRouter CreatePublishedRouter(IUmbracoContextAccessor umbracoContextAccessor)
-            => new PublishedRouter(
-                Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x=>x.CurrentValue == new WebRoutingSettings()),
-                new ContentFinderCollection(() => Enumerable.Empty<IContentFinder>()),
-                new TestLastChanceFinder(),
-                new TestVariationContextAccessor(),
-                Mock.Of<IProfilingLogger>(),
-                Mock.Of<ILogger<PublishedRouter>>(),
-                Mock.Of<IPublishedUrlProvider>(),
-                Mock.Of<IRequestAccessor>(),
-                Mock.Of<IPublishedValueFallback>(),
-                Mock.Of<IFileService>(),
-                Mock.Of<IContentTypeService>(),
-                umbracoContextAccessor,
-                Mock.Of<IEventAggregator>());
+        var uri = new Uri("http://example.com");
+        var umbracoContext = Mock.Of<IUmbracoContext>(x => x.CleanedUmbracoUrl == uri);
+        var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
+        return umbracoContextAccessor;
+    }
 
-        private IUmbracoContextAccessor GetUmbracoContextAccessor()
-        {
-            var uri = new Uri("http://example.com");
-            var umbracoContext = Mock.Of<IUmbracoContext>(x => x.CleanedUmbracoUrl == uri);
-            var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
-            return umbracoContextAccessor;
-        }
+    [Test]
+    public async Task ConfigureRequest_Returns_False_Without_HasPublishedContent()
+    {
+        var umbracoContextAccessor = GetUmbracoContextAccessor();
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var request =
+            await publishedRouter.CreateRequestAsync(umbracoContextAccessor.GetRequiredUmbracoContext()
+                .CleanedUmbracoUrl);
+        var result = publishedRouter.BuildRequest(request);
 
-        [Test]
-        public async Task ConfigureRequest_Returns_False_Without_HasPublishedContent()
-        {
-            var umbracoContextAccessor = GetUmbracoContextAccessor();
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var request = await publishedRouter.CreateRequestAsync(umbracoContextAccessor.GetRequiredUmbracoContext().CleanedUmbracoUrl);
-            var result = publishedRouter.BuildRequest(request);
+        Assert.IsFalse(result.Success());
+    }
 
-            Assert.IsFalse(result.Success());
-        }
+    [Test]
+    public async Task ConfigureRequest_Returns_False_When_IsRedirect()
+    {
+        var umbracoContextAccessor = GetUmbracoContextAccessor();
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var request =
+            await publishedRouter.CreateRequestAsync(umbracoContextAccessor.GetRequiredUmbracoContext()
+                .CleanedUmbracoUrl);
+        var content = GetPublishedContentMock();
+        request.SetPublishedContent(content.Object);
+        request.SetCulture("en-AU");
+        request.SetRedirect("/hello");
+        var result = publishedRouter.BuildRequest(request);
 
-        [Test]
-        public async Task ConfigureRequest_Returns_False_When_IsRedirect()
-        {
-            var umbracoContextAccessor = GetUmbracoContextAccessor();
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var request = await publishedRouter.CreateRequestAsync(umbracoContextAccessor.GetRequiredUmbracoContext().CleanedUmbracoUrl);
-            var content = GetPublishedContentMock();
-            request.SetPublishedContent(content.Object);
-            request.SetCulture("en-AU");
-            request.SetRedirect("/hello");
-            var result = publishedRouter.BuildRequest(request);
+        Assert.IsFalse(result.Success());
+    }
 
-            Assert.IsFalse(result.Success());
-        }
-
-        private Mock<IPublishedContent> GetPublishedContentMock()
-        {
-            var pc = new Mock<IPublishedContent>();
-            pc.Setup(content => content.Id).Returns(1);
-            pc.Setup(content => content.Name).Returns("test");
-            pc.Setup(content => content.CreateDate).Returns(DateTime.Now);
-            pc.Setup(content => content.UpdateDate).Returns(DateTime.Now);
-            pc.Setup(content => content.Path).Returns("-1,1");
-            pc.Setup(content => content.Parent).Returns(() => null);
-            pc.Setup(content => content.Properties).Returns(new Collection<IPublishedProperty>());
-            pc.Setup(content => content.ContentType).Returns(new PublishedContentType(Guid.NewGuid(), 22, "anything", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing));
-            return pc;
-        }
+    private Mock<IPublishedContent> GetPublishedContentMock()
+    {
+        var pc = new Mock<IPublishedContent>();
+        pc.Setup(content => content.Id).Returns(1);
+        pc.Setup(content => content.Name).Returns("test");
+        pc.Setup(content => content.CreateDate).Returns(DateTime.Now);
+        pc.Setup(content => content.UpdateDate).Returns(DateTime.Now);
+        pc.Setup(content => content.Path).Returns("-1,1");
+        pc.Setup(content => content.Parent).Returns(() => null);
+        pc.Setup(content => content.Properties).Returns(new Collection<IPublishedProperty>());
+        pc.Setup(content => content.ContentType)
+            .Returns(new PublishedContentType(
+                Guid.NewGuid(),
+                22,
+                "anything",
+                PublishedItemType.Content,
+                Enumerable.Empty<string>(),
+                Enumerable.Empty<PublishedPropertyType>(),
+                ContentVariation.Nothing));
+        return pc;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs
index 2582059182..35bc5c4b62 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/SiteDomainMapperTests.cs
@@ -2,386 +2,387 @@
 // See LICENSE for more details.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class SiteDomainMapperTests
 {
-    [TestFixture]
-    public class SiteDomainMapperTests
+    private SiteDomainMapper CreateSut() => new();
+
+    private static readonly string s_cultureFr = "fr-fr";
+    private static readonly string s_cultureGb = "en-gb";
+
+    [Test]
+    public void AddSites()
     {
+        var siteDomainMapper = CreateSut();
 
-        private SiteDomainMapper CreateSut() => new SiteDomainMapper();
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
 
-        private static readonly string s_cultureFr = "fr-fr";
-        private static readonly string s_cultureGb = "en-gb";
+        var sites = siteDomainMapper.Sites;
 
-        [Test]
-        public void AddSites()
+        Assert.AreEqual(2, sites.Count);
+
+        Assert.Contains("site1", sites.Keys);
+        Assert.Contains("site2", sites.Keys);
+
+        var domains = sites["site1"];
+        Assert.AreEqual(3, domains.Length);
+        Assert.Contains("domain1.com", domains);
+        Assert.Contains("domain1.net", domains);
+        Assert.Contains("domain1.org", domains);
+
+        domains = sites["site2"];
+        Assert.AreEqual(3, domains.Length);
+        Assert.Contains("domain2.com", domains);
+        Assert.Contains("domain2.net", domains);
+        Assert.Contains("domain2.org", domains);
+    }
+
+    [TestCase("foo")] // that one is suspect
+    [TestCase("domain.com")]
+    [TestCase("domain.com/")]
+    [TestCase("domain.com:12")]
+    [TestCase("domain.com:12/")]
+    [TestCase("http://www.domain.com")]
+    [TestCase("http://www.domain.com:12")]
+    [TestCase("http://www.domain.com:12/")]
+    [TestCase("https://foo.www.domain.com")]
+    [TestCase("https://foo.www.domain.com:5478/")]
+    public void AddValidSite(string domain)
+    {
+        var siteDomainMapper = CreateSut();
+
+        siteDomainMapper.AddSite("site1", domain);
+    }
+
+    [TestCase("domain.com/foo")]
+    [TestCase("http:/domain.com")]
+    [TestCase("*")]
+    public void AddInvalidSite(string domain)
+    {
+        var siteDomainMapper = CreateSut();
+
+        Assert.Throws<ArgumentOutOfRangeException>(() => siteDomainMapper.AddSite("site1", domain));
+    }
+
+    [Test]
+    public void AddRemoveSites()
+    {
+        var siteDomainMapper = CreateSut();
+
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+
+        var sites = siteDomainMapper.Sites;
+
+        siteDomainMapper.RemoveSite("site1");
+        siteDomainMapper.RemoveSite("site3");
+
+        Assert.AreEqual(1, sites.Count);
+
+        Assert.Contains("site2", sites.Keys);
+    }
+
+    [Test]
+    public void AddSiteAgain()
+    {
+        var siteDomainMapper = CreateSut();
+
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site1", "domain2.com", "domain1.net");
+
+        var sites = siteDomainMapper.Sites;
+
+        Assert.AreEqual(1, sites.Count);
+
+        Assert.Contains("site1", sites.Keys);
+
+        var domains = sites["site1"];
+        Assert.AreEqual(2, domains.Count());
+        Assert.Contains("domain2.com", domains);
+        Assert.Contains("domain1.net", domains);
+    }
+
+    [Test]
+    public void BindSitesOnce()
+    {
+        var siteDomainMapper = CreateSut();
+
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+        siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
+        siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
+
+        siteDomainMapper.BindSites("site1", "site2");
+
+        var bindings = siteDomainMapper.Bindings;
+
+        Assert.AreEqual(2, bindings.Count);
+        Assert.Contains("site1", bindings.Keys);
+        Assert.Contains("site2", bindings.Keys);
+
+        var others = bindings["site1"];
+        Assert.AreEqual(1, others.Count);
+        Assert.Contains("site2", others);
+
+        others = bindings["site2"];
+        Assert.AreEqual(1, others.Count);
+        Assert.Contains("site1", others);
+    }
+
+    [Test]
+    public void BindMoreSites()
+    {
+        var siteDomainMapper = CreateSut();
+
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+        siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
+        siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
+
+        siteDomainMapper.BindSites("site1", "site2");
+        siteDomainMapper.BindSites("site1", "site3");
+
+        var bindings = siteDomainMapper.Bindings;
+
+        Assert.AreEqual(3, bindings.Count);
+        Assert.Contains("site1", bindings.Keys);
+        Assert.Contains("site2", bindings.Keys);
+        Assert.Contains("site3", bindings.Keys);
+
+        var others = bindings["site1"];
+        Assert.AreEqual(2, others.Count);
+        Assert.Contains("site2", others);
+        Assert.Contains("site3", others);
+
+        others = bindings["site2"];
+        Assert.AreEqual(2, others.Count);
+        Assert.Contains("site1", others);
+        Assert.Contains("site3", others);
+
+        others = bindings["site3"];
+        Assert.AreEqual(2, others.Count);
+        Assert.Contains("site1", others);
+        Assert.Contains("site2", others);
+    }
+
+    private DomainAndUri[] DomainAndUris(Uri current, Domain[] domains) =>
+        domains
+            .Where(d => d.IsWildcard == false)
+            .Select(d => new DomainAndUri(d, current))
+            .OrderByDescending(d => d.Uri.ToString())
+            .ToArray();
+
+    [Test]
+    public void MapDomainWithScheme()
+    {
+        var siteDomainMapper = CreateSut();
+
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+        siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
+        siteDomainMapper.AddSite("site4", "https://domain4.com", "https://domain4.net", "https://domain4.org");
+
+        var current = new Uri("https://domain1.com/foo/bar");
+        Domain[] domains =
         {
-            SiteDomainMapper siteDomainMapper = CreateSut();
+            new Domain(1, "domain2.com", -1, s_cultureFr, false),
+            new Domain(1, "domain1.com", -1, s_cultureGb, false),
+        };
+        var domainAndUris = DomainAndUris(current, domains);
+        var output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
+        Assert.AreEqual("https://domain1.com/", output);
 
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
-
-            Dictionary<string, string[]> sites = siteDomainMapper.Sites;
-
-            Assert.AreEqual(2, sites.Count);
-
-            Assert.Contains("site1", sites.Keys);
-            Assert.Contains("site2", sites.Keys);
-
-            string[] domains = sites["site1"];
-            Assert.AreEqual(3, domains.Length);
-            Assert.Contains("domain1.com", domains);
-            Assert.Contains("domain1.net", domains);
-            Assert.Contains("domain1.org", domains);
-
-            domains = sites["site2"];
-            Assert.AreEqual(3, domains.Length);
-            Assert.Contains("domain2.com", domains);
-            Assert.Contains("domain2.net", domains);
-            Assert.Contains("domain2.org", domains);
-        }
-
-        [TestCase("foo")] // that one is suspect
-        [TestCase("domain.com")]
-        [TestCase("domain.com/")]
-        [TestCase("domain.com:12")]
-        [TestCase("domain.com:12/")]
-        [TestCase("http://www.domain.com")]
-        [TestCase("http://www.domain.com:12")]
-        [TestCase("http://www.domain.com:12/")]
-        [TestCase("https://foo.www.domain.com")]
-        [TestCase("https://foo.www.domain.com:5478/")]
-        public void AddValidSite(string domain)
+        // will pick it all right
+        current = new Uri("https://domain1.com/foo/bar");
+        domains = new[]
         {
-            SiteDomainMapper siteDomainMapper = CreateSut();
+            new Domain(1, "https://domain1.com", -1, s_cultureFr, false),
+            new Domain(1, "https://domain2.com", -1, s_cultureGb, false),
+        };
+        domainAndUris = DomainAndUris(current, domains);
+        output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
+        Assert.AreEqual("https://domain1.com/", output);
 
-            siteDomainMapper.AddSite("site1", domain);
-        }
-
-        [TestCase("domain.com/foo")]
-        [TestCase("http:/domain.com")]
-        [TestCase("*")]
-        public void AddInvalidSite(string domain)
+        current = new Uri("https://domain1.com/foo/bar");
+        domains = new[]
         {
-            SiteDomainMapper siteDomainMapper = CreateSut();
+            new Domain(1, "https://domain1.com", -1, s_cultureFr, false),
+            new Domain(1, "https://domain4.com", -1, s_cultureGb, false),
+        };
+        domainAndUris = DomainAndUris(current, domains);
+        output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
+        Assert.AreEqual("https://domain1.com/", output);
 
-            Assert.Throws<ArgumentOutOfRangeException>(() => siteDomainMapper.AddSite("site1", domain));
-        }
-
-        [Test]
-        public void AddRemoveSites()
+        current = new Uri("https://domain4.com/foo/bar");
+        domains = new[]
         {
-            SiteDomainMapper siteDomainMapper = CreateSut();
+            new Domain(1, "https://domain1.com", -1, s_cultureFr, false),
+            new Domain(1, "https://domain4.com", -1, s_cultureGb, false),
+        };
+        domainAndUris = DomainAndUris(current, domains);
+        output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
+        Assert.AreEqual("https://domain4.com/", output);
+    }
 
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+    [Test]
+    public void MapDomain()
+    {
+        var siteDomainMapper = CreateSut();
 
-            Dictionary<string, string[]> sites = siteDomainMapper.Sites;
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+        siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
+        siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
 
-            siteDomainMapper.RemoveSite("site1");
-            siteDomainMapper.RemoveSite("site3");
-
-            Assert.AreEqual(1, sites.Count);
-
-            Assert.Contains("site2", sites.Keys);
-        }
-
-        [Test]
-        public void AddSiteAgain()
-        {
-            SiteDomainMapper siteDomainMapper = CreateSut();
-
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site1", "domain2.com", "domain1.net");
-
-            Dictionary<string, string[]> sites = siteDomainMapper.Sites;
-
-            Assert.AreEqual(1, sites.Count);
-
-            Assert.Contains("site1", sites.Keys);
-
-            string[] domains = sites["site1"];
-            Assert.AreEqual(2, domains.Count());
-            Assert.Contains("domain2.com", domains);
-            Assert.Contains("domain1.net", domains);
-        }
-
-        [Test]
-        public void BindSitesOnce()
-        {
-            SiteDomainMapper siteDomainMapper = CreateSut();
-
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
-            siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
-            siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
-
-            siteDomainMapper.BindSites("site1", "site2");
-
-            Dictionary<string, List<string>> bindings = siteDomainMapper.Bindings;
-
-            Assert.AreEqual(2, bindings.Count);
-            Assert.Contains("site1", bindings.Keys);
-            Assert.Contains("site2", bindings.Keys);
-
-            List<string> others = bindings["site1"];
-            Assert.AreEqual(1, others.Count);
-            Assert.Contains("site2", others);
-
-            others = bindings["site2"];
-            Assert.AreEqual(1, others.Count);
-            Assert.Contains("site1", others);
-        }
-
-        [Test]
-        public void BindMoreSites()
-        {
-            SiteDomainMapper siteDomainMapper = CreateSut();
-
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
-            siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
-            siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
-
-            siteDomainMapper.BindSites("site1", "site2");
-            siteDomainMapper.BindSites("site1", "site3");
-
-            Dictionary<string, List<string>> bindings = siteDomainMapper.Bindings;
-
-            Assert.AreEqual(3, bindings.Count);
-            Assert.Contains("site1", bindings.Keys);
-            Assert.Contains("site2", bindings.Keys);
-            Assert.Contains("site3", bindings.Keys);
-
-            List<string> others = bindings["site1"];
-            Assert.AreEqual(2, others.Count);
-            Assert.Contains("site2", others);
-            Assert.Contains("site3", others);
-
-            others = bindings["site2"];
-            Assert.AreEqual(2, others.Count);
-            Assert.Contains("site1", others);
-            Assert.Contains("site3", others);
-
-            others = bindings["site3"];
-            Assert.AreEqual(2, others.Count);
-            Assert.Contains("site1", others);
-            Assert.Contains("site2", others);
-        }
-
-        private DomainAndUri[] DomainAndUris(Uri current, Domain[] domains) =>
-            domains
-                .Where(d => d.IsWildcard == false)
-                .Select(d => new DomainAndUri(d, current))
-                .OrderByDescending(d => d.Uri.ToString())
-                .ToArray();
-
-        [Test]
-        public void MapDomainWithScheme()
-        {
-            SiteDomainMapper siteDomainMapper = CreateSut();
-
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
-            siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
-            siteDomainMapper.AddSite("site4", "https://domain4.com", "https://domain4.net", "https://domain4.org");
-
-            var current = new Uri("https://domain1.com/foo/bar");
-            Domain[] domains = new[]
-                {
-                    new Domain(1, "domain2.com", -1, s_cultureFr, false),
-                    new Domain(1, "domain1.com", -1, s_cultureGb, false),
-                };
-            DomainAndUri[] domainAndUris = DomainAndUris(current, domains);
-            string output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
-            Assert.AreEqual("https://domain1.com/", output);
-
-            // will pick it all right
-            current = new Uri("https://domain1.com/foo/bar");
-            domains = new[]
-                {
-                    new Domain(1, "https://domain1.com", -1, s_cultureFr, false),
-                    new Domain(1, "https://domain2.com", -1, s_cultureGb, false)
-                };
-            domainAndUris = DomainAndUris(current, domains);
-            output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
-            Assert.AreEqual("https://domain1.com/", output);
-
-            current = new Uri("https://domain1.com/foo/bar");
-            domains = new[]
-                {
-                    new Domain(1, "https://domain1.com", -1, s_cultureFr, false),
-                    new Domain(1, "https://domain4.com", -1, s_cultureGb, false)
-                };
-            domainAndUris = DomainAndUris(current, domains);
-            output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
-            Assert.AreEqual("https://domain1.com/", output);
-
-            current = new Uri("https://domain4.com/foo/bar");
-            domains = new[]
+        // current is a site1 uri, domains contain current
+        // so we'll get current
+        var current = new Uri("http://domain1.com/foo/bar");
+        var output = siteDomainMapper.MapDomain(
+            new[]
             {
-                new Domain(1, "https://domain1.com", -1, s_cultureFr, false),
-                new Domain(1, "https://domain4.com", -1, s_cultureGb, false)
-            };
-            domainAndUris = DomainAndUris(current, domains);
-            output = siteDomainMapper.MapDomain(domainAndUris, current, s_cultureFr, s_cultureFr).Uri.ToString();
-            Assert.AreEqual("https://domain4.com/", output);
-        }
+                new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false), current),
+                new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current),
+            },
+            current,
+            s_cultureFr,
+            s_cultureFr).Uri.ToString();
+        Assert.AreEqual("http://domain1.com/", output);
 
-        [Test]
-        public void MapDomain()
-        {
-            SiteDomainMapper siteDomainMapper = CreateSut();
+        // current is a site1 uri, domains do not contain current
+        // so we'll get the corresponding site1 domain
+        current = new Uri("http://domain1.com/foo/bar");
+        output = siteDomainMapper.MapDomain(
+            new[]
+            {
+                new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false), current),
+                new DomainAndUri(new Domain(1, "domain2.net", -1, s_cultureGb, false), current),
+            },
+            current,
+            s_cultureFr,
+            s_cultureFr).Uri.ToString();
+        Assert.AreEqual("http://domain1.net/", output);
 
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
-            siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
-            siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
+        // current is a site1 uri, domains do not contain current
+        // so we'll get the corresponding site1 domain
+        // order does not matter
+        current = new Uri("http://domain1.com/foo/bar");
+        output = siteDomainMapper.MapDomain(
+            new[]
+            {
+                new DomainAndUri(new Domain(1, "domain2.net", -1, s_cultureFr, false), current),
+                new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureGb, false), current),
+            },
+            current,
+            s_cultureFr,
+            s_cultureFr).Uri.ToString();
+        Assert.AreEqual("http://domain1.net/", output);
+    }
 
-            // current is a site1 uri, domains contain current
-            // so we'll get current
-            var current = new Uri("http://domain1.com/foo/bar");
-            string output = siteDomainMapper.MapDomain(
-                new[]
-                {
-                    new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false), current),
-                    new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current),
-                }, current,
-                s_cultureFr,
-                s_cultureFr).Uri.ToString();
-            Assert.AreEqual("http://domain1.com/", output);
+    [Test]
+    public void MapDomains()
+    {
+        var siteDomainMapper = CreateSut();
 
-            // current is a site1 uri, domains do not contain current
-            // so we'll get the corresponding site1 domain
-            current = new Uri("http://domain1.com/foo/bar");
-            output = siteDomainMapper.MapDomain(
-                new[]
-                {
-                    new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false), current),
-                    new DomainAndUri(new Domain(1, "domain2.net", -1, s_cultureGb, false), current)
-                }, current,
-                s_cultureFr,
-                s_cultureFr).Uri.ToString();
-            Assert.AreEqual("http://domain1.net/", output);
+        siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
+        siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
+        siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
+        siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
 
-            // current is a site1 uri, domains do not contain current
-            // so we'll get the corresponding site1 domain
-            // order does not matter
-            current = new Uri("http://domain1.com/foo/bar");
-            output = siteDomainMapper.MapDomain(
-                new[]
-                {
-                    new DomainAndUri(new Domain(1, "domain2.net", -1, s_cultureFr, false), current),
-                    new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureGb, false), current)
-                }, current,
-                s_cultureFr,
-                s_cultureFr).Uri.ToString();
-            Assert.AreEqual("http://domain1.net/", output);
-        }
+        // the rule is:
+        // - exclude the current domain
+        // - exclude what MapDomain would return
+        // - return all domains from same site, or bound sites
 
-        [Test]
-        public void MapDomains()
-        {
-            SiteDomainMapper siteDomainMapper = CreateSut();
+        // current is a site1 uri, domains contains current
+        var current = new Uri("http://domain1.com/foo/bar");
+        var output = siteDomainMapper.MapDomains(
+            new[]
+            {
+                new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false), current), // no: current + what MapDomain would pick
+                new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
+            },
+            current,
+            true,
+            s_cultureFr,
+            s_cultureFr).ToArray();
 
-            siteDomainMapper.AddSite("site1", "domain1.com", "domain1.net", "domain1.org");
-            siteDomainMapper.AddSite("site2", "domain2.com", "domain2.net", "domain2.org");
-            siteDomainMapper.AddSite("site3", "domain3.com", "domain3.net", "domain3.org");
-            siteDomainMapper.AddSite("site4", "domain4.com", "domain4.net", "domain4.org");
+        Assert.AreEqual(1, output.Count());
+        Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
 
-            // the rule is:
-            // - exclude the current domain
-            // - exclude what MapDomain would return
-            // - return all domains from same site, or bound sites
+        // current is a site1 uri, domains does not contain current
+        current = new Uri("http://domain1.com/foo/bar");
+        output = siteDomainMapper.MapDomains(
+            new[]
+            {
+                new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false), current), // no: what MapDomain would pick
+                new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
+            },
+            current,
+            true,
+            s_cultureFr,
+            s_cultureFr).ToArray();
 
-            // current is a site1 uri, domains contains current
-            var current = new Uri("http://domain1.com/foo/bar");
-            DomainAndUri[] output = siteDomainMapper.MapDomains(
-                new[]
-                {
-                    new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false), current), // no: current + what MapDomain would pick
-                    new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
-                },
-                current,
-                true,
-                s_cultureFr,
-                s_cultureFr).ToArray();
+        Assert.AreEqual(1, output.Count());
+        Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
 
-            Assert.AreEqual(1, output.Count());
-            Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
+        siteDomainMapper.BindSites("site1", "site3");
+        siteDomainMapper.BindSites("site2", "site4");
 
-            // current is a site1 uri, domains does not contain current
-            current = new Uri("http://domain1.com/foo/bar");
-            output = siteDomainMapper.MapDomains(
-                new[]
-                {
-                    new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false), current), // no: what MapDomain would pick
-                    new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
-                },
-                current,
-                true,
-                s_cultureFr,
-                s_cultureFr).ToArray();
+        // current is a site1 uri, domains contains current
+        current = new Uri("http://domain1.com/foo/bar");
+        output = siteDomainMapper.MapDomains(
+            new[]
+            {
+                new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false), current), // no: current + what MapDomain would pick
+                new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // yes: bound site
+                new DomainAndUri(new Domain(1, "domain3.org", -1, s_cultureGb, false), current), // yes: bound site
+                new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
+            },
+            current,
+            true,
+            s_cultureFr,
+            s_cultureFr).ToArray();
 
-            Assert.AreEqual(1, output.Count());
-            Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
+        Assert.AreEqual(3, output.Count());
+        Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
+        Assert.Contains("http://domain3.com/", output.Select(d => d.Uri.ToString()).ToArray());
+        Assert.Contains("http://domain3.org/", output.Select(d => d.Uri.ToString()).ToArray());
 
-            siteDomainMapper.BindSites("site1", "site3");
-            siteDomainMapper.BindSites("site2", "site4");
+        // current is a site1 uri, domains does not contain current
+        current = new Uri("http://domain1.com/foo/bar");
+        output = siteDomainMapper.MapDomains(
+            new[]
+            {
+                new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false), current), // no: what MapDomain would pick
+                new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // yes: bound site
+                new DomainAndUri(new Domain(1, "domain3.org", -1, s_cultureGb, false), current), // yes: bound site
+                new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
+                new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
+            },
+            current,
+            true,
+            s_cultureFr,
+            s_cultureFr).ToArray();
 
-            // current is a site1 uri, domains contains current
-            current = new Uri("http://domain1.com/foo/bar");
-            output = siteDomainMapper.MapDomains(
-                new[]
-                {
-                    new DomainAndUri(new Domain(1, "domain1.com", -1, s_cultureFr, false), current), // no: current + what MapDomain would pick
-                    new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // yes: bound site
-                    new DomainAndUri(new Domain(1, "domain3.org", -1, s_cultureGb, false), current), // yes: bound site
-                    new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
-                },
-                current,
-                true,
-                s_cultureFr,
-                s_cultureFr).ToArray();
-
-            Assert.AreEqual(3, output.Count());
-            Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
-            Assert.Contains("http://domain3.com/", output.Select(d => d.Uri.ToString()).ToArray());
-            Assert.Contains("http://domain3.org/", output.Select(d => d.Uri.ToString()).ToArray());
-
-            // current is a site1 uri, domains does not contain current
-            current = new Uri("http://domain1.com/foo/bar");
-            output = siteDomainMapper.MapDomains(
-                new[]
-                {
-                    new DomainAndUri(new Domain(1, "domain1.net", -1, s_cultureFr, false), current), // no: what MapDomain would pick
-                    new DomainAndUri(new Domain(1, "domain2.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain3.com", -1, s_cultureGb, false), current), // yes: bound site
-                    new DomainAndUri(new Domain(1, "domain3.org", -1, s_cultureGb, false), current), // yes: bound site
-                    new DomainAndUri(new Domain(1, "domain4.com", -1, s_cultureGb, false), current), // no: not same site
-                    new DomainAndUri(new Domain(1, "domain1.org", -1, s_cultureGb, false), current), // yes: same site (though bogus setup)
-                }, current,
-                true,
-                s_cultureFr,
-                s_cultureFr).ToArray();
-
-            Assert.AreEqual(3, output.Count());
-            Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
-            Assert.Contains("http://domain3.com/", output.Select(d => d.Uri.ToString()).ToArray());
-            Assert.Contains("http://domain3.org/", output.Select(d => d.Uri.ToString()).ToArray());
-        }
+        Assert.AreEqual(3, output.Count());
+        Assert.Contains("http://domain1.org/", output.Select(d => d.Uri.ToString()).ToArray());
+        Assert.Contains("http://domain3.com/", output.Select(d => d.Uri.ToString()).ToArray());
+        Assert.Contains("http://domain3.org/", output.Select(d => d.Uri.ToString()).ToArray());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs
index 7f854d2e44..744febae67 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UmbracoRequestPathsTests.cs
@@ -1,114 +1,112 @@
 using System;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Tests.Common.Testing;
-using Umbraco.Cms.Web.Common.AspNetCore;
 using IHostingEnvironment = Umbraco.Cms.Core.Hosting.IHostingEnvironment;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class UmbracoRequestPathsTests
 {
-    [TestFixture]
-    public class UmbracoRequestPathsTests
+    [OneTimeSetUp]
+    public void Setup()
     {
-        private IWebHostEnvironment _hostEnvironment;
-        private GlobalSettings _globalSettings;
+        _hostEnvironment = Mock.Of<IWebHostEnvironment>();
+        _globalSettings = new GlobalSettings();
+    }
 
-        [OneTimeSetUp]
-        public void Setup()
-        {
-            _hostEnvironment = Mock.Of<IWebHostEnvironment>();
-            _globalSettings = new GlobalSettings();
-        }
+    private IWebHostEnvironment _hostEnvironment;
+    private GlobalSettings _globalSettings;
 
-        private IHostingEnvironment CreateHostingEnvironment(string virtualPath = "")
-        {
-            var hostingSettings = new HostingSettings { ApplicationVirtualPath = virtualPath };
-            var webRoutingSettings = new WebRoutingSettings();
-            var mockedOptionsMonitorOfHostingSettings = Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == hostingSettings);
-            var mockedOptionsMonitorOfWebRoutingSettings = Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings);
+    private IHostingEnvironment CreateHostingEnvironment(string virtualPath = "")
+    {
+        var hostingSettings = new HostingSettings { ApplicationVirtualPath = virtualPath };
+        var webRoutingSettings = new WebRoutingSettings();
+        var mockedOptionsMonitorOfHostingSettings =
+            Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == hostingSettings);
+        var mockedOptionsMonitorOfWebRoutingSettings =
+            Mock.Of<IOptionsMonitor<WebRoutingSettings>>(x => x.CurrentValue == webRoutingSettings);
 
-            return new TestHostingEnvironment(
-                mockedOptionsMonitorOfHostingSettings,
-                mockedOptionsMonitorOfWebRoutingSettings,
-                _hostEnvironment);
-        }
+        return new TestHostingEnvironment(
+            mockedOptionsMonitorOfHostingSettings,
+            mockedOptionsMonitorOfWebRoutingSettings,
+            _hostEnvironment);
+    }
 
-        [TestCase("/favicon.ico", true)]
-        [TestCase("/umbraco_client/Tree/treeIcons.css", true)]
-        [TestCase("/umbraco_client/Tree/Themes/umbraco/style.css?cdv=37", true)]
-        [TestCase("/base/somebasehandler", false)]
-        [TestCase("/", false)]
-        [TestCase("/home.aspx", true)] // has ext, assume client side
-        [TestCase("http://www.domain.com/Umbraco/test/test.aspx", true)] // has ext, assume client side
-        [TestCase("http://www.domain.com/umbraco/test/test.js", true)]
-        public void Is_Client_Side_Request(string url, bool assert)
-        {
-            IHostingEnvironment hostingEnvironment = CreateHostingEnvironment();
-            var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
+    [TestCase("/favicon.ico", true)]
+    [TestCase("/umbraco_client/Tree/treeIcons.css", true)]
+    [TestCase("/umbraco_client/Tree/Themes/umbraco/style.css?cdv=37", true)]
+    [TestCase("/base/somebasehandler", false)]
+    [TestCase("/", false)]
+    [TestCase("/home.aspx", true)] // has ext, assume client side
+    [TestCase("http://www.domain.com/Umbraco/test/test.aspx", true)] // has ext, assume client side
+    [TestCase("http://www.domain.com/umbraco/test/test.js", true)]
+    public void Is_Client_Side_Request(string url, bool assert)
+    {
+        var hostingEnvironment = CreateHostingEnvironment();
+        var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
 
-            var uri = new Uri("http://test.com" + url);
-            var result = umbracoRequestPaths.IsClientSideRequest(uri.AbsolutePath);
-            Assert.AreEqual(assert, result);
-        }
+        var uri = new Uri("http://test.com" + url);
+        var result = umbracoRequestPaths.IsClientSideRequest(uri.AbsolutePath);
+        Assert.AreEqual(assert, result);
+    }
 
-        [Test]
-        public void Is_Client_Side_Request_InvalidPath_ReturnFalse()
-        {
-            IHostingEnvironment hostingEnvironment = CreateHostingEnvironment();
-            var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
+    [Test]
+    public void Is_Client_Side_Request_InvalidPath_ReturnFalse()
+    {
+        var hostingEnvironment = CreateHostingEnvironment();
+        var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
 
-            // This URL is invalid. Default to false when the extension cannot be determined
-            var uri = new Uri("http://test.com/installing-modules+foobar+\"yipee\"");
-            var result = umbracoRequestPaths.IsClientSideRequest(uri.AbsolutePath);
-            Assert.AreEqual(false, result);
-        }
+        // This URL is invalid. Default to false when the extension cannot be determined
+        var uri = new Uri("http://test.com/installing-modules+foobar+\"yipee\"");
+        var result = umbracoRequestPaths.IsClientSideRequest(uri.AbsolutePath);
+        Assert.AreEqual(false, result);
+    }
 
-        [TestCase("http://www.domain.com/umbraco/preview/frame?id=1234", "", true)]
-        [TestCase("http://www.domain.com/umbraco", "", true)]
-        [TestCase("http://www.domain.com/Umbraco/", "", true)]
-        [TestCase("http://www.domain.com/umbraco/default.aspx", "", true)]
-        [TestCase("http://www.domain.com/umbraco/test/test", "", false)]
-        [TestCase("http://www.domain.com/umbraco/test/test/test", "", false)]
-        [TestCase("http://www.domain.com/umbrac", "", false)]
-        [TestCase("http://www.domain.com/test", "", false)]
-        [TestCase("http://www.domain.com/test/umbraco", "", false)]
-        [TestCase("http://www.domain.com/Umbraco/Backoffice/blah", "", true)]
-        [TestCase("http://www.domain.com/Umbraco/anything", "", true)]
-        [TestCase("http://www.domain.com/Umbraco/anything/", "", true)]
-        [TestCase("http://www.domain.com/Umbraco/surface/blah", "", false)]
-        [TestCase("http://www.domain.com/umbraco/api/blah", "", false)]
-        [TestCase("http://www.domain.com/myvdir/umbraco/api/blah", "myvdir", false)]
-        [TestCase("http://www.domain.com/MyVdir/umbraco/api/blah", "/myvdir", false)]
-        [TestCase("http://www.domain.com/MyVdir/Umbraco/", "myvdir", true)]
-        public void Is_Back_Office_Request(string input, string virtualPath, bool expected)
-        {
-            var source = new Uri(input);
-            var hostingEnvironment = CreateHostingEnvironment(virtualPath);
-            var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
-            Assert.AreEqual(expected, umbracoRequestPaths.IsBackOfficeRequest(source.AbsolutePath));
-        }
+    [TestCase("http://www.domain.com/umbraco/preview/frame?id=1234", "", true)]
+    [TestCase("http://www.domain.com/umbraco", "", true)]
+    [TestCase("http://www.domain.com/Umbraco/", "", true)]
+    [TestCase("http://www.domain.com/umbraco/default.aspx", "", true)]
+    [TestCase("http://www.domain.com/umbraco/test/test", "", false)]
+    [TestCase("http://www.domain.com/umbraco/test/test/test", "", false)]
+    [TestCase("http://www.domain.com/umbrac", "", false)]
+    [TestCase("http://www.domain.com/test", "", false)]
+    [TestCase("http://www.domain.com/test/umbraco", "", false)]
+    [TestCase("http://www.domain.com/Umbraco/Backoffice/blah", "", true)]
+    [TestCase("http://www.domain.com/Umbraco/anything", "", true)]
+    [TestCase("http://www.domain.com/Umbraco/anything/", "", true)]
+    [TestCase("http://www.domain.com/Umbraco/surface/blah", "", false)]
+    [TestCase("http://www.domain.com/umbraco/api/blah", "", false)]
+    [TestCase("http://www.domain.com/myvdir/umbraco/api/blah", "myvdir", false)]
+    [TestCase("http://www.domain.com/MyVdir/umbraco/api/blah", "/myvdir", false)]
+    [TestCase("http://www.domain.com/MyVdir/Umbraco/", "myvdir", true)]
+    public void Is_Back_Office_Request(string input, string virtualPath, bool expected)
+    {
+        var source = new Uri(input);
+        var hostingEnvironment = CreateHostingEnvironment(virtualPath);
+        var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
+        Assert.AreEqual(expected, umbracoRequestPaths.IsBackOfficeRequest(source.AbsolutePath));
+    }
 
-        [TestCase("http://www.domain.com/install", true)]
-        [TestCase("http://www.domain.com/Install/", true)]
-        [TestCase("http://www.domain.com/install/default.aspx", true)]
-        [TestCase("http://www.domain.com/install/test/test", true)]
-        [TestCase("http://www.domain.com/Install/test/test.aspx", true)]
-        [TestCase("http://www.domain.com/install/test/test.js", true)]
-        [TestCase("http://www.domain.com/instal", false)]
-        [TestCase("http://www.domain.com/umbraco", false)]
-        [TestCase("http://www.domain.com/umbraco/umbraco", false)]
-        public void Is_Installer_Request(string input, bool expected)
-        {
-            var source = new Uri(input);
-            var hostingEnvironment = CreateHostingEnvironment();
-            var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
-            Assert.AreEqual(expected, umbracoRequestPaths.IsInstallerRequest(source.AbsolutePath));
-        }
+    [TestCase("http://www.domain.com/install", true)]
+    [TestCase("http://www.domain.com/Install/", true)]
+    [TestCase("http://www.domain.com/install/default.aspx", true)]
+    [TestCase("http://www.domain.com/install/test/test", true)]
+    [TestCase("http://www.domain.com/Install/test/test.aspx", true)]
+    [TestCase("http://www.domain.com/install/test/test.js", true)]
+    [TestCase("http://www.domain.com/instal", false)]
+    [TestCase("http://www.domain.com/umbraco", false)]
+    [TestCase("http://www.domain.com/umbraco/umbraco", false)]
+    public void Is_Installer_Request(string input, bool expected)
+    {
+        var source = new Uri(input);
+        var hostingEnvironment = CreateHostingEnvironment();
+        var umbracoRequestPaths = new UmbracoRequestPaths(Options.Create(_globalSettings), hostingEnvironment);
+        Assert.AreEqual(expected, umbracoRequestPaths.IsInstallerRequest(source.AbsolutePath));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs
index fad2e00db9..04ab83801d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UriUtilityTests.cs
@@ -8,108 +8,106 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+// FIXME: not testing virtual directory!
+[TestFixture]
+public class UriUtilityTests
 {
-    // FIXME: not testing virtual directory!
+    // test normal urls
+    [TestCase("http://LocalHost/", "http://localhost/")]
+    [TestCase("http://LocalHost/?x=y", "http://localhost/?x=y")]
+    [TestCase("http://LocalHost/Home", "http://localhost/home")]
+    [TestCase("http://LocalHost/Home?x=y", "http://localhost/home?x=y")]
+    [TestCase("http://LocalHost/Home/Sub1", "http://localhost/home/sub1")]
+    [TestCase("http://LocalHost/Home/Sub1?x=y", "http://localhost/home/sub1?x=y")]
 
-    [TestFixture]
-    public class UriUtilityTests
+    // test that the trailing slash goes but not on hostname
+    [TestCase("http://LocalHost/", "http://localhost/")]
+    [TestCase("http://LocalHost/Home/", "http://localhost/home")]
+    [TestCase("http://LocalHost/Home/?x=y", "http://localhost/home?x=y")]
+    [TestCase("http://LocalHost/Home/Sub1/", "http://localhost/home/sub1")]
+    [TestCase("http://LocalHost/Home/Sub1/?x=y", "http://localhost/home/sub1?x=y")]
+    public void Uri_To_Umbraco(string sourceUrl, string expectedUrl)
     {
-        // test normal urls
-        [TestCase("http://LocalHost/", "http://localhost/")]
-        [TestCase("http://LocalHost/?x=y", "http://localhost/?x=y")]
-        [TestCase("http://LocalHost/Home", "http://localhost/home")]
-        [TestCase("http://LocalHost/Home?x=y", "http://localhost/home?x=y")]
-        [TestCase("http://LocalHost/Home/Sub1", "http://localhost/home/sub1")]
-        [TestCase("http://LocalHost/Home/Sub1?x=y", "http://localhost/home/sub1?x=y")]
+        // Arrange
+        var sourceUri = new Uri(sourceUrl);
+        var uriUtility = BuildUriUtility("/");
 
-        // test that the trailing slash goes but not on hostname
-        [TestCase("http://LocalHost/", "http://localhost/")]
-        [TestCase("http://LocalHost/Home/", "http://localhost/home")]
-        [TestCase("http://LocalHost/Home/?x=y", "http://localhost/home?x=y")]
-        [TestCase("http://LocalHost/Home/Sub1/", "http://localhost/home/sub1")]
-        [TestCase("http://LocalHost/Home/Sub1/?x=y", "http://localhost/home/sub1?x=y")]
-        public void Uri_To_Umbraco(string sourceUrl, string expectedUrl)
-        {
-            // Arrange
-            var sourceUri = new Uri(sourceUrl);
-            UriUtility uriUtility = BuildUriUtility("/");
+        // Act
+        var resultUri = uriUtility.UriToUmbraco(sourceUri);
 
-            // Act
-            Uri resultUri = uriUtility.UriToUmbraco(sourceUri);
+        // Assert
+        var expectedUri = new Uri(expectedUrl);
+        Assert.AreEqual(expectedUri.ToString(), resultUri.ToString());
+    }
 
-            // Assert
-            var expectedUri = new Uri(expectedUrl);
-            Assert.AreEqual(expectedUri.ToString(), resultUri.ToString());
-        }
+    // test directoryUrl true, trailingSlash false
+    [TestCase("/", "/", false)]
+    [TestCase("/home", "/home", false)]
+    [TestCase("/home/sub1", "/home/sub1", false)]
 
-        // test directoryUrl true, trailingSlash false
-        [TestCase("/", "/", false)]
-        [TestCase("/home", "/home", false)]
-        [TestCase("/home/sub1", "/home/sub1", false)]
+    // test directoryUrl true, trailingSlash true
+    [TestCase("/", "/", true)]
+    [TestCase("/home", "/home/", true)]
+    [TestCase("/home/sub1", "/home/sub1/", true)]
+    public void Uri_From_Umbraco(string sourceUrl, string expectedUrl, bool trailingSlash)
+    {
+        // Arrange
+        var sourceUri = new Uri(sourceUrl, UriKind.Relative);
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = trailingSlash };
+        var uriUtility = BuildUriUtility("/");
 
-        // test directoryUrl true, trailingSlash true
-        [TestCase("/", "/", true)]
-        [TestCase("/home", "/home/", true)]
-        [TestCase("/home/sub1", "/home/sub1/", true)]
-        public void Uri_From_Umbraco(string sourceUrl, string expectedUrl, bool trailingSlash)
-        {
-            // Arrange
-            var sourceUri = new Uri(sourceUrl, UriKind.Relative);
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = trailingSlash };
-            UriUtility uriUtility = BuildUriUtility("/");
+        // Act
+        var resultUri = uriUtility.UriFromUmbraco(sourceUri, requestHandlerSettings);
 
-            // Act
-            Uri resultUri = uriUtility.UriFromUmbraco(sourceUri, requestHandlerSettings);
+        // Assert
+        var expectedUri = new Uri(expectedUrl, UriKind.Relative);
+        Assert.AreEqual(expectedUri.ToString(), resultUri.ToString());
+    }
 
-            // Assert
-            var expectedUri = new Uri(expectedUrl, UriKind.Relative);
-            Assert.AreEqual(expectedUri.ToString(), resultUri.ToString());
-        }
+    [TestCase("/", "/", "/")]
+    [TestCase("/", "/foo", "/foo")]
+    [TestCase("/", "~/foo", "/foo")]
+    [TestCase("/vdir", "/", "/vdir/")]
+    [TestCase("/vdir", "/foo", "/vdir/foo")]
+    [TestCase("/vdir", "/foo/", "/vdir/foo/")]
+    [TestCase("/vdir", "~/foo", "/vdir/foo")]
+    public void Uri_To_Absolute(string virtualPath, string sourceUrl, string expectedUrl)
+    {
+        // Arrange
+        var uriUtility = BuildUriUtility(virtualPath);
 
-        [TestCase("/", "/", "/")]
-        [TestCase("/", "/foo", "/foo")]
-        [TestCase("/", "~/foo", "/foo")]
-        [TestCase("/vdir", "/", "/vdir/")]
-        [TestCase("/vdir", "/foo", "/vdir/foo")]
-        [TestCase("/vdir", "/foo/", "/vdir/foo/")]
-        [TestCase("/vdir", "~/foo", "/vdir/foo")]
-        public void Uri_To_Absolute(string virtualPath, string sourceUrl, string expectedUrl)
-        {
-            // Arrange
-            UriUtility uriUtility = BuildUriUtility(virtualPath);
+        // Act
+        var resultUrl = uriUtility.ToAbsolute(sourceUrl);
 
-            // Act
-            var resultUrl = uriUtility.ToAbsolute(sourceUrl);
+        // Assert
+        Assert.AreEqual(expectedUrl, resultUrl);
+    }
 
-            // Assert
-            Assert.AreEqual(expectedUrl, resultUrl);
-        }
+    [TestCase("/", "/", "/")]
+    [TestCase("/", "/foo", "/foo")]
+    [TestCase("/", "/foo/", "/foo/")]
+    [TestCase("/vdir", "/vdir", "/")]
+    [TestCase("/vdir", "/vdir/", "/")]
+    [TestCase("/vdir", "/vdir/foo", "/foo")]
+    [TestCase("/vdir", "/vdir/foo/", "/foo/")]
+    public void Url_To_App_Relative(string virtualPath, string sourceUrl, string expectedUrl)
+    {
+        // Arrange
+        var uriUtility = BuildUriUtility(virtualPath);
 
-        [TestCase("/", "/", "/")]
-        [TestCase("/", "/foo", "/foo")]
-        [TestCase("/", "/foo/", "/foo/")]
-        [TestCase("/vdir", "/vdir", "/")]
-        [TestCase("/vdir", "/vdir/", "/")]
-        [TestCase("/vdir", "/vdir/foo", "/foo")]
-        [TestCase("/vdir", "/vdir/foo/", "/foo/")]
-        public void Url_To_App_Relative(string virtualPath, string sourceUrl, string expectedUrl)
-        {
-            // Arrange
-            UriUtility uriUtility = BuildUriUtility(virtualPath);
+        // Act
+        var resultUrl = uriUtility.ToAppRelative(sourceUrl);
 
-            // Act
-            var resultUrl = uriUtility.ToAppRelative(sourceUrl);
+        // Assert
+        Assert.AreEqual(expectedUrl, resultUrl);
+    }
 
-            // Assert
-            Assert.AreEqual(expectedUrl, resultUrl);
-        }
-
-        private UriUtility BuildUriUtility(string virtualPath)
-        {
-            var mockHostingEnvironment = new Mock<IHostingEnvironment>();
-            mockHostingEnvironment.Setup(x => x.ApplicationVirtualPath).Returns(virtualPath);
-            return new UriUtility(mockHostingEnvironment.Object);
-        }
+    private UriUtility BuildUriUtility(string virtualPath)
+    {
+        var mockHostingEnvironment = new Mock<IHostingEnvironment>();
+        mockHostingEnvironment.Setup(x => x.ApplicationVirtualPath).Returns(virtualPath);
+        return new UriUtility(mockHostingEnvironment.Object);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs
index 59884882bf..e8df94c196 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs
@@ -1,57 +1,51 @@
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class UrlProviderWithHideTopLevelNodeFromPathTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class UrlProviderWithHideTopLevelNodeFromPathTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        base.Setup();
 
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
+        InitializedCache(kits, contentTypes, dataTypes);
 
-            GlobalSettings.HideTopLevelNodeFromPath = true;
-        }
+        GlobalSettings.HideTopLevelNodeFromPath = true;
+    }
 
-        [TestCase(1046, "/")]
-        [TestCase(1173, "/sub1/")]
-        [TestCase(1174, "/sub1/sub2/")]
-        [TestCase(1176, "/sub1/sub-3/")]
-        [TestCase(1177, "/sub1/custom-sub-1/")]
-        [TestCase(1178, "/sub1/custom-sub-2/")]
-        [TestCase(1175, "/sub-2/")]
-        [TestCase(1172, "/test-page/")] // not hidden because not first root
-        public void Get_Url_Hiding_Top_Level(int nodeId, string niceUrlMatch)
-        {
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+    [TestCase(1046, "/")]
+    [TestCase(1173, "/sub1/")]
+    [TestCase(1174, "/sub1/sub2/")]
+    [TestCase(1176, "/sub1/sub-3/")]
+    [TestCase(1177, "/sub1/custom-sub-1/")]
+    [TestCase(1178, "/sub1/custom-sub-2/")]
+    [TestCase(1175, "/sub-2/")]
+    [TestCase(1172, "/test-page/")] // not hidden because not first root
+    public void Get_Url_Hiding_Top_Level(int nodeId, string niceUrlMatch)
+    {
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
 
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
 
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out var uriUtility);
 
-            var result = urlProvider.GetUrl(nodeId);
-            Assert.AreEqual(niceUrlMatch, result);
-        }
+        var result = urlProvider.GetUrl(nodeId);
+        Assert.AreEqual(niceUrlMatch, result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs
index 8c68aa5c36..3a00616215 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs
@@ -1,336 +1,311 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
-using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class UrlProviderWithoutHideTopLevelNodeFromPathTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class UrlProviderWithoutHideTopLevelNodeFromPathTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private const string CacheKeyPrefix = "NuCache.ContentCache.RouteByContent";
+        base.Setup();
 
-        [SetUp]
-        public override void Setup()
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+    }
+
+    private const string CacheKeyPrefix = "NuCache.ContentCache.RouteByContent";
+
+    private void PopulateCache(string culture = "fr-FR")
+    {
+        var dataTypes = GetDefaultDataTypes();
+        var propertyDataTypes = new Dictionary<string, IDataType>
         {
-            base.Setup();
+            // we only have one data type for this test which will be resolved with string empty.
+            [string.Empty] = dataTypes[0],
+        };
+        var contentType1 = new ContentType(ShortStringHelper, -1);
 
-
-
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-        }
-
-        private void PopulateCache(string culture = "fr-FR")
-        {
-            var dataTypes = GetDefaultDataTypes();
-            var propertyDataTypes = new Dictionary<string, IDataType>
+        var rootData = new ContentDataBuilder()
+            .WithName("Page" + Guid.NewGuid())
+            .WithCultureInfos(new Dictionary<string, CultureVariation>
             {
-                // we only have one data type for this test which will be resolved with string empty.
-                [string.Empty] = dataTypes[0]
-            };
-            var contentType1 = new ContentType(ShortStringHelper, -1);
+                [culture] = new() { Name = "root", IsDraft = true, Date = DateTime.Now, UrlSegment = "root" },
+            })
+            .Build(ShortStringHelper, propertyDataTypes, contentType1, "alias");
 
-            ContentData rootData = new ContentDataBuilder()
-                .WithName("Page" + Guid.NewGuid())
-                .WithCultureInfos(new Dictionary<string, CultureVariation>
-                {
-                    [culture] = new CultureVariation
-                    {
-                        Name = "root",
-                        IsDraft = true,
-                        Date = DateTime.Now,
-                        UrlSegment = "root"
-                    },
-                })
-                .Build(ShortStringHelper, propertyDataTypes, contentType1, "alias");
+        var root = ContentNodeKitBuilder.CreateWithContent(
+            contentType1.Id,
+            9876,
+            "-1,9876",
+            draftData: rootData,
+            publishedData: rootData);
 
-            ContentNodeKit root = ContentNodeKitBuilder.CreateWithContent(
-                contentType1.Id,
-                9876, $"-1,9876",
-                draftData: rootData,
-                publishedData: rootData);
-
-            ContentData parentData = new ContentDataBuilder()
-                .WithName("Page" + Guid.NewGuid())
-                .WithCultureInfos(new Dictionary<string, CultureVariation>
-                {
-                    [culture] = new CultureVariation
-                    {
-                        Name = "home",
-                        IsDraft = true,
-                        Date = DateTime.Now,
-                        UrlSegment = "home"
-                    },
-                })
-                .Build();
-
-            ContentNodeKit parent = ContentNodeKitBuilder.CreateWithContent(
-                contentType1.Id,
-                5432, $"-1,9876,5432",
-                parentContentId: 9876,
-                draftData: parentData,
-                publishedData: parentData);
-
-            ContentData contentData = new ContentDataBuilder()
-                .WithName("Page" + Guid.NewGuid())
-                .WithCultureInfos(new Dictionary<string, CultureVariation>
-                {
-                    [culture] = new CultureVariation
-                    {
-                        Name = "name-fr2",
-                        IsDraft = true,
-                        Date = DateTime.Now,
-                        UrlSegment = "test-fr"
-                    },
-                })
-                .Build();
-
-            ContentNodeKit content = ContentNodeKitBuilder.CreateWithContent(
-                contentType1.Id,
-                1234, $"-1,9876,5432,1234",
-                parentContentId: 5432,
-                draftData: contentData,
-                publishedData: contentData);
-
-            InitializedCache(new[] { root, parent, content }, new[] { contentType1 }, dataTypes: dataTypes);
-        }
-
-        private void SetDomains1()
-        {
-            var domainService = Mock.Get(DomainService);
-
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
-                {
-                    new UmbracoDomain("http://example.us/") {Id = 1, RootContentId = 9876, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://example.fr/") {Id = 2, RootContentId = 9876, LanguageIsoCode = "fr-FR"}
-                });
-        }
-
-        /// <summary>
-        /// This checks that when we retrieve a NiceUrl for multiple items that there are no issues with cache overlap
-        /// and that they are all cached correctly.
-        /// </summary>
-        [Test]
-        public void Ensure_Cache_Is_Correct()
-        {
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = false };
-
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            var samples = new Dictionary<int, string> {
-                { 1046, "/home" },
-                { 1173, "/home/sub1" },
-                { 1174, "/home/sub1/sub2" },
-                { 1176, "/home/sub1/sub-3" },
-                { 1177, "/home/sub1/custom-sub-1" },
-                { 1178, "/home/sub1/custom-sub-2" },
-                { 1175, "/home/sub-2" },
-                { 1172, "/test-page" }
-            };
-
-            foreach (var sample in samples)
+        var parentData = new ContentDataBuilder()
+            .WithName("Page" + Guid.NewGuid())
+            .WithCultureInfos(new Dictionary<string, CultureVariation>
             {
-                var result = urlProvider.GetUrl(sample.Key);
-                Assert.AreEqual(sample.Value, result);
-            }
+                [culture] = new() { Name = "home", IsDraft = true, Date = DateTime.Now, UrlSegment = "home" },
+            })
+            .Build();
 
-            var randomSample = new KeyValuePair<int, string>(1177, "/home/sub1/custom-sub-1");
-            for (int i = 0; i < 5; i++)
+        var parent = ContentNodeKitBuilder.CreateWithContent(
+            contentType1.Id,
+            5432,
+            "-1,9876,5432",
+            parentContentId: 9876,
+            draftData: parentData,
+            publishedData: parentData);
+
+        var contentData = new ContentDataBuilder()
+            .WithName("Page" + Guid.NewGuid())
+            .WithCultureInfos(new Dictionary<string, CultureVariation>
             {
-                var result = urlProvider.GetUrl(randomSample.Key);
-                Assert.AreEqual(randomSample.Value, result);
-            }
+                [culture] = new() { Name = "name-fr2", IsDraft = true, Date = DateTime.Now, UrlSegment = "test-fr" },
+            })
+            .Build();
 
+        var content = ContentNodeKitBuilder.CreateWithContent(
+            contentType1.Id,
+            1234,
+            "-1,9876,5432,1234",
+            parentContentId: 5432,
+            draftData: contentData,
+            publishedData: contentData);
 
-            var cache = (FastDictionaryAppCache)umbracoContext.PublishedSnapshot.ElementsCache;
-            var cachedRoutes = cache.Keys.Where(x => x.StartsWith(CacheKeyPrefix)).ToList();
-            Assert.AreEqual(8, cachedRoutes.Count);
+        InitializedCache(new[] { root, parent, content }, new[] { contentType1 }, dataTypes);
+    }
 
-            foreach (var sample in samples)
+    private void SetDomains1()
+    {
+        var domainService = Mock.Get(DomainService);
+
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
             {
-                var cacheKey = $"{CacheKeyPrefix}[P:{sample.Key}]";
-                var found = (string)cache.Get(cacheKey);
-                Assert.IsNotNull(found);
-                Assert.AreEqual(sample.Value, found);
-            }
+                new UmbracoDomain("http://example.us/") { Id = 1, RootContentId = 9876, LanguageIsoCode = "en-US" },
+                new UmbracoDomain("http://example.fr/") { Id = 2, RootContentId = 9876, LanguageIsoCode = "fr-FR" },
+            });
+    }
+
+    /// <summary>
+    ///     This checks that when we retrieve a NiceUrl for multiple items that there are no issues with cache overlap
+    ///     and that they are all cached correctly.
+    /// </summary>
+    [Test]
+    public void Ensure_Cache_Is_Correct()
+    {
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = false };
+
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var samples = new Dictionary<int, string>
+        {
+            { 1046, "/home" },
+            { 1173, "/home/sub1" },
+            { 1174, "/home/sub1/sub2" },
+            { 1176, "/home/sub1/sub-3" },
+            { 1177, "/home/sub1/custom-sub-1" },
+            { 1178, "/home/sub1/custom-sub-2" },
+            { 1175, "/home/sub-2" },
+            { 1172, "/test-page" },
+        };
+
+        foreach (var sample in samples)
+        {
+            var result = urlProvider.GetUrl(sample.Key);
+            Assert.AreEqual(sample.Value, result);
         }
 
-        [TestCase(1046, "/home/")]
-        [TestCase(1173, "/home/sub1/")]
-        [TestCase(1174, "/home/sub1/sub2/")]
-        [TestCase(1176, "/home/sub1/sub-3/")]
-        [TestCase(1177, "/home/sub1/custom-sub-1/")]
-        [TestCase(1178, "/home/sub1/custom-sub-2/")]
-        [TestCase(1175, "/home/sub-2/")]
-        [TestCase(1172, "/test-page/")]
-        public void Get_Url_Not_Hiding_Top_Level(int nodeId, string niceUrlMatch)
+        var randomSample = new KeyValuePair<int, string>(1177, "/home/sub1/custom-sub-1");
+        for (var i = 0; i < 5; i++)
         {
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            var result = urlProvider.GetUrl(nodeId);
-            Assert.AreEqual(niceUrlMatch, result);
+            var result = urlProvider.GetUrl(randomSample.Key);
+            Assert.AreEqual(randomSample.Value, result);
         }
 
-        [Test]
-        [TestCase("fr-FR", ExpectedResult = "#")] // Non default cultures cannot return urls
-        [TestCase("en-US", ExpectedResult = "/root/home/test-fr/")] // Default culture can return urls
-        public string Get_Url_For_Culture_Variant_Without_Domains_Non_Current_Url(string culture)
+        var cache = (FastDictionaryAppCache)umbracoContext.PublishedSnapshot.ElementsCache;
+        var cachedRoutes = cache.Keys.Where(x => x.StartsWith(CacheKeyPrefix)).ToList();
+        Assert.AreEqual(8, cachedRoutes.Count);
+
+        foreach (var sample in samples)
         {
-            const string currentUri = "http://example.us/test";
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-
-            PopulateCache(culture);
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor(currentUri);
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-
-            //even though we are asking for a specific culture URL, there are no domains assigned so all that can be returned is a normal relative URL.
-            var url = urlProvider.GetUrl(1234, culture: culture);
-
-            return url;
-        }
-
-        /// <summary>
-        /// This tests DefaultUrlProvider.GetUrl with a specific culture when the current URL is the culture specific domain
-        /// </summary>
-        [Test]
-        public void Get_Url_For_Culture_Variant_With_Current_Url()
-        {
-            const string currentUri = "http://example.fr/test";
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-
-            PopulateCache();
-
-            SetDomains1();
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor(currentUri);
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            var url = urlProvider.GetUrl(1234, culture: "fr-FR");
-
-            Assert.AreEqual("/home/test-fr/", url);
-        }
-
-        /// <summary>
-        /// This tests DefaultUrlProvider.GetUrl with a specific culture when the current URL is not the culture specific domain
-        /// </summary>
-        [Test]
-        public void Get_Url_For_Culture_Variant_Non_Current_Url()
-        {
-            const string currentUri = "http://example.us/test";
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-
-            PopulateCache();
-
-            SetDomains1();
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor(currentUri);
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-            var url = urlProvider.GetUrl(1234, culture: "fr-FR");
-
-            //the current uri is not the culture specific domain we want, so the result is an absolute path to the culture specific domain
-            Assert.AreEqual("http://example.fr/home/test-fr/", url);
-        }
-
-        [Test]
-        public void Get_Url_Relative_Or_Absolute()
-        {
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("http://example.com/test");
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            Assert.AreEqual("/home/sub1/custom-sub-1/", urlProvider.GetUrl(1177));
-
-            urlProvider.Mode = UrlMode.Absolute;
-            Assert.AreEqual("http://example.com/home/sub1/custom-sub-1/", urlProvider.GetUrl(1177));
-        }
-
-        [Test]
-        public void Get_Url_Unpublished()
-        {
-            var requestHandlerSettings = new RequestHandlerSettings();
-
-            string xml = PublishedContentXml.BaseWebTestXml(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("http://example.com/test");
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            //mock the Umbraco settings that we need
-
-            Assert.AreEqual("#", urlProvider.GetUrl(999999));
-
-            urlProvider.Mode = UrlMode.Absolute;
-
-            Assert.AreEqual("#", urlProvider.GetUrl(999999));
+            var cacheKey = $"{CacheKeyPrefix}[P:{sample.Key}]";
+            var found = (string)cache.Get(cacheKey);
+            Assert.IsNotNull(found);
+            Assert.AreEqual(sample.Value, found);
         }
     }
+
+    [TestCase(1046, "/home/")]
+    [TestCase(1173, "/home/sub1/")]
+    [TestCase(1174, "/home/sub1/sub2/")]
+    [TestCase(1176, "/home/sub1/sub-3/")]
+    [TestCase(1177, "/home/sub1/custom-sub-1/")]
+    [TestCase(1178, "/home/sub1/custom-sub-2/")]
+    [TestCase(1175, "/home/sub-2/")]
+    [TestCase(1172, "/test-page/")]
+    public void Get_Url_Not_Hiding_Top_Level(int nodeId, string niceUrlMatch)
+    {
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var result = urlProvider.GetUrl(nodeId);
+        Assert.AreEqual(niceUrlMatch, result);
+    }
+
+    [Test]
+    [TestCase("fr-FR", ExpectedResult = "#")] // Non default cultures cannot return urls
+    [TestCase("en-US", ExpectedResult = "/root/home/test-fr/")] // Default culture can return urls
+    public string Get_Url_For_Culture_Variant_Without_Domains_Non_Current_Url(string culture)
+    {
+        const string currentUri = "http://example.us/test";
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+
+        PopulateCache(culture);
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor(currentUri);
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        // even though we are asking for a specific culture URL, there are no domains assigned so all that can be returned is a normal relative URL.
+        var url = urlProvider.GetUrl(1234, culture: culture);
+
+        return url;
+    }
+
+    /// <summary>
+    ///     This tests DefaultUrlProvider.GetUrl with a specific culture when the current URL is the culture specific domain
+    /// </summary>
+    [Test]
+    public void Get_Url_For_Culture_Variant_With_Current_Url()
+    {
+        const string currentUri = "http://example.fr/test";
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+
+        PopulateCache();
+
+        SetDomains1();
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor(currentUri);
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var url = urlProvider.GetUrl(1234, culture: "fr-FR");
+
+        Assert.AreEqual("/home/test-fr/", url);
+    }
+
+    /// <summary>
+    ///     This tests DefaultUrlProvider.GetUrl with a specific culture when the current URL is not the culture specific
+    ///     domain
+    /// </summary>
+    [Test]
+    public void Get_Url_For_Culture_Variant_Non_Current_Url()
+    {
+        const string currentUri = "http://example.us/test";
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+
+        PopulateCache();
+
+        SetDomains1();
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor(currentUri);
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+        var url = urlProvider.GetUrl(1234, culture: "fr-FR");
+
+        // the current uri is not the culture specific domain we want, so the result is an absolute path to the culture specific domain
+        Assert.AreEqual("http://example.fr/home/test-fr/", url);
+    }
+
+    [Test]
+    public void Get_Url_Relative_Or_Absolute()
+    {
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("http://example.com/test");
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        Assert.AreEqual("/home/sub1/custom-sub-1/", urlProvider.GetUrl(1177));
+
+        urlProvider.Mode = UrlMode.Absolute;
+        Assert.AreEqual("http://example.com/home/sub1/custom-sub-1/", urlProvider.GetUrl(1177));
+    }
+
+    [Test]
+    public void Get_Url_Unpublished()
+    {
+        var requestHandlerSettings = new RequestHandlerSettings();
+
+        var xml = PublishedContentXml.BaseWebTestXml(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("http://example.com/test");
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        // mock the Umbraco settings that we need
+        Assert.AreEqual("#", urlProvider.GetUrl(999999));
+
+        urlProvider.Mode = UrlMode.Absolute;
+
+        Assert.AreEqual("#", urlProvider.GetUrl(999999));
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlRoutingTestBase.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlRoutingTestBase.cs
index 65eea64f75..ee4c32d58d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlRoutingTestBase.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlRoutingTestBase.cs
@@ -8,138 +8,195 @@ using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public abstract class UrlRoutingTestBase : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public abstract class UrlRoutingTestBase : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        base.Setup();
 
-            string xml = GetXmlContent(1234);
+        var xml = GetXmlContent(1234);
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
+        InitializedCache(kits, contentTypes, dataTypes);
+    }
 
-        }
+    // Sets up the mock domain service
+    protected override ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes, IDataType[] dataTypes)
+    {
+        var serviceContext = base.CreateServiceContext(contentTypes, mediaTypes, dataTypes);
 
-        // Sets up the mock domain service
-        protected override ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes, IDataType[] dataTypes)
-        {
-            var serviceContext = base.CreateServiceContext(contentTypes, mediaTypes, dataTypes);
-
-            //setup mock domain service
-            var domainService = Mock.Get(serviceContext.DomainService);
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        // setup mock domain service
+        var domainService = Mock.Get(serviceContext.DomainService);
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("domain1.com/")
                 {
-                    new UmbracoDomain("domain1.com/"){Id = 1, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE"},
-                    new UmbracoDomain("domain1.com/en"){Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("domain1.com/fr"){Id = 3, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"}
-                });
+                    Id = 1, LanguageId = LangDeId, RootContentId = 1001, LanguageIsoCode = "de-DE",
+                },
+                new UmbracoDomain("domain1.com/en")
+                {
+                    Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("domain1.com/fr")
+                {
+                    Id = 3, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+            });
 
-            return serviceContext;
-        }
+        return serviceContext;
+    }
 
-        protected virtual string GetXmlContent(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    protected virtual string GetXmlContent(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Doc ANY>
 <!ATTLIST Doc id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
+    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
         <content><![CDATA[]]></content>
         <umbracoUrlAlias><![CDATA[this/is/my/alias, anotheralias]]></umbracoUrlAlias>
-        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
+        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[page2/alias, 2ndpagealias, en/flux, endanger]]></umbracoUrlAlias>
-            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
+            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[only/one/alias, entropy, bar/foo, en/bar/nil]]></umbracoUrlAlias>
             </Doc>
-            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
+            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
+                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
+                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
+        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
             <umbracoUrlAlias><![CDATA[alias42]]></umbracoUrlAlias>
-            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
+            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
                 <content><![CDATA[]]></content>
                 <umbracoUrlAlias><![CDATA[alias43]]></umbracoUrlAlias>
             </Doc>
-            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
+            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
+                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
+                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
+        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
             <umbracoUrlAlias><![CDATA[alias42]]></umbracoUrlAlias>
         </Doc>
     </Doc>
-    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
+    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
     </Doc>
-    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
+    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
         <content><![CDATA[]]></content>
-        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
+        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
+            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
+            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
+                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
+                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
+        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
+            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
+            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""0"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
+                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""0"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
+                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
+        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
         </Doc>
     </Doc>
 </root>";
 
-        public const int LangDeId = 333;
-        public const int LangEngId = 334;
-        public const int LangFrId = 335;
-        public const int LangCzId = 336;
-        public const int LangNlId = 337;
-        public const int LangDkId = 338;
-    }
+    public const int LangDeId = 333;
+    public const int LangEngId = 334;
+    public const int LangFrId = 335;
+    public const int LangCzId = 336;
+    public const int LangNlId = 337;
+    public const int LangDkId = 338;
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsProviderWithDomainsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsProviderWithDomainsTests.cs
index 28c8dd7194..eecbd38963 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsProviderWithDomainsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsProviderWithDomainsTests.cs
@@ -1,394 +1,484 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Routing;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Web;
-using Umbraco.Cms.Tests.Common;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class UrlsProviderWithDomainsTests : UrlRoutingTestBase
 {
-    [TestFixture]
-    public class UrlsProviderWithDomainsTests : UrlRoutingTestBase
+    private const string CacheKeyPrefix = "NuCache.ContentCache.RouteByContent";
+
+    private void SetDomains1()
     {
-        private const string CacheKeyPrefix = "NuCache.ContentCache.RouteByContent";
+        var domainService = Mock.Get(DomainService);
 
-        private void SetDomains1()
-        {
-            var domainService = Mock.Get(DomainService);
-
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("domain1.com")
                 {
-                    new UmbracoDomain("domain1.com") {Id = 1, LanguageId = LangFrId, RootContentId = 1001, LanguageIsoCode = "fr-FR"}
-                });
-        }
+                    Id = 1, LanguageId = LangFrId, RootContentId = 1001, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
 
-        private void SetDomains2()
-        {
-            var domainService = Mock.Get(DomainService);
+    private void SetDomains2()
+    {
+        var domainService = Mock.Get(DomainService);
 
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("http://domain1.com/foo")
                 {
-                    new UmbracoDomain("http://domain1.com/foo") {Id = 1, LanguageId = LangFrId, RootContentId = 1001, LanguageIsoCode = "fr-FR"}
-                });
-        }
+                    Id = 1, LanguageId = LangFrId, RootContentId = 1001, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
 
-        private void SetDomains3()
-        {
-            var domainService = Mock.Get(DomainService);
+    private void SetDomains3()
+    {
+        var domainService = Mock.Get(DomainService);
 
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("http://domain1.com/")
                 {
-                    new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangFrId, RootContentId = 10011, LanguageIsoCode = "fr-FR"}
-                });
-        }
+                    Id = 1, LanguageId = LangFrId, RootContentId = 10011, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
 
-        private void SetDomains4()
-        {
-            var domainService = Mock.Get(DomainService);
+    private void SetDomains4()
+    {
+        var domainService = Mock.Get(DomainService);
 
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("http://domain1.com/")
                 {
-                    new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain1.com/en") {Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain1.com/fr") {Id = 3, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
-                    new UmbracoDomain("http://domain3.com/") {Id = 4, LanguageId = LangEngId, RootContentId = 1003, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain3.com/en") {Id = 5, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain3.com/fr") {Id = 6, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR"}
-                });
-        }
-
-        private void SetDomains5()
-        {
-            var domainService = Mock.Get(DomainService);
-
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+                    Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain1.com/en")
                 {
-                    new UmbracoDomain("http://domain1.com/en") {Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain1a.com/en") {Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain1b.com/en") {Id = 3, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain1.com/fr") {Id = 4, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
-                    new UmbracoDomain("http://domain1a.com/fr") {Id = 5, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
-                    new UmbracoDomain("http://domain1b.com/fr") {Id = 6, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR"},
-                    new UmbracoDomain("http://domain3.com/en") {Id = 7, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain3.com/fr") {Id = 8, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR"}
-                });
-        }
+                    Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain1.com/fr")
+                {
+                    Id = 3, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+                new UmbracoDomain("http://domain3.com/")
+                {
+                    Id = 4, LanguageId = LangEngId, RootContentId = 1003, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain3.com/en")
+                {
+                    Id = 5, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain3.com/fr")
+                {
+                    Id = 6, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
 
-        protected override string GetXmlContent(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    private void SetDomains5()
+    {
+        var domainService = Mock.Get(DomainService);
+
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("http://domain1.com/en")
+                {
+                    Id = 1, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain1a.com/en")
+                {
+                    Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain1b.com/en")
+                {
+                    Id = 3, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain1.com/fr")
+                {
+                    Id = 4, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+                new UmbracoDomain("http://domain1a.com/fr")
+                {
+                    Id = 5, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+                new UmbracoDomain("http://domain1b.com/fr")
+                {
+                    Id = 6, LanguageId = LangFrId, RootContentId = 10012, LanguageIsoCode = "fr-FR",
+                },
+                new UmbracoDomain("http://domain3.com/en")
+                {
+                    Id = 7, LanguageId = LangEngId, RootContentId = 10031, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain3.com/fr")
+                {
+                    Id = 8, LanguageId = LangFrId, RootContentId = 10032, LanguageIsoCode = "fr-FR",
+                },
+            });
+    }
+
+    protected override string GetXmlContent(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Doc ANY>
 <!ATTLIST Doc id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
+    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
         <content><![CDATA[]]></content>
-        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
+        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
+            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
+            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
+                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
+                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
+        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
+            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
+            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
+                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
+                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
+        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
         </Doc>
     </Doc>
-    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
+    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
     </Doc>
-    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
+    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
         <content><![CDATA[]]></content>
-        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
+        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
+            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
+            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
+                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
+                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
+        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
+            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
+            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
+                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
+                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
+        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
         </Doc>
     </Doc>
 </root>";
 
-        // with one simple domain "domain1.com"
-        // basic tests
-        [TestCase(1001, "http://domain1.com", false, "/")]
-        [TestCase(10011, "http://domain1.com", false, "/1001-1/")]
-        [TestCase(1002, "http://domain1.com", false, "/1002/")]
-        // absolute tests
-        [TestCase(1001, "http://domain1.com", true, "http://domain1.com/")]
-        [TestCase(10011, "http://domain1.com", true, "http://domain1.com/1001-1/")]
-        // different current tests
-        [TestCase(1001, "http://domain2.com", false, "http://domain1.com/")]
-        [TestCase(10011, "http://domain2.com", false, "http://domain1.com/1001-1/")]
-        [TestCase(1001, "https://domain1.com", false, "/")]
-        [TestCase(10011, "https://domain1.com", false, "/1001-1/")]
-        public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
+    // with one simple domain "domain1.com"
+    // basic tests
+    [TestCase(1001, "http://domain1.com", false, "/")]
+    [TestCase(10011, "http://domain1.com", false, "/1001-1/")]
+    [TestCase(1002, "http://domain1.com", false, "/1002/")]
+
+    // absolute tests
+    [TestCase(1001, "http://domain1.com", true, "http://domain1.com/")]
+    [TestCase(10011, "http://domain1.com", true, "http://domain1.com/1001-1/")]
+
+    // different current tests
+    [TestCase(1001, "http://domain2.com", false, "http://domain1.com/")]
+    [TestCase(10011, "http://domain2.com", false, "http://domain1.com/1001-1/")]
+    [TestCase(1001, "https://domain1.com", false, "/")]
+    [TestCase(10011, "https://domain1.com", false, "/1001-1/")]
+    public void Get_Url_SimpleDomain(int nodeId, string currentUrl, bool absolute, string expected)
+    {
+        SetDomains1();
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var currentUri = new Uri(currentUrl);
+        var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
+        var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
+        Assert.AreEqual(expected, result);
+    }
+
+    // with one complete domain "http://domain1.com/foo"
+    // basic tests
+    [TestCase(1001, "http://domain1.com", false, "/foo/")]
+    [TestCase(10011, "http://domain1.com", false, "/foo/1001-1/")]
+    [TestCase(1002, "http://domain1.com", false, "/1002/")]
+
+    // absolute tests
+    [TestCase(1001, "http://domain1.com", true, "http://domain1.com/foo/")]
+    [TestCase(10011, "http://domain1.com", true, "http://domain1.com/foo/1001-1/")]
+
+    // different current tests
+    [TestCase(1001, "http://domain2.com", false, "http://domain1.com/foo/")]
+    [TestCase(10011, "http://domain2.com", false, "http://domain1.com/foo/1001-1/")]
+    [TestCase(1001, "https://domain1.com", false, "http://domain1.com/foo/")]
+    [TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
+    public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
+    {
+        SetDomains2();
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var currentUri = new Uri(currentUrl);
+        var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
+        var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
+        Assert.AreEqual(expected, result);
+    }
+
+    // with one domain, not at root
+    [TestCase(1001, "http://domain1.com", false, "/1001/")]
+    [TestCase(10011, "http://domain1.com", false, "/")]
+    [TestCase(100111, "http://domain1.com", false, "/1001-1-1/")]
+    [TestCase(1002, "http://domain1.com", false, "/1002/")]
+    public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
+    {
+        SetDomains3();
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var currentUri = new Uri(currentUrl);
+        var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
+        var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
+        Assert.AreEqual(expected, result);
+    }
+
+    // with nested domains
+    [TestCase(1001, "http://domain1.com", false, "/")]
+    [TestCase(10011, "http://domain1.com", false, "/en/")]
+    [TestCase(100111, "http://domain1.com", false, "/en/1001-1-1/")]
+    [TestCase(10012, "http://domain1.com", false, "/fr/")]
+    [TestCase(100121, "http://domain1.com", false, "/fr/1001-2-1/")]
+    [TestCase(10013, "http://domain1.com", false, "/1001-3/")]
+    [TestCase(1002, "http://domain1.com", false, "/1002/")]
+    [TestCase(1003, "http://domain3.com", false, "/")]
+    [TestCase(10031, "http://domain3.com", false, "/en/")]
+    [TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
+    public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
+    {
+        SetDomains4();
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var currentUri = new Uri(currentUrl);
+        var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
+        var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
+        Assert.AreEqual(expected, result);
+    }
+
+    [Test]
+    public void Get_Url_DomainsAndCache()
+    {
+        SetDomains4();
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        urlProvider.GetUrl(1001, UrlMode.Auto, current: new Uri("http://domain1.com"));
+        urlProvider.GetUrl(10011, UrlMode.Auto, current: new Uri("http://domain1.com"));
+        urlProvider.GetUrl(100111, UrlMode.Auto, current: new Uri("http://domain1.com"));
+        urlProvider.GetUrl(10012, UrlMode.Auto, current: new Uri("http://domain1.com"));
+        urlProvider.GetUrl(100121, UrlMode.Auto, current: new Uri("http://domain1.com"));
+        urlProvider.GetUrl(10013, UrlMode.Auto, current: new Uri("http://domain1.com"));
+        urlProvider.GetUrl(1002, UrlMode.Auto, current: new Uri("http://domain1.com"));
+        urlProvider.GetUrl(1001, UrlMode.Auto, current: new Uri("http://domain2.com"));
+        urlProvider.GetUrl(10011, UrlMode.Auto, current: new Uri("http://domain2.com"));
+        urlProvider.GetUrl(100111, UrlMode.Auto, current: new Uri("http://domain2.com"));
+        urlProvider.GetUrl(1002, UrlMode.Auto, current: new Uri("http://domain2.com"));
+
+        var cache = (FastDictionaryAppCache)umbracoContext.PublishedSnapshot.ElementsCache;
+        var cachedRoutes = cache.Keys.Where(x => x.StartsWith(CacheKeyPrefix)).ToList();
+        Assert.AreEqual(7, cachedRoutes.Count);
+
+        // var cachedIds = cache.RoutesCache.GetCachedIds();
+        // Assert.AreEqual(0, cachedIds.Count);
+        CheckRoute(cache, 1001, "1001/");
+        CheckRoute(cache, 10011, "10011/");
+        CheckRoute(cache, 100111, "10011/1001-1-1");
+        CheckRoute(cache, 10012, "10012/");
+        CheckRoute(cache, 100121, "10012/1001-2-1");
+        CheckRoute(cache, 10013, "1001/1001-3");
+        CheckRoute(cache, 1002, "/1002");
+
+        // use the cache
+        Assert.AreEqual("/", urlProvider.GetUrl(1001, UrlMode.Auto, current: new Uri("http://domain1.com")));
+        Assert.AreEqual("/en/", urlProvider.GetUrl(10011, UrlMode.Auto, current: new Uri("http://domain1.com")));
+        Assert.AreEqual("/en/1001-1-1/", urlProvider.GetUrl(100111, UrlMode.Auto, current: new Uri("http://domain1.com")));
+        Assert.AreEqual("/fr/", urlProvider.GetUrl(10012, UrlMode.Auto, current: new Uri("http://domain1.com")));
+        Assert.AreEqual("/fr/1001-2-1/", urlProvider.GetUrl(100121, UrlMode.Auto, current: new Uri("http://domain1.com")));
+        Assert.AreEqual("/1001-3/", urlProvider.GetUrl(10013, UrlMode.Auto, current: new Uri("http://domain1.com")));
+        Assert.AreEqual("/1002/", urlProvider.GetUrl(1002, UrlMode.Auto, current: new Uri("http://domain1.com")));
+
+        Assert.AreEqual("http://domain1.com/fr/1001-2-1/", urlProvider.GetUrl(100121, UrlMode.Auto, current: new Uri("http://domain2.com")));
+    }
+
+    private static void CheckRoute(FastDictionaryAppCache routes, int id, string route)
+    {
+        var cacheKey = $"{CacheKeyPrefix}[P:{id}]";
+        var found = (string)routes.Get(cacheKey);
+        Assert.IsNotNull(found);
+        Assert.AreEqual(route, found);
+    }
+
+    [Test]
+    public void Get_Url_Relative_Or_Absolute()
+    {
+        SetDomains4();
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("http://domain1.com/test");
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        Assert.AreEqual("/en/1001-1-1/", urlProvider.GetUrl(100111));
+        Assert.AreEqual("http://domain3.com/en/1003-1-1/", urlProvider.GetUrl(100311));
+
+        urlProvider.Mode = UrlMode.Absolute;
+
+        Assert.AreEqual("http://domain1.com/en/1001-1-1/", urlProvider.GetUrl(100111));
+        Assert.AreEqual("http://domain3.com/en/1003-1-1/", urlProvider.GetUrl(100311));
+    }
+
+    [Test]
+    public void Get_Url_Alternate()
+    {
+        SetDomains5();
+
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var umbracoContextAccessor = GetUmbracoContextAccessor("http://domain1.com/en/test");
+        var urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out _);
+
+        var url = urlProvider.GetUrl(100111, UrlMode.Absolute);
+        Assert.AreEqual("http://domain1.com/en/1001-1-1/", url);
+
+        var result = urlProvider.GetOtherUrls(100111).ToArray();
+
+        foreach (var x in result)
         {
-            SetDomains1();
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            var currentUri = new Uri(currentUrl);
-            var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
-            var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
-            Assert.AreEqual(expected, result);
-        }
-
-        // with one complete domain "http://domain1.com/foo"
-        // basic tests
-        [TestCase(1001, "http://domain1.com", false, "/foo/")]
-        [TestCase(10011, "http://domain1.com", false, "/foo/1001-1/")]
-        [TestCase(1002, "http://domain1.com", false, "/1002/")]
-        // absolute tests
-        [TestCase(1001, "http://domain1.com", true, "http://domain1.com/foo/")]
-        [TestCase(10011, "http://domain1.com", true, "http://domain1.com/foo/1001-1/")]
-        // different current tests
-        [TestCase(1001, "http://domain2.com", false, "http://domain1.com/foo/")]
-        [TestCase(10011, "http://domain2.com", false, "http://domain1.com/foo/1001-1/")]
-        [TestCase(1001, "https://domain1.com", false, "http://domain1.com/foo/")]
-        [TestCase(10011, "https://domain1.com", false, "http://domain1.com/foo/1001-1/")]
-        public void Get_Url_SimpleWithSchemeAndPath(int nodeId, string currentUrl, bool absolute, string expected)
-        {
-            SetDomains2();
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            var currentUri = new Uri(currentUrl);
-            var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
-            var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
-            Assert.AreEqual(expected, result);
-        }
-
-        // with one domain, not at root
-        [TestCase(1001, "http://domain1.com", false, "/1001/")]
-        [TestCase(10011, "http://domain1.com", false, "/")]
-        [TestCase(100111, "http://domain1.com", false, "/1001-1-1/")]
-        [TestCase(1002, "http://domain1.com", false, "/1002/")]
-        public void Get_Url_DeepDomain(int nodeId, string currentUrl, bool absolute, string expected)
-        {
-            SetDomains3();
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-            var currentUri = new Uri(currentUrl);
-            var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
-            var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
-            Assert.AreEqual(expected, result);
-        }
-
-        // with nested domains
-        [TestCase(1001, "http://domain1.com", false, "/")]
-        [TestCase(10011, "http://domain1.com", false, "/en/")]
-        [TestCase(100111, "http://domain1.com", false, "/en/1001-1-1/")]
-        [TestCase(10012, "http://domain1.com", false, "/fr/")]
-        [TestCase(100121, "http://domain1.com", false, "/fr/1001-2-1/")]
-        [TestCase(10013, "http://domain1.com", false, "/1001-3/")]
-        [TestCase(1002, "http://domain1.com", false, "/1002/")]
-        [TestCase(1003, "http://domain3.com", false, "/")]
-        [TestCase(10031, "http://domain3.com", false, "/en/")]
-        [TestCase(100321, "http://domain3.com", false, "/fr/1003-2-1/")]
-        public void Get_Url_NestedDomains(int nodeId, string currentUrl, bool absolute, string expected)
-        {
-            SetDomains4();
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
-
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-
-            var currentUri = new Uri(currentUrl);
-            var mode = absolute ? UrlMode.Absolute : UrlMode.Auto;
-            var result = urlProvider.GetUrl(nodeId, mode, current: currentUri);
-            Assert.AreEqual(expected, result);
-        }
-
-        [Test]
-        public void Get_Url_DomainsAndCache()
-        {
-            SetDomains4();
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("/test");
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-
-
-            string ignore;
-            ignore = urlProvider.GetUrl(1001, UrlMode.Auto, current: new Uri("http://domain1.com"));
-            ignore = urlProvider.GetUrl(10011, UrlMode.Auto, current: new Uri("http://domain1.com"));
-            ignore = urlProvider.GetUrl(100111, UrlMode.Auto, current: new Uri("http://domain1.com"));
-            ignore = urlProvider.GetUrl(10012, UrlMode.Auto, current: new Uri("http://domain1.com"));
-            ignore = urlProvider.GetUrl(100121, UrlMode.Auto, current: new Uri("http://domain1.com"));
-            ignore = urlProvider.GetUrl(10013, UrlMode.Auto, current: new Uri("http://domain1.com"));
-            ignore = urlProvider.GetUrl(1002, UrlMode.Auto, current: new Uri("http://domain1.com"));
-            ignore = urlProvider.GetUrl(1001, UrlMode.Auto, current: new Uri("http://domain2.com"));
-            ignore = urlProvider.GetUrl(10011, UrlMode.Auto, current: new Uri("http://domain2.com"));
-            ignore = urlProvider.GetUrl(100111, UrlMode.Auto, current: new Uri("http://domain2.com"));
-            ignore = urlProvider.GetUrl(1002, UrlMode.Auto, current: new Uri("http://domain2.com"));
-
-
-            var cache = (FastDictionaryAppCache)umbracoContext.PublishedSnapshot.ElementsCache;
-            var cachedRoutes = cache.Keys.Where(x => x.StartsWith(CacheKeyPrefix)).ToList();
-            Assert.AreEqual(7, cachedRoutes.Count);
-
-            //var cachedIds = cache.RoutesCache.GetCachedIds();
-            //Assert.AreEqual(0, cachedIds.Count);
-
-            CheckRoute(cache, 1001, "1001/");
-            CheckRoute(cache, 10011, "10011/");
-            CheckRoute(cache, 100111, "10011/1001-1-1");
-            CheckRoute(cache, 10012, "10012/");
-            CheckRoute(cache, 100121, "10012/1001-2-1");
-            CheckRoute(cache, 10013, "1001/1001-3");
-            CheckRoute(cache, 1002, "/1002");
-
-            // use the cache
-            Assert.AreEqual("/", urlProvider.GetUrl(1001, UrlMode.Auto, current: new Uri("http://domain1.com")));
-            Assert.AreEqual("/en/", urlProvider.GetUrl(10011, UrlMode.Auto, current: new Uri("http://domain1.com")));
-            Assert.AreEqual("/en/1001-1-1/", urlProvider.GetUrl(100111, UrlMode.Auto, current: new Uri("http://domain1.com")));
-            Assert.AreEqual("/fr/", urlProvider.GetUrl(10012, UrlMode.Auto, current: new Uri("http://domain1.com")));
-            Assert.AreEqual("/fr/1001-2-1/", urlProvider.GetUrl(100121, UrlMode.Auto, current: new Uri("http://domain1.com")));
-            Assert.AreEqual("/1001-3/", urlProvider.GetUrl(10013, UrlMode.Auto, current: new Uri("http://domain1.com")));
-            Assert.AreEqual("/1002/", urlProvider.GetUrl(1002, UrlMode.Auto, current: new Uri("http://domain1.com")));
-
-            Assert.AreEqual("http://domain1.com/fr/1001-2-1/", urlProvider.GetUrl(100121, UrlMode.Auto, current: new Uri("http://domain2.com")));
-        }
-
-        private static void CheckRoute(FastDictionaryAppCache routes, int id, string route)
-        {
-            var cacheKey = $"{CacheKeyPrefix}[P:{id}]";
-            var found = (string)routes.Get(cacheKey);
-            Assert.IsNotNull(found);
-            Assert.AreEqual(route, found);
-        }
-
-        [Test]
-        public void Get_Url_Relative_Or_Absolute()
-        {
-            SetDomains4();
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("http://domain1.com/test");
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-
-            Assert.AreEqual("/en/1001-1-1/", urlProvider.GetUrl(100111));
-            Assert.AreEqual("http://domain3.com/en/1003-1-1/", urlProvider.GetUrl(100311));
-
-            urlProvider.Mode = UrlMode.Absolute;
-
-            Assert.AreEqual("http://domain1.com/en/1001-1-1/", urlProvider.GetUrl(100111));
-            Assert.AreEqual("http://domain3.com/en/1003-1-1/", urlProvider.GetUrl(100311));
-        }
-
-        [Test]
-        public void Get_Url_Alternate()
-        {
-            SetDomains5();
-
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            var umbracoContextAccessor = GetUmbracoContextAccessor("http://domain1.com/en/test");
-            UrlProvider urlProvider = GetUrlProvider(umbracoContextAccessor, requestHandlerSettings, new WebRoutingSettings(), out UriUtility uriUtility);
-
-
-            var url = urlProvider.GetUrl(100111, UrlMode.Absolute);
-            Assert.AreEqual("http://domain1.com/en/1001-1-1/", url);
-
-            var result = urlProvider.GetOtherUrls(100111).ToArray();
-
-            foreach (var x in result)
-                Console.WriteLine(x);
-
-            Assert.AreEqual(2, result.Length);
-            Assert.AreEqual(result[0].Text, "http://domain1b.com/en/1001-1-1/");
-            Assert.AreEqual(result[1].Text, "http://domain1a.com/en/1001-1-1/");
+            Console.WriteLine(x);
         }
 
+        Assert.AreEqual(2, result.Length);
+        Assert.AreEqual(result[0].Text, "http://domain1b.com/en/1001-1-1/");
+        Assert.AreEqual(result[1].Text, "http://domain1a.com/en/1001-1-1/");
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsWithNestedDomains.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsWithNestedDomains.cs
index 15397b7dfe..41c485e732 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsWithNestedDomains.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/UrlsWithNestedDomains.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -11,187 +10,232 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class UrlsWithNestedDomains : UrlRoutingTestBase
 {
-    [TestFixture]
-    public class UrlsWithNestedDomains : UrlRoutingTestBase
+    // in the case of nested domains more than 1 URL may resolve to a document
+    // but only one route can be cached - the 'canonical' route ie the route
+    // using the closest domain to the node - here we test that if we request
+    // a non-canonical route, it is not cached / the cache is not polluted
+    [Test]
+    public async Task DoNotPolluteCache()
     {
-        // in the case of nested domains more than 1 URL may resolve to a document
-        // but only one route can be cached - the 'canonical' route ie the route
-        // using the closest domain to the node - here we test that if we request
-        // a non-canonical route, it is not cached / the cache is not polluted
+        var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
+        GlobalSettings.HideTopLevelNodeFromPath = false;
 
-        [Test]
-        public async Task DoNotPolluteCache()
-        {
-            var requestHandlerSettings = new RequestHandlerSettings { AddTrailingSlash = true };
-            GlobalSettings.HideTopLevelNodeFromPath = false;
+        SetDomains1();
 
-            SetDomains1();
+        const string url = "http://domain1.com/1001-1/1001-1-1";
 
-            const string url = "http://domain1.com/1001-1/1001-1-1";
+        // get the nice URL for 100111
+        var umbracoContextAccessor = GetUmbracoContextAccessor(url);
+        var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
 
-            // get the nice URL for 100111
-            var umbracoContextAccessor = GetUmbracoContextAccessor(url);
-            var umbracoContext = umbracoContextAccessor.GetRequiredUmbracoContext();
+        var urlProvider = new DefaultUrlProvider(
+            Mock.Of<IOptionsMonitor<RequestHandlerSettings>>(x => x.CurrentValue == requestHandlerSettings),
+            Mock.Of<ILogger<DefaultUrlProvider>>(),
+            new SiteDomainMapper(),
+            umbracoContextAccessor,
+            new UriUtility(Mock.Of<IHostingEnvironment>()),
+            Mock.Of<ILocalizationService>());
+        var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
 
-            var urlProvider = new DefaultUrlProvider(
-                Mock.Of<IOptionsMonitor<RequestHandlerSettings>>(x=>x.CurrentValue == requestHandlerSettings),
-                Mock.Of<ILogger<DefaultUrlProvider>>(),
-                new SiteDomainMapper(),
-                umbracoContextAccessor,
-                new UriUtility(Mock.Of<IHostingEnvironment>()),
-                Mock.Of<ILocalizationService>());
-            var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
+        var absUrl = publishedUrlProvider.GetUrl(100111, UrlMode.Absolute);
+        Assert.AreEqual("http://domain2.com/1001-1-1/", absUrl);
 
-            string absUrl = publishedUrlProvider.GetUrl(100111, UrlMode.Absolute);
-            Assert.AreEqual("http://domain2.com/1001-1-1/", absUrl);
+        const string cacheKeyPrefix = "NuCache.ContentCache.RouteByContent";
 
-            const string cacheKeyPrefix = "NuCache.ContentCache.RouteByContent";
+        // check that the proper route has been cached
+        var cache = (FastDictionaryAppCache)umbracoContext.PublishedSnapshot.ElementsCache;
 
-            // check that the proper route has been cached
-            var cache = (FastDictionaryAppCache)umbracoContext.PublishedSnapshot.ElementsCache;
+        var cacheKey = $"{cacheKeyPrefix}[P:100111]";
+        Assert.AreEqual("10011/1001-1-1", cache.Get(cacheKey));
 
-            var cachedRoutes = cache.Keys.Where(x => x.StartsWith(cacheKeyPrefix)).ToList();
-            var cacheKey = $"{cacheKeyPrefix}[P:100111]";
-            Assert.AreEqual("10011/1001-1-1", cache.Get(cacheKey));
+        // route a rogue URL
+        var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
+        var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
 
-            // route a rogue URL
-            var publishedRouter = CreatePublishedRouter(umbracoContextAccessor);
-            var frequest = await publishedRouter.CreateRequestAsync(umbracoContext.CleanedUmbracoUrl);
+        publishedRouter.FindDomain(frequest);
+        Assert.IsTrue(frequest.HasDomain());
 
-            publishedRouter.FindDomain(frequest);
-            Assert.IsTrue(frequest.HasDomain());
+        // check that it's been routed
+        var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
+        var result = await lookup.TryFindContent(frequest);
+        Assert.IsTrue(result);
+        Assert.AreEqual(100111, frequest.PublishedContent.Id);
 
-            // check that it's been routed
-            var lookup = new ContentFinderByUrl(Mock.Of<ILogger<ContentFinderByUrl>>(), umbracoContextAccessor);
-            var result = await lookup.TryFindContent(frequest);
-            Assert.IsTrue(result);
-            Assert.AreEqual(100111, frequest.PublishedContent.Id);
+        // has the cache been polluted?
+        Assert.AreEqual("10011/1001-1-1", cache.Get(cacheKey)); // no
 
-            // has the cache been polluted?
-            cachedRoutes = cache.Keys.Where(x => x.StartsWith(cacheKeyPrefix)).ToList();
-            Assert.AreEqual("10011/1001-1-1", cache.Get(cacheKey)); // no
+        // what's the nice URL now?
+        Assert.AreEqual("http://domain2.com/1001-1-1/", publishedUrlProvider.GetUrl(100111)); // good
+    }
 
-            // what's the nice URL now?
-            Assert.AreEqual("http://domain2.com/1001-1-1/", publishedUrlProvider.GetUrl(100111)); // good
-        }
+    private void SetDomains1()
+    {
+        var domainService = Mock.Get(DomainService);
 
-        private IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext, object urlProvider)
-        {
-            throw new NotImplementedException();
-        }
-
-        private void SetDomains1()
-        {
-            var domainService = Mock.Get(DomainService);
-
-            domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
-                .Returns((bool incWildcards) => new[]
+        domainService.Setup(service => service.GetAll(It.IsAny<bool>()))
+            .Returns((bool incWildcards) => new[]
+            {
+                new UmbracoDomain("http://domain1.com/")
                 {
-                    new UmbracoDomain("http://domain1.com/") {Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US"},
-                    new UmbracoDomain("http://domain2.com/") {Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US"}
-                });
-        }
+                    Id = 1, LanguageId = LangEngId, RootContentId = 1001, LanguageIsoCode = "en-US",
+                },
+                new UmbracoDomain("http://domain2.com/")
+                {
+                    Id = 2, LanguageId = LangEngId, RootContentId = 10011, LanguageIsoCode = "en-US",
+                },
+            });
+    }
 
-        private IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext, DefaultUrlProvider urlProvider)
-        {
-            var webRoutingSettings = new WebRoutingSettings();
-            return new UrlProvider(
-                new TestUmbracoContextAccessor(umbracoContext),
-                Microsoft.Extensions.Options.Options.Create(webRoutingSettings),
-                new UrlProviderCollection(() => new[] { urlProvider }),
-                new MediaUrlProviderCollection(() => Enumerable.Empty<IMediaUrlProvider>()),
-                Mock.Of<IVariationContextAccessor>()
-            );
-        }
+    private IPublishedUrlProvider GetPublishedUrlProvider(IUmbracoContext umbracoContext, DefaultUrlProvider urlProvider)
+    {
+        var webRoutingSettings = new WebRoutingSettings();
+        return new UrlProvider(
+            new TestUmbracoContextAccessor(umbracoContext),
+            Options.Create(webRoutingSettings),
+            new UrlProviderCollection(() => new[] { urlProvider }),
+            new MediaUrlProviderCollection(() => Enumerable.Empty<IMediaUrlProvider>()),
+            Mock.Of<IVariationContextAccessor>());
+    }
 
-        protected override string GetXmlContent(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+    protected override string GetXmlContent(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Doc ANY>
 <!ATTLIST Doc id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
+    <Doc id=""1001"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1001"" writerName=""admin"" creatorName=""admin"" path=""-1,1001"" isDoc="""">
         <content><![CDATA[]]></content>
-        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
+        <Doc id=""10011"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1001-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
+            <Doc id=""100111"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100111"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
+            <Doc id=""100112"" parentID=""10011"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
+                <Doc id=""1001121"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
+                <Doc id=""1001122"" parentID=""100112"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10011,100112,1001122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
+        <Doc id=""10012"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
+            <Doc id=""100121"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1001-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100121"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
+            <Doc id=""100122"" parentID=""10012"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
+                <Doc id=""1001221"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
+                <Doc id=""1001222"" parentID=""100122"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1001-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10012,100122,1001222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
+        <Doc id=""10013"" parentID=""1001"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1001-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1001,10013"" isDoc="""">
         </Doc>
     </Doc>
-    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
+    <Doc id=""1002"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1234"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-16T15:26:59"" updateDate=""2012-07-18T14:23:35"" nodeName=""Test"" urlName=""1002"" writerName=""admin"" creatorName=""admin"" path=""-1,1002"" isDoc="""">
     </Doc>
-    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
+    <Doc id=""1003"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""1003"" writerName=""admin"" creatorName=""admin"" path=""-1,1003"" isDoc="""">
         <content><![CDATA[]]></content>
-        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
+        <Doc id=""10031"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" nodeName=""Sub1"" urlName=""1003-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
+            <Doc id=""100311"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-1-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100311"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
+            <Doc id=""100312"" parentID=""10031"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
+                <Doc id=""1003121"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003121"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
+                <Doc id=""1003122"" parentID=""100312"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-1-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10031,100312,1003122"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
+        <Doc id=""10032"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032"" isDoc="""">
             <content><![CDATA[<div>This is some content</div>]]></content>
-            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
+            <Doc id=""100321"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""1"" createDate=""2012-07-20T18:07:54"" updateDate=""2012-07-20T19:10:27"" nodeName=""Sub2"" urlName=""1003-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100321"" isDoc="""">
                 <content><![CDATA[]]></content>
             </Doc>
-            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
+            <Doc id=""100322"" parentID=""10032"" level=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322"" isDoc="""">
                 <content><![CDATA[]]></content>
-                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
+                <Doc id=""1003221"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-1"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003221"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
-                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
+                <Doc id=""1003222"" parentID=""100322"" level=""4"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""2"" createDate=""2012-07-20T18:08:08"" updateDate=""2012-07-20T19:10:52"" nodeName=""Sub 3"" urlName=""1003-2-2-2"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10032,100322,1003222"" isDoc="""">
                     <content><![CDATA[]]></content>
                 </Doc>
             </Doc>
         </Doc>
-        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
+        <Doc id=""10033"" parentID=""1003"" level=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" sortOrder=""3"" createDate=""2012-07-20T18:08:01"" updateDate=""2012-07-20T18:49:32"" nodeName=""Sub 2"" urlName=""1003-3"" writerName=""admin"" creatorName=""admin"" path=""-1,1003,10033"" isDoc="""">
         </Doc>
     </Doc>
 </root>";
-    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs
index a3e3da5060..098e047981 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Routing/WebPathTests.cs
@@ -5,30 +5,30 @@ using System;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Routing;
+
+[TestFixture]
+public class WebPathTests
 {
-    [TestFixture]
-    public class WebPathTests
-    {
-        [Test]
-        [TestCase("/umbraco", "config", "lang", ExpectedResult = "/umbraco/config/lang")]
-        [TestCase("/umbraco", "/config", "/lang", ExpectedResult = "/umbraco/config/lang")]
-        [TestCase("/umbraco/", "/config/", "/lang/", ExpectedResult = "/umbraco/config/lang")]
-        [TestCase("/umbraco/", "config/", "lang/", ExpectedResult = "/umbraco/config/lang")]
-        [TestCase("umbraco", "config", "lang", ExpectedResult = "umbraco/config/lang")]
-        [TestCase("umbraco", ExpectedResult = "umbraco")]
-        [TestCase("~/umbraco", "config", "lang", ExpectedResult = "~/umbraco/config/lang")]
-        [TestCase("~/umbraco", "/config", "/lang", ExpectedResult = "~/umbraco/config/lang")]
-        [TestCase("~/umbraco/", "/config/", "/lang/", ExpectedResult = "~/umbraco/config/lang")]
-        [TestCase("~/umbraco/", "config/", "lang/", ExpectedResult = "~/umbraco/config/lang")]
-        [TestCase("~/umbraco", ExpectedResult = "~/umbraco")]
-        [TestCase("https://hello.com/", "/world", ExpectedResult = "https://hello.com/world")]
-        public string Combine(params string[] parts) => WebPath.Combine(parts);
+    [Test]
+    [TestCase("/umbraco", "config", "lang", ExpectedResult = "/umbraco/config/lang")]
+    [TestCase("/umbraco", "/config", "/lang", ExpectedResult = "/umbraco/config/lang")]
+    [TestCase("/umbraco/", "/config/", "/lang/", ExpectedResult = "/umbraco/config/lang")]
+    [TestCase("/umbraco/", "config/", "lang/", ExpectedResult = "/umbraco/config/lang")]
+    [TestCase("umbraco", "config", "lang", ExpectedResult = "umbraco/config/lang")]
+    [TestCase("umbraco", ExpectedResult = "umbraco")]
+    [TestCase("~/umbraco", "config", "lang", ExpectedResult = "~/umbraco/config/lang")]
+    [TestCase("~/umbraco", "/config", "/lang", ExpectedResult = "~/umbraco/config/lang")]
+    [TestCase("~/umbraco/", "/config/", "/lang/", ExpectedResult = "~/umbraco/config/lang")]
+    [TestCase("~/umbraco/", "config/", "lang/", ExpectedResult = "~/umbraco/config/lang")]
+    [TestCase("~/umbraco", ExpectedResult = "~/umbraco")]
+    [TestCase("https://hello.com/", "/world", ExpectedResult = "https://hello.com/world")]
+    public string Combine(params string[] parts) => WebPath.Combine(parts);
 
-        [Test]
-        public void Combine_must_handle_empty_array() => Assert.AreEqual(string.Empty, WebPath.Combine(Array.Empty<string>()));
+    [Test]
+    public void Combine_must_handle_empty_array() =>
+        Assert.AreEqual(string.Empty, WebPath.Combine(Array.Empty<string>()));
 
-        [Test]
-        public void Combine_must_handle_null() => Assert.Throws<ArgumentNullException>(() => WebPath.Combine(null));
-    }
+    [Test]
+    public void Combine_must_handle_null() => Assert.Throws<ArgumentNullException>(() => WebPath.Combine(null));
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanupTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanupTest.cs
index 430cd184c1..496b0ad42d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanupTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scheduling/ContentVersionCleanupTest.cs
@@ -12,136 +12,125 @@ using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.HostedServices;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 
-namespace Umbraco.Tests.Scheduling
+namespace Umbraco.Tests.Scheduling;
+
+[TestFixture]
+internal class ContentVersionCleanupTest
 {
-    [TestFixture]
-    class ContentVersionCleanupTest
+    [Test]
+    [AutoMoqData]
+    public async Task ContentVersionCleanup_WhenNotEnabled_DoesNotCleanupWillRepeat(
+        [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
+        [Frozen] Mock<IMainDom> mainDom,
+        [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+        [Frozen] Mock<IRuntimeState> runtimeState,
+        [Frozen] Mock<IContentVersionService> cleanupService,
+        ContentVersionCleanup sut)
     {
-        [Test, AutoMoqData]
-        public async Task ContentVersionCleanup_WhenNotEnabled_DoesNotCleanupWillRepeat(
-            [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
-            [Frozen] Mock<IMainDom> mainDom,
-            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
-            [Frozen] Mock<IRuntimeState> runtimeState,
-            [Frozen] Mock<IContentVersionService> cleanupService,
-            ContentVersionCleanup sut)
+        settings.Setup(x => x.CurrentValue).Returns(new ContentSettings
         {
-            settings.Setup(x => x.CurrentValue).Returns(new ContentSettings()
-            {
-                ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings()
-                {
-                    EnableCleanup = false
-                }
-            });
-            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
-            mainDom.Setup(x => x.IsMainDom).Returns(true);
-            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+            ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings { EnableCleanup = false },
+        });
+        runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+        mainDom.Setup(x => x.IsMainDom).Returns(true);
+        serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
 
-            await sut.PerformExecuteAsync(null);
+        await sut.PerformExecuteAsync(null);
 
-            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
-        }
+        cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+    }
 
-        [Test, AutoMoqData]
-        public async Task ContentVersionCleanup_RuntimeLevelNotRun_DoesNotCleanupWillRepeat(
-            [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
-            [Frozen] Mock<IMainDom> mainDom,
-            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
-            [Frozen] Mock<IRuntimeState> runtimeState,
-            [Frozen] Mock<IContentVersionService> cleanupService,
-            ContentVersionCleanup sut)
+    [Test]
+    [AutoMoqData]
+    public async Task ContentVersionCleanup_RuntimeLevelNotRun_DoesNotCleanupWillRepeat(
+        [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
+        [Frozen] Mock<IMainDom> mainDom,
+        [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+        [Frozen] Mock<IRuntimeState> runtimeState,
+        [Frozen] Mock<IContentVersionService> cleanupService,
+        ContentVersionCleanup sut)
+    {
+        settings.Setup(x => x.CurrentValue).Returns(new ContentSettings
         {
-            settings.Setup(x => x.CurrentValue).Returns(new ContentSettings()
-            {
-                ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings()
-                {
-                    EnableCleanup = true
-                }
-            });
-            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Unknown);
-            mainDom.Setup(x => x.IsMainDom).Returns(true);
-            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+            ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings { EnableCleanup = true },
+        });
+        runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Unknown);
+        mainDom.Setup(x => x.IsMainDom).Returns(true);
+        serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
 
-            await sut.PerformExecuteAsync(null);
+        await sut.PerformExecuteAsync(null);
 
-            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
-        }
+        cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+    }
 
-        [Test, AutoMoqData]
-        public async Task  ContentVersionCleanup_ServerRoleUnknown_DoesNotCleanupWillRepeat(
-            [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
-            [Frozen] Mock<IMainDom> mainDom,
-            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
-            [Frozen] Mock<IRuntimeState> runtimeState,
-            [Frozen] Mock<IContentVersionService> cleanupService,
-            ContentVersionCleanup sut)
+    [Test]
+    [AutoMoqData]
+    public async Task ContentVersionCleanup_ServerRoleUnknown_DoesNotCleanupWillRepeat(
+        [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
+        [Frozen] Mock<IMainDom> mainDom,
+        [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+        [Frozen] Mock<IRuntimeState> runtimeState,
+        [Frozen] Mock<IContentVersionService> cleanupService,
+        ContentVersionCleanup sut)
+    {
+        settings.Setup(x => x.CurrentValue).Returns(new ContentSettings
         {
-            settings.Setup(x => x.CurrentValue).Returns(new ContentSettings()
-            {
-                ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings()
-                {
-                    EnableCleanup = true
-                }
-            });
-            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
-            mainDom.Setup(x => x.IsMainDom).Returns(true);
-            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.Unknown);
+            ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings { EnableCleanup = true },
+        });
+        runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+        mainDom.Setup(x => x.IsMainDom).Returns(true);
+        serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.Unknown);
 
-            await sut.PerformExecuteAsync(null);
+        await sut.PerformExecuteAsync(null);
 
-            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
-        }
+        cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+    }
 
-        [Test, AutoMoqData]
-        public async Task ContentVersionCleanup_NotMainDom_DoesNotCleanupWillNotRepeat(
-            [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
-            [Frozen] Mock<IMainDom> mainDom,
-            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
-            [Frozen] Mock<IRuntimeState> runtimeState,
-            [Frozen] Mock<IContentVersionService> cleanupService,
-            ContentVersionCleanup sut)
+    [Test]
+    [AutoMoqData]
+    public async Task ContentVersionCleanup_NotMainDom_DoesNotCleanupWillNotRepeat(
+        [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
+        [Frozen] Mock<IMainDom> mainDom,
+        [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+        [Frozen] Mock<IRuntimeState> runtimeState,
+        [Frozen] Mock<IContentVersionService> cleanupService,
+        ContentVersionCleanup sut)
+    {
+        settings.Setup(x => x.CurrentValue).Returns(new ContentSettings
         {
-            settings.Setup(x => x.CurrentValue).Returns(new ContentSettings()
-            {
-                ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings()
-                {
-                    EnableCleanup = true
-                }
-            });
+            ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings { EnableCleanup = true },
+        });
 
-            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
-            mainDom.Setup(x => x.IsMainDom).Returns(false);
-            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+        runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+        mainDom.Setup(x => x.IsMainDom).Returns(false);
+        serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
 
-            await sut.PerformExecuteAsync(null);
+        await sut.PerformExecuteAsync(null);
 
-            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
-        }
+        cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Never);
+    }
 
-        [Test, AutoMoqData]
-        public async Task ContentVersionCleanup_Enabled_DelegatesToCleanupService(
-            [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
-            [Frozen] Mock<IMainDom> mainDom,
-            [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
-            [Frozen] Mock<IRuntimeState> runtimeState,
-            [Frozen] Mock<IContentVersionService> cleanupService,
-            ContentVersionCleanup sut)
+    [Test]
+    [AutoMoqData]
+    public async Task ContentVersionCleanup_Enabled_DelegatesToCleanupService(
+        [Frozen] Mock<IOptionsMonitor<ContentSettings>> settings,
+        [Frozen] Mock<IMainDom> mainDom,
+        [Frozen] Mock<IServerRoleAccessor> serverRoleAccessor,
+        [Frozen] Mock<IRuntimeState> runtimeState,
+        [Frozen] Mock<IContentVersionService> cleanupService,
+        ContentVersionCleanup sut)
+    {
+        settings.Setup(x => x.CurrentValue).Returns(new ContentSettings
         {
-            settings.Setup(x => x.CurrentValue).Returns(new ContentSettings()
-            {
-                ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings()
-                {
-                    EnableCleanup = true
-                }
-            });
+            ContentVersionCleanupPolicy = new ContentVersionCleanupPolicySettings { EnableCleanup = true },
+        });
 
-            runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
-            mainDom.Setup(x => x.IsMainDom).Returns(true);
-            serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
+        runtimeState.Setup(x => x.Level).Returns(RuntimeLevel.Run);
+        mainDom.Setup(x => x.IsMainDom).Returns(true);
+        serverRoleAccessor.Setup(x => x.CurrentServerRole).Returns(ServerRole.SchedulingPublisher);
 
-            await sut.PerformExecuteAsync(null);
+        await sut.PerformExecuteAsync(null);
 
-            cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Once);
-        }
+        cleanupService.Verify(x => x.PerformContentVersionCleanup(It.IsAny<DateTime>()), Times.Once);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs
index b58291505e..d20a30e661 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/EventNameExtractorTests.cs
@@ -3,57 +3,55 @@
 
 using System;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Events;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Scoping
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Scoping;
+
+[TestFixture]
+public class EventNameExtractorTests
 {
-    [TestFixture]
-    public class EventNameExtractorTests
+    [Test]
+    public void Find_Event_Ing()
     {
-        [Test]
-        public void Find_Event_Ing()
-        {
-            Attempt<EventNameExtractorResult> found = EventNameExtractor.FindEvent(this, new SaveEventArgs<string>("test"), EventNameExtractor.MatchIngNames);
-            Assert.IsTrue(found.Success);
-            Assert.AreEqual("FoundMe", found.Result.Name);
-        }
-
-        [Test]
-        public void Find_Event_Non_Ing()
-        {
-            Attempt<EventNameExtractorResult> found = EventNameExtractor.FindEvent(this, new SaveEventArgs<string>("test"), EventNameExtractor.MatchNonIngNames);
-            Assert.IsTrue(found.Success);
-            Assert.AreEqual("FindingMe", found.Result.Name);
-        }
-
-        [Test]
-        public void Ambiguous_Match()
-        {
-            Attempt<EventNameExtractorResult> found = EventNameExtractor.FindEvent(this, new SaveEventArgs<int>(0), EventNameExtractor.MatchIngNames);
-            Assert.IsFalse(found.Success);
-            Assert.AreEqual(EventNameExtractorError.Ambiguous, found.Result.Error);
-        }
-
-        [Test]
-        public void No_Match()
-        {
-            Attempt<EventNameExtractorResult> found = EventNameExtractor.FindEvent(this, new SaveEventArgs<double>(0), EventNameExtractor.MatchIngNames);
-            Assert.IsFalse(found.Success);
-            Assert.AreEqual(EventNameExtractorError.NoneFound, found.Result.Error);
-        }
-
-        public static event EventHandler<SaveEventArgs<string>> FindingMe;
-
-        public static event EventHandler<SaveEventArgs<string>> FoundMe;
-
-        // will lead to ambiguous matches
-        public static event EventHandler<SaveEventArgs<int>> SavingThis;
-
-        public static event EventHandler<SaveEventArgs<int>> SavedThis;
-
-        public static event EventHandler<SaveEventArgs<int>> SavingThat;
-
-        public static event EventHandler<SaveEventArgs<int>> SavedThat;
+        var found = EventNameExtractor.FindEvent(this, new SaveEventArgs<string>("test"), EventNameExtractor.MatchIngNames);
+        Assert.IsTrue(found.Success);
+        Assert.AreEqual("FoundMe", found.Result.Name);
     }
+
+    [Test]
+    public void Find_Event_Non_Ing()
+    {
+        var found = EventNameExtractor.FindEvent(this, new SaveEventArgs<string>("test"), EventNameExtractor.MatchNonIngNames);
+        Assert.IsTrue(found.Success);
+        Assert.AreEqual("FindingMe", found.Result.Name);
+    }
+
+    [Test]
+    public void Ambiguous_Match()
+    {
+        var found = EventNameExtractor.FindEvent(this, new SaveEventArgs<int>(0), EventNameExtractor.MatchIngNames);
+        Assert.IsFalse(found.Success);
+        Assert.AreEqual(EventNameExtractorError.Ambiguous, found.Result.Error);
+    }
+
+    [Test]
+    public void No_Match()
+    {
+        var found = EventNameExtractor.FindEvent(this, new SaveEventArgs<double>(0), EventNameExtractor.MatchIngNames);
+        Assert.IsFalse(found.Success);
+        Assert.AreEqual(EventNameExtractorError.NoneFound, found.Result.Error);
+    }
+
+    public static event EventHandler<SaveEventArgs<string>> FindingMe;
+
+    public static event EventHandler<SaveEventArgs<string>> FoundMe;
+
+    // will lead to ambiguous matches
+    public static event EventHandler<SaveEventArgs<int>> SavingThis;
+
+    public static event EventHandler<SaveEventArgs<int>> SavedThis;
+
+    public static event EventHandler<SaveEventArgs<int>> SavingThat;
+
+    public static event EventHandler<SaveEventArgs<int>> SavedThat;
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs
index 79d2f7b3d3..1a76d92bc7 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Scoping/ScopedNotificationPublisherTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -11,98 +10,95 @@ using Umbraco.Cms.Core.DistributedLocking;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
-using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Scoping
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Scoping;
+
+[TestFixture]
+public class ScopedNotificationPublisherTests
 {
-    [TestFixture]
-    public class ScopedNotificationPublisherTests
+    [Test]
+    public void ScopeUsesInjectedNotificationPublisher()
     {
+        var notificationPublisherMock = new Mock<IScopedNotificationPublisher>();
+        var scopeProvider = GetScopeProvider(out var eventAggregatorMock);
 
-        [Test]
-        public void ScopeUsesInjectedNotificationPublisher()
+        using (ICoreScope scope = scopeProvider.CreateScope(notificationPublisher: notificationPublisherMock.Object))
         {
-            var notificationPublisherMock = new Mock<IScopedNotificationPublisher>();
-            ScopeProvider scopeProvider = GetScopeProvider(out var eventAggregatorMock);
+            scope.Notifications.Publish(Mock.Of<INotification>());
+            scope.Notifications.PublishCancelable(Mock.Of<ICancelableNotification>());
 
-            using (ICoreScope scope = scopeProvider.CreateScope(notificationPublisher: notificationPublisherMock.Object))
+            notificationPublisherMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Once);
+            notificationPublisherMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Once);
+
+            // Ensure that the custom scope provider is till used in inner scope.
+            using (ICoreScope innerScope = scopeProvider.CreateScope())
             {
-                scope.Notifications.Publish(Mock.Of<INotification>());
-                scope.Notifications.PublishCancelable(Mock.Of<ICancelableNotification>());
+                innerScope.Notifications.Publish(Mock.Of<INotification>());
+                innerScope.Notifications.PublishCancelable(Mock.Of<ICancelableNotification>());
 
-                notificationPublisherMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Once);
-                notificationPublisherMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Once);
-
-                // Ensure that the custom scope provider is till used in inner scope.
-                using (ICoreScope innerScope = scopeProvider.CreateScope())
-                {
-                    innerScope.Notifications.Publish(Mock.Of<INotification>());
-                    innerScope.Notifications.PublishCancelable(Mock.Of<ICancelableNotification>());
-
-                    notificationPublisherMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Exactly(2));
-                    notificationPublisherMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Exactly(2));
-                }
-
-                // Ensure scope exit is not called until outermost scope is being disposed
-                notificationPublisherMock.Verify(x => x.ScopeExit(It.IsAny<bool>()), Times.Never());
+                notificationPublisherMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Exactly(2));
+                notificationPublisherMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Exactly(2));
             }
 
-            notificationPublisherMock.Verify(x => x.ScopeExit(It.IsAny<bool>()), Times.Once());
-            // Ensure that the event aggregator isn't used directly.
-            eventAggregatorMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Never);
-            eventAggregatorMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Never);
+            // Ensure scope exit is not called until outermost scope is being disposed
+            notificationPublisherMock.Verify(x => x.ScopeExit(It.IsAny<bool>()), Times.Never());
         }
 
-        [Test]
-        public void SpecifyingNotificationPublishInInnerScopeCausesError()
+        notificationPublisherMock.Verify(x => x.ScopeExit(It.IsAny<bool>()), Times.Once());
+
+        // Ensure that the event aggregator isn't used directly.
+        eventAggregatorMock.Verify(x => x.Publish(It.IsAny<INotification>()), Times.Never);
+        eventAggregatorMock.Verify(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()), Times.Never);
+    }
+
+    [Test]
+    public void SpecifyingNotificationPublishInInnerScopeCausesError()
+    {
+        var notificationPublisherMock = new Mock<IScopedNotificationPublisher>();
+        var scopeProvider = GetScopeProvider(out var eventAggregatorMock);
+
+        using (var scope = scopeProvider.CreateScope())
         {
-            var notificationPublisherMock = new Mock<IScopedNotificationPublisher>();
-            ScopeProvider scopeProvider = GetScopeProvider(out var eventAggregatorMock);
-
-            using (var scope = scopeProvider.CreateScope())
-            {
-                Assert.Throws<ArgumentException>(() => scopeProvider.CreateScope(notificationPublisher: notificationPublisherMock.Object));
-            }
-        }
-
-        private ScopeProvider GetScopeProvider(out Mock<IEventAggregator> eventAggregatorMock)
-        {
-            NullLoggerFactory loggerFactory = NullLoggerFactory.Instance;
-
-            var fileSystems = new FileSystems(
-                loggerFactory,
-                Mock.Of<IIOHelper>(),
-                Options.Create(new GlobalSettings()),
-                Mock.Of<IHostingEnvironment>());
-
-            var mediaFileManager = new MediaFileManager(
-                Mock.Of<IFileSystem>(),
-                Mock.Of<IMediaPathScheme>(),
-                loggerFactory.CreateLogger<MediaFileManager>(),
-                Mock.Of<IShortStringHelper>(),
-                Mock.Of<IServiceProvider>(),
-                Options.Create(new ContentSettings()));
-
-            eventAggregatorMock = new Mock<IEventAggregator>();
-
-            return new ScopeProvider(
-                new AmbientScopeStack(),
-                new AmbientScopeContextStack(),
-                Mock.Of<IDistributedLockingMechanismFactory>(),
-                Mock.Of<IUmbracoDatabaseFactory>(),
-                fileSystems,
-                new TestOptionsMonitor<CoreDebugSettings>(new CoreDebugSettings()),
-                mediaFileManager,
-                loggerFactory,
-                eventAggregatorMock.Object
-            );
+            Assert.Throws<ArgumentException>(() =>
+                scopeProvider.CreateScope(notificationPublisher: notificationPublisherMock.Object));
         }
     }
+
+    private ScopeProvider GetScopeProvider(out Mock<IEventAggregator> eventAggregatorMock)
+    {
+        var loggerFactory = NullLoggerFactory.Instance;
+
+        var fileSystems = new FileSystems(
+            loggerFactory,
+            Mock.Of<IIOHelper>(),
+            Options.Create(new GlobalSettings()),
+            Mock.Of<IHostingEnvironment>());
+
+        var mediaFileManager = new MediaFileManager(
+            Mock.Of<IFileSystem>(),
+            Mock.Of<IMediaPathScheme>(),
+            loggerFactory.CreateLogger<MediaFileManager>(),
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IServiceProvider>(),
+            Options.Create(new ContentSettings()));
+
+        eventAggregatorMock = new Mock<IEventAggregator>();
+
+        return new ScopeProvider(
+            new AmbientScopeStack(),
+                new AmbientScopeContextStack(),Mock.Of<IDistributedLockingMechanismFactory>(),
+            Mock.Of<IUmbracoDatabaseFactory>(),
+            fileSystems,
+            new TestOptionsMonitor<CoreDebugSettings>(new CoreDebugSettings()),
+            mediaFileManager,
+            loggerFactory,
+            
+            eventAggregatorMock.Object);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs
index 9bbd353516..a7d679d7ab 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/ContentPermissionsTests.cs
@@ -12,361 +12,342 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security;
+
+[TestFixture]
+public class ContentPermissionsTests
 {
-    [TestFixture]
-    public class ContentPermissionsTests
+    [Test]
+    public void Access_Allowed_By_Path()
     {
-        [Test]
-        public void Access_Allowed_By_Path()
+        // Arrange
+        var user = CreateUser(9);
+        var contentMock = new Mock<IContent>();
+        contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+        var content = contentMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+        var contentService = contentServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var userService = userServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(1234, user, out IContent _);
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
+    }
+
+    [Test]
+    public void No_Content_Found()
+    {
+        // Arrange
+        var user = CreateUser(9);
+        var contentMock = new Mock<IContent>();
+        contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+        var content = contentMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        contentServiceMock.Setup(x => x.GetById(0)).Returns(content);
+        var contentService = contentServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var permissions = new EntityPermissionCollection();
+        var permissionSet = new EntityPermissionSet(1234, permissions);
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234,5678")).Returns(permissionSet);
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(1234, user, out IContent _, new[] { 'F' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.NotFound, result);
+    }
+
+    [Test]
+    public void No_Access_By_Path()
+    {
+        // Arrange
+        var user = CreateUser(9, 9876);
+        var contentMock = new Mock<IContent>();
+        contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+        var content = contentMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+        var contentService = contentServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var permissions = new EntityPermissionCollection();
+        var permissionSet = new EntityPermissionSet(1234, permissions);
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234")).Returns(permissionSet);
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 9876 && entity.Path == "-1,9876") });
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(1234, user, out IContent _, new[] { 'F' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
+    }
+
+    [Test]
+    public void No_Access_By_Permission()
+    {
+        // Arrange
+        var user = CreateUser(9);
+        var contentMock = new Mock<IContent>();
+        contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+        var content = contentMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+        var contentService = contentServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var permissions = new EntityPermissionCollection { new(9876, 1234, new[] { "A", "B", "C" }) };
+        var permissionSet = new EntityPermissionSet(1234, permissions);
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234,5678")).Returns(permissionSet);
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(1234, user, out IContent _, new[] { 'F' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
+    }
+
+    [Test]
+    public void Access_Allowed_By_Permission()
+    {
+        // Arrange
+        var user = CreateUser(9);
+        var contentMock = new Mock<IContent>();
+        contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
+        var content = contentMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
+        var contentService = contentServiceMock.Object;
+        var permissions = new EntityPermissionCollection { new(9876, 1234, new[] { "A", "F", "C" }) };
+        var permissionSet = new EntityPermissionSet(1234, permissions);
+        var userServiceMock = new Mock<IUserService>();
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234,5678")).Returns(permissionSet);
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(1234, user, out IContent _, new[] { 'F' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
+    }
+
+    [Test]
+    public void Access_To_Root_By_Path()
+    {
+        // Arrange
+        var user = CreateUser();
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-1, user, out IContent _);
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
+    }
+
+    [Test]
+    public void Access_To_Recycle_Bin_By_Path()
+    {
+        // Arrange
+        var user = CreateUser();
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-20, user, out IContent _);
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
+    }
+
+    [Test]
+    public void No_Access_To_Recycle_Bin_By_Path()
+    {
+        // Arrange
+        var user = CreateUser(startContentId: 1234);
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-20, user, out IContent _);
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
+    }
+
+    [Test]
+    public void No_Access_To_Root_By_Path()
+    {
+        // Arrange
+        var user = CreateUser(startContentId: 1234);
+
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var userServiceMock = new Mock<IUserService>();
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-1, user, out IContent _);
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
+    }
+
+    [Test]
+    public void Access_To_Root_By_Permission()
+    {
+        // Arrange
+        var user = CreateUser();
+
+        var userServiceMock = new Mock<IUserService>();
+        var permissions = new EntityPermissionCollection { new(9876, 1234, new[] { "A" }) };
+        var permissionSet = new EntityPermissionSet(1234, permissions);
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1")).Returns(permissionSet);
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-1, user, out IContent _, new[] { 'A' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
+    }
+
+    [Test]
+    public void No_Access_To_Root_By_Permission()
+    {
+        // Arrange
+        var user = CreateUser(withUserGroup: false);
+
+        var userServiceMock = new Mock<IUserService>();
+        var permissions = new EntityPermissionCollection { new(9876, 1234, new[] { "A" }) };
+        var permissionSet = new EntityPermissionSet(1234, permissions);
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1")).Returns(permissionSet);
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-1, user, out IContent _, new[] { 'B' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
+    }
+
+    [Test]
+    public void Access_To_Recycle_Bin_By_Permission()
+    {
+        // Arrange
+        var user = CreateUser();
+
+        var userServiceMock = new Mock<IUserService>();
+        var permissions = new EntityPermissionCollection { new(9876, 1234, new[] { "A" }) };
+        var permissionSet = new EntityPermissionSet(-20, permissions);
+
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-20")).Returns(permissionSet);
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-20, user, out IContent _, new[] { 'A' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
+    }
+
+    [Test]
+    public void No_Access_To_Recycle_Bin_By_Permission()
+    {
+        // Arrange
+        var user = CreateUser(withUserGroup: false);
+
+        var userServiceMock = new Mock<IUserService>();
+        var permissions = new EntityPermissionCollection { new(9876, 1234, new[] { "A" }) };
+        var permissionSet = new EntityPermissionSet(1234, permissions);
+        userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-20")).Returns(permissionSet);
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var contentServiceMock = new Mock<IContentService>();
+        var contentService = contentServiceMock.Object;
+        var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = contentPermissions.CheckPermissions(-20, user, out IContent _, new[] { 'B' });
+
+        // Assert
+        Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
+    }
+
+    private IUser CreateUser(int id = 0, int? startContentId = null, bool withUserGroup = true)
+    {
+        var builder = new UserBuilder()
+            .WithId(id)
+            .WithStartContentIds(startContentId.HasValue ? new[] { startContentId.Value } : new int[0]);
+        if (withUserGroup)
         {
-            // Arrange
-            IUser user = CreateUser(id: 9);
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            IContent content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            IContentService contentService = contentServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            IUserService userService = userServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(1234, user, out IContent foundContent);
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
-        }
-
-        [Test]
-        public void No_Content_Found()
-        {
-            // Arrange
-            IUser user = CreateUser(id: 9);
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            IContent content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(0)).Returns(content);
-            IContentService contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new EntityPermissionCollection();
-            var permissionSet = new EntityPermissionSet(1234, permissions);
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234,5678")).Returns(permissionSet);
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(1234, user, out IContent foundContent, new[] { 'F' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.NotFound, result);
-        }
-
-        [Test]
-        public void No_Access_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser(id: 9, startContentId: 9876);
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            IContent content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            IContentService contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new EntityPermissionCollection();
-            var permissionSet = new EntityPermissionSet(1234, permissions);
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234")).Returns(permissionSet);
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 9876 && entity.Path == "-1,9876") });
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(1234, user, out IContent foundContent, new[] { 'F' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
-        }
-
-        [Test]
-        public void No_Access_By_Permission()
-        {
-            // Arrange
-            IUser user = CreateUser(id: 9);
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            IContent content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            IContentService contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new EntityPermissionCollection
-                {
-                    new EntityPermission(9876, 1234, new string[] { "A", "B", "C" })
-                };
-            var permissionSet = new EntityPermissionSet(1234, permissions);
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234,5678")).Returns(permissionSet);
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(1234, user, out IContent foundContent, new[] { 'F' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
-        }
-
-        [Test]
-        public void Access_Allowed_By_Permission()
-        {
-            // Arrange
-            IUser user = CreateUser(id: 9);
-            var contentMock = new Mock<IContent>();
-            contentMock.Setup(c => c.Path).Returns("-1,1234,5678");
-            IContent content = contentMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            contentServiceMock.Setup(x => x.GetById(1234)).Returns(content);
-            IContentService contentService = contentServiceMock.Object;
-            var permissions = new EntityPermissionCollection
-                {
-                    new EntityPermission(9876, 1234, new string[] { "A", "F", "C" })
-                };
-            var permissionSet = new EntityPermissionSet(1234, permissions);
-            var userServiceMock = new Mock<IUserService>();
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1,1234,5678")).Returns(permissionSet);
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(1234, user, out IContent foundContent, new[] { 'F' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
-        }
-
-        [Test]
-        public void Access_To_Root_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser();
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-1, user, out IContent _);
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
-        }
-
-        [Test]
-        public void Access_To_Recycle_Bin_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser();
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-20, user, out IContent _);
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
-        }
-
-        [Test]
-        public void No_Access_To_Recycle_Bin_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser(startContentId: 1234);
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-20, user, out IContent foundContent);
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
-        }
-
-        [Test]
-        public void No_Access_To_Root_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser(startContentId: 1234);
-
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            var userServiceMock = new Mock<IUserService>();
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-1, user, out IContent foundContent);
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
-        }
-
-        [Test]
-        public void Access_To_Root_By_Permission()
-        {
-            // Arrange
-            IUser user = CreateUser();
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new EntityPermissionCollection
-                {
-                    new EntityPermission(9876, 1234, new string[] { "A" })
-                };
-            var permissionSet = new EntityPermissionSet(1234, permissions);
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1")).Returns(permissionSet);
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-1, user, out IContent foundContent, new[] { 'A' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
-        }
-
-        [Test]
-        public void No_Access_To_Root_By_Permission()
-        {
-            // Arrange
-            IUser user = CreateUser(withUserGroup: false);
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new EntityPermissionCollection
-                {
-                    new EntityPermission(9876, 1234, new string[] { "A" })
-                };
-            var permissionSet = new EntityPermissionSet(1234, permissions);
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-1")).Returns(permissionSet);
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-1, user, out IContent foundContent, new[] { 'B' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
-        }
-
-        [Test]
-        public void Access_To_Recycle_Bin_By_Permission()
-        {
-            // Arrange
-            IUser user = CreateUser();
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new EntityPermissionCollection
-            {
-                new EntityPermission(9876, 1234, new string[] { "A" })
-            };
-            var permissionSet = new EntityPermissionSet(-20, permissions);
-
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-20")).Returns(permissionSet);
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-20, user, out IContent foundContent, new[] { 'A' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Granted, result);
-        }
-
-        [Test]
-        public void No_Access_To_Recycle_Bin_By_Permission()
-        {
-            // Arrange
-            IUser user = CreateUser(withUserGroup: false);
-
-            var userServiceMock = new Mock<IUserService>();
-            var permissions = new EntityPermissionCollection
-                {
-                    new EntityPermission(9876, 1234, new string[] { "A" })
-                };
-            var permissionSet = new EntityPermissionSet(1234, permissions);
-            userServiceMock.Setup(x => x.GetPermissionsForPath(user, "-20")).Returns(permissionSet);
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var contentServiceMock = new Mock<IContentService>();
-            IContentService contentService = contentServiceMock.Object;
-            var contentPermissions = new ContentPermissions(userService, contentService, entityService, AppCaches.Disabled);
-
-            // Act
-            ContentPermissions.ContentAccess result = contentPermissions.CheckPermissions(-20, user, out IContent foundContent, new[] { 'B' });
-
-            // Assert
-            Assert.AreEqual(ContentPermissions.ContentAccess.Denied, result);
-        }
-
-        private IUser CreateUser(int id = 0, int? startContentId = null, bool withUserGroup = true)
-        {
-            UserBuilder<object> builder = new UserBuilder()
-                .WithId(id)
-                .WithStartContentIds(startContentId.HasValue ? new[] { startContentId.Value } : new int[0]);
-            if (withUserGroup)
-            {
-                builder = builder
+            builder = builder
                 .AddUserGroup()
-                    .WithId(1)
-                    .WithName("admin")
-                    .WithAlias("admin")
-                    .Done();
-            }
-
-            return builder.Build();
+                .WithId(1)
+                .WithName("admin")
+                .WithAlias("admin")
+                .Done();
         }
+
+        return builder.Build();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs
index 12c5f50d30..fc9abecc10 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/LegacyPasswordSecurityTests.cs
@@ -6,105 +6,112 @@ using System.Security.Cryptography;
 using System.Text;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Security;
-using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security;
+
+[TestFixture]
+public class LegacyPasswordSecurityTests
 {
-    [TestFixture]
-    public class LegacyPasswordSecurityTests
+    [Test]
+    public void Check_Password_Hashed_Non_KeyedHashAlgorithm()
     {
-        [Test]
-        public void Check_Password_Hashed_Non_KeyedHashAlgorithm()
+        var passwordConfiguration = Mock.Of<IPasswordConfiguration>(x => x.HashAlgorithmType == "SHA1");
+        var passwordSecurity = new LegacyPasswordSecurity();
+
+        var pass = "ThisIsAHashedPassword";
+        var hashed = passwordSecurity.HashNewPassword(passwordConfiguration.HashAlgorithmType, pass, out var salt);
+        var storedPassword =
+            passwordSecurity.FormatPasswordForStorage(passwordConfiguration.HashAlgorithmType, hashed, salt);
+
+        var result = passwordSecurity.VerifyPassword(passwordConfiguration.HashAlgorithmType, "ThisIsAHashedPassword", storedPassword);
+
+        Assert.IsTrue(result);
+    }
+
+    [Test]
+    public void Check_Password_Hashed_KeyedHashAlgorithm()
+    {
+        var passwordConfiguration = Mock.Of<IPasswordConfiguration>(x =>
+            x.HashAlgorithmType == Constants.Security.AspNetUmbraco8PasswordHashAlgorithmName);
+        var passwordSecurity = new LegacyPasswordSecurity();
+
+        var pass = "ThisIsAHashedPassword";
+        var hashed = passwordSecurity.HashNewPassword(passwordConfiguration.HashAlgorithmType, pass, out var salt);
+        var storedPassword =
+            passwordSecurity.FormatPasswordForStorage(passwordConfiguration.HashAlgorithmType, hashed, salt);
+
+        var result = passwordSecurity.VerifyPassword(
+            passwordConfiguration.HashAlgorithmType,
+            "ThisIsAHashedPassword",
+            storedPassword);
+
+        Assert.IsTrue(result);
+    }
+
+    [Test]
+    public void Check_Password_Legacy_v4_SHA1()
+    {
+        const string clearText = "ThisIsAHashedPassword";
+        var clearTextUnicodeBytes = Encoding.Unicode.GetBytes(clearText);
+        using var algorithm = new HMACSHA1(clearTextUnicodeBytes);
+        var dbPassword = Convert.ToBase64String(algorithm.ComputeHash(clearTextUnicodeBytes));
+
+        var result = new LegacyPasswordSecurity().VerifyLegacyHashedPassword(clearText, dbPassword);
+
+        Assert.IsTrue(result);
+    }
+
+    [Test]
+    public void Format_Pass_For_Storage_Hashed()
+    {
+        var passwordConfiguration = Mock.Of<IPasswordConfiguration>(x =>
+            x.HashAlgorithmType == Constants.Security.AspNetUmbraco8PasswordHashAlgorithmName);
+        var passwordSecurity = new LegacyPasswordSecurity();
+
+        var salt = LegacyPasswordSecurity.GenerateSalt();
+        var stored = "ThisIsAHashedPassword";
+
+        var result = passwordSecurity.FormatPasswordForStorage(passwordConfiguration.HashAlgorithmType, stored, salt);
+
+        Assert.AreEqual(salt + "ThisIsAHashedPassword", result);
+    }
+
+    [Test]
+    public void Get_Stored_Password_Hashed()
+    {
+        var passwordConfiguration = Mock.Of<IPasswordConfiguration>(x =>
+            x.HashAlgorithmType == Constants.Security.AspNetUmbraco8PasswordHashAlgorithmName);
+        var passwordSecurity = new LegacyPasswordSecurity();
+
+        var salt = LegacyPasswordSecurity.GenerateSalt();
+        var stored = salt + "ThisIsAHashedPassword";
+
+        var result =
+            passwordSecurity.ParseStoredHashPassword(passwordConfiguration.HashAlgorithmType, stored, out _);
+
+        Assert.AreEqual("ThisIsAHashedPassword", result);
+    }
+
+    /// <summary>
+    ///     The salt generated is always the same length
+    /// </summary>
+    [Test]
+    public void Check_Salt_Length()
+    {
+        var lastLength = 0;
+        for (var i = 0; i < 10000; i++)
         {
-            IPasswordConfiguration passwordConfiguration = Mock.Of<IPasswordConfiguration>(x => x.HashAlgorithmType == "SHA1");
-            var passwordSecurity = new LegacyPasswordSecurity();
+            var result = LegacyPasswordSecurity.GenerateSalt();
 
-            var pass = "ThisIsAHashedPassword";
-            var hashed = passwordSecurity.HashNewPassword(passwordConfiguration.HashAlgorithmType, pass, out string salt);
-            var storedPassword = passwordSecurity.FormatPasswordForStorage(passwordConfiguration.HashAlgorithmType, hashed, salt);
-
-            var result = passwordSecurity.VerifyPassword(passwordConfiguration.HashAlgorithmType, "ThisIsAHashedPassword", storedPassword);
-
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void Check_Password_Hashed_KeyedHashAlgorithm()
-        {
-            IPasswordConfiguration passwordConfiguration = Mock.Of<IPasswordConfiguration>(x => x.HashAlgorithmType == Constants.Security.AspNetUmbraco8PasswordHashAlgorithmName);
-            var passwordSecurity = new LegacyPasswordSecurity();
-
-            var pass = "ThisIsAHashedPassword";
-            var hashed = passwordSecurity.HashNewPassword(passwordConfiguration.HashAlgorithmType, pass, out string salt);
-            var storedPassword = passwordSecurity.FormatPasswordForStorage(passwordConfiguration.HashAlgorithmType, hashed, salt);
-
-            var result = passwordSecurity.VerifyPassword(passwordConfiguration.HashAlgorithmType, "ThisIsAHashedPassword", storedPassword);
-
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void Check_Password_Legacy_v4_SHA1()
-        {
-            const string clearText = "ThisIsAHashedPassword";
-            var clearTextUnicodeBytes = Encoding.Unicode.GetBytes(clearText);
-            using var algorithm = new HMACSHA1(clearTextUnicodeBytes);
-            var dbPassword = Convert.ToBase64String(algorithm.ComputeHash(clearTextUnicodeBytes));
-
-            var result = new LegacyPasswordSecurity().VerifyLegacyHashedPassword(clearText, dbPassword);
-
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public void Format_Pass_For_Storage_Hashed()
-        {
-            IPasswordConfiguration passwordConfiguration = Mock.Of<IPasswordConfiguration>(x => x.HashAlgorithmType == Constants.Security.AspNetUmbraco8PasswordHashAlgorithmName);
-            var passwordSecurity = new LegacyPasswordSecurity();
-
-            var salt = LegacyPasswordSecurity.GenerateSalt();
-            var stored = "ThisIsAHashedPassword";
-
-            var result = passwordSecurity.FormatPasswordForStorage(passwordConfiguration.HashAlgorithmType, stored, salt);
-
-            Assert.AreEqual(salt + "ThisIsAHashedPassword", result);
-        }
-
-        [Test]
-        public void Get_Stored_Password_Hashed()
-        {
-            IPasswordConfiguration passwordConfiguration = Mock.Of<IPasswordConfiguration>(x => x.HashAlgorithmType == Constants.Security.AspNetUmbraco8PasswordHashAlgorithmName);
-            var passwordSecurity = new LegacyPasswordSecurity();
-
-            var salt = LegacyPasswordSecurity.GenerateSalt();
-            var stored = salt + "ThisIsAHashedPassword";
-
-            var result = passwordSecurity.ParseStoredHashPassword(passwordConfiguration.HashAlgorithmType, stored, out string initSalt);
-
-            Assert.AreEqual("ThisIsAHashedPassword", result);
-        }
-
-        /// <summary>
-        /// The salt generated is always the same length
-        /// </summary>
-        [Test]
-        public void Check_Salt_Length()
-        {
-            var lastLength = 0;
-            for (var i = 0; i < 10000; i++)
+            if (i > 0)
             {
-                var result = LegacyPasswordSecurity.GenerateSalt();
-
-                if (i > 0)
-                {
-                    Assert.AreEqual(lastLength, result.Length);
-                }
-
-                lastLength = result.Length;
+                Assert.AreEqual(lastLength, result.Length);
             }
+
+            lastLength = result.Length;
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs
index b719b57c37..eba3d26c5e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Security/MediaPermissionsTests.cs
@@ -12,162 +12,161 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Security;
+
+[TestFixture]
+public class MediaPermissionsTests
 {
-    [TestFixture]
-    public class MediaPermissionsTests
+    [Test]
+    public void Access_Allowed_By_Path()
     {
-        [Test]
-        public void Access_Allowed_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser(id: 9);
-            var mediaMock = new Mock<IMedia>();
-            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
-            IMedia media = mediaMock.Object;
-            var mediaServiceMock = new Mock<IMediaService>();
-            mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
-            IMediaService mediaService = mediaServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
+        // Arrange
+        var user = CreateUser(9);
+        var mediaMock = new Mock<IMedia>();
+        mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
+        var media = mediaMock.Object;
+        var mediaServiceMock = new Mock<IMediaService>();
+        mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
+        var mediaService = mediaServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
 
-            // Act
-            MediaPermissions.MediaAccess result = mediaPermissions.CheckPermissions(user, 1234, out _);
+        // Act
+        var result = mediaPermissions.CheckPermissions(user, 1234, out _);
 
-            // Assert
-            Assert.AreEqual(MediaPermissions.MediaAccess.Granted, result);
-        }
-
-        [Test]
-        public void Returns_Not_Found_When_No_Media_Found()
-        {
-            // Arrange
-            IUser user = CreateUser(id: 9);
-            var mediaMock = new Mock<IMedia>();
-            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
-            IMedia media = mediaMock.Object;
-            var mediaServiceMock = new Mock<IMediaService>();
-            mediaServiceMock.Setup(x => x.GetById(0)).Returns(media);
-            IMediaService mediaService = mediaServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
-
-            // Act/assert
-            MediaPermissions.MediaAccess result = mediaPermissions.CheckPermissions(user, 1234, out _);
-            Assert.AreEqual(MediaPermissions.MediaAccess.NotFound, result);
-        }
-
-        [Test]
-        public void No_Access_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser(id: 9, startMediaId: 9876);
-            var mediaMock = new Mock<IMedia>();
-            mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
-            IMedia media = mediaMock.Object;
-            var mediaServiceMock = new Mock<IMediaService>();
-            mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
-            IMediaService mediaService = mediaServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 9876 && entity.Path == "-1,9876") });
-            IEntityService entityService = entityServiceMock.Object;
-            var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
-
-            // Act
-            MediaPermissions.MediaAccess result = mediaPermissions.CheckPermissions(user, 1234, out _);
-
-            // Assert
-            Assert.AreEqual(MediaPermissions.MediaAccess.Denied, result);
-        }
-
-        [Test]
-        public void Access_To_Root_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser();
-            var mediaServiceMock = new Mock<IMediaService>();
-            IMediaService mediaService = mediaServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
-
-            // Act
-            MediaPermissions.MediaAccess result = mediaPermissions.CheckPermissions(user, -1, out _);
-
-            // Assert
-            Assert.AreEqual(MediaPermissions.MediaAccess.Granted, result);
-        }
-
-        [Test]
-        public void No_Access_To_Root_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser(startMediaId: 1234);
-            var mediaServiceMock = new Mock<IMediaService>();
-            IMediaService mediaService = mediaServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
-            IEntityService entityService = entityServiceMock.Object;
-            var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
-
-            // Act
-            MediaPermissions.MediaAccess result = mediaPermissions.CheckPermissions(user, -1, out _);
-
-            // Assert
-            Assert.AreEqual(MediaPermissions.MediaAccess.Denied, result);
-        }
-
-        [Test]
-        public void Access_To_Recycle_Bin_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser();
-            var mediaServiceMock = new Mock<IMediaService>();
-            IMediaService mediaService = mediaServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            IEntityService entityService = entityServiceMock.Object;
-            var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
-
-            // Act
-            MediaPermissions.MediaAccess result = mediaPermissions.CheckPermissions(user, -21, out _);
-
-            // Assert
-            Assert.AreEqual(MediaPermissions.MediaAccess.Granted, result);
-        }
-
-        [Test]
-        public void No_Access_To_Recycle_Bin_By_Path()
-        {
-            // Arrange
-            IUser user = CreateUser(startMediaId: 1234);
-            var mediaServiceMock = new Mock<IMediaService>();
-            IMediaService mediaService = mediaServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
-            IEntityService entityService = entityServiceMock.Object;
-            var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
-
-            // Act
-            MediaPermissions.MediaAccess result = mediaPermissions.CheckPermissions(user, -21, out _);
-
-            // Assert
-            Assert.AreEqual(MediaPermissions.MediaAccess.Denied, result);
-        }
-
-        private IUser CreateUser(int id = 0, int? startMediaId = null) =>
-            new UserBuilder()
-                .WithId(id)
-                .WithStartMediaIds(startMediaId.HasValue ? new[] { startMediaId.Value } : new int[0])
-                .AddUserGroup()
-                    .WithId(1)
-                    .WithName("admin")
-                    .WithAlias("admin")
-                    .Done()
-                .Build();
+        // Assert
+        Assert.AreEqual(MediaPermissions.MediaAccess.Granted, result);
     }
+
+    [Test]
+    public void Returns_Not_Found_When_No_Media_Found()
+    {
+        // Arrange
+        var user = CreateUser(9);
+        var mediaMock = new Mock<IMedia>();
+        mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
+        var media = mediaMock.Object;
+        var mediaServiceMock = new Mock<IMediaService>();
+        mediaServiceMock.Setup(x => x.GetById(0)).Returns(media);
+        var mediaService = mediaServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
+
+        // Act/assert
+        var result = mediaPermissions.CheckPermissions(user, 1234, out _);
+        Assert.AreEqual(MediaPermissions.MediaAccess.NotFound, result);
+    }
+
+    [Test]
+    public void No_Access_By_Path()
+    {
+        // Arrange
+        var user = CreateUser(9, 9876);
+        var mediaMock = new Mock<IMedia>();
+        mediaMock.Setup(m => m.Path).Returns("-1,1234,5678");
+        var media = mediaMock.Object;
+        var mediaServiceMock = new Mock<IMediaService>();
+        mediaServiceMock.Setup(x => x.GetById(1234)).Returns(media);
+        var mediaService = mediaServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 9876 && entity.Path == "-1,9876") });
+        var entityService = entityServiceMock.Object;
+        var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = mediaPermissions.CheckPermissions(user, 1234, out _);
+
+        // Assert
+        Assert.AreEqual(MediaPermissions.MediaAccess.Denied, result);
+    }
+
+    [Test]
+    public void Access_To_Root_By_Path()
+    {
+        // Arrange
+        var user = CreateUser();
+        var mediaServiceMock = new Mock<IMediaService>();
+        var mediaService = mediaServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = mediaPermissions.CheckPermissions(user, -1, out _);
+
+        // Assert
+        Assert.AreEqual(MediaPermissions.MediaAccess.Granted, result);
+    }
+
+    [Test]
+    public void No_Access_To_Root_By_Path()
+    {
+        // Arrange
+        var user = CreateUser(startMediaId: 1234);
+        var mediaServiceMock = new Mock<IMediaService>();
+        var mediaService = mediaServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
+        var entityService = entityServiceMock.Object;
+        var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = mediaPermissions.CheckPermissions(user, -1, out _);
+
+        // Assert
+        Assert.AreEqual(MediaPermissions.MediaAccess.Denied, result);
+    }
+
+    [Test]
+    public void Access_To_Recycle_Bin_By_Path()
+    {
+        // Arrange
+        var user = CreateUser();
+        var mediaServiceMock = new Mock<IMediaService>();
+        var mediaService = mediaServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        var entityService = entityServiceMock.Object;
+        var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = mediaPermissions.CheckPermissions(user, -21, out _);
+
+        // Assert
+        Assert.AreEqual(MediaPermissions.MediaAccess.Granted, result);
+    }
+
+    [Test]
+    public void No_Access_To_Recycle_Bin_By_Path()
+    {
+        // Arrange
+        var user = CreateUser(startMediaId: 1234);
+        var mediaServiceMock = new Mock<IMediaService>();
+        var mediaService = mediaServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 1234 && entity.Path == "-1,1234") });
+        var entityService = entityServiceMock.Object;
+        var mediaPermissions = new MediaPermissions(mediaService, entityService, AppCaches.Disabled);
+
+        // Act
+        var result = mediaPermissions.CheckPermissions(user, -21, out _);
+
+        // Assert
+        Assert.AreEqual(MediaPermissions.MediaAccess.Denied, result);
+    }
+
+    private IUser CreateUser(int id = 0, int? startMediaId = null) =>
+        new UserBuilder()
+            .WithId(id)
+            .WithStartMediaIds(startMediaId.HasValue ? new[] { startMediaId.Value } : new int[0])
+            .AddUserGroup()
+            .WithId(1)
+            .WithName("admin")
+            .WithAlias("admin")
+            .Done()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs
index c59dd16f10..115d830040 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/BasicAuthServiceTests.cs
@@ -3,38 +3,41 @@ using System.Net;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Web.Common.Mvc;
-using IpAddressUtilities = Umbraco.Cms.Web.Common.Mvc.IpAddressUtilities;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services;
+
+[TestFixture]
+public class BasicAuthServiceTests
 {
-    [TestFixture]
-    public class BasicAuthServiceTests
+    [TestCase(true, ExpectedResult = true)]
+    [TestCase(false, ExpectedResult = false)]
+    public bool IsBasicAuthEnabled(bool enabled)
     {
-        [TestCase(true, ExpectedResult = true)]
-        [TestCase(false, ExpectedResult = false)]
-        public bool IsBasicAuthEnabled(bool enabled)
-        {
-           var sut = new BasicAuthService(Mock.Of<IOptionsMonitor<BasicAuthSettings>>(_ => _.CurrentValue == new BasicAuthSettings() {Enabled = enabled}), new IpAddressUtilities());
+        var sut = new BasicAuthService(
+            Mock.Of<IOptionsMonitor<BasicAuthSettings>>(
+                _ => _.CurrentValue == new BasicAuthSettings { Enabled = enabled }),
+            new IpAddressUtilities());
 
-           return sut.IsBasicAuthEnabled();
-        }
+        return sut.IsBasicAuthEnabled();
+    }
 
-        [TestCase("::1", "1.1.1.1", ExpectedResult = false)]
-        [TestCase("::1", "1.1.1.1, ::1", ExpectedResult = true)]
-        [TestCase("127.0.0.1", "127.0.0.1, ::1", ExpectedResult = true)]
-        [TestCase("127.0.0.1", "", ExpectedResult = false)]
-        [TestCase("125.125.125.1", "125.125.125.0/24", ExpectedResult = true)]
-        [TestCase("125.125.124.1", "125.125.125.0/24", ExpectedResult = false)]
-        public bool IsIpAllowListed(string clientIpAddress, string commaSeperatedAllowlist)
-        {
-            var allowedIPs = commaSeperatedAllowlist.Split(",").Select(x=>x.Trim()).ToArray();
-            var sut = new BasicAuthService(Mock.Of<IOptionsMonitor<BasicAuthSettings>>(_ => _.CurrentValue == new BasicAuthSettings() {AllowedIPs = allowedIPs}), new IpAddressUtilities());
+    [TestCase("::1", "1.1.1.1", ExpectedResult = false)]
+    [TestCase("::1", "1.1.1.1, ::1", ExpectedResult = true)]
+    [TestCase("127.0.0.1", "127.0.0.1, ::1", ExpectedResult = true)]
+    [TestCase("127.0.0.1", "", ExpectedResult = false)]
+    [TestCase("125.125.125.1", "125.125.125.0/24", ExpectedResult = true)]
+    [TestCase("125.125.124.1", "125.125.125.0/24", ExpectedResult = false)]
+    public bool IsIpAllowListed(string clientIpAddress, string commaSeperatedAllowlist)
+    {
+        var allowedIPs = commaSeperatedAllowlist.Split(",").Select(x => x.Trim()).ToArray();
+        var sut = new BasicAuthService(
+            Mock.Of<IOptionsMonitor<BasicAuthSettings>>(_ =>
+                _.CurrentValue == new BasicAuthSettings { AllowedIPs = allowedIPs }),
+            new IpAddressUtilities());
 
-            return sut.IsIpAllowListed(IPAddress.Parse(clientIpAddress));
-        }
+        return sut.IsIpAllowListed(IPAddress.Parse(clientIpAddress));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs
index ca89009b6c..e89310144c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentTypeServiceExtensionsTests.cs
@@ -4,285 +4,293 @@
 using System.Linq;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services;
+
+[TestFixture]
+public class ContentTypeServiceExtensionsTests
 {
-    [TestFixture]
-    public class ContentTypeServiceExtensionsTests
+    private IShortStringHelper ShortStringHelper => new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+    [Test]
+    public void GetAvailableCompositeContentTypes_No_Overlap_By_Content_Type_And_Property_Type_Alias()
     {
-        private IShortStringHelper ShortStringHelper => new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
-
-        [Test]
-        public void GetAvailableCompositeContentTypes_No_Overlap_By_Content_Type_And_Property_Type_Alias()
+        void AddPropType(string alias, IContentType ct)
         {
-            void AddPropType(string alias, IContentType ct)
+            var contentCollection = new PropertyTypeCollection(true)
             {
-                var contentCollection = new PropertyTypeCollection(true)
+                new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
                 {
-                    new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = alias, Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88 }
-                };
-                var pg = new PropertyGroup(contentCollection)
-                {
-                    Alias = "test",
-                    Name = "test",
-                    SortOrder = 1
-                };
-                ct.PropertyGroups.Add(pg);
-            }
+                    Alias = alias,
+                    Name = "Title",
+                    Description = string.Empty,
+                    Mandatory = false,
+                    SortOrder = 1,
+                    DataTypeId = -88,
+                },
+            };
+            var pg = new PropertyGroup(contentCollection) { Alias = "test", Name = "test", SortOrder = 1 };
+            ct.PropertyGroups.Add(pg);
+        }
 
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1", null);
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", null);
-            AddPropType("title", ct2);
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3", null);
-            AddPropType("title", ct3);
-            ContentType ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4", null);
-            ContentType ct5 = ContentTypeBuilder.CreateBasicContentType("ct5", "CT5", null);
-            AddPropType("blah", ct5);
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
-            ct4.Id = 4;
-            ct5.Id = 4;
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        AddPropType("title", ct2);
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        AddPropType("title", ct3);
+        var ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4");
+        var ct5 = ContentTypeBuilder.CreateBasicContentType("ct5", "CT5");
+        AddPropType("blah", ct5);
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
+        ct4.Id = 4;
+        ct5.Id = 4;
 
-            var service = new Mock<IContentTypeService>();
+        var service = new Mock<IContentTypeService>();
 
-            IContentTypeComposition[] availableTypes = service.Object.GetAvailableCompositeContentTypes(
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
                 ct1,
                 new[] { ct1, ct2, ct3, ct4, ct5 },
                 new[] { ct2.Alias },
                 new[] { "blah" })
-                .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
+            .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
 
-            Assert.AreEqual(1, availableTypes.Count());
-            Assert.AreEqual(ct4.Id, availableTypes.ElementAt(0).Id);
+        Assert.AreEqual(1, availableTypes.Count());
+        Assert.AreEqual(ct4.Id, availableTypes.ElementAt(0).Id);
+    }
+
+    [Test]
+    public void GetAvailableCompositeContentTypes_No_Overlap_By_Property_Type_Alias()
+    {
+        void AddPropType(IContentType ct)
+        {
+            var contentCollection = new PropertyTypeCollection(true)
+            {
+                new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+                {
+                    Alias = "title",
+                    Name = "Title",
+                    Description = string.Empty,
+                    Mandatory = false,
+                    SortOrder = 1,
+                    DataTypeId = -88,
+                },
+            };
+            var pg = new PropertyGroup(contentCollection) { Alias = "test", Name = "test", SortOrder = 1 };
+            ct.PropertyGroups.Add(pg);
         }
 
-        [Test]
-        public void GetAvailableCompositeContentTypes_No_Overlap_By_Property_Type_Alias()
-        {
-            void AddPropType(IContentType ct)
-            {
-                var contentCollection = new PropertyTypeCollection(true)
-                {
-                    new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = "title", Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88 }
-                };
-                var pg = new PropertyGroup(contentCollection)
-                {
-                    Alias = "test",
-                    Name = "test",
-                    SortOrder = 1
-                };
-                ct.PropertyGroups.Add(pg);
-            }
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        AddPropType(ct2);
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        AddPropType(ct3);
+        var ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4");
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
+        ct4.Id = 4;
 
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1", null);
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", null);
-            AddPropType(ct2);
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3", null);
-            AddPropType(ct3);
-            ContentType ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4", null);
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
-            ct4.Id = 4;
+        var service = new Mock<IContentTypeService>();
 
-            var service = new Mock<IContentTypeService>();
-
-            IContentTypeComposition[] availableTypes = service.Object.GetAvailableCompositeContentTypes(
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
                 ct1,
                 new[] { ct1, ct2, ct3, ct4 },
                 new string[] { },
                 new[] { "title" })
-                .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
+            .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
 
-            Assert.AreEqual(1, availableTypes.Count());
-            Assert.AreEqual(ct4.Id, availableTypes.ElementAt(0).Id);
+        Assert.AreEqual(1, availableTypes.Count());
+        Assert.AreEqual(ct4.Id, availableTypes.ElementAt(0).Id);
+    }
+
+    [Test]
+    public void GetAvailableCompositeContentTypes_No_Overlap_By_Content_Type()
+    {
+        void AddPropType(IContentType ct)
+        {
+            var contentCollection = new PropertyTypeCollection(true)
+            {
+                new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext)
+                {
+                    Alias = "title",
+                    Name = "Title",
+                    Description = string.Empty,
+                    Mandatory = false,
+                    SortOrder = 1,
+                    DataTypeId = -88,
+                },
+            };
+            var pg = new PropertyGroup(contentCollection) { Alias = "test", Name = "test", SortOrder = 1 };
+            ct.PropertyGroups.Add(pg);
         }
 
-        [Test]
-        public void GetAvailableCompositeContentTypes_No_Overlap_By_Content_Type()
-        {
-            void AddPropType(IContentType ct)
-            {
-                var contentCollection = new PropertyTypeCollection(true)
-                {
-                    new PropertyType(ShortStringHelper, Constants.PropertyEditors.Aliases.TextBox, ValueStorageType.Ntext) { Alias = "title", Name = "Title", Description = string.Empty, Mandatory = false, SortOrder = 1, DataTypeId = -88 }
-                };
-                var pg = new PropertyGroup(contentCollection)
-                {
-                    Alias = "test",
-                    Name = "test",
-                    SortOrder = 1
-                };
-                ct.PropertyGroups.Add(pg);
-            }
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        AddPropType(ct2);
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        AddPropType(ct3);
+        var ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4");
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
+        ct4.Id = 4;
 
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1", null);
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", null);
-            AddPropType(ct2);
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3", null);
-            AddPropType(ct3);
-            ContentType ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4", null);
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
-            ct4.Id = 4;
+        var service = new Mock<IContentTypeService>();
 
-            var service = new Mock<IContentTypeService>();
-
-            IContentTypeComposition[] availableTypes = service.Object.GetAvailableCompositeContentTypes(
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
                 ct1,
                 new[] { ct1, ct2, ct3, ct4 },
                 new[] { ct2.Alias })
-                .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
+            .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
 
-            Assert.AreEqual(1, availableTypes.Count());
-            Assert.AreEqual(ct4.Id, availableTypes.ElementAt(0).Id);
-        }
+        Assert.AreEqual(1, availableTypes.Count());
+        Assert.AreEqual(ct4.Id, availableTypes.ElementAt(0).Id);
+    }
 
-        [Test]
-        public void GetAvailableCompositeContentTypes_Not_Itself()
-        {
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1", null);
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", null);
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3", null);
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
+    [Test]
+    public void GetAvailableCompositeContentTypes_Not_Itself()
+    {
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
 
-            var service = new Mock<IContentTypeService>();
+        var service = new Mock<IContentTypeService>();
 
-            IContentTypeComposition[] availableTypes = service.Object.GetAvailableCompositeContentTypes(
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
                 ct1,
                 new[] { ct1, ct2, ct3 })
-                .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
+            .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
 
-            Assert.AreEqual(2, availableTypes.Count());
-            Assert.AreEqual(ct2.Id, availableTypes.ElementAt(0).Id);
-            Assert.AreEqual(ct3.Id, availableTypes.ElementAt(1).Id);
-        }
+        Assert.AreEqual(2, availableTypes.Count());
+        Assert.AreEqual(ct2.Id, availableTypes.ElementAt(0).Id);
+        Assert.AreEqual(ct3.Id, availableTypes.ElementAt(1).Id);
+    }
 
-        // This shows that a nested comp is not allowed
-        [Test]
-        public void GetAvailableCompositeContentTypes_No_Results_If_Already_A_Composition_By_Parent()
-        {
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
-            ct1.Id = 1;
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", ct1);
-            ct2.Id = 2;
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
-            ct3.Id = 3;
+    // This shows that a nested comp is not allowed
+    [Test]
+    public void GetAvailableCompositeContentTypes_No_Results_If_Already_A_Composition_By_Parent()
+    {
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        ct1.Id = 1;
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2", ct1);
+        ct2.Id = 2;
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        ct3.Id = 3;
 
-            var service = new Mock<IContentTypeService>();
+        var service = new Mock<IContentTypeService>();
 
-            System.Collections.Generic.IEnumerable<ContentTypeAvailableCompositionsResult> availableTypes = service.Object.GetAvailableCompositeContentTypes(
-                ct1,
-                new[] { ct1, ct2, ct3 }).Results;
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
+            ct1,
+            new[] { ct1, ct2, ct3 }).Results;
 
-            Assert.AreEqual(0, availableTypes.Count());
-        }
+        Assert.AreEqual(0, availableTypes.Count());
+    }
 
-        // This shows that a nested comp is not allowed
-        [Test]
-        public void GetAvailableCompositeContentTypes_No_Results_If_Already_A_Composition()
-        {
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
+    // This shows that a nested comp is not allowed
+    [Test]
+    public void GetAvailableCompositeContentTypes_No_Results_If_Already_A_Composition()
+    {
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
 
-            ct2.AddContentType(ct1);
+        ct2.AddContentType(ct1);
 
-            var service = new Mock<IContentTypeService>();
+        var service = new Mock<IContentTypeService>();
 
-            System.Collections.Generic.IEnumerable<ContentTypeAvailableCompositionsResult> availableTypes = service.Object.GetAvailableCompositeContentTypes(
-                ct1,
-                new[] { ct1, ct2, ct3 }).Results;
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
+            ct1,
+            new[] { ct1, ct2, ct3 }).Results;
 
-            Assert.AreEqual(0, availableTypes.Count());
-        }
+        Assert.AreEqual(0, availableTypes.Count());
+    }
 
-        [Test]
-        public void GetAvailableCompositeContentTypes_Do_Not_Include_Other_Composed_Types()
-        {
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
+    [Test]
+    public void GetAvailableCompositeContentTypes_Do_Not_Include_Other_Composed_Types()
+    {
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
 
-            ct2.AddContentType(ct3);
+        ct2.AddContentType(ct3);
 
-            var service = new Mock<IContentTypeService>();
+        var service = new Mock<IContentTypeService>();
 
-            IContentTypeComposition[] availableTypes = service.Object.GetAvailableCompositeContentTypes(
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
                 ct1,
                 new[] { ct1, ct2, ct3 })
-                .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
+            .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
 
-            Assert.AreEqual(1, availableTypes.Count());
-            Assert.AreEqual(ct3.Id, availableTypes.Single().Id);
-        }
+        Assert.AreEqual(1, availableTypes.Count());
+        Assert.AreEqual(ct3.Id, availableTypes.Single().Id);
+    }
 
-        [Test]
-        public void GetAvailableCompositeContentTypes_Include_Direct_Composed_Types()
-        {
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
+    [Test]
+    public void GetAvailableCompositeContentTypes_Include_Direct_Composed_Types()
+    {
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
 
-            ct1.AddContentType(ct3);
+        ct1.AddContentType(ct3);
 
-            var service = new Mock<IContentTypeService>();
+        var service = new Mock<IContentTypeService>();
 
-            IContentTypeComposition[] availableTypes = service.Object.GetAvailableCompositeContentTypes(
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
                 ct1,
                 new[] { ct1, ct2, ct3 })
-                .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
+            .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
 
-            Assert.AreEqual(2, availableTypes.Count());
-            Assert.AreEqual(ct2.Id, availableTypes.ElementAt(0).Id);
-            Assert.AreEqual(ct3.Id, availableTypes.ElementAt(1).Id);
-        }
+        Assert.AreEqual(2, availableTypes.Count());
+        Assert.AreEqual(ct2.Id, availableTypes.ElementAt(0).Id);
+        Assert.AreEqual(ct3.Id, availableTypes.ElementAt(1).Id);
+    }
 
-        [Test]
-        public void GetAvailableCompositeContentTypes_Include_Indirect_Composed_Types()
-        {
-            ContentType ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
-            ContentType ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
-            ContentType ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
-            ContentType ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4");
-            ct1.Id = 1;
-            ct2.Id = 2;
-            ct3.Id = 3;
-            ct4.Id = 4;
+    [Test]
+    public void GetAvailableCompositeContentTypes_Include_Indirect_Composed_Types()
+    {
+        var ct1 = ContentTypeBuilder.CreateBasicContentType("ct1", "CT1");
+        var ct2 = ContentTypeBuilder.CreateBasicContentType("ct2", "CT2");
+        var ct3 = ContentTypeBuilder.CreateBasicContentType("ct3", "CT3");
+        var ct4 = ContentTypeBuilder.CreateBasicContentType("ct4", "CT4");
+        ct1.Id = 1;
+        ct2.Id = 2;
+        ct3.Id = 3;
+        ct4.Id = 4;
 
-            ct1.AddContentType(ct3);    // ct3 is direct to ct1
-            ct3.AddContentType(ct4);    // ct4 is indirect to ct1
+        ct1.AddContentType(ct3); // ct3 is direct to ct1
+        ct3.AddContentType(ct4); // ct4 is indirect to ct1
 
-            var service = new Mock<IContentTypeService>();
+        var service = new Mock<IContentTypeService>();
 
-            IContentTypeComposition[] availableTypes = service.Object.GetAvailableCompositeContentTypes(
+        var availableTypes = service.Object.GetAvailableCompositeContentTypes(
                 ct1,
                 new[] { ct1, ct2, ct3 })
-                .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
+            .Results.Where(x => x.Allowed).Select(x => x.Composition).ToArray();
 
-            Assert.AreEqual(3, availableTypes.Count());
-            Assert.AreEqual(ct2.Id, availableTypes.ElementAt(0).Id);
-            Assert.AreEqual(ct3.Id, availableTypes.ElementAt(1).Id);
-            Assert.AreEqual(ct4.Id, availableTypes.ElementAt(2).Id);
-        }
+        Assert.AreEqual(3, availableTypes.Count());
+        Assert.AreEqual(ct2.Id, availableTypes.ElementAt(0).Id);
+        Assert.AreEqual(ct3.Id, availableTypes.ElementAt(1).Id);
+        Assert.AreEqual(ct4.Id, availableTypes.ElementAt(2).Id);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupServiceTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupServiceTest.cs
index 11ff6db989..3684eba470 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupServiceTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/ContentVersionCleanupServiceTest.cs
@@ -10,158 +10,164 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Persistence.Repositories;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 
-namespace Umbraco.Tests.Services
+namespace Umbraco.Tests.Services;
+
+[TestFixture]
+internal class ContentVersionCleanupServiceTest
 {
-    [TestFixture]
-    internal class ContentVersionCleanupServiceTest
+    [Test]
+    [AutoMoqData]
+    public void PerformContentVersionCleanup_Always_RespectsDeleteRevisionsCancellation(
+        [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
+        [Frozen] Mock<IContentVersionCleanupPolicy> policy,
+        [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
+        List<ContentVersionMeta> someHistoricVersions,
+        DateTime aDateTime,
+        ContentVersionService sut)
     {
-        [Test]
-        [AutoMoqData]
-        public void PerformContentVersionCleanup_Always_RespectsDeleteRevisionsCancellation(
-            [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
-            [Frozen] Mock<IContentVersionCleanupPolicy> policy,
-            [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<ContentVersionMeta> someHistoricVersions,
-            DateTime aDateTime,
-            ContentVersionService sut)
+        documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
+            .Returns(someHistoricVersions);
+
+        eventAggregator.Setup(x => x.PublishCancelable(It.IsAny<ContentDeletingVersionsNotification>()))
+            .Returns(true);
+
+        policy.Setup(x => x.Apply(aDateTime, someHistoricVersions))
+            .Returns(someHistoricVersions);
+
+        // # Act
+        var report = sut.PerformContentVersionCleanup(aDateTime);
+
+        Assert.Multiple(() =>
         {
-            documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
-                .Returns(someHistoricVersions);
+            eventAggregator.Verify(
+                x => x.PublishCancelable(
+                    It.IsAny<ContentDeletingVersionsNotification>()),
+                Times.Exactly(someHistoricVersions.Count));
+            Assert.AreEqual(0, report.Count);
+        });
+    }
 
-            eventAggregator.Setup(x => x.PublishCancelable(It.IsAny<ContentDeletingVersionsNotification>()))
-                .Returns(true);
+    [Test]
+    [AutoMoqData]
+    public void PerformContentVersionCleanup_Always_FiresDeletedVersionsForEachDeletedVersion(
+        [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
+        [Frozen] Mock<IContentVersionCleanupPolicy> policy,
+        [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
+        List<ContentVersionMeta> someHistoricVersions,
+        DateTime aDateTime,
+        ContentVersionService sut)
+    {
+        documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
+            .Returns(someHistoricVersions);
 
-            policy.Setup(x => x.Apply(aDateTime, someHistoricVersions))
-                .Returns(someHistoricVersions);
+        eventAggregator
+            .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
+            .Returns(false);
 
-            // # Act
-            IReadOnlyCollection<ContentVersionMeta> report = sut.PerformContentVersionCleanup(aDateTime);
+        policy.Setup(x => x.Apply(aDateTime, someHistoricVersions))
+            .Returns(someHistoricVersions);
 
-            Assert.Multiple(() =>
-            {
-                eventAggregator.Verify(x => x.PublishCancelable(It.IsAny<ContentDeletingVersionsNotification>()), Times.Exactly(someHistoricVersions.Count));
-                Assert.AreEqual(0, report.Count);
-            });
-        }
+        // # Act
+        sut.PerformContentVersionCleanup(aDateTime);
 
-        [Test]
-        [AutoMoqData]
-        public void PerformContentVersionCleanup_Always_FiresDeletedVersionsForEachDeletedVersion(
-            [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
-            [Frozen] Mock<IContentVersionCleanupPolicy> policy,
-            [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<ContentVersionMeta> someHistoricVersions,
-            DateTime aDateTime,
-            ContentVersionService sut)
+        eventAggregator.Verify(x => x.Publish(It.IsAny<ContentDeletedVersionsNotification>()), Times.Exactly(someHistoricVersions.Count));
+    }
+
+    [Test]
+    [AutoMoqData]
+    public void PerformContentVersionCleanup_Always_ReturnsReportOfDeletedItems(
+        [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
+        [Frozen] Mock<IContentVersionCleanupPolicy> policy,
+        [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
+        List<ContentVersionMeta> someHistoricVersions,
+        DateTime aDateTime,
+        ContentVersionService sut)
+    {
+        documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
+            .Returns(someHistoricVersions);
+
+        eventAggregator
+            .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
+            .Returns(false);
+
+        // # Act
+        var report = sut.PerformContentVersionCleanup(aDateTime);
+
+        Assert.Multiple(() =>
         {
-            documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
-                .Returns(someHistoricVersions);
+            Assert.Greater(report.Count, 0);
+            Assert.AreEqual(someHistoricVersions.Count, report.Count);
+        });
+    }
 
-            eventAggregator
-                 .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
-                 .Returns(false);
+    [Test]
+    [AutoMoqData]
+    public void PerformContentVersionCleanup_Always_AdheresToCleanupPolicy(
+        [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
+        [Frozen] Mock<IContentVersionCleanupPolicy> policy,
+        [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
+        List<ContentVersionMeta> someHistoricVersions,
+        DateTime aDateTime,
+        ContentVersionService sut)
+    {
+        documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
+            .Returns(someHistoricVersions);
 
-            policy.Setup(x => x.Apply(aDateTime, someHistoricVersions))
-                .Returns(someHistoricVersions);
+        eventAggregator
+            .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
+            .Returns(false);
 
-            // # Act
-            sut.PerformContentVersionCleanup(aDateTime);
+        policy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<ContentVersionMeta>>()))
+            .Returns<DateTime, IEnumerable<ContentVersionMeta>>((_, items) => items.Take(1));
 
-            eventAggregator.Verify(x => x.Publish(It.IsAny<ContentDeletedVersionsNotification>()), Times.Exactly(someHistoricVersions.Count));
-        }
+        // # Act
+        var report = sut.PerformContentVersionCleanup(aDateTime);
 
-        [Test, AutoMoqData]
-        public void PerformContentVersionCleanup_Always_ReturnsReportOfDeletedItems(
-            [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
-            [Frozen] Mock<IContentVersionCleanupPolicy> policy,
-            [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<ContentVersionMeta> someHistoricVersions,
-            DateTime aDateTime,
-            ContentVersionService sut)
+        Debug.Assert(someHistoricVersions.Count > 1);
+
+        Assert.Multiple(() =>
         {
-            documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
-                .Returns(someHistoricVersions);
+            policy.Verify(x => x.Apply(aDateTime, someHistoricVersions), Times.Once);
+            Assert.AreEqual(someHistoricVersions.First(), report.Single());
+        });
+    }
 
-            eventAggregator
-                .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
-                .Returns(false);
+    /// <remarks>
+    ///     For v9 this just needs a rewrite, no static events, no service location etc
+    /// </remarks>
+    [Test]
+    [AutoMoqData]
+    public void PerformContentVersionCleanup_HasVersionsToDelete_CallsDeleteOnRepositoryWithFilteredSet(
+        [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
+        [Frozen] Mock<IContentVersionCleanupPolicy> policy,
+        [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
+        List<ContentVersionMeta> someHistoricVersions,
+        DateTime aDateTime,
+        ContentVersionService sut)
+    {
+        documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
+            .Returns(someHistoricVersions);
 
-            // # Act
-            var report = sut.PerformContentVersionCleanup(aDateTime);
+        eventAggregator
+            .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
+            .Returns(false);
 
-            Assert.Multiple(() =>
-            {
-                Assert.Greater(report.Count, 0);
-                Assert.AreEqual(someHistoricVersions.Count, report.Count);
-            });
-        }
+        var filteredSet = someHistoricVersions.Take(1);
 
-        [Test, AutoMoqData]
-        public void PerformContentVersionCleanup_Always_AdheresToCleanupPolicy(
-            [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
-            [Frozen] Mock<IContentVersionCleanupPolicy> policy,
-            [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<ContentVersionMeta> someHistoricVersions,
-            DateTime aDateTime,
-            ContentVersionService sut)
-        {
-            documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
-                .Returns(someHistoricVersions);
+        policy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<ContentVersionMeta>>()))
+            .Returns<DateTime, IEnumerable<ContentVersionMeta>>((_, items) => filteredSet);
 
-            eventAggregator
-                .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
-                .Returns(false);
+        // # Act
+        sut.PerformContentVersionCleanup(aDateTime);
 
-            policy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<ContentVersionMeta>>()))
-                .Returns<DateTime, IEnumerable<ContentVersionMeta>>((_, items) => items.Take(1));
+        Debug.Assert(someHistoricVersions.Any());
 
-            // # Act
-            var report = sut.PerformContentVersionCleanup(aDateTime);
+        var expectedId = filteredSet.First().VersionId;
 
-            Debug.Assert(someHistoricVersions.Count > 1);
-
-            Assert.Multiple(() =>
-            {
-                policy.Verify(x => x.Apply(aDateTime, someHistoricVersions), Times.Once);
-                Assert.AreEqual(someHistoricVersions.First(), report.Single());
-            });
-        }
-
-        /// <remarks>
-        /// For v9 this just needs a rewrite, no static events, no service location etc
-        /// </remarks>
-        [Test, AutoMoqData]
-        public void PerformContentVersionCleanup_HasVersionsToDelete_CallsDeleteOnRepositoryWithFilteredSet(
-            [Frozen] Mock<IScopedNotificationPublisher> eventAggregator,
-            [Frozen] Mock<IContentVersionCleanupPolicy> policy,
-            [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
-            List<ContentVersionMeta> someHistoricVersions,
-            DateTime aDateTime,
-            ContentVersionService sut)
-        {
-            documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
-                .Returns(someHistoricVersions);
-
-            eventAggregator
-                .Setup(x => x.PublishCancelable(It.IsAny<ICancelableNotification>()))
-                .Returns(false);
-
-            var filteredSet = someHistoricVersions.Take(1);
-
-            policy.Setup(x => x.Apply(It.IsAny<DateTime>(), It.IsAny<IEnumerable<ContentVersionMeta>>()))
-                .Returns<DateTime, IEnumerable<ContentVersionMeta>>((_, items) => filteredSet);
-
-            // # Act
-            var report = sut.PerformContentVersionCleanup(aDateTime);
-
-            Debug.Assert(someHistoricVersions.Any());
-
-            var expectedId = filteredSet.First().VersionId;
-
-            documentVersionRepository.Verify(x => x.DeleteVersions(It.Is<IEnumerable<int>>(y => y.Single() == expectedId)), Times.Once);
-        }
+        documentVersionRepository.Verify(
+            x => x.DeleteVersions(It.Is<IEnumerable<int>>(y => y.Single() == expectedId)),
+            Times.Once);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicyTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicyTest.cs
index 6eb9af166f..e7879afea2 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicyTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/DefaultContentVersionCleanupPolicyTest.cs
@@ -17,7 +17,8 @@ namespace Umbraco.Tests.Services
     [TestFixture]
     public class DefaultContentVersionCleanupPolicyTest
     {
-        [Test, AutoMoqData]
+        [Test]
+        [AutoMoqData]
         public void Apply_AllOlderThanKeepSettings_AllVersionsReturned(
             [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
             [Frozen] Mock<IOptions<ContentSettings>> contentSettings,
@@ -37,8 +38,8 @@ namespace Umbraco.Tests.Services
                 {
                     EnableCleanup = true,
                     KeepAllVersionsNewerThanDays = 0,
-                    KeepLatestVersionPerDayForDays = 0
-                }
+                    KeepLatestVersionPerDayForDays = 0,
+                },
             });
 
             documentVersionRepository.Setup(x => x.GetCleanupPolicies())
@@ -52,7 +53,8 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(2, results.Count);
         }
 
-        [Test, AutoMoqData]
+        [Test]
+        [AutoMoqData]
         public void Apply_OverlappingKeepSettings_KeepAllVersionsNewerThanDaysTakesPriority(
             [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
             [Frozen] Mock<IOptions<ContentSettings>> contentSettings,
@@ -72,8 +74,8 @@ namespace Umbraco.Tests.Services
                 {
                     EnableCleanup = true,
                     KeepAllVersionsNewerThanDays = 2,
-                    KeepLatestVersionPerDayForDays = 2
-                }
+                    KeepLatestVersionPerDayForDays = 2,
+                },
             });
 
             documentVersionRepository.Setup(x => x.GetCleanupPolicies())
@@ -87,7 +89,8 @@ namespace Umbraco.Tests.Services
             Assert.AreEqual(0, results.Count);
         }
 
-        [Test, AutoMoqData]
+        [Test]
+        [AutoMoqData]
         public void Apply_WithinInKeepLatestPerDay_ReturnsSinglePerContentPerDay(
             [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
             [Frozen] Mock<IOptions<ContentSettings>> contentSettings,
@@ -102,21 +105,21 @@ namespace Umbraco.Tests.Services
                 new ContentVersionMeta(versionId: 4, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddDays(-1).AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 5, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddDays(-1).AddHours(-2), false, false, false, null),
                 new ContentVersionMeta(versionId: 6, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddDays(-1).AddHours(-1), false, false, false, null),
+
                 // another content
                 new ContentVersionMeta(versionId: 7, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 8, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
                 new ContentVersionMeta(versionId: 9, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
             };
 
-
             contentSettings.Setup(x => x.Value).Returns(new ContentSettings()
             {
                 ContentVersionCleanupPolicy = new Cms.Core.Configuration.Models.ContentVersionCleanupPolicySettings()
                 {
                     EnableCleanup = true,
                     KeepAllVersionsNewerThanDays = 0,
-                    KeepLatestVersionPerDayForDays = 3
-                }
+                    KeepLatestVersionPerDayForDays = 3,
+                },
             });
 
             documentVersionRepository.Setup(x => x.GetCleanupPolicies())
@@ -140,7 +143,8 @@ namespace Umbraco.Tests.Services
             });
         }
 
-        [Test, AutoMoqData]
+        [Test]
+        [AutoMoqData]
         public void Apply_HasOverridePolicy_RespectsPreventCleanup(
             [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
             [Frozen] Mock<IOptions<ContentSettings>> contentSettings,
@@ -151,6 +155,7 @@ namespace Umbraco.Tests.Services
                 new ContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
                 new ContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
+
                 // another content & type
                 new ContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
@@ -163,14 +168,14 @@ namespace Umbraco.Tests.Services
                 {
                     EnableCleanup = true,
                     KeepAllVersionsNewerThanDays = 0,
-                    KeepLatestVersionPerDayForDays = 0
-                }
+                    KeepLatestVersionPerDayForDays = 0,
+                },
             });
 
             documentVersionRepository.Setup(x => x.GetCleanupPolicies())
                 .Returns(new ContentVersionCleanupPolicySettings[]
                 {
-                    new ContentVersionCleanupPolicySettings{ ContentTypeId = 2, PreventCleanup = true }
+                    new() { ContentTypeId = 2, PreventCleanup = true },
                 });
 
             documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
@@ -181,7 +186,8 @@ namespace Umbraco.Tests.Services
             Assert.True(results.All(x => x.ContentTypeId == 1));
         }
 
-        [Test, AutoMoqData]
+        [Test]
+        [AutoMoqData]
         public void Apply_HasOverridePolicy_RespectsKeepAll(
             [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
             [Frozen] Mock<IOptions<ContentSettings>> contentSettings,
@@ -192,6 +198,7 @@ namespace Umbraco.Tests.Services
                 new ContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
                 new ContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
+
                 // another content & type
                 new ContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
@@ -204,14 +211,14 @@ namespace Umbraco.Tests.Services
                 {
                     EnableCleanup = true,
                     KeepAllVersionsNewerThanDays = 0,
-                    KeepLatestVersionPerDayForDays = 0
-                }
+                    KeepLatestVersionPerDayForDays = 0,
+                },
             });
 
             documentVersionRepository.Setup(x => x.GetCleanupPolicies())
                 .Returns(new ContentVersionCleanupPolicySettings[]
                 {
-                    new ContentVersionCleanupPolicySettings{ ContentTypeId = 2, PreventCleanup = false, KeepAllVersionsNewerThanDays = 3 }
+                    new() { ContentTypeId = 2, PreventCleanup = false, KeepAllVersionsNewerThanDays = 3 },
                 });
 
             documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
@@ -222,7 +229,8 @@ namespace Umbraco.Tests.Services
             Assert.True(results.All(x => x.ContentTypeId == 1));
         }
 
-        [Test, AutoMoqData]
+        [Test]
+        [AutoMoqData]
         public void Apply_HasOverridePolicy_RespectsKeepLatest(
             [Frozen] Mock<IDocumentVersionRepository> documentVersionRepository,
             [Frozen] Mock<IOptions<ContentSettings>> contentSettings,
@@ -233,10 +241,12 @@ namespace Umbraco.Tests.Services
                 new ContentVersionMeta(versionId: 1, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 2, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
                 new ContentVersionMeta(versionId: 3, contentId: 1, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
+
                 // another content
                 new ContentVersionMeta(versionId: 4, contentId: 2, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 5, contentId: 2, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
                 new ContentVersionMeta(versionId: 6, contentId: 2, contentTypeId: 1, -1, versionDate: DateTime.Today.AddHours(-1), false, false, false, null),
+
                 // another content & type
                 new ContentVersionMeta(versionId: 7, contentId: 3, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-3), false, false, false, null),
                 new ContentVersionMeta(versionId: 8, contentId: 3, contentTypeId: 2, -1, versionDate: DateTime.Today.AddHours(-2), false, false, false, null),
@@ -249,14 +259,14 @@ namespace Umbraco.Tests.Services
                 {
                     EnableCleanup = true,
                     KeepAllVersionsNewerThanDays = 0,
-                    KeepLatestVersionPerDayForDays = 0
-                }
+                    KeepLatestVersionPerDayForDays = 0,
+                },
             });
 
             documentVersionRepository.Setup(x => x.GetCleanupPolicies())
                 .Returns(new ContentVersionCleanupPolicySettings[]
                 {
-                    new ContentVersionCleanupPolicySettings{ ContentTypeId = 2, PreventCleanup = false, KeepLatestVersionPerDayForDays = 3 }
+                    new() { ContentTypeId = 2, PreventCleanup = false, KeepLatestVersionPerDayForDays = 3 },
                 });
 
             documentVersionRepository.Setup(x => x.GetDocumentVersionsEligibleForCleanup())
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs
index 3c638fb2ef..f50bb8ae09 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -16,141 +15,145 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Telemetry.Providers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Services;
+
+[TestFixture]
+public class UserDataServiceTests
 {
-    [TestFixture]
-    public class UserDataServiceTests
+    [OneTimeSetUp]
+    public void CreateMocks() => CreateUmbracoVersion(9, 0, 0);
+
+    private IUmbracoVersion _umbracoVersion;
+
+    [Test]
+    [TestCase("en-US")]
+    [TestCase("de-DE")]
+    [TestCase("en-NZ")]
+    [TestCase("sv-SE")]
+    public void GetCorrectDefaultLanguageTest(string culture)
     {
-        private IUmbracoVersion _umbracoVersion;
-
-        [OneTimeSetUp]
-        public void CreateMocks() => CreateUmbracoVersion(9, 0, 0);
-
-        [Test]
-        [TestCase("en-US")]
-        [TestCase("de-DE")]
-        [TestCase("en-NZ")]
-        [TestCase("sv-SE")]
-        public void GetCorrectDefaultLanguageTest(string culture)
+        var userDataService = CreateUserDataService(culture);
+        var defaultLanguage = userDataService.GetUserData().FirstOrDefault(x => x.Name == "Default Language");
+        Assert.Multiple(() =>
         {
-            var userDataService = CreateUserDataService(culture);
-            var defaultLanguage = userDataService.GetUserData().FirstOrDefault(x => x.Name == "Default Language");
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(defaultLanguage);
-                Assert.AreEqual(culture, defaultLanguage.Data);
-            });
-        }
+            Assert.IsNotNull(defaultLanguage);
+            Assert.AreEqual(culture, defaultLanguage.Data);
+        });
+    }
 
-        [Test]
-        [TestCase("en-US")]
-        [TestCase("de-DE")]
-        [TestCase("en-NZ")]
-        [TestCase("sv-SE")]
-        public void GetCorrectCultureTest(string culture)
+    [Test]
+    [TestCase("en-US")]
+    [TestCase("de-DE")]
+    [TestCase("en-NZ")]
+    [TestCase("sv-SE")]
+    public void GetCorrectCultureTest(string culture)
+    {
+        Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
+        var userDataService = CreateUserDataService(culture);
+        var currentCulture = userDataService.GetUserData().FirstOrDefault(x => x.Name == "Current Culture");
+        Assert.Multiple(() =>
         {
-            Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
-            var userDataService = CreateUserDataService(culture);
-            var currentCulture = userDataService.GetUserData().FirstOrDefault(x => x.Name == "Current Culture");
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(currentCulture);
-                Assert.AreEqual(culture, currentCulture.Data);
-            });
-        }
+            Assert.IsNotNull(currentCulture);
+            Assert.AreEqual(culture, currentCulture.Data);
+        });
+    }
 
-        [Test]
-        [TestCase("en-US")]
-        [TestCase("de-DE")]
-        [TestCase("en-NZ")]
-        [TestCase("sv-SE")]
-        public void GetCorrectUICultureTest(string culture)
+    [Test]
+    [TestCase("en-US")]
+    [TestCase("de-DE")]
+    [TestCase("en-NZ")]
+    [TestCase("sv-SE")]
+    public void GetCorrectUICultureTest(string culture)
+    {
+        Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
+        var userDataService = CreateUserDataService(culture);
+        var currentCulture = userDataService.GetUserData().FirstOrDefault(x => x.Name == "Current UI Culture");
+        Assert.Multiple(() =>
         {
-            Thread.CurrentThread.CurrentUICulture = new CultureInfo(culture);
-            var userDataService = CreateUserDataService(culture);
-            var currentCulture = userDataService.GetUserData().FirstOrDefault(x => x.Name == "Current UI Culture");
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(currentCulture);
-                Assert.AreEqual(culture, currentCulture.Data);
-            });
-        }
+            Assert.IsNotNull(currentCulture);
+            Assert.AreEqual(culture, currentCulture.Data);
+        });
+    }
 
-        [Test]
-        [TestCase("en-US")]
-        [TestCase("de-DE")]
-        [TestCase("en-NZ")]
-        [TestCase("sv-SE")]
-        public void RunTimeInformationNotNullTest(string culture)
+    [Test]
+    [TestCase("en-US")]
+    [TestCase("de-DE")]
+    [TestCase("en-NZ")]
+    [TestCase("sv-SE")]
+    public void RunTimeInformationNotNullTest(string culture)
+    {
+        var userDataService = CreateUserDataService(culture);
+        IEnumerable<UserData> userData = userDataService.GetUserData().ToList();
+        Assert.Multiple(() =>
         {
-            var userDataService = CreateUserDataService(culture);
-            IEnumerable<UserData> userData = userDataService.GetUserData().ToList();
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(userData.Select(x => x.Name == "Server OS"));
-                Assert.IsNotNull(userData.Select(x => x.Name == "Server Framework"));
-                Assert.IsNotNull(userData.Select(x => x.Name == "Current Webserver"));
-            });
-        }
+            Assert.IsNotNull(userData.Select(x => x.Name == "Server OS"));
+            Assert.IsNotNull(userData.Select(x => x.Name == "Server Framework"));
+            Assert.IsNotNull(userData.Select(x => x.Name == "Current Webserver"));
+        });
+    }
 
-        [Test]
-        [TestCase(ModelsMode.Nothing)]
-        [TestCase(ModelsMode.InMemoryAuto)]
-        [TestCase(ModelsMode.SourceCodeAuto)]
-        [TestCase(ModelsMode.SourceCodeManual)]
-        public void ReportsModelsModeCorrectly(ModelsMode modelsMode)
-        {
-            var userDataService = CreateUserDataService(modelsMode: modelsMode);
-            UserData[] userData = userDataService.GetUserData().ToArray();
+    [Test]
+    [TestCase(ModelsMode.Nothing)]
+    [TestCase(ModelsMode.InMemoryAuto)]
+    [TestCase(ModelsMode.SourceCodeAuto)]
+    [TestCase(ModelsMode.SourceCodeManual)]
+    public void ReportsModelsModeCorrectly(ModelsMode modelsMode)
+    {
+        var userDataService = CreateUserDataService(modelsMode: modelsMode);
+        var userData = userDataService.GetUserData().ToArray();
 
-            var actual = userData.FirstOrDefault(x => x.Name == "Models Builder Mode");
-            Assert.IsNotNull(actual?.Data);
-            Assert.AreEqual(modelsMode.ToString(), actual.Data);
-        }
+        var actual = userData.FirstOrDefault(x => x.Name == "Models Builder Mode");
+        Assert.IsNotNull(actual?.Data);
+        Assert.AreEqual(modelsMode.ToString(), actual.Data);
+    }
 
-        [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void ReportsDebugModeCorrectly(bool isDebug)
-        {
-            var userDataService = CreateUserDataService(isDebug: isDebug);
-            UserData[] userData = userDataService.GetUserData().ToArray();
+    [Test]
+    [TestCase(true)]
+    [TestCase(false)]
+    public void ReportsDebugModeCorrectly(bool isDebug)
+    {
+        var userDataService = CreateUserDataService(isDebug: isDebug);
+        var userData = userDataService.GetUserData().ToArray();
 
-            var actual = userData.FirstOrDefault(x => x.Name == "Debug Mode");
-            Assert.IsNotNull(actual?.Data);
-            Assert.AreEqual(isDebug.ToString(), actual.Data);
-        }
+        var actual = userData.FirstOrDefault(x => x.Name == "Debug Mode");
+        Assert.IsNotNull(actual?.Data);
+        Assert.AreEqual(isDebug.ToString(), actual.Data);
+    }
 
-        private SystemInformationTelemetryProvider CreateUserDataService(string culture = "", ModelsMode modelsMode = ModelsMode.InMemoryAuto, bool isDebug = true)
-        {
-            var localizationService = CreateILocalizationService(culture);
+    private SystemInformationTelemetryProvider CreateUserDataService(
+        string culture = "",
+        ModelsMode modelsMode = ModelsMode.InMemoryAuto,
+        bool isDebug = true)
+    {
+        var localizationService = CreateILocalizationService(culture);
 
-            var databaseMock = new Mock<IUmbracoDatabase>();
-            databaseMock.Setup(x => x.DatabaseType.GetProviderName()).Returns("SQL");
+        var databaseMock = new Mock<IUmbracoDatabase>();
+        databaseMock.Setup(x => x.DatabaseType.GetProviderName()).Returns("SQL");
 
-            return new SystemInformationTelemetryProvider(
-                _umbracoVersion,
-                localizationService,
-                Mock.Of<IOptionsMonitor<ModelsBuilderSettings>>(x => x.CurrentValue == new ModelsBuilderSettings { ModelsMode = modelsMode }),
-                Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == new HostingSettings { Debug = isDebug }),
-                Mock.Of<IOptionsMonitor<GlobalSettings>>(x => x.CurrentValue == new GlobalSettings()),
-                Mock.Of<IHostEnvironment>(),
-                Mock.Of<IUmbracoDatabaseFactory>(x=>x.CreateDatabase() == Mock.Of<IUmbracoDatabase>(y=>y.DatabaseType == DatabaseType.SQLite)));
-        }
+        return new SystemInformationTelemetryProvider(
+            _umbracoVersion,
+            localizationService,
+            Mock.Of<IOptionsMonitor<ModelsBuilderSettings>>(x =>
+                x.CurrentValue == new ModelsBuilderSettings { ModelsMode = modelsMode }),
+            Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == new HostingSettings { Debug = isDebug }),
+            Mock.Of<IOptionsMonitor<GlobalSettings>>(x => x.CurrentValue == new GlobalSettings()),
+            Mock.Of<IHostEnvironment>(),
+            Mock.Of<IUmbracoDatabaseFactory>(x =>
+                x.CreateDatabase() == Mock.Of<IUmbracoDatabase>(y => y.DatabaseType == DatabaseType.SQLite)));
+    }
 
-        private ILocalizationService CreateILocalizationService(string culture)
-        {
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns(culture);
-            return localizationService.Object;
-        }
+    private ILocalizationService CreateILocalizationService(string culture)
+    {
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns(culture);
+        return localizationService.Object;
+    }
 
-        private void CreateUmbracoVersion(int major, int minor, int patch)
-        {
-            var umbracoVersion = new Mock<IUmbracoVersion>();
-            var semVersion = new SemVersion(major, minor, patch);
-            umbracoVersion.Setup(x => x.SemanticVersion).Returns(semVersion);
-            _umbracoVersion = umbracoVersion.Object;
-        }
+    private void CreateUmbracoVersion(int major, int minor, int patch)
+    {
+        var umbracoVersion = new Mock<IUmbracoVersion>();
+        var semVersion = new SemVersion(major, minor, patch);
+        umbracoVersion.Setup(x => x.SemanticVersion).Returns(semVersion);
+        _umbracoVersion = umbracoVersion.Object;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs
index 5f72f0d93d..634422cfec 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs
@@ -7,36 +7,36 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+
+[TestFixture]
+public class CmsHelperCasingTests
 {
-    [TestFixture]
-    public class CmsHelperCasingTests
+    private IShortStringHelper ShortStringHelper =>
+        new DefaultShortStringHelper(Options.Create(new RequestHandlerSettings()));
+
+    [TestCase("thisIsTheEnd", "This Is The End")]
+    [TestCase("th", "Th")]
+    [TestCase("t", "t")]
+    [TestCase("thisis", "Thisis")]
+    [TestCase("ThisIsTheEnd", "This Is The End")]
+    //// [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6In The Village")] // note the issue with Number6In
+    [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6 In The Village")] // now fixed since DefaultShortStringHelper is the default
+    public void SpaceCamelCasing(string input, string expected)
     {
-        private IShortStringHelper ShortStringHelper => new DefaultShortStringHelper(Options.Create(new RequestHandlerSettings()));
+        var output = input.SpaceCamelCasing(ShortStringHelper);
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase("thisIsTheEnd", "This Is The End")]
-        [TestCase("th", "Th")]
-        [TestCase("t", "t")]
-        [TestCase("thisis", "Thisis")]
-        [TestCase("ThisIsTheEnd", "This Is The End")]
-        //// [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6In The Village")] // note the issue with Number6In
-        [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6 In The Village")] // now fixed since DefaultShortStringHelper is the default
-        public void SpaceCamelCasing(string input, string expected)
-        {
-            var output = input.SpaceCamelCasing(ShortStringHelper);
-            Assert.AreEqual(expected, output);
-        }
-
-        [TestCase("thisIsTheEnd", "This Is The End")]
-        [TestCase("th", "Th")]
-        [TestCase("t", "t")]
-        [TestCase("thisis", "Thisis")]
-        [TestCase("ThisIsTheEnd", "This Is The End")]
-        [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6 In The Village")] // issue is fixed
-        public void CompatibleDefaultReplacement(string input, string expected)
-        {
-            var output = input.Length < 2 ? input : ShortStringHelper.SplitPascalCasing(input, ' ').ToFirstUpperInvariant();
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("thisIsTheEnd", "This Is The End")]
+    [TestCase("th", "Th")]
+    [TestCase("t", "t")]
+    [TestCase("thisis", "Thisis")]
+    [TestCase("ThisIsTheEnd", "This Is The End")]
+    [TestCase("WhoIsNumber6InTheVillage", "Who Is Number6 In The Village")] // issue is fixed
+    public void CompatibleDefaultReplacement(string input, string expected)
+    {
+        var output = input.Length < 2 ? input : ShortStringHelper.SplitPascalCasing(input, ' ').ToFirstUpperInvariant();
+        Assert.AreEqual(expected, output);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs
index 2731d8bc34..cae6f12e83 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTests.cs
@@ -8,178 +8,194 @@ using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+
+[TestFixture]
+public class DefaultShortStringHelperTests
 {
-    [TestFixture]
-    public class DefaultShortStringHelperTests
-    {
-        private IShortStringHelper ShortStringHelper { get; set; }
+    [SetUp]
+    public void SetUp() =>
 
-        [SetUp]
-        public void SetUp() =>
-
-            // NOTE pre-filters runs _before_ Recode takes place
-            // so there still may be utf8 chars even though you want ascii
-            ShortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.FileName, new DefaultShortStringHelperConfig.Config
-                {
-                    // PreFilter = ClearFileChars, // done in IsTerm
-                    IsTerm = (c, leading) => (char.IsLetterOrDigit(c) || c == '_') && DefaultShortStringHelper.IsValidFileNameChar(c),
-                    StringType = CleanStringType.LowerCase | CleanStringType.Ascii,
-                    Separator = '-'
-                })
-                .WithConfig(CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
+        // NOTE pre-filters runs _before_ Recode takes place
+        // so there still may be utf8 chars even though you want ascii
+        ShortStringHelper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.FileName, new DefaultShortStringHelperConfig.Config
+            {
+                // PreFilter = ClearFileChars, // done in IsTerm
+                IsTerm = (c, leading) =>
+                    (char.IsLetterOrDigit(c) || c == '_') && DefaultShortStringHelper.IsValidFileNameChar(c),
+                StringType = CleanStringType.LowerCase | CleanStringType.Ascii,
+                Separator = '-',
+            })
+            .WithConfig(
+                CleanStringType.UrlSegment,
+                new DefaultShortStringHelperConfig.Config
                 {
                     PreFilter = StripQuotes,
                     IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
                     StringType = CleanStringType.LowerCase | CleanStringType.Ascii,
-                    Separator = '-'
+                    Separator = '-',
                 })
-                .WithConfig("fr-FR", CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
+            .WithConfig(
+                "fr-FR",
+                CleanStringType.UrlSegment,
+                new DefaultShortStringHelperConfig.Config
                 {
                     PreFilter = FilterFrenchElisions,
-                    IsTerm = (c, leading) => leading ? char.IsLetter(c) : (char.IsLetterOrDigit(c) || c == '_'),
+                    IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c) || c == '_',
                     StringType = CleanStringType.LowerCase | CleanStringType.Ascii,
-                    Separator = '-'
+                    Separator = '-',
                 })
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     PreFilter = StripQuotes,
                     IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c),
-                    StringType = CleanStringType.UmbracoCase | CleanStringType.Ascii
+                    StringType = CleanStringType.UmbracoCase | CleanStringType.Ascii,
                 })
-                .WithConfig("fr-FR", CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            .WithConfig(
+                "fr-FR",
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     PreFilter = WhiteQuotes,
                     IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c),
-                    StringType = CleanStringType.UmbracoCase | CleanStringType.Ascii
+                    StringType = CleanStringType.UmbracoCase | CleanStringType.Ascii,
                 })
-                .WithConfig(CleanStringType.ConvertCase, new DefaultShortStringHelperConfig.Config
-                {
-                    PreFilter = null,
-                    IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_', // letter, digit or underscore
-                    StringType = CleanStringType.Ascii,
-                    BreakTermsOnUpper = true
-                }));
+            .WithConfig(CleanStringType.ConvertCase, new DefaultShortStringHelperConfig.Config
+            {
+                PreFilter = null,
+                IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_', // letter, digit or underscore
+                StringType = CleanStringType.Ascii,
+                BreakTermsOnUpper = true,
+            }));
 
-        private static readonly Regex s_frenchElisionsRegex = new Regex("\\b(c|d|j|l|m|n|qu|s|t)('|\u8217)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+    private IShortStringHelper ShortStringHelper { get; set; }
 
-        private static string FilterFrenchElisions(string s) => s_frenchElisionsRegex.Replace(s, string.Empty);
+    private static readonly Regex s_frenchElisionsRegex =
+        new("\\b(c|d|j|l|m|n|qu|s|t)('|\u8217)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static string StripQuotes(string s)
-        {
-            s = s.ReplaceMany(new Dictionary<string, string> { { "'", string.Empty }, { "\u8217", string.Empty } });
-            return s;
-        }
+    private static string FilterFrenchElisions(string s) => s_frenchElisionsRegex.Replace(s, string.Empty);
 
-        private static string WhiteQuotes(string s)
-        {
-            s = s.ReplaceMany(new Dictionary<string, string> { { "'", " " }, { "\u8217", " " } });
-            return s;
-        }
+    private static string StripQuotes(string s)
+    {
+        s = s.ReplaceMany(new Dictionary<string, string> { { "'", string.Empty }, { "\u8217", string.Empty } });
+        return s;
+    }
 
-        [TestCase("foo", "foo")]
-        [TestCase("    foo    ", "foo")]
-        [TestCase("Foo", "Foo")]
-        [TestCase("FoO", "FoO")]
-        [TestCase("FoO bar", "FoOBar")]
-        [TestCase("FoO bar NIL", "FoOBarNIL")]
-        [TestCase("FoO 33bar 22NIL", "FoO33bar22NIL")]
-        [TestCase("FoO 33bar 22NI", "FoO33bar22NI")]
-        [TestCase("0foo", "foo")]
-        [TestCase("2foo bar", "fooBar")]
-        [TestCase("9FOO", "FOO")]
-        [TestCase("foo-BAR", "fooBAR")]
-        [TestCase("foo-BA-dang", "fooBADang")]
-        [TestCase("foo_BAR", "fooBAR")]
-        [TestCase("foo'BAR", "fooBAR")]
-        [TestCase("sauté dans l'espace", "sauteDansLespace")]
-        [TestCase("foo\"\"bar", "fooBar")]
-        [TestCase("-foo-", "foo")]
-        [TestCase("_foo_", "foo")]
-        [TestCase("spécial", "special")]
-        [TestCase("brô dëk ", "broDek")]
-        [TestCase("1235brô dëk ", "broDek")]
-        [TestCase("汉#字*/漢?字", "")]
-        [TestCase("aa DB cd EFG X KLMN OP qrst", "aaDBCdEFGXKLMNOPQrst")]
-        [TestCase("AA db cd EFG X KLMN OP qrst", "AADbCdEFGXKLMNOPQrst")]
-        [TestCase("AAA db cd EFG X KLMN OP qrst", "AAADbCdEFGXKLMNOPQrst")]
-        [TestCase("4 ways selector", "waysSelector")]
-        [TestCase("WhatIfWeDoItAgain", "WhatIfWeDoItAgain")]
-        [TestCase("whatIfWeDoItAgain", "whatIfWeDoItAgain")]
-        [TestCase("WhatIfWEDOITAgain", "WhatIfWEDOITAgain")]
-        [TestCase("WhatIfWe doItAgain", "WhatIfWeDoItAgain")]
-        [TestCase("What if I have emojis 🎈", "WhatIfIHaveEmojis")]
-        public void CleanStringForSafeAlias(string input, string expected)
-        {
-            var output = ShortStringHelper.CleanStringForSafeAlias(input);
-            Assert.AreEqual(expected, output);
-        }
+    private static string WhiteQuotes(string s)
+    {
+        s = s.ReplaceMany(new Dictionary<string, string> { { "'", " " }, { "\u8217", " " } });
+        return s;
+    }
 
-        [TestCase("Home Page", "home-page")]
-        [TestCase("Shannon's Home Page!", "shannons-home-page")]
-        [TestCase("#Someones's Twitter $h1z%n", "someoness-twitter-h1z-n")]
-        [TestCase("Räksmörgås", "raksmorgas")]
-        [TestCase("'em guys-over there, are#goin' a \"little\"bit crazy eh!! :)", "em-guys-over-there-are-goin-a-little-bit-crazy-eh")]
-        [TestCase("汉#字*/漢?字", "")]
-        [TestCase("Réalösk fix bran#lo'sk", "realosk-fix-bran-losk")]
-        [TestCase("200 ways to be happy", "200-ways-to-be-happy")]
-        [TestCase("What if I have emojis 🎈", "what-if-i-have-emojis")]
-        public void CleanStringForUrlSegment(string input, string expected)
-        {
-            var output = ShortStringHelper.CleanStringForUrlSegment(input);
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("foo", "foo")]
+    [TestCase("    foo    ", "foo")]
+    [TestCase("Foo", "Foo")]
+    [TestCase("FoO", "FoO")]
+    [TestCase("FoO bar", "FoOBar")]
+    [TestCase("FoO bar NIL", "FoOBarNIL")]
+    [TestCase("FoO 33bar 22NIL", "FoO33bar22NIL")]
+    [TestCase("FoO 33bar 22NI", "FoO33bar22NI")]
+    [TestCase("0foo", "foo")]
+    [TestCase("2foo bar", "fooBar")]
+    [TestCase("9FOO", "FOO")]
+    [TestCase("foo-BAR", "fooBAR")]
+    [TestCase("foo-BA-dang", "fooBADang")]
+    [TestCase("foo_BAR", "fooBAR")]
+    [TestCase("foo'BAR", "fooBAR")]
+    [TestCase("sauté dans l'espace", "sauteDansLespace")]
+    [TestCase("foo\"\"bar", "fooBar")]
+    [TestCase("-foo-", "foo")]
+    [TestCase("_foo_", "foo")]
+    [TestCase("spécial", "special")]
+    [TestCase("brô dëk ", "broDek")]
+    [TestCase("1235brô dëk ", "broDek")]
+    [TestCase("汉#字*/漢?字", "")]
+    [TestCase("aa DB cd EFG X KLMN OP qrst", "aaDBCdEFGXKLMNOPQrst")]
+    [TestCase("AA db cd EFG X KLMN OP qrst", "AADbCdEFGXKLMNOPQrst")]
+    [TestCase("AAA db cd EFG X KLMN OP qrst", "AAADbCdEFGXKLMNOPQrst")]
+    [TestCase("4 ways selector", "waysSelector")]
+    [TestCase("WhatIfWeDoItAgain", "WhatIfWeDoItAgain")]
+    [TestCase("whatIfWeDoItAgain", "whatIfWeDoItAgain")]
+    [TestCase("WhatIfWEDOITAgain", "WhatIfWEDOITAgain")]
+    [TestCase("WhatIfWe doItAgain", "WhatIfWeDoItAgain")]
+    [TestCase("What if I have emojis 🎈", "WhatIfIHaveEmojis")]
+    public void CleanStringForSafeAlias(string input, string expected)
+    {
+        var output = ShortStringHelper.CleanStringForSafeAlias(input);
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase("ThisIsTheEndMyFriend", "This Is The End My Friend")]
-        [TestCase("ThisIsTHEEndMyFriend", "This Is THE End My Friend")]
-        [TestCase("THISIsTHEEndMyFriend", "THIS Is THE End My Friend")]
-        [TestCase("This33I33sThe33EndMyFriend", "This33 I33s The33 End My Friend")] // works!
-        [TestCase("ThisIsTHEEndMyFriendX", "This Is THE End My Friend X")]
-        [TestCase("ThisIsTHEEndMyFriendXYZ", "This Is THE End My Friend XYZ")]
-        [TestCase("ThisIsTHEEndMyFriendXYZt", "This Is THE End My Friend XY Zt")]
-        [TestCase("UneÉlévationÀPartir", "Une Élévation À Partir")]
-        [TestCase("WhatIfIHaveEmojis🎈", "What If I Have Emojis🎈")]
-        public void SplitPascalCasing(string input, string expected)
-        {
-            var output = ShortStringHelper.SplitPascalCasing(input, ' ');
-            Assert.AreEqual(expected, output);
+    [TestCase("Home Page", "home-page")]
+    [TestCase("Shannon's Home Page!", "shannons-home-page")]
+    [TestCase("#Someones's Twitter $h1z%n", "someoness-twitter-h1z-n")]
+    [TestCase("Räksmörgås", "raksmorgas")]
+    [TestCase("'em guys-over there, are#goin' a \"little\"bit crazy eh!! :)", "em-guys-over-there-are-goin-a-little-bit-crazy-eh")]
+    [TestCase("汉#字*/漢?字", "")]
+    [TestCase("Réalösk fix bran#lo'sk", "realosk-fix-bran-losk")]
+    [TestCase("200 ways to be happy", "200-ways-to-be-happy")]
+    [TestCase("What if I have emojis 🎈", "what-if-i-have-emojis")]
+    public void CleanStringForUrlSegment(string input, string expected)
+    {
+        var output = ShortStringHelper.CleanStringForUrlSegment(input);
+        Assert.AreEqual(expected, output);
+    }
 
-            output = ShortStringHelper.SplitPascalCasing(input, '*');
-            expected = expected.Replace(' ', '*');
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("ThisIsTheEndMyFriend", "This Is The End My Friend")]
+    [TestCase("ThisIsTHEEndMyFriend", "This Is THE End My Friend")]
+    [TestCase("THISIsTHEEndMyFriend", "THIS Is THE End My Friend")]
+    [TestCase("This33I33sThe33EndMyFriend", "This33 I33s The33 End My Friend")] // works!
+    [TestCase("ThisIsTHEEndMyFriendX", "This Is THE End My Friend X")]
+    [TestCase("ThisIsTHEEndMyFriendXYZ", "This Is THE End My Friend XYZ")]
+    [TestCase("ThisIsTHEEndMyFriendXYZt", "This Is THE End My Friend XY Zt")]
+    [TestCase("UneÉlévationÀPartir", "Une Élévation À Partir")]
+    [TestCase("WhatIfIHaveEmojis🎈", "What If I Have Emojis🎈")]
+    public void SplitPascalCasing(string input, string expected)
+    {
+        var output = ShortStringHelper.SplitPascalCasing(input, ' ');
+        Assert.AreEqual(expected, output);
 
-        [TestCase("sauté dans l'espace", "saute-dans-espace", "fr-FR", CleanStringType.UrlSegment | CleanStringType.Ascii | CleanStringType.LowerCase)]
-        [TestCase("sauté dans l'espace", "sauté-dans-espace", "fr-FR", CleanStringType.UrlSegment | CleanStringType.Utf8 | CleanStringType.LowerCase)]
-        [TestCase("sauté dans l'espace", "SauteDansLEspace", "fr-FR", CleanStringType.Alias | CleanStringType.Ascii | CleanStringType.PascalCase)]
-        [TestCase("he doesn't want", "he-doesnt-want", null, CleanStringType.UrlSegment | CleanStringType.Ascii | CleanStringType.LowerCase)]
-        [TestCase("he doesn't want", "heDoesntWant", null, CleanStringType.Alias | CleanStringType.Ascii | CleanStringType.CamelCase)]
-        public void CleanStringWithTypeAndCulture(string input, string expected, string culture, CleanStringType stringType)
-        {
-            // picks the proper config per culture
-            // and overrides some stringType params (ascii...)
-            var output = ShortStringHelper.CleanString(input, stringType, culture);
-            Assert.AreEqual(expected, output);
-        }
+        output = ShortStringHelper.SplitPascalCasing(input, '*');
+        expected = expected.Replace(' ', '*');
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase("foo.txt", "foo.txt")]
-        [TestCase("foo", "foo")]
-        [TestCase(".txt", ".txt")]
-        [TestCase("nag*dog/poo:xit.txt", "nag-dog-poo-xit.txt")]
-        [TestCase("the dog is in the house.txt", "the-dog-is-in-the-house.txt")]
-        [TestCase("nil.nil.nil.txt", "nil-nil-nil.txt")]
-        [TestCase("taradabum", "taradabum")]
-        [TestCase("tara$$da:b/u<m", "tara-da-b-u-m")]
-        [TestCase("Straße Zvöskî.yop", "strasse-zvoski.yop")]
-        [TestCase("yop.Straße Zvöskî", "yop.strasse-zvoski")]
-        [TestCase("yop.Straße Zvös--kî", "yop.strasse-zvos-ki")]
-        [TestCase("ma--ma---ma.ma-----ma", "ma-ma-ma.ma-ma")]
-        [TestCase("What if I have emojis 🎈", "what-if-i-have-emojis")]
-        public void CleanStringForSafeFileName(string input, string expected)
-        {
-            var output = ShortStringHelper.CleanStringForSafeFileName(input);
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase(
+        "sauté dans l'espace",
+        "saute-dans-espace",
+        "fr-FR",
+        CleanStringType.UrlSegment | CleanStringType.Ascii | CleanStringType.LowerCase)]
+    [TestCase("sauté dans l'espace", "sauté-dans-espace", "fr-FR", CleanStringType.UrlSegment | CleanStringType.Utf8 | CleanStringType.LowerCase)]
+    [TestCase("sauté dans l'espace", "SauteDansLEspace", "fr-FR", CleanStringType.Alias | CleanStringType.Ascii | CleanStringType.PascalCase)]
+    [TestCase("he doesn't want", "he-doesnt-want", null, CleanStringType.UrlSegment | CleanStringType.Ascii | CleanStringType.LowerCase)]
+    [TestCase("he doesn't want", "heDoesntWant", null, CleanStringType.Alias | CleanStringType.Ascii | CleanStringType.CamelCase)]
+    public void CleanStringWithTypeAndCulture(string input, string expected, string culture, CleanStringType stringType)
+    {
+        // picks the proper config per culture
+        // and overrides some stringType params (ascii...)
+        var output = ShortStringHelper.CleanString(input, stringType, culture);
+        Assert.AreEqual(expected, output);
+    }
+
+    [TestCase("foo.txt", "foo.txt")]
+    [TestCase("foo", "foo")]
+    [TestCase(".txt", ".txt")]
+    [TestCase("nag*dog/poo:xit.txt", "nag-dog-poo-xit.txt")]
+    [TestCase("the dog is in the house.txt", "the-dog-is-in-the-house.txt")]
+    [TestCase("nil.nil.nil.txt", "nil-nil-nil.txt")]
+    [TestCase("taradabum", "taradabum")]
+    [TestCase("tara$$da:b/u<m", "tara-da-b-u-m")]
+    [TestCase("Straße Zvöskî.yop", "strasse-zvoski.yop")]
+    [TestCase("yop.Straße Zvöskî", "yop.strasse-zvoski")]
+    [TestCase("yop.Straße Zvös--kî", "yop.strasse-zvos-ki")]
+    [TestCase("ma--ma---ma.ma-----ma", "ma-ma-ma.ma-ma")]
+    [TestCase("What if I have emojis 🎈", "what-if-i-have-emojis")]
+    public void CleanStringForSafeFileName(string input, string expected)
+    {
+        var output = ShortStringHelper.CleanStringForSafeFileName(input);
+        Assert.AreEqual(expected, output);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs
index b686aee278..47fcce82ee 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs
@@ -3,437 +3,515 @@
 
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Configuration.UmbracoSettings;
 using Umbraco.Cms.Core.Strings;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+
+[TestFixture]
+public class DefaultShortStringHelperTestsWithoutSetup
 {
-    [TestFixture]
-    public class DefaultShortStringHelperTestsWithoutSetup
+    [Test]
+    public void U4_4056()
     {
-        [Test]
-        public void U4_4056()
+        var requestHandlerSettings = new RequestHandlerSettings
         {
-            var requestHandlerSettings = new RequestHandlerSettings()
+            CharCollection = Array.Empty<CharItem>(),
+            EnableDefaultCharReplacements = false,
+            ConvertUrlsToAscii = "false",
+        };
+
+        const string input = "ÆØÅ and æøå and 中文测试 and  אודות האתר and größer БбДдЖж page";
+
+        var helper =
+            new DefaultShortStringHelper(
+                new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)); // unicode
+        var output = helper.CleanStringForUrlSegment(input);
+        Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", output);
+
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)
+            .WithConfig(CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
             {
-                CharCollection = Array.Empty<CharItem>(),
-                EnableDefaultCharReplacements = false,
-                ConvertUrlsToAscii = "false"
-            };
+                IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
+                StringType = CleanStringType.LowerCase | CleanStringType.Ascii, // ascii
+                Separator = '-',
+            }));
+        output = helper.CleanStringForUrlSegment(input);
+        Assert.AreEqual("aeoa-and-aeoa-and-and-and-grosser-bbddzhzh-page", output);
+    }
 
-            const string input = "ÆØÅ and æøå and 中文测试 and  אודות האתר and größer БбДдЖж page";
-
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)); // unicode
-            var output = helper.CleanStringForUrlSegment(input);
-            Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", output);
-
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)
-                .WithConfig(CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
-                {
-                    IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
-                    StringType = CleanStringType.LowerCase | CleanStringType.Ascii, // ascii
-                    Separator = '-'
-                }));
-            output = helper.CleanStringForUrlSegment(input);
-            Assert.AreEqual("aeoa-and-aeoa-and-and-and-grosser-bbddzhzh-page", output);
-        }
-
-        [Test]
-        public void U4_4056_TryAscii()
+    [Test]
+    public void U4_4056_TryAscii()
+    {
+        var requestHandlerSettings = new RequestHandlerSettings
         {
-            var requestHandlerSettings = new RequestHandlerSettings()
+            CharCollection = Array.Empty<CharItem>(),
+            EnableDefaultCharReplacements = false,
+            ConvertUrlsToAscii = "false",
+        };
+
+        const string input1 = "ÆØÅ and æøå and 中文测试 and  אודות האתר and größer БбДдЖж page";
+        const string input2 = "ÆØÅ and æøå and größer БбДдЖж page";
+
+        var helper =
+            new DefaultShortStringHelper(
+                new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)); // unicode
+        Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input1));
+        Assert.AreEqual("æøå-and-æøå-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input2));
+
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)
+            .WithConfig(CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
             {
-                CharCollection = Array.Empty<CharItem>(),
-                EnableDefaultCharReplacements = false,
-                ConvertUrlsToAscii = "false"
-            };
+                IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
+                StringType = CleanStringType.LowerCase | CleanStringType.TryAscii, // try ascii
+                Separator = '-',
+            }));
+        Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input1));
+        Assert.AreEqual("aeoa-and-aeoa-and-grosser-bbddzhzh-page", helper.CleanStringForUrlSegment(input2));
+    }
 
-            const string input1 = "ÆØÅ and æøå and 中文测试 and  אודות האתר and größer БбДдЖж page";
-            const string input2 = "ÆØÅ and æøå and größer БбДдЖж page";
+    [Test]
+    public void CleanStringUnderscoreInTerm()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                // underscore is accepted within terms
+                IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                Separator = '*',
+            }));
+        Assert.AreEqual("foo_bar*nil", helper.CleanString("foo_bar nil", CleanStringType.Alias));
 
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)); // unicode
-            Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input1));
-            Assert.AreEqual("æøå-and-æøå-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input2));
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                // underscore is not accepted within terms
+                IsTerm = (c, leading) => char.IsLetterOrDigit(c),
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                Separator = '*',
+            }));
+        Assert.AreEqual("foo*bar*nil", helper.CleanString("foo_bar nil", CleanStringType.Alias));
+    }
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings)
-                .WithConfig(CleanStringType.UrlSegment, new DefaultShortStringHelperConfig.Config
-                {
-                    IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
-                    StringType = CleanStringType.LowerCase | CleanStringType.TryAscii, // try ascii
-                    Separator = '-'
-                }));
-            Assert.AreEqual("æøå-and-æøå-and-中文测试-and-אודות-האתר-and-größer-ббдджж-page", helper.CleanStringForUrlSegment(input1));
-            Assert.AreEqual("aeoa-and-aeoa-and-grosser-bbddzhzh-page", helper.CleanStringForUrlSegment(input2));
-        }
+    [Test]
+    public void CleanStringLeadingChars()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                // letters and digits are valid leading chars
+                IsTerm = (c, leading) => char.IsLetterOrDigit(c),
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                Separator = '*',
+            }));
+        Assert.AreEqual("0123foo*bar*543*nil*321", helper.CleanString("0123foo_bar 543 nil 321", CleanStringType.Alias));
 
-        [Test]
-        public void CleanStringUnderscoreInTerm()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    // underscore is accepted within terms
-                    IsTerm = (c, leading) => char.IsLetterOrDigit(c) || c == '_',
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("foo_bar*nil", helper.CleanString("foo_bar nil", CleanStringType.Alias));
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                // only letters are valid leading chars
+                IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c),
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                Separator = '*',
+            }));
+        Assert.AreEqual("foo*bar*543*nil*321", helper.CleanString("0123foo_bar 543 nil 321", CleanStringType.Alias));
+        Assert.AreEqual("foo*bar*543*nil*321", helper.CleanString("0123 foo_bar 543 nil 321", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    // underscore is not accepted within terms
-                    IsTerm = (c, leading) => char.IsLetterOrDigit(c),
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("foo*bar*nil", helper.CleanString("foo_bar nil", CleanStringType.Alias));
-        }
+        helper = new DefaultShortStringHelper(
+            new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings()));
+        Assert.AreEqual("child2", helper.CleanStringForSafeAlias("1child2"));
+    }
 
-        [Test]
-        public void CleanStringLeadingChars()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    // letters and digits are valid leading chars
-                    IsTerm = (c, leading) => char.IsLetterOrDigit(c),
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("0123foo*bar*543*nil*321", helper.CleanString("0123foo_bar 543 nil 321", CleanStringType.Alias));
+    [Test]
+    public void CleanStringTermOnUpper()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    // only letters are valid leading chars
-                    IsTerm = (c, leading) => leading ? char.IsLetter(c) : char.IsLetterOrDigit(c),
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("foo*bar*543*nil*321", helper.CleanString("0123foo_bar 543 nil 321", CleanStringType.Alias));
-            Assert.AreEqual("foo*bar*543*nil*321", helper.CleanString("0123 foo_bar 543 nil 321", CleanStringType.Alias));
+                // uppercase letter means new term
+                BreakTermsOnUpper = true,
+                Separator = '*',
+            }));
+        Assert.AreEqual("foo*Bar", helper.CleanString("fooBar", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings()));
-            Assert.AreEqual("child2", helper.CleanStringForSafeAlias("1child2"));
-        }
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
 
-        [Test]
-        public void CleanStringTermOnUpper()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                // uppercase letter is part of term
+                BreakTermsOnUpper = false,
+                Separator = '*',
+            }));
+        Assert.AreEqual("fooBar", helper.CleanString("fooBar", CleanStringType.Alias));
+    }
 
-                    // uppercase letter means new term
-                    BreakTermsOnUpper = true,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("foo*Bar", helper.CleanString("fooBar", CleanStringType.Alias));
+    [Test]
+    public void CleanStringAcronymOnNonUpper()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                // non-uppercase letter means cut acronym
+                CutAcronymOnNonUpper = true,
+                Separator = '*',
+            }));
+        Assert.AreEqual("foo*BAR*Rnil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BA*Rnil", helper.CleanString("foo BARnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BAnil", helper.CleanString("foo BAnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
 
-                    // uppercase letter is part of term
-                    BreakTermsOnUpper = false,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("fooBar", helper.CleanString("fooBar", CleanStringType.Alias));
-        }
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+            {
+                StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
 
-        [Test]
-        public void CleanStringAcronymOnNonUpper()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                // non-uppercase letter means word
+                CutAcronymOnNonUpper = false,
+                Separator = '*',
+            }));
+        Assert.AreEqual("foo*BARRnil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BARnil", helper.CleanString("foo BARnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BAnil", helper.CleanString("foo BAnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
+    }
 
-                    // non-uppercase letter means cut acronym
-                    CutAcronymOnNonUpper = true,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("foo*BAR*Rnil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BA*Rnil", helper.CleanString("foo BARnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BAnil", helper.CleanString("foo BAnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
-
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-
-                    // non-uppercase letter means word
-                    CutAcronymOnNonUpper = false,
-                    Separator = '*'
-                }));
-            Assert.AreEqual("foo*BARRnil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BARnil", helper.CleanString("foo BARnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BAnil", helper.CleanString("foo BAnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
-        }
-
-        [Test]
-        public void CleanStringGreedyAcronyms()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+    [Test]
+    public void CleanStringGreedyAcronyms()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
                     CutAcronymOnNonUpper = true,
                     GreedyAcronyms = true,
-                    Separator = '*'
+                    Separator = '*',
                 }));
-            Assert.AreEqual("foo*BARR*nil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BAR*nil", helper.CleanString("foo BARnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BA*nil", helper.CleanString("foo BAnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BARR*nil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BAR*nil", helper.CleanString("foo BARnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BA*nil", helper.CleanString("foo BAnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
                     CutAcronymOnNonUpper = true,
                     GreedyAcronyms = false,
-                    Separator = '*'
+                    Separator = '*',
                 }));
-            Assert.AreEqual("foo*BAR*Rnil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BA*Rnil", helper.CleanString("foo BARnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*BAnil", helper.CleanString("foo BAnil", CleanStringType.Alias));
-            Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
-        }
+        Assert.AreEqual("foo*BAR*Rnil", helper.CleanString("foo BARRnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BA*Rnil", helper.CleanString("foo BARnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*BAnil", helper.CleanString("foo BAnil", CleanStringType.Alias));
+        Assert.AreEqual("foo*Bnil", helper.CleanString("foo Bnil", CleanStringType.Alias));
+    }
 
-        [Test]
-        public void CleanStringWhiteSpace()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+    [Test]
+    public void CleanStringWhiteSpace()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
+                    Separator = '*',
                 }));
-            Assert.AreEqual("foo", helper.CleanString("   foo   ", CleanStringType.Alias));
-            Assert.AreEqual("foo*bar", helper.CleanString("   foo   bar   ", CleanStringType.Alias));
-        }
+        Assert.AreEqual("foo", helper.CleanString("   foo   ", CleanStringType.Alias));
+        Assert.AreEqual("foo*bar", helper.CleanString("   foo   bar   ", CleanStringType.Alias));
+    }
 
-        [Test]
-        public void CleanStringSeparator()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+    [Test]
+    public void CleanStringSeparator()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
+                    Separator = '*',
                 }));
-            Assert.AreEqual("foo*bar", helper.CleanString("foo bar", CleanStringType.Alias));
+        Assert.AreEqual("foo*bar", helper.CleanString("foo bar", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = ' '
+                    Separator = ' ',
                 }));
-            Assert.AreEqual("foo bar", helper.CleanString("foo bar", CleanStringType.Alias));
+        Assert.AreEqual("foo bar", helper.CleanString("foo bar", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
-                {
-                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged
-                }));
-            Assert.AreEqual("foobar", helper.CleanString("foo bar", CleanStringType.Alias));
-
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '文'
                 }));
-            Assert.AreEqual("foo文bar", helper.CleanString("foo bar", CleanStringType.Alias));
-        }
+        Assert.AreEqual("foobar", helper.CleanString("foo bar", CleanStringType.Alias));
 
-        [Test]
-        public void CleanStringSymbols()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
+                    Separator = '文',
                 }));
-            Assert.AreEqual("house*2", helper.CleanString("house (2)", CleanStringType.Alias));
+        Assert.AreEqual("foo文bar", helper.CleanString("foo bar", CleanStringType.Alias));
+    }
 
-            // FIXME: but for a filename we want to keep them!
-            // FIXME: and what about a URL?
-        }
-
-        [Test]
-        public void Utf8Surrogates()
-        {
-            // Unicode values between 0x10000 and 0x10FFF are represented by two 16-bit "surrogate" characters
-            const string str = "a\U00010F00z\uA74Ft";
-            Assert.AreEqual(6, str.Length);
-            Assert.IsTrue(char.IsSurrogate(str[1]));
-            Assert.IsTrue(char.IsHighSurrogate(str[1]));
-            Assert.IsTrue(char.IsSurrogate(str[2]));
-            Assert.IsTrue(char.IsLowSurrogate(str[2]));
-            Assert.AreEqual('z', str[3]);
-            Assert.IsFalse(char.IsSurrogate(str[4]));
-            Assert.AreEqual('\uA74F', str[4]);
-            Assert.AreEqual('t', str[5]);
-
-            Assert.AreEqual("z", str.Substring(3, 1));
-            Assert.AreEqual("\U00010F00", str.Substring(1, 2));
-
-            var bytes = Encoding.UTF8.GetBytes(str);
-            Assert.AreEqual(10, bytes.Length);
-            Assert.AreEqual('a', bytes[0]);
-
-            // Then next string element is two chars (surrogate pair) or 4 bytes, 21 bits of code point.
-            Assert.AreEqual('z', bytes[5]);
-
-            // Then next string element is one char and 3 bytes, 16 bits of code point.
-            Assert.AreEqual('t', bytes[9]);
-
-            //// foreach (var b in bytes)
-            ////    Debug.Print("{0:X}", b);
-
-            Debug.Print("\U00010B70");
-        }
-
-        [Test]
-        public void Utf8ToAsciiConverter()
-        {
-            const string str = "a\U00010F00z\uA74Ftéô";
-            var output = Cms.Core.Strings.Utf8ToAsciiConverter.ToAsciiString(str);
-            Assert.AreEqual("a?zooteo", output);
-        }
-
-        [Test]
-        public void CleanStringEncoding()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+    [Test]
+    public void CleanStringSymbols()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = '*'
+                    Separator = '*',
                 }));
-            Assert.AreEqual("中文测试", helper.CleanString("中文测试", CleanStringType.Alias));
-            Assert.AreEqual("léger*中文测试*ZÔRG", helper.CleanString("léger 中文测试 ZÔRG", CleanStringType.Alias));
+        Assert.AreEqual("house*2", helper.CleanString("house (2)", CleanStringType.Alias));
 
-            helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+        // FIXME: but for a filename we want to keep them!
+        // FIXME: and what about a URL?
+    }
+
+    [Test]
+    public void Utf8Surrogates()
+    {
+        // Unicode values between 0x10000 and 0x10FFF are represented by two 16-bit "surrogate" characters
+        const string str = "a\U00010F00z\uA74Ft";
+        Assert.AreEqual(6, str.Length);
+        Assert.IsTrue(char.IsSurrogate(str[1]));
+        Assert.IsTrue(char.IsHighSurrogate(str[1]));
+        Assert.IsTrue(char.IsSurrogate(str[2]));
+        Assert.IsTrue(char.IsLowSurrogate(str[2]));
+        Assert.AreEqual('z', str[3]);
+        Assert.IsFalse(char.IsSurrogate(str[4]));
+        Assert.AreEqual('\uA74F', str[4]);
+        Assert.AreEqual('t', str[5]);
+
+        Assert.AreEqual("z", str.Substring(3, 1));
+        Assert.AreEqual("\U00010F00", str.Substring(1, 2));
+
+        var bytes = Encoding.UTF8.GetBytes(str);
+        Assert.AreEqual(10, bytes.Length);
+        Assert.AreEqual('a', bytes[0]);
+
+        // Then next string element is two chars (surrogate pair) or 4 bytes, 21 bits of code point.
+        Assert.AreEqual('z', bytes[5]);
+
+        // Then next string element is one char and 3 bytes, 16 bits of code point.
+        Assert.AreEqual('t', bytes[9]);
+
+        //// foreach (var b in bytes)
+        ////    Debug.Print("{0:X}", b);
+
+        Debug.Print("\U00010B70");
+    }
+
+    [Test]
+    public void Utf8ToAsciiConverter()
+    {
+        const string str = "a\U00010F00z\uA74Ftéô";
+        var output = Cms.Core.Strings.Utf8ToAsciiConverter.ToAsciiString(str);
+        Assert.AreEqual("a?zooteo", output);
+    }
+
+    [Test]
+    public void CleanStringEncoding()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
+                {
+                    StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
+                    Separator = '*',
+                }));
+        Assert.AreEqual("中文测试", helper.CleanString("中文测试", CleanStringType.Alias));
+        Assert.AreEqual("léger*中文测试*ZÔRG", helper.CleanString("léger 中文测试 ZÔRG", CleanStringType.Alias));
+
+        helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Ascii | CleanStringType.Unchanged,
-                    Separator = '*'
+                    Separator = '*',
                 }));
-            Assert.AreEqual(string.Empty, helper.CleanString("中文测试", CleanStringType.Alias));
-            Assert.AreEqual("leger*ZORG", helper.CleanString("léger 中文测试 ZÔRG", CleanStringType.Alias));
-        }
+        Assert.AreEqual(string.Empty, helper.CleanString("中文测试", CleanStringType.Alias));
+        Assert.AreEqual("leger*ZORG", helper.CleanString("léger 中文测试 ZÔRG", CleanStringType.Alias));
+    }
 
-        [Test]
-        public void CleanStringDefaultConfig()
+    [Test]
+    public void CleanStringDefaultConfig()
+    {
+        var requestHandlerSettings = new RequestHandlerSettings
         {
-            var requestHandlerSettings = new RequestHandlerSettings()
-            {
-                CharCollection = Array.Empty<CharItem>(),
-                EnableDefaultCharReplacements = false,
-                ConvertUrlsToAscii = "false"
-            };
+            CharCollection = Array.Empty<CharItem>(),
+            EnableDefaultCharReplacements = false,
+            ConvertUrlsToAscii = "false",
+        };
 
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings));
+        var helper =
+            new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(requestHandlerSettings));
 
-            const string input = "0123 中文测试 中文测试 léger ZÔRG (2) a?? *x";
+        const string input = "0123 中文测试 中文测试 léger ZÔRG (2) a?? *x";
 
-            var alias = helper.CleanStringForSafeAlias(input);
-            var filename = helper.CleanStringForSafeFileName(input);
-            var segment = helper.CleanStringForUrlSegment(input);
+        var alias = helper.CleanStringForSafeAlias(input);
+        var filename = helper.CleanStringForSafeFileName(input);
+        var segment = helper.CleanStringForUrlSegment(input);
 
-            // umbraco-cased ascii alias, must begin with a proper letter
-            Assert.AreEqual("legerZORG2AX", alias, "alias");
+        // umbraco-cased ascii alias, must begin with a proper letter
+        Assert.AreEqual("legerZORG2AX", alias, "alias");
 
-            // lower-cased, utf8 filename, removing illegal filename chars, using dash-separator
-            Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", filename, "filename");
+        // lower-cased, utf8 filename, removing illegal filename chars, using dash-separator
+        Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", filename, "filename");
 
-            // lower-cased, utf8 URL segment, only letters and digits, using dash-separator
-            Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", segment, "segment");
-        }
+        // lower-cased, utf8 URL segment, only letters and digits, using dash-separator
+        Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", segment, "segment");
+    }
 
-        [Test]
-        public void CleanStringCasing()
-        {
-            var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig().WithDefault(new RequestHandlerSettings())
-                .WithConfig(CleanStringType.Alias, new DefaultShortStringHelperConfig.Config
+    [Test]
+    public void CleanStringCasing()
+    {
+        var helper = new DefaultShortStringHelper(new DefaultShortStringHelperConfig()
+            .WithDefault(new RequestHandlerSettings())
+            .WithConfig(
+                CleanStringType.Alias,
+                new DefaultShortStringHelperConfig.Config
                 {
                     StringType = CleanStringType.Utf8 | CleanStringType.Unchanged,
-                    Separator = ' '
+                    Separator = ' ',
                 }));
 
-            // BBB is an acronym
-            // E is a word (too short to be an acronym)
-            // FF is an acronym
+        // BBB is an acronym
+        // E is a word (too short to be an acronym)
+        // FF is an acronym
 
-            // FIXME: "C" can't be an acronym
-            // FIXME: "DBXreview" = acronym?!
-            Assert.AreEqual("aaa BBB CCc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias)); // unchanged
-            Assert.AreEqual("aaa Bbb Ccc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.CamelCase));
-            Assert.AreEqual("Aaa Bbb Ccc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.PascalCase));
-            Assert.AreEqual("aaa bbb ccc ddd e ff", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.LowerCase));
-            Assert.AreEqual("AAA BBB CCC DDD E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.UpperCase));
-            Assert.AreEqual("aaa BBB CCc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.UmbracoCase));
+        // FIXME: "C" can't be an acronym
+        // FIXME: "DBXreview" = acronym?!
+        Assert.AreEqual(
+            "aaa BBB CCc Ddd E FF",
+            helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias)); // unchanged
+        Assert.AreEqual(
+            "aaa Bbb Ccc Ddd E FF",
+            helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.CamelCase));
+        Assert.AreEqual("Aaa Bbb Ccc Ddd E FF", helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.PascalCase));
+        Assert.AreEqual(
+            "aaa bbb ccc ddd e ff",
+            helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.LowerCase));
+        Assert.AreEqual(
+            "AAA BBB CCC DDD E FF",
+            helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.UpperCase));
+        Assert.AreEqual(
+            "aaa BBB CCc Ddd E FF",
+            helper.CleanString("aaa BBB CCc Ddd E FF", CleanStringType.Alias | CleanStringType.UmbracoCase));
 
-            // MS rules & guidelines:
-            // - Do capitalize both characters of two-character acronyms, except the first word of a camel-cased identifier.
-            //     eg "DBRate" (pascal) or "ioHelper" (camel) - "SpecialDBRate" (pascal) or "specialIOHelper" (camel)
-            // - Do capitalize only the first character of acronyms with three or more characters, except the first word of a camel-cased identifier.
-            //     eg "XmlWriter (pascal) or "htmlReader" (camel) - "SpecialXmlWriter" (pascal) or "specialHtmlReader" (camel)
-            // - Do not capitalize any of the characters of any acronyms, whatever their length, at the beginning of a camel-cased identifier.
-            //     eg "xmlWriter" or "dbWriter" (camel)
-            Assert.AreEqual("aaa BB Ccc", helper.CleanString("aaa BB ccc", CleanStringType.Alias | CleanStringType.CamelCase));
-            Assert.AreEqual("aa Bb Ccc", helper.CleanString("AA bb ccc", CleanStringType.Alias | CleanStringType.CamelCase));
-            Assert.AreEqual("aaa Bb Ccc", helper.CleanString("AAA bb ccc", CleanStringType.Alias | CleanStringType.CamelCase));
-            Assert.AreEqual("db Rate", helper.CleanString("DB rate", CleanStringType.Alias | CleanStringType.CamelCase));
-            Assert.AreEqual("special DB Rate", helper.CleanString("special DB rate", CleanStringType.Alias | CleanStringType.CamelCase));
-            Assert.AreEqual("xml Writer", helper.CleanString("XML writer", CleanStringType.Alias | CleanStringType.CamelCase));
-            Assert.AreEqual("special Xml Writer", helper.CleanString("special XML writer", CleanStringType.Alias | CleanStringType.CamelCase));
+        // MS rules & guidelines:
+        // - Do capitalize both characters of two-character acronyms, except the first word of a camel-cased identifier.
+        //     eg "DBRate" (pascal) or "ioHelper" (camel) - "SpecialDBRate" (pascal) or "specialIOHelper" (camel)
+        // - Do capitalize only the first character of acronyms with three or more characters, except the first word of a camel-cased identifier.
+        //     eg "XmlWriter (pascal) or "htmlReader" (camel) - "SpecialXmlWriter" (pascal) or "specialHtmlReader" (camel)
+        // - Do not capitalize any of the characters of any acronyms, whatever their length, at the beginning of a camel-cased identifier.
+        //     eg "xmlWriter" or "dbWriter" (camel)
+        Assert.AreEqual(
+            "aaa BB Ccc",
+            helper.CleanString("aaa BB ccc", CleanStringType.Alias | CleanStringType.CamelCase));
+        Assert.AreEqual(
+            "aa Bb Ccc",
+            helper.CleanString("AA bb ccc", CleanStringType.Alias | CleanStringType.CamelCase));
+        Assert.AreEqual(
+            "aaa Bb Ccc",
+            helper.CleanString("AAA bb ccc", CleanStringType.Alias | CleanStringType.CamelCase));
+        Assert.AreEqual("db Rate", helper.CleanString("DB rate", CleanStringType.Alias | CleanStringType.CamelCase));
+        Assert.AreEqual(
+            "special DB Rate",
+            helper.CleanString("special DB rate", CleanStringType.Alias | CleanStringType.CamelCase));
+        Assert.AreEqual(
+            "xml Writer",
+            helper.CleanString("XML writer", CleanStringType.Alias | CleanStringType.CamelCase));
+        Assert.AreEqual(
+            "special Xml Writer",
+            helper.CleanString("special XML writer", CleanStringType.Alias | CleanStringType.CamelCase));
 
-            Assert.AreEqual("Aaa BB Ccc", helper.CleanString("aaa BB ccc", CleanStringType.Alias | CleanStringType.PascalCase));
-            Assert.AreEqual("AA Bb Ccc", helper.CleanString("AA bb ccc", CleanStringType.Alias | CleanStringType.PascalCase));
-            Assert.AreEqual("Aaa Bb Ccc", helper.CleanString("AAA bb ccc", CleanStringType.Alias | CleanStringType.PascalCase));
-            Assert.AreEqual("DB Rate", helper.CleanString("DB rate", CleanStringType.Alias | CleanStringType.PascalCase));
-            Assert.AreEqual("Special DB Rate", helper.CleanString("special DB rate", CleanStringType.Alias | CleanStringType.PascalCase));
-            Assert.AreEqual("Xml Writer", helper.CleanString("XML writer", CleanStringType.Alias | CleanStringType.PascalCase));
-            Assert.AreEqual("Special Xml Writer", helper.CleanString("special XML writer", CleanStringType.Alias | CleanStringType.PascalCase));
-        }
-
-        // #region Cases
-        // [TestCase("This is my_little_house so cute.", "thisIsMyLittleHouseSoCute", false)]
-        // [TestCase("This is my_little_house so cute.", "thisIsMy_little_houseSoCute", true)]
-        // [TestCase("This is my_Little_House so cute.", "thisIsMyLittleHouseSoCute", false)]
-        // [TestCase("This is my_Little_House so cute.", "thisIsMy_Little_HouseSoCute", true)]
-        // [TestCase("An UPPER_CASE_TEST to check", "anUpperCaseTestToCheck", false)]
-        // [TestCase("An UPPER_CASE_TEST to check", "anUpper_case_testToCheck", true)]
-        // [TestCase("Trailing_", "trailing", false)]
-        // [TestCase("Trailing_", "trailing_", true)]
-        // [TestCase("_Leading", "leading", false)]
-        // [TestCase("_Leading", "leading", true)]
-        // [TestCase("Repeat___Repeat", "repeatRepeat", false)]
-        // [TestCase("Repeat___Repeat", "repeat___Repeat", true)]
-        // [TestCase("Repeat___repeat", "repeatRepeat", false)]
-        // [TestCase("Repeat___repeat", "repeat___repeat", true)]
-        // #endregion
-        // public void CleanStringWithUnderscore(string input, string expected, bool allowUnderscoreInTerm)
-        // {
-        //     var helper = new DefaultShortStringHelper(SettingsForTests.GetDefault())
-        //         .WithConfig(allowUnderscoreInTerm: allowUnderscoreInTerm);
-        //     var output = helper.CleanString(input, CleanStringType.Alias | CleanStringType.Ascii | CleanStringType.CamelCase);
-        //     Assert.AreEqual(expected, output);
-        // }
+        Assert.AreEqual(
+            "Aaa BB Ccc",
+            helper.CleanString("aaa BB ccc", CleanStringType.Alias | CleanStringType.PascalCase));
+        Assert.AreEqual(
+            "AA Bb Ccc",
+            helper.CleanString("AA bb ccc", CleanStringType.Alias | CleanStringType.PascalCase));
+        Assert.AreEqual(
+            "Aaa Bb Ccc",
+            helper.CleanString("AAA bb ccc", CleanStringType.Alias | CleanStringType.PascalCase));
+        Assert.AreEqual("DB Rate", helper.CleanString("DB rate", CleanStringType.Alias | CleanStringType.PascalCase));
+        Assert.AreEqual(
+            "Special DB Rate",
+            helper.CleanString("special DB rate", CleanStringType.Alias | CleanStringType.PascalCase));
+        Assert.AreEqual(
+            "Xml Writer",
+            helper.CleanString("XML writer", CleanStringType.Alias | CleanStringType.PascalCase));
+        Assert.AreEqual(
+            "Special Xml Writer",
+            helper.CleanString("special XML writer", CleanStringType.Alias | CleanStringType.PascalCase));
     }
+
+    // #region Cases
+    // [TestCase("This is my_little_house so cute.", "thisIsMyLittleHouseSoCute", false)]
+    // [TestCase("This is my_little_house so cute.", "thisIsMy_little_houseSoCute", true)]
+    // [TestCase("This is my_Little_House so cute.", "thisIsMyLittleHouseSoCute", false)]
+    // [TestCase("This is my_Little_House so cute.", "thisIsMy_Little_HouseSoCute", true)]
+    // [TestCase("An UPPER_CASE_TEST to check", "anUpperCaseTestToCheck", false)]
+    // [TestCase("An UPPER_CASE_TEST to check", "anUpper_case_testToCheck", true)]
+    // [TestCase("Trailing_", "trailing", false)]
+    // [TestCase("Trailing_", "trailing_", true)]
+    // [TestCase("_Leading", "leading", false)]
+    // [TestCase("_Leading", "leading", true)]
+    // [TestCase("Repeat___Repeat", "repeatRepeat", false)]
+    // [TestCase("Repeat___Repeat", "repeat___Repeat", true)]
+    // [TestCase("Repeat___repeat", "repeatRepeat", false)]
+    // [TestCase("Repeat___repeat", "repeat___repeat", true)]
+    // #endregion
+    // public void CleanStringWithUnderscore(string input, string expected, bool allowUnderscoreInTerm)
+    // {
+    //     var helper = new DefaultShortStringHelper(SettingsForTests.GetDefault())
+    //         .WithConfig(allowUnderscoreInTerm: allowUnderscoreInTerm);
+    //     var output = helper.CleanString(input, CleanStringType.Alias | CleanStringType.Ascii | CleanStringType.CamelCase);
+    //     Assert.AreEqual(expected, output);
+    // }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs
index 35b5ed63e4..387b7f16b8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/MockShortStringHelper.cs
@@ -3,34 +3,34 @@
 
 using Umbraco.Cms.Core.Strings;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+
+internal class MockShortStringHelper : IShortStringHelper
 {
-    internal class MockShortStringHelper : IShortStringHelper
-    {
-        public void Freeze() => IsFrozen = true;
+    public bool IsFrozen { get; private set; }
 
-        public bool IsFrozen { get; private set; }
+    public string CleanStringForSafeAlias(string text) => "SAFE-ALIAS::" + text;
 
-        public string CleanStringForSafeAlias(string text) => "SAFE-ALIAS::" + text;
+    public string CleanStringForSafeAlias(string text, string culture) => "SAFE-ALIAS-CULTURE::" + text;
 
-        public string CleanStringForSafeAlias(string text, string culture) => "SAFE-ALIAS-CULTURE::" + text;
+    public string CleanStringForUrlSegment(string text) => "URL-SEGMENT::" + text;
 
-        public string CleanStringForUrlSegment(string text) => "URL-SEGMENT::" + text;
+    public string CleanStringForUrlSegment(string text, string culture) => "URL-SEGMENT-CULTURE::" + text;
 
-        public string CleanStringForUrlSegment(string text, string culture) => "URL-SEGMENT-CULTURE::" + text;
+    public string CleanStringForSafeFileName(string text) => "SAFE-FILE-NAME::" + text;
 
-        public string CleanStringForSafeFileName(string text) => "SAFE-FILE-NAME::" + text;
+    public string CleanStringForSafeFileName(string text, string culture) => "SAFE-FILE-NAME-CULTURE::" + text;
 
-        public string CleanStringForSafeFileName(string text, string culture) => "SAFE-FILE-NAME-CULTURE::" + text;
+    public string SplitPascalCasing(string text, char separator) => "SPLIT-PASCAL-CASING::" + text;
 
-        public string SplitPascalCasing(string text, char separator) => "SPLIT-PASCAL-CASING::" + text;
+    public string CleanString(string text, CleanStringType stringType) => "CLEAN-STRING-A::" + text;
 
-        public string CleanString(string text, CleanStringType stringType) => "CLEAN-STRING-A::" + text;
+    public string CleanString(string text, CleanStringType stringType, char separator) => "CLEAN-STRING-B::" + text;
 
-        public string CleanString(string text, CleanStringType stringType, char separator) => "CLEAN-STRING-B::" + text;
+    public string CleanString(string text, CleanStringType stringType, string culture) => "CLEAN-STRING-C::" + text;
 
-        public string CleanString(string text, CleanStringType stringType, string culture) => "CLEAN-STRING-C::" + text;
+    public string CleanString(string text, CleanStringType stringType, char separator, string culture) =>
+        "CLEAN-STRING-D::" + text;
 
-        public string CleanString(string text, CleanStringType stringType, char separator, string culture) => "CLEAN-STRING-D::" + text;
-    }
+    public void Freeze() => IsFrozen = true;
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs
index 74d80d8665..7e13b2a06a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringExtensionsTests.cs
@@ -6,289 +6,321 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
-using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+
+[TestFixture]
+public class StringExtensionsTests
 {
-    [TestFixture]
-    public class StringExtensionsTests
+    private readonly IShortStringHelper _mockShortStringHelper = new MockShortStringHelper();
+
+    [TestCase("hello-world.png", "Hello World")]
+    [TestCase("hello-world .png", "Hello World")]
+    [TestCase("_hello-world __1.png", "Hello World 1")]
+    public void To_Friendly_Name(string first, string second) => Assert.AreEqual(first.ToFriendlyName(), second);
+
+    [TestCase("hello", "world", false)]
+    [TestCase("hello", "hello", true)]
+    [TestCase("hellohellohellohellohellohellohello", "hellohellohellohellohellohellohelloo", false)]
+    [TestCase(
+        "hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohello",
+        "hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohelloo",
+        false)]
+    [TestCase(
+        "hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohello",
+        "hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohello",
+        true)]
+    public void String_To_Guid(string first, string second, bool result)
     {
-        private readonly IShortStringHelper _mockShortStringHelper = new MockShortStringHelper();
+        Debug.Print("First: " + first.ToGuid());
+        Debug.Print("Second: " + second.ToGuid());
+        Assert.AreEqual(result, first.ToGuid() == second.ToGuid());
+    }
 
-        [TestCase("hello-world.png", "Hello World")]
-        [TestCase("hello-world .png", "Hello World")]
-        [TestCase("_hello-world __1.png", "Hello World 1")]
-        public void To_Friendly_Name(string first, string second) => Assert.AreEqual(first.ToFriendlyName(), second);
+    [TestCase("hello.txt", "hello")]
+    [TestCase("this.is.a.Txt", "this.is.a")]
+    [TestCase("this.is.not.a. Txt", "this.is.not.a. Txt")]
+    [TestCase("not a file", "not a file")]
+    public void Strip_File_Extension(string input, string result)
+    {
+        var stripped = input.StripFileExtension();
+        Assert.AreEqual(stripped, result);
+    }
 
-        [TestCase("hello", "world", false)]
-        [TestCase("hello", "hello", true)]
-        [TestCase("hellohellohellohellohellohellohello", "hellohellohellohellohellohellohelloo", false)]
-        [TestCase("hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohello", "hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohelloo", false)]
-        [TestCase("hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohello", "hellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohellohello", true)]
-        public void String_To_Guid(string first, string second, bool result)
-        {
-            Debug.Print("First: " + first.ToGuid());
-            Debug.Print("Second: " + second.ToGuid());
-            Assert.AreEqual(result, first.ToGuid() == second.ToGuid());
-        }
+    [TestCase("../wtf.js?x=wtf", ".js")]
+    [TestCase(".htaccess", ".htaccess")]
+    [TestCase("path/to/file/image.png", ".png")]
+    [TestCase("c:\\abc\\def\\ghi.jkl", ".jkl")]
+    [TestCase("/root/folder.name/file.ext", ".ext")]
+    [TestCase("http://www.domain.com/folder/name/file.txt", ".txt")]
+    [TestCase("i/don't\\have\\an/extension", "")]
+    [TestCase("https://some.where/path/to/file.ext?query=this&more=that", ".ext")]
+    [TestCase("double_query.string/file.ext?query=abc?something.else", ".ext")]
+    [TestCase("test.tar.gz", ".gz")]
+    [TestCase("wierd.file,but._legal", "._legal")]
+    [TestCase("one_char.x", ".x")]
+    public void Get_File_Extension(string input, string result)
+    {
+        var extension = input.GetFileExtension();
+        Assert.AreEqual(result, extension);
+    }
 
-        [TestCase("hello.txt", "hello")]
-        [TestCase("this.is.a.Txt", "this.is.a")]
-        [TestCase("this.is.not.a. Txt", "this.is.not.a. Txt")]
-        [TestCase("not a file", "not a file")]
-        public void Strip_File_Extension(string input, string result)
-        {
-            var stripped = input.StripFileExtension();
-            Assert.AreEqual(stripped, result);
-        }
+    [TestCase("'+alert(1234)+'", "+alert1234+")]
+    [TestCase("'+alert(56+78)+'", "+alert56+78+")]
+    [TestCase("{{file}}", "file")]
+    [TestCase("'+alert('hello')+'", "+alerthello+")]
+    [TestCase("Test", "Test")]
+    public void Clean_From_XSS(string input, string result)
+    {
+        var cleaned = input.CleanForXss();
+        Assert.AreEqual(cleaned, result);
+    }
 
-        [TestCase("../wtf.js?x=wtf", ".js")]
-        [TestCase(".htaccess", ".htaccess")]
-        [TestCase("path/to/file/image.png", ".png")]
-        [TestCase("c:\\abc\\def\\ghi.jkl", ".jkl")]
-        [TestCase("/root/folder.name/file.ext", ".ext")]
-        [TestCase("http://www.domain.com/folder/name/file.txt", ".txt")]
-        [TestCase("i/don't\\have\\an/extension", "")]
-        [TestCase("https://some.where/path/to/file.ext?query=this&more=that", ".ext")]
-        [TestCase("double_query.string/file.ext?query=abc?something.else", ".ext")]
-        [TestCase("test.tar.gz", ".gz")]
-        [TestCase("wierd.file,but._legal", "._legal")]
-        [TestCase("one_char.x", ".x")]
-        public void Get_File_Extension(string input, string result)
-        {
-            var extension = input.GetFileExtension();
-            Assert.AreEqual(result, extension);
-        }
+    [TestCase("Hello this is my string", " string", "Hello this is my")]
+    [TestCase("Hello this is my string strung", " string", "Hello this is my string strung")]
+    [TestCase("Hello this is my string string", " string", "Hello this is my")]
+    [TestCase("Hello this is my string string", "g", "Hello this is my string strin")]
+    [TestCase("Hello this is my string string", "ello this is my string string", "H")]
+    [TestCase("Hello this is my string string", "Hello this is my string string", "")]
+    public void TrimEnd(string input, string forTrimming, string shouldBe)
+    {
+        var trimmed = input.TrimEnd(forTrimming);
+        Assert.AreEqual(shouldBe, trimmed);
+    }
 
-        [TestCase("'+alert(1234)+'", "+alert1234+")]
-        [TestCase("'+alert(56+78)+'", "+alert56+78+")]
-        [TestCase("{{file}}", "file")]
-        [TestCase("'+alert('hello')+'", "+alerthello+")]
-        [TestCase("Test", "Test")]
-        public void Clean_From_XSS(string input, string result)
-        {
-            var cleaned = input.CleanForXss();
-            Assert.AreEqual(cleaned, result);
-        }
+    [TestCase("Hello this is my string", "hello", " this is my string")]
+    [TestCase("Hello this is my string", "Hello this", " is my string")]
+    [TestCase("Hello this is my string", "Hello this is my ", "string")]
+    [TestCase("Hello this is my string", "Hello this is my string", "")]
+    public void TrimStart(string input, string forTrimming, string shouldBe)
+    {
+        var trimmed = input.TrimStart(forTrimming);
+        Assert.AreEqual(shouldBe, trimmed);
+    }
 
-        [TestCase("Hello this is my string", " string", "Hello this is my")]
-        [TestCase("Hello this is my string strung", " string", "Hello this is my string strung")]
-        [TestCase("Hello this is my string string", " string", "Hello this is my")]
-        [TestCase("Hello this is my string string", "g", "Hello this is my string strin")]
-        [TestCase("Hello this is my string string", "ello this is my string string", "H")]
-        [TestCase("Hello this is my string string", "Hello this is my string string", "")]
-        public void TrimEnd(string input, string forTrimming, string shouldBe)
-        {
-            var trimmed = input.TrimEnd(forTrimming);
-            Assert.AreEqual(shouldBe, trimmed);
-        }
+    [TestCase(
+        "Hello this is my string",
+        "hello",
+        "replaced",
+        "replaced this is my string",
+        StringComparison.CurrentCultureIgnoreCase)]
+    [TestCase(
+        "Hello this is hello my string",
+        "hello",
+        "replaced",
+        "replaced this is replaced my string",
+        StringComparison.CurrentCultureIgnoreCase)]
+    [TestCase(
+        "Hello this is my string",
+        "nonexistent",
+        "replaced",
+        "Hello this is my string",
+        StringComparison.CurrentCultureIgnoreCase)]
+    [TestCase(
+        "Hellohello this is my string",
+        "hello",
+        "replaced",
+        "replacedreplaced this is my string",
+        StringComparison.CurrentCultureIgnoreCase)]
 
-        [TestCase("Hello this is my string", "hello", " this is my string")]
-        [TestCase("Hello this is my string", "Hello this", " is my string")]
-        [TestCase("Hello this is my string", "Hello this is my ", "string")]
-        [TestCase("Hello this is my string", "Hello this is my string", "")]
-        public void TrimStart(string input, string forTrimming, string shouldBe)
-        {
-            var trimmed = input.TrimStart(forTrimming);
-            Assert.AreEqual(shouldBe, trimmed);
-        }
+    // Ensure replacing with the same string doesn't cause infinite loop.
+    [TestCase(
+        "Hello this is my string",
+        "hello",
+        "hello",
+        "hello this is my string",
+        StringComparison.CurrentCultureIgnoreCase)]
+    public void ReplaceWithStringComparison(
+        string input,
+        string oldString,
+        string newString,
+        string shouldBe,
+        StringComparison stringComparison)
+    {
+        var replaced = input.Replace(oldString, newString, stringComparison);
+        Assert.AreEqual(shouldBe, replaced);
+    }
 
-        [TestCase("Hello this is my string", "hello", "replaced", "replaced this is my string", StringComparison.CurrentCultureIgnoreCase)]
-        [TestCase("Hello this is hello my string", "hello", "replaced", "replaced this is replaced my string", StringComparison.CurrentCultureIgnoreCase)]
-        [TestCase("Hello this is my string", "nonexistent", "replaced", "Hello this is my string", StringComparison.CurrentCultureIgnoreCase)]
-        [TestCase("Hellohello this is my string", "hello", "replaced", "replacedreplaced this is my string", StringComparison.CurrentCultureIgnoreCase)]
+    [TestCase(null, null)]
+    [TestCase("", "")]
+    [TestCase("x", "X")]
+    [TestCase("xyzT", "XyzT")]
+    [TestCase("XyzT", "XyzT")]
+    public void ToFirstUpper(string input, string expected)
+    {
+        var output = input.ToFirstUpper();
+        Assert.AreEqual(expected, output);
+    }
 
-        // Ensure replacing with the same string doesn't cause infinite loop.
-        [TestCase("Hello this is my string", "hello", "hello", "hello this is my string", StringComparison.CurrentCultureIgnoreCase)]
-        public void ReplaceWithStringComparison(string input, string oldString, string newString, string shouldBe, StringComparison stringComparison)
-        {
-            var replaced = input.Replace(oldString, newString, stringComparison);
-            Assert.AreEqual(shouldBe, replaced);
-        }
+    [TestCase(null, null)]
+    [TestCase("", "")]
+    [TestCase("X", "x")]
+    [TestCase("XyZ", "xyZ")]
+    [TestCase("xyZ", "xyZ")]
+    public void ToFirstLower(string input, string expected)
+    {
+        var output = input.ToFirstLower();
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase(null, null)]
-        [TestCase("", "")]
-        [TestCase("x", "X")]
-        [TestCase("xyzT", "XyzT")]
-        [TestCase("XyzT", "XyzT")]
-        public void ToFirstUpper(string input, string expected)
-        {
-            var output = input.ToFirstUpper();
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("pineapple", new[] { "banana", "apple", "blueberry", "strawberry" }, StringComparison.CurrentCulture, true)]
+    [TestCase("PINEAPPLE", new[] { "banana", "apple", "blueberry", "strawberry" }, StringComparison.CurrentCulture, false)]
+    [TestCase("pineapple", new[] { "banana", "Apple", "blueberry", "strawberry" }, StringComparison.CurrentCulture, false)]
+    [TestCase("pineapple", new[] { "banana", "Apple", "blueberry", "strawberry" }, StringComparison.OrdinalIgnoreCase, true)]
+    [TestCase("pineapple", new[] { "banana", "blueberry", "strawberry" }, StringComparison.OrdinalIgnoreCase, false)]
+    [TestCase("Strawberry unicorn pie", new[] { "Berry" }, StringComparison.OrdinalIgnoreCase, true)]
+    [TestCase("empty pie", new string[0], StringComparison.OrdinalIgnoreCase, false)]
+    public void ContainsAny(string haystack, IEnumerable<string> needles, StringComparison comparison, bool expected)
+    {
+        var output = haystack.ContainsAny(needles, comparison);
+        Assert.AreEqual(expected, output);
+    }
 
-        [TestCase(null, null)]
-        [TestCase("", "")]
-        [TestCase("X", "x")]
-        [TestCase("XyZ", "xyZ")]
-        [TestCase("xyZ", "xyZ")]
-        public void ToFirstLower(string input, string expected)
-        {
-            var output = input.ToFirstLower();
-            Assert.AreEqual(expected, output);
-        }
-
-        [TestCase("pineapple", new string[] { "banana", "apple", "blueberry", "strawberry" }, StringComparison.CurrentCulture, true)]
-        [TestCase("PINEAPPLE", new string[] { "banana", "apple", "blueberry", "strawberry" }, StringComparison.CurrentCulture, false)]
-        [TestCase("pineapple", new string[] { "banana", "Apple", "blueberry", "strawberry" }, StringComparison.CurrentCulture, false)]
-        [TestCase("pineapple", new string[] { "banana", "Apple", "blueberry", "strawberry" }, StringComparison.OrdinalIgnoreCase, true)]
-        [TestCase("pineapple", new string[] { "banana", "blueberry", "strawberry" }, StringComparison.OrdinalIgnoreCase, false)]
-        [TestCase("Strawberry unicorn pie", new string[] { "Berry" }, StringComparison.OrdinalIgnoreCase, true)]
-        [TestCase("empty pie", new string[0], StringComparison.OrdinalIgnoreCase, false)]
-        public void ContainsAny(string haystack, IEnumerable<string> needles, StringComparison comparison, bool expected)
-        {
-            bool output = haystack.ContainsAny(needles, comparison);
-            Assert.AreEqual(expected, output);
-        }
-
-        [TestCase("", true)]
-        [TestCase(" ", true)]
-        [TestCase("\r\n\r\n", true)]
-        [TestCase("\r\n", true)]
-        [TestCase(
-            @"
+    [TestCase("", true)]
+    [TestCase(" ", true)]
+    [TestCase("\r\n\r\n", true)]
+    [TestCase("\r\n", true)]
+    [TestCase(
+        @"
         Hello
-        ", false)]
-        [TestCase(null, true)]
-        [TestCase("a", false)]
-        [TestCase("abc", false)]
-        [TestCase("abc   ", false)]
-        [TestCase("   abc", false)]
-        [TestCase("   abc   ", false)]
-        public void IsNullOrWhiteSpace(string value, bool expected)
+        ",
+        false)]
+    [TestCase(null, true)]
+    [TestCase("a", false)]
+    [TestCase("abc", false)]
+    [TestCase("abc   ", false)]
+    [TestCase("   abc", false)]
+    [TestCase("   abc   ", false)]
+    public void IsNullOrWhiteSpace(string value, bool expected)
+    {
+        // Act
+        var result = value.IsNullOrWhiteSpace();
+
+        // Assert
+        Assert.AreEqual(expected, result);
+    }
+
+    [TestCase("hello", "aGVsbG8")]
+    [TestCase("tad", "dGFk")]
+    [TestCase("AmqGr+Fd!~ééé", "QW1xR3IrRmQhfsOpw6nDqQ")]
+    public void UrlTokenEncoding(string value, string expected)
+    {
+        var bytes = Encoding.UTF8.GetBytes(value);
+        Console.WriteLine("base64: " + Convert.ToBase64String(bytes));
+        var encoded = bytes.UrlTokenEncode();
+        Assert.AreEqual(expected, encoded);
+
+        var backBytes = encoded.UrlTokenDecode();
+        var backString = Encoding.UTF8.GetString(backBytes);
+        Assert.AreEqual(value, backString);
+    }
+
+    // FORMAT STRINGS
+
+    // note: here we just ensure that the proper helper gets called properly
+    // but the "legacy" tests have moved to the legacy helper tests
+    [Test]
+    public void ToUrlAlias()
+    {
+        var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper);
+        Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void FormatUrl()
+    {
+        var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper);
+        Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ToUmbracoAlias()
+    {
+        var output = "JUST-ANYTHING".ToSafeAlias(_mockShortStringHelper);
+        Assert.AreEqual("SAFE-ALIAS::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ToSafeAlias()
+    {
+        var output = "JUST-ANYTHING".ToSafeAlias(_mockShortStringHelper);
+        Assert.AreEqual("SAFE-ALIAS::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ToSafeAliasWithCulture()
+    {
+        var output = "JUST-ANYTHING".ToSafeAlias(_mockShortStringHelper, null);
+        Assert.AreEqual("SAFE-ALIAS-CULTURE::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ToUrlSegment()
+    {
+        var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper);
+        Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ToUrlSegmentWithCulture()
+    {
+        var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper, null);
+        Assert.AreEqual("URL-SEGMENT-CULTURE::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ToSafeFileName()
+    {
+        var output = "JUST-ANYTHING".ToSafeFileName(_mockShortStringHelper);
+        Assert.AreEqual("SAFE-FILE-NAME::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ToSafeFileNameWithCulture()
+    {
+        var output = "JUST-ANYTHING".ToSafeFileName(_mockShortStringHelper, null);
+        Assert.AreEqual("SAFE-FILE-NAME-CULTURE::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void ConvertCase()
+    {
+        var output = "JUST-ANYTHING".ToCleanString(_mockShortStringHelper, CleanStringType.Unchanged);
+        Assert.AreEqual("CLEAN-STRING-A::JUST-ANYTHING", output);
+    }
+
+    [Test]
+    public void SplitPascalCasing()
+    {
+        var output = "JUST-ANYTHING".SplitPascalCasing(_mockShortStringHelper);
+        Assert.AreEqual("SPLIT-PASCAL-CASING::JUST-ANYTHING", output);
+    }
+
+    [Test] // can't do cases with an IDictionary
+    public void ReplaceManyWithCharMap()
+    {
+        const string input = "télévisiön tzvâr ßup &nbsp; pof";
+        const string expected = "television tzvar ssup   pof";
+        IDictionary<string, string> replacements = new Dictionary<string, string>
         {
-            // Act
-            bool result = value.IsNullOrWhiteSpace();
+            { "é", "e" },
+            { "ö", "o" },
+            { "â", "a" },
+            { "ß", "ss" },
+            { "&nbsp;", " " },
+        };
+        var output = input.ReplaceMany(replacements);
+        Assert.AreEqual(expected, output);
+    }
 
-            // Assert
-            Assert.AreEqual(expected, result);
-        }
-
-        [TestCase("hello", "aGVsbG8")]
-        [TestCase("tad", "dGFk")]
-        [TestCase("AmqGr+Fd!~ééé", "QW1xR3IrRmQhfsOpw6nDqQ")]
-        public void UrlTokenEncoding(string value, string expected)
-        {
-            var bytes = Encoding.UTF8.GetBytes(value);
-            Console.WriteLine("base64: " + Convert.ToBase64String(bytes));
-            var encoded = bytes.UrlTokenEncode();
-            Assert.AreEqual(expected, encoded);
-
-            var backBytes = encoded.UrlTokenDecode();
-            var backString = Encoding.UTF8.GetString(backBytes);
-            Assert.AreEqual(value, backString);
-        }
-
-        // FORMAT STRINGS
-
-        // note: here we just ensure that the proper helper gets called properly
-        // but the "legacy" tests have moved to the legacy helper tests
-
-        [Test]
-        public void ToUrlAlias()
-        {
-            var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper);
-            Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void FormatUrl()
-        {
-            var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper);
-            Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ToUmbracoAlias()
-        {
-            var output = "JUST-ANYTHING".ToSafeAlias(_mockShortStringHelper);
-            Assert.AreEqual("SAFE-ALIAS::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ToSafeAlias()
-        {
-            var output = "JUST-ANYTHING".ToSafeAlias(_mockShortStringHelper);
-            Assert.AreEqual("SAFE-ALIAS::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ToSafeAliasWithCulture()
-        {
-            var output = "JUST-ANYTHING".ToSafeAlias(_mockShortStringHelper, (string)null);
-            Assert.AreEqual("SAFE-ALIAS-CULTURE::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ToUrlSegment()
-        {
-            var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper);
-            Assert.AreEqual("URL-SEGMENT::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ToUrlSegmentWithCulture()
-        {
-            var output = "JUST-ANYTHING".ToUrlSegment(_mockShortStringHelper, (string)null);
-            Assert.AreEqual("URL-SEGMENT-CULTURE::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ToSafeFileName()
-        {
-            var output = "JUST-ANYTHING".ToSafeFileName(_mockShortStringHelper);
-            Assert.AreEqual("SAFE-FILE-NAME::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ToSafeFileNameWithCulture()
-        {
-            var output = "JUST-ANYTHING".ToSafeFileName(_mockShortStringHelper, null);
-            Assert.AreEqual("SAFE-FILE-NAME-CULTURE::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void ConvertCase()
-        {
-            var output = "JUST-ANYTHING".ToCleanString(_mockShortStringHelper, CleanStringType.Unchanged);
-            Assert.AreEqual("CLEAN-STRING-A::JUST-ANYTHING", output);
-        }
-
-        [Test]
-        public void SplitPascalCasing()
-        {
-            var output = "JUST-ANYTHING".SplitPascalCasing(_mockShortStringHelper);
-            Assert.AreEqual("SPLIT-PASCAL-CASING::JUST-ANYTHING", output);
-        }
-
-        [Test] // can't do cases with an IDictionary
-        public void ReplaceManyWithCharMap()
-        {
-            const string input = "télévisiön tzvâr ßup &nbsp; pof";
-            const string expected = "television tzvar ssup   pof";
-            IDictionary<string, string> replacements = new Dictionary<string, string>
-                {
-                    { "é", "e" },
-                    { "ö", "o" },
-                    { "â", "a" },
-                    { "ß", "ss" },
-                    { "&nbsp;", " " },
-                };
-            var output = input.ReplaceMany(replacements);
-            Assert.AreEqual(expected, output);
-        }
-
-        [TestCase("val$id!ate|this|str'ing", "$!'", '-', "val-id-ate|this|str-ing")]
-        [TestCase("val$id!ate|this|str'ing", "$!'", '*', "val*id*ate|this|str*ing")]
-        public void ReplaceManyByOneChar(string input, string toReplace, char replacement, string expected)
-        {
-            var output = input.ReplaceMany(toReplace.ToArray(), replacement);
-            Assert.AreEqual(expected, output);
-        }
+    [TestCase("val$id!ate|this|str'ing", "$!'", '-', "val-id-ate|this|str-ing")]
+    [TestCase("val$id!ate|this|str'ing", "$!'", '*', "val*id*ate|this|str*ing")]
+    public void ReplaceManyByOneChar(string input, string toReplace, char replacement, string expected)
+    {
+        var output = input.ReplaceMany(toReplace.ToArray(), replacement);
+        Assert.AreEqual(expected, output);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs
index 0f982fb946..3d4a56121e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StringValidationTests.cs
@@ -1,43 +1,40 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.ComponentModel.DataAnnotations;
 using NUnit.Framework;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+
+[TestFixture]
+public class StringValidationTests
 {
-    [TestFixture]
-    public class StringValidationTests
+    [TestCase("someone@somewhere.com", ExpectedResult = true)]
+    [TestCase("someone@somewhere.co.uk", ExpectedResult = true)]
+    [TestCase("someone+tag@somewhere.net", ExpectedResult = true)]
+    [TestCase("futureTLD@somewhere.fooo", ExpectedResult = true)]
+    [TestCase("abc@xyz.financial", ExpectedResult = true)]
+    [TestCase("admin+gmail-syntax@c.pizza", ExpectedResult = true)]
+    [TestCase("admin@c.pizza", ExpectedResult = true)]
+    [TestCase("fdsa", ExpectedResult = false)]
+    [TestCase("fdsa@", ExpectedResult = false)]
+
+    // IsValid can be either a powerful regex OR a dummy test,
+    // and by default it depends on System.ComponentModel.DataAnnotations.AppSettings.DisableRegEx
+    // which ends up using BinaryCompatibility.Current.TargetsAtLeastFramework472 so for some reason
+    // in 472 we are not using the regex anymore
+    //
+    // it can be forced, though with an app settings
+    // dataAnnotations:dataTypeAttribute:disableRegEx = false
+    //
+    // since Umbraco is now 4.7.2+, the setting is required for the following tests to pass
+
+    // [TestCase("fdsa@fdsa", ExpectedResult = false)]
+    // [TestCase("fdsa@fdsa.", ExpectedResult = false)]
+    public bool Validate_Email_Address(string input)
     {
-        [TestCase("someone@somewhere.com", ExpectedResult = true)]
-        [TestCase("someone@somewhere.co.uk", ExpectedResult = true)]
-        [TestCase("someone+tag@somewhere.net", ExpectedResult = true)]
-        [TestCase("futureTLD@somewhere.fooo", ExpectedResult = true)]
+        var foo = new EmailAddressAttribute();
 
-        [TestCase("abc@xyz.financial", ExpectedResult = true)]
-        [TestCase("admin+gmail-syntax@c.pizza", ExpectedResult = true)]
-        [TestCase("admin@c.pizza", ExpectedResult = true)]
-
-        [TestCase("fdsa", ExpectedResult = false)]
-        [TestCase("fdsa@", ExpectedResult = false)]
-
-        // IsValid can be either a powerful regex OR a dummy test,
-        // and by default it depends on System.ComponentModel.DataAnnotations.AppSettings.DisableRegEx
-        // which ends up using BinaryCompatibility.Current.TargetsAtLeastFramework472 so for some reason
-        // in 472 we are not using the regex anymore
-        //
-        // it can be forced, though with an app settings
-        // dataAnnotations:dataTypeAttribute:disableRegEx = false
-        //
-        // since Umbraco is now 4.7.2+, the setting is required for the following tests to pass
-
-        // [TestCase("fdsa@fdsa", ExpectedResult = false)]
-        // [TestCase("fdsa@fdsa.", ExpectedResult = false)]
-        public bool Validate_Email_Address(string input)
-        {
-            var foo = new EmailAddressAttribute();
-
-            return foo.IsValid(input);
-        }
+        return foo.IsValid(input);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs
index 736e6c76a1..eddc517f1f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/StylesheetHelperTests.cs
@@ -1,88 +1,100 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Strings.Css;
 using Umbraco.Cms.Tests.Common.Extensions;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+
+[TestFixture]
+public class StylesheetHelperTests
 {
-    [TestFixture]
-    public class StylesheetHelperTests
+    [Test]
+    public void Replace_Rule()
     {
-        [Test]
-        public void Replace_Rule()
-        {
-            string css = @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}";
-            IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
+        var css =
+            @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}";
+        var results = StylesheetHelper.ParseRules(css);
 
-            string result = StylesheetHelper.ReplaceRule(css, results.First().Name, new StylesheetRule()
+        var result = StylesheetHelper.ReplaceRule(
+            css,
+            results.First().Name,
+            new StylesheetRule
             {
                 Name = "My new rule",
                 Selector = "p",
-                Styles = "font-size:1em; color:blue;"
+                Styles = "font-size:1em; color:blue;",
             });
 
-            Assert.AreEqual(
-                @"body {font-family:Arial;}/**umb_name:My new rule*/
-p{font-size:1em; color:blue;} /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}".StripWhitespace(), result.StripWhitespace());
-        }
+        Assert.AreEqual(
+            @"body {font-family:Arial;}/**umb_name:My new rule*/
+p{font-size:1em; color:blue;} /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}".StripWhitespace(),
+            result.StripWhitespace());
+    }
 
-        [Test]
-        public void Append_Rule()
-        {
-            string css = @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}";
+    [Test]
+    public void Append_Rule()
+    {
+        var css =
+            @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}";
 
-            string result = StylesheetHelper.AppendRule(css, new StylesheetRule()
-            {
-                Name = "My new rule",
-                Selector = "p",
-                Styles = "font-size:1em; color:blue;"
-            });
+        var result = StylesheetHelper.AppendRule(
+            css,
+            new StylesheetRule { Name = "My new rule", Selector = "p", Styles = "font-size:1em; color:blue;" });
 
-            Assert.AreEqual(
-                @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}
+        Assert.AreEqual(
+            @"body {font-family:Arial;}/** Umb_Name: Test1 */ p { font-size: 1em; } /** umb_name:  Test2 */ li {padding:0px;} table {margin:0;}
 
 /**umb_name:My new rule*/
-p{font-size:1em; color:blue;}".StripWhitespace(), result.StripWhitespace());
-        }
+p{font-size:1em; color:blue;}".StripWhitespace(),
+            result.StripWhitespace());
+    }
 
-        [Test]
-        public void Duplicate_Names()
-        {
-            string css = @"/** Umb_Name: Test */ p { font-size: 1em; } /** umb_name:  Test */ li {padding:0px;}";
-            IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
-            Assert.AreEqual(1, results.Count());
-        }
+    [Test]
+    public void Duplicate_Names()
+    {
+        var css = @"/** Umb_Name: Test */ p { font-size: 1em; } /** umb_name:  Test */ li {padding:0px;}";
+        var results = StylesheetHelper.ParseRules(css);
+        Assert.AreEqual(1, results.Count());
+    }
 
-        // Standard rule stle
-        [TestCase("Test", "p", "font-size: 1em;", @"/**
+    // Standard rule stle
+    [TestCase("Test", "p", "font-size: 1em;", @"/**
     Umb_Name: Test
 */
 p {
     font-size: 1em;
 }")]
-        // All on one line, different casing
-        [TestCase("Test", "p", "font-size: 1em;", @"/** Umb_Name: Test */ p { font-size: 1em; }")]
-        // styles on several lines
-        [TestCase("Test", "p", @"font-size: 1em;
+
+    // All on one line, different casing
+    [TestCase("Test", "p", "font-size: 1em;", @"/** Umb_Name: Test */ p { font-size: 1em; }")]
+
+    // styles on several lines
+    [TestCase(
+        "Test",
+        "p",
+        @"font-size: 1em;
 color:red; font-weight:bold;
 
-text-align:left;", @"/** umb_name: Test */ p { font-size: 1em;
+text-align:left;",
+        @"/** umb_name: Test */ p { font-size: 1em;
 color:red; font-weight:bold;
 
 text-align:left;
 
 }")]
-        // All on one line with no spaces
-        [TestCase("Test", "p", "font-size: 1em;", @"/**UMB_NAME:Test*/p{font-size: 1em;}")]
-        // Has a name with spaces
-        [TestCase("Hello world", "p", "font-size: 1em;", @"/**UMB_NAME:Hello world */p{font-size: 1em;}")]
-        // Every part on a new line
-        [TestCase("Test", "p", "font-size: 1em;", @"/**
+
+    // All on one line with no spaces
+    [TestCase("Test", "p", "font-size: 1em;", @"/**UMB_NAME:Test*/p{font-size: 1em;}")]
+
+    // Has a name with spaces
+    [TestCase("Hello world", "p", "font-size: 1em;", @"/**UMB_NAME:Hello world */p{font-size: 1em;}")]
+
+    // Every part on a new line
+    [TestCase("Test", "p", "font-size: 1em;", @"/**
 umb_name:
 Test
 */
@@ -90,130 +102,126 @@ p
 {
 font-size: 1em;
 }")]
-        public void ParseRules_Parses(string name, string selector, string styles, string css)
-        {
-            // Act
-            IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
+    public void ParseRules_Parses(string name, string selector, string styles, string css)
+    {
+        // Act
+        var results = StylesheetHelper.ParseRules(css).ToArray();
 
-            // Assert
-            Assert.AreEqual(1, results.Count());
+        // Assert
+        Assert.AreEqual(1, results.Length);
 
-            // Assert.IsTrue(results.First().RuleId.Value.Value.ToString() == file.Id.Value.Value + "/" + name);
-            Assert.AreEqual(name, results.First().Name);
-            Assert.AreEqual(selector, results.First().Selector);
-            Assert.AreEqual(styles.StripWhitespace(), results.First().Styles.StripWhitespace());
-        }
+        // Assert.IsTrue(results.First().RuleId.Value.Value.ToString() == file.Id.Value.Value + "/" + name);
+        Assert.AreEqual(name, results.First().Name);
+        Assert.AreEqual(selector, results.First().Selector);
+        Assert.AreEqual(styles.StripWhitespace(), results.First().Styles.StripWhitespace());
+    }
 
-        // No Name: keyword
-        [TestCase(@"/** Test2 */
+    // No Name: keyword
+    [TestCase(@"/** Test2 */
 p
 {
     font-size: 1em;
 }")]
 
-        // Has a Name: keyword, but applies to 2 rules, so shouldn't parse
-        [TestCase(@"/** umb_name: Test2 */
+    // Has a Name: keyword, but applies to 2 rules, so shouldn't parse
+    [TestCase(@"/** umb_name: Test2 */
 p, h2
 {
     font-size: 1em;
 }")]
 
-        // Has it's name wrapping over two lines
-        [TestCase("/** umb_name: Test\r\n2 */ p { font-size: 1em; }")]
-        [TestCase("/** umb_name: Test\n2 */ p { font-size: 1em; }")]
+    // Has it's name wrapping over two lines
+    [TestCase("/** umb_name: Test\r\n2 */ p { font-size: 1em; }")]
+    [TestCase("/** umb_name: Test\n2 */ p { font-size: 1em; }")]
 
-        // Only a single asterisk
-        [TestCase("/* umb_name: Test */ p { font-size: 1em; }")]
+    // Only a single asterisk
+    [TestCase("/* umb_name: Test */ p { font-size: 1em; }")]
 
-        // Has a name with spaces over multiple lines
-        [TestCase(@"/**UMB_NAME:Hello
+    // Has a name with spaces over multiple lines
+    [TestCase(@"/**UMB_NAME:Hello
 
 world */p{font-size: 1em;}")]
-        public void ParseRules_DoesntParse(string css)
-        {
-            // Act
-            IEnumerable<StylesheetRule> results = StylesheetHelper.ParseRules(css);
+    public void ParseRules_DoesntParse(string css)
+    {
+        // Act
+        var results = StylesheetHelper.ParseRules(css);
 
-            // Assert
-            Assert.IsTrue(results.Any() == false);
-        }
-
-        [Test]
-        public void AppendRules_IsFormatted()
-        {
-            // base CSS
-            string css = Tabbed(
-@"body {
-#font-family:Arial;
-}");
-            // add a couple of rules
-            string result = StylesheetHelper.AppendRule(css, new StylesheetRule
-            {
-                Name = "Test",
-                Selector = ".test",
-                Styles = "font-color: red;margin: 1rem;"
-            });
-            result = StylesheetHelper.AppendRule(result, new StylesheetRule
-            {
-                Name = "Test2",
-                Selector = ".test2",
-                Styles = "font-color: green;"
-            });
-
-            // verify the CSS formatting including the indents
-            Assert.AreEqual(
-                Tabbed(
-@"body {
-#font-family:Arial;
-}
-
-/**umb_name:Test*/
-.test {
-#font-color: red;
-#margin: 1rem;
-}
-
-/**umb_name:Test2*/
-.test2 {
-#font-color: green;
-}").NormalizeNewLines(), result.NormalizeNewLines());
-        }
-
-        [Test]
-        public void ParseFormattedRules_CanParse()
-        {
-            // base CSS
-            string css = Tabbed(
-@"body {
-#font-family:Arial;
-}
-
-/**umb_name:Test*/
-.test {
-#font-color: red;
-#margin: 1rem;
-}
-
-/**umb_name:Test2*/
-.test2 {
-#font-color: green;
-}");
-            IEnumerable<StylesheetRule> rules = StylesheetHelper.ParseRules(css);
-            Assert.AreEqual(2, rules.Count());
-
-            Assert.AreEqual("Test", rules.First().Name);
-            Assert.AreEqual(".test", rules.First().Selector);
-            Assert.AreEqual(
-@"font-color: red;
-margin: 1rem;".NormalizeNewLines(), rules.First().Styles.NormalizeNewLines());
-
-            Assert.AreEqual("Test2", rules.Last().Name);
-            Assert.AreEqual(".test2", rules.Last().Selector);
-            Assert.AreEqual("font-color: green;", rules.Last().Styles);
-        }
-
-        // can't put tabs in verbatim strings, so this will replace # with \t to test the CSS indents
-        // - and it's tabs because the editor uses tabs, not spaces...
-        private static string Tabbed(string input) => input.Replace("#", "\t");
+        // Assert
+        Assert.IsTrue(results.Any() == false);
     }
+
+    [Test]
+    public void AppendRules_IsFormatted()
+    {
+        // base CSS
+        var css = Tabbed(
+            @"body {
+#font-family:Arial;
+}");
+
+        // add a couple of rules
+        var result = StylesheetHelper.AppendRule(
+            css,
+            new StylesheetRule { Name = "Test", Selector = ".test", Styles = "font-color: red;margin: 1rem;" });
+        result = StylesheetHelper.AppendRule(
+            result,
+            new StylesheetRule { Name = "Test2", Selector = ".test2", Styles = "font-color: green;" });
+
+        // verify the CSS formatting including the indents
+        Assert.AreEqual(
+            Tabbed(
+                @"body {
+#font-family:Arial;
+}
+
+/**umb_name:Test*/
+.test {
+#font-color: red;
+#margin: 1rem;
+}
+
+/**umb_name:Test2*/
+.test2 {
+#font-color: green;
+}").NormalizeNewLines(),
+            result.NormalizeNewLines());
+    }
+
+    [Test]
+    public void ParseFormattedRules_CanParse()
+    {
+        // base CSS
+        var css = Tabbed(
+            @"body {
+#font-family:Arial;
+}
+
+/**umb_name:Test*/
+.test {
+#font-color: red;
+#margin: 1rem;
+}
+
+/**umb_name:Test2*/
+.test2 {
+#font-color: green;
+}");
+        var rules = StylesheetHelper.ParseRules(css).ToArray();
+        Assert.AreEqual(2, rules.Count());
+
+        Assert.AreEqual("Test", rules.First().Name);
+        Assert.AreEqual(".test", rules.First().Selector);
+        Assert.AreEqual(
+            @"font-color: red;
+margin: 1rem;".NormalizeNewLines(),
+            rules.First().Styles.NormalizeNewLines());
+
+        Assert.AreEqual("Test2", rules.Last().Name);
+        Assert.AreEqual(".test2", rules.Last().Selector);
+        Assert.AreEqual("font-color: green;", rules.Last().Styles);
+    }
+
+    // can't put tabs in verbatim strings, so this will replace # with \t to test the CSS indents
+    // - and it's tabs because the editor uses tabs, not spaces...
+    private static string Tabbed(string input) => input.Replace("#", "\t");
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs
index 23a3955bc1..2f29b10243 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/TaskHelperTests.cs
@@ -12,66 +12,62 @@ using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class TaskHelperTests
 {
-    [TestFixture]
-    public class TaskHelperTests
+    [Test]
+    [AutoMoqData]
+    public void RunBackgroundTask__Suppress_Execution_Context(
+        [Frozen] ILogger<TaskHelper> logger,
+        TaskHelper sut)
     {
-        [Test]
-        [AutoMoqData]
-        public void RunBackgroundTask__Suppress_Execution_Context(
-            [Frozen] ILogger<TaskHelper> logger,
-            TaskHelper sut)
+        var local = new AsyncLocal<string> { Value = "hello" };
+
+        string taskResult = null;
+
+        var t = sut.ExecuteBackgroundTask(() =>
         {
-            var local = new AsyncLocal<string>
-            {
-                Value = "hello"
-            };
+            // FireAndForgetTasks ensure that flow is suppressed therefore this value will be null
+            taskResult = local.Value;
+            return Task.CompletedTask;
+        });
 
-            string taskResult = null;
-            
-            Task t = sut.ExecuteBackgroundTask(() =>
-            {
-                // FireAndForgetTasks ensure that flow is suppressed therefore this value will be null
-                taskResult = local.Value;
-                return Task.CompletedTask;
-            });
+        Task.WaitAll(t);
 
-            Task.WaitAll(t);
+        Assert.IsNull(taskResult);
+    }
 
-            Assert.IsNull(taskResult);
-        }
-
-        [Test]
-        [AutoMoqData]
-        public void RunBackgroundTask__Must_Run_Func(
-            [Frozen] ILogger<TaskHelper> logger,
-            TaskHelper sut)
+    [Test]
+    [AutoMoqData]
+    public void RunBackgroundTask__Must_Run_Func(
+        [Frozen] ILogger<TaskHelper> logger,
+        TaskHelper sut)
+    {
+        var i = 0;
+        var t = sut.ExecuteBackgroundTask(() =>
         {
-            var i = 0;
-            Task t = sut.ExecuteBackgroundTask(() =>
-            {
-                Interlocked.Increment(ref i);
-                return Task.CompletedTask;
-            });
+            Interlocked.Increment(ref i);
+            return Task.CompletedTask;
+        });
 
-            Task.WaitAll(t);
+        Task.WaitAll(t);
 
-            Assert.AreEqual(1, i);
-        }
+        Assert.AreEqual(1, i);
+    }
 
-        [Test]
-        [AutoMoqData]
-        public void RunBackgroundTask__Log_Error_When_Exception_Happen_In_Background_Task(
-            [Frozen] ILogger<TaskHelper> logger,
-            Exception exception,
-            TaskHelper sut)
-        {
-            Task t = sut.ExecuteBackgroundTask(() => throw exception);
+    [Test]
+    [AutoMoqData]
+    public void RunBackgroundTask__Log_Error_When_Exception_Happen_In_Background_Task(
+        [Frozen] ILogger<TaskHelper> logger,
+        Exception exception,
+        TaskHelper sut)
+    {
+        var t = sut.ExecuteBackgroundTask(() => throw exception);
 
-            Task.WaitAll(t);
+        Task.WaitAll(t);
 
-            Mock.Get(logger).VerifyLogError(exception, "Exception thrown in a background thread", Times.Once());
-        }
+        Mock.Get(logger).VerifyLogError(exception, "Exception thrown in a background thread", Times.Once());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SiteIdentifierServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SiteIdentifierServiceTests.cs
index 81934cc1be..d8c9e9f39c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SiteIdentifierServiceTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SiteIdentifierServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -7,71 +7,70 @@ using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Telemetry;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Telemetry
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Telemetry;
+
+[TestFixture]
+public class SiteIdentifierServiceTests
 {
-    [TestFixture]
-    public class SiteIdentifierServiceTests
+    [TestCase("0F1785C5-7BA0-4C52-AB62-863BD2C8F3FE", true)]
+    [TestCase("This is not a guid", false)]
+    [TestCase("", false)]
+    [TestCase("00000000-0000-0000-0000-000000000000", false)] // Don't count empty GUID as valid
+    public void TryGetOnlyPassesIfValidId(string guidString, bool shouldSucceed)
     {
-        [TestCase("0F1785C5-7BA0-4C52-AB62-863BD2C8F3FE", true)]
-        [TestCase("This is not a guid", false)]
-        [TestCase("", false)]
-        [TestCase("00000000-0000-0000-0000-000000000000", false)] // Don't count empty GUID as valid
-        public void TryGetOnlyPassesIfValidId(string guidString, bool shouldSucceed)
+        var globalSettings = CreateGlobalSettings(guidString);
+        var sut = new SiteIdentifierService(
+            globalSettings,
+            Mock.Of<IConfigManipulator>(),
+            Mock.Of<ILogger<SiteIdentifierService>>());
+
+        var result = sut.TryGetSiteIdentifier(out var siteIdentifier);
+
+        Assert.AreEqual(shouldSucceed, result);
+        if (shouldSucceed)
         {
-            var globalSettings = CreateGlobalSettings(guidString);
-            var sut = new SiteIdentifierService(
-                globalSettings,
-                Mock.Of<IConfigManipulator>(),
-                Mock.Of<ILogger<SiteIdentifierService>>());
-
-            var result = sut.TryGetSiteIdentifier(out var siteIdentifier);
-
-            Assert.AreEqual(shouldSucceed, result);
-            if (shouldSucceed)
-            {
-                // When toString is called on a GUID it will to lower, so do the same to our guidString
-                Assert.AreEqual(guidString.ToLower(), siteIdentifier.ToString());
-            }
-            else
-            {
-                Assert.AreEqual(Guid.Empty, siteIdentifier);
-            }
+            // When toString is called on a GUID it will to lower, so do the same to our guidString
+            Assert.AreEqual(guidString.ToLower(), siteIdentifier.ToString());
         }
-
-        [TestCase("0F1785C5-7BA0-4C52-AB62-863BD2C8F3FE", false)]
-        [TestCase("This is not a guid", true)]
-        [TestCase("", true)]
-        [TestCase("00000000-0000-0000-0000-000000000000", true)] // Don't count empty GUID as valid
-        public void TryGetOrCreateOnlyCreatesNewGuidIfCurrentIsMissingOrInvalid(string guidString, bool shouldCreate)
+        else
         {
-            var globalSettings = CreateGlobalSettings(guidString);
-            var configManipulatorMock = new Mock<IConfigManipulator>();
-
-            var sut = new SiteIdentifierService(
-                globalSettings,
-                configManipulatorMock.Object,
-                Mock.Of<ILogger<SiteIdentifierService>>());
-
-            var result = sut.TryGetOrCreateSiteIdentifier(out var identifier);
-
-            if (shouldCreate)
-            {
-                configManipulatorMock.Verify(x => x.SetGlobalId(It.IsAny<string>()), Times.Once);
-                Assert.AreNotEqual(Guid.Empty, identifier);
-                Assert.IsTrue(result);
-            }
-            else
-            {
-                configManipulatorMock.Verify(x => x.SetGlobalId(It.IsAny<string>()), Times.Never());
-                Assert.AreEqual(guidString.ToLower(), identifier.ToString());
-                Assert.IsTrue(result);
-            }
-        }
-
-        private IOptionsMonitor<GlobalSettings> CreateGlobalSettings(string guidString)
-        {
-            var globalSettings = new GlobalSettings { Id = guidString };
-            return Mock.Of<IOptionsMonitor<GlobalSettings>>(x => x.CurrentValue == globalSettings);
+            Assert.AreEqual(Guid.Empty, siteIdentifier);
         }
     }
+
+    [TestCase("0F1785C5-7BA0-4C52-AB62-863BD2C8F3FE", false)]
+    [TestCase("This is not a guid", true)]
+    [TestCase("", true)]
+    [TestCase("00000000-0000-0000-0000-000000000000", true)] // Don't count empty GUID as valid
+    public void TryGetOrCreateOnlyCreatesNewGuidIfCurrentIsMissingOrInvalid(string guidString, bool shouldCreate)
+    {
+        var globalSettings = CreateGlobalSettings(guidString);
+        var configManipulatorMock = new Mock<IConfigManipulator>();
+
+        var sut = new SiteIdentifierService(
+            globalSettings,
+            configManipulatorMock.Object,
+            Mock.Of<ILogger<SiteIdentifierService>>());
+
+        var result = sut.TryGetOrCreateSiteIdentifier(out var identifier);
+
+        if (shouldCreate)
+        {
+            configManipulatorMock.Verify(x => x.SetGlobalId(It.IsAny<string>()), Times.Once);
+            Assert.AreNotEqual(Guid.Empty, identifier);
+            Assert.IsTrue(result);
+        }
+        else
+        {
+            configManipulatorMock.Verify(x => x.SetGlobalId(It.IsAny<string>()), Times.Never());
+            Assert.AreEqual(guidString.ToLower(), identifier.ToString());
+            Assert.IsTrue(result);
+        }
+    }
+
+    private IOptionsMonitor<GlobalSettings> CreateGlobalSettings(string guidString)
+    {
+        var globalSettings = new GlobalSettings { Id = guidString };
+        return Mock.Of<IOptionsMonitor<GlobalSettings>>(x => x.CurrentValue == globalSettings);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs
index 42aae01281..28fc224b8a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
@@ -10,113 +9,114 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Telemetry.Providers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Telemetry
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Telemetry;
+
+[TestFixture]
+public class SystemInformationTelemetryProviderTests
 {
-    [TestFixture]
-    public class SystemInformationTelemetryProviderTests
+    [Test]
+    [TestCase(ModelsMode.Nothing)]
+    [TestCase(ModelsMode.InMemoryAuto)]
+    [TestCase(ModelsMode.SourceCodeAuto)]
+    [TestCase(ModelsMode.SourceCodeManual)]
+    public void ReportsModelsModeCorrectly(ModelsMode modelsMode)
     {
-        [Test]
-        [TestCase(ModelsMode.Nothing)]
-        [TestCase(ModelsMode.InMemoryAuto)]
-        [TestCase(ModelsMode.SourceCodeAuto)]
-        [TestCase(ModelsMode.SourceCodeManual)]
-        public void ReportsModelsModeCorrectly(ModelsMode modelsMode)
-        {
-            var telemetryProvider = CreateProvider(modelsMode: modelsMode);
-            UsageInformation[] usageInformation = telemetryProvider.GetInformation().ToArray();
+        var telemetryProvider = CreateProvider(modelsMode);
+        var usageInformation = telemetryProvider.GetInformation().ToArray();
 
-            var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.ModelsBuilderMode);
-            Assert.IsNotNull(actual?.Data);
-            Assert.AreEqual(modelsMode.ToString(), actual.Data);
-        }
+        var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.ModelsBuilderMode);
+        Assert.IsNotNull(actual?.Data);
+        Assert.AreEqual(modelsMode.ToString(), actual.Data);
+    }
 
-        [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void ReportsDebugModeCorrectly(bool isDebug)
-        {
-            var telemetryProvider = CreateProvider(isDebug: isDebug);
-            UsageInformation[] usageInformation = telemetryProvider.GetInformation().ToArray();
+    [Test]
+    [TestCase(true)]
+    [TestCase(false)]
+    public void ReportsDebugModeCorrectly(bool isDebug)
+    {
+        var telemetryProvider = CreateProvider(isDebug: isDebug);
+        var usageInformation = telemetryProvider.GetInformation().ToArray();
 
-            var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.IsDebug);
-            Assert.IsNotNull(actual?.Data);
-            Assert.AreEqual(isDebug, actual.Data);
-        }
+        var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.IsDebug);
+        Assert.IsNotNull(actual?.Data);
+        Assert.AreEqual(isDebug, actual.Data);
+    }
 
-        [Test]
-        [TestCase("en-US")]
-        [TestCase("de-DE")]
-        [TestCase("en-NZ")]
-        [TestCase("sv-SE")]
-        public void ReportsOsLanguageCorrectly(string culture)
-        {
-            Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
-            var telemetryProvider = CreateProvider();
+    [Test]
+    [TestCase("en-US")]
+    [TestCase("de-DE")]
+    [TestCase("en-NZ")]
+    [TestCase("sv-SE")]
+    public void ReportsOsLanguageCorrectly(string culture)
+    {
+        Thread.CurrentThread.CurrentCulture = new CultureInfo(culture);
+        var telemetryProvider = CreateProvider();
 
-            UsageInformation[] usageInformation = telemetryProvider.GetInformation().ToArray();
-            var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.OsLanguage);
+        var usageInformation = telemetryProvider.GetInformation().ToArray();
+        var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.OsLanguage);
 
-            Assert.NotNull(actual?.Data);
-            Assert.AreEqual(culture, actual.Data.ToString());
-        }
+        Assert.NotNull(actual?.Data);
+        Assert.AreEqual(culture, actual.Data.ToString());
+    }
 
-        [Test]
-        [TestCase(GlobalSettings.StaticUmbracoPath, false)]
-        [TestCase("mycustompath", true)]
-        [TestCase("~/notUmbraco", true)]
-        [TestCase("/umbraco", true)]
-        [TestCase("umbraco", true)]
-        public void ReportsCustomUmbracoPathCorrectly(string path, bool isCustom)
-        {
-            var telemetryProvider = CreateProvider(umbracoPath: path);
+    [Test]
+    [TestCase(GlobalSettings.StaticUmbracoPath, false)]
+    [TestCase("mycustompath", true)]
+    [TestCase("~/notUmbraco", true)]
+    [TestCase("/umbraco", true)]
+    [TestCase("umbraco", true)]
+    public void ReportsCustomUmbracoPathCorrectly(string path, bool isCustom)
+    {
+        var telemetryProvider = CreateProvider(umbracoPath: path);
 
-            UsageInformation[] usageInformation = telemetryProvider.GetInformation().ToArray();
-            var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.CustomUmbracoPath);
+        var usageInformation = telemetryProvider.GetInformation().ToArray();
+        var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.CustomUmbracoPath);
 
-            Assert.NotNull(actual?.Data);
-            Assert.AreEqual(isCustom, actual.Data);
-        }
+        Assert.NotNull(actual?.Data);
+        Assert.AreEqual(isCustom, actual.Data);
+    }
 
-        [Test]
-        [TestCase("Development")]
-        [TestCase("Staging")]
-        [TestCase("Production")]
-        public void ReportsCorrectAspEnvironment(string environment)
-        {
-            var telemetryProvider = CreateProvider(environment: environment);
+    [Test]
+    [TestCase("Development")]
+    [TestCase("Staging")]
+    [TestCase("Production")]
+    public void ReportsCorrectAspEnvironment(string environment)
+    {
+        var telemetryProvider = CreateProvider(environment: environment);
 
-            UsageInformation[] usageInformation = telemetryProvider.GetInformation().ToArray();
-            var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.AspEnvironment);
+        var usageInformation = telemetryProvider.GetInformation().ToArray();
+        var actual = usageInformation.FirstOrDefault(x => x.Name == Constants.Telemetry.AspEnvironment);
 
-            Assert.NotNull(actual?.Data);
-            Assert.AreEqual(environment, actual.Data);
-        }
+        Assert.NotNull(actual?.Data);
+        Assert.AreEqual(environment, actual.Data);
+    }
 
-        private SystemInformationTelemetryProvider CreateProvider(
-            ModelsMode modelsMode = ModelsMode.InMemoryAuto,
-            bool isDebug = true,
-            string umbracoPath = "",
-            string environment = "")
-        {
-            var hostEnvironment = new Mock<IHostEnvironment>();
-            hostEnvironment.Setup(x => x.EnvironmentName).Returns(environment);
+    private SystemInformationTelemetryProvider CreateProvider(
+        ModelsMode modelsMode = ModelsMode.InMemoryAuto,
+        bool isDebug = true,
+        string umbracoPath = "",
+        string environment = "")
+    {
+        var hostEnvironment = new Mock<IHostEnvironment>();
+        hostEnvironment.Setup(x => x.EnvironmentName).Returns(environment);
 
-            var databaseMock = new Mock<IUmbracoDatabase>();
-            databaseMock.Setup(x => x.DatabaseType.GetProviderName()).Returns("SQL");
+        var databaseMock = new Mock<IUmbracoDatabase>();
+        databaseMock.Setup(x => x.DatabaseType.GetProviderName()).Returns("SQL");
 
-            return new SystemInformationTelemetryProvider(
-                Mock.Of<IUmbracoVersion>(),
-                Mock.Of<ILocalizationService>(),
-                Mock.Of<IOptionsMonitor<ModelsBuilderSettings>>(x => x.CurrentValue == new ModelsBuilderSettings{ ModelsMode = modelsMode }),
-                Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == new HostingSettings { Debug = isDebug }),
-                Mock.Of<IOptionsMonitor<GlobalSettings>>(x => x.CurrentValue == new GlobalSettings{ UmbracoPath = umbracoPath }),
-                hostEnvironment.Object,
-                Mock.Of<IUmbracoDatabaseFactory>(x=>x.CreateDatabase() == Mock.Of<IUmbracoDatabase>(y=>y.DatabaseType == DatabaseType.SQLite)));
-        }
+        return new SystemInformationTelemetryProvider(
+            Mock.Of<IUmbracoVersion>(),
+            Mock.Of<ILocalizationService>(),
+            Mock.Of<IOptionsMonitor<ModelsBuilderSettings>>(x =>
+                x.CurrentValue == new ModelsBuilderSettings { ModelsMode = modelsMode }),
+            Mock.Of<IOptionsMonitor<HostingSettings>>(x => x.CurrentValue == new HostingSettings { Debug = isDebug }),
+            Mock.Of<IOptionsMonitor<GlobalSettings>>(x =>
+                x.CurrentValue == new GlobalSettings { UmbracoPath = umbracoPath }),
+            hostEnvironment.Object,
+            Mock.Of<IUmbracoDatabaseFactory>(x =>
+                x.CreateDatabase() == Mock.Of<IUmbracoDatabase>(y => y.DatabaseType == DatabaseType.SQLite)));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/TelemetryServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
index 67e046f1fa..83aa368d70 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
@@ -10,128 +10,151 @@ using Umbraco.Cms.Core.Semver;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Telemetry;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Telemetry
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Telemetry;
+
+[TestFixture]
+public class TelemetryServiceTests
 {
-    [TestFixture]
-    public class TelemetryServiceTests
+    [Test]
+    public void UsesGetOrCreateSiteId()
     {
-        [Test]
-        public void UsesGetOrCreateSiteId()
+        var version = CreateUmbracoVersion(9, 3, 1);
+        var siteIdentifierServiceMock = new Mock<ISiteIdentifierService>();
+        var usageInformationServiceMock = new Mock<IUsageInformationService>();
+        var sut = new TelemetryService(
+            Mock.Of<IManifestParser>(),
+            version,
+            siteIdentifierServiceMock.Object,
+            usageInformationServiceMock.Object,
+            Mock.Of<IMetricsConsentService>());
+        Guid guid;
+
+        sut.TryGetTelemetryReportData(out _);
+        siteIdentifierServiceMock.Verify(x => x.TryGetOrCreateSiteIdentifier(out guid), Times.Once);
+    }
+
+    [Test]
+    public void SkipsIfCantGetOrCreateId()
+    {
+        var version = CreateUmbracoVersion(9, 3, 1);
+        var sut = new TelemetryService(
+            Mock.Of<IManifestParser>(),
+            version,
+            CreateSiteIdentifierService(false),
+            Mock.Of<IUsageInformationService>(),
+            Mock.Of<IMetricsConsentService>());
+
+        var result = sut.TryGetTelemetryReportData(out var telemetry);
+
+        Assert.IsFalse(result);
+        Assert.IsNull(telemetry);
+    }
+
+    [Test]
+    public void ReturnsSemanticVersionWithoutBuild()
+    {
+        var version = CreateUmbracoVersion(9, 1, 1, "-rc", "-ad2f4k2d");
+
+        var metricsConsentService = new Mock<IMetricsConsentService>();
+        metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Detailed);
+        var sut = new TelemetryService(
+            Mock.Of<IManifestParser>(),
+            version,
+            CreateSiteIdentifierService(),
+            Mock.Of<IUsageInformationService>(),
+            metricsConsentService.Object);
+
+        var result = sut.TryGetTelemetryReportData(out var telemetry);
+
+        Assert.IsTrue(result);
+        Assert.AreEqual("9.1.1-rc", telemetry.Version);
+    }
+
+    [Test]
+    public void CanGatherPackageTelemetry()
+    {
+        var version = CreateUmbracoVersion(9, 1, 1);
+        var versionPackageName = "VersionPackage";
+        var packageVersion = "1.0.0";
+        var noVersionPackageName = "NoVersionPackage";
+        PackageManifest[] manifests =
         {
-            var version = CreateUmbracoVersion(9, 3, 1);
-            var siteIdentifierServiceMock = new Mock<ISiteIdentifierService>();
-            var usageInformationServiceMock = new Mock<IUsageInformationService>();
-            var sut = new TelemetryService(Mock.Of<IManifestParser>(), version, siteIdentifierServiceMock.Object, usageInformationServiceMock.Object, Mock.Of<IMetricsConsentService>());
-            Guid guid;
+            new() { PackageName = versionPackageName, Version = packageVersion },
+            new() { PackageName = noVersionPackageName },
+        };
+        var manifestParser = CreateManifestParser(manifests);
+        var metricsConsentService = new Mock<IMetricsConsentService>();
+        metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Basic);
+        var sut = new TelemetryService(
+            manifestParser,
+            version,
+            CreateSiteIdentifierService(),
+            Mock.Of<IUsageInformationService>(),
+            metricsConsentService.Object);
 
-            var result = sut.TryGetTelemetryReportData(out var telemetryReportData);
-            siteIdentifierServiceMock.Verify(x => x.TryGetOrCreateSiteIdentifier(out guid), Times.Once);
-        }
+        var success = sut.TryGetTelemetryReportData(out var telemetry);
 
-        [Test]
-        public void SkipsIfCantGetOrCreateId()
+        Assert.IsTrue(success);
+        Assert.Multiple(() =>
         {
-            var version = CreateUmbracoVersion(9, 3, 1);
-            var sut = new TelemetryService(Mock.Of<IManifestParser>(), version, createSiteIdentifierService(false), Mock.Of<IUsageInformationService>(), Mock.Of<IMetricsConsentService>());
+            Assert.AreEqual(2, telemetry.Packages.Count());
+            var versionPackage = telemetry.Packages.FirstOrDefault(x => x.Name == versionPackageName);
+            Assert.AreEqual(versionPackageName, versionPackage.Name);
+            Assert.AreEqual(packageVersion, versionPackage.Version);
 
-            var result = sut.TryGetTelemetryReportData(out var telemetry);
+            var noVersionPackage = telemetry.Packages.FirstOrDefault(x => x.Name == noVersionPackageName);
+            Assert.AreEqual(noVersionPackageName, noVersionPackage.Name);
+            Assert.AreEqual(string.Empty, noVersionPackage.Version);
+        });
+    }
 
-            Assert.IsFalse(result);
-            Assert.IsNull(telemetry);
-        }
-
-        [Test]
-        public void ReturnsSemanticVersionWithoutBuild()
+    [Test]
+    public void RespectsAllowPackageTelemetry()
+    {
+        var version = CreateUmbracoVersion(9, 1, 1);
+        PackageManifest[] manifests =
         {
-            var version = CreateUmbracoVersion(9, 1, 1, "-rc", "-ad2f4k2d");
+            new() { PackageName = "DoNotTrack", AllowPackageTelemetry = false },
+            new() { PackageName = "TrackingAllowed", AllowPackageTelemetry = true },
+        };
+        var manifestParser = CreateManifestParser(manifests);
+        var metricsConsentService = new Mock<IMetricsConsentService>();
+        metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Basic);
+        var sut = new TelemetryService(
+            manifestParser,
+            version,
+            CreateSiteIdentifierService(),
+            Mock.Of<IUsageInformationService>(),
+            metricsConsentService.Object);
 
-            var metricsConsentService = new Mock<IMetricsConsentService>();
-            metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Detailed);
-            var sut = new TelemetryService(Mock.Of<IManifestParser>(), version, createSiteIdentifierService(), Mock.Of<IUsageInformationService>(), metricsConsentService.Object);
+        var success = sut.TryGetTelemetryReportData(out var telemetry);
 
-            var result = sut.TryGetTelemetryReportData(out var telemetry);
-
-            Assert.IsTrue(result);
-            Assert.AreEqual("9.1.1-rc", telemetry.Version);
-        }
-
-        [Test]
-        public void CanGatherPackageTelemetry()
+        Assert.IsTrue(success);
+        Assert.Multiple(() =>
         {
-            var version = CreateUmbracoVersion(9, 1, 1);
-            var versionPackageName = "VersionPackage";
-            var packageVersion = "1.0.0";
-            var noVersionPackageName = "NoVersionPackage";
-            PackageManifest[] manifests =
-            {
-                new () { PackageName = versionPackageName, Version = packageVersion },
-                new () { PackageName = noVersionPackageName }
-            };
-            var manifestParser = CreateManifestParser(manifests);
-            var metricsConsentService = new Mock<IMetricsConsentService>();
-            metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Basic);
-            var sut = new TelemetryService(manifestParser, version, createSiteIdentifierService(), Mock.Of<IUsageInformationService>(), metricsConsentService.Object);
+            Assert.AreEqual(1, telemetry.Packages.Count());
+            Assert.AreEqual("TrackingAllowed", telemetry.Packages.First().Name);
+        });
+    }
 
-            var success = sut.TryGetTelemetryReportData(out var telemetry);
+    private IManifestParser CreateManifestParser(IEnumerable<PackageManifest> manifests)
+    {
+        var manifestParserMock = new Mock<IManifestParser>();
+        manifestParserMock.Setup(x => x.GetManifests()).Returns(manifests);
+        return manifestParserMock.Object;
+    }
 
-            Assert.IsTrue(success);
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(2, telemetry.Packages.Count());
-                var versionPackage = telemetry.Packages.FirstOrDefault(x => x.Name == versionPackageName);
-                Assert.AreEqual(versionPackageName, versionPackage.Name);
-                Assert.AreEqual(packageVersion, versionPackage.Version);
+    private IUmbracoVersion CreateUmbracoVersion(int major, int minor, int patch, string prerelease = "", string build = "")
+    {
+        var version = new SemVersion(major, minor, patch, prerelease, build);
+        return Mock.Of<IUmbracoVersion>(x => x.SemanticVersion == version);
+    }
 
-                var noVersionPackage = telemetry.Packages.FirstOrDefault(x => x.Name == noVersionPackageName);
-                Assert.AreEqual(noVersionPackageName, noVersionPackage.Name);
-                Assert.AreEqual(string.Empty, noVersionPackage.Version);
-            });
-        }
-
-        [Test]
-        public void RespectsAllowPackageTelemetry()
-        {
-            var version = CreateUmbracoVersion(9, 1, 1);
-            PackageManifest[] manifests =
-            {
-                new () { PackageName = "DoNotTrack", AllowPackageTelemetry = false },
-                new () { PackageName = "TrackingAllowed", AllowPackageTelemetry = true },
-            };
-            var manifestParser = CreateManifestParser(manifests);
-            var metricsConsentService = new Mock<IMetricsConsentService>();
-            metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Basic);
-            var sut = new TelemetryService(manifestParser, version, createSiteIdentifierService(), Mock.Of<IUsageInformationService>(), metricsConsentService.Object);
-
-            var success = sut.TryGetTelemetryReportData(out var telemetry);
-
-            Assert.IsTrue(success);
-            Assert.Multiple(() =>
-            {
-                Assert.AreEqual(1, telemetry.Packages.Count());
-                Assert.AreEqual("TrackingAllowed", telemetry.Packages.First().Name);
-            });
-        }
-
-
-        private IManifestParser CreateManifestParser(IEnumerable<PackageManifest> manifests)
-        {
-            var manifestParserMock = new Mock<IManifestParser>();
-            manifestParserMock.Setup(x => x.GetManifests()).Returns(manifests);
-            return manifestParserMock.Object;
-        }
-
-        private IUmbracoVersion CreateUmbracoVersion(int major, int minor, int patch, string prerelease = "", string build = "")
-        {
-            var version = new SemVersion(major, minor, patch, prerelease, build);
-            return Mock.Of<IUmbracoVersion>(x => x.SemanticVersion == version);
-        }
-
-        private ISiteIdentifierService createSiteIdentifierService(bool shouldSucceed = true)
-        {
-            var mock = new Mock<ISiteIdentifierService>();
-            var siteIdentifier = shouldSucceed ? Guid.NewGuid() : Guid.Empty;
-            mock.Setup(x => x.TryGetOrCreateSiteIdentifier(out siteIdentifier)).Returns(shouldSucceed);
-            return mock.Object;
-        }
+    private ISiteIdentifierService CreateSiteIdentifierService(bool shouldSucceed = true)
+    {
+        var mock = new Mock<ISiteIdentifierService>();
+        var siteIdentifier = shouldSucceed ? Guid.NewGuid() : Guid.Empty;
+        mock.Setup(x => x.TryGetOrCreateSiteIdentifier(out siteIdentifier)).Returns(shouldSucceed);
+        return mock.Object;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/DefaultViewContentProviderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/DefaultViewContentProviderTests.cs
index d43d88f001..c09b76a9ae 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/DefaultViewContentProviderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/DefaultViewContentProviderTests.cs
@@ -4,107 +4,116 @@
 using NUnit.Framework;
 using Umbraco.Cms.Core.IO;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
-{
-    [TestFixture]
-    public class DefaultViewContentProviderTests
-    {
-        private IDefaultViewContentProvider DefaultViewContentProvider => new DefaultViewContentProvider();
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates;
 
-        [Test]
-        public void NoOptions()
-        {
-            var view = DefaultViewContentProvider.GetDefaultFileContent();
-            Assert.AreEqual(
-                FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
+[TestFixture]
+public class DefaultViewContentProviderTests
+{
+    private IDefaultViewContentProvider DefaultViewContentProvider => new DefaultViewContentProvider();
+
+    [Test]
+    public void NoOptions()
+    {
+        var view = DefaultViewContentProvider.GetDefaultFileContent();
+        Assert.AreEqual(
+            FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
 @{
     Layout = null;
-}"), FixView(view));
-        }
+}"),
+            FixView(view));
+    }
 
-        [Test]
-        public void Layout()
-        {
-            var view = DefaultViewContentProvider.GetDefaultFileContent(layoutPageAlias: "Dharznoik");
-            Assert.AreEqual(
-                FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
+    [Test]
+    public void Layout()
+    {
+        var view = DefaultViewContentProvider.GetDefaultFileContent("Dharznoik");
+        Assert.AreEqual(
+            FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
 @{
     Layout = ""Dharznoik.cshtml"";
-}"), FixView(view));
-        }
+}"),
+            FixView(view));
+    }
 
-        [Test]
-        public void ClassName()
-        {
-            var view = DefaultViewContentProvider.GetDefaultFileContent(modelClassName: "ClassName");
-            Assert.AreEqual(
-                FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
+    [Test]
+    public void ClassName()
+    {
+        var view = DefaultViewContentProvider.GetDefaultFileContent(modelClassName: "ClassName");
+        Assert.AreEqual(
+            FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ClassName>
 @{
     Layout = null;
-}"), FixView(view));
-        }
+}"),
+            FixView(view));
+    }
 
-        [Test]
-        public void Namespace()
-        {
-            var view = DefaultViewContentProvider.GetDefaultFileContent(modelNamespace: "Models");
-            Assert.AreEqual(
-                FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
+    [Test]
+    public void Namespace()
+    {
+        var view = DefaultViewContentProvider.GetDefaultFileContent(modelNamespace: "Models");
+        Assert.AreEqual(
+            FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
 @{
     Layout = null;
-}"), FixView(view));
-        }
+}"),
+            FixView(view));
+    }
 
-        [Test]
-        public void ClassNameAndNamespace()
-        {
-            var view = DefaultViewContentProvider.GetDefaultFileContent(modelClassName: "ClassName", modelNamespace: "My.Models");
-            Assert.AreEqual(
-                FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
+    [Test]
+    public void ClassNameAndNamespace()
+    {
+        var view = DefaultViewContentProvider.GetDefaultFileContent(modelClassName: "ClassName", modelNamespace: "My.Models");
+        Assert.AreEqual(
+            FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.ClassName>
 @using ContentModels = My.Models;
 @{
     Layout = null;
-}"), FixView(view));
-        }
+}"),
+            FixView(view));
+    }
 
-        [Test]
-        public void ClassNameAndNamespaceAndAlias()
-        {
-            var view = DefaultViewContentProvider.GetDefaultFileContent(modelClassName: "ClassName", modelNamespace: "My.Models", modelNamespaceAlias: "MyModels");
-            Assert.AreEqual(
-                FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
+    [Test]
+    public void ClassNameAndNamespaceAndAlias()
+    {
+        var view = DefaultViewContentProvider.GetDefaultFileContent(
+            modelClassName: "ClassName",
+            modelNamespace: "My.Models",
+            modelNamespaceAlias: "MyModels");
+        Assert.AreEqual(
+            FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<MyModels.ClassName>
 @using MyModels = My.Models;
 @{
     Layout = null;
-}"), FixView(view));
-        }
+}"),
+            FixView(view));
+    }
 
-        [Test]
-        public void Combined()
-        {
-            var view = DefaultViewContentProvider.GetDefaultFileContent(layoutPageAlias: "Dharznoik", modelClassName: "ClassName", modelNamespace: "My.Models", modelNamespaceAlias: "MyModels");
-            Assert.AreEqual(
-                FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
+    [Test]
+    public void Combined()
+    {
+        var view = DefaultViewContentProvider.GetDefaultFileContent("Dharznoik", "ClassName", "My.Models", "MyModels");
+        Assert.AreEqual(
+            FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<MyModels.ClassName>
 @using MyModels = My.Models;
 @{
     Layout = ""Dharznoik.cshtml"";
-}"), FixView(view));
-        }
+}"),
+            FixView(view));
+    }
 
-        private static string FixView(string view)
-        {
-            view = view.Replace("\r\n", "\n");
-            view = view.Replace("\r", "\n");
-            view = view.Replace("\n", "\r\n");
-            view = view.Replace("\t", "    ");
-            return view;
-        }
+    private static string FixView(string view)
+    {
+        view = view.Replace("\r\n", "\n");
+        view = view.Replace("\r", "\n");
+        view = view.Replace("\n", "\r\n");
+        view = view.Replace("\t", "    ");
+        return view;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs
index 4d0e643d7f..2da75ed64d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlImageSourceParserTests.cs
@@ -13,38 +13,37 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Templates;
-using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates;
+
+[TestFixture]
+public class HtmlImageSourceParserTests
 {
-    [TestFixture]
-    public class HtmlImageSourceParserTests
+    [Test]
+    public void Returns_Udis_From_Data_Udi_Html_Attributes()
     {
-        [Test]
-        public void Returns_Udis_From_Data_Udi_Html_Attributes()
-        {
-            var input = @"<p>
+        var input = @"<p>
     <div>
         <img src='/media/12312.jpg' data-udi='umb://media/D4B18427A1544721B09AC7692F35C264' />
     </div>
 </p><p><img src='/media/234234.jpg' data-udi=""umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"" /></p>";
 
-            var imageSourceParser = new HtmlImageSourceParser(Mock.Of<IPublishedUrlProvider>());
+        var imageSourceParser = new HtmlImageSourceParser(Mock.Of<IPublishedUrlProvider>());
 
-            var result = imageSourceParser.FindUdisFromDataAttributes(input).ToList();
-            Assert.AreEqual(2, result.Count);
-            Assert.AreEqual(UdiParser.Parse("umb://media/D4B18427A1544721B09AC7692F35C264"), result[0]);
-            Assert.AreEqual(UdiParser.Parse("umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"), result[1]);
-        }
+        var result = imageSourceParser.FindUdisFromDataAttributes(input).ToList();
+        Assert.AreEqual(2, result.Count);
+        Assert.AreEqual(UdiParser.Parse("umb://media/D4B18427A1544721B09AC7692F35C264"), result[0]);
+        Assert.AreEqual(UdiParser.Parse("umb://media-type/B726D735E4C446D58F703F3FBCFC97A5"), result[1]);
+    }
 
-        [Test]
-        public void Remove_Image_Sources()
-        {
-            var imageSourceParser = new HtmlImageSourceParser(Mock.Of<IPublishedUrlProvider>());
+    [Test]
+    public void Remove_Image_Sources()
+    {
+        var imageSourceParser = new HtmlImageSourceParser(Mock.Of<IPublishedUrlProvider>());
 
-            var result = imageSourceParser.RemoveImageSources(@"<p>
+        var result = imageSourceParser.RemoveImageSources(@"<p>
 <div>
     <img src=""/media/12354/test.jpg"" />
 </div></p>
@@ -52,47 +51,60 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
     <div><img src=""/media/987645/test.jpg"" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
 </p>");
 
-            Assert.AreEqual(
-                @"<p>
+        Assert.AreEqual(
+            @"<p>
 <div>
     <img src=""/media/12354/test.jpg"" />
 </div></p>
 <p>
     <div><img src="""" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
-</p>", result);
-        }
+</p>",
+            result);
+    }
 
-        [Test]
-        public void Ensure_Image_Sources()
+    [Test]
+    public void Ensure_Image_Sources()
+    {
+        // setup a mock URL provider which we'll use for testing
+        var mediaType = new PublishedContentType(
+            Guid.NewGuid(),
+            777,
+            "image",
+            PublishedItemType.Media,
+            Enumerable.Empty<string>(),
+            Enumerable.Empty<PublishedPropertyType>(),
+            ContentVariation.Nothing);
+        var media = new Mock<IPublishedContent>();
+        media.Setup(x => x.ContentType).Returns(mediaType);
+        var mediaUrlProvider = new Mock<IMediaUrlProvider>();
+        mediaUrlProvider.Setup(x => x.GetMediaUrl(
+                It.IsAny<IPublishedContent>(),
+                It.IsAny<string>(),
+                It.IsAny<UrlMode>(),
+                It.IsAny<string>(),
+                It.IsAny<Uri>()))
+            .Returns(UrlInfo.Url("/media/1001/my-image.jpg"));
+
+        var umbracoContextAccessor = new TestUmbracoContextAccessor();
+
+        var umbracoContextFactory = TestUmbracoContextFactory.Create(
+            umbracoContextAccessor: umbracoContextAccessor);
+
+        var webRoutingSettings = new WebRoutingSettings();
+        var publishedUrlProvider = new UrlProvider(
+            umbracoContextAccessor,
+            Options.Create(webRoutingSettings),
+            new UrlProviderCollection(() => Enumerable.Empty<IUrlProvider>()),
+            new MediaUrlProviderCollection(() => new[] { mediaUrlProvider.Object }),
+            Mock.Of<IVariationContextAccessor>());
+        using (var reference = umbracoContextFactory.EnsureUmbracoContext())
         {
-            // setup a mock URL provider which we'll use for testing
-            var mediaType = new PublishedContentType(Guid.NewGuid(), 777, "image", PublishedItemType.Media, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
-            var media = new Mock<IPublishedContent>();
-            media.Setup(x => x.ContentType).Returns(mediaType);
-            var mediaUrlProvider = new Mock<IMediaUrlProvider>();
-            mediaUrlProvider.Setup(x => x.GetMediaUrl(It.IsAny<IPublishedContent>(), It.IsAny<string>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<Uri>()))
-                .Returns(UrlInfo.Url("/media/1001/my-image.jpg"));
+            var mediaCache = Mock.Get(reference.UmbracoContext.Media);
+            mediaCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(media.Object);
 
-            var umbracoContextAccessor = new TestUmbracoContextAccessor();
+            var imageSourceParser = new HtmlImageSourceParser(publishedUrlProvider);
 
-            IUmbracoContextFactory umbracoContextFactory = TestUmbracoContextFactory.Create(
-                umbracoContextAccessor: umbracoContextAccessor);
-
-            var webRoutingSettings = new WebRoutingSettings();
-            var publishedUrlProvider = new UrlProvider(
-                umbracoContextAccessor,
-                Options.Create(webRoutingSettings),
-                new UrlProviderCollection(() => Enumerable.Empty<IUrlProvider>()),
-                new MediaUrlProviderCollection(() => new[] { mediaUrlProvider.Object }),
-                Mock.Of<IVariationContextAccessor>());
-            using (UmbracoContextReference reference = umbracoContextFactory.EnsureUmbracoContext())
-            {
-                var mediaCache = Mock.Get(reference.UmbracoContext.Media);
-                mediaCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(media.Object);
-
-                var imageSourceParser = new HtmlImageSourceParser(publishedUrlProvider);
-
-                var result = imageSourceParser.EnsureImageSources(@"<p>
+            var result = imageSourceParser.EnsureImageSources(@"<p>
 <div>
     <img src="""" />
 </div></p>
@@ -103,8 +115,8 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
     <div><img src=""?width=100"" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
 </p>");
 
-                Assert.AreEqual(
-                    @"<p>
+            Assert.AreEqual(
+                @"<p>
 <div>
     <img src="""" />
 </div></p>
@@ -113,77 +125,76 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
 </p>
 <p>
     <div><img src=""/media/1001/my-image.jpg?width=100"" data-udi=""umb://media/81BB2036-034F-418B-B61F-C7160D68DCD4"" /></div>
-</p>", result);
-            }
+</p>",
+                result);
         }
+    }
 
-        [TestCase(
-            @"<div><img src="""" /></div>",
-            ExpectedResult = @"<div><img src="""" /></div>",
-            TestName = "Empty source is not updated with no data-udi set")]
-        [TestCase(
-            @"<div><img src="""" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            TestName = "Empty source is updated with data-udi set")]
-        [TestCase(
-            @"<div><img src=""non empty src"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            TestName = "Filled source is overwritten with data-udi set")]
-        [TestCase(
-            @"<div><img src=""some src"" some-attribute data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4"" another-attribute/></div>",
-            ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" some-attribute data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4"" another-attribute/></div>",
-            TestName = "Attributes are persisted")]
-        [TestCase(
-            @"<div><img src=""somesrc?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            ExpectedResult = @"<div><img src=""/media/1001/image.jpg?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            TestName = "Source is trimmed and parameters are prefixed")]
-        [TestCase(
-            @"<div><img src=""?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            ExpectedResult = @"<div><img src=""/media/1001/image.jpg?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
-            TestName = "Parameters are prefixed")]
-        [TestCase(
-            @"<div>
+    [TestCase(
+        @"<div><img src="""" /></div>",
+        ExpectedResult = @"<div><img src="""" /></div>",
+        TestName = "Empty source is not updated with no data-udi set")]
+    [TestCase(
+        @"<div><img src="""" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        TestName = "Empty source is updated with data-udi set")]
+    [TestCase(
+        @"<div><img src=""non empty src"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        TestName = "Filled source is overwritten with data-udi set")]
+    [TestCase(
+        @"<div><img src=""some src"" some-attribute data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4"" another-attribute/></div>",
+        ExpectedResult = @"<div><img src=""/media/1001/image.jpg"" some-attribute data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4"" another-attribute/></div>",
+        TestName = "Attributes are persisted")]
+    [TestCase(
+        @"<div><img src=""somesrc?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        ExpectedResult = @"<div><img src=""/media/1001/image.jpg?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        TestName = "Source is trimmed and parameters are prefixed")]
+    [TestCase(
+        @"<div><img src=""?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        ExpectedResult = @"<div><img src=""/media/1001/image.jpg?width=100&height=500"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/></div>",
+        TestName = "Parameters are prefixed")]
+    [TestCase(
+        @"<div>
                 <img src="""" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/>
                 <img src=""src"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD5""/>
                 <img src=""?asd"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD6""/>
               </div>",
-            ExpectedResult =
+        ExpectedResult =
             @"<div>
                 <img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD4""/>
                 <img src=""/media/1001/image.jpg"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD5""/>
                 <img src=""/media/1001/image.jpg?asd"" data-udi=""umb://media/81BB2036034F418BB61FC7160D68DCD6""/>
               </div>",
-            TestName = "Multiple img tags are handled")]
+        TestName = "Multiple img tags are handled")]
+    [Category("Ensure image sources")]
+    public string Ensure_ImageSources_Processing(string sourceHtml)
+    {
+        var fakeMediaUrl = "/media/1001/image.jpg";
+        var parser = new HtmlImageSourceParser(guid => fakeMediaUrl);
+        var actual = parser.EnsureImageSources(sourceHtml);
 
-        [Category("Ensure image sources")]
-        public string Ensure_ImageSources_Processing(string sourceHtml)
-        {
-            var fakeMediaUrl = "/media/1001/image.jpg";
-            var parser = new HtmlImageSourceParser((guid) => fakeMediaUrl);
-            var actual = parser.EnsureImageSources(sourceHtml);
+        return actual;
+    }
 
-            return actual;
-        }
+    [Category("Ensure image sources")]
+    [Test]
+    public void Ensure_Large_Html_Is_Processed_Quickly()
+    {
+        var symbolCount = 25000;
+        var maxMsToRun = 200;
 
-        [Category("Ensure image sources")]
-        [Test]
-        public void Ensure_Large_Html_Is_Processed_Quickly()
-        {
-            int symbolCount = 25000;
-            int maxMsToRun = 200;
+        var longText = new string('*', symbolCount);
+        var text = $@"<img src=""{longText}"" />";
 
-            var longText = new string('*', symbolCount);
-            var text = $@"<img src=""{longText}"" />";
+        var fakeMediaUrl = "/media/1001/image.jpg";
+        var parser = new HtmlImageSourceParser(guid => fakeMediaUrl);
 
-            var fakeMediaUrl = "/media/1001/image.jpg";
-            var parser = new HtmlImageSourceParser((guid) => fakeMediaUrl);
+        var timer = new Stopwatch();
+        timer.Start();
+        parser.EnsureImageSources(text);
+        timer.Stop();
 
-            var timer = new Stopwatch();
-            timer.Start();
-            var actual = parser.EnsureImageSources(text);
-            timer.Stop();
-
-            Assert.IsTrue(timer.ElapsedMilliseconds <= maxMsToRun);
-        }
+        Assert.IsTrue(timer.ElapsedMilliseconds <= maxMsToRun);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs
index d171342023..21180fca0f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/HtmlLocalLinkParserTests.cs
@@ -12,19 +12,18 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Templates;
-using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates;
+
+[TestFixture]
+public class HtmlLocalLinkParserTests
 {
-    [TestFixture]
-    public class HtmlLocalLinkParserTests
+    [Test]
+    public void Returns_Udis_From_LocalLinks()
     {
-        [Test]
-        public void Returns_Udis_From_LocalLinks()
-        {
-            var input = @"<p>
+        var input = @"<p>
     <div>
         <img src='/media/12312.jpg' data-udi='umb://media/D4B18427A1544721B09AC7692F35C264' />
         <a href=""{locallink:umb://document/C093961595094900AAF9170DDE6AD442}"">hello</a>
@@ -33,72 +32,106 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
 <a href=""{locallink:umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2}"">hello</a>
 </p>";
 
-            var umbracoContextAccessor = new TestUmbracoContextAccessor();
-            var parser = new HtmlLocalLinkParser(umbracoContextAccessor, Mock.Of<IPublishedUrlProvider>());
+        var umbracoContextAccessor = new TestUmbracoContextAccessor();
+        var parser = new HtmlLocalLinkParser(umbracoContextAccessor, Mock.Of<IPublishedUrlProvider>());
 
-            var result = parser.FindUdisFromLocalLinks(input).ToList();
+        var result = parser.FindUdisFromLocalLinks(input).ToList();
 
-            Assert.AreEqual(2, result.Count);
-            Assert.AreEqual(UdiParser.Parse("umb://document/C093961595094900AAF9170DDE6AD442"), result[0]);
-            Assert.AreEqual(UdiParser.Parse("umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2"), result[1]);
-        }
+        Assert.AreEqual(2, result.Count);
+        Assert.AreEqual(UdiParser.Parse("umb://document/C093961595094900AAF9170DDE6AD442"), result[0]);
+        Assert.AreEqual(UdiParser.Parse("umb://document-type/2D692FCB070B4CDA92FB6883FDBFD6E2"), result[1]);
+    }
 
-        [TestCase("", "")]
-        [TestCase("hello href=\"{localLink:1234}\" world ", "hello href=\"/my-test-url\" world ")]
-        [TestCase("hello href=\"{localLink:umb://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"/my-test-url\" world ")]
-        [TestCase("hello href=\"{localLink:umb://document/9931BDE0AAC34BABB838909A7B47570E}\" world ", "hello href=\"/my-test-url\" world ")]
-        [TestCase("hello href=\"{localLink:umb://media/9931BDE0AAC34BABB838909A7B47570E}\" world ", "hello href=\"/media/1001/my-image.jpg\" world ")]
+    [TestCase("", "")]
+    [TestCase(
+        "hello href=\"{localLink:1234}\" world ",
+        "hello href=\"/my-test-url\" world ")]
+    [TestCase(
+        "hello href=\"{localLink:umb://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ",
+        "hello href=\"/my-test-url\" world ")]
+    [TestCase(
+        "hello href=\"{localLink:umb://document/9931BDE0AAC34BABB838909A7B47570E}\" world ",
+        "hello href=\"/my-test-url\" world ")]
+    [TestCase(
+        "hello href=\"{localLink:umb://media/9931BDE0AAC34BABB838909A7B47570E}\" world ",
+        "hello href=\"/media/1001/my-image.jpg\" world ")]
 
-        // This one has an invalid char so won't match.
-        [TestCase("hello href=\"{localLink:umb^://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"{localLink:umb^://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ")]
-        [TestCase("hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"#\" world ")]
-        public void ParseLocalLinks(string input, string result)
+    // This one has an invalid char so won't match.
+    [TestCase(
+        "hello href=\"{localLink:umb^://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ",
+        "hello href=\"{localLink:umb^://document/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ")]
+    [TestCase(
+        "hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ",
+        "hello href=\"#\" world ")]
+    public void ParseLocalLinks(string input, string result)
+    {
+        // setup a mock URL provider which we'll use for testing
+        var contentUrlProvider = new Mock<IUrlProvider>();
+        contentUrlProvider
+            .Setup(x => x.GetUrl(
+                It.IsAny<IPublishedContent>(),
+                It.IsAny<UrlMode>(),
+                It.IsAny<string>(),
+                It.IsAny<Uri>()))
+            .Returns(UrlInfo.Url("/my-test-url"));
+        var contentType = new PublishedContentType(
+            Guid.NewGuid(),
+            666,
+            "alias",
+            PublishedItemType.Content,
+            Enumerable.Empty<string>(),
+            Enumerable.Empty<PublishedPropertyType>(),
+            ContentVariation.Nothing);
+        var publishedContent = new Mock<IPublishedContent>();
+        publishedContent.Setup(x => x.Id).Returns(1234);
+        publishedContent.Setup(x => x.ContentType).Returns(contentType);
+
+        var mediaType = new PublishedContentType(
+            Guid.NewGuid(),
+            777,
+            "image",
+            PublishedItemType.Media,
+            Enumerable.Empty<string>(),
+            Enumerable.Empty<PublishedPropertyType>(),
+            ContentVariation.Nothing);
+        var media = new Mock<IPublishedContent>();
+        media.Setup(x => x.ContentType).Returns(mediaType);
+        var mediaUrlProvider = new Mock<IMediaUrlProvider>();
+        mediaUrlProvider.Setup(x => x.GetMediaUrl(
+                It.IsAny<IPublishedContent>(),
+                It.IsAny<string>(),
+                It.IsAny<UrlMode>(),
+                It.IsAny<string>(),
+                It.IsAny<Uri>()))
+            .Returns(UrlInfo.Url("/media/1001/my-image.jpg"));
+
+        var umbracoContextAccessor = new TestUmbracoContextAccessor();
+
+        var umbracoContextFactory = TestUmbracoContextFactory.Create(
+            umbracoContextAccessor: umbracoContextAccessor);
+
+        var webRoutingSettings = new WebRoutingSettings();
+        var publishedUrlProvider = new UrlProvider(
+            umbracoContextAccessor,
+            Options.Create(webRoutingSettings),
+            new UrlProviderCollection(() => new[] { contentUrlProvider.Object }),
+            new MediaUrlProviderCollection(() => new[] { mediaUrlProvider.Object }),
+            Mock.Of<IVariationContextAccessor>());
+        using (var reference = umbracoContextFactory.EnsureUmbracoContext())
         {
-            // setup a mock URL provider which we'll use for testing
-            var contentUrlProvider = new Mock<IUrlProvider>();
-            contentUrlProvider
-                .Setup(x => x.GetUrl(It.IsAny<IPublishedContent>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<Uri>()))
-                .Returns(UrlInfo.Url("/my-test-url"));
-            var contentType = new PublishedContentType(Guid.NewGuid(), 666, "alias", PublishedItemType.Content, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
-            var publishedContent = new Mock<IPublishedContent>();
-            publishedContent.Setup(x => x.Id).Returns(1234);
-            publishedContent.Setup(x => x.ContentType).Returns(contentType);
+            var contentCache = Mock.Get(reference.UmbracoContext.Content);
+            contentCache.Setup(x => x.GetById(It.IsAny<int>())).Returns(publishedContent.Object);
+            contentCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(publishedContent.Object);
 
-            var mediaType = new PublishedContentType(Guid.NewGuid(), 777, "image", PublishedItemType.Media, Enumerable.Empty<string>(), Enumerable.Empty<PublishedPropertyType>(), ContentVariation.Nothing);
-            var media = new Mock<IPublishedContent>();
-            media.Setup(x => x.ContentType).Returns(mediaType);
-            var mediaUrlProvider = new Mock<IMediaUrlProvider>();
-            mediaUrlProvider.Setup(x => x.GetMediaUrl(It.IsAny<IPublishedContent>(), It.IsAny<string>(), It.IsAny<UrlMode>(), It.IsAny<string>(), It.IsAny<Uri>()))
-                .Returns(UrlInfo.Url("/media/1001/my-image.jpg"));
+            var mediaCache = Mock.Get(reference.UmbracoContext.Media);
+            mediaCache.Setup(x => x.GetById(It.IsAny<int>())).Returns(media.Object);
+            mediaCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(media.Object);
 
-            var umbracoContextAccessor = new TestUmbracoContextAccessor();
+            var linkParser = new HtmlLocalLinkParser(umbracoContextAccessor, publishedUrlProvider);
 
-            IUmbracoContextFactory umbracoContextFactory = TestUmbracoContextFactory.Create(
-                umbracoContextAccessor: umbracoContextAccessor);
+            var output = linkParser.EnsureInternalLinks(input);
 
-            var webRoutingSettings = new WebRoutingSettings();
-            var publishedUrlProvider = new UrlProvider(
-                umbracoContextAccessor,
-                Options.Create(webRoutingSettings),
-                new UrlProviderCollection(() => new[] { contentUrlProvider.Object }),
-                new MediaUrlProviderCollection(() => new[] { mediaUrlProvider.Object }),
-                Mock.Of<IVariationContextAccessor>());
-            using (UmbracoContextReference reference = umbracoContextFactory.EnsureUmbracoContext())
-            {
-                var contentCache = Mock.Get(reference.UmbracoContext.Content);
-                contentCache.Setup(x => x.GetById(It.IsAny<int>())).Returns(publishedContent.Object);
-                contentCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(publishedContent.Object);
-
-                var mediaCache = Mock.Get(reference.UmbracoContext.Media);
-                mediaCache.Setup(x => x.GetById(It.IsAny<int>())).Returns(media.Object);
-                mediaCache.Setup(x => x.GetById(It.IsAny<Guid>())).Returns(media.Object);
-
-                var linkParser = new HtmlLocalLinkParser(umbracoContextAccessor, publishedUrlProvider);
-
-                var output = linkParser.EnsureInternalLinks(input);
-
-                Assert.AreEqual(result, output);
-            }
+            Assert.AreEqual(result, output);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs
index 04bf021346..06fcae14bc 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/VersionExtensionTests.cs
@@ -5,29 +5,28 @@ using System;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class VersionExtensionTests
 {
-    [TestFixture]
-    public class VersionExtensionTests
+    [TestCase(1, 0, 0, 0, "0.2147483647.2147483647.2147483647")]
+    [TestCase(1, 1, 0, 0, "1.0.2147483647.2147483647")]
+    [TestCase(1, 1, 1, 0, "1.1.0.2147483647")]
+    [TestCase(1, 1, 1, 1, "1.1.1.0")]
+    [TestCase(0, 1, 0, 0, "0.0.2147483647.2147483647")]
+    [TestCase(0, 1, 1, 0, "0.1.0.2147483647")]
+    [TestCase(0, 1, 1, 1, "0.1.1.0")]
+    [TestCase(0, 0, 1, 0, "0.0.0.2147483647")]
+    [TestCase(0, 0, 1, 1, "0.0.1.0")]
+    [TestCase(0, 0, 0, 1, "0.0.0.0")]
+    [TestCase(7, 3, 0, 0, "7.2.2147483647.2147483647")]
+    public void Subtract_Revision(int major, int minor, int build, int rev, string outcome)
     {
-        [TestCase(1, 0, 0, 0, "0.2147483647.2147483647.2147483647")]
-        [TestCase(1, 1, 0, 0, "1.0.2147483647.2147483647")]
-        [TestCase(1, 1, 1, 0, "1.1.0.2147483647")]
-        [TestCase(1, 1, 1, 1, "1.1.1.0")]
-        [TestCase(0, 1, 0, 0, "0.0.2147483647.2147483647")]
-        [TestCase(0, 1, 1, 0, "0.1.0.2147483647")]
-        [TestCase(0, 1, 1, 1, "0.1.1.0")]
-        [TestCase(0, 0, 1, 0, "0.0.0.2147483647")]
-        [TestCase(0, 0, 1, 1, "0.0.1.0")]
-        [TestCase(0, 0, 0, 1, "0.0.0.0")]
-        [TestCase(7, 3, 0, 0, "7.2.2147483647.2147483647")]
-        public void Subtract_Revision(int major, int minor, int build, int rev, string outcome)
-        {
-            var version = new Version(major, minor, build, rev);
+        var version = new Version(major, minor, build, rev);
 
-            Version result = version.SubtractRevision();
+        var result = version.SubtractRevision();
 
-            Assert.AreEqual(new Version(outcome), result);
-        }
+        Assert.AreEqual(new Version(outcome), result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs
index ceeb0de7bb..4074f459da 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Web/Routing/PublishedRequestBuilderTests.cs
@@ -7,90 +7,89 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Web.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Web.Routing;
+
+[TestFixture]
+public class PublishedRequestBuilderTests
 {
-    [TestFixture]
-    public class PublishedRequestBuilderTests
+    private readonly Uri _baseUri = new("https://example.com");
+
+    private IPublishedRequestBuilder GetBuilder() => new PublishedRequestBuilder(
+        _baseUri,
+        Mock.Of<IFileService>());
+
+    [Test]
+    public void Setting_Published_Content_Clears_Template_And_Redirect()
     {
-        private readonly Uri _baseUri = new Uri("https://example.com");
+        var sut = GetBuilder();
+        sut.SetTemplate(Mock.Of<ITemplate>());
 
-        private IPublishedRequestBuilder GetBuilder() => new PublishedRequestBuilder(
-            _baseUri,
-            Mock.Of<IFileService>());
+        Assert.IsNotNull(sut.Template);
 
-        [Test]
-        public void Setting_Published_Content_Clears_Template_And_Redirect()
-        {
-            IPublishedRequestBuilder sut = GetBuilder();
-            sut.SetTemplate(Mock.Of<ITemplate>());
+        sut.SetInternalRedirect(Mock.Of<IPublishedContent>());
 
-            Assert.IsNotNull(sut.Template);
+        Assert.IsNull(sut.Template);
+        Assert.IsTrue(sut.IsInternalRedirect);
 
-            sut.SetInternalRedirect(Mock.Of<IPublishedContent>());
+        sut.SetTemplate(Mock.Of<ITemplate>());
+        sut.SetPublishedContent(Mock.Of<IPublishedContent>());
 
-            Assert.IsNull(sut.Template);
-            Assert.IsTrue(sut.IsInternalRedirect);
+        Assert.IsNull(sut.Template);
+        Assert.IsFalse(sut.IsInternalRedirect);
+    }
 
-            sut.SetTemplate(Mock.Of<ITemplate>());
-            sut.SetPublishedContent(Mock.Of<IPublishedContent>());
+    [Test]
+    public void Setting_Domain_Also_Sets_Culture()
+    {
+        var sut = GetBuilder();
 
-            Assert.IsNull(sut.Template);
-            Assert.IsFalse(sut.IsInternalRedirect);
-        }
+        Assert.IsNull(sut.Culture);
 
-        [Test]
-        public void Setting_Domain_Also_Sets_Culture()
-        {
-            IPublishedRequestBuilder sut = GetBuilder();
+        sut.SetDomain(
+            new DomainAndUri(
+                new Domain(1, "test", 2, "en-AU", false), new Uri("https://example.com/en-au")));
 
-            Assert.IsNull(sut.Culture);
+        Assert.IsNotNull(sut.Domain);
+        Assert.IsNotNull(sut.Culture);
+    }
 
-            sut.SetDomain(
-                new DomainAndUri(
-                    new Domain(1, "test", 2, "en-AU", false), new Uri("https://example.com/en-au")));
+    [Test]
+    public void Builds_All_Values()
+    {
+        var sut = GetBuilder();
 
-            Assert.IsNotNull(sut.Domain);
-            Assert.IsNotNull(sut.Culture);
-        }
+        var content = Mock.Of<IPublishedContent>(x => x.Id == 1);
+        var template = Mock.Of<ITemplate>(x => x.Id == 1);
+        string[] cacheExt = { "must-revalidate" };
+        var auCulture = "en-AU";
+        var usCulture = "en-US";
+        var domain = new DomainAndUri(
+            new Domain(1, "test", 2, auCulture, false), new Uri("https://example.com/en-au"));
+        IReadOnlyDictionary<string, string> headers = new Dictionary<string, string> { ["Hello"] = "world" };
+        var redirect = "https://test.com";
 
-        [Test]
-        public void Builds_All_Values()
-        {
-            IPublishedRequestBuilder sut = GetBuilder();
+        sut
+            .SetNoCacheHeader(true)
+            .SetCacheExtensions(cacheExt)
+            .SetDomain(domain)
+            .SetCulture(usCulture)
+            .SetHeaders(headers)
+            .SetInternalRedirect(content)
+            .SetRedirect(redirect)
+            .SetTemplate(template);
 
-            IPublishedContent content = Mock.Of<IPublishedContent>(x => x.Id == 1);
-            ITemplate template = Mock.Of<ITemplate>(x => x.Id == 1);
-            string[] cacheExt = new[] { "must-revalidate" };
-            var auCulture = "en-AU";
-            var usCulture = "en-US";
-            var domain = new DomainAndUri(
-                    new Domain(1, "test", 2, auCulture, false), new Uri("https://example.com/en-au"));
-            IReadOnlyDictionary<string, string> headers = new Dictionary<string, string> { ["Hello"] = "world" };
-            var redirect = "https://test.com";
+        var request = sut.Build();
 
-            sut
-                .SetNoCacheHeader(true)
-                .SetCacheExtensions(cacheExt)
-                .SetDomain(domain)
-                .SetCulture(usCulture)
-                .SetHeaders(headers)
-                .SetInternalRedirect(content)
-                .SetRedirect(redirect)
-                .SetTemplate(template);
-
-            IPublishedRequest request = sut.Build();
-
-            Assert.AreEqual(true, request.SetNoCacheHeader);
-            Assert.AreEqual(cacheExt, request.CacheExtensions);
-            Assert.AreEqual(usCulture, request.Culture);
-            Assert.AreEqual(domain, request.Domain);
-            Assert.AreEqual(headers, request.Headers);
-            Assert.AreEqual(true, request.IsInternalRedirect);
-            Assert.AreEqual(content, request.PublishedContent);
-            Assert.AreEqual(redirect, request.RedirectUrl);
-            Assert.AreEqual(302, request.ResponseStatusCode);
-            Assert.AreEqual(template, request.Template);
-            Assert.AreEqual(_baseUri, request.Uri);
-        }
+        Assert.AreEqual(true, request.SetNoCacheHeader);
+        Assert.AreEqual(cacheExt, request.CacheExtensions);
+        Assert.AreEqual(usCulture, request.Culture);
+        Assert.AreEqual(domain, request.Domain);
+        Assert.AreEqual(headers, request.Headers);
+        Assert.AreEqual(true, request.IsInternalRedirect);
+        Assert.AreEqual(content, request.PublishedContent);
+        Assert.AreEqual(redirect, request.RedirectUrl);
+        Assert.AreEqual(302, request.ResponseStatusCode);
+        Assert.AreEqual(template, request.Template);
+        Assert.AreEqual(_baseUri, request.Uri);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs
index cea8625d3f..2e75454c7f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/Xml/XmlHelperTests.cs
@@ -10,118 +10,85 @@ using Umbraco.Cms.Core.Xml;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Xml
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Xml;
+
+[TestFixture]
+public class XmlHelperTests
 {
-    [TestFixture]
-    public class XmlHelperTests
+    [SetUp]
+    public void SetUp() => _builder = new XmlDocumentBuilder();
+
+    private XmlDocumentBuilder _builder;
+
+    [Ignore("This is a benchmark test so is ignored by default")]
+    [Test]
+    public void Sort_Nodes_Benchmark_Legacy()
     {
-        private XmlDocumentBuilder _builder;
+        var xml = _builder.Build();
+        var original = xml.GetElementById(1173.ToString());
+        Assert.IsNotNull(original);
 
-        [SetUp]
-        public void SetUp() => _builder = new XmlDocumentBuilder();
+        long totalTime = 0;
+        var watch = new Stopwatch();
+        var iterations = 10000;
 
-        [Ignore("This is a benchmark test so is ignored by default")]
-        [Test]
-        public void Sort_Nodes_Benchmark_Legacy()
+        for (var i = 0; i < iterations; i++)
         {
-            XmlDocument xml = _builder.Build();
-            XmlElement original = xml.GetElementById(1173.ToString());
-            Assert.IsNotNull(original);
+            // don't measure the time for clone!
+            var parentNode = original.Clone();
+            watch.Start();
+            LegacySortNodes(ref parentNode);
+            watch.Stop();
+            totalTime += watch.ElapsedMilliseconds;
+            watch.Reset();
 
-            long totalTime = 0;
-            var watch = new Stopwatch();
-            var iterations = 10000;
-
-            for (var i = 0; i < iterations; i++)
+            // Do assertions just to make sure it is working properly.
+            var currSort = 0;
+            foreach (var child in parentNode.SelectNodes("./* [@id]").Cast<XmlNode>())
             {
-                // don't measure the time for clone!
-                XmlNode parentNode = original.Clone();
-                watch.Start();
-                LegacySortNodes(ref parentNode);
-                watch.Stop();
-                totalTime += watch.ElapsedMilliseconds;
-                watch.Reset();
-
-                // Do assertions just to make sure it is working properly.
-                var currSort = 0;
-                foreach (XmlNode child in parentNode.SelectNodes("./* [@id]").Cast<XmlNode>())
-                {
-                    Assert.AreEqual(currSort, int.Parse(child.Attributes["sortOrder"].Value));
-                    currSort++;
-                }
-
-                // Ensure the parent node's properties still exist first.
-                Assert.AreEqual("content", parentNode.ChildNodes[0].Name);
-                Assert.AreEqual("umbracoUrlAlias", parentNode.ChildNodes[1].Name);
-
-                // Then the child nodes should come straight after.
-                Assert.IsTrue(parentNode.ChildNodes[2].Attributes["id"] != null);
+                Assert.AreEqual(currSort, int.Parse(child.Attributes["sortOrder"].Value));
+                currSort++;
             }
 
-            Debug.WriteLine("Total time for " + iterations + " iterations is " + totalTime);
+            // Ensure the parent node's properties still exist first.
+            Assert.AreEqual("content", parentNode.ChildNodes[0].Name);
+            Assert.AreEqual("umbracoUrlAlias", parentNode.ChildNodes[1].Name);
+
+            // Then the child nodes should come straight after.
+            Assert.IsTrue(parentNode.ChildNodes[2].Attributes["id"] != null);
         }
 
-        [Ignore("This is a benchmark test so is ignored by default")]
-        [Test]
-        public void Sort_Nodes_Benchmark_New()
+        Debug.WriteLine("Total time for " + iterations + " iterations is " + totalTime);
+    }
+
+    [Ignore("This is a benchmark test so is ignored by default")]
+    [Test]
+    public void Sort_Nodes_Benchmark_New()
+    {
+        var xml = _builder.Build();
+        var original = xml.GetElementById(1173.ToString());
+        Assert.IsNotNull(original);
+
+        long totalTime = 0;
+        var watch = new Stopwatch();
+        var iterations = 10000;
+
+        for (var i = 0; i < iterations; i++)
         {
-            XmlDocument xml = _builder.Build();
-            XmlElement original = xml.GetElementById(1173.ToString());
-            Assert.IsNotNull(original);
-
-            long totalTime = 0;
-            var watch = new Stopwatch();
-            var iterations = 10000;
-
-            for (var i = 0; i < iterations; i++)
-            {
-                // don't measure the time for clone!
-                var parentNode = (XmlElement)original.Clone();
-                watch.Start();
-                XmlHelper.SortNodes(
-                    parentNode,
-                    "./* [@id]",
-                    x => x.AttributeValue<int>("sortOrder"));
-                watch.Stop();
-                totalTime += watch.ElapsedMilliseconds;
-                watch.Reset();
-
-                // do assertions just to make sure it is working properly.
-                var currSort = 0;
-                foreach (XmlNode child in parentNode.SelectNodes("./* [@id]").Cast<XmlNode>())
-                {
-                    Assert.AreEqual(currSort, int.Parse(child.Attributes["sortOrder"].Value));
-                    currSort++;
-                }
-
-                // ensure the parent node's properties still exist first
-                Assert.AreEqual("content", parentNode.ChildNodes[0].Name);
-                Assert.AreEqual("umbracoUrlAlias", parentNode.ChildNodes[1].Name);
-
-                // then the child nodes should come straight after
-                Assert.IsTrue(parentNode.ChildNodes[2].Attributes["id"] != null);
-            }
-
-            Debug.WriteLine("Total time for " + iterations + " iterations is " + totalTime);
-        }
-
-        [Test]
-        public void Sort_Nodes()
-        {
-            XmlDocument xml = _builder.Build();
-            XmlElement original = xml.GetElementById(1173.ToString());
-            Assert.IsNotNull(original);
-
+            // don't measure the time for clone!
             var parentNode = (XmlElement)original.Clone();
-
+            watch.Start();
             XmlHelper.SortNodes(
                 parentNode,
                 "./* [@id]",
                 x => x.AttributeValue<int>("sortOrder"));
+            watch.Stop();
+            totalTime += watch.ElapsedMilliseconds;
+            watch.Reset();
 
             // do assertions just to make sure it is working properly.
             var currSort = 0;
-            foreach (XmlNode child in parentNode.SelectNodes("./* [@id]").Cast<XmlNode>())
+            foreach (var child in parentNode.SelectNodes("./* [@id]").Cast<XmlNode>())
             {
                 Assert.AreEqual(currSort, int.Parse(child.Attributes["sortOrder"].Value));
                 currSort++;
@@ -135,29 +102,61 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Xml
             Assert.IsTrue(parentNode.ChildNodes[2].Attributes["id"] != null);
         }
 
-        /// <summary>
-        /// This was the logic to sort before and now lives here just to show the benchmarks tests above.
-        /// </summary>
-        private static void LegacySortNodes(ref XmlNode parentNode)
+        Debug.WriteLine("Total time for " + iterations + " iterations is " + totalTime);
+    }
+
+    [Test]
+    public void Sort_Nodes()
+    {
+        var xml = _builder.Build();
+        var original = xml.GetElementById(1173.ToString());
+        Assert.IsNotNull(original);
+
+        var parentNode = (XmlElement)original.Clone();
+
+        XmlHelper.SortNodes(
+            parentNode,
+            "./* [@id]",
+            x => x.AttributeValue<int>("sortOrder"));
+
+        // do assertions just to make sure it is working properly.
+        var currSort = 0;
+        foreach (var child in parentNode.SelectNodes("./* [@id]").Cast<XmlNode>())
         {
-            XmlNode n = parentNode.CloneNode(true);
+            Assert.AreEqual(currSort, int.Parse(child.Attributes["sortOrder"].Value));
+            currSort++;
+        }
 
-            // remove all children from original node
-            var xpath = "./* [@id]";
-            foreach (XmlNode child in parentNode.SelectNodes(xpath))
-            {
-                parentNode.RemoveChild(child);
-            }
+        // ensure the parent node's properties still exist first
+        Assert.AreEqual("content", parentNode.ChildNodes[0].Name);
+        Assert.AreEqual("umbracoUrlAlias", parentNode.ChildNodes[1].Name);
 
-            XPathNavigator nav = n.CreateNavigator();
-            XPathExpression expr = nav.Compile(xpath);
-            expr.AddSort("@sortOrder", XmlSortOrder.Ascending, XmlCaseOrder.None, string.Empty, XmlDataType.Number);
-            XPathNodeIterator iterator = nav.Select(expr);
-            while (iterator.MoveNext())
-            {
-                parentNode.AppendChild(
-                    ((IHasXmlNode)iterator.Current).GetNode());
-            }
+        // then the child nodes should come straight after
+        Assert.IsTrue(parentNode.ChildNodes[2].Attributes["id"] != null);
+    }
+
+    /// <summary>
+    ///     This was the logic to sort before and now lives here just to show the benchmarks tests above.
+    /// </summary>
+    private static void LegacySortNodes(ref XmlNode parentNode)
+    {
+        var n = parentNode.CloneNode(true);
+
+        // remove all children from original node
+        var xpath = "./* [@id]";
+        foreach (XmlNode child in parentNode.SelectNodes(xpath))
+        {
+            parentNode.RemoveChild(child);
+        }
+
+        var nav = n.CreateNavigator();
+        var expr = nav.Compile(xpath);
+        expr.AddSort("@sortOrder", XmlSortOrder.Ascending, XmlCaseOrder.None, string.Empty, XmlDataType.Number);
+        var iterator = nav.Select(expr);
+        while (iterator.MoveNext())
+        {
+            parentNode.AppendChild(
+                ((IHasXmlNode)iterator.Current).GetNode());
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs
index eda2c8d7aa..ff767b9cb8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Core/XmlExtensionsTests.cs
@@ -6,46 +6,45 @@ using System.Xml.Linq;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;
+
+[TestFixture]
+public class XmlExtensionsTests
 {
-    [TestFixture]
-    public class XmlExtensionsTests
+    [Test]
+    public void XCDataToXmlNode()
     {
-        [Test]
-        public void XCDataToXmlNode()
-        {
-            var cdata = new XElement("test", new XCData("hello world"));
-            var xdoc = new XmlDocument();
+        var cdata = new XElement("test", new XCData("hello world"));
+        var xdoc = new XmlDocument();
 
-            XmlNode xmlNode = cdata.GetXmlNode(xdoc);
+        var xmlNode = cdata.GetXmlNode(xdoc);
 
-            Assert.AreEqual("hello world", xmlNode.InnerText);
-        }
+        Assert.AreEqual("hello world", xmlNode.InnerText);
+    }
 
-        [Test]
-        public void XTextToXmlNode()
-        {
-            var cdata = new XElement("test", new XText("hello world"));
-            var xdoc = new XmlDocument();
+    [Test]
+    public void XTextToXmlNode()
+    {
+        var cdata = new XElement("test", new XText("hello world"));
+        var xdoc = new XmlDocument();
 
-            XmlNode xmlNode = cdata.GetXmlNode(xdoc);
+        var xmlNode = cdata.GetXmlNode(xdoc);
 
-            Assert.AreEqual("hello world", xmlNode.InnerText);
-        }
+        Assert.AreEqual("hello world", xmlNode.InnerText);
+    }
 
-        [Test]
-        public void ToXmlNodeIsNonDestructive()
-        {
-            const string xml = "<root><foo attr=\"123\">hello</foo><bar>world</bar></root>";
+    [Test]
+    public void ToXmlNodeIsNonDestructive()
+    {
+        const string xml = "<root><foo attr=\"123\">hello</foo><bar>world</bar></root>";
 
-            var cdata = new XElement("test", new XText("hello world"));
-            var xdoc = new XmlDocument();
-            xdoc.LoadXml(xml);
+        var cdata = new XElement("test", new XText("hello world"));
+        var xdoc = new XmlDocument();
+        xdoc.LoadXml(xml);
 
-            XmlNode xmlNode = cdata.GetXmlNode(xdoc);
+        var xmlNode = cdata.GetXmlNode(xdoc);
 
-            Assert.AreEqual("hello world", xmlNode.InnerText);
-            Assert.AreEqual(xml, xdoc.OuterXml);
-        }
+        Assert.AreEqual("hello world", xmlNode.InnerText);
+        Assert.AreEqual(xml, xdoc.OuterXml);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs
index e54eedae7f..2db6b97121 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/BackOffice/BackOfficeClaimsPrincipalFactoryTests.cs
@@ -9,151 +9,155 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.BackOffice;
+
+[TestFixture]
+public class BackOfficeClaimsPrincipalFactoryTests
 {
-    [TestFixture]
-    public class BackOfficeClaimsPrincipalFactoryTests
+    [SetUp]
+    public void Setup()
     {
-        private const int TestUserId = 2;
-        private const string TestUserName = "bob";
-        private const string TestUserGivenName = "Bob";
-        private const string TestUserCulture = "en-US";
-        private const string TestUserSecurityStamp = "B6937738-9C17-4C7D-A25A-628A875F5177";
-        private BackOfficeIdentityUser _testUser;
-        private Mock<UserManager<BackOfficeIdentityUser>> _mockUserManager;
+        var globalSettings = new GlobalSettings { DefaultUILanguage = "test" };
 
-        private static Mock<UserManager<BackOfficeIdentityUser>> GetMockedUserManager()
-            => new Mock<UserManager<BackOfficeIdentityUser>>(new Mock<IUserStore<BackOfficeIdentityUser>>().Object, null, null, null, null, null, null, null, null);
-
-        [Test]
-        public void Ctor_When_UserManager_Is_Null_Expect_ArgumentNullException()
-            => Assert.Throws<ArgumentNullException>(() => new BackOfficeClaimsPrincipalFactory(
-                                                            null,
-                                                            new OptionsWrapper<BackOfficeIdentityOptions>(new BackOfficeIdentityOptions())));
-
-        [Test]
-        public void Ctor_When_Options_Are_Null_Expect_ArgumentNullException()
-            => Assert.Throws<ArgumentNullException>(() => new BackOfficeClaimsPrincipalFactory(GetMockedUserManager().Object, null));
-
-        [Test]
-        public void Ctor_When_Options_Value_Is_Null_Expect_ArgumentNullException()
-            => Assert.Throws<ArgumentNullException>(() => new BackOfficeClaimsPrincipalFactory(
-                                                            GetMockedUserManager().Object,
-                                                            new OptionsWrapper<BackOfficeIdentityOptions>(null)));
-
-        [Test]
-        public void CreateAsync_When_User_Is_Null_Expect_ArgumentNullException()
+        _testUser = new BackOfficeIdentityUser(globalSettings, TestUserId, new List<IReadOnlyUserGroup>())
         {
-            BackOfficeClaimsPrincipalFactory sut = CreateSut();
+            UserName = TestUserName,
+            Name = TestUserGivenName,
+            Email = "bob@umbraco.test",
+            SecurityStamp = TestUserSecurityStamp,
+            Culture = TestUserCulture,
+        };
 
-            Assert.ThrowsAsync<ArgumentNullException>(async () => await sut.CreateAsync(null));
-        }
-
-        [Test]
-        public async Task CreateAsync_Should_Create_Principal_With_Claims_Identity()
-        {
-            BackOfficeClaimsPrincipalFactory sut = CreateSut();
-
-            ClaimsPrincipal claimsPrincipal = await sut.CreateAsync(_testUser);
-
-            var umbracoBackOfficeIdentity = claimsPrincipal.Identity as ClaimsIdentity;
-            Assert.IsNotNull(umbracoBackOfficeIdentity);
-        }
-
-        [TestCase(ClaimTypes.NameIdentifier, TestUserId)]
-        [TestCase(ClaimTypes.Name, TestUserName)]
-        public async Task CreateAsync_Should_Include_Claim(string expectedClaimType, object expectedClaimValue)
-        {
-            BackOfficeClaimsPrincipalFactory sut = CreateSut();
-
-            ClaimsPrincipal claimsPrincipal = await sut.CreateAsync(_testUser);
-
-            Assert.True(claimsPrincipal.HasClaim(expectedClaimType, expectedClaimValue.ToString()));
-            Assert.True(claimsPrincipal.GetUmbracoIdentity().HasClaim(expectedClaimType, expectedClaimValue.ToString()));
-        }
-
-        [Test]
-        public async Task CreateAsync_When_SecurityStamp_Supported_Expect_SecurityStamp_Claim()
-        {
-            const string expectedClaimType = Constants.Security.SecurityStampClaimType;
-            var expectedClaimValue = _testUser.SecurityStamp;
-
-            _mockUserManager.Setup(x => x.SupportsUserSecurityStamp).Returns(true);
-            _mockUserManager.Setup(x => x.GetSecurityStampAsync(_testUser)).ReturnsAsync(_testUser.SecurityStamp);
-
-            BackOfficeClaimsPrincipalFactory sut = CreateSut();
-
-            ClaimsPrincipal claimsPrincipal = await sut.CreateAsync(_testUser);
-
-            Assert.True(claimsPrincipal.HasClaim(expectedClaimType, expectedClaimValue));
-            Assert.True(claimsPrincipal.GetUmbracoIdentity().HasClaim(expectedClaimType, expectedClaimValue));
-        }
-
-        [Test]
-        public async Task CreateAsync_When_Roles_Supported_Expect_Role_Claims_In_UmbracoIdentity()
-        {
-            const string expectedClaimType = ClaimTypes.Role;
-            const string expectedClaimValue = "b87309fb-4caf-48dc-b45a-2b752d051508";
-
-            _testUser.Roles.Add(new IdentityUserRole<string> { RoleId = expectedClaimValue });
-            _mockUserManager.Setup(x => x.SupportsUserRole).Returns(true);
-            _mockUserManager.Setup(x => x.GetRolesAsync(_testUser)).ReturnsAsync(new[] { expectedClaimValue });
-
-            BackOfficeClaimsPrincipalFactory sut = CreateSut();
-
-            ClaimsPrincipal claimsPrincipal = await sut.CreateAsync(_testUser);
-
-            Assert.True(claimsPrincipal.HasClaim(expectedClaimType, expectedClaimValue));
-        }
-
-        [Test]
-        public async Task CreateAsync_When_UserClaims_Supported_Expect_UserClaims_In_Actor()
-        {
-            const string expectedClaimType = "custom";
-            const string expectedClaimValue = "val";
-
-            _testUser.Claims.Add(new IdentityUserClaim<string> { ClaimType = expectedClaimType, ClaimValue = expectedClaimValue });
-            _mockUserManager.Setup(x => x.SupportsUserClaim).Returns(true);
-            _mockUserManager.Setup(x => x.GetClaimsAsync(_testUser)).ReturnsAsync(
-                new List<Claim> { new Claim(expectedClaimType, expectedClaimValue) });
-
-            BackOfficeClaimsPrincipalFactory sut = CreateSut();
-
-            ClaimsPrincipal claimsPrincipal = await sut.CreateAsync(_testUser);
-
-            Assert.True(claimsPrincipal.GetUmbracoIdentity().HasClaim(expectedClaimType, expectedClaimValue));
-        }
-
-        [SetUp]
-        public void Setup()
-        {
-            var globalSettings = new GlobalSettings { DefaultUILanguage = "test" };
-
-            _testUser = new BackOfficeIdentityUser(globalSettings, TestUserId, new List<IReadOnlyUserGroup>())
-            {
-                UserName = TestUserName,
-                Name = TestUserGivenName,
-                Email = "bob@umbraco.test",
-                SecurityStamp = TestUserSecurityStamp,
-                Culture = TestUserCulture
-            };
-
-            _mockUserManager = GetMockedUserManager();
-            _mockUserManager.Setup(x => x.GetUserIdAsync(_testUser)).ReturnsAsync(_testUser.Id.ToString);
-            _mockUserManager.Setup(x => x.GetUserNameAsync(_testUser)).ReturnsAsync(_testUser.UserName);
-            _mockUserManager.Setup(x => x.SupportsUserSecurityStamp).Returns(false);
-            _mockUserManager.Setup(x => x.SupportsUserClaim).Returns(false);
-            _mockUserManager.Setup(x => x.SupportsUserRole).Returns(false);
-        }
-
-        private BackOfficeClaimsPrincipalFactory CreateSut() => new BackOfficeClaimsPrincipalFactory(
-                _mockUserManager.Object,
-                new OptionsWrapper<BackOfficeIdentityOptions>(new BackOfficeIdentityOptions()));
+        _mockUserManager = GetMockedUserManager();
+        _mockUserManager.Setup(x => x.GetUserIdAsync(_testUser)).ReturnsAsync(_testUser.Id.ToString);
+        _mockUserManager.Setup(x => x.GetUserNameAsync(_testUser)).ReturnsAsync(_testUser.UserName);
+        _mockUserManager.Setup(x => x.SupportsUserSecurityStamp).Returns(false);
+        _mockUserManager.Setup(x => x.SupportsUserClaim).Returns(false);
+        _mockUserManager.Setup(x => x.SupportsUserRole).Returns(false);
     }
+
+    private const int TestUserId = 2;
+    private const string TestUserName = "bob";
+    private const string TestUserGivenName = "Bob";
+    private const string TestUserCulture = "en-US";
+    private const string TestUserSecurityStamp = "B6937738-9C17-4C7D-A25A-628A875F5177";
+    private BackOfficeIdentityUser _testUser;
+    private Mock<UserManager<BackOfficeIdentityUser>> _mockUserManager;
+
+    private static Mock<UserManager<BackOfficeIdentityUser>> GetMockedUserManager()
+        => new(new Mock<IUserStore<BackOfficeIdentityUser>>().Object, null, null, null, null, null, null, null, null);
+
+    [Test]
+    public void Ctor_When_UserManager_Is_Null_Expect_ArgumentNullException()
+        => Assert.Throws<ArgumentNullException>(() => new BackOfficeClaimsPrincipalFactory(
+            null,
+            new OptionsWrapper<BackOfficeIdentityOptions>(new BackOfficeIdentityOptions())));
+
+    [Test]
+    public void Ctor_When_Options_Are_Null_Expect_ArgumentNullException()
+        => Assert.Throws<ArgumentNullException>(() =>
+            new BackOfficeClaimsPrincipalFactory(GetMockedUserManager().Object, null));
+
+    [Test]
+    public void Ctor_When_Options_Value_Is_Null_Expect_ArgumentNullException()
+        => Assert.Throws<ArgumentNullException>(() => new BackOfficeClaimsPrincipalFactory(
+            GetMockedUserManager().Object,
+            new OptionsWrapper<BackOfficeIdentityOptions>(null)));
+
+    [Test]
+    public void CreateAsync_When_User_Is_Null_Expect_ArgumentNullException()
+    {
+        var sut = CreateSut();
+
+        Assert.ThrowsAsync<ArgumentNullException>(async () => await sut.CreateAsync(null));
+    }
+
+    [Test]
+    public async Task CreateAsync_Should_Create_Principal_With_Claims_Identity()
+    {
+        var sut = CreateSut();
+
+        var claimsPrincipal = await sut.CreateAsync(_testUser);
+
+        var umbracoBackOfficeIdentity = claimsPrincipal.Identity as ClaimsIdentity;
+        Assert.IsNotNull(umbracoBackOfficeIdentity);
+    }
+
+    [TestCase(ClaimTypes.NameIdentifier, TestUserId)]
+    [TestCase(ClaimTypes.Name, TestUserName)]
+    public async Task CreateAsync_Should_Include_Claim(string expectedClaimType, object expectedClaimValue)
+    {
+        var sut = CreateSut();
+
+        var claimsPrincipal = await sut.CreateAsync(_testUser);
+
+        Assert.True(claimsPrincipal.HasClaim(expectedClaimType, expectedClaimValue.ToString()));
+        Assert.True(claimsPrincipal.GetUmbracoIdentity().HasClaim(expectedClaimType, expectedClaimValue.ToString()));
+    }
+
+    [Test]
+    public async Task CreateAsync_When_SecurityStamp_Supported_Expect_SecurityStamp_Claim()
+    {
+        const string expectedClaimType = Constants.Security.SecurityStampClaimType;
+        var expectedClaimValue = _testUser.SecurityStamp;
+
+        _mockUserManager.Setup(x => x.SupportsUserSecurityStamp).Returns(true);
+        _mockUserManager.Setup(x => x.GetSecurityStampAsync(_testUser)).ReturnsAsync(_testUser.SecurityStamp);
+
+        var sut = CreateSut();
+
+        var claimsPrincipal = await sut.CreateAsync(_testUser);
+
+        Assert.True(claimsPrincipal.HasClaim(expectedClaimType, expectedClaimValue));
+        Assert.True(claimsPrincipal.GetUmbracoIdentity().HasClaim(expectedClaimType, expectedClaimValue));
+    }
+
+    [Test]
+    public async Task CreateAsync_When_Roles_Supported_Expect_Role_Claims_In_UmbracoIdentity()
+    {
+        const string expectedClaimType = ClaimTypes.Role;
+        const string expectedClaimValue = "b87309fb-4caf-48dc-b45a-2b752d051508";
+
+        _testUser.Roles.Add(new IdentityUserRole<string> { RoleId = expectedClaimValue });
+        _mockUserManager.Setup(x => x.SupportsUserRole).Returns(true);
+        _mockUserManager.Setup(x => x.GetRolesAsync(_testUser)).ReturnsAsync(new[] { expectedClaimValue });
+
+        var sut = CreateSut();
+
+        var claimsPrincipal = await sut.CreateAsync(_testUser);
+
+        Assert.True(claimsPrincipal.HasClaim(expectedClaimType, expectedClaimValue));
+    }
+
+    [Test]
+    public async Task CreateAsync_When_UserClaims_Supported_Expect_UserClaims_In_Actor()
+    {
+        const string expectedClaimType = "custom";
+        const string expectedClaimValue = "val";
+
+        _testUser.Claims.Add(new IdentityUserClaim<string>
+        {
+            ClaimType = expectedClaimType,
+            ClaimValue = expectedClaimValue,
+        });
+        _mockUserManager.Setup(x => x.SupportsUserClaim).Returns(true);
+        _mockUserManager.Setup(x => x.GetClaimsAsync(_testUser)).ReturnsAsync(
+            new List<Claim> { new(expectedClaimType, expectedClaimValue) });
+
+        var sut = CreateSut();
+
+        var claimsPrincipal = await sut.CreateAsync(_testUser);
+
+        Assert.True(claimsPrincipal.GetUmbracoIdentity().HasClaim(expectedClaimType, expectedClaimValue));
+    }
+
+    private BackOfficeClaimsPrincipalFactory CreateSut() => new(
+        _mockUserManager.Object,
+        new OptionsWrapper<BackOfficeIdentityOptions>(new BackOfficeIdentityOptions()));
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
index 94064ddaba..d16c24e1af 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Editors/UserEditorAuthorizationHelperTests.cs
@@ -14,435 +14,406 @@ using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Editors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Editors;
+
+[TestFixture]
+public class UserEditorAuthorizationHelperTests
 {
-    [TestFixture]
-    public class UserEditorAuthorizationHelperTests
+    [Test]
+    public void Admin_Is_Authorized()
     {
-        [Test]
-        public void Admin_Is_Authorized()
-        {
-            IUser currentUser = CreateAdminUser();
-            IUser savingUser = CreateUser();
+        var currentUser = CreateAdminUser();
+        var savingUser = CreateUser();
 
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
 
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
 
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new string[0]);
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new string[0]);
 
-            Assert.IsTrue(result.Success);
-        }
-
-        [Test]
-        public void Non_Admin_Cannot_Save_Admin()
-        {
-            IUser currentUser = CreateUser();
-            IUser savingUser = CreateAdminUser();
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new string[0]);
-
-            Assert.IsFalse(result.Success);
-        }
-
-        [Test]
-        public void Cannot_Grant_Group_Membership_Without_Being_A_Member()
-        {
-            IUser currentUser = CreateUser(withGroup: true);
-            IUser savingUser = CreateUser();
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { "FunGroup" });
-
-            Assert.IsFalse(result.Success);
-        }
-
-        [Test]
-        public void Can_Grant_Group_Membership_With_Being_A_Member()
-        {
-            IUser currentUser = CreateUser(withGroup: true);
-            IUser savingUser = CreateUser();
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { "test" });
-
-            Assert.IsTrue(result.Success);
-        }
-
-        [Test]
-        [TestCase(Constants.Security.AdminGroupAlias, Constants.Security.AdminGroupAlias, ExpectedResult = true)]
-        [TestCase(Constants.Security.AdminGroupAlias, "SomethingElse", ExpectedResult = true)]
-        [TestCase(Constants.Security.EditorGroupAlias, Constants.Security.AdminGroupAlias, ExpectedResult = false)]
-        [TestCase(Constants.Security.EditorGroupAlias, "SomethingElse", ExpectedResult = false)]
-        [TestCase(Constants.Security.EditorGroupAlias, Constants.Security.EditorGroupAlias, ExpectedResult = true)]
-        public bool Can_only_add_user_groups_you_are_part_of_yourself_unless_you_are_admin(string groupAlias, string groupToAdd)
-        {
-            var currentUser = Mock.Of<IUser>(user => user.Groups == new[]
-            {
-                new ReadOnlyUserGroup(1, "CurrentUser", "icon-user", null, null, groupAlias, new string[0], new string[0])
-            });
-            IUser savingUser = null; // This means it is a new created user
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { groupToAdd });
-
-            return result.Success;
-        }
-
-        [Test]
-        public void Can_Add_Another_Content_Start_Node_On_User_With_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startContentIds: new[] { 9876 });
-            IUser savingUser = CreateUser(startContentIds: new[] { 1234 });
-
-            var contentService = new Mock<IContentService>();
-            contentService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // adding 5555 which currentUser has access to since it's a child of 9876 ... adding is still ok even though currentUser doesn't have access to 1234
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234, 5555 }, new int[0], new string[0]);
-
-            Assert.IsTrue(result.Success);
-        }
-
-        [Test]
-        public void Can_Remove_Content_Start_Node_On_User_Without_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startContentIds: new[] { 9876 });
-            IUser savingUser = CreateUser(startContentIds: new[] { 1234, 4567 });
-
-            var contentService = new Mock<IContentService>();
-            contentService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // removing 4567 start node even though currentUser doesn't have acces to it ... removing is ok
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234 }, new int[0], new string[0]);
-
-            Assert.IsTrue(result.Success);
-        }
-
-        [Test]
-        public void Cannot_Add_Content_Start_Node_On_User_Without_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startContentIds: new[] { 9876 });
-            IUser savingUser = CreateUser();
-
-            var contentService = new Mock<IContentService>();
-            contentService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // adding 1234 but currentUser doesn't have access to it ... nope
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234 }, new int[0], new string[0]);
-
-            Assert.IsFalse(result.Success);
-        }
-
-        [Test]
-        public void Can_Add_Content_Start_Node_On_User_With_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startContentIds: new[] { 9876 });
-            IUser savingUser = CreateUser();
-
-            var contentService = new Mock<IContentService>();
-            contentService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
-            var mediaService = new Mock<IMediaService>();
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // adding 5555 which currentUser has access to since it's a child of 9876 ... ok
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 5555 }, new int[0], new string[0]);
-
-            Assert.IsTrue(result.Success);
-        }
-
-        [Test]
-        public void Cannot_Add_Media_Start_Node_On_User_Without_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startMediaIds: new[] { 9876 });
-            IUser savingUser = CreateUser();
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            mediaService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // adding 1234 but currentUser doesn't have access to it ... nope
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234 }, new string[0]);
-
-            Assert.IsFalse(result.Success);
-        }
-
-        [Test]
-        public void Can_Add_Media_Start_Node_On_User_With_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startMediaIds: new[] { 9876 });
-            IUser savingUser = CreateUser();
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            mediaService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // adding 5555 which currentUser has access to since it's a child of 9876 ... ok
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 5555 }, new string[0]);
-
-            Assert.IsTrue(result.Success);
-        }
-
-        [Test]
-        public void Can_Add_Another_Media_Start_Node_On_User_With_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startMediaIds: new[] { 9876 });
-            IUser savingUser = CreateUser(startMediaIds: new[] { 1234 });
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            mediaService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // adding 5555 which currentUser has access to since it's a child of 9876 ... adding is still ok even though currentUser doesn't have access to 1234
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234, 5555 }, new string[0]);
-
-            Assert.IsTrue(result.Success);
-        }
-
-        [Test]
-        public void Can_Remove_Media_Start_Node_On_User_Without_Access()
-        {
-            var nodePaths = new Dictionary<int, string>
-            {
-                { 1234, "-1,1234" },
-                { 9876, "-1,9876" },
-                { 5555, "-1,9876,5555" },
-                { 4567, "-1,4567" },
-            };
-
-            IUser currentUser = CreateUser(startMediaIds: new[] { 9876 });
-            IUser savingUser = CreateUser(startMediaIds: new[] { 1234, 4567 });
-
-            var contentService = new Mock<IContentService>();
-            var mediaService = new Mock<IMediaService>();
-            mediaService.Setup(x => x.GetById(It.IsAny<int>()))
-                .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
-            var userService = new Mock<IUserService>();
-            var entityService = new Mock<IEntityService>();
-            entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns((UmbracoObjectTypes objType, int[] ids) => ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
-
-            var authHelper = new UserEditorAuthorizationHelper(
-                contentService.Object,
-                mediaService.Object,
-                entityService.Object,
-                AppCaches.Disabled);
-
-            // removing 4567 start node even though currentUser doesn't have acces to it ... removing is ok
-            Attempt<string> result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234 }, new string[0]);
-
-            Assert.IsTrue(result.Success);
-        }
-
-        private static IUser CreateUser(bool withGroup = false, int[] startContentIds = null, int[] startMediaIds = null)
-        {
-            UserBuilder<object> builder = new UserBuilder()
-                .WithStartContentIds(startContentIds ?? (new int[0]))
-                .WithStartMediaIds(startMediaIds ?? (new int[0]));
-            if (withGroup)
-            {
-                builder = (UserBuilder)builder
-                    .AddUserGroup()
-                        .WithName("Test")
-                        .WithAlias("test")
-                        .Done();
-            }
-
-            return builder.Build();
-        }
-
-        private static IUser CreateAdminUser() =>
-            new UserBuilder()
-                .AddUserGroup()
-                    .WithId(1)
-                    .WithName("Admin")
-                    .WithAlias(Constants.Security.AdminGroupAlias)
-                    .Done()
-                .Build();
+        Assert.IsTrue(result.Success);
     }
+
+    [Test]
+    public void Non_Admin_Cannot_Save_Admin()
+    {
+        var currentUser = CreateUser();
+        var savingUser = CreateAdminUser();
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new string[0]);
+
+        Assert.IsFalse(result.Success);
+    }
+
+    [Test]
+    public void Cannot_Grant_Group_Membership_Without_Being_A_Member()
+    {
+        var currentUser = CreateUser(true);
+        var savingUser = CreateUser();
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { "FunGroup" });
+
+        Assert.IsFalse(result.Success);
+    }
+
+    [Test]
+    public void Can_Grant_Group_Membership_With_Being_A_Member()
+    {
+        var currentUser = CreateUser(true);
+        var savingUser = CreateUser();
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { "test" });
+
+        Assert.IsTrue(result.Success);
+    }
+
+    [Test]
+    [TestCase(Constants.Security.AdminGroupAlias, Constants.Security.AdminGroupAlias, ExpectedResult = true)]
+    [TestCase(Constants.Security.AdminGroupAlias, "SomethingElse", ExpectedResult = true)]
+    [TestCase(Constants.Security.EditorGroupAlias, Constants.Security.AdminGroupAlias, ExpectedResult = false)]
+    [TestCase(Constants.Security.EditorGroupAlias, "SomethingElse", ExpectedResult = false)]
+    [TestCase(Constants.Security.EditorGroupAlias, Constants.Security.EditorGroupAlias, ExpectedResult = true)]
+    public bool Can_only_add_user_groups_you_are_part_of_yourself_unless_you_are_admin(
+        string groupAlias,
+        string groupToAdd)
+    {
+        var currentUser = Mock.Of<IUser>(user => user.Groups == new[]
+        {
+            new ReadOnlyUserGroup(1, "CurrentUser", "icon-user", null, null, groupAlias, new string[0], new string[0]),
+        });
+        IUser savingUser = null; // This means it is a new created user
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new int[0], new[] { groupToAdd });
+
+        return result.Success;
+    }
+
+    [Test]
+    public void Can_Add_Another_Content_Start_Node_On_User_With_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startContentIds: new[] { 9876 });
+        var savingUser = CreateUser(startContentIds: new[] { 1234 });
+
+        var contentService = new Mock<IContentService>();
+        contentService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // adding 5555 which currentUser has access to since it's a child of 9876 ... adding is still ok even though currentUser doesn't have access to 1234
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234, 5555 }, new int[0], new string[0]);
+
+        Assert.IsTrue(result.Success);
+    }
+
+    [Test]
+    public void Can_Remove_Content_Start_Node_On_User_Without_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startContentIds: new[] { 9876 });
+        var savingUser = CreateUser(startContentIds: new[] { 1234, 4567 });
+
+        var contentService = new Mock<IContentService>();
+        contentService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // removing 4567 start node even though currentUser doesn't have acces to it ... removing is ok
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234 }, new int[0], new string[0]);
+
+        Assert.IsTrue(result.Success);
+    }
+
+    [Test]
+    public void Cannot_Add_Content_Start_Node_On_User_Without_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startContentIds: new[] { 9876 });
+        var savingUser = CreateUser();
+
+        var contentService = new Mock<IContentService>();
+        contentService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // adding 1234 but currentUser doesn't have access to it ... nope
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 1234 }, new int[0], new string[0]);
+
+        Assert.IsFalse(result.Success);
+    }
+
+    [Test]
+    public void Can_Add_Content_Start_Node_On_User_With_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startContentIds: new[] { 9876 });
+        var savingUser = CreateUser();
+
+        var contentService = new Mock<IContentService>();
+        contentService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IContent>(content => content.Path == nodePaths[id]));
+        var mediaService = new Mock<IMediaService>();
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // adding 5555 which currentUser has access to since it's a child of 9876 ... ok
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new[] { 5555 }, new int[0], new string[0]);
+
+        Assert.IsTrue(result.Success);
+    }
+
+    [Test]
+    public void Cannot_Add_Media_Start_Node_On_User_Without_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startMediaIds: new[] { 9876 });
+        var savingUser = CreateUser();
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        mediaService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // adding 1234 but currentUser doesn't have access to it ... nope
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234 }, new string[0]);
+
+        Assert.IsFalse(result.Success);
+    }
+
+    [Test]
+    public void Can_Add_Media_Start_Node_On_User_With_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startMediaIds: new[] { 9876 });
+        var savingUser = CreateUser();
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        mediaService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // adding 5555 which currentUser has access to since it's a child of 9876 ... ok
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 5555 }, new string[0]);
+
+        Assert.IsTrue(result.Success);
+    }
+
+    [Test]
+    public void Can_Add_Another_Media_Start_Node_On_User_With_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startMediaIds: new[] { 9876 });
+        var savingUser = CreateUser(startMediaIds: new[] { 1234 });
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        mediaService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // adding 5555 which currentUser has access to since it's a child of 9876 ... adding is still ok even though currentUser doesn't have access to 1234
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234, 5555 }, new string[0]);
+
+        Assert.IsTrue(result.Success);
+    }
+
+    [Test]
+    public void Can_Remove_Media_Start_Node_On_User_Without_Access()
+    {
+        var nodePaths = new Dictionary<int, string>
+        {
+            { 1234, "-1,1234" }, { 9876, "-1,9876" }, { 5555, "-1,9876,5555" }, { 4567, "-1,4567" },
+        };
+
+        var currentUser = CreateUser(startMediaIds: new[] { 9876 });
+        var savingUser = CreateUser(startMediaIds: new[] { 1234, 4567 });
+
+        var contentService = new Mock<IContentService>();
+        var mediaService = new Mock<IMediaService>();
+        mediaService.Setup(x => x.GetById(It.IsAny<int>()))
+            .Returns((int id) => Mock.Of<IMedia>(content => content.Path == nodePaths[id]));
+        var entityService = new Mock<IEntityService>();
+        entityService.Setup(service => service.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns((UmbracoObjectTypes objType, int[] ids) =>
+                ids.Select(x => new TreeEntityPath { Path = nodePaths[x], Id = x }));
+
+        var authHelper = new UserEditorAuthorizationHelper(
+            contentService.Object,
+            mediaService.Object,
+            entityService.Object,
+            AppCaches.Disabled);
+
+        // removing 4567 start node even though currentUser doesn't have acces to it ... removing is ok
+        var result = authHelper.IsAuthorized(currentUser, savingUser, new int[0], new[] { 1234 }, new string[0]);
+
+        Assert.IsTrue(result.Success);
+    }
+
+    private static IUser CreateUser(bool withGroup = false, int[] startContentIds = null, int[] startMediaIds = null)
+    {
+        var builder = new UserBuilder()
+            .WithStartContentIds(startContentIds ?? new int[0])
+            .WithStartMediaIds(startMediaIds ?? new int[0]);
+        if (withGroup)
+        {
+            builder = (UserBuilder)builder
+                .AddUserGroup()
+                .WithName("Test")
+                .WithAlias("test")
+                .Done();
+        }
+
+        return builder.Build();
+    }
+
+    private static IUser CreateAdminUser() =>
+        new UserBuilder()
+            .AddUserGroup()
+            .WithId(1)
+            .WithName("Admin")
+            .WithAlias(Constants.Security.AdminGroupAlias)
+            .Done()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
index 5531b9968f..c3d357c477 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Examine/UmbracoContentValueSetValidatorTests.cs
@@ -13,352 +13,439 @@ using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Examine;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Examine
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Examine;
+
+[TestFixture]
+public class UmbracoContentValueSetValidatorTests
 {
-    [TestFixture]
-    public class UmbracoContentValueSetValidatorTests
+    [Test]
+    public void Invalid_Category()
     {
-        [Test]
-        public void Invalid_Category()
-        {
-            var validator = new ContentValueSetValidator(
-                false,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>());
+        var validator = new ContentValueSetValidator(
+            false,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>());
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+        var result =
+            validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("777", IndexTypes.Media, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+        result = validator.Validate(
+            ValueSet.FromObject("777", IndexTypes.Media, new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", "invalid-category", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
-        }
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            "invalid-category",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+    }
 
-        [Test]
-        public void Must_Have_Path()
-        {
-            var validator = new ContentValueSetValidator(
-                false,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>());
+    [Test]
+    public void Must_Have_Path()
+    {
+        var validator = new ContentValueSetValidator(
+            false,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>());
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+        var result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+    }
 
-        [Test]
-        public void Parent_Id()
-        {
-            var validator = new ContentValueSetValidator(
-                false,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>(),
-                555);
+    [Test]
+    public void Parent_Id()
+    {
+        var validator = new ContentValueSetValidator(
+            false,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>(),
+            555);
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        var result =
+            validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,444" }));
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,444" }));
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555,777" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,555,777" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555,777,999" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,555,777,999" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+    }
 
-        [Test]
-        public void Inclusion_Field_List()
-        {
-            var validator = new ValueSetValidator(
-                null,
-                null,
-                new[] { "hello", "world" },
-                null);
+    [Test]
+    public void Inclusion_Field_List()
+    {
+        var validator = new ValueSetValidator(
+            null,
+            null,
+            new[] { "hello", "world" },
+            null);
 
-            var valueSet = ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555", world = "your oyster" });
-            ValueSetValidationResult result = validator.Validate(valueSet);
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        var valueSet = ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "test-content",
+            new { hello = "world", path = "-1,555", world = "your oyster" });
+        var result = validator.Validate(valueSet);
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
 
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey("path"));
-            Assert.IsTrue(result.ValueSet.Values.ContainsKey("hello"));
-            Assert.IsTrue(result.ValueSet.Values.ContainsKey("world"));
-        }
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey("path"));
+        Assert.IsTrue(result.ValueSet.Values.ContainsKey("hello"));
+        Assert.IsTrue(result.ValueSet.Values.ContainsKey("world"));
+    }
 
-        [Test]
-        public void Exclusion_Field_List()
-        {
-            var validator = new ValueSetValidator(
-                null,
-                null,
-                null,
-                new[] { "hello", "world" });
+    [Test]
+    public void Exclusion_Field_List()
+    {
+        var validator = new ValueSetValidator(
+            null,
+            null,
+            null,
+            new[] { "hello", "world" });
 
-            var valueSet = ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555", world = "your oyster" });
-            ValueSetValidationResult result = validator.Validate(valueSet);
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        var valueSet = ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "test-content",
+            new { hello = "world", path = "-1,555", world = "your oyster" });
+        var result = validator.Validate(valueSet);
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
 
-            Assert.IsTrue(result.ValueSet.Values.ContainsKey("path"));
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey("hello"));
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey("world"));
-        }
+        Assert.IsTrue(result.ValueSet.Values.ContainsKey("path"));
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey("hello"));
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey("world"));
+    }
 
-        [Test]
-        public void Inclusion_Exclusion_Field_List()
-        {
-            var validator = new ValueSetValidator(
-                null,
-                null,
-                new[] { "hello", "world" },
-                new[] { "world" });
+    [Test]
+    public void Inclusion_Exclusion_Field_List()
+    {
+        var validator = new ValueSetValidator(
+            null,
+            null,
+            new[] { "hello", "world" },
+            new[] { "world" });
 
-            var valueSet = ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555", world = "your oyster" });
-            ValueSetValidationResult result = validator.Validate(valueSet);
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        var valueSet = ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "test-content",
+            new { hello = "world", path = "-1,555", world = "your oyster" });
+        var result = validator.Validate(valueSet);
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
 
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey("path"));
-            Assert.IsTrue(result.ValueSet.Values.ContainsKey("hello"));
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey("world"));
-        }
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey("path"));
+        Assert.IsTrue(result.ValueSet.Values.ContainsKey("hello"));
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey("world"));
+    }
 
-        [Test]
-        public void Inclusion_Type_List()
-        {
-            var validator = new ContentValueSetValidator(
-                false,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>(),
-                includeItemTypes: new List<string> { "include-content" });
+    [Test]
+    public void Inclusion_Type_List()
+    {
+        var validator = new ContentValueSetValidator(
+            false,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>(),
+            includeItemTypes: new List<string> { "include-content" });
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+        var result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "test-content",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "include-content", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "include-content",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+    }
 
-        [Test]
-        public void Exclusion_Type_List()
-        {
-            var validator = new ContentValueSetValidator(
-                false,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>(),
-                excludeItemTypes: new List<string> { "exclude-content" });
+    [Test]
+    public void Exclusion_Type_List()
+    {
+        var validator = new ContentValueSetValidator(
+            false,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>(),
+            excludeItemTypes: new List<string> { "exclude-content" });
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+        var result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "test-content",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "exclude-content", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
-        }
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "exclude-content",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+    }
 
-        [Test]
-        public void Inclusion_Exclusion_Type_List()
-        {
-            var validator = new ContentValueSetValidator(
-                false,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>(),
-                includeItemTypes: new List<string> { "include-content", "exclude-content" },
-                excludeItemTypes: new List<string> { "exclude-content" });
+    [Test]
+    public void Inclusion_Exclusion_Type_List()
+    {
+        var validator = new ContentValueSetValidator(
+            false,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>(),
+            includeItemTypes: new List<string> { "include-content", "exclude-content" },
+            excludeItemTypes: new List<string> { "exclude-content" });
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "test-content", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+        var result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "test-content",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "exclude-content", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "exclude-content",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, "include-content", new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            "include-content",
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+    }
 
-        [Test]
-        public void Recycle_Bin_Content()
-        {
-            var validator = new ContentValueSetValidator(
-                true,
-                false,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>());
+    [Test]
+    public void Recycle_Bin_Content()
+    {
+        var validator = new ContentValueSetValidator(
+            true,
+            false,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>());
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,-20,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
-
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,-20,555,777" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
-
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
-
-            result = validator.Validate(new ValueSet(
+        var result =
+            validator.Validate(ValueSet.FromObject(
                 "555",
                 IndexTypes.Content,
-                new Dictionary<string, object>
-                {
-                    ["hello"] = "world",
-                    ["path"] = "-1,555",
-                    [UmbracoExamineFieldNames.PublishedFieldName] = "y"
-                }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+                new { hello = "world", path = "-1,-20,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-        [Test]
-        public void Recycle_Bin_Media()
-        {
-            var validator = new ContentValueSetValidator(
-                true,
-                false,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>());
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,-20,555,777" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Media, new { hello = "world", path = "-1,-21,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Media, new { hello = "world", path = "-1,-21,555,777" }));
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        result = validator.Validate(new ValueSet(
+            "555",
+            IndexTypes.Content,
+            new Dictionary<string, object>
+            {
+                ["hello"] = "world",
+                ["path"] = "-1,555",
+                [UmbracoExamineFieldNames.PublishedFieldName] = "y",
+            }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+    }
 
-            result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Media, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+    [Test]
+    public void Recycle_Bin_Media()
+    {
+        var validator = new ContentValueSetValidator(
+            true,
+            false,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>());
 
-        [Test]
-        public void Published_Only()
-        {
-            var validator = new ContentValueSetValidator(
-                true,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>());
-
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
-
-            result = validator.Validate(new ValueSet(
+        var result =
+            validator.Validate(ValueSet.FromObject(
                 "555",
-                IndexTypes.Content,
-                new Dictionary<string, object>
-                {
-                    ["hello"] = "world",
-                    ["path"] = "-1,555",
-                    [UmbracoExamineFieldNames.PublishedFieldName] = "n"
-                }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+                IndexTypes.Media,
+                new { hello = "world", path = "-1,-21,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
 
-            result = validator.Validate(new ValueSet(
-                "555",
-                IndexTypes.Content,
-                new Dictionary<string, object>
-                {
-                    ["hello"] = "world",
-                    ["path"] = "-1,555",
-                    [UmbracoExamineFieldNames.PublishedFieldName] = "y"
-                }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+        result = validator.Validate(ValueSet.FromObject(
+            "555",
+            IndexTypes.Media,
+            new { hello = "world", path = "-1,-21,555,777" }));
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
 
-        [Test]
-        public void Published_Only_With_Variants()
-        {
-            var validator = new ContentValueSetValidator(true,
-                true,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IScopeProvider>());
+        result = validator.Validate(
+            ValueSet.FromObject("555", IndexTypes.Media, new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+    }
 
-            ValueSetValidationResult result = validator.Validate(new ValueSet(
-                "555",
-                IndexTypes.Content,
-                new Dictionary<string, object>
-                {
-                    ["hello"] = "world",
-                    ["path"] = "-1,555",
-                    [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y",
-                    [UmbracoExamineFieldNames.PublishedFieldName] = "n"
-                }));
-            Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
+    [Test]
+    public void Published_Only()
+    {
+        var validator = new ContentValueSetValidator(
+            true,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>());
 
-            result = validator.Validate(new ValueSet(
-                "555",
-                IndexTypes.Content,
-                new Dictionary<string, object>
-                {
-                    ["hello"] = "world",
-                    ["path"] = "-1,555",
-                    [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y",
-                    [UmbracoExamineFieldNames.PublishedFieldName] = "y"
-                }));
-             Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+        var result =
+            validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            var valueSet = new ValueSet(
-                "555",
-                IndexTypes.Content,
-                new Dictionary<string, object>
-                {
-                    ["hello"] = "world",
-                    ["path"] = "-1,555",
-                    [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y",
-                    [$"{UmbracoExamineFieldNames.PublishedFieldName}_en-us"] = "y",
-                    ["hello_en-us"] = "world",
-                    ["title_en-us"] = "my title",
-                    [$"{UmbracoExamineFieldNames.PublishedFieldName}_es-es"] = "n",
-                    ["hello_es-ES"] = "world",
-                    ["title_es-ES"] = "my title",
-                    [UmbracoExamineFieldNames.PublishedFieldName] = "y"
-                });
-            Assert.AreEqual(10, valueSet.Values.Count());
-            Assert.IsTrue(valueSet.Values.ContainsKey($"{UmbracoExamineFieldNames.PublishedFieldName}_es-es"));
-            Assert.IsTrue(valueSet.Values.ContainsKey("hello_es-ES"));
-            Assert.IsTrue(valueSet.Values.ContainsKey("title_es-ES"));
+        result = validator.Validate(new ValueSet(
+            "555",
+            IndexTypes.Content,
+            new Dictionary<string, object>
+            {
+                ["hello"] = "world",
+                ["path"] = "-1,555",
+                [UmbracoExamineFieldNames.PublishedFieldName] = "n",
+            }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            result = validator.Validate(valueSet);
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        result = validator.Validate(new ValueSet(
+            "555",
+            IndexTypes.Content,
+            new Dictionary<string, object>
+            {
+                ["hello"] = "world",
+                ["path"] = "-1,555",
+                [UmbracoExamineFieldNames.PublishedFieldName] = "y",
+            }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
+    }
 
-            Assert.AreEqual(7, result.ValueSet.Values.Count()); // filtered to 7 values (removes es-es values)
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey($"{UmbracoExamineFieldNames.PublishedFieldName}_es-es"));
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey("hello_es-ES"));
-            Assert.IsFalse(result.ValueSet.Values.ContainsKey("title_es-ES"));
-        }
+    [Test]
+    public void Published_Only_With_Variants()
+    {
+        var validator = new ContentValueSetValidator(
+            true,
+            true,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IScopeProvider>());
 
-        [Test]
-        public void Non_Protected()
-        {
-            var publicAccessService = new Mock<IPublicAccessService>();
-            publicAccessService.Setup(x => x.IsProtected("-1,555"))
-                .Returns(Attempt.Succeed(new PublicAccessEntry(Guid.NewGuid(), 555, 444, 333, Enumerable.Empty<PublicAccessRule>())));
-            publicAccessService.Setup(x => x.IsProtected("-1,777"))
-                .Returns(Attempt.Fail<PublicAccessEntry>());
-            var validator = new ContentValueSetValidator(
-                false,
-                false,
-                publicAccessService.Object,
-                Mock.Of<IScopeProvider>());
+        var result = validator.Validate(new ValueSet(
+            "555",
+            IndexTypes.Content,
+            new Dictionary<string, object>
+            {
+                ["hello"] = "world",
+                ["path"] = "-1,555",
+                [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y",
+                [UmbracoExamineFieldNames.PublishedFieldName] = "n",
+            }));
+        Assert.AreEqual(ValueSetValidationStatus.Failed, result.Status);
 
-            ValueSetValidationResult result = validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
-            Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+        result = validator.Validate(new ValueSet(
+            "555",
+            IndexTypes.Content,
+            new Dictionary<string, object>
+            {
+                ["hello"] = "world",
+                ["path"] = "-1,555",
+                [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y",
+                [UmbracoExamineFieldNames.PublishedFieldName] = "y",
+            }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
 
-            result = validator.Validate(ValueSet.FromObject("777", IndexTypes.Content, new { hello = "world", path = "-1,777" }));
-            Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
-        }
+        var valueSet = new ValueSet(
+            "555",
+            IndexTypes.Content,
+            new Dictionary<string, object>
+            {
+                ["hello"] = "world",
+                ["path"] = "-1,555",
+                [UmbracoExamineFieldNames.VariesByCultureFieldName] = "y",
+                [$"{UmbracoExamineFieldNames.PublishedFieldName}_en-us"] = "y",
+                ["hello_en-us"] = "world",
+                ["title_en-us"] = "my title",
+                [$"{UmbracoExamineFieldNames.PublishedFieldName}_es-es"] = "n",
+                ["hello_es-ES"] = "world",
+                ["title_es-ES"] = "my title",
+                [UmbracoExamineFieldNames.PublishedFieldName] = "y",
+            });
+        Assert.AreEqual(10, valueSet.Values.Count());
+        Assert.IsTrue(valueSet.Values.ContainsKey($"{UmbracoExamineFieldNames.PublishedFieldName}_es-es"));
+        Assert.IsTrue(valueSet.Values.ContainsKey("hello_es-ES"));
+        Assert.IsTrue(valueSet.Values.ContainsKey("title_es-ES"));
+
+        result = validator.Validate(valueSet);
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+
+        Assert.AreEqual(7, result.ValueSet.Values.Count()); // filtered to 7 values (removes es-es values)
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey($"{UmbracoExamineFieldNames.PublishedFieldName}_es-es"));
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey("hello_es-ES"));
+        Assert.IsFalse(result.ValueSet.Values.ContainsKey("title_es-ES"));
+    }
+
+    [Test]
+    public void Non_Protected()
+    {
+        var publicAccessService = new Mock<IPublicAccessService>();
+        publicAccessService.Setup(x => x.IsProtected("-1,555"))
+            .Returns(Attempt.Succeed(new PublicAccessEntry(Guid.NewGuid(), 555, 444, 333, Enumerable.Empty<PublicAccessRule>())));
+        publicAccessService.Setup(x => x.IsProtected("-1,777"))
+            .Returns(Attempt.Fail<PublicAccessEntry>());
+        var validator = new ContentValueSetValidator(
+            false,
+            false,
+            publicAccessService.Object,
+            Mock.Of<IScopeProvider>());
+
+        var result =
+            validator.Validate(ValueSet.FromObject("555", IndexTypes.Content, new { hello = "world", path = "-1,555" }));
+        Assert.AreEqual(ValueSetValidationStatus.Filtered, result.Status);
+
+        result = validator.Validate(ValueSet.FromObject(
+            "777",
+            IndexTypes.Content,
+            new { hello = "world", path = "-1,777" }));
+        Assert.AreEqual(ValueSetValidationStatus.Valid, result.Status);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs
index 709873e8a3..7fd63d3173 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Extensions/EmailMessageExtensionsTests.cs
@@ -6,219 +6,210 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Email;
 using Umbraco.Cms.Infrastructure.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Extensions;
+
+[TestFixture]
+public class EmailMessageExtensionsTests
 {
-    [TestFixture]
-    public class EmailMessageExtensionsTests
+    private const string ConfiguredSender = "noreply@umbraco.com";
+
+    [Test]
+    public void Can_Construct_MimeMessage_From_Simple_EmailMessage()
     {
-        private const string ConfiguredSender = "noreply@umbraco.com";
+        const string from = "from@email.com";
+        const string to = "to@email.com";
+        const string subject = "Subject";
+        const string body = "<p>Message</p>";
+        const bool isBodyHtml = true;
+        var emailMessage = new EmailMessage(from, to, subject, body, isBodyHtml);
 
-        [Test]
-        public void Can_Construct_MimeMessage_From_Simple_EmailMessage()
-        {
-            const string from = "from@email.com";
-            const string to = "to@email.com";
-            const string subject = "Subject";
-            const string body = "<p>Message</p>";
-            const bool isBodyHtml = true;
-            var emailMessage = new EmailMessage(from, to, subject, body, isBodyHtml);
+        var result = emailMessage.ToMimeMessage(ConfiguredSender);
 
-            var result = emailMessage.ToMimeMessage(ConfiguredSender);
+        Assert.AreEqual(1, result.From.Count());
+        Assert.AreEqual(from, result.From.First().ToString());
+        Assert.AreEqual(1, result.To.Count());
+        Assert.AreEqual(to, result.To.First().ToString());
+        Assert.AreEqual(subject, result.Subject);
+        Assert.IsNull(result.TextBody);
+        Assert.AreEqual(body, result.HtmlBody);
+    }
 
-            Assert.AreEqual(1, result.From.Count());
-            Assert.AreEqual(from, result.From.First().ToString());
-            Assert.AreEqual(1, result.To.Count());
-            Assert.AreEqual(to, result.To.First().ToString());
-            Assert.AreEqual(subject, result.Subject);
-            Assert.IsNull(result.TextBody);
-            Assert.AreEqual(body, result.HtmlBody.ToString());
-        }
+    [Test]
+    public void Can_Construct_MimeMessage_From_Full_EmailMessage()
+    {
+        const string from = "from@email.com";
+        string[] to = { "to@email.com", "to2@email.com" };
+        string[] cc = { "cc@email.com", "cc2@email.com" };
+        string[] bcc = { "bcc@email.com", "bcc2@email.com", "bcc3@email.com", "invalid@email@address" };
+        string[] replyTo = { "replyto@email.com" };
+        const string subject = "Subject";
+        const string body = "Message";
+        const bool isBodyHtml = false;
 
-        [Test]
-        public void Can_Construct_MimeMessage_From_Full_EmailMessage()
-        {
-            const string from = "from@email.com";
-            string[] to = new[] { "to@email.com", "to2@email.com" };
-            string[] cc = new[] { "cc@email.com", "cc2@email.com" };
-            string[] bcc = new[] { "bcc@email.com", "bcc2@email.com", "bcc3@email.com", "invalid@email@address" };
-            string[] replyTo = new[] { "replyto@email.com" };
-            const string subject = "Subject";
-            const string body = "Message";
-            const bool isBodyHtml = false;
+        using var attachmentStream = new MemoryStream(Encoding.UTF8.GetBytes("test"));
+        var attachments = new List<EmailMessageAttachment> { new(attachmentStream, "test.txt") };
+        var emailMessage = new EmailMessage(from, to, cc, bcc, replyTo, subject, body, isBodyHtml, attachments);
 
-            using var attachmentStream = new MemoryStream(Encoding.UTF8.GetBytes("test"));
-            var attachments = new List<EmailMessageAttachment>
-                {
-                    new EmailMessageAttachment(attachmentStream, "test.txt"),
-                };
-            var emailMessage = new EmailMessage(from, to, cc, bcc, replyTo, subject, body, isBodyHtml, attachments);
+        var result = emailMessage.ToMimeMessage(ConfiguredSender);
 
-            var result = emailMessage.ToMimeMessage(ConfiguredSender);
+        Assert.AreEqual(1, result.From.Count());
+        Assert.AreEqual(from, result.From.First().ToString());
+        Assert.AreEqual(2, result.To.Count());
+        Assert.AreEqual(to[0], result.To.First().ToString());
+        Assert.AreEqual(to[1], result.To.Skip(1).First().ToString());
+        Assert.AreEqual(2, result.Cc.Count());
+        Assert.AreEqual(cc[0], result.Cc.First().ToString());
+        Assert.AreEqual(cc[1], result.Cc.Skip(1).First().ToString());
+        Assert.AreEqual(3, result.Bcc.Count());
+        Assert.AreEqual(bcc[0], result.Bcc.First().ToString());
+        Assert.AreEqual(bcc[1], result.Bcc.Skip(1).First().ToString());
+        Assert.AreEqual(bcc[2], result.Bcc.Skip(2).First().ToString());
+        Assert.AreEqual(1, result.ReplyTo.Count());
+        Assert.AreEqual(replyTo[0], result.ReplyTo.First().ToString());
+        Assert.AreEqual(subject, result.Subject);
+        Assert.IsNull(result.HtmlBody);
+        Assert.AreEqual(body, result.TextBody);
+        Assert.AreEqual(1, result.Attachments.Count());
+    }
 
-            Assert.AreEqual(1, result.From.Count());
-            Assert.AreEqual(from, result.From.First().ToString());
-            Assert.AreEqual(2, result.To.Count());
-            Assert.AreEqual(to[0], result.To.First().ToString());
-            Assert.AreEqual(to[1], result.To.Skip(1).First().ToString());
-            Assert.AreEqual(2, result.Cc.Count());
-            Assert.AreEqual(cc[0], result.Cc.First().ToString());
-            Assert.AreEqual(cc[1], result.Cc.Skip(1).First().ToString());
-            Assert.AreEqual(3, result.Bcc.Count());
-            Assert.AreEqual(bcc[0], result.Bcc.First().ToString());
-            Assert.AreEqual(bcc[1], result.Bcc.Skip(1).First().ToString());
-            Assert.AreEqual(bcc[2], result.Bcc.Skip(2).First().ToString());
-            Assert.AreEqual(1, result.ReplyTo.Count());
-            Assert.AreEqual(replyTo[0], result.ReplyTo.First().ToString());
-            Assert.AreEqual(subject, result.Subject);
-            Assert.IsNull(result.HtmlBody);
-            Assert.AreEqual(body, result.TextBody.ToString());
-            Assert.AreEqual(1, result.Attachments.Count());
-        }
+    [Test]
+    public void Can_Construct_MimeMessage_With_ConfiguredSender()
+    {
+        const string to = "to@email.com";
+        const string subject = "Subject";
+        const string body = "<p>Message</p>";
+        const bool isBodyHtml = true;
+        var emailMessage = new EmailMessage(null, to, subject, body, isBodyHtml);
 
-        [Test]
-        public void Can_Construct_MimeMessage_With_ConfiguredSender()
-        {
-            const string to = "to@email.com";
-            const string subject = "Subject";
-            const string body = "<p>Message</p>";
-            const bool isBodyHtml = true;
-            var emailMessage = new EmailMessage(null, to, subject, body, isBodyHtml);
+        var result = emailMessage.ToMimeMessage(ConfiguredSender);
 
-            var result = emailMessage.ToMimeMessage(ConfiguredSender);
+        Assert.AreEqual(1, result.From.Count());
+        Assert.AreEqual(ConfiguredSender, result.From.First().ToString());
+        Assert.AreEqual(1, result.To.Count());
+        Assert.AreEqual(to, result.To.First().ToString());
+        Assert.AreEqual(subject, result.Subject);
+        Assert.IsNull(result.TextBody);
+        Assert.AreEqual(body, result.HtmlBody);
+    }
 
-            Assert.AreEqual(1, result.From.Count());
-            Assert.AreEqual(ConfiguredSender, result.From.First().ToString());
-            Assert.AreEqual(1, result.To.Count());
-            Assert.AreEqual(to, result.To.First().ToString());
-            Assert.AreEqual(subject, result.Subject);
-            Assert.IsNull(result.TextBody);
-            Assert.AreEqual(body, result.HtmlBody.ToString());
-        }
+    [Test]
+    public void Can_Construct_NotificationEmailModel_From_Simple_MailMessage()
+    {
+        const string from = "from@email.com";
+        const string to = "to@email.com";
+        const string subject = "Subject";
+        const string body = "<p>Message</p>";
+        const bool isBodyHtml = true;
+        var emailMessage = new EmailMessage(from, to, subject, body, isBodyHtml);
 
-        [Test]
-        public void Can_Construct_NotificationEmailModel_From_Simple_MailMessage()
-        {
-            const string from = "from@email.com";
-            const string to = "to@email.com";
-            const string subject = "Subject";
-            const string body = "<p>Message</p>";
-            const bool isBodyHtml = true;
-            var emailMessage = new EmailMessage(from, to, subject, body, isBodyHtml);
+        var result = emailMessage.ToNotificationEmail(ConfiguredSender);
 
-            NotificationEmailModel result = emailMessage.ToNotificationEmail(ConfiguredSender);
+        Assert.AreEqual(from, result.From.Address);
+        Assert.AreEqual(string.Empty, result.From.DisplayName);
+        Assert.AreEqual(1, result.To.Count());
+        Assert.AreEqual(to, result.To.First().Address);
+        Assert.AreEqual(string.Empty, result.To.First().DisplayName);
+        Assert.AreEqual(subject, result.Subject);
+        Assert.AreEqual(body, result.Body);
+        Assert.IsTrue(result.IsBodyHtml);
+        Assert.IsFalse(result.HasAttachments);
+    }
 
-            Assert.AreEqual(from, result.From.Address);
-            Assert.AreEqual("", result.From.DisplayName);
-            Assert.AreEqual(1, result.To.Count());
-            Assert.AreEqual(to, result.To.First().Address);
-            Assert.AreEqual("", result.To.First().DisplayName);
-            Assert.AreEqual(subject, result.Subject);
-            Assert.AreEqual(body, result.Body);
-            Assert.IsTrue(result.IsBodyHtml);
-            Assert.IsFalse(result.HasAttachments);
-        }
+    [Test]
+    public void Can_Construct_NotificationEmailModel_From_Simple_MailMessage_With_Configured_Sender()
+    {
+        const string to = "to@email.com";
+        const string subject = "Subject";
+        const string body = "<p>Message</p>";
+        const bool isBodyHtml = true;
+        var emailMessage = new EmailMessage(null, to, subject, body, isBodyHtml);
 
-        [Test]
-        public void Can_Construct_NotificationEmailModel_From_Simple_MailMessage_With_Configured_Sender()
-        {
-            const string to = "to@email.com";
-            const string subject = "Subject";
-            const string body = "<p>Message</p>";
-            const bool isBodyHtml = true;
-            var emailMessage = new EmailMessage(null, to, subject, body, isBodyHtml);
+        var result = emailMessage.ToNotificationEmail(ConfiguredSender);
 
-            NotificationEmailModel result = emailMessage.ToNotificationEmail(ConfiguredSender);
+        Assert.AreEqual(ConfiguredSender, result.From.Address);
+        Assert.AreEqual(string.Empty, result.From.DisplayName);
+        Assert.AreEqual(1, result.To.Count());
+        Assert.AreEqual(to, result.To.First().Address);
+        Assert.AreEqual(string.Empty, result.To.First().DisplayName);
+        Assert.AreEqual(subject, result.Subject);
+        Assert.AreEqual(body, result.Body);
+        Assert.IsTrue(result.IsBodyHtml);
+        Assert.IsFalse(result.HasAttachments);
+    }
 
-            Assert.AreEqual(ConfiguredSender, result.From.Address);
-            Assert.AreEqual("", result.From.DisplayName);
-            Assert.AreEqual(1, result.To.Count());
-            Assert.AreEqual(to, result.To.First().Address);
-            Assert.AreEqual("", result.To.First().DisplayName);
-            Assert.AreEqual(subject, result.Subject);
-            Assert.AreEqual(body, result.Body);
-            Assert.IsTrue(result.IsBodyHtml);
-            Assert.IsFalse(result.HasAttachments);
-        }
+    [Test]
+    public void Can_Construct_NotificationEmailModel_From_Simple_MailMessage_With_DisplayName()
+    {
+        const string from = "\"From Email\" <from@from.com>";
+        const string to = "\"To Email\" <to@to.com>";
+        const string subject = "Subject";
+        const string body = "<p>Message</p>";
+        const bool isBodyHtml = true;
+        var emailMessage = new EmailMessage(from, to, subject, body, isBodyHtml);
 
-        [Test]
-        public void Can_Construct_NotificationEmailModel_From_Simple_MailMessage_With_DisplayName()
-        {
-            const string from = "\"From Email\" <from@from.com>";
-            const string to = "\"To Email\" <to@to.com>";
-            const string subject = "Subject";
-            const string body = "<p>Message</p>";
-            const bool isBodyHtml = true;
-            var emailMessage = new EmailMessage(from, to, subject, body, isBodyHtml);
+        var result = emailMessage.ToNotificationEmail(ConfiguredSender);
 
-            NotificationEmailModel result = emailMessage.ToNotificationEmail(ConfiguredSender);
+        Assert.AreEqual("from@from.com", result.From.Address);
+        Assert.AreEqual("From Email", result.From.DisplayName);
+        Assert.AreEqual(1, result.To.Count());
+        Assert.AreEqual("to@to.com", result.To.First().Address);
+        Assert.AreEqual("To Email", result.To.First().DisplayName);
+        Assert.AreEqual(subject, result.Subject);
+        Assert.AreEqual(body, result.Body);
+        Assert.IsTrue(result.IsBodyHtml);
+        Assert.IsFalse(result.HasAttachments);
+    }
 
-            Assert.AreEqual("from@from.com", result.From.Address);
-            Assert.AreEqual("From Email", result.From.DisplayName);
-            Assert.AreEqual(1, result.To.Count());
-            Assert.AreEqual("to@to.com", result.To.First().Address);
-            Assert.AreEqual("To Email", result.To.First().DisplayName);
-            Assert.AreEqual(subject, result.Subject);
-            Assert.AreEqual(body, result.Body);
-            Assert.IsTrue(result.IsBodyHtml);
-            Assert.IsFalse(result.HasAttachments);
-        }
+    [Test]
+    public void Can_Construct_NotificationEmailModel_From_Full_EmailMessage()
+    {
+        const string from = "\"From Email\" <from@from.com>";
+        string[] to = { "to@email.com", "\"Second Email\" <to2@email.com>", "invalid@invalid@invalid" };
+        string[] cc = { "\"First CC\" <cc@email.com>", "cc2@email.com", "invalid@invalid@invalid" };
+        string[] bcc = { "bcc@email.com", "bcc2@email.com", "\"Third BCC\" <bcc3@email.com>", "invalid@email@address" };
+        string[] replyTo = { "replyto@email.com", "invalid@invalid@invalid" };
+        const string subject = "Subject";
+        const string body = "Message";
+        const bool isBodyHtml = false;
 
+        using var attachmentStream = new MemoryStream(Encoding.UTF8.GetBytes("test"));
+        var attachments = new List<EmailMessageAttachment> { new(attachmentStream, "test.txt") };
+        var emailMessage = new EmailMessage(from, to, cc, bcc, replyTo, subject, body, isBodyHtml, attachments);
 
-        [Test]
-        public void Can_Construct_NotificationEmailModel_From_Full_EmailMessage()
-        {
-            const string from = "\"From Email\" <from@from.com>";
-            string[] to = { "to@email.com", "\"Second Email\" <to2@email.com>", "invalid@invalid@invalid" };
-            string[] cc = { "\"First CC\" <cc@email.com>", "cc2@email.com", "invalid@invalid@invalid" };
-            string[] bcc = { "bcc@email.com", "bcc2@email.com", "\"Third BCC\" <bcc3@email.com>", "invalid@email@address" };
-            string[] replyTo = { "replyto@email.com", "invalid@invalid@invalid" };
-            const string subject = "Subject";
-            const string body = "Message";
-            const bool isBodyHtml = false;
+        var result = emailMessage.ToNotificationEmail(ConfiguredSender);
 
-            using var attachmentStream = new MemoryStream(Encoding.UTF8.GetBytes("test"));
-            var attachments = new List<EmailMessageAttachment>
-                {
-                    new EmailMessageAttachment(attachmentStream, "test.txt"),
-                };
-            var emailMessage = new EmailMessage(from, to, cc, bcc, replyTo, subject, body, isBodyHtml, attachments);
+        Assert.AreEqual("from@from.com", result.From.Address);
+        Assert.AreEqual("From Email", result.From.DisplayName);
 
-            var result = emailMessage.ToNotificationEmail(ConfiguredSender);
+        Assert.AreEqual(2, result.To.Count());
+        Assert.AreEqual("to@email.com", result.To.First().Address);
+        Assert.AreEqual(string.Empty, result.To.First().DisplayName);
+        Assert.AreEqual("to2@email.com", result.To.Skip(1).First().Address);
+        Assert.AreEqual("Second Email", result.To.Skip(1).First().DisplayName);
 
-            Assert.AreEqual("from@from.com", result.From.Address);
-            Assert.AreEqual("From Email", result.From.DisplayName);
+        Assert.AreEqual(2, result.Cc.Count());
+        Assert.AreEqual("cc@email.com", result.Cc.First().Address);
+        Assert.AreEqual("First CC", result.Cc.First().DisplayName);
+        Assert.AreEqual("cc2@email.com", result.Cc.Skip(1).First().Address);
+        Assert.AreEqual(string.Empty, result.Cc.Skip(1).First().DisplayName);
 
-            Assert.AreEqual(2, result.To.Count());
-            Assert.AreEqual("to@email.com", result.To.First().Address);
-            Assert.AreEqual("", result.To.First().DisplayName);
-            Assert.AreEqual("to2@email.com", result.To.Skip(1).First().Address);
-            Assert.AreEqual("Second Email", result.To.Skip(1).First().DisplayName);
+        Assert.AreEqual(3, result.Bcc.Count());
+        Assert.AreEqual("bcc@email.com", result.Bcc.First().Address);
+        Assert.AreEqual(string.Empty, result.Bcc.First().DisplayName);
+        Assert.AreEqual("bcc2@email.com", result.Bcc.Skip(1).First().Address);
+        Assert.AreEqual(string.Empty, result.Bcc.Skip(1).First().DisplayName);
+        Assert.AreEqual("bcc3@email.com", result.Bcc.Skip(2).First().Address);
+        Assert.AreEqual("Third BCC", result.Bcc.Skip(2).First().DisplayName);
 
-            Assert.AreEqual(2, result.Cc.Count());
-            Assert.AreEqual("cc@email.com", result.Cc.First().Address);
-            Assert.AreEqual("First CC", result.Cc.First().DisplayName);
-            Assert.AreEqual("cc2@email.com", result.Cc.Skip(1).First().Address);
-            Assert.AreEqual("", result.Cc.Skip(1).First().DisplayName);
+        Assert.AreEqual(1, result.ReplyTo.Count());
+        Assert.AreEqual("replyto@email.com", result.ReplyTo.First().Address);
+        Assert.AreEqual(string.Empty, result.ReplyTo.First().DisplayName);
 
-            Assert.AreEqual(3, result.Bcc.Count());
-            Assert.AreEqual("bcc@email.com", result.Bcc.First().Address);
-            Assert.AreEqual("", result.Bcc.First().DisplayName);
-            Assert.AreEqual("bcc2@email.com", result.Bcc.Skip(1).First().Address);
-            Assert.AreEqual("", result.Bcc.Skip(1).First().DisplayName);
-            Assert.AreEqual("bcc3@email.com", result.Bcc.Skip(2).First().Address);
-            Assert.AreEqual("Third BCC", result.Bcc.Skip(2).First().DisplayName);
-
-            Assert.AreEqual(1, result.ReplyTo.Count());
-            Assert.AreEqual("replyto@email.com", result.ReplyTo.First().Address);
-            Assert.AreEqual("", result.ReplyTo.First().DisplayName);
-
-            Assert.AreEqual(subject, result.Subject);
-            Assert.AreEqual(body, result.Body);
-            Assert.AreEqual(1, result.Attachments.Count());
-        }
+        Assert.AreEqual(subject, result.Subject);
+        Assert.AreEqual(body, result.Body);
+        Assert.AreEqual(1, result.Attachments.Count());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs
index c1a155d5a3..3a790696da 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HealthChecks/HealthCheckResultsTests.cs
@@ -7,144 +7,140 @@ using System.Threading.Tasks;
 using NUnit.Framework;
 using Umbraco.Cms.Core.HealthChecks;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HealthChecks
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HealthChecks;
+
+[TestFixture]
+public class HealthCheckResultsTests
 {
-    [TestFixture]
-    public class HealthCheckResultsTests
+    [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A1", "Stub check")]
+    public abstract class StubHealthCheck : HealthCheck
     {
-        [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A1", "Stub check")]
-        public abstract class StubHealthCheck : HealthCheck
+        private readonly string _message;
+        private readonly StatusResultType _resultType;
+
+        public StubHealthCheck(StatusResultType resultType, string message)
         {
-            private readonly string _message;
-            private readonly StatusResultType _resultType;
-
-            public StubHealthCheck(StatusResultType resultType, string message)
-            {
-                _resultType = resultType;
-                _message = message;
-            }
-
-            public override HealthCheckStatus ExecuteAction(HealthCheckAction action) => throw new NotImplementedException();
-
-            public override async Task<IEnumerable<HealthCheckStatus>> GetStatus() =>
-                new List<HealthCheckStatus>
-                {
-                    new HealthCheckStatus(_message)
-                    {
-                        ResultType = _resultType
-                    }
-                };
+            _resultType = resultType;
+            _message = message;
         }
 
-        [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A1", "Stub check 1")]
-        public class StubHealthCheck1 : StubHealthCheck
+        public override HealthCheckStatus ExecuteAction(HealthCheckAction action) =>
+            throw new NotImplementedException();
+
+        public override async Task<IEnumerable<HealthCheckStatus>> GetStatus() =>
+            new List<HealthCheckStatus> { new(_message) { ResultType = _resultType } };
+    }
+
+    [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A1", "Stub check 1")]
+    public class StubHealthCheck1 : StubHealthCheck
+    {
+        public StubHealthCheck1(StatusResultType resultType, string message)
+            : base(resultType, message)
         {
-            public StubHealthCheck1(StatusResultType resultType, string message)
-                : base(resultType, message)
-            {
-            }
-        }
-
-        [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A2", "Stub check 2")]
-        public class StubHealthCheck2 : StubHealthCheck
-        {
-            public StubHealthCheck2(StatusResultType resultType, string message)
-                : base(resultType, message)
-            {
-            }
-        }
-
-        [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A3", "Stub check 3")]
-        public class StubHealthCheck3 : StubHealthCheck
-        {
-            public StubHealthCheck3(StatusResultType resultType, string message)
-                : base(resultType, message)
-            {
-            }
-
-            public override async Task<IEnumerable<HealthCheckStatus>> GetStatus() => throw new Exception("Check threw exception");
-        }
-
-        [Test]
-        public async Task HealthCheckResults_WithSuccessfulChecks_ReturnsCorrectResultDescription()
-        {
-            var checks = new List<HealthCheck>
-            {
-                new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
-                new StubHealthCheck2(StatusResultType.Success, "Second check was successful"),
-            };
-            var results = await HealthCheckResults.Create(checks);
-
-            Assert.IsTrue(results.AllChecksSuccessful);
-
-            var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' all completed successfully.") > -1);
-        }
-
-        [Test]
-        public async Task HealthCheckResults_WithFailingChecks_ReturnsCorrectResultDescription()
-        {
-            var checks = new List<HealthCheck>
-            {
-                new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
-                new StubHealthCheck2(StatusResultType.Error, "Second check was not successful"),
-            };
-            var results = await HealthCheckResults.Create(checks);
-
-            Assert.IsFalse(results.AllChecksSuccessful);
-
-            var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' completed with errors.") > -1);
-        }
-
-        [Test]
-        public async Task HealthCheckResults_WithErroringCheck_ReturnsCorrectResultDescription()
-        {
-            var checks = new List<HealthCheck>
-            {
-                new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
-                new StubHealthCheck3(StatusResultType.Error, "Third check was not successful"),
-                new StubHealthCheck2(StatusResultType.Error, "Second check was not successful"),
-            };
-            var results = await HealthCheckResults.Create(checks);
-
-            Assert.IsFalse(results.AllChecksSuccessful);
-
-            var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' completed with errors.") > -1);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 3' completed with errors.") > -1);
-        }
-
-        [Test]
-        public async Task HealthCheckResults_WithSummaryVerbosity_ReturnsCorrectResultDescription()
-        {
-            var checks = new List<HealthCheck>
-            {
-                new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
-                new StubHealthCheck2(StatusResultType.Success, "Second check was successful"),
-            };
-            var results = await HealthCheckResults.Create(checks);
-
-            var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success'" + Environment.NewLine) > -1);
-        }
-
-        [Test]
-        public async Task HealthCheckResults_WithDetailedVerbosity_ReturnsCorrectResultDescription()
-        {
-            var checks = new List<HealthCheck>
-            {
-                new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
-                new StubHealthCheck2(StatusResultType.Success, "Second check was successful"),
-            };
-            var results = await HealthCheckResults.Create(checks);
-
-            var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Detailed);
-            Assert.IsFalse(resultAsMarkdown.IndexOf("Result: 'Success'" + Environment.NewLine) > -1);
-            Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success', Message: 'First check was successful'" + Environment.NewLine) > -1);
         }
     }
+
+    [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A2", "Stub check 2")]
+    public class StubHealthCheck2 : StubHealthCheck
+    {
+        public StubHealthCheck2(StatusResultType resultType, string message)
+            : base(resultType, message)
+        {
+        }
+    }
+
+    [HealthCheck("CFD6FC34-59C9-4402-B55F-C8BC96B628A3", "Stub check 3")]
+    public class StubHealthCheck3 : StubHealthCheck
+    {
+        public StubHealthCheck3(StatusResultType resultType, string message)
+            : base(resultType, message)
+        {
+        }
+
+        public override async Task<IEnumerable<HealthCheckStatus>> GetStatus() =>
+            throw new Exception("Check threw exception");
+    }
+
+    [Test]
+    public async Task HealthCheckResults_WithSuccessfulChecks_ReturnsCorrectResultDescription()
+    {
+        var checks = new List<HealthCheck>
+        {
+            new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
+            new StubHealthCheck2(StatusResultType.Success, "Second check was successful"),
+        };
+        var results = await HealthCheckResults.Create(checks);
+
+        Assert.IsTrue(results.AllChecksSuccessful);
+
+        var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' all completed successfully.") > -1);
+    }
+
+    [Test]
+    public async Task HealthCheckResults_WithFailingChecks_ReturnsCorrectResultDescription()
+    {
+        var checks = new List<HealthCheck>
+        {
+            new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
+            new StubHealthCheck2(StatusResultType.Error, "Second check was not successful"),
+        };
+        var results = await HealthCheckResults.Create(checks);
+
+        Assert.IsFalse(results.AllChecksSuccessful);
+
+        var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' completed with errors.") > -1);
+    }
+
+    [Test]
+    public async Task HealthCheckResults_WithErroringCheck_ReturnsCorrectResultDescription()
+    {
+        var checks = new List<HealthCheck>
+        {
+            new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
+            new StubHealthCheck3(StatusResultType.Error, "Third check was not successful"),
+            new StubHealthCheck2(StatusResultType.Error, "Second check was not successful"),
+        };
+        var results = await HealthCheckResults.Create(checks);
+
+        Assert.IsFalse(results.AllChecksSuccessful);
+
+        var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 1' all completed successfully.") > -1);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 2' completed with errors.") > -1);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Checks for 'Stub check 3' completed with errors.") > -1);
+    }
+
+    [Test]
+    public async Task HealthCheckResults_WithSummaryVerbosity_ReturnsCorrectResultDescription()
+    {
+        var checks = new List<HealthCheck>
+        {
+            new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
+            new StubHealthCheck2(StatusResultType.Success, "Second check was successful"),
+        };
+        var results = await HealthCheckResults.Create(checks);
+
+        var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Summary);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success'" + Environment.NewLine) > -1);
+    }
+
+    [Test]
+    public async Task HealthCheckResults_WithDetailedVerbosity_ReturnsCorrectResultDescription()
+    {
+        var checks = new List<HealthCheck>
+        {
+            new StubHealthCheck1(StatusResultType.Success, "First check was successful"),
+            new StubHealthCheck2(StatusResultType.Success, "Second check was successful"),
+        };
+        var results = await HealthCheckResults.Create(checks);
+
+        var resultAsMarkdown = results.ResultsAsMarkDown(HealthCheckNotificationVerbosity.Detailed);
+        Assert.IsFalse(resultAsMarkdown.IndexOf("Result: 'Success'" + Environment.NewLine) > -1);
+        Assert.IsTrue(resultAsMarkdown.IndexOf("Result: 'Success', Message: 'First check was successful'" +
+                                               Environment.NewLine) > -1);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs
index b60eb9891d..86ad79fbee 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/HealthCheckNotifierTests.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
@@ -16,178 +15,175 @@ using Umbraco.Cms.Core.HealthChecks;
 using Umbraco.Cms.Core.HealthChecks.NotificationMethods;
 using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Runtime;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.HostedServices;
+using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices;
+
+[TestFixture]
+public class HealthCheckNotifierTests
 {
-    [TestFixture]
-    public class HealthCheckNotifierTests
+    private Mock<IHealthCheckNotificationMethod> _mockNotificationMethod;
+
+    private const string Check1Id = "00000000-0000-0000-0000-000000000001";
+    private const string Check2Id = "00000000-0000-0000-0000-000000000002";
+    private const string Check3Id = "00000000-0000-0000-0000-000000000003";
+
+    [Test]
+    public async Task Does_Not_Execute_When_Not_Enabled()
     {
-        private Mock<IHealthCheckNotificationMethod> _mockNotificationMethod;
+        var sut = CreateHealthCheckNotifier(false);
+        await sut.PerformExecuteAsync(null);
+        VerifyNotificationsNotSent();
+    }
 
-        private const string Check1Id = "00000000-0000-0000-0000-000000000001";
-        private const string Check2Id = "00000000-0000-0000-0000-000000000002";
-        private const string Check3Id = "00000000-0000-0000-0000-000000000003";
+    [TestCase(RuntimeLevel.Boot)]
+    [TestCase(RuntimeLevel.Install)]
+    [TestCase(RuntimeLevel.Unknown)]
+    [TestCase(RuntimeLevel.Upgrade)]
+    [TestCase(RuntimeLevel.BootFailed)]
+    public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
+    {
+        var sut = CreateHealthCheckNotifier(runtimeLevel: runtimeLevel);
+        await sut.PerformExecuteAsync(null);
+        VerifyNotificationsNotSent();
+    }
 
-        [Test]
-        public async Task Does_Not_Execute_When_Not_Enabled()
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
+    {
+        var sut = CreateHealthCheckNotifier(serverRole: ServerRole.Subscriber);
+        await sut.PerformExecuteAsync(null);
+        VerifyNotificationsNotSent();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
+    {
+        var sut = CreateHealthCheckNotifier(serverRole: ServerRole.Unknown);
+        await sut.PerformExecuteAsync(null);
+        VerifyNotificationsNotSent();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Not_Main_Dom()
+    {
+        var sut = CreateHealthCheckNotifier(isMainDom: false);
+        await sut.PerformExecuteAsync(null);
+        VerifyNotificationsNotSent();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_With_No_Enabled_Notification_Methods()
+    {
+        var sut = CreateHealthCheckNotifier(notificationEnabled: false);
+        await sut.PerformExecuteAsync(null);
+        VerifyNotificationsNotSent();
+    }
+
+    [Test]
+    public async Task Executes_With_Enabled_Notification_Methods()
+    {
+        var sut = CreateHealthCheckNotifier();
+        await sut.PerformExecuteAsync(null);
+        VerifyNotificationsSent();
+    }
+
+    [Test]
+    public async Task Executes_Only_Enabled_Checks()
+    {
+        var sut = CreateHealthCheckNotifier();
+        await sut.PerformExecuteAsync(null);
+        _mockNotificationMethod.Verify(
+            x => x.SendAsync(
+                It.Is<HealthCheckResults>(y =>
+                    y.ResultsAsDictionary.Count == 1 && y.ResultsAsDictionary.ContainsKey("Check1"))),
+            Times.Once);
+    }
+
+    private HealthCheckNotifier CreateHealthCheckNotifier(
+        bool enabled = true,
+        RuntimeLevel runtimeLevel = RuntimeLevel.Run,
+        ServerRole serverRole = ServerRole.Single,
+        bool isMainDom = true,
+        bool notificationEnabled = true)
+    {
+        var settings = new HealthChecksSettings
         {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier(enabled: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyNotificationsNotSent();
-        }
-
-        [TestCase(RuntimeLevel.Boot)]
-        [TestCase(RuntimeLevel.Install)]
-        [TestCase(RuntimeLevel.Unknown)]
-        [TestCase(RuntimeLevel.Upgrade)]
-        [TestCase(RuntimeLevel.BootFailed)]
-        public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
-        {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier(runtimeLevel: runtimeLevel);
-            await sut.PerformExecuteAsync(null);
-            VerifyNotificationsNotSent();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
-        {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier(serverRole: ServerRole.Subscriber);
-            await sut.PerformExecuteAsync(null);
-            VerifyNotificationsNotSent();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
-        {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier(serverRole: ServerRole.Unknown);
-            await sut.PerformExecuteAsync(null);
-            VerifyNotificationsNotSent();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Not_Main_Dom()
-        {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier(isMainDom: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyNotificationsNotSent();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_With_No_Enabled_Notification_Methods()
-        {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier(notificationEnabled: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyNotificationsNotSent();
-        }
-
-        [Test]
-        public async Task Executes_With_Enabled_Notification_Methods()
-        {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier();
-            await sut.PerformExecuteAsync(null);
-            VerifyNotificationsSent();
-        }
-
-        [Test]
-        public async Task Executes_Only_Enabled_Checks()
-        {
-            HealthCheckNotifier sut = CreateHealthCheckNotifier();
-            await sut.PerformExecuteAsync(null);
-            _mockNotificationMethod.Verify(
-                x => x.SendAsync(
-                    It.Is<HealthCheckResults>(y => y.ResultsAsDictionary.Count == 1 && y.ResultsAsDictionary.ContainsKey("Check1"))), Times.Once);
-        }
-
-        private HealthCheckNotifier CreateHealthCheckNotifier(
-            bool enabled = true,
-            RuntimeLevel runtimeLevel = RuntimeLevel.Run,
-            ServerRole serverRole = ServerRole.Single,
-            bool isMainDom = true,
-            bool notificationEnabled = true)
-        {
-            var settings = new HealthChecksSettings
+            Notification = new HealthChecksNotificationSettings
             {
-                Notification = new HealthChecksNotificationSettings
-                {
-                    Enabled = enabled,
-                    DisabledChecks = new List<DisabledHealthCheckSettings>
-                {
-                    new DisabledHealthCheckSettings { Id = Guid.Parse(Check3Id) }
-                }
-                },
-                DisabledChecks = new List<DisabledHealthCheckSettings>
-                {
-                    new DisabledHealthCheckSettings { Id = Guid.Parse(Check2Id) }
-                }
-            };
-            var checks = new HealthCheckCollection(() => new List<HealthCheck>
-            {
-                new TestHealthCheck1(),
-                new TestHealthCheck2(),
-                new TestHealthCheck3(),
-            });
-
-            _mockNotificationMethod = new Mock<IHealthCheckNotificationMethod>();
-            _mockNotificationMethod.SetupGet(x => x.Enabled).Returns(notificationEnabled);
-            var notifications = new HealthCheckNotificationMethodCollection(() => new List<IHealthCheckNotificationMethod> { _mockNotificationMethod.Object });
-
-            var mockRunTimeState = new Mock<IRuntimeState>();
-            mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
-
-            var mockServerRegistrar = new Mock<IServerRoleAccessor>();
-            mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
-
-            var mockMainDom = new Mock<IMainDom>();
-            mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
-
-            var mockScopeProvider = new Mock<global::Umbraco.Cms.Infrastructure.Scoping.IScopeProvider>();
-            var mockLogger = new Mock<ILogger<HealthCheckNotifier>>();
-            var mockProfilingLogger = new Mock<IProfilingLogger>();
-
-            return new HealthCheckNotifier(
-                new TestOptionsMonitor<HealthChecksSettings>(settings),
-                checks,
-                notifications,
-                mockRunTimeState.Object,
-                mockServerRegistrar.Object,
-                mockMainDom.Object,
-                mockScopeProvider.Object,
-                mockLogger.Object,
-                mockProfilingLogger.Object,
-                Mock.Of<ICronTabParser>());
-        }
-
-        private void VerifyNotificationsNotSent() => VerifyNotificationsSentTimes(Times.Never());
-
-        private void VerifyNotificationsSent() => VerifyNotificationsSentTimes(Times.Once());
-
-        private void VerifyNotificationsSentTimes(Times times) => _mockNotificationMethod.Verify(x => x.SendAsync(It.IsAny<HealthCheckResults>()), times);
-
-        [HealthCheck(Check1Id, "Check1")]
-        private class TestHealthCheck1 : TestHealthCheck
+                Enabled = enabled,
+                DisabledChecks = new List<DisabledHealthCheckSettings> { new() { Id = Guid.Parse(Check3Id) } },
+            },
+            DisabledChecks = new List<DisabledHealthCheckSettings> { new() { Id = Guid.Parse(Check2Id) } },
+        };
+        var checks = new HealthCheckCollection(() => new List<HealthCheck>
         {
-        }
+            new TestHealthCheck1(),
+            new TestHealthCheck2(),
+            new TestHealthCheck3(),
+        });
 
-        [HealthCheck(Check2Id, "Check2")]
-        private class TestHealthCheck2 : TestHealthCheck
-        {
-        }
+        _mockNotificationMethod = new Mock<IHealthCheckNotificationMethod>();
+        _mockNotificationMethod.SetupGet(x => x.Enabled).Returns(notificationEnabled);
+        var notifications = new HealthCheckNotificationMethodCollection(() =>
+            new List<IHealthCheckNotificationMethod> { _mockNotificationMethod.Object });
 
-        [HealthCheck(Check3Id, "Check3")]
-        private class TestHealthCheck3 : TestHealthCheck
-        {
-        }
+        var mockRunTimeState = new Mock<IRuntimeState>();
+        mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
 
-        private class TestHealthCheck : HealthCheck
-        {
-            public override HealthCheckStatus ExecuteAction(HealthCheckAction action) => new HealthCheckStatus("Check message");
+        var mockServerRegistrar = new Mock<IServerRoleAccessor>();
+        mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
 
-            public override async Task<IEnumerable<HealthCheckStatus>> GetStatus() => Enumerable.Empty<HealthCheckStatus>();
-        }
+        var mockMainDom = new Mock<IMainDom>();
+        mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
+
+        var mockScopeProvider = new Mock<IScopeProvider>();
+        var mockLogger = new Mock<ILogger<HealthCheckNotifier>>();
+        var mockProfilingLogger = new Mock<IProfilingLogger>();
+
+        return new HealthCheckNotifier(
+            new TestOptionsMonitor<HealthChecksSettings>(settings),
+            checks,
+            notifications,
+            mockRunTimeState.Object,
+            mockServerRegistrar.Object,
+            mockMainDom.Object,
+            mockScopeProvider.Object,
+            mockLogger.Object,
+            mockProfilingLogger.Object,
+            Mock.Of<ICronTabParser>());
+    }
+
+    private void VerifyNotificationsNotSent() => VerifyNotificationsSentTimes(Times.Never());
+
+    private void VerifyNotificationsSent() => VerifyNotificationsSentTimes(Times.Once());
+
+    private void VerifyNotificationsSentTimes(Times times) =>
+        _mockNotificationMethod.Verify(x => x.SendAsync(It.IsAny<HealthCheckResults>()), times);
+
+    [HealthCheck(Check1Id, "Check1")]
+    private class TestHealthCheck1 : TestHealthCheck
+    {
+    }
+
+    [HealthCheck(Check2Id, "Check2")]
+    private class TestHealthCheck2 : TestHealthCheck
+    {
+    }
+
+    [HealthCheck(Check3Id, "Check3")]
+    private class TestHealthCheck3 : TestHealthCheck
+    {
+    }
+
+    private class TestHealthCheck : HealthCheck
+    {
+        public override HealthCheckStatus ExecuteAction(HealthCheckAction action) => new("Check message");
+
+        public override async Task<IEnumerable<HealthCheckStatus>> GetStatus() => Enumerable.Empty<HealthCheckStatus>();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs
index d8efc0445c..09421bdd81 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/KeepAliveTests.cs
@@ -7,7 +7,6 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Moq;
 using Moq.Protected;
 using NUnit.Framework;
@@ -20,111 +19,109 @@ using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.HostedServices;
 using Umbraco.Cms.Tests.Common;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices;
+
+[TestFixture]
+public class KeepAliveTests
 {
-    [TestFixture]
-    public class KeepAliveTests
+    private Mock<HttpMessageHandler> _mockHttpMessageHandler;
+
+    private const string ApplicationUrl = "https://mysite.com";
+
+    [Test]
+    public async Task Does_Not_Execute_When_Not_Enabled()
     {
-        private Mock<HttpMessageHandler> _mockHttpMessageHandler;
-
-        private const string ApplicationUrl = "https://mysite.com";
-
-        [Test]
-        public async Task Does_Not_Execute_When_Not_Enabled()
-        {
-            KeepAlive sut = CreateKeepAlive(enabled: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyKeepAliveRequestNotSent();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
-        {
-            KeepAlive sut = CreateKeepAlive(serverRole: ServerRole.Subscriber);
-            await sut.PerformExecuteAsync(null);
-            VerifyKeepAliveRequestNotSent();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
-        {
-            KeepAlive sut = CreateKeepAlive(serverRole: ServerRole.Unknown);
-            await sut.PerformExecuteAsync(null);
-            VerifyKeepAliveRequestNotSent();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Not_Main_Dom()
-        {
-            KeepAlive sut = CreateKeepAlive(isMainDom: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyKeepAliveRequestNotSent();
-        }
-
-        [Test]
-        public async Task Executes_And_Calls_Ping_Url()
-        {
-            KeepAlive sut = CreateKeepAlive();
-            await sut.PerformExecuteAsync(null);
-            VerifyKeepAliveRequestSent();
-        }
-
-        private KeepAlive CreateKeepAlive(
-            bool enabled = true,
-            ServerRole serverRole = ServerRole.Single,
-            bool isMainDom = true)
-        {
-            var settings = new KeepAliveSettings
-            {
-                DisableKeepAliveTask = !enabled,
-            };
-
-            var mockHostingEnvironment = new Mock<IHostingEnvironment>();
-            mockHostingEnvironment.SetupGet(x => x.ApplicationMainUrl).Returns(new Uri(ApplicationUrl));
-            mockHostingEnvironment.Setup(x => x.ToAbsolute(It.IsAny<string>()))
-                .Returns((string s) => s.TrimStart('~'));
-
-            var mockServerRegistrar = new Mock<IServerRoleAccessor>();
-            mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
-
-            var mockMainDom = new Mock<IMainDom>();
-            mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
-
-            var mockScopeProvider = new Mock<IScopeProvider>();
-            var mockLogger = new Mock<ILogger<KeepAlive>>();
-            var mockProfilingLogger = new Mock<IProfilingLogger>();
-
-            _mockHttpMessageHandler = new Mock<HttpMessageHandler>();
-            _mockHttpMessageHandler.Protected()
-                .Setup<Task<HttpResponseMessage>>("SendAsync", ItExpr.IsAny<HttpRequestMessage>(), ItExpr.IsAny<CancellationToken>())
-                .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK))
-                .Verifiable();
-            _mockHttpMessageHandler.As<IDisposable>().Setup(s => s.Dispose());
-            var httpClient = new HttpClient(_mockHttpMessageHandler.Object);
-
-            var mockHttpClientFactory = new Mock<IHttpClientFactory>(MockBehavior.Strict);
-            mockHttpClientFactory.Setup(x => x.CreateClient(It.IsAny<string>())).Returns(httpClient);
-
-            return new KeepAlive(
-                mockHostingEnvironment.Object,
-                mockMainDom.Object,
-
-                new TestOptionsMonitor<KeepAliveSettings>(settings),
-                mockLogger.Object,
-                mockProfilingLogger.Object,
-                mockServerRegistrar.Object,
-                mockHttpClientFactory.Object);
-        }
-
-        private void VerifyKeepAliveRequestNotSent() => VerifyKeepAliveRequestSentTimes(Times.Never());
-
-        private void VerifyKeepAliveRequestSent() => VerifyKeepAliveRequestSentTimes(Times.Once());
-
-        private void VerifyKeepAliveRequestSentTimes(Times times) => _mockHttpMessageHandler.Protected()
-            .Verify(
-                "SendAsync",
-                times,
-                ItExpr.Is<HttpRequestMessage>(x => x.RequestUri.ToString() == $"{ApplicationUrl}/api/keepalive/ping"),
-                ItExpr.IsAny<CancellationToken>());
+        var sut = CreateKeepAlive(false);
+        await sut.PerformExecuteAsync(null);
+        VerifyKeepAliveRequestNotSent();
     }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
+    {
+        var sut = CreateKeepAlive(serverRole: ServerRole.Subscriber);
+        await sut.PerformExecuteAsync(null);
+        VerifyKeepAliveRequestNotSent();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
+    {
+        var sut = CreateKeepAlive(serverRole: ServerRole.Unknown);
+        await sut.PerformExecuteAsync(null);
+        VerifyKeepAliveRequestNotSent();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Not_Main_Dom()
+    {
+        var sut = CreateKeepAlive(isMainDom: false);
+        await sut.PerformExecuteAsync(null);
+        VerifyKeepAliveRequestNotSent();
+    }
+
+    [Test]
+    public async Task Executes_And_Calls_Ping_Url()
+    {
+        var sut = CreateKeepAlive();
+        await sut.PerformExecuteAsync(null);
+        VerifyKeepAliveRequestSent();
+    }
+
+    private KeepAlive CreateKeepAlive(
+        bool enabled = true,
+        ServerRole serverRole = ServerRole.Single,
+        bool isMainDom = true)
+    {
+        var settings = new KeepAliveSettings { DisableKeepAliveTask = !enabled };
+
+        var mockHostingEnvironment = new Mock<IHostingEnvironment>();
+        mockHostingEnvironment.SetupGet(x => x.ApplicationMainUrl).Returns(new Uri(ApplicationUrl));
+        mockHostingEnvironment.Setup(x => x.ToAbsolute(It.IsAny<string>()))
+            .Returns((string s) => s.TrimStart('~'));
+
+        var mockServerRegistrar = new Mock<IServerRoleAccessor>();
+        mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
+
+        var mockMainDom = new Mock<IMainDom>();
+        mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
+
+        var mockScopeProvider = new Mock<IScopeProvider>();
+        var mockLogger = new Mock<ILogger<KeepAlive>>();
+        var mockProfilingLogger = new Mock<IProfilingLogger>();
+
+        _mockHttpMessageHandler = new Mock<HttpMessageHandler>();
+        _mockHttpMessageHandler.Protected()
+            .Setup<Task<HttpResponseMessage>>(
+                "SendAsync",
+                ItExpr.IsAny<HttpRequestMessage>(),
+                ItExpr.IsAny<CancellationToken>())
+            .ReturnsAsync(new HttpResponseMessage(HttpStatusCode.OK))
+            .Verifiable();
+        _mockHttpMessageHandler.As<IDisposable>().Setup(s => s.Dispose());
+        var httpClient = new HttpClient(_mockHttpMessageHandler.Object);
+
+        var mockHttpClientFactory = new Mock<IHttpClientFactory>(MockBehavior.Strict);
+        mockHttpClientFactory.Setup(x => x.CreateClient(It.IsAny<string>())).Returns(httpClient);
+
+        return new KeepAlive(
+            mockHostingEnvironment.Object,
+            mockMainDom.Object,
+            new TestOptionsMonitor<KeepAliveSettings>(settings),
+            mockLogger.Object,
+            mockProfilingLogger.Object,
+            mockServerRegistrar.Object,
+            mockHttpClientFactory.Object);
+    }
+
+    private void VerifyKeepAliveRequestNotSent() => VerifyKeepAliveRequestSentTimes(Times.Never());
+
+    private void VerifyKeepAliveRequestSent() => VerifyKeepAliveRequestSentTimes(Times.Once());
+
+    private void VerifyKeepAliveRequestSentTimes(Times times) => _mockHttpMessageHandler.Protected()
+        .Verify(
+            "SendAsync",
+            times,
+            ItExpr.Is<HttpRequestMessage>(x => x.RequestUri.ToString() == $"{ApplicationUrl}/api/keepalive/ping"),
+            ItExpr.IsAny<CancellationToken>());
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs
index eae96be4ee..4e67e2952f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/LogScrubberTests.cs
@@ -5,7 +5,6 @@ using System;
 using System.Data;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -18,86 +17,90 @@ using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.HostedServices;
 using Umbraco.Cms.Tests.Common;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices;
+
+[TestFixture]
+public class LogScrubberTests
 {
-    [TestFixture]
-    public class LogScrubberTests
+    private Mock<IAuditService> _mockAuditService;
+
+    private const int MaxLogAgeInMinutes = 60;
+
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
     {
-        private Mock<IAuditService> _mockAuditService;
-
-        private const int MaxLogAgeInMinutes = 60;
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
-        {
-            LogScrubber sut = CreateLogScrubber(serverRole: ServerRole.Subscriber);
-            await sut.PerformExecuteAsync(null);
-            VerifyLogsNotScrubbed();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
-        {
-            LogScrubber sut = CreateLogScrubber(serverRole: ServerRole.Unknown);
-            await sut.PerformExecuteAsync(null);
-            VerifyLogsNotScrubbed();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Not_Main_Dom()
-        {
-            LogScrubber sut = CreateLogScrubber(isMainDom: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyLogsNotScrubbed();
-        }
-
-        [Test]
-        public async Task Executes_And_Scrubs_Logs()
-        {
-            LogScrubber sut = CreateLogScrubber();
-            await sut.PerformExecuteAsync(null);
-            VerifyLogsScrubbed();
-        }
-
-        private LogScrubber CreateLogScrubber(
-            ServerRole serverRole = ServerRole.Single,
-            bool isMainDom = true)
-        {
-            var settings = new LoggingSettings
-            {
-                MaxLogAge = TimeSpan.FromMinutes(MaxLogAgeInMinutes),
-            };
-
-            var mockServerRegistrar = new Mock<IServerRoleAccessor>();
-            mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
-
-            var mockMainDom = new Mock<IMainDom>();
-            mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
-
-            var mockScope = new Mock<IScope>();
-            var mockScopeProvider = new Mock<ICoreScopeProvider>();
-            mockScopeProvider
-                .Setup(x => x.CreateCoreScope(It.IsAny<IsolationLevel>(), It.IsAny<RepositoryCacheMode>(), It.IsAny<IEventDispatcher>(), It.IsAny<IScopedNotificationPublisher>(), It.IsAny<bool?>(), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(mockScope.Object);
-            var mockLogger = new Mock<ILogger<LogScrubber>>();
-            var mockProfilingLogger = new Mock<IProfilingLogger>();
-
-            _mockAuditService = new Mock<IAuditService>();
-
-            return new LogScrubber(
-                mockMainDom.Object,
-                mockServerRegistrar.Object,
-                _mockAuditService.Object,
-                new TestOptionsMonitor<LoggingSettings>(settings),
-                mockScopeProvider.Object,
-                mockLogger.Object,
-                mockProfilingLogger.Object);
-        }
-
-        private void VerifyLogsNotScrubbed() => VerifyLogsScrubbed(Times.Never());
-
-        private void VerifyLogsScrubbed() => VerifyLogsScrubbed(Times.Once());
-
-        private void VerifyLogsScrubbed(Times times) => _mockAuditService.Verify(x => x.CleanLogs(It.Is<int>(y => y == MaxLogAgeInMinutes)), times);
+        var sut = CreateLogScrubber(ServerRole.Subscriber);
+        await sut.PerformExecuteAsync(null);
+        VerifyLogsNotScrubbed();
     }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
+    {
+        var sut = CreateLogScrubber(ServerRole.Unknown);
+        await sut.PerformExecuteAsync(null);
+        VerifyLogsNotScrubbed();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Not_Main_Dom()
+    {
+        var sut = CreateLogScrubber(isMainDom: false);
+        await sut.PerformExecuteAsync(null);
+        VerifyLogsNotScrubbed();
+    }
+
+    [Test]
+    public async Task Executes_And_Scrubs_Logs()
+    {
+        var sut = CreateLogScrubber();
+        await sut.PerformExecuteAsync(null);
+        VerifyLogsScrubbed();
+    }
+
+    private LogScrubber CreateLogScrubber(
+        ServerRole serverRole = ServerRole.Single,
+        bool isMainDom = true)
+    {
+        var settings = new LoggingSettings { MaxLogAge = TimeSpan.FromMinutes(MaxLogAgeInMinutes) };
+
+        var mockServerRegistrar = new Mock<IServerRoleAccessor>();
+        mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
+
+        var mockMainDom = new Mock<IMainDom>();
+        mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
+
+        var mockScope = new Mock<IScope>();
+        var mockScopeProvider = new Mock<ICoreScopeProvider>();
+        mockScopeProvider
+            .Setup(x => x.CreateCoreScope(
+                It.IsAny<IsolationLevel>(),
+                It.IsAny<RepositoryCacheMode>(),
+                It.IsAny<IEventDispatcher>(),
+                It.IsAny<IScopedNotificationPublisher>(),
+                It.IsAny<bool?>(),
+                It.IsAny<bool>(),
+                It.IsAny<bool>()))
+            .Returns(mockScope.Object);
+        var mockLogger = new Mock<ILogger<LogScrubber>>();
+        var mockProfilingLogger = new Mock<IProfilingLogger>();
+
+        _mockAuditService = new Mock<IAuditService>();
+
+        return new LogScrubber(
+            mockMainDom.Object,
+            mockServerRegistrar.Object,
+            _mockAuditService.Object,
+            new TestOptionsMonitor<LoggingSettings>(settings),
+            mockScopeProvider.Object,
+            mockLogger.Object,
+            mockProfilingLogger.Object);
+    }
+
+    private void VerifyLogsNotScrubbed() => VerifyLogsScrubbed(Times.Never());
+
+    private void VerifyLogsScrubbed() => VerifyLogsScrubbed(Times.Once());
+
+    private void VerifyLogsScrubbed(Times times) =>
+        _mockAuditService.Verify(x => x.CleanLogs(It.Is<int>(y => y == MaxLogAgeInMinutes)), times);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs
index 12e5c22fd8..b0a5c865e5 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ScheduledPublishingTests.cs
@@ -11,126 +11,133 @@ using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Core.Scoping;
-using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.Web;
 using Umbraco.Cms.Infrastructure;
 using Umbraco.Cms.Infrastructure.HostedServices;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices;
+
+[TestFixture]
+public class ScheduledPublishingTests
 {
-    [TestFixture]
-    public class ScheduledPublishingTests
+    private Mock<IContentService> _mockContentService;
+    private Mock<ILogger<ScheduledPublishing>> _mockLogger;
+
+    [Test]
+    public async Task Does_Not_Execute_When_Not_Enabled()
     {
-        private Mock<IContentService> _mockContentService;
-        private Mock<ILogger<ScheduledPublishing>> _mockLogger;
-
-        [Test]
-        public async Task Does_Not_Execute_When_Not_Enabled()
-        {
-            ScheduledPublishing sut = CreateScheduledPublishing(enabled: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyScheduledPublishingNotPerformed();
-        }
-
-        [TestCase(RuntimeLevel.Boot)]
-        [TestCase(RuntimeLevel.Install)]
-        [TestCase(RuntimeLevel.Unknown)]
-        [TestCase(RuntimeLevel.Upgrade)]
-        [TestCase(RuntimeLevel.BootFailed)]
-        public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
-        {
-            ScheduledPublishing sut = CreateScheduledPublishing(runtimeLevel: runtimeLevel);
-            await sut.PerformExecuteAsync(null);
-            VerifyScheduledPublishingNotPerformed();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
-        {
-            ScheduledPublishing sut = CreateScheduledPublishing(serverRole: ServerRole.Subscriber);
-            await sut.PerformExecuteAsync(null);
-            VerifyScheduledPublishingNotPerformed();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
-        {
-            ScheduledPublishing sut = CreateScheduledPublishing(serverRole: ServerRole.Unknown);
-            await sut.PerformExecuteAsync(null);
-            VerifyScheduledPublishingNotPerformed();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Not_Main_Dom()
-        {
-            ScheduledPublishing sut = CreateScheduledPublishing(isMainDom: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyScheduledPublishingNotPerformed();
-        }
-
-        [Test]
-        public async Task Executes_And_Performs_Scheduled_Publishing()
-        {
-            ScheduledPublishing sut = CreateScheduledPublishing();
-            await sut.PerformExecuteAsync(null);
-            VerifyScheduledPublishingPerformed();
-        }
-
-        private ScheduledPublishing CreateScheduledPublishing(
-            bool enabled = true,
-            RuntimeLevel runtimeLevel = RuntimeLevel.Run,
-            ServerRole serverRole = ServerRole.Single,
-            bool isMainDom = true)
-        {
-            if (enabled)
-            {
-                Suspendable.ScheduledPublishing.Resume();
-            }
-            else
-            {
-                Suspendable.ScheduledPublishing.Suspend();
-            }
-
-            var mockRunTimeState = new Mock<IRuntimeState>();
-            mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
-
-            var mockServerRegistrar = new Mock<IServerRoleAccessor>();
-            mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
-
-            var mockMainDom = new Mock<IMainDom>();
-            mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
-
-            _mockContentService = new Mock<IContentService>();
-
-            var mockUmbracoContextFactory = new Mock<IUmbracoContextFactory>();
-            mockUmbracoContextFactory.Setup(x => x.EnsureUmbracoContext()).Returns(new UmbracoContextReference(null, false, null));
-
-            _mockLogger = new Mock<ILogger<ScheduledPublishing>>();
-
-            var mockServerMessenger = new Mock<IServerMessenger>();
-
-            var mockScopeProvider = new Mock<ICoreScopeProvider>();
-            mockScopeProvider
-                .Setup(x => x.CreateCoreScope(It.IsAny<IsolationLevel>(), It.IsAny<RepositoryCacheMode>(), It.IsAny<IEventDispatcher>(), It.IsAny<IScopedNotificationPublisher>(), It.IsAny<bool?>(), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(Mock.Of<IScope>());
-
-            return new ScheduledPublishing(
-                mockRunTimeState.Object,
-                mockMainDom.Object,
-                mockServerRegistrar.Object,
-                _mockContentService.Object,
-                mockUmbracoContextFactory.Object,
-                _mockLogger.Object,
-                mockServerMessenger.Object,
-                mockScopeProvider.Object);
-        }
-
-        private void VerifyScheduledPublishingNotPerformed() => VerifyScheduledPublishingPerformed(Times.Never());
-
-        private void VerifyScheduledPublishingPerformed() => VerifyScheduledPublishingPerformed(Times.Once());
-
-        private void VerifyScheduledPublishingPerformed(Times times) => _mockContentService.Verify(x => x.PerformScheduledPublish(It.IsAny<DateTime>()), times);
+        var sut = CreateScheduledPublishing(false);
+        await sut.PerformExecuteAsync(null);
+        VerifyScheduledPublishingNotPerformed();
     }
+
+    [TestCase(RuntimeLevel.Boot)]
+    [TestCase(RuntimeLevel.Install)]
+    [TestCase(RuntimeLevel.Unknown)]
+    [TestCase(RuntimeLevel.Upgrade)]
+    [TestCase(RuntimeLevel.BootFailed)]
+    public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
+    {
+        var sut = CreateScheduledPublishing(runtimeLevel: runtimeLevel);
+        await sut.PerformExecuteAsync(null);
+        VerifyScheduledPublishingNotPerformed();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Subscriber()
+    {
+        var sut = CreateScheduledPublishing(serverRole: ServerRole.Subscriber);
+        await sut.PerformExecuteAsync(null);
+        VerifyScheduledPublishingNotPerformed();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Server_Role_Is_Unknown()
+    {
+        var sut = CreateScheduledPublishing(serverRole: ServerRole.Unknown);
+        await sut.PerformExecuteAsync(null);
+        VerifyScheduledPublishingNotPerformed();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Not_Main_Dom()
+    {
+        var sut = CreateScheduledPublishing(isMainDom: false);
+        await sut.PerformExecuteAsync(null);
+        VerifyScheduledPublishingNotPerformed();
+    }
+
+    [Test]
+    public async Task Executes_And_Performs_Scheduled_Publishing()
+    {
+        var sut = CreateScheduledPublishing();
+        await sut.PerformExecuteAsync(null);
+        VerifyScheduledPublishingPerformed();
+    }
+
+    private ScheduledPublishing CreateScheduledPublishing(
+        bool enabled = true,
+        RuntimeLevel runtimeLevel = RuntimeLevel.Run,
+        ServerRole serverRole = ServerRole.Single,
+        bool isMainDom = true)
+    {
+        if (enabled)
+        {
+            Suspendable.ScheduledPublishing.Resume();
+        }
+        else
+        {
+            Suspendable.ScheduledPublishing.Suspend();
+        }
+
+        var mockRunTimeState = new Mock<IRuntimeState>();
+        mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
+
+        var mockServerRegistrar = new Mock<IServerRoleAccessor>();
+        mockServerRegistrar.Setup(x => x.CurrentServerRole).Returns(serverRole);
+
+        var mockMainDom = new Mock<IMainDom>();
+        mockMainDom.SetupGet(x => x.IsMainDom).Returns(isMainDom);
+
+        _mockContentService = new Mock<IContentService>();
+
+        var mockUmbracoContextFactory = new Mock<IUmbracoContextFactory>();
+        mockUmbracoContextFactory.Setup(x => x.EnsureUmbracoContext())
+            .Returns(new UmbracoContextReference(null, false, null));
+
+        _mockLogger = new Mock<ILogger<ScheduledPublishing>>();
+
+        var mockServerMessenger = new Mock<IServerMessenger>();
+
+        var mockScopeProvider = new Mock<ICoreScopeProvider>();
+        mockScopeProvider
+            .Setup(x => x.CreateCoreScope(
+                It.IsAny<IsolationLevel>(),
+                It.IsAny<RepositoryCacheMode>(),
+                It.IsAny<IEventDispatcher>(),
+                It.IsAny<IScopedNotificationPublisher>(),
+                It.IsAny<bool?>(),
+                It.IsAny<bool>(),
+                It.IsAny<bool>()))
+            .Returns(Mock.Of<IScope>());
+
+        return new ScheduledPublishing(
+            mockRunTimeState.Object,
+            mockMainDom.Object,
+            mockServerRegistrar.Object,
+            _mockContentService.Object,
+            mockUmbracoContextFactory.Object,
+            _mockLogger.Object,
+            mockServerMessenger.Object,
+            mockScopeProvider.Object);
+    }
+
+    private void VerifyScheduledPublishingNotPerformed() => VerifyScheduledPublishingPerformed(Times.Never());
+
+    private void VerifyScheduledPublishingPerformed() => VerifyScheduledPublishingPerformed(Times.Once());
+
+    private void VerifyScheduledPublishingPerformed(Times times) =>
+        _mockContentService.Verify(x => x.PerformScheduledPublish(It.IsAny<DateTime>()), times);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs
index 096eef5f33..fd24d60019 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/InstructionProcessTaskTests.cs
@@ -12,51 +12,54 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.HostedServices.ServerRegistration;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration;
+
+[TestFixture]
+public class InstructionProcessTaskTests
 {
-    [TestFixture]
-    public class InstructionProcessTaskTests
+    private Mock<IServerMessenger> _mockDatabaseServerMessenger;
+
+    [TestCase(RuntimeLevel.Boot)]
+    [TestCase(RuntimeLevel.Install)]
+    [TestCase(RuntimeLevel.Unknown)]
+    [TestCase(RuntimeLevel.Upgrade)]
+    [TestCase(RuntimeLevel.BootFailed)]
+    public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
     {
-        private Mock<IServerMessenger> _mockDatabaseServerMessenger;
-
-        [TestCase(RuntimeLevel.Boot)]
-        [TestCase(RuntimeLevel.Install)]
-        [TestCase(RuntimeLevel.Unknown)]
-        [TestCase(RuntimeLevel.Upgrade)]
-        [TestCase(RuntimeLevel.BootFailed)]
-        public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
-        {
-            InstructionProcessTask sut = CreateInstructionProcessTask(runtimeLevel: runtimeLevel);
-            await sut.PerformExecuteAsync(null);
-            VerifyMessengerNotSynced();
-        }
-
-        [Test]
-        public async Task Executes_And_Touches_Server()
-        {
-            InstructionProcessTask sut = CreateInstructionProcessTask();
-            await sut.PerformExecuteAsync(null);
-            VerifyMessengerSynced();
-        }
-
-        private InstructionProcessTask CreateInstructionProcessTask(RuntimeLevel runtimeLevel = RuntimeLevel.Run)
-        {
-            var mockRunTimeState = new Mock<IRuntimeState>();
-            mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
-
-            var mockLogger = new Mock<ILogger<InstructionProcessTask>>();
-
-            _mockDatabaseServerMessenger = new Mock<IServerMessenger>();
-
-            var settings = new GlobalSettings();
-
-            return new InstructionProcessTask(mockRunTimeState.Object, _mockDatabaseServerMessenger.Object, mockLogger.Object, Options.Create(settings));
-        }
-
-        private void VerifyMessengerNotSynced() => VerifyMessengerSyncedTimes(Times.Never());
-
-        private void VerifyMessengerSynced() => VerifyMessengerSyncedTimes(Times.Once());
-
-        private void VerifyMessengerSyncedTimes(Times times) => _mockDatabaseServerMessenger.Verify(x => x.Sync(), times);
+        var sut = CreateInstructionProcessTask(runtimeLevel);
+        await sut.PerformExecuteAsync(null);
+        VerifyMessengerNotSynced();
     }
+
+    [Test]
+    public async Task Executes_And_Touches_Server()
+    {
+        var sut = CreateInstructionProcessTask();
+        await sut.PerformExecuteAsync(null);
+        VerifyMessengerSynced();
+    }
+
+    private InstructionProcessTask CreateInstructionProcessTask(RuntimeLevel runtimeLevel = RuntimeLevel.Run)
+    {
+        var mockRunTimeState = new Mock<IRuntimeState>();
+        mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
+
+        var mockLogger = new Mock<ILogger<InstructionProcessTask>>();
+
+        _mockDatabaseServerMessenger = new Mock<IServerMessenger>();
+
+        var settings = new GlobalSettings();
+
+        return new InstructionProcessTask(
+            mockRunTimeState.Object,
+            _mockDatabaseServerMessenger.Object,
+            mockLogger.Object,
+            Options.Create(settings));
+    }
+
+    private void VerifyMessengerNotSynced() => VerifyMessengerSyncedTimes(Times.Never());
+
+    private void VerifyMessengerSynced() => VerifyMessengerSyncedTimes(Times.Once());
+
+    private void VerifyMessengerSyncedTimes(Times times) => _mockDatabaseServerMessenger.Verify(x => x.Sync(), times);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs
index a281225990..4ad5aa8bb2 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/ServerRegistration/TouchServerTaskTests.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
@@ -15,94 +14,94 @@ using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.HostedServices.ServerRegistration;
 using Umbraco.Cms.Tests.Common;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices.ServerRegistration;
+
+[TestFixture]
+public class TouchServerTaskTests
 {
-    [TestFixture]
-    public class TouchServerTaskTests
+    private Mock<IServerRegistrationService> _mockServerRegistrationService;
+
+    private const string ApplicationUrl = "https://mysite.com/";
+    private readonly TimeSpan _staleServerTimeout = TimeSpan.FromMinutes(2);
+
+    [TestCase(RuntimeLevel.Boot)]
+    [TestCase(RuntimeLevel.Install)]
+    [TestCase(RuntimeLevel.Unknown)]
+    [TestCase(RuntimeLevel.Upgrade)]
+    [TestCase(RuntimeLevel.BootFailed)]
+    public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
     {
-        private Mock<IServerRegistrationService> _mockServerRegistrationService;
-
-        private const string ApplicationUrl = "https://mysite.com/";
-        private readonly TimeSpan _staleServerTimeout = TimeSpan.FromMinutes(2);
-
-        [TestCase(RuntimeLevel.Boot)]
-        [TestCase(RuntimeLevel.Install)]
-        [TestCase(RuntimeLevel.Unknown)]
-        [TestCase(RuntimeLevel.Upgrade)]
-        [TestCase(RuntimeLevel.BootFailed)]
-        public async Task Does_Not_Execute_When_Runtime_State_Is_Not_Run(RuntimeLevel runtimeLevel)
-        {
-            TouchServerTask sut = CreateTouchServerTask(runtimeLevel: runtimeLevel);
-            await sut.PerformExecuteAsync(null);
-            VerifyServerNotTouched();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Application_Url_Is_Not_Available()
-        {
-            TouchServerTask sut = CreateTouchServerTask(applicationUrl: string.Empty);
-            await sut.PerformExecuteAsync(null);
-            VerifyServerNotTouched();
-        }
-
-        [Test]
-        public async Task Executes_And_Touches_Server()
-        {
-            TouchServerTask sut = CreateTouchServerTask();
-            await sut.PerformExecuteAsync(null);
-            VerifyServerTouched();
-        }
-
-        [Test]
-        public async Task Does_Not_Execute_When_Role_Accessor_Is_Not_Elected()
-        {
-            TouchServerTask sut = CreateTouchServerTask(useElection: false);
-            await sut.PerformExecuteAsync(null);
-            VerifyServerNotTouched();
-        }
-
-        private TouchServerTask CreateTouchServerTask(RuntimeLevel runtimeLevel = RuntimeLevel.Run, string applicationUrl = ApplicationUrl, bool useElection = true)
-        {
-            var mockRequestAccessor = new Mock<IHostingEnvironment>();
-            mockRequestAccessor.SetupGet(x => x.ApplicationMainUrl).Returns(!string.IsNullOrEmpty(applicationUrl) ? new Uri(ApplicationUrl) : null);
-
-            var mockRunTimeState = new Mock<IRuntimeState>();
-            mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
-
-            var mockLogger = new Mock<ILogger<TouchServerTask>>();
-
-            _mockServerRegistrationService = new Mock<IServerRegistrationService>();
-
-            var settings = new GlobalSettings
-            {
-                DatabaseServerRegistrar = new DatabaseServerRegistrarSettings
-                {
-                    StaleServerTimeout = _staleServerTimeout,
-                }
-            };
-
-            IServerRoleAccessor roleAccessor = useElection
-                ? new ElectedServerRoleAccessor(_mockServerRegistrationService.Object)
-                : new SingleServerRoleAccessor();
-
-            return new TouchServerTask(
-                mockRunTimeState.Object,
-                _mockServerRegistrationService.Object,
-                mockRequestAccessor.Object,
-                mockLogger.Object,
-                new TestOptionsMonitor<GlobalSettings>(settings),
-                roleAccessor);
-        }
-
-        private void VerifyServerNotTouched() => VerifyServerTouchedTimes(Times.Never());
-
-        private void VerifyServerTouched() => VerifyServerTouchedTimes(Times.Once());
-
-        private void VerifyServerTouchedTimes(Times times) => _mockServerRegistrationService
-                .Verify(
-                    x => x.TouchServer(
-                        It.Is<string>(y => y == ApplicationUrl),
-                        It.Is<TimeSpan>(y => y == _staleServerTimeout)),
-                    times);
+        var sut = CreateTouchServerTask(runtimeLevel);
+        await sut.PerformExecuteAsync(null);
+        VerifyServerNotTouched();
     }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Application_Url_Is_Not_Available()
+    {
+        var sut = CreateTouchServerTask(applicationUrl: string.Empty);
+        await sut.PerformExecuteAsync(null);
+        VerifyServerNotTouched();
+    }
+
+    [Test]
+    public async Task Executes_And_Touches_Server()
+    {
+        var sut = CreateTouchServerTask();
+        await sut.PerformExecuteAsync(null);
+        VerifyServerTouched();
+    }
+
+    [Test]
+    public async Task Does_Not_Execute_When_Role_Accessor_Is_Not_Elected()
+    {
+        var sut = CreateTouchServerTask(useElection: false);
+        await sut.PerformExecuteAsync(null);
+        VerifyServerNotTouched();
+    }
+
+    private TouchServerTask CreateTouchServerTask(
+        RuntimeLevel runtimeLevel = RuntimeLevel.Run,
+        string applicationUrl = ApplicationUrl,
+        bool useElection = true)
+    {
+        var mockRequestAccessor = new Mock<IHostingEnvironment>();
+        mockRequestAccessor.SetupGet(x => x.ApplicationMainUrl)
+            .Returns(!string.IsNullOrEmpty(applicationUrl) ? new Uri(ApplicationUrl) : null);
+
+        var mockRunTimeState = new Mock<IRuntimeState>();
+        mockRunTimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
+
+        var mockLogger = new Mock<ILogger<TouchServerTask>>();
+
+        _mockServerRegistrationService = new Mock<IServerRegistrationService>();
+
+        var settings = new GlobalSettings
+        {
+            DatabaseServerRegistrar = new DatabaseServerRegistrarSettings { StaleServerTimeout = _staleServerTimeout },
+        };
+
+        IServerRoleAccessor roleAccessor = useElection
+            ? new ElectedServerRoleAccessor(_mockServerRegistrationService.Object)
+            : new SingleServerRoleAccessor();
+
+        return new TouchServerTask(
+            mockRunTimeState.Object,
+            _mockServerRegistrationService.Object,
+            mockRequestAccessor.Object,
+            mockLogger.Object,
+            new TestOptionsMonitor<GlobalSettings>(settings),
+            roleAccessor);
+    }
+
+    private void VerifyServerNotTouched() => VerifyServerTouchedTimes(Times.Never());
+
+    private void VerifyServerTouched() => VerifyServerTouchedTimes(Times.Once());
+
+    private void VerifyServerTouchedTimes(Times times) => _mockServerRegistrationService
+        .Verify(
+            x => x.TouchServer(
+                It.Is<string>(y => y == ApplicationUrl),
+                It.Is<TimeSpan>(y => y == _staleServerTimeout)),
+            times);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs
index cad82f9dee..b89781d4cf 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/HostedServices/TempFileCleanupTests.cs
@@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Infrastructure.HostedServices;
 
@@ -43,12 +42,11 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.HostedServices
 
             _mockIOHelper = new Mock<IIOHelper>();
             _mockIOHelper.Setup(x => x.GetTempFolders())
-                .Returns(new DirectoryInfo[] { new DirectoryInfo(_testPath) });
+                .Returns(new DirectoryInfo[] { new(_testPath) });
             _mockIOHelper.Setup(x => x.CleanFolder(It.IsAny<DirectoryInfo>(), It.IsAny<TimeSpan>()))
                 .Returns(CleanFolderResult.Success());
 
             var mockLogger = new Mock<ILogger<TempFileCleanup>>();
-            var mockProfilingLogger = new Mock<IProfilingLogger>();
 
             return new TempFileCleanup(_mockIOHelper.Object, mockMainDom.Object, mockLogger.Object);
         }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs
index 7304a82b89..45c8929628 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Logging/LogviewerTests.cs
@@ -11,9 +11,6 @@ using Moq;
 using NUnit.Framework;
 using Serilog;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Hosting;
-using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Logging;
 using Umbraco.Cms.Core.Logging.Viewer;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Persistence.Querying;
@@ -24,265 +21,261 @@ using Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using File = System.IO.File;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Logging
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Logging;
+
+[TestFixture]
+public class LogviewerTests
 {
-    [TestFixture]
-    public class LogviewerTests
+    [OneTimeSetUp]
+    public void Setup()
     {
-        private ILogViewer _logViewer;
+        var testRoot = TestContext.CurrentContext.TestDirectory.Split("bin")[0];
 
-        private const string LogfileName = "UmbracoTraceLog.UNITTEST.20181112.json";
+        // Create an example JSON log file to check results
+        // As a one time setup for all tets in this class/fixture
+        var ioHelper = TestHelper.IOHelper;
+        var hostingEnv = TestHelper.GetHostingEnvironment();
 
-        private string _newLogfilePath;
-        private string _newLogfileDirPath;
+        var loggingConfiguration = TestHelper.GetLoggingConfiguration(hostingEnv);
 
-        private readonly LogTimePeriod _logTimePeriod = new LogTimePeriod(
-            new DateTime(year: 2018, month: 11, day: 12, hour: 0, minute: 0, second: 0),
-            new DateTime(year: 2018, month: 11, day: 13, hour: 0, minute: 0, second: 0));
+        var exampleLogfilePath = Path.Combine(testRoot, "TestHelpers", "Assets", LogfileName);
+        _newLogfileDirPath = loggingConfiguration.LogDirectory;
+        _newLogfilePath = Path.Combine(_newLogfileDirPath, LogfileName);
 
-        private ILogViewerQueryRepository LogViewerQueryRepository { get; } = new TestLogViewerQueryRepository();
+        // Create/ensure Directory exists
+        ioHelper.EnsurePathExists(_newLogfileDirPath);
 
-        [OneTimeSetUp]
-        public void Setup()
+        // Copy the sample files
+        File.Copy(exampleLogfilePath, _newLogfilePath, true);
+
+        var logger = Mock.Of<ILogger<SerilogJsonLogViewer>>();
+        var logViewerConfig = new LogViewerConfig(LogViewerQueryRepository, Mock.Of<IScopeProvider>());
+        var logLevelLoader = Mock.Of<ILogLevelLoader>();
+        _logViewer =
+            new SerilogJsonLogViewer(logger, logViewerConfig, loggingConfiguration, logLevelLoader, Log.Logger);
+    }
+
+    [OneTimeTearDown]
+    public void TearDown()
+    {
+        // Cleanup & delete the example log & search files off disk
+        // Once all tests in this class/fixture have run
+        if (File.Exists(_newLogfilePath))
         {
-            var testRoot = TestContext.CurrentContext.TestDirectory.Split("bin")[0];
-
-            // Create an example JSON log file to check results
-            // As a one time setup for all tets in this class/fixture
-            IIOHelper ioHelper = TestHelper.IOHelper;
-            IHostingEnvironment hostingEnv = TestHelper.GetHostingEnvironment();
-
-            ILoggingConfiguration loggingConfiguration = TestHelper.GetLoggingConfiguration(hostingEnv);
-
-            var exampleLogfilePath = Path.Combine(testRoot, "TestHelpers", "Assets", LogfileName);
-            _newLogfileDirPath = loggingConfiguration.LogDirectory;
-            _newLogfilePath = Path.Combine(_newLogfileDirPath, LogfileName);
-
-            // Create/ensure Directory exists
-            ioHelper.EnsurePathExists(_newLogfileDirPath);
-
-            // Copy the sample files
-            File.Copy(exampleLogfilePath, _newLogfilePath, true);
-
-            ILogger<SerilogJsonLogViewer> logger = Mock.Of<ILogger<SerilogJsonLogViewer>>();
-            var logViewerConfig = new LogViewerConfig(LogViewerQueryRepository, Mock.Of<IScopeProvider>());
-            var logLevelLoader = Mock.Of<ILogLevelLoader>();
-            _logViewer = new SerilogJsonLogViewer(logger, logViewerConfig, loggingConfiguration, logLevelLoader, Log.Logger);
-        }
-
-        [OneTimeTearDown]
-        public void TearDown()
-        {
-            // Cleanup & delete the example log & search files off disk
-            // Once all tests in this class/fixture have run
-            if (File.Exists(_newLogfilePath))
-            {
-                File.Delete(_newLogfilePath);
-            }
-        }
-
-        [Test]
-        public void Logs_Contain_Correct_Error_Count()
-        {
-            var numberOfErrors = _logViewer.GetNumberOfErrors(_logTimePeriod);
-
-            // Our dummy log should contain 2 errors
-            Assert.AreEqual(1, numberOfErrors);
-        }
-
-        [Test]
-        public void Logs_Contain_Correct_Log_Level_Counts()
-        {
-            LogLevelCounts logCounts = _logViewer.GetLogLevelCounts(_logTimePeriod);
-
-            Assert.AreEqual(55, logCounts.Debug);
-            Assert.AreEqual(1, logCounts.Error);
-            Assert.AreEqual(0, logCounts.Fatal);
-            Assert.AreEqual(38, logCounts.Information);
-            Assert.AreEqual(6, logCounts.Warning);
-        }
-
-        [Test]
-        public void Logs_Contains_Correct_Message_Templates()
-        {
-            IEnumerable<LogTemplate> templates = _logViewer.GetMessageTemplates(_logTimePeriod);
-
-            // Count no of templates
-            Assert.AreEqual(25, templates.Count());
-
-            // Verify all templates & counts are unique
-            CollectionAssert.AllItemsAreUnique(templates);
-
-            // Ensure the collection contains LogTemplate objects
-            CollectionAssert.AllItemsAreInstancesOfType(templates, typeof(LogTemplate));
-
-            // Get first item & verify its template & count are what we expect
-            LogTemplate popularTemplate = templates.FirstOrDefault();
-
-            Assert.IsNotNull(popularTemplate);
-            Assert.AreEqual("{EndMessage} ({Duration}ms) [Timing {TimingId}]", popularTemplate.MessageTemplate);
-            Assert.AreEqual(26, popularTemplate.Count);
-        }
-
-        [Test]
-        public void Logs_Can_Open_As_Small_File()
-        {
-            // We are just testing a return value (as we know the example file is less than 200MB)
-            // But this test method does not test/check that
-            var canOpenLogs = _logViewer.CheckCanOpenLogs(_logTimePeriod);
-            Assert.IsTrue(canOpenLogs);
-        }
-
-        [Test]
-        public void Logs_Can_Be_Queried()
-        {
-            var sw = new Stopwatch();
-            sw.Start();
-
-            // Should get me the most 100 recent log entries & using default overloads for remaining params
-            PagedResult<LogMessage> allLogs = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1);
-
-            sw.Stop();
-
-            // Check we get 100 results back for a page & total items all good :)
-            Assert.AreEqual(100, allLogs.Items.Count());
-            Assert.AreEqual(102, allLogs.TotalItems);
-            Assert.AreEqual(2, allLogs.TotalPages);
-
-            // Check collection all contain same object type
-            CollectionAssert.AllItemsAreInstancesOfType(allLogs.Items, typeof(LogMessage));
-
-            // Check first item is newest
-            LogMessage newestItem = allLogs.Items.First();
-            DateTimeOffset.TryParse("2018-11-12T08:39:18.1971147Z", out DateTimeOffset newDate);
-            Assert.AreEqual(newDate, newestItem.Timestamp);
-
-            // Check we call method again with a smaller set of results & in ascending
-            PagedResult<LogMessage> smallQuery = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, pageSize: 10, orderDirection: Direction.Ascending);
-            Assert.AreEqual(10, smallQuery.Items.Count());
-            Assert.AreEqual(11, smallQuery.TotalPages);
-
-            // Check first item is oldest
-            LogMessage oldestItem = smallQuery.Items.First();
-            DateTimeOffset.TryParse("2018-11-12T08:34:45.8371142Z", out DateTimeOffset oldDate);
-            Assert.AreEqual(oldDate, oldestItem.Timestamp);
-
-            // Check invalid log levels
-            // Rather than expect 0 items - get all items back & ignore the invalid levels
-            string[] invalidLogLevels = { "Invalid", "NotALevel" };
-            PagedResult<LogMessage> queryWithInvalidLevels = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, logLevels: invalidLogLevels);
-            Assert.AreEqual(102, queryWithInvalidLevels.TotalItems);
-
-            // Check we can call method with an array of logLevel (error & warning)
-            string[] logLevels = { "Warning", "Error" };
-            PagedResult<LogMessage> queryWithLevels = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, logLevels: logLevels);
-            Assert.AreEqual(7, queryWithLevels.TotalItems);
-
-            // Query @Level='Warning' BUT we pass in array of LogLevels for Debug & Info (Expect to get 0 results)
-            string[] logLevelMismatch = { "Debug", "Information" };
-            PagedResult<LogMessage> filterLevelQuery = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, filterExpression: "@Level='Warning'", logLevels: logLevelMismatch);
-            Assert.AreEqual(0, filterLevelQuery.TotalItems);
-        }
-
-        [TestCase("", 102)]
-        [TestCase("Has(@Exception)", 1)]
-        [TestCase("Has(@x)", 1)]
-        [TestCase("Has(Duration) and Duration > 1000", 2)]
-        [TestCase("Not(@Level = 'Verbose') and Not(@Level = 'Debug')", 45)]
-        [TestCase("Not(@l = 'Verbose') and Not(@l = 'Debug')", 45)]
-        [TestCase("StartsWith(SourceContext, 'Umbraco.Core')", 86)]
-        [TestCase("@MessageTemplate = '{EndMessage} ({Duration}ms) [Timing {TimingId}]'", 26)]
-        [TestCase("@mt = '{EndMessage} ({Duration}ms) [Timing {TimingId}]'", 26)]
-        [TestCase("SortedComponentTypes[?] = 'Umbraco.Web.Search.ExamineComponent'", 1)]
-        [TestCase("Contains(SortedComponentTypes[?], 'DatabaseServer')", 1)]
-        [Test]
-        public void Logs_Can_Query_With_Expressions(string queryToVerify, int expectedCount)
-        {
-            PagedResult<LogMessage> testQuery = _logViewer.GetLogs(_logTimePeriod, pageNumber: 1, filterExpression: queryToVerify);
-            Assert.AreEqual(expectedCount, testQuery.TotalItems);
-        }
-
-        [Test]
-        public void Log_Search_Can_Persist()
-        {
-            // Add a new search
-            _logViewer.AddSavedSearch("Unit Test Example", "Has(UnitTest)");
-
-            IReadOnlyList<SavedLogSearch> searches = _logViewer.GetSavedSearches();
-
-            var savedSearch = new SavedLogSearch
-            {
-                Name = "Unit Test Example",
-                Query = "Has(UnitTest)"
-            };
-
-            // Check if we can find the newly added item from the results we get back
-            IEnumerable<SavedLogSearch> findItem = searches.Where(x => x.Name == "Unit Test Example" && x.Query == "Has(UnitTest)");
-
-            Assert.IsNotNull(findItem, "We should have found the saved search, but get no results");
-            Assert.AreEqual(1, findItem.Count(), "Our list of searches should only contain one result");
-
-            // TODO: Need someone to help me find out why these don't work
-            // CollectionAssert.Contains(searches, savedSearch, "Can not find the new search that was saved");
-            // Assert.That(searches, Contains.Item(savedSearch));
-
-            // Remove the search from above & ensure it no longer exists
-            _logViewer.DeleteSavedSearch("Unit Test Example", "Has(UnitTest)");
-
-            searches = _logViewer.GetSavedSearches();
-            findItem = searches.Where(x => x.Name == "Unit Test Example" && x.Query == "Has(UnitTest)");
-            Assert.IsEmpty(findItem, "The search item should no longer exist");
+            File.Delete(_newLogfilePath);
         }
     }
 
-    internal class TestLogViewerQueryRepository : ILogViewerQueryRepository
+    private ILogViewer _logViewer;
+
+    private const string LogfileName = "UmbracoTraceLog.UNITTEST.20181112.json";
+
+    private string _newLogfilePath;
+    private string _newLogfileDirPath;
+
+    private readonly LogTimePeriod _logTimePeriod = new(
+        new DateTime(2018, 11, 12, 0, 0, 0),
+        new DateTime(2018, 11, 13, 0, 0, 0));
+
+    private ILogViewerQueryRepository LogViewerQueryRepository { get; } = new TestLogViewerQueryRepository();
+
+    [Test]
+    public void Logs_Contain_Correct_Error_Count()
     {
-        public TestLogViewerQueryRepository()
-        {
-            Store = new List<ILogViewerQuery>(MigrateLogViewerQueriesFromFileToDb._defaultLogQueries
-                .Select(LogViewerQueryModelFactory.BuildEntity));
-        }
+        var numberOfErrors = _logViewer.GetNumberOfErrors(_logTimePeriod);
 
-        private IList<ILogViewerQuery> Store { get; }
-        private LogViewerQueryRepository.LogViewerQueryModelFactory LogViewerQueryModelFactory { get; } = new LogViewerQueryRepository.LogViewerQueryModelFactory();
+        // Our dummy log should contain 2 errors
+        Assert.AreEqual(1, numberOfErrors);
+    }
 
+    [Test]
+    public void Logs_Contain_Correct_Log_Level_Counts()
+    {
+        var logCounts = _logViewer.GetLogLevelCounts(_logTimePeriod);
 
-        public ILogViewerQuery Get(int id) => Store.FirstOrDefault(x => x.Id == id);
+        Assert.AreEqual(55, logCounts.Debug);
+        Assert.AreEqual(1, logCounts.Error);
+        Assert.AreEqual(0, logCounts.Fatal);
+        Assert.AreEqual(38, logCounts.Information);
+        Assert.AreEqual(6, logCounts.Warning);
+    }
 
-        public IEnumerable<ILogViewerQuery> GetMany(params int[] ids) =>
-            ids.Any() ? Store.Where(x => ids.Contains(x.Id)) : Store;
+    [Test]
+    public void Logs_Contains_Correct_Message_Templates()
+    {
+        var templates = _logViewer.GetMessageTemplates(_logTimePeriod).ToArray();
 
-        public bool Exists(int id) => Get(id) is not null;
+        // Count no of templates
+        Assert.AreEqual(25, templates.Count());
 
-        public void Save(ILogViewerQuery entity)
-        {
-            var item = Get(entity.Id);
+        // Verify all templates & counts are unique
+        CollectionAssert.AllItemsAreUnique(templates);
 
-            if (item is null)
-            {
-               Store.Add(entity);
-            }
-            else
-            {
-                item.Name = entity.Name;
-                item.Query = entity.Query;
-            }
-        }
+        // Ensure the collection contains LogTemplate objects
+        CollectionAssert.AllItemsAreInstancesOfType(templates, typeof(LogTemplate));
 
-        public void Delete(ILogViewerQuery entity)
-        {
-            var item = Get(entity.Id);
+        // Get first item & verify its template & count are what we expect
+        var popularTemplate = templates.FirstOrDefault();
 
-            if (item is not null)
-            {
-                Store.Remove(item);
-            }
-        }
+        Assert.IsNotNull(popularTemplate);
+        Assert.AreEqual("{EndMessage} ({Duration}ms) [Timing {TimingId}]", popularTemplate.MessageTemplate);
+        Assert.AreEqual(26, popularTemplate.Count);
+    }
 
-        public IEnumerable<ILogViewerQuery> Get(IQuery<ILogViewerQuery> query) => throw new NotImplementedException();
+    [Test]
+    public void Logs_Can_Open_As_Small_File()
+    {
+        // We are just testing a return value (as we know the example file is less than 200MB)
+        // But this test method does not test/check that
+        var canOpenLogs = _logViewer.CheckCanOpenLogs(_logTimePeriod);
+        Assert.IsTrue(canOpenLogs);
+    }
 
-        public int Count(IQuery<ILogViewerQuery> query) => throw new NotImplementedException();
+    [Test]
+    public void Logs_Can_Be_Queried()
+    {
+        var sw = new Stopwatch();
+        sw.Start();
 
-        public ILogViewerQuery GetByName(string name) => Store.FirstOrDefault(x => x.Name == name);
+        // Should get me the most 100 recent log entries & using default overloads for remaining params
+        var allLogs = _logViewer.GetLogs(_logTimePeriod, 1);
+
+        sw.Stop();
+
+        // Check we get 100 results back for a page & total items all good :)
+        Assert.AreEqual(100, allLogs.Items.Count());
+        Assert.AreEqual(102, allLogs.TotalItems);
+        Assert.AreEqual(2, allLogs.TotalPages);
+
+        // Check collection all contain same object type
+        CollectionAssert.AllItemsAreInstancesOfType(allLogs.Items, typeof(LogMessage));
+
+        // Check first item is newest
+        var newestItem = allLogs.Items.First();
+        DateTimeOffset.TryParse("2018-11-12T08:39:18.1971147Z", out var newDate);
+        Assert.AreEqual(newDate, newestItem.Timestamp);
+
+        // Check we call method again with a smaller set of results & in ascending
+        var smallQuery = _logViewer.GetLogs(_logTimePeriod, 1, 10, Direction.Ascending);
+        Assert.AreEqual(10, smallQuery.Items.Count());
+        Assert.AreEqual(11, smallQuery.TotalPages);
+
+        // Check first item is oldest
+        var oldestItem = smallQuery.Items.First();
+        DateTimeOffset.TryParse("2018-11-12T08:34:45.8371142Z", out var oldDate);
+        Assert.AreEqual(oldDate, oldestItem.Timestamp);
+
+        // Check invalid log levels
+        // Rather than expect 0 items - get all items back & ignore the invalid levels
+        string[] invalidLogLevels = { "Invalid", "NotALevel" };
+        var queryWithInvalidLevels = _logViewer.GetLogs(_logTimePeriod, 1, logLevels: invalidLogLevels);
+        Assert.AreEqual(102, queryWithInvalidLevels.TotalItems);
+
+        // Check we can call method with an array of logLevel (error & warning)
+        string[] logLevels = { "Warning", "Error" };
+        var queryWithLevels = _logViewer.GetLogs(_logTimePeriod, 1, logLevels: logLevels);
+        Assert.AreEqual(7, queryWithLevels.TotalItems);
+
+        // Query @Level='Warning' BUT we pass in array of LogLevels for Debug & Info (Expect to get 0 results)
+        string[] logLevelMismatch = { "Debug", "Information" };
+        var filterLevelQuery = _logViewer.GetLogs(
+            _logTimePeriod,
+            1,
+            filterExpression: "@Level='Warning'",
+            logLevels: logLevelMismatch);
+        Assert.AreEqual(0, filterLevelQuery.TotalItems);
+    }
+
+    [TestCase("", 102)]
+    [TestCase("Has(@Exception)", 1)]
+    [TestCase("Has(@x)", 1)]
+    [TestCase("Has(Duration) and Duration > 1000", 2)]
+    [TestCase("Not(@Level = 'Verbose') and Not(@Level = 'Debug')", 45)]
+    [TestCase("Not(@l = 'Verbose') and Not(@l = 'Debug')", 45)]
+    [TestCase("StartsWith(SourceContext, 'Umbraco.Core')", 86)]
+    [TestCase("@MessageTemplate = '{EndMessage} ({Duration}ms) [Timing {TimingId}]'", 26)]
+    [TestCase("@mt = '{EndMessage} ({Duration}ms) [Timing {TimingId}]'", 26)]
+    [TestCase("SortedComponentTypes[?] = 'Umbraco.Web.Search.ExamineComponent'", 1)]
+    [TestCase("Contains(SortedComponentTypes[?], 'DatabaseServer')", 1)]
+    [Test]
+    public void Logs_Can_Query_With_Expressions(string queryToVerify, int expectedCount)
+    {
+        var testQuery = _logViewer.GetLogs(_logTimePeriod, 1, filterExpression: queryToVerify);
+        Assert.AreEqual(expectedCount, testQuery.TotalItems);
+    }
+
+    [Test]
+    public void Log_Search_Can_Persist()
+    {
+        // Add a new search
+        _logViewer.AddSavedSearch("Unit Test Example", "Has(UnitTest)");
+
+        var searches = _logViewer.GetSavedSearches();
+
+        // Check if we can find the newly added item from the results we get back
+        var findItem = searches.Where(x => x.Name == "Unit Test Example" && x.Query == "Has(UnitTest)");
+
+        Assert.IsNotNull(findItem, "We should have found the saved search, but get no results");
+        Assert.AreEqual(1, findItem.Count(), "Our list of searches should only contain one result");
+
+        // TODO: Need someone to help me find out why these don't work
+        // CollectionAssert.Contains(searches, savedSearch, "Can not find the new search that was saved");
+        // Assert.That(searches, Contains.Item(savedSearch));
+
+        // Remove the search from above & ensure it no longer exists
+        _logViewer.DeleteSavedSearch("Unit Test Example", "Has(UnitTest)");
+
+        searches = _logViewer.GetSavedSearches();
+        findItem = searches.Where(x => x.Name == "Unit Test Example" && x.Query == "Has(UnitTest)");
+        Assert.IsEmpty(findItem, "The search item should no longer exist");
     }
 }
+
+internal class TestLogViewerQueryRepository : ILogViewerQueryRepository
+{
+    public TestLogViewerQueryRepository() =>
+        Store = new List<ILogViewerQuery>(MigrateLogViewerQueriesFromFileToDb._defaultLogQueries
+            .Select(LogViewerQueryModelFactory.BuildEntity));
+
+    private IList<ILogViewerQuery> Store { get; }
+
+    private LogViewerQueryRepository.LogViewerQueryModelFactory LogViewerQueryModelFactory { get; } = new();
+
+    public ILogViewerQuery Get(int id) => Store.FirstOrDefault(x => x.Id == id);
+
+    public IEnumerable<ILogViewerQuery> GetMany(params int[] ids) =>
+        ids.Any() ? Store.Where(x => ids.Contains(x.Id)) : Store;
+
+    public bool Exists(int id) => Get(id) is not null;
+
+    public void Save(ILogViewerQuery entity)
+    {
+        var item = Get(entity.Id);
+
+        if (item is null)
+        {
+            Store.Add(entity);
+        }
+        else
+        {
+            item.Name = entity.Name;
+            item.Query = entity.Query;
+        }
+    }
+
+    public void Delete(ILogViewerQuery entity)
+    {
+        var item = Get(entity.Id);
+
+        if (item is not null)
+        {
+            Store.Remove(item);
+        }
+    }
+
+    public IEnumerable<ILogViewerQuery> Get(IQuery<ILogViewerQuery> query) => throw new NotImplementedException();
+
+    public int Count(IQuery<ILogViewerQuery> query) => throw new NotImplementedException();
+
+    public ILogViewerQuery GetByName(string name) => Store.FirstOrDefault(x => x.Name == name);
+}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
index b3e761c5be..03da5482c1 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Mapping/MappingTests.cs
@@ -13,352 +13,330 @@ using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Scoping;
+using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
 using PropertyCollection = Umbraco.Cms.Core.Models.PropertyCollection;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Mapping
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Mapping;
+
+[TestFixture]
+public class MappingTests
 {
-    [TestFixture]
-    public class MappingTests
+    [SetUp]
+    public void MockScopeProvider()
     {
-        private global::Umbraco.Cms.Infrastructure.Scoping.IScopeProvider _scopeProvider;
+        var scopeMock = new Mock<IScopeProvider>();
+        scopeMock.Setup(x => x.CreateScope(
+                It.IsAny<IsolationLevel>(),
+                It.IsAny<RepositoryCacheMode>(),
+                It.IsAny<IEventDispatcher>(),
+                It.IsAny<IScopedNotificationPublisher>(),
+                It.IsAny<bool?>(),
+                It.IsAny<bool>(),
+                It.IsAny<bool>()))
+            .Returns(Mock.Of<IScope>);
 
-        [SetUp]
-        public void MockScopeProvider()
+        _scopeProvider = scopeMock.Object;
+    }
+
+    private IScopeProvider _scopeProvider;
+
+    [Test]
+    public void SimpleMap()
+    {
+        var definitions = new MapDefinitionCollection(() => new IMapDefinition[] { new MapperDefinition1() });
+        var mapper = new UmbracoMapper(definitions, _scopeProvider);
+
+        var thing1 = new Thing1 { Value = "value" };
+        var thing2 = mapper.Map<Thing1, Thing2>(thing1);
+
+        Assert.IsNotNull(thing2);
+        Assert.AreEqual("value", thing2.Value);
+
+        thing2 = mapper.Map<Thing2>(thing1);
+
+        Assert.IsNotNull(thing2);
+        Assert.AreEqual("value", thing2.Value);
+
+        thing2 = new Thing2();
+        mapper.Map(thing1, thing2);
+        Assert.AreEqual("value", thing2.Value);
+    }
+
+    [Test]
+    public void EnumerableMap()
+    {
+        var definitions = new MapDefinitionCollection(() => new IMapDefinition[] { new MapperDefinition1() });
+        var mapper = new UmbracoMapper(definitions, _scopeProvider);
+
+        var thing1A = new Thing1 { Value = "valueA" };
+        var thing1B = new Thing1 { Value = "valueB" };
+        Thing1[] thing1 = { thing1A, thing1B };
+        var thing2 = mapper.Map<IEnumerable<Thing1>, IEnumerable<Thing2>>(thing1).ToList();
+
+        Assert.IsNotNull(thing2);
+        Assert.AreEqual(2, thing2.Count);
+        Assert.AreEqual("valueA", thing2[0].Value);
+        Assert.AreEqual("valueB", thing2[1].Value);
+
+        thing2 = mapper.Map<IEnumerable<Thing2>>(thing1).ToList();
+
+        Assert.IsNotNull(thing2);
+        Assert.AreEqual(2, thing2.Count);
+        Assert.AreEqual("valueA", thing2[0].Value);
+        Assert.AreEqual("valueB", thing2[1].Value);
+
+        thing2 = mapper.MapEnumerable<Thing1, Thing2>(thing1).ToList();
+
+        Assert.IsNotNull(thing2);
+        Assert.AreEqual(2, thing2.Count);
+        Assert.AreEqual("valueA", thing2[0].Value);
+        Assert.AreEqual("valueB", thing2[1].Value);
+    }
+
+    [Test]
+    public void InheritedMap()
+    {
+        var definitions = new MapDefinitionCollection(() => new IMapDefinition[] { new MapperDefinition1() });
+        var mapper = new UmbracoMapper(definitions, _scopeProvider);
+
+        var thing3 = new Thing3 { Value = "value" };
+        var thing2 = mapper.Map<Thing3, Thing2>(thing3);
+
+        Assert.IsNotNull(thing2);
+        Assert.AreEqual("value", thing2.Value);
+
+        thing2 = mapper.Map<Thing2>(thing3);
+
+        Assert.IsNotNull(thing2);
+        Assert.AreEqual("value", thing2.Value);
+
+        thing2 = new Thing2();
+        mapper.Map(thing3, thing2);
+        Assert.AreEqual("value", thing2.Value);
+    }
+
+    [Test]
+    public void CollectionsMap()
+    {
+        var definitions = new MapDefinitionCollection(() => new IMapDefinition[] { new MapperDefinition2() });
+        var mapper = new UmbracoMapper(definitions, _scopeProvider);
+
+        // can map a PropertyCollection
+        var source = new PropertyCollection();
+        var target = mapper.Map<IEnumerable<ContentPropertyDto>>(source);
+    }
+
+    [Test]
+    [Explicit]
+    public void ConcurrentMap()
+    {
+        var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
         {
-            var scopeMock = new Mock<global::Umbraco.Cms.Infrastructure.Scoping.IScopeProvider>();
-            scopeMock.Setup(x => x.CreateScope(
-                    It.IsAny<IsolationLevel>(),
-                    It.IsAny<RepositoryCacheMode>(),
-                    It.IsAny<IEventDispatcher>(),
-                    It.IsAny<IScopedNotificationPublisher>(),
-                    It.IsAny<bool?>(),
-                    It.IsAny<bool>(),
-                    It.IsAny<bool>()))
-                .Returns(Mock.Of<IScope>);
+            new MapperDefinition1(),
+            new MapperDefinition3(),
+        });
+        var mapper = new UmbracoMapper(definitions, _scopeProvider);
 
-            _scopeProvider = scopeMock.Object;
-        }
+        // the mapper currently has a map from Thing1 to Thing2
+        // because Thing3 inherits from Thing1, it will map a Thing3 instance,
+        // and register a new map from Thing3 to Thing2,
+        // thus modifying its internal dictionaries
 
-        [Test]
-        public void SimpleMap()
+        // if timing is good, and mapper does have non-concurrent dictionaries, it fails
+        // practically, to reproduce, one needs to add a 1s sleep in the mapper's loop
+        // hence, this test is explicit
+        var thing3 = new Thing3 { Value = "value" };
+        var thing4 = new Thing4();
+        Exception caught = null;
+
+        void ThreadLoop()
         {
-            var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
+            // keep failing at mapping - and looping through the maps
+            for (var i = 0; i < 10; i++)
             {
-                new MapperDefinition1(),
-            });
-            var mapper = new UmbracoMapper(definitions, _scopeProvider);
-
-            var thing1 = new Thing1 { Value = "value" };
-            Thing2 thing2 = mapper.Map<Thing1, Thing2>(thing1);
-
-            Assert.IsNotNull(thing2);
-            Assert.AreEqual("value", thing2.Value);
-
-            thing2 = mapper.Map<Thing2>(thing1);
-
-            Assert.IsNotNull(thing2);
-            Assert.AreEqual("value", thing2.Value);
-
-            thing2 = new Thing2();
-            mapper.Map(thing1, thing2);
-            Assert.AreEqual("value", thing2.Value);
-        }
-
-        [Test]
-        public void EnumerableMap()
-        {
-            var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
-            {
-                new MapperDefinition1(),
-            });
-            var mapper = new UmbracoMapper(definitions, _scopeProvider);
-
-            var thing1A = new Thing1 { Value = "valueA" };
-            var thing1B = new Thing1 { Value = "valueB" };
-            Thing1[] thing1 = new[] { thing1A, thing1B };
-            var thing2 = mapper.Map<IEnumerable<Thing1>, IEnumerable<Thing2>>(thing1).ToList();
-
-            Assert.IsNotNull(thing2);
-            Assert.AreEqual(2, thing2.Count);
-            Assert.AreEqual("valueA", thing2[0].Value);
-            Assert.AreEqual("valueB", thing2[1].Value);
-
-            thing2 = mapper.Map<IEnumerable<Thing2>>(thing1).ToList();
-
-            Assert.IsNotNull(thing2);
-            Assert.AreEqual(2, thing2.Count);
-            Assert.AreEqual("valueA", thing2[0].Value);
-            Assert.AreEqual("valueB", thing2[1].Value);
-
-            thing2 = mapper.MapEnumerable<Thing1, Thing2>(thing1).ToList();
-
-            Assert.IsNotNull(thing2);
-            Assert.AreEqual(2, thing2.Count);
-            Assert.AreEqual("valueA", thing2[0].Value);
-            Assert.AreEqual("valueB", thing2[1].Value);
-        }
-
-        [Test]
-        public void InheritedMap()
-        {
-            var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
-            {
-                new MapperDefinition1(),
-            });
-            var mapper = new UmbracoMapper(definitions, _scopeProvider);
-
-            var thing3 = new Thing3 { Value = "value" };
-            Thing2 thing2 = mapper.Map<Thing3, Thing2>(thing3);
-
-            Assert.IsNotNull(thing2);
-            Assert.AreEqual("value", thing2.Value);
-
-            thing2 = mapper.Map<Thing2>(thing3);
-
-            Assert.IsNotNull(thing2);
-            Assert.AreEqual("value", thing2.Value);
-
-            thing2 = new Thing2();
-            mapper.Map(thing3, thing2);
-            Assert.AreEqual("value", thing2.Value);
-        }
-
-        [Test]
-        public void CollectionsMap()
-        {
-            var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
-            {
-                new MapperDefinition2(),
-            });
-            var mapper = new UmbracoMapper(definitions, _scopeProvider);
-
-            // can map a PropertyCollection
-            var source = new PropertyCollection();
-            IEnumerable<ContentPropertyDto> target = mapper.Map<IEnumerable<ContentPropertyDto>>(source);
-        }
-
-        [Test]
-        [Explicit]
-        public void ConcurrentMap()
-        {
-            var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
-            {
-                new MapperDefinition1(),
-                new MapperDefinition3(),
-            });
-            var mapper = new UmbracoMapper(definitions, _scopeProvider);
-
-            // the mapper currently has a map from Thing1 to Thing2
-            // because Thing3 inherits from Thing1, it will map a Thing3 instance,
-            // and register a new map from Thing3 to Thing2,
-            // thus modifying its internal dictionaries
-
-            // if timing is good, and mapper does have non-concurrent dictionaries, it fails
-            // practically, to reproduce, one needs to add a 1s sleep in the mapper's loop
-            // hence, this test is explicit
-            var thing3 = new Thing3 { Value = "value" };
-            var thing4 = new Thing4();
-            Exception caught = null;
-
-            void ThreadLoop()
-            {
-                // keep failing at mapping - and looping through the maps
-                for (var i = 0; i < 10; i++)
+                try
                 {
-                    try
-                    {
-                        mapper.Map<Thing2>(thing4);
-                    }
-                    catch (Exception e)
-                    {
-                        caught = e;
-                        Console.WriteLine($"{e.GetType().Name} {e.Message}");
-                    }
+                    mapper.Map<Thing2>(thing4);
+                }
+                catch (Exception e)
+                {
+                    caught = e;
+                    Console.WriteLine($"{e.GetType().Name} {e.Message}");
                 }
-
-                Console.WriteLine("done");
             }
 
-            var thread = new Thread(ThreadLoop);
-            thread.Start();
-            Thread.Sleep(1000);
-
-            try
-            {
-                Console.WriteLine($"{DateTime.Now:O} mapping");
-                Thing2 thing2 = mapper.Map<Thing2>(thing3);
-                Console.WriteLine($"{DateTime.Now:O} mapped");
-
-                Assert.IsNotNull(thing2);
-                Assert.AreEqual("value", thing2.Value);
-            }
-            finally
-            {
-                thread.Join();
-            }
+            Console.WriteLine("done");
         }
 
-        [Test]
-        public void EnumMap()
+        var thread = new Thread(ThreadLoop);
+        thread.Start();
+        Thread.Sleep(1000);
+
+        try
         {
-            var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
-            {
-                new MapperDefinition4(),
-            });
-            var mapper = new UmbracoMapper(definitions, _scopeProvider);
+            Console.WriteLine($"{DateTime.Now:O} mapping");
+            var thing2 = mapper.Map<Thing2>(thing3);
+            Console.WriteLine($"{DateTime.Now:O} mapped");
 
-            var thing5 = new Thing5()
-            {
-                Fruit1 = Thing5Enum.Apple,
-                Fruit2 = Thing5Enum.Banana,
-                Fruit3 = Thing5Enum.Cherry
-            };
-
-            Thing6 thing6 = mapper.Map<Thing5, Thing6>(thing5);
-
-            Assert.IsNotNull(thing6);
-            Assert.AreEqual(Thing6Enum.Apple, thing6.Fruit1);
-            Assert.AreEqual(Thing6Enum.Banana, thing6.Fruit2);
-            Assert.AreEqual(Thing6Enum.Cherry, thing6.Fruit3);
+            Assert.IsNotNull(thing2);
+            Assert.AreEqual("value", thing2.Value);
         }
-
-        [Test]
-        public void NullPropertyMap()
+        finally
         {
-            var definitions = new MapDefinitionCollection(() => new IMapDefinition[]
-            {
-                new MapperDefinition5(),
-            });
-            var mapper = new UmbracoMapper(definitions, _scopeProvider);
-
-            var thing7 = new Thing7();
-
-            Thing8 thing8 = mapper.Map<Thing7, Thing8>(thing7);
-
-            Assert.IsNotNull(thing8);
-            Assert.IsNull(thing8.Things);
-        }
-
-        private class Thing1
-        {
-            public string Value { get; set; }
-        }
-
-        private class Thing3 : Thing1
-        {
-        }
-
-        private class Thing2
-        {
-            public string Value { get; set; }
-        }
-
-        private class Thing4
-        {
-        }
-
-        private class Thing5
-        {
-            public Thing5Enum Fruit1 { get; set; }
-
-            public Thing5Enum Fruit2 { get; set; }
-
-            public Thing5Enum Fruit3 { get; set; }
-        }
-
-        private enum Thing5Enum
-        {
-            Apple = 0,
-            Banana = 1,
-            Cherry = 2
-        }
-
-        private class Thing6
-        {
-            public Thing6Enum Fruit1 { get; set; }
-
-            public Thing6Enum Fruit2 { get; set; }
-
-            public Thing6Enum Fruit3 { get; set; }
-        }
-
-        private enum Thing6Enum
-        {
-            Apple = 0,
-            Banana = 1,
-            Cherry = 2
-        }
-
-        private class Thing7
-        {
-            public IEnumerable<Thing1> Things { get; set; }
-        }
-
-        private class Thing8
-        {
-            public IEnumerable<Thing2> Things { get; set; }
-        }
-
-        private class MapperDefinition1 : IMapDefinition
-        {
-            public void DefineMaps(IUmbracoMapper mapper) => mapper.Define<Thing1, Thing2>((source, context) => new Thing2(), Map);
-
-            private void Map(Thing1 source, Thing2 target, MapperContext context) => target.Value = source.Value;
-        }
-
-        private class MapperDefinition2 : IMapDefinition
-        {
-            public void DefineMaps(IUmbracoMapper mapper) =>
-                mapper.Define<IProperty, ContentPropertyDto>((source, context) => new ContentPropertyDto(), Map);
-
-            private static void Map(IProperty source, ContentPropertyDto target, MapperContext context)
-            {
-            }
-        }
-
-        private class MapperDefinition3 : IMapDefinition
-        {
-            public void DefineMaps(IUmbracoMapper mapper)
-            {
-                // just some random things so that the mapper contains things
-                mapper.Define<int, object>();
-                mapper.Define<string, object>();
-                mapper.Define<double, object>();
-                mapper.Define<UmbracoMapper, object>();
-                mapper.Define<Property, object>();
-            }
-        }
-
-        private class MapperDefinition4 : IMapDefinition
-        {
-            public void DefineMaps(IUmbracoMapper mapper)
-            {
-                mapper.Define<Thing5, Thing6>((source, context) => new Thing6(), Map);
-                mapper.Define<Thing5Enum, Thing6Enum>(
-                    (source, context) => (Thing6Enum)source);
-            }
-
-            private void Map(Thing5 source, Thing6 target, MapperContext context)
-            {
-                target.Fruit1 = context.Map<Thing6Enum>(source.Fruit1);
-                target.Fruit2 = context.Map<Thing6Enum>(source.Fruit2);
-                target.Fruit3 = context.Map<Thing6Enum>(source.Fruit3);
-            }
-        }
-
-        private class MapperDefinition5 : IMapDefinition
-        {
-            public void DefineMaps(IUmbracoMapper mapper)
-            {
-                mapper.Define<Thing1, Thing2>((source, context) => new Thing2(), Map1);
-                mapper.Define<Thing7, Thing8>((source, context) => new Thing8(), Map2);
-            }
-
-            private void Map1(Thing1 source, Thing2 target, MapperContext context) =>
-                target.Value = source.Value;
-
-            private void Map2(Thing7 source, Thing8 target, MapperContext context) =>
-                target.Things = context.Map<IEnumerable<Thing2>>(source.Things);
+            thread.Join();
         }
     }
+
+    [Test]
+    public void EnumMap()
+    {
+        var definitions = new MapDefinitionCollection(() => new IMapDefinition[] { new MapperDefinition4() });
+        var mapper = new UmbracoMapper(definitions, _scopeProvider);
+
+        var thing5 = new Thing5 { Fruit1 = Thing5Enum.Apple, Fruit2 = Thing5Enum.Banana, Fruit3 = Thing5Enum.Cherry };
+
+        var thing6 = mapper.Map<Thing5, Thing6>(thing5);
+
+        Assert.IsNotNull(thing6);
+        Assert.AreEqual(Thing6Enum.Apple, thing6.Fruit1);
+        Assert.AreEqual(Thing6Enum.Banana, thing6.Fruit2);
+        Assert.AreEqual(Thing6Enum.Cherry, thing6.Fruit3);
+    }
+
+    [Test]
+    public void NullPropertyMap()
+    {
+        var definitions = new MapDefinitionCollection(() => new IMapDefinition[] { new MapperDefinition5() });
+        var mapper = new UmbracoMapper(definitions, _scopeProvider);
+
+        var thing7 = new Thing7();
+
+        var thing8 = mapper.Map<Thing7, Thing8>(thing7);
+
+        Assert.IsNotNull(thing8);
+        Assert.IsNull(thing8.Things);
+    }
+
+    private class Thing1
+    {
+        public string Value { get; set; }
+    }
+
+    private class Thing3 : Thing1
+    {
+    }
+
+    private class Thing2
+    {
+        public string Value { get; set; }
+    }
+
+    private class Thing4
+    {
+    }
+
+    private class Thing5
+    {
+        public Thing5Enum Fruit1 { get; set; }
+
+        public Thing5Enum Fruit2 { get; set; }
+
+        public Thing5Enum Fruit3 { get; set; }
+    }
+
+    private enum Thing5Enum
+    {
+        Apple = 0,
+        Banana = 1,
+        Cherry = 2,
+    }
+
+    private class Thing6
+    {
+        public Thing6Enum Fruit1 { get; set; }
+
+        public Thing6Enum Fruit2 { get; set; }
+
+        public Thing6Enum Fruit3 { get; set; }
+    }
+
+    private enum Thing6Enum
+    {
+        Apple = 0,
+        Banana = 1,
+        Cherry = 2,
+    }
+
+    private class Thing7
+    {
+        public IEnumerable<Thing1> Things { get; set; }
+    }
+
+    private class Thing8
+    {
+        public IEnumerable<Thing2> Things { get; set; }
+    }
+
+    private class MapperDefinition1 : IMapDefinition
+    {
+        public void DefineMaps(IUmbracoMapper mapper) =>
+            mapper.Define<Thing1, Thing2>((source, context) => new Thing2(), Map);
+
+        private void Map(Thing1 source, Thing2 target, MapperContext context) => target.Value = source.Value;
+    }
+
+    private class MapperDefinition2 : IMapDefinition
+    {
+        public void DefineMaps(IUmbracoMapper mapper) =>
+            mapper.Define<IProperty, ContentPropertyDto>((source, context) => new ContentPropertyDto(), Map);
+
+        private static void Map(IProperty source, ContentPropertyDto target, MapperContext context)
+        {
+        }
+    }
+
+    private class MapperDefinition3 : IMapDefinition
+    {
+        public void DefineMaps(IUmbracoMapper mapper)
+        {
+            // just some random things so that the mapper contains things
+            mapper.Define<int, object>();
+            mapper.Define<string, object>();
+            mapper.Define<double, object>();
+            mapper.Define<UmbracoMapper, object>();
+            mapper.Define<Property, object>();
+        }
+    }
+
+    private class MapperDefinition4 : IMapDefinition
+    {
+        public void DefineMaps(IUmbracoMapper mapper)
+        {
+            mapper.Define<Thing5, Thing6>((source, context) => new Thing6(), Map);
+            mapper.Define<Thing5Enum, Thing6Enum>(
+                (source, context) => (Thing6Enum)source);
+        }
+
+        private void Map(Thing5 source, Thing6 target, MapperContext context)
+        {
+            target.Fruit1 = context.Map<Thing6Enum>(source.Fruit1);
+            target.Fruit2 = context.Map<Thing6Enum>(source.Fruit2);
+            target.Fruit3 = context.Map<Thing6Enum>(source.Fruit3);
+        }
+    }
+
+    private class MapperDefinition5 : IMapDefinition
+    {
+        public void DefineMaps(IUmbracoMapper mapper)
+        {
+            mapper.Define<Thing1, Thing2>((source, context) => new Thing2(), Map1);
+            mapper.Define<Thing7, Thing8>((source, context) => new Thing8(), Map2);
+        }
+
+        private void Map1(Thing1 source, Thing2 target, MapperContext context) =>
+            target.Value = source.Value;
+
+        private void Map2(Thing7 source, Thing8 target, MapperContext context) =>
+            target.Things = context.Map<IEnumerable<Thing2>>(source.Things);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs
index 02310a3192..71d5d641f8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/AlterMigrationTests.cs
@@ -7,134 +7,135 @@ using System.Linq;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Migrations;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations;
+
+[TestFixture]
+public class AlterMigrationTests
 {
-    [TestFixture]
-    public class AlterMigrationTests
+    private readonly ILogger<MigrationContext> _logger = Mock.Of<ILogger<MigrationContext>>();
+
+    private class TestPlan : MigrationPlan
     {
-        private readonly ILogger<MigrationContext> _logger = Mock.Of<ILogger<MigrationContext>>();        
-        private class TestPlan : MigrationPlan
+        public TestPlan()
+            : base("Test")
         {
-            public TestPlan() : base("Test")
-            {
-            }
         }
-        private MigrationContext GetMigrationContext(out TestDatabase db)
+    }
+
+    private MigrationContext GetMigrationContext(out TestDatabase db)
+    {
+        db = new TestDatabase();
+        return new MigrationContext(new TestPlan(), db, _logger);
+    }
+
+    [Test]
+    public void Drop_Foreign_Key()
+    {
+        // Arrange
+        var context = GetMigrationContext(out var database);
+        var stub = new DropForeignKeyMigrationStub(context);
+
+        // Act
+        stub.Run();
+
+        foreach (var op in database.Operations)
         {
-            db = new TestDatabase();
-            return new MigrationContext(new TestPlan(), db, _logger);
+            Console.WriteLine("{0}\r\n\t{1}", op.Text, op.Sql);
         }
 
-        [Test]
-        public void Drop_Foreign_Key()
+        // Assert
+        Assert.That(database.Operations.Count, Is.EqualTo(1));
+        Assert.That(
+            database.Operations[0].Sql,
+            Is.EqualTo("ALTER TABLE [umbracoUser2app] DROP CONSTRAINT [FK_umbracoUser2app_umbracoUser_id]"));
+    }
+
+    [Test]
+    public void CreateColumn()
+    {
+        var context = GetMigrationContext(out var database);
+        var migration = new CreateColumnMigration(context);
+
+        migration.Run();
+
+        foreach (var op in database.Operations)
         {
-            // Arrange
-            var context = GetMigrationContext(out var database);
-            var stub = new DropForeignKeyMigrationStub(context);
-
-            // Act
-            stub.Run();
-
-            foreach (TestDatabase.Operation op in database.Operations)
-            {
-                Console.WriteLine("{0}\r\n\t{1}", op.Text, op.Sql);
-            }
-
-            // Assert
-            Assert.That(database.Operations.Count, Is.EqualTo(1));
-            Assert.That(
-                database.Operations[0].Sql,
-                Is.EqualTo("ALTER TABLE [umbracoUser2app] DROP CONSTRAINT [FK_umbracoUser2app_umbracoUser_id]"));
+            Console.WriteLine("{0}\r\n\t{1}", op.Text, op.Sql);
         }
 
-        [Test]
-        public void CreateColumn()
+        Assert.That(database.Operations.Count, Is.EqualTo(1));
+        Assert.That(
+            database.Operations[0].Sql,
+            Is.EqualTo("ALTER TABLE [bar] ADD [foo] UniqueIdentifier NOT NULL"));
+    }
+
+    public class CreateColumnMigration : MigrationBase
+    {
+        public CreateColumnMigration(IMigrationContext context)
+            : base(context)
         {
-            var context = GetMigrationContext(out var database);
-            var migration = new CreateColumnMigration(context);
-
-            migration.Run();
-
-            foreach (TestDatabase.Operation op in database.Operations)
-            {
-                Console.WriteLine("{0}\r\n\t{1}", op.Text, op.Sql);
-            }
-
-            Assert.That(database.Operations.Count, Is.EqualTo(1));
-            Assert.That(
-                database.Operations[0].Sql,
-                Is.EqualTo("ALTER TABLE [bar] ADD [foo] UniqueIdentifier NOT NULL"));
         }
 
-        public class CreateColumnMigration : MigrationBase
-        {
-            public CreateColumnMigration(IMigrationContext context)
-                : base(context)
-            {
-            }
+        protected override void Migrate() => Alter.Table("bar").AddColumn("foo").AsGuid().Do();
+    }
 
-            protected override void Migrate() => Alter.Table("bar").AddColumn("foo").AsGuid().Do();
+    [Test]
+    public void AlterColumn()
+    {
+        var context = GetMigrationContext(out var database);
+        var migration = new AlterColumnMigration(context);
+
+        migration.Run();
+
+        foreach (var op in database.Operations)
+        {
+            Console.WriteLine("{0}\r\n\t{1}", op.Text, op.Sql);
         }
 
-        [Test]
-        public void AlterColumn()
+        Assert.That(database.Operations.Count, Is.EqualTo(1));
+        Assert.That(
+            database.Operations[0].Sql,
+            Is.EqualTo("ALTER TABLE [bar] ALTER COLUMN [foo] UniqueIdentifier NOT NULL"));
+    }
+
+    public class AlterColumnMigration : MigrationBase
+    {
+        public AlterColumnMigration(IMigrationContext context)
+            : base(context)
         {
-            var context = GetMigrationContext(out var database);
-            var migration = new AlterColumnMigration(context);
-
-            migration.Run();
-
-            foreach (TestDatabase.Operation op in database.Operations)
-            {
-                Console.WriteLine("{0}\r\n\t{1}", op.Text, op.Sql);
-            }
-
-            Assert.That(database.Operations.Count, Is.EqualTo(1));
-            Assert.That(
-                database.Operations[0].Sql,
-                Is.EqualTo("ALTER TABLE [bar] ALTER COLUMN [foo] UniqueIdentifier NOT NULL"));
         }
 
-        public class AlterColumnMigration : MigrationBase
+        protected override void Migrate() =>
+
+            // bad/good syntax...
+            //// Alter.Column("foo").OnTable("bar").AsGuid().NotNullable();
+            Alter.Table("bar").AlterColumn("foo").AsGuid().NotNullable().Do();
+    }
+
+    [Ignore("this doesn't actually test anything")]
+    [Test]
+    public void Can_Get_Up_Migration_From_MigrationStub()
+    {
+        // Arrange
+        var context = GetMigrationContext(out var database);
+        var stub = new AlterUserTableMigrationStub(context);
+
+        // Act
+        stub.Run();
+
+        // Assert
+        Assert.That(database.Operations.Any(), Is.True);
+
+        // Console output
+        Debug.Print("Number of expressions in context: {0}", database.Operations.Count);
+        Debug.Print(string.Empty);
+        foreach (var expression in database.Operations)
         {
-            public AlterColumnMigration(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate() =>
-
-                // bad/good syntax...
-                //// Alter.Column("foo").OnTable("bar").AsGuid().NotNullable();
-                Alter.Table("bar").AlterColumn("foo").AsGuid().NotNullable().Do();
-        }
-
-        [Ignore("this doesn't actually test anything")]
-        [Test]
-        public void Can_Get_Up_Migration_From_MigrationStub()
-        {
-            // Arrange
-            var context = GetMigrationContext(out var database);
-            var stub = new AlterUserTableMigrationStub(context);
-
-            // Act
-            stub.Run();
-
-            // Assert
-            Assert.That(database.Operations.Any(), Is.True);
-
-            // Console output
-            Debug.Print("Number of expressions in context: {0}", database.Operations.Count);
-            Debug.Print(string.Empty);
-            foreach (TestDatabase.Operation expression in database.Operations)
-            {
-                Debug.Print(expression.ToString());
-            }
+            Debug.Print(expression.ToString());
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs
index 8fbcf05ddc..8349974ebd 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationPlanTests.cs
@@ -4,8 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Moq;
@@ -13,227 +11,226 @@ using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
 using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations;
+
+[TestFixture]
+public class MigrationPlanTests
 {
-    [TestFixture]
-    public class MigrationPlanTests
+    [Test]
+    public void CanExecute()
     {
-        [Test]
-        public void CanExecute()
-        {
-            NullLoggerFactory loggerFactory = NullLoggerFactory.Instance;
+        var loggerFactory = NullLoggerFactory.Instance;
 
-            var database = new TestDatabase();
-            IScope scope = Mock.Of<IScope>(x => x.Notifications == Mock.Of<IScopedNotificationPublisher>());
-            Mock.Get(scope)
-                .Setup(x => x.Database)
-                .Returns(database);
+        var database = new TestDatabase();
+        var scope = Mock.Of<IScope>(x => x.Notifications == Mock.Of<IScopedNotificationPublisher>());
+        Mock.Get(scope)
+            .Setup(x => x.Database)
+            .Returns(database);
 
-            var sqlContext = new SqlContext(new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())), DatabaseType.SQLCe, Mock.Of<IPocoDataFactory>());
-            var scopeProvider = new MigrationTests.TestScopeProvider(scope) { SqlContext = sqlContext };
+        var sqlContext = new SqlContext(
+            new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())),
+            DatabaseType.SQLCe,
+            Mock.Of<IPocoDataFactory>());
+        var scopeProvider = new MigrationTests.TestScopeProvider(scope) { SqlContext = sqlContext };
 
-            IMigrationBuilder migrationBuilder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(migrationBuilder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
-                {
-                    switch (t.Name)
-                    {
-                        case "DeleteRedirectUrlTable":
-                            return new DeleteRedirectUrlTable(c);
-                        case "NoopMigration":
-                            return new NoopMigration(c);
-                        default:
-                            throw new NotSupportedException();
-                    }
-                });
-
-            var executor = new MigrationPlanExecutor(scopeProvider, scopeProvider, loggerFactory, migrationBuilder);
-
-            MigrationPlan plan = new MigrationPlan("default")
-                .From(string.Empty)
-                .To<DeleteRedirectUrlTable>("{4A9A1A8F-0DA1-4BCF-AD06-C19D79152E35}")
-                .To<NoopMigration>("VERSION.33");
-
-            IKeyValueService kvs = Mock.Of<IKeyValueService>();
-            Mock.Get(kvs).Setup(x => x.GetValue(It.IsAny<string>()))
-                .Returns<string>(k => k == "Umbraco.Tests.MigrationPlan" ? string.Empty : null);
-
-            string state;
-            using (IScope s = scopeProvider.CreateScope())
+        var migrationBuilder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(migrationBuilder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
             {
-                // read current state
-                var sourceState = kvs.GetValue("Umbraco.Tests.MigrationPlan") ?? string.Empty;
-
-                // execute plan                
-                state = executor.Execute(plan, sourceState);
-
-                // save new state
-                kvs.SetValue("Umbraco.Tests.MigrationPlan", sourceState, state);
-
-                s.Complete();
-            }
-
-            Assert.AreEqual("VERSION.33", state);
-            Assert.AreEqual(1, database.Operations.Count);
-            Assert.AreEqual("DROP TABLE [umbracoRedirectUrl]", database.Operations[0].Sql);
-        }
-
-        [Test]
-        public void CanAddMigrations()
-        {
-            var plan = new MigrationPlan("default");
-            plan
-                .From(string.Empty)
-                .To("aaa")
-                .To("bbb")
-                .To("ccc");
-        }
-
-        [Test]
-        public void CannotTransitionToSameState()
-        {
-            var plan = new MigrationPlan("default");
-            Assert.Throws<ArgumentException>(() => plan.From("aaa").To("aaa"));
-        }
-
-        [Test]
-        public void OnlyOneTransitionPerState()
-        {
-            var plan = new MigrationPlan("default");
-            plan.From("aaa").To("bbb");
-            Assert.Throws<InvalidOperationException>(() => plan.From("aaa").To("ccc"));
-        }
-
-        [Test]
-        public void CannotContainTwoMoreHeads()
-        {
-            var plan = new MigrationPlan("default");
-            plan
-                .From(string.Empty)
-                .To("aaa")
-                .To("bbb")
-                .From("ccc")
-                .To("ddd");
-            Assert.Throws<InvalidOperationException>(() => plan.Validate());
-        }
-
-        [Test]
-        public void CannotContainLoops()
-        {
-            var plan = new MigrationPlan("default");
-            plan
-                .From("aaa")
-                .To("bbb")
-                .To("ccc")
-                .To("aaa");
-            Assert.Throws<InvalidOperationException>(() => plan.Validate());
-        }
-
-        [Test]
-        public void ValidateUmbracoPlan()
-        {
-            var plan = new UmbracoPlan(TestHelper.GetUmbracoVersion());
-            plan.Validate();
-            Console.WriteLine(plan.FinalState);
-            Assert.IsFalse(plan.FinalState.IsNullOrWhiteSpace());
-        }
-
-        [Test]
-        public void CanClone()
-        {
-            var plan = new MigrationPlan("default");
-            plan
-                .From(string.Empty)
-                .To("aaa")
-                .To("bbb")
-                .To("ccc")
-                .To("ddd")
-                .To("eee");
-
-            plan
-                .From("xxx")
-                .ToWithClone("bbb", "ddd", "yyy")
-                .To("eee");
-
-            WritePlanToConsole(plan);
-
-            plan.Validate();
-            Assert.AreEqual("eee", plan.FollowPath("xxx").Last());
-            Assert.AreEqual("yyy", plan.FollowPath("xxx", "yyy").Last());
-        }
-
-        [Test]
-        public void CanMerge()
-        {
-            var plan = new MigrationPlan("default");
-            plan
-                .From(string.Empty)
-                .To("aaa")
-                .Merge()
-                .To("bbb")
-                .To("ccc")
-                .With()
-                .To("ddd")
-                .To("eee")
-                .As("fff")
-                .To("ggg");
-
-            WritePlanToConsole(plan);
-
-            plan.Validate();
-            AssertList(plan.FollowPath(), string.Empty, "aaa", "bbb", "ccc", "*", "*", "fff", "ggg");
-            AssertList(plan.FollowPath("ccc"), "ccc", "*", "*", "fff", "ggg");
-            AssertList(plan.FollowPath("eee"), "eee", "*", "*", "fff", "ggg");
-        }
-
-        private void AssertList(IReadOnlyList<string> states, params string[] expected)
-        {
-            Assert.AreEqual(expected.Length, states.Count, string.Join(", ", states));
-            for (var i = 0; i < expected.Length; i++)
-            {
-                if (expected[i] != "*")
+                switch (t.Name)
                 {
-                    Assert.AreEqual(expected[i], states[i], "at:" + i);
+                    case "DeleteRedirectUrlTable":
+                        return new DeleteRedirectUrlTable(c);
+                    case "NoopMigration":
+                        return new NoopMigration(c);
+                    default:
+                        throw new NotSupportedException();
                 }
-            }
+            });
+
+        var executor = new MigrationPlanExecutor(scopeProvider, scopeProvider, loggerFactory, migrationBuilder);
+
+        var plan = new MigrationPlan("default")
+            .From(string.Empty)
+            .To<DeleteRedirectUrlTable>("{4A9A1A8F-0DA1-4BCF-AD06-C19D79152E35}")
+            .To<NoopMigration>("VERSION.33");
+
+        var kvs = Mock.Of<IKeyValueService>();
+        Mock.Get(kvs).Setup(x => x.GetValue(It.IsAny<string>()))
+            .Returns<string>(k => k == "Umbraco.Tests.MigrationPlan" ? string.Empty : null);
+
+        string state;
+        using (var s = scopeProvider.CreateScope())
+        {
+            // read current state
+            var sourceState = kvs.GetValue("Umbraco.Tests.MigrationPlan") ?? string.Empty;
+
+            // execute plan
+            state = executor.Execute(plan, sourceState);
+
+            // save new state
+            kvs.SetValue("Umbraco.Tests.MigrationPlan", sourceState, state);
+
+            s.Complete();
         }
 
-        private void WritePlanToConsole(MigrationPlan plan)
+        Assert.AreEqual("VERSION.33", state);
+        Assert.AreEqual(1, database.Operations.Count);
+        Assert.AreEqual("DROP TABLE [umbracoRedirectUrl]", database.Operations[0].Sql);
+    }
+
+    [Test]
+    public void CanAddMigrations()
+    {
+        var plan = new MigrationPlan("default");
+        plan
+            .From(string.Empty)
+            .To("aaa")
+            .To("bbb")
+            .To("ccc");
+    }
+
+    [Test]
+    public void CannotTransitionToSameState()
+    {
+        var plan = new MigrationPlan("default");
+        Assert.Throws<ArgumentException>(() => plan.From("aaa").To("aaa"));
+    }
+
+    [Test]
+    public void OnlyOneTransitionPerState()
+    {
+        var plan = new MigrationPlan("default");
+        plan.From("aaa").To("bbb");
+        Assert.Throws<InvalidOperationException>(() => plan.From("aaa").To("ccc"));
+    }
+
+    [Test]
+    public void CannotContainTwoMoreHeads()
+    {
+        var plan = new MigrationPlan("default");
+        plan
+            .From(string.Empty)
+            .To("aaa")
+            .To("bbb")
+            .From("ccc")
+            .To("ddd");
+        Assert.Throws<InvalidOperationException>(() => plan.Validate());
+    }
+
+    [Test]
+    public void CannotContainLoops()
+    {
+        var plan = new MigrationPlan("default");
+        plan
+            .From("aaa")
+            .To("bbb")
+            .To("ccc")
+            .To("aaa");
+        Assert.Throws<InvalidOperationException>(() => plan.Validate());
+    }
+
+    [Test]
+    public void ValidateUmbracoPlan()
+    {
+        var plan = new UmbracoPlan(TestHelper.GetUmbracoVersion());
+        plan.Validate();
+        Console.WriteLine(plan.FinalState);
+        Assert.IsFalse(plan.FinalState.IsNullOrWhiteSpace());
+    }
+
+    [Test]
+    public void CanClone()
+    {
+        var plan = new MigrationPlan("default");
+        plan
+            .From(string.Empty)
+            .To("aaa")
+            .To("bbb")
+            .To("ccc")
+            .To("ddd")
+            .To("eee");
+
+        plan
+            .From("xxx")
+            .ToWithClone("bbb", "ddd", "yyy")
+            .To("eee");
+
+        WritePlanToConsole(plan);
+
+        plan.Validate();
+        Assert.AreEqual("eee", plan.FollowPath("xxx").Last());
+        Assert.AreEqual("yyy", plan.FollowPath("xxx", "yyy").Last());
+    }
+
+    [Test]
+    public void CanMerge()
+    {
+        var plan = new MigrationPlan("default");
+        plan
+            .From(string.Empty)
+            .To("aaa")
+            .Merge()
+            .To("bbb")
+            .To("ccc")
+            .With()
+            .To("ddd")
+            .To("eee")
+            .As("fff")
+            .To("ggg");
+
+        WritePlanToConsole(plan);
+
+        plan.Validate();
+        AssertList(plan.FollowPath(), string.Empty, "aaa", "bbb", "ccc", "*", "*", "fff", "ggg");
+        AssertList(plan.FollowPath("ccc"), "ccc", "*", "*", "fff", "ggg");
+        AssertList(plan.FollowPath("eee"), "eee", "*", "*", "fff", "ggg");
+    }
+
+    private void AssertList(IReadOnlyList<string> states, params string[] expected)
+    {
+        Assert.AreEqual(expected.Length, states.Count, string.Join(", ", states));
+        for (var i = 0; i < expected.Length; i++)
         {
-            var final = plan.Transitions.First(x => x.Value == null).Key;
-
-            Console.WriteLine("plan \"{0}\" to final state \"{1}\":", plan.Name, final);
-            foreach ((var _, MigrationPlan.Transition transition) in plan.Transitions)
+            if (expected[i] != "*")
             {
-                if (transition != null)
-                {
-                    Console.WriteLine(transition);
-                }
+                Assert.AreEqual(expected[i], states[i], "at:" + i);
             }
         }
-
-        public class DeleteRedirectUrlTable : MigrationBase
-        {
-            public DeleteRedirectUrlTable(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate() => Delete.Table("umbracoRedirectUrl").Do();
-        }
+    }
+
+    private void WritePlanToConsole(MigrationPlan plan)
+    {
+        var final = plan.Transitions.First(x => x.Value == null).Key;
+
+        Console.WriteLine("plan \"{0}\" to final state \"{1}\":", plan.Name, final);
+        foreach ((var _, var transition) in plan.Transitions)
+        {
+            if (transition != null)
+            {
+                Console.WriteLine(transition);
+            }
+        }
+    }
+
+    public class DeleteRedirectUrlTable : MigrationBase
+    {
+        public DeleteRedirectUrlTable(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        protected override void Migrate() => Delete.Table("umbracoRedirectUrl").Do();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs
index 7f5b284023..65feecb943 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/MigrationTests.cs
@@ -2,55 +2,56 @@
 // See LICENSE for more details.
 
 using System;
-#if DEBUG_SCOPES
-using System.Collections.Generic;
-#endif
 using System.Data;
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Persistence.Querying;
+using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Scoping;
+using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
+#if DEBUG_SCOPES
+using System.Collections.Generic;
+#endif
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations;
+
+[TestFixture]
+public class MigrationTests
 {
-    [TestFixture]
-    public class MigrationTests
+    public class TestScopeProvider : IScopeProvider, IScopeAccessor
     {
-        public class TestScopeProvider : IScopeProvider, IScopeAccessor
-        {
-            private readonly IScope _scope;
+        public TestScopeProvider(IScope scope) => AmbientScope = scope;
 
-            public TestScopeProvider(IScope scope) => _scope = scope;
+        public IScope CreateScope(
+            IsolationLevel isolationLevel = IsolationLevel.Unspecified,
+            RepositoryCacheMode repositoryCacheMode = RepositoryCacheMode.Unspecified,
+            IEventDispatcher eventDispatcher = null,
+            IScopedNotificationPublisher notificationPublisher = null,
+            bool? scopeFileSystems = null,
+            bool callContext = false,
+            bool autoComplete = false) => AmbientScope;
 
-            public IScope CreateScope(
-                IsolationLevel isolationLevel = IsolationLevel.Unspecified,
-                Cms.Core.Scoping.RepositoryCacheMode repositoryCacheMode = Cms.Core.Scoping.RepositoryCacheMode.Unspecified,
-                IEventDispatcher eventDispatcher = null,
-                IScopedNotificationPublisher notificationPublisher = null,
-                bool? scopeFileSystems = null,
-                bool callContext = false,
-                bool autoComplete = false) => _scope;
+        public IScope CreateDetachedScope(
+            IsolationLevel isolationLevel = IsolationLevel.Unspecified,
+            RepositoryCacheMode repositoryCacheMode = RepositoryCacheMode.Unspecified,
+            IEventDispatcher eventDispatcher = null,
+            IScopedNotificationPublisher notificationPublisher = null,
+            bool? scopeFileSystems = null) => throw new NotImplementedException();
 
-            public IScope CreateDetachedScope(
-                IsolationLevel isolationLevel = IsolationLevel.Unspecified,
-                Cms.Core.Scoping.RepositoryCacheMode repositoryCacheMode = Cms.Core.Scoping.RepositoryCacheMode.Unspecified,
-                IEventDispatcher eventDispatcher = null,
-                IScopedNotificationPublisher notificationPublisher = null,
-                bool? scopeFileSystems = null) => throw new NotImplementedException();
+        public void AttachScope(IScope scope, bool callContext = false) => throw new NotImplementedException();
 
-            public void AttachScope(IScope scope, bool callContext = false) => throw new NotImplementedException();
+        public IScope DetachScope() => throw new NotImplementedException();
 
-            public IScope DetachScope() => throw new NotImplementedException();
+        public IScopeContext Context { get; set; }
 
-            public Cms.Core.Scoping.IScopeContext Context { get; set; }
-            public IQuery<T> CreateQuery<T>() => SqlContext.Query<T>();
+        public IQuery<T> CreateQuery<T>() => SqlContext.Query<T>();
 
-            public ISqlContext SqlContext { get; set; }
+        public ISqlContext SqlContext { get; set; }
 
 #if DEBUG_SCOPES
             public ScopeInfo GetScopeInfo(IScope scope)
@@ -59,75 +60,80 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations
             }
             public IEnumerable<ScopeInfo> ScopeInfos => throw new NotImplementedException();
 #endif
-            public IScope AmbientScope => _scope;
+        public IScope AmbientScope { get; }
+    }
+
+    private class TestPlan : MigrationPlan
+    {
+        public TestPlan()
+            : base("Test")
+        {
+        }
+    }
+
+    private MigrationContext GetMigrationContext() =>
+        new(
+            new TestPlan(),
+            Mock.Of<IUmbracoDatabase>(),
+            Mock.Of<ILogger<MigrationContext>>());
+
+    [Test]
+    public void RunGoodMigration()
+    {
+        var migrationContext = GetMigrationContext();
+        MigrationBase migration = new GoodMigration(migrationContext);
+        migration.Run();
+    }
+
+    [Test]
+    public void DetectBadMigration1()
+    {
+        var migrationContext = GetMigrationContext();
+        MigrationBase migration = new BadMigration1(migrationContext);
+        Assert.Throws<IncompleteMigrationExpressionException>(() => migration.Run());
+    }
+
+    [Test]
+    public void DetectBadMigration2()
+    {
+        var migrationContext = GetMigrationContext();
+        MigrationBase migration = new BadMigration2(migrationContext);
+        Assert.Throws<IncompleteMigrationExpressionException>(() => migration.Run());
+    }
+
+    public class GoodMigration : MigrationBase
+    {
+        public GoodMigration(IMigrationContext context)
+            : base(context)
+        {
         }
 
-        private class TestPlan : MigrationPlan
-        {
-            public TestPlan() : base("Test")
-            {
-            }
-        }
-        private MigrationContext GetMigrationContext() => new MigrationContext(new TestPlan(), Mock.Of<IUmbracoDatabase>(), Mock.Of<ILogger<MigrationContext>>());
+        protected override void Migrate() => Execute.Sql(string.Empty).Do();
+    }
 
-        [Test]
-        public void RunGoodMigration()
+    public class BadMigration1 : MigrationBase
+    {
+        public BadMigration1(IMigrationContext context)
+            : base(context)
         {
-            var migrationContext = GetMigrationContext();
-            MigrationBase migration = new GoodMigration(migrationContext);
-            migration.Run();
         }
 
-        [Test]
-        public void DetectBadMigration1()
+        protected override void Migrate() => Alter.Table("foo"); // stop here, don't Do it
+    }
+
+    public class BadMigration2 : MigrationBase
+    {
+        public BadMigration2(IMigrationContext context)
+            : base(context)
         {
-            var migrationContext = GetMigrationContext();
-            MigrationBase migration = new BadMigration1(migrationContext);
-            Assert.Throws<IncompleteMigrationExpressionException>(() => migration.Run());
         }
 
-        [Test]
-        public void DetectBadMigration2()
+        protected override void Migrate()
         {
-            var migrationContext = GetMigrationContext();
-            MigrationBase migration = new BadMigration2(migrationContext);
-            Assert.Throws<IncompleteMigrationExpressionException>(() => migration.Run());
-        }
+            Alter.Table("foo"); // stop here, don't Do it
 
-        public class GoodMigration : MigrationBase
-        {
-            public GoodMigration(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate() => Execute.Sql(string.Empty).Do();
-        }
-
-        public class BadMigration1 : MigrationBase
-        {
-            public BadMigration1(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate() => Alter.Table("foo"); // stop here, don't Do it
-        }
-
-        public class BadMigration2 : MigrationBase
-        {
-            public BadMigration2(IMigrationContext context)
-                : base(context)
-            {
-            }
-
-            protected override void Migrate()
-            {
-                Alter.Table("foo"); // stop here, don't Do it
-
-                // and try to start another one
-                Alter.Table("bar");
-            }
+            // and try to start another one
+            Alter.Table("bar");
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs
index 05d9cf6cbc..fdae9cda06 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/PostMigrationTests.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using System;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
@@ -17,146 +16,149 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.Migrations;
 using Umbraco.Cms.Infrastructure.Migrations.Upgrade;
 using Umbraco.Cms.Infrastructure.Persistence;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using IScope = Umbraco.Cms.Infrastructure.Scoping.IScope;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations;
+
+[TestFixture]
+public class PostMigrationTests
 {
-    [TestFixture]
-    public class PostMigrationTests
+    private static readonly ILoggerFactory s_loggerFactory = NullLoggerFactory.Instance;
+
+    private IMigrationPlanExecutor GetMigrationPlanExecutor(
+        ICoreScopeProvider scopeProvider,
+        IScopeAccessor scopeAccessor,
+        IMigrationBuilder builder)
+        => new MigrationPlanExecutor(scopeProvider, scopeAccessor, s_loggerFactory, builder);
+
+    [Test]
+    public void ExecutesPlanPostMigration()
     {
-        private static readonly ILoggerFactory s_loggerFactory = NullLoggerFactory.Instance;
-        private IMigrationPlanExecutor GetMigrationPlanExecutor(ICoreScopeProvider scopeProvider, IScopeAccessor scopeAccessor,IMigrationBuilder builder)
-            => new MigrationPlanExecutor(scopeProvider, scopeAccessor, s_loggerFactory, builder);
-
-        [Test]
-        public void ExecutesPlanPostMigration()
-        {
-            IMigrationBuilder builder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(builder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
+        var builder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(builder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
+            {
+                switch (t.Name)
                 {
-                    switch (t.Name)
-                    {
-                        case nameof(NoopMigration):
-                            return new NoopMigration(c);
-                        case nameof(TestPostMigration):
-                            return new TestPostMigration(c);
-                        default:
-                            throw new NotSupportedException();
-                    }
-                });
+                    case nameof(NoopMigration):
+                        return new NoopMigration(c);
+                    case nameof(TestPostMigration):
+                        return new TestPostMigration(c);
+                    default:
+                        throw new NotSupportedException();
+                }
+            });
 
-            var database = new TestDatabase();
-            IScope scope = Mock.Of<IScope>(x => x.Notifications == Mock.Of<IScopedNotificationPublisher>());
-            Mock.Get(scope)
-                .Setup(x => x.Database)
-                .Returns(database);
+        var database = new TestDatabase();
+        var scope = Mock.Of<IScope>(x => x.Notifications == Mock.Of<IScopedNotificationPublisher>());
+        Mock.Get(scope)
+            .Setup(x => x.Database)
+            .Returns(database);
 
-            var sqlContext = new SqlContext(
-                new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())),
-                DatabaseType.SQLCe,
-                Mock.Of<IPocoDataFactory>());
-            var scopeProvider = new MigrationTests.TestScopeProvider(scope) { SqlContext = sqlContext };
+        var sqlContext = new SqlContext(
+            new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())),
+            DatabaseType.SQLCe,
+            Mock.Of<IPocoDataFactory>());
+        var scopeProvider = new MigrationTests.TestScopeProvider(scope) { SqlContext = sqlContext };
 
-            MigrationPlan plan = new MigrationPlan("Test")
-                .From(string.Empty).To("done");
+        var plan = new MigrationPlan("Test")
+            .From(string.Empty).To("done");
 
-            plan.AddPostMigration<TestPostMigration>();
-            TestPostMigration.MigrateCount = 0;
+        plan.AddPostMigration<TestPostMigration>();
+        TestPostMigration.MigrateCount = 0;
 
-            var upgrader = new Upgrader(plan);
-            IMigrationPlanExecutor executor = GetMigrationPlanExecutor(scopeProvider, scopeProvider, builder);
-            upgrader.Execute(
-                executor,
-                scopeProvider,
-                Mock.Of<IKeyValueService>());
+        var upgrader = new Upgrader(plan);
+        var executor = GetMigrationPlanExecutor(scopeProvider, scopeProvider, builder);
+        upgrader.Execute(
+            executor,
+            scopeProvider,
+            Mock.Of<IKeyValueService>());
 
-            Assert.AreEqual(1, TestPostMigration.MigrateCount);
-        }
+        Assert.AreEqual(1, TestPostMigration.MigrateCount);
+    }
 
-        [Test]
-        public void MigrationCanAddPostMigration()
-        {
-            IMigrationBuilder builder = Mock.Of<IMigrationBuilder>();
-            Mock.Get(builder)
-                .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
-                .Returns<Type, IMigrationContext>((t, c) =>
+    [Test]
+    public void MigrationCanAddPostMigration()
+    {
+        var builder = Mock.Of<IMigrationBuilder>();
+        Mock.Get(builder)
+            .Setup(x => x.Build(It.IsAny<Type>(), It.IsAny<IMigrationContext>()))
+            .Returns<Type, IMigrationContext>((t, c) =>
+            {
+                switch (t.Name)
                 {
-                    switch (t.Name)
-                    {
-                        case nameof(NoopMigration):
-                            return new NoopMigration(c);
-                        case nameof(TestMigration):
-                            return new TestMigration(c);
-                        case nameof(TestPostMigration):
-                            return new TestPostMigration(c);
-                        default:
-                            throw new NotSupportedException();
-                    }
-                });
+                    case nameof(NoopMigration):
+                        return new NoopMigration(c);
+                    case nameof(TestMigration):
+                        return new TestMigration(c);
+                    case nameof(TestPostMigration):
+                        return new TestPostMigration(c);
+                    default:
+                        throw new NotSupportedException();
+                }
+            });
 
-            var database = new TestDatabase();
-            IScope scope = Mock.Of<IScope>(x => x.Notifications == Mock.Of<IScopedNotificationPublisher>());
-            Mock.Get(scope)
-                .Setup(x => x.Database)
-                .Returns(database);
+        var database = new TestDatabase();
+        var scope = Mock.Of<IScope>(x => x.Notifications == Mock.Of<IScopedNotificationPublisher>());
+        Mock.Get(scope)
+            .Setup(x => x.Database)
+            .Returns(database);
 
-            var sqlContext = new SqlContext(
-                new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())),
-                DatabaseType.SQLCe,
-                Mock.Of<IPocoDataFactory>());
-            var scopeProvider = new MigrationTests.TestScopeProvider(scope) { SqlContext = sqlContext };
+        var sqlContext = new SqlContext(
+            new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())),
+            DatabaseType.SQLCe,
+            Mock.Of<IPocoDataFactory>());
+        var scopeProvider = new MigrationTests.TestScopeProvider(scope) { SqlContext = sqlContext };
 
-            MigrationPlan plan = new MigrationPlan("Test")
-                .From(string.Empty).To<TestMigration>("done");
+        var plan = new MigrationPlan("Test")
+            .From(string.Empty).To<TestMigration>("done");
 
-            TestMigration.MigrateCount = 0;
-            TestPostMigration.MigrateCount = 0;
+        TestMigration.MigrateCount = 0;
+        TestPostMigration.MigrateCount = 0;
 
-            new MigrationContext(plan, database, s_loggerFactory.CreateLogger<MigrationContext>());
+        new MigrationContext(plan, database, s_loggerFactory.CreateLogger<MigrationContext>());
 
-            var upgrader = new Upgrader(plan);
-            IMigrationPlanExecutor executor = GetMigrationPlanExecutor(scopeProvider, scopeProvider, builder);
-            upgrader.Execute(
-                executor,
-                scopeProvider,
-                Mock.Of<IKeyValueService>());
+        var upgrader = new Upgrader(plan);
+        var executor = GetMigrationPlanExecutor(scopeProvider, scopeProvider, builder);
+        upgrader.Execute(
+            executor,
+            scopeProvider,
+            Mock.Of<IKeyValueService>());
 
-            Assert.AreEqual(1, TestMigration.MigrateCount);
-            Assert.AreEqual(1, TestPostMigration.MigrateCount);
+        Assert.AreEqual(1, TestMigration.MigrateCount);
+        Assert.AreEqual(1, TestPostMigration.MigrateCount);
+    }
+
+    public class TestMigration : MigrationBase
+    {
+        public TestMigration(IMigrationContext context)
+            : base(context)
+        {
         }
 
-        public class TestMigration : MigrationBase
+        public static int MigrateCount { get; set; }
+
+        protected override void Migrate()
         {
-            public TestMigration(IMigrationContext context)
-                : base(context)
-            {
-            }
+            MigrateCount++;
 
-            public static int MigrateCount { get; set; }
-
-            protected override void Migrate()
-            {
-                MigrateCount++;
-
-                Context.AddPostMigration<TestPostMigration>();
-            }
-        }
-
-        public class TestPostMigration : MigrationBase
-        {
-            public TestPostMigration(IMigrationContext context) : base(context)
-            {
-            }
-
-            public static int MigrateCount { get; set; }
-
-            protected override void Migrate() => MigrateCount++;
+            Context.AddPostMigration<TestPostMigration>();
         }
     }
+
+    public class TestPostMigration : MigrationBase
+    {
+        public TestPostMigration(IMigrationContext context)
+            : base(context)
+        {
+        }
+
+        public static int MigrateCount { get; set; }
+
+        protected override void Migrate() => MigrateCount++;
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs
index 370cd5b22c..4fbf7e1a82 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/AlterUserTableMigrationStub.cs
@@ -1,23 +1,20 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Umbraco.Cms.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs
-{
-    public class AlterUserTableMigrationStub : MigrationBase
-    {
-        public AlterUserTableMigrationStub(IMigrationContext context)
-            : base(context)
-        {
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-        protected override void Migrate()
-        {
-            Alter.Table("umbracoUser")
-                 .AddColumn("Birthday")
-                 .AsDateTime()
-                 .Nullable();
-        }
+public class AlterUserTableMigrationStub : MigrationBase
+{
+    public AlterUserTableMigrationStub(IMigrationContext context)
+        : base(context)
+    {
     }
+
+    protected override void Migrate() =>
+        Alter.Table("umbracoUser")
+            .AddColumn("Birthday")
+            .AsDateTime()
+            .Nullable();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs
index 6d50b15919..670d3f77fd 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/DropForeignKeyMigrationStub.cs
@@ -1,20 +1,17 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Umbraco.Cms.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs
-{
-    public class DropForeignKeyMigrationStub : MigrationBase
-    {
-        public DropForeignKeyMigrationStub(IMigrationContext context)
-            : base(context)
-        {
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-        protected override void Migrate()
-        {
-            Delete.ForeignKey().FromTable("umbracoUser2app").ForeignColumn("user").ToTable("umbracoUser").PrimaryColumn("id").Do();
-        }
+public class DropForeignKeyMigrationStub : MigrationBase
+{
+    public DropForeignKeyMigrationStub(IMigrationContext context)
+        : base(context)
+    {
     }
+
+    protected override void Migrate() => Delete.ForeignKey().FromTable("umbracoUser2app").ForeignColumn("user")
+        .ToTable("umbracoUser").PrimaryColumn("id").Do();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs
index a7212f0898..4c2aea2bd4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/Dummy.cs
@@ -1,20 +1,21 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System;
 using Umbraco.Cms.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs
-{
-    /// <summary>
-    /// This is just a dummy class that is used to ensure that implementations
-    /// of IMigration is not found if it doesn't have the MigrationAttribute (like this class).
-    /// </summary>
-    public class Dummy : MigrationBase
-    {
-        public Dummy(IMigrationContext context) : base(context)
-        {
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-        protected override void Migrate() => throw new System.NotImplementedException();
+/// <summary>
+///     This is just a dummy class that is used to ensure that implementations
+///     of IMigration is not found if it doesn't have the MigrationAttribute (like this class).
+/// </summary>
+public class Dummy : MigrationBase
+{
+    public Dummy(IMigrationContext context)
+        : base(context)
+    {
     }
+
+    protected override void Migrate() => throw new NotImplementedException();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs
index df4ae36420..2200369d69 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FiveZeroMigration.cs
@@ -1,19 +1,18 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Umbraco.Cms.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs
-{
-    public class FiveZeroMigration : MigrationBase
-    {
-        public FiveZeroMigration(IMigrationContext context)
-            : base(context)
-        {
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-        protected override void Migrate()
-        {
-        }
+public class FiveZeroMigration : MigrationBase
+{
+    public FiveZeroMigration(IMigrationContext context)
+        : base(context)
+    {
+    }
+
+    protected override void Migrate()
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs
index 9a245704e3..f31970a866 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/FourElevenMigration.cs
@@ -1,20 +1,16 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Umbraco.Cms.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs
-{
-    public class FourElevenMigration : MigrationBase
-    {
-        public FourElevenMigration(IMigrationContext context)
-            : base(context)
-        {
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-        protected override void Migrate()
-        {
-            Alter.Table("umbracoUser").AddColumn("companyPhone").AsString(255);
-        }
+public class FourElevenMigration : MigrationBase
+{
+    public FourElevenMigration(IMigrationContext context)
+        : base(context)
+    {
     }
+
+    protected override void Migrate() => Alter.Table("umbracoUser").AddColumn("companyPhone").AsString(255);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs
index 30b06190a7..99d6580056 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration1.cs
@@ -1,20 +1,16 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Umbraco.Cms.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs
-{
-    public class SixZeroMigration1 : MigrationBase
-    {
-        public SixZeroMigration1(IMigrationContext context)
-            : base(context)
-        {
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-        protected override void Migrate()
-        {
-            Alter.Table("umbracoUser").AddColumn("secret").AsString(255);
-        }
+public class SixZeroMigration1 : MigrationBase
+{
+    public SixZeroMigration1(IMigrationContext context)
+        : base(context)
+    {
     }
+
+    protected override void Migrate() => Alter.Table("umbracoUser").AddColumn("secret").AsString(255);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs
index bc494f8fed..0d2acde945 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Stubs/SixZeroMigration2.cs
@@ -1,20 +1,16 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Umbraco.Cms.Infrastructure.Migrations;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs
-{
-    public class SixZeroMigration2 : MigrationBase
-    {
-        public SixZeroMigration2(IMigrationContext context)
-            : base(context)
-        {
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Stubs;
 
-        protected override void Migrate()
-        {
-            Alter.Table("umbracoUser").AddColumn("secondEmail").AsString(255);
-        }
+public class SixZeroMigration2 : MigrationBase
+{
+    public SixZeroMigration2(IMigrationContext context)
+        : base(context)
+    {
     }
+
+    protected override void Migrate() => Alter.Table("umbracoUser").AddColumn("secondEmail").AsString(255);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs
index d832f09325..bb3699bcba 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Migrations/Upgrade/V_8_17_0/AddPropertyTypeGroupColumnsTests.cs
@@ -10,45 +10,45 @@ using Umbraco.Cms.Infrastructure.Migrations.Upgrade.V_8_17_0;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Upgrade.V_8_17_0
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Migrations.Upgrade.V_8_17_0;
+
+[TestFixture]
+public class AddPropertyTypeGroupColumnsTests
 {
-    [TestFixture]
-    public class AddPropertyTypeGroupColumnsTests
+    private readonly IShortStringHelper _shortStringHelper =
+        new DefaultShortStringHelper(Options.Create(new RequestHandlerSettings()));
+
+    private readonly ILogger<MigrationContext> _contextLogger = Mock.Of<ILogger<MigrationContext>>();
+
+    [Test]
+    public void CreateColumn()
     {
-        private readonly IShortStringHelper _shortStringHelper = new DefaultShortStringHelper(Options.Create(new RequestHandlerSettings()));
-        private readonly ILogger<MigrationContext> _contextLogger = Mock.Of<ILogger<MigrationContext>>();
+        var database = new TestDatabase();
+        var context = new MigrationContext(new MigrationPlan("test"), database, _contextLogger);
+        var migration = new AddPropertyTypeGroupColumns(context, _shortStringHelper);
 
-        [Test]
-        public void CreateColumn()
+        var dtos = new[]
         {
-            var database = new TestDatabase();
-            var context = new MigrationContext(new MigrationPlan("test"), database, _contextLogger);
-            var migration = new AddPropertyTypeGroupColumns(context, _shortStringHelper);
+            new PropertyTypeGroupDto { Id = 0, Text = "Content" }, new PropertyTypeGroupDto { Id = 1, Text = "Content" },
+            new PropertyTypeGroupDto { Id = 2, Text = "Settings" },
+            new PropertyTypeGroupDto { Id = 3, Text = "Content " }, // The trailing space is intentional
+            new PropertyTypeGroupDto { Id = 4, Text = "SEO/OpenGraph" },
+            new PropertyTypeGroupDto { Id = 5, Text = "Site defaults" },
+        };
 
-            var dtos = new[]
-            {
-                new PropertyTypeGroupDto() { Id = 0, Text = "Content" },
-                new PropertyTypeGroupDto() { Id = 1, Text = "Content" },
-                new PropertyTypeGroupDto() { Id = 2, Text = "Settings" },
-                new PropertyTypeGroupDto() { Id = 3, Text = "Content " }, // The trailing space is intentional
-                new PropertyTypeGroupDto() { Id = 4, Text = "SEO/OpenGraph" },
-                new PropertyTypeGroupDto() { Id = 5, Text = "Site defaults" }
-            };
+        var populatedDtos = migration.PopulateAliases(dtos)
+            .OrderBy(x => x.Id) // The populated DTOs can be returned in a different order
+            .ToArray();
 
-            var populatedDtos = migration.PopulateAliases(dtos)
-                .OrderBy(x => x.Id) // The populated DTOs can be returned in a different order
-                .ToArray();
+        // All DTOs should be returned and Id and Text should be unaltered
+        Assert.That(dtos.Select(x => (x.Id, x.Text)), Is.EquivalentTo(populatedDtos.Select(x => (x.Id, x.Text))));
 
-            // All DTOs should be returned and Id and Text should be unaltered
-            Assert.That(dtos.Select(x => (x.Id, x.Text)), Is.EquivalentTo(populatedDtos.Select(x => (x.Id, x.Text))));
-
-            // Check populated aliases
-            Assert.That(populatedDtos[0].Alias, Is.EqualTo("content"));
-            Assert.That(populatedDtos[1].Alias, Is.EqualTo("content"));
-            Assert.That(populatedDtos[2].Alias, Is.EqualTo("settings"));
-            Assert.That(populatedDtos[3].Alias, Is.EqualTo("content2"));
-            Assert.That(populatedDtos[4].Alias, Is.EqualTo("sEOOpenGraph"));
-            Assert.That(populatedDtos[5].Alias, Is.EqualTo("siteDefaults"));
-        }
+        // Check populated aliases
+        Assert.That(populatedDtos[0].Alias, Is.EqualTo("content"));
+        Assert.That(populatedDtos[1].Alias, Is.EqualTo("content"));
+        Assert.That(populatedDtos[2].Alias, Is.EqualTo("settings"));
+        Assert.That(populatedDtos[3].Alias, Is.EqualTo("content2"));
+        Assert.That(populatedDtos[4].Alias, Is.EqualTo("sEOOpenGraph"));
+        Assert.That(populatedDtos[5].Alias, Is.EqualTo("siteDefaults"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
index 4ab4d769b2..c18efee429 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/DataTypeTests.cs
@@ -1,61 +1,59 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Reflection;
 using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Models;
+
+[TestFixture]
+public class DataTypeTests
 {
-    [TestFixture]
-    public class DataTypeTests
+    [SetUp]
+    public void SetUp() => _builder = new DataTypeBuilder();
+
+    private DataTypeBuilder _builder;
+
+    [Test]
+    public void Can_Deep_Clone()
     {
-        private DataTypeBuilder _builder;
+        var dtd = _builder
+            .WithId(3123)
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new DataTypeBuilder();
+        var clone = (DataType)dtd.DeepClone();
 
-        [Test]
-        public void Can_Deep_Clone()
+        Assert.AreNotSame(clone, dtd);
+        Assert.AreEqual(clone, dtd);
+        Assert.AreEqual(clone.CreateDate, dtd.CreateDate);
+        Assert.AreEqual(clone.CreatorId, dtd.CreatorId);
+        Assert.AreEqual(clone.DatabaseType, dtd.DatabaseType);
+        Assert.AreEqual(clone.Id, dtd.Id);
+        Assert.AreEqual(clone.Key, dtd.Key);
+        Assert.AreEqual(clone.Level, dtd.Level);
+        Assert.AreEqual(clone.Name, dtd.Name);
+        Assert.AreEqual(clone.ParentId, dtd.ParentId);
+        Assert.AreEqual(clone.Path, dtd.Path);
+        Assert.AreEqual(clone.SortOrder, dtd.SortOrder);
+        Assert.AreEqual(clone.Trashed, dtd.Trashed);
+        Assert.AreEqual(clone.UpdateDate, dtd.UpdateDate);
+
+        // This double verifies by reflection
+        var allProps = clone.GetType().GetProperties();
+        foreach (var propertyInfo in allProps)
         {
-            DataType dtd = _builder
-               .WithId(3123)
-               .Build();
-
-            var clone = (DataType)dtd.DeepClone();
-
-            Assert.AreNotSame(clone, dtd);
-            Assert.AreEqual(clone, dtd);
-            Assert.AreEqual(clone.CreateDate, dtd.CreateDate);
-            Assert.AreEqual(clone.CreatorId, dtd.CreatorId);
-            Assert.AreEqual(clone.DatabaseType, dtd.DatabaseType);
-            Assert.AreEqual(clone.Id, dtd.Id);
-            Assert.AreEqual(clone.Key, dtd.Key);
-            Assert.AreEqual(clone.Level, dtd.Level);
-            Assert.AreEqual(clone.Name, dtd.Name);
-            Assert.AreEqual(clone.ParentId, dtd.ParentId);
-            Assert.AreEqual(clone.Path, dtd.Path);
-            Assert.AreEqual(clone.SortOrder, dtd.SortOrder);
-            Assert.AreEqual(clone.Trashed, dtd.Trashed);
-            Assert.AreEqual(clone.UpdateDate, dtd.UpdateDate);
-
-            // This double verifies by reflection
-            PropertyInfo[] allProps = clone.GetType().GetProperties();
-            foreach (PropertyInfo propertyInfo in allProps)
-            {
-                Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(dtd, null));
-            }
-        }
-
-        [Test]
-        public void Can_Serialize_Without_Error()
-        {
-            DataType item = _builder.Build();
-
-            Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+            Assert.AreEqual(propertyInfo.GetValue(clone, null), propertyInfo.GetValue(dtd, null));
         }
     }
+
+    [Test]
+    public void Can_Serialize_Without_Error()
+    {
+        var item = _builder.Build();
+
+        Assert.DoesNotThrow(() => JsonConvert.SerializeObject(item));
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs
index bbe04db34a..11a4c87ce5 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Models/PathValidationTests.cs
@@ -10,142 +10,150 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Models
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Models;
+
+[TestFixture]
+public class PathValidationTests
 {
-    [TestFixture]
-    public class PathValidationTests
+    [SetUp]
+    public void SetUp() => _builder = new EntitySlimBuilder();
+
+    private EntitySlimBuilder _builder;
+
+    [Test]
+    public void Validate_Path()
     {
-        private EntitySlimBuilder _builder;
+        var entity = _builder
+            .WithoutIdentity()
+            .Build();
 
-        [SetUp]
-        public void SetUp() => _builder = new EntitySlimBuilder();
+        // it's empty with no id so we need to allow it
+        Assert.IsTrue(entity.ValidatePath());
 
-        [Test]
-        public void Validate_Path()
-        {
-            EntitySlim entity = _builder
-                .WithoutIdentity()
-                .Build();
+        entity.Id = 1234;
 
-            // it's empty with no id so we need to allow it
-            Assert.IsTrue(entity.ValidatePath());
+        // it has an id but no path, so we can't allow it
+        Assert.IsFalse(entity.ValidatePath());
 
-            entity.Id = 1234;
+        entity.Path = "-1";
 
-            // it has an id but no path, so we can't allow it
-            Assert.IsFalse(entity.ValidatePath());
+        // invalid path
+        Assert.IsFalse(entity.ValidatePath());
 
-            entity.Path = "-1";
+        entity.Path = string.Concat("-1,", entity.Id);
 
-            // invalid path
-            Assert.IsFalse(entity.ValidatePath());
+        // valid path
+        Assert.IsTrue(entity.ValidatePath());
+    }
 
-            entity.Path = string.Concat("-1,", entity.Id);
+    [Test]
+    public void Ensure_Path_Throws_Without_Id()
+    {
+        var entity = _builder
+            .WithoutIdentity()
+            .Build();
 
-            // valid path
-            Assert.IsTrue(entity.ValidatePath());
-        }
-
-        [Test]
-        public void Ensure_Path_Throws_Without_Id()
-        {
-            EntitySlim entity = _builder
-                .WithoutIdentity()
-                .Build();
-
-            // no id assigned
-            Assert.Throws<InvalidOperationException>(() => entity.EnsureValidPath(Mock.Of<ILogger<EntitySlim>>(), umbracoEntity => new EntitySlim(), umbracoEntity => { }));
-        }
-
-        [Test]
-        public void Ensure_Path_Throws_Without_Parent()
-        {
-            EntitySlim entity = _builder
-                .WithId(1234)
-                .WithNoParentId()
-                .Build();
-
-            // no parent found
-            Assert.Throws<NullReferenceException>(() => entity.EnsureValidPath(Mock.Of<ILogger<EntitySlim>>(), umbracoEntity => null, umbracoEntity => { }));
-        }
-
-        [Test]
-        public void Ensure_Path_Entity_At_Root()
-        {
-            EntitySlim entity = _builder
-                .WithId(1234)
-                .Build();
-
-            entity.EnsureValidPath(Mock.Of<ILogger<EntitySlim>>(), umbracoEntity => null, umbracoEntity => { });
-
-            // works because it's under the root
-            Assert.AreEqual("-1,1234", entity.Path);
-        }
-
-        [Test]
-        public void Ensure_Path_Entity_Valid_Parent()
-        {
-            EntitySlim entity = _builder
-                .WithId(1234)
-                .WithParentId(888)
-                .Build();
-
-            entity.EnsureValidPath(Mock.Of<ILogger<EntitySlim>>(), umbracoEntity => umbracoEntity.ParentId == 888 ? new EntitySlim { Id = 888, Path = "-1,888" } : null, umbracoEntity => { });
-
-            // works because the parent was found
-            Assert.AreEqual("-1,888,1234", entity.Path);
-        }
-
-        [Test]
-        public void Ensure_Path_Entity_Valid_Recursive_Parent()
-        {
-            EntitySlim parentA = _builder
-                .WithId(999)
-                .Build();
-
-            // Re-creating the class-level builder as we need to reset before usage when creating multiple entities.
-            _builder = new EntitySlimBuilder();
-            EntitySlim parentB = _builder
-                .WithId(888)
-                .WithParentId(999)
-                .Build();
-
-            _builder = new EntitySlimBuilder();
-            EntitySlim parentC = _builder
-                .WithId(777)
-                .WithParentId(888)
-                .Build();
-
-            _builder = new EntitySlimBuilder();
-            EntitySlim entity = _builder
-                .WithId(1234)
-                .WithParentId(777)
-                .Build();
-
-            IUmbracoEntity GetParent(IUmbracoEntity umbracoEntity)
+        // no id assigned
+        Assert.Throws<InvalidOperationException>(() => entity.EnsureValidPath(
+            Mock.Of<ILogger<EntitySlim>>(),
+            umbracoEntity => new EntitySlim(),
+            umbracoEntity =>
             {
-                switch (umbracoEntity.ParentId)
-                {
-                    case 999:
-                        return parentA;
-                    case 888:
-                        return parentB;
-                    case 777:
-                        return parentC;
-                    case 1234:
-                        return entity;
-                    default:
-                        return null;
-                }
+            }));
+    }
+
+    [Test]
+    public void Ensure_Path_Throws_Without_Parent()
+    {
+        var entity = _builder
+            .WithId(1234)
+            .WithNoParentId()
+            .Build();
+
+        // no parent found
+        Assert.Throws<NullReferenceException>(() =>
+            entity.EnsureValidPath(Mock.Of<ILogger<EntitySlim>>(), umbracoEntity => null, umbracoEntity => { }));
+    }
+
+    [Test]
+    public void Ensure_Path_Entity_At_Root()
+    {
+        var entity = _builder
+            .WithId(1234)
+            .Build();
+
+        entity.EnsureValidPath(Mock.Of<ILogger<EntitySlim>>(), umbracoEntity => null, umbracoEntity => { });
+
+        // works because it's under the root
+        Assert.AreEqual("-1,1234", entity.Path);
+    }
+
+    [Test]
+    public void Ensure_Path_Entity_Valid_Parent()
+    {
+        var entity = _builder
+            .WithId(1234)
+            .WithParentId(888)
+            .Build();
+
+        entity.EnsureValidPath(
+            Mock.Of<ILogger<EntitySlim>>(),
+            umbracoEntity => umbracoEntity.ParentId == 888 ? new EntitySlim { Id = 888, Path = "-1,888" } : null,
+            umbracoEntity => { });
+
+        // works because the parent was found
+        Assert.AreEqual("-1,888,1234", entity.Path);
+    }
+
+    [Test]
+    public void Ensure_Path_Entity_Valid_Recursive_Parent()
+    {
+        var parentA = _builder
+            .WithId(999)
+            .Build();
+
+        // Re-creating the class-level builder as we need to reset before usage when creating multiple entities.
+        _builder = new EntitySlimBuilder();
+        var parentB = _builder
+            .WithId(888)
+            .WithParentId(999)
+            .Build();
+
+        _builder = new EntitySlimBuilder();
+        var parentC = _builder
+            .WithId(777)
+            .WithParentId(888)
+            .Build();
+
+        _builder = new EntitySlimBuilder();
+        var entity = _builder
+            .WithId(1234)
+            .WithParentId(777)
+            .Build();
+
+        IUmbracoEntity GetParent(IUmbracoEntity umbracoEntity)
+        {
+            switch (umbracoEntity.ParentId)
+            {
+                case 999:
+                    return parentA;
+                case 888:
+                    return parentB;
+                case 777:
+                    return parentC;
+                case 1234:
+                    return entity;
+                default:
+                    return null;
             }
-
-            // this will recursively fix all paths
-            entity.EnsureValidPath(Mock.Of<ILogger<IUmbracoEntity>>(), GetParent, umbracoEntity => { });
-
-            Assert.AreEqual("-1,999", parentA.Path);
-            Assert.AreEqual("-1,999,888", parentB.Path);
-            Assert.AreEqual("-1,999,888,777", parentC.Path);
-            Assert.AreEqual("-1,999,888,777,1234", entity.Path);
         }
+
+        // this will recursively fix all paths
+        entity.EnsureValidPath(Mock.Of<ILogger<IUmbracoEntity>>(), GetParent, umbracoEntity => { });
+
+        Assert.AreEqual("-1,999", parentA.Path);
+        Assert.AreEqual("-1,999,888", parentB.Path);
+        Assert.AreEqual("-1,999,888,777", parentC.Path);
+        Assert.AreEqual("-1,999,888,777,1234", entity.Path);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs
index c1b2bc052b..38436ba338 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/BulkDataReaderTests.cs
@@ -6,2455 +6,2860 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.Common;
-using Microsoft.Data.SqlClient;
 using NUnit.Framework;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence;
+
+/// <summary>
+///     Unit tests for <see cref="BulkDataReader" />.
+/// </summary>
+/// <remarks>
+///     Borrowed from Microsoft:
+///     See: https://blogs.msdn.microsoft.com/anthonybloesch/2013/01/23/bulk-loading-data-with-idatareader-and-sqlbulkcopy/
+/// </remarks>
+[TestFixture]
+public class BulkDataReaderTests
 {
     /// <summary>
-    ///  Unit tests for <see cref="BulkDataReader"/>.
+    ///     The <see cref="BulkDataReaderSubclass" /> schema name.
+    /// </summary>
+    private const string TestSchemaName = "TestSchema";
+
+    /// <summary>
+    ///     The <see cref="BulkDataReaderSubclass" /> table name.
+    /// </summary>
+    private const string TestTableName = "TestTable";
+
+    /// <summary>
+    ///     The test UDT schema name.
+    /// </summary>
+    private const string TestUdtSchemaName = "UdtSchema";
+
+    /// <summary>
+    ///     The test UDT name.
+    /// </summary>
+    private const string TestUdtName = "TestUdt";
+
+    /// <summary>
+    ///     The test XML schema collection database name.
+    /// </summary>
+    private const string TestXmlSchemaCollectionDatabaseName = "XmlDatabase";
+
+    /// <summary>
+    ///     The test XML schema collection owning schema name.
+    /// </summary>
+    private const string TestXmlSchemaCollectionSchemaName = "XmlSchema";
+
+    /// <summary>
+    ///     The test XML schema collection name.
+    /// </summary>
+    private const string TestXmlSchemaCollectionName = "Xml";
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.ColumnMappings" /> is functioning correctly.
+    /// </summary>
+    /// <seealso cref="BulkDataReader.ColumnMappings" />
+    [Test]
+    public void ColumnMappingsTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            var columnMappings = testReader.ColumnMappings;
+
+            Assert.IsTrue(columnMappings.Count > 0);
+            Assert.AreEqual(columnMappings.Count, testReader.FieldCount);
+
+            foreach (var columnMapping in columnMappings)
+            {
+                Assert.AreEqual(columnMapping.SourceColumn, columnMapping.DestinationColumn);
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.GetDataTypeName(int)" /> is functioning correctly.
+    /// </summary>
+    /// <seealso cref="BulkDataReader.GetDataTypeName(int)" />
+    [Test]
+    public void GetDataTypeNameTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.FieldCount > 0);
+
+            for (var currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
+            {
+                var schemaTable = testReader.GetSchemaTable();
+                Assert.IsNotNull(schemaTable);
+                Assert.AreEqual(
+                    testReader.GetDataTypeName(currentColumn),
+                    ((Type)schemaTable.Rows[currentColumn][SchemaTableColumn.DataType]).Name);
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.GetFieldType(int)" /> is functioning correctly.
+    /// </summary>
+    /// <seealso cref="BulkDataReader.GetFieldType(int)" />
+    [Test]
+    public void GetFieldTypeTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.FieldCount > 0);
+
+            for (var currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
+            {
+                var schemaTable = testReader.GetSchemaTable();
+                Assert.IsNotNull(schemaTable);
+                Assert.AreEqual(
+                    testReader.GetFieldType(currentColumn),
+                    schemaTable.Rows[currentColumn][SchemaTableColumn.DataType]);
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.GetOrdinal(string)" /> is functioning correctly.
+    /// </summary>
+    /// <seealso cref="BulkDataReader.GetOrdinal(string)" />
+    [Test]
+    public void GetOrdinalTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.FieldCount > 0);
+
+            for (var currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
+            {
+                Assert.AreEqual(testReader.GetOrdinal(testReader.GetName(currentColumn)), currentColumn);
+                Assert.AreEqual(
+                    testReader.GetOrdinal(testReader.GetName(currentColumn).ToUpperInvariant()),
+                    currentColumn);
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.GetSchemaTable()" /> functions correctly.
     /// </summary>
     /// <remarks>
-    /// Borrowed from Microsoft:
-    /// See: https://blogs.msdn.microsoft.com/anthonybloesch/2013/01/23/bulk-loading-data-with-idatareader-and-sqlbulkcopy/
+    ///     uses <see cref="BulkDataReaderSubclass" /> to test legal schema combinations.
     /// </remarks>
-    [TestFixture]
-    public class BulkDataReaderTests
+    /// <seealso cref="BulkDataReader.GetSchemaTable()" />
+    [Test]
+    public void GetSchemaTableTest()
     {
-        /// <summary>
-        /// The <see cref="BulkDataReaderSubclass"/> schema name.
-        /// </summary>
-        private const string TestSchemaName = "TestSchema";
-
-        /// <summary>
-        /// The <see cref="BulkDataReaderSubclass"/> table name.
-        /// </summary>
-        private const string TestTableName = "TestTable";
-
-        /// <summary>
-        /// The test UDT schema name.
-        /// </summary>
-        private const string TestUdtSchemaName = "UdtSchema";
-
-        /// <summary>
-        /// The test UDT name.
-        /// </summary>
-        private const string TestUdtName = "TestUdt";
-
-        /// <summary>
-        /// The test XML schema collection database name.
-        /// </summary>
-        private const string TestXmlSchemaCollectionDatabaseName = "XmlDatabase";
-
-        /// <summary>
-        /// The test XML schema collection owning schema name.
-        /// </summary>
-        private const string TestXmlSchemaCollectionSchemaName = "XmlSchema";
-
-        /// <summary>
-        /// The test XML schema collection name.
-        /// </summary>
-        private const string TestXmlSchemaCollectionName = "Xml";
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.ColumnMappings"/> is functioning correctly.
-        /// </summary>
-        /// <seealso cref="BulkDataReader.ColumnMappings"/>
-        [Test]
-        public void ColumnMappingsTest()
+        using (var testReader = new BulkDataReaderSubclass())
         {
-            using (var testReader = new BulkDataReaderSubclass())
+            var schemaTable = testReader.GetSchemaTable();
+
+            Assert.IsNotNull(schemaTable);
+            Assert.IsTrue(schemaTable.Rows.Count > 0);
+            Assert.AreEqual(schemaTable.Rows.Count, BulkDataReaderSubclass.ExpectedResultSet.Count);
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for null column names.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowNullColumnNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = null;
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.BigInt;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
             {
-                ReadOnlyCollection<SqlBulkCopyColumnMapping> columnMappings = testReader.ColumnMappings;
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
 
-                Assert.IsTrue(columnMappings.Count > 0);
-                Assert.AreEqual(columnMappings.Count, testReader.FieldCount);
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for empty column names.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowEmptyColumnNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = string.Empty;
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.BigInt;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
 
-                foreach (SqlBulkCopyColumnMapping columnMapping in columnMappings)
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for nonpositive column sizes.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowNonpositiveColumnSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 0;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.NVarChar;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for nonpositive numeric precision.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowNonpositiveNumericPrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 0;
+            testReader.NumericScale = 0;
+            testReader.ProviderType = SqlDbType.Decimal;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for negative numeric scale.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowNegativeNumericScaleTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 5;
+            testReader.NumericScale = -1;
+            testReader.ProviderType = SqlDbType.Decimal;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for binary column without a column size.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowBinaryWithoutSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Binary;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for binary column with a column size that is too large (>8000).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowBinaryWithTooLargeSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 8001;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Binary;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for char column without a column size.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowCharWithoutSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Char;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for char column with a column size that is too large (>8000).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowCharWithTooLargeSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 8001;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Char;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for decimal column without a column precision.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowDecimalWithoutPrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = 5;
+            testReader.ProviderType = SqlDbType.Decimal;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for decimal column without a column scale.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowDecimalWithoutScaleTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 20;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Decimal;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for decimal column with a column precision that is too large
+    ///     (>38).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowDecimalWithTooLargePrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 39;
+            testReader.NumericScale = 5;
+            testReader.ProviderType = SqlDbType.Decimal;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for decimal column with a column scale that is larger than the
+    ///     column precision.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowDecimalWithTooLargeScaleTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 20;
+            testReader.NumericScale = 21;
+            testReader.ProviderType = SqlDbType.Decimal;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for datetime2 column with a column size that has a precision
+    ///     that is too large (>7).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowDateTime2WithTooLargePrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 8;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.DateTime2;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for datetimeoffset column with a column size that has a
+    ///     precision that is too large (>7).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowDateTimeOffsetWithTooLargePrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 8;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.DateTimeOffset;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for nchar column without a precision.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowFloatWithoutPrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Float;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for float column with a column precision that is too large
+    ///     (>53).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowFloatWithTooLargePrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 54;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Float;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for nchar column without a column size.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowNCharWithoutSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.NChar;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for nchar column with a column size that is too large (>4000).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowNCharWithTooLargeSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 4001;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.NChar;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for nvarchar column with a column size that is too large
+    ///     (>4000).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowNVarCharWithTooLargeSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 4001;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.NVarChar;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for time column with a column precision that is too large (>7).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowTimeWithTooLargePrecisionTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 8;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Time;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for missing UDT schema name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowUdtMissingSchemaNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Udt;
+            testReader.UdtSchema = null;
+            testReader.UdtType = "Type";
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for empty UDT schema name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowUdtEmptySchemaNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Udt;
+            testReader.UdtSchema = string.Empty;
+            testReader.UdtType = "Type";
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for missing UDT name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowUdtMissingNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Udt;
+            testReader.UdtSchema = "Schema";
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for empty UDT name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowUdtEmptyNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Udt;
+            testReader.UdtSchema = "Schema";
+            testReader.UdtType = string.Empty;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for varbinary column with a column size that is too large
+    ///     (>8000).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowVarBinaryWithTooLargeSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 8001;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.VarBinary;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for varchar column with a column size that is too large
+    ///     (>8000).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowVarCharWithTooLargeSizeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 8001;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.VarChar;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for null xml collection name but with a name for the database.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowXmlNullNameWithDatabaseNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Xml;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = "Database";
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for null xml collection name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowXmlNullNameWithOwningSchemaNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Xml;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = "Schema";
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for empty xml collection database name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowXmlEmptyDatabaseNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Xml;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = string.Empty;
+            testReader.XmlSchemaCollectionOwningSchema = "Schema";
+            testReader.XmlSchemaCollectionName = "Xml";
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for empty xml collection owning schema name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowXmlEmptyOwningSchemaNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Xml;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = "Database";
+            testReader.XmlSchemaCollectionOwningSchema = string.Empty;
+            testReader.XmlSchemaCollectionName = "Xml";
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentException" /> for empty xml collection name.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowXmlEmptyNameTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Xml;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = "Database";
+            testReader.XmlSchemaCollectionOwningSchema = "Schema";
+            testReader.XmlSchemaCollectionName = string.Empty;
+
+            Assert.Throws<ArgumentException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for a structured column (which is illegal).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowStructuredTypeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Structured;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws a <see cref="ArgumentOutOfRangeException" /> for a timestamp column (which is illegal).
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowTimestampTypeTest()
+    {
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.ProviderType = SqlDbType.Timestamp;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetSchemaTable();
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that
+    ///     <see
+    ///         cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    ///     throws an <see cref="ArgumentException" /> for a column with an unallowed optional column set.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSchemaTest" /> to test the illegal schema combination.
+    /// </remarks>
+    /// <seealso
+    ///     cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)" />
+    [Test]
+    public void AddSchemaTableRowUnallowedOptionalColumnTest()
+    {
+        // Column size set
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = 5;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Bit,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.Udt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.Variant,
+                         SqlDbType.Xml,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
                 {
-                    Assert.AreEqual(columnMapping.SourceColumn, columnMapping.DestinationColumn);
                 }
             }
         }
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.GetDataTypeName(int)"/> is functioning correctly.
-        /// </summary>
-        /// <seealso cref="BulkDataReader.GetDataTypeName(int)"/>
-        [Test]
-        public void GetDataTypeNameTest()
+        // Numeric precision set
+        using (var testReader = new BulkDataReaderSchemaTest())
         {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.FieldCount > 0);
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 5;
+            testReader.NumericScale = null;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
 
-                for (int currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.Udt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Xml,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
                 {
-                    DataTable schemaTable = testReader.GetSchemaTable();
-                    Assert.IsNotNull(schemaTable);
-                    Assert.AreEqual(testReader.GetDataTypeName(currentColumn), ((Type)schemaTable.Rows[currentColumn][SchemaTableColumn.DataType]).Name);
                 }
             }
         }
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.GetFieldType(int)"/> is functioning correctly.
-        /// </summary>
-        /// <seealso cref="BulkDataReader.GetFieldType(int)"/>
-        [Test]
-        public void GetFieldTypeTest()
+        // Numeric scale set
+        using (var testReader = new BulkDataReaderSchemaTest())
         {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.FieldCount > 0);
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 5;
+            testReader.NumericScale = 3;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
 
-                for (int currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.Udt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Xml,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
                 {
-                    DataTable schemaTable = testReader.GetSchemaTable();
-                    Assert.IsNotNull(schemaTable);
-                    Assert.AreEqual(testReader.GetFieldType(currentColumn), schemaTable.Rows[currentColumn][SchemaTableColumn.DataType]);
                 }
             }
         }
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.GetOrdinal(string)"/> is functioning correctly.
-        /// </summary>
-        /// <seealso cref="BulkDataReader.GetOrdinal(string)"/>
-        [Test]
-        public void GetOrdinalTest()
+        // Numeric scale set
+        using (var testReader = new BulkDataReaderSchemaTest())
         {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.FieldCount > 0);
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = 5;
+            testReader.NumericScale = 3;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
 
-                for (int currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.Udt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Xml,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
                 {
-                    Assert.AreEqual(testReader.GetOrdinal(testReader.GetName(currentColumn)), currentColumn);
-                    Assert.AreEqual(testReader.GetOrdinal(testReader.GetName(currentColumn).ToUpperInvariant()), currentColumn);
                 }
             }
         }
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.GetSchemaTable()"/> functions correctly.
-        /// </summary>
-        /// <remarks>
-        /// uses <see cref="BulkDataReaderSubclass"/> to test legal schema combinations.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.GetSchemaTable()"/>
-        [Test]
-        public void GetSchemaTableTest()
+        // UDT type name set
+        using (var testReader = new BulkDataReaderSchemaTest())
         {
-            using (var testReader = new BulkDataReaderSubclass())
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.UdtSchema = null;
+            testReader.UdtType = "Type";
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Decimal,
+                         SqlDbType.Float,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Xml,
+                     })
             {
-                DataTable schemaTable = testReader.GetSchemaTable();
+                testReader.ProviderType = dbtype;
 
-                Assert.IsNotNull(schemaTable);
-                Assert.IsTrue(schemaTable.Rows.Count > 0);
-                Assert.AreEqual(schemaTable.Rows.Count, BulkDataReaderSubclass.ExpectedResultSet.Count);
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for null column names.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowNullColumnNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = null;
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.BigInt;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
+                try
                 {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
+                    var unused = testReader.GetSchemaTable();
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for empty column names.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowEmptyColumnNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = string.Empty;
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.BigInt;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for nonpositive column sizes.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowNonpositiveColumnSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 0;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.NVarChar;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for nonpositive numeric precision.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowNonpositiveNumericPrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 0;
-                testReader.NumericScale = 0;
-                testReader.ProviderType = SqlDbType.Decimal;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for negative numeric scale.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowNegativeNumericScaleTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 5;
-                testReader.NumericScale = -1;
-                testReader.ProviderType = SqlDbType.Decimal;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for binary column without a column size.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowBinaryWithoutSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Binary;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for binary column with a column size that is too large (>8000).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowBinaryWithTooLargeSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 8001;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Binary;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for char column without a column size.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowCharWithoutSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Char;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for char column with a column size that is too large (>8000).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowCharWithTooLargeSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 8001;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Char;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for decimal column without a column precision.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowDecimalWithoutPrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = 5;
-                testReader.ProviderType = SqlDbType.Decimal;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for decimal column without a column scale.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowDecimalWithoutScaleTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 20;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Decimal;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for decimal column with a column precision that is too large (>38).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowDecimalWithTooLargePrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 39;
-                testReader.NumericScale = 5;
-                testReader.ProviderType = SqlDbType.Decimal;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for decimal column with a column scale that is larger than the column precision.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowDecimalWithTooLargeScaleTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 20;
-                testReader.NumericScale = 21;
-                testReader.ProviderType = SqlDbType.Decimal;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for datetime2 column with a column size that has a precision that is too large (>7).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowDateTime2WithTooLargePrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 8;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.DateTime2;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for datetimeoffset column with a column size that has a precision that is too large (>7).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowDateTimeOffsetWithTooLargePrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 8;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.DateTimeOffset;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for nchar column without a precision.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowFloatWithoutPrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Float;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for float column with a column precision that is too large (>53).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowFloatWithTooLargePrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 54;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Float;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for nchar column without a column size.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowNCharWithoutSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.NChar;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for nchar column with a column size that is too large (>4000).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowNCharWithTooLargeSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 4001;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.NChar;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for nvarchar column with a column size that is too large (>4000).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowNVarCharWithTooLargeSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 4001;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.NVarChar;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for time column with a column precision that is too large (>7).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowTimeWithTooLargePrecisionTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 8;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Time;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for missing UDT schema name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowUdtMissingSchemaNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Udt;
-                testReader.UdtSchema = null;
-                testReader.UdtType = "Type";
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for empty UDT schema name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowUdtEmptySchemaNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Udt;
-                testReader.UdtSchema = string.Empty;
-                testReader.UdtType = "Type";
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for missing UDT name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowUdtMissingNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Udt;
-                testReader.UdtSchema = "Schema";
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for empty UDT name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowUdtEmptyNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Udt;
-                testReader.UdtSchema = "Schema";
-                testReader.UdtType = string.Empty;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for varbinary column with a column size that is too large (>8000).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowVarBinaryWithTooLargeSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 8001;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.VarBinary;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for varchar column with a column size that is too large (>8000).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowVarCharWithTooLargeSizeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 8001;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.VarChar;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for null xml collection name but with a name for the database.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowXmlNullNameWithDatabaseNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Xml;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = "Database";
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for null xml collection name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowXmlNullNameWithOwningSchemaNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Xml;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = "Schema";
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for empty xml collection database name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowXmlEmptyDatabaseNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Xml;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = string.Empty;
-                testReader.XmlSchemaCollectionOwningSchema = "Schema";
-                testReader.XmlSchemaCollectionName = "Xml";
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for empty xml collection owning schema name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowXmlEmptyOwningSchemaNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Xml;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = "Database";
-                testReader.XmlSchemaCollectionOwningSchema = string.Empty;
-                testReader.XmlSchemaCollectionName = "Xml";
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentException"/> for empty xml collection name.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowXmlEmptyNameTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Xml;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = "Database";
-                testReader.XmlSchemaCollectionOwningSchema = "Schema";
-                testReader.XmlSchemaCollectionName = string.Empty;
-
-                Assert.Throws<ArgumentException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for a structured column (which is illegal).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowStructuredTypeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Structured;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws a <see cref="ArgumentOutOfRangeException"/> for a timestamp column (which is illegal).
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowTimestampTypeTest()
-        {
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.ProviderType = SqlDbType.Timestamp;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    DataTable unused = testReader.GetSchemaTable();
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        /// throws an <see cref="ArgumentException"/> for a column with an unallowed optional column set.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSchemaTest"/> to test the illegal schema combination.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.AddSchemaTableRow(string,int?,short?,short?,bool,bool,bool,SqlDbType,string,string,string,string,string)"/>
-        [Test]
-        public void AddSchemaTableRowUnallowedOptionalColumnTest()
-        {
-            // Column size set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = 5;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Bit, SqlDbType.Date, SqlDbType.DateTime, SqlDbType.DateTime2,
-                    SqlDbType.DateTimeOffset, SqlDbType.Image, SqlDbType.Int, SqlDbType.Money, SqlDbType.Real,
-                    SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney, SqlDbType.Structured, SqlDbType.Text,
-                    SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt, SqlDbType.Udt, SqlDbType.UniqueIdentifier,
-                    SqlDbType.Variant, SqlDbType.Xml
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
+                    Assert.Fail();
                 }
-            }
-
-            // Numeric precision set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 5;
-                testReader.NumericScale = null;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
+                catch (ArgumentException)
                 {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.Image, SqlDbType.Int, SqlDbType.Money, SqlDbType.NChar,
-                    SqlDbType.NText, SqlDbType.NVarChar, SqlDbType.Real, SqlDbType.SmallDateTime, SqlDbType.SmallInt,
-                    SqlDbType.SmallMoney, SqlDbType.Structured, SqlDbType.Text, SqlDbType.Timestamp, SqlDbType.TinyInt,
-                    SqlDbType.Udt, SqlDbType.UniqueIdentifier, SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant,
-                    SqlDbType.Xml
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
-                }
-            }
-
-            // Numeric scale set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 5;
-                testReader.NumericScale = 3;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.DateTime2, SqlDbType.DateTimeOffset, SqlDbType.Image, SqlDbType.Int,
-                    SqlDbType.Money, SqlDbType.NChar, SqlDbType.NText, SqlDbType.NVarChar, SqlDbType.Real,
-                    SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney, SqlDbType.Structured, SqlDbType.Text,
-                    SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt, SqlDbType.Udt, SqlDbType.UniqueIdentifier,
-                    SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant, SqlDbType.Xml
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
-                }
-            }
-
-            // Numeric scale set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = 5;
-                testReader.NumericScale = 3;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.DateTime2, SqlDbType.DateTimeOffset, SqlDbType.Image, SqlDbType.Int,
-                    SqlDbType.Money, SqlDbType.NChar, SqlDbType.NText, SqlDbType.NVarChar, SqlDbType.Real,
-                    SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney, SqlDbType.Structured, SqlDbType.Text,
-                    SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt, SqlDbType.Udt, SqlDbType.UniqueIdentifier,
-                    SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant, SqlDbType.Xml
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
-                }
-            }
-
-            // UDT type name set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.UdtSchema = null;
-                testReader.UdtType = "Type";
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.DateTime2, SqlDbType.DateTimeOffset, SqlDbType.Decimal, SqlDbType.Float,
-                    SqlDbType.Image, SqlDbType.Int, SqlDbType.Money, SqlDbType.NChar, SqlDbType.NText,
-                    SqlDbType.NVarChar, SqlDbType.Real, SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney,
-                    SqlDbType.Structured, SqlDbType.Text, SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt,
-                    SqlDbType.UniqueIdentifier, SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant, SqlDbType.Xml
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
-                }
-            }
-
-            // UDT schema and type name set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.UdtSchema = "Schema";
-                testReader.UdtType = "Type";
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = null;
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.DateTime2, SqlDbType.DateTimeOffset, SqlDbType.Decimal, SqlDbType.Float,
-                    SqlDbType.Image, SqlDbType.Int, SqlDbType.Money, SqlDbType.NChar, SqlDbType.NText,
-                    SqlDbType.NVarChar, SqlDbType.Real, SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney,
-                    SqlDbType.Structured, SqlDbType.Text, SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt,
-                    SqlDbType.UniqueIdentifier, SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant, SqlDbType.Xml
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
-                }
-            }
-
-            // XML type name set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = null;
-                testReader.XmlSchemaCollectionName = "Name";
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.DateTime2, SqlDbType.DateTimeOffset, SqlDbType.Decimal, SqlDbType.Float,
-                    SqlDbType.Image, SqlDbType.Int, SqlDbType.Money, SqlDbType.NChar, SqlDbType.NText,
-                    SqlDbType.NVarChar, SqlDbType.Real, SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney,
-                    SqlDbType.Structured, SqlDbType.Text, SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt,
-                    SqlDbType.UniqueIdentifier, SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant, SqlDbType.Udt
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
-                }
-            }
-
-            // XML owning schema and type name set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = null;
-                testReader.XmlSchemaCollectionOwningSchema = "Schema";
-                testReader.XmlSchemaCollectionName = "Name";
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.DateTime2, SqlDbType.DateTimeOffset, SqlDbType.Decimal, SqlDbType.Float,
-                    SqlDbType.Image, SqlDbType.Int, SqlDbType.Money, SqlDbType.NChar, SqlDbType.NText,
-                    SqlDbType.NVarChar, SqlDbType.Real, SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney,
-                    SqlDbType.Structured, SqlDbType.Text, SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt,
-                    SqlDbType.UniqueIdentifier, SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant, SqlDbType.Udt
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
-                }
-            }
-
-            // XML database, owning schema and type name set
-            using (var testReader = new BulkDataReaderSchemaTest())
-            {
-                testReader.AllowDBNull = false;
-                testReader.ColumnName = "Name";
-                testReader.ColumnSize = null;
-                testReader.IsKey = false;
-                testReader.IsUnique = false;
-                testReader.NumericPrecision = null;
-                testReader.NumericScale = null;
-                testReader.UdtSchema = null;
-                testReader.UdtType = null;
-                testReader.XmlSchemaCollectionDatabase = "Database";
-                testReader.XmlSchemaCollectionOwningSchema = "Schema";
-                testReader.XmlSchemaCollectionName = "Name";
-
-                foreach (SqlDbType dbtype in new List<SqlDbType>
-                {
-                    SqlDbType.BigInt, SqlDbType.Binary, SqlDbType.Bit, SqlDbType.Char, SqlDbType.Date,
-                    SqlDbType.DateTime, SqlDbType.DateTime2, SqlDbType.DateTimeOffset, SqlDbType.Decimal, SqlDbType.Float,
-                    SqlDbType.Image, SqlDbType.Int, SqlDbType.Money, SqlDbType.NChar, SqlDbType.NText,
-                    SqlDbType.NVarChar, SqlDbType.Real, SqlDbType.SmallDateTime, SqlDbType.SmallInt, SqlDbType.SmallMoney,
-                    SqlDbType.Structured, SqlDbType.Text, SqlDbType.Time, SqlDbType.Timestamp, SqlDbType.TinyInt,
-                    SqlDbType.UniqueIdentifier, SqlDbType.VarBinary, SqlDbType.VarChar, SqlDbType.Variant, SqlDbType.Udt
-                })
-                {
-                    testReader.ProviderType = dbtype;
-
-                    try
-                    {
-                        DataTable unused = testReader.GetSchemaTable();
-
-                        Assert.Fail();
-                    }
-                    catch (ArgumentException)
-                    {
-                    }
                 }
             }
         }
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.Close()"/> is functioning correctly.
-        /// </summary>
-        /// <seealso cref="BulkDataReader.Close()"/>
-        [Test]
-        public void CloseTest()
+        // UDT schema and type name set
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.UdtSchema = "Schema";
+            testReader.UdtType = "Type";
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = null;
+
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Decimal,
+                         SqlDbType.Float,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Xml,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
+                {
+                }
+            }
+        }
+
+        // XML type name set
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = null;
+            testReader.XmlSchemaCollectionName = "Name";
+
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Decimal,
+                         SqlDbType.Float,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Udt,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
+                {
+                }
+            }
+        }
+
+        // XML owning schema and type name set
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = null;
+            testReader.XmlSchemaCollectionOwningSchema = "Schema";
+            testReader.XmlSchemaCollectionName = "Name";
+
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Decimal,
+                         SqlDbType.Float,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Udt,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
+                {
+                }
+            }
+        }
+
+        // XML database, owning schema and type name set
+        using (var testReader = new BulkDataReaderSchemaTest())
+        {
+            testReader.AllowDBNull = false;
+            testReader.ColumnName = "Name";
+            testReader.ColumnSize = null;
+            testReader.IsKey = false;
+            testReader.IsUnique = false;
+            testReader.NumericPrecision = null;
+            testReader.NumericScale = null;
+            testReader.UdtSchema = null;
+            testReader.UdtType = null;
+            testReader.XmlSchemaCollectionDatabase = "Database";
+            testReader.XmlSchemaCollectionOwningSchema = "Schema";
+            testReader.XmlSchemaCollectionName = "Name";
+
+            foreach (var dbtype in new List<SqlDbType>
+                     {
+                         SqlDbType.BigInt,
+                         SqlDbType.Binary,
+                         SqlDbType.Bit,
+                         SqlDbType.Char,
+                         SqlDbType.Date,
+                         SqlDbType.DateTime,
+                         SqlDbType.DateTime2,
+                         SqlDbType.DateTimeOffset,
+                         SqlDbType.Decimal,
+                         SqlDbType.Float,
+                         SqlDbType.Image,
+                         SqlDbType.Int,
+                         SqlDbType.Money,
+                         SqlDbType.NChar,
+                         SqlDbType.NText,
+                         SqlDbType.NVarChar,
+                         SqlDbType.Real,
+                         SqlDbType.SmallDateTime,
+                         SqlDbType.SmallInt,
+                         SqlDbType.SmallMoney,
+                         SqlDbType.Structured,
+                         SqlDbType.Text,
+                         SqlDbType.Time,
+                         SqlDbType.Timestamp,
+                         SqlDbType.TinyInt,
+                         SqlDbType.UniqueIdentifier,
+                         SqlDbType.VarBinary,
+                         SqlDbType.VarChar,
+                         SqlDbType.Variant,
+                         SqlDbType.Udt,
+                     })
+            {
+                testReader.ProviderType = dbtype;
+
+                try
+                {
+                    var unused = testReader.GetSchemaTable();
+
+                    Assert.Fail();
+                }
+                catch (ArgumentException)
+                {
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.Close()" /> is functioning correctly.
+    /// </summary>
+    /// <seealso cref="BulkDataReader.Close()" />
+    [Test]
+    public void CloseTest()
+    {
+        var testReader = new BulkDataReaderSubclass();
+
+        testReader.Close();
+
+        Assert.IsTrue(testReader.IsClosed);
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.Depth" /> is functioning correctly.
+    /// </summary>
+    /// <remarks>
+    ///     Because nested row sets are not supported, this should always return 0;
+    /// </remarks>
+    /// <seealso cref="BulkDataReader.Depth" />
+    [Test]
+    public void DepthTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            Assert.AreEqual(0, testReader.Depth);
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.GetData(int)" /> is functioning correctly.
+    /// </summary>
+    /// <remarks>
+    ///     Because nested row sets are not supported, this should always return null;
+    /// </remarks>
+    /// <seealso cref="BulkDataReader.GetData(int)" />
+    [Test]
+    public void GetDataTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            Assert.IsTrue(testReader.FieldCount > 0);
+
+            Assert.IsNull(testReader.GetData(0));
+        }
+    }
+
+    /// <summary>
+    ///     Test <see cref="BulkDataReader.GetValue(int)" /> and related functions.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSubclass" /> to test legal schema combinations.
+    /// </remarks>
+    [Test]
+    public void GetValueTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            // this[int]
+            for (var column = 0; column < BulkDataReaderSubclass.ExpectedResultSet.Count; column++)
+            {
+                Assert.AreEqual(testReader[column], BulkDataReaderSubclass.ExpectedResultSet[column]);
+            }
+
+            // this[string]
+            for (var column = 0; column < BulkDataReaderSubclass.ExpectedResultSet.Count; column++)
+            {
+                Assert.AreEqual(
+                    testReader[testReader.GetName(column)],
+                    BulkDataReaderSubclass.ExpectedResultSet[column]);
+
+                Assert.AreEqual(
+                    testReader[testReader.GetName(column).ToUpperInvariant()],
+                    BulkDataReaderSubclass.ExpectedResultSet[column]);
+            }
+
+            // GetValues
+            {
+                var values = new object[BulkDataReaderSubclass.ExpectedResultSet.Count];
+                var expectedValues = new object[BulkDataReaderSubclass.ExpectedResultSet.Count];
+
+                Assert.AreEqual(testReader.GetValues(values), values.Length);
+
+                BulkDataReaderSubclass.ExpectedResultSet.CopyTo(expectedValues, 0);
+
+                Assert.IsTrue(ArraysMatch(values, expectedValues));
+            }
+
+            // Typed getters
+            {
+                var currentColumn = 0;
+
+                Assert.AreEqual(
+                    testReader.GetInt64(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+                {
+                    var expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
+                    var expectedLength = expectedResult.Length;
+                    var buffer = new byte[expectedLength];
+
+                    Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
+
+                    Assert.IsTrue(ArraysMatch(buffer, expectedResult));
+                }
+
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetBoolean(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.IsDBNull(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn] == null);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetChar(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetChar(currentColumn),
+                    ((char[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn])[0]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetChar(currentColumn),
+                    ((string)BulkDataReaderSubclass.ExpectedResultSet[currentColumn])[0]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                {
+                    var expectedResult =
+                        ((string)BulkDataReaderSubclass.ExpectedResultSet[currentColumn]).ToCharArray();
+                    var expectedLength = expectedResult.Length;
+                    var buffer = new char[expectedLength];
+
+                    Assert.AreEqual(testReader.GetChars(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
+
+                    Assert.IsTrue(ArraysMatch(buffer, expectedResult));
+                }
+
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDateTime(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDateTime(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDateTime(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDateTime(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDateTimeOffset(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDateTimeOffset(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDecimal(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDouble(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+                {
+                    var expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
+                    var expectedLength = expectedResult.Length;
+                    var buffer = new byte[expectedLength];
+
+                    Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
+
+                    Assert.IsTrue(ArraysMatch(buffer, expectedResult));
+                }
+
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetInt32(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDecimal(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetFloat(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDateTime(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetInt16(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetDecimal(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetTimeSpan(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetTimeSpan(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetByte(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetValue(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetGuid(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+                {
+                    var expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
+                    var expectedLength = expectedResult.Length;
+                    var buffer = new byte[expectedLength];
+
+                    Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
+
+                    Assert.IsTrue(ArraysMatch(buffer, expectedResult));
+                }
+
+                currentColumn++;
+                {
+                    var expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
+                    var expectedLength = expectedResult.Length;
+                    var buffer = new byte[expectedLength];
+
+                    Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
+
+                    Assert.IsTrue(ArraysMatch(buffer, expectedResult));
+                }
+
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetValue(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+                currentColumn++;
+
+                Assert.AreEqual(
+                    testReader.GetString(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Test <see cref="BulkDataReader.GetValue(int)" /> throws a <see cref="ArgumentOutOfRangeException" /> when
+    ///     the index is too small.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSubclass" /> to test the method.
+    /// </remarks>
+    /// <seealso cref="BulkDataReader.GetValue(int)" />
+    [Test]
+    public void GetValueIndexTooSmallTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetValue(-1);
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test <see cref="BulkDataReader.GetValue(int)" /> throws a <see cref="ArgumentOutOfRangeException" /> when
+    ///     the index is too large.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSubclass" /> to test the method.
+    /// </remarks>
+    /// <seealso cref="BulkDataReader.GetValue(int)" />
+    [Test]
+    public void GetValueIndexTooLargeTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetValue(testReader.FieldCount);
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test <see cref="BulkDataReader.GetData(int)" /> throws a <see cref="ArgumentOutOfRangeException" /> when
+    ///     the index is too small.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSubclass" /> to test the method.
+    /// </remarks>
+    /// <seealso cref="BulkDataReader.GetValue(int)" />
+    [Test]
+    public void GetDataIndexTooSmallTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetData(-1);
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test <see cref="BulkDataReader.GetValue(int)" /> throws a <see cref="ArgumentOutOfRangeException" /> when
+    ///     the index is too large.
+    /// </summary>
+    /// <remarks>
+    ///     Uses <see cref="BulkDataReaderSubclass" /> to test the method.
+    /// </remarks>
+    [Test]
+    public void GetDataIndexTooLargeTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            Assert.Throws<ArgumentOutOfRangeException>(() =>
+            {
+                var unused = testReader.GetData(testReader.FieldCount);
+            });
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.IsDBNull(int)" /> functions correctly.
+    /// </summary>
+    /// <seealso cref="BulkDataReader.IsDBNull(int)" />
+    [Test]
+    public void IsDbNullTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            for (var currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
+            {
+                Assert.AreEqual(
+                    testReader.IsDBNull(currentColumn),
+                    BulkDataReaderSubclass.ExpectedResultSet[currentColumn] == null);
+            }
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.NextResult()" /> is functioning correctly.
+    /// </summary>
+    /// <remarks>
+    ///     Because this is a single row set, this should always return false;
+    /// </remarks>
+    /// <seealso cref="BulkDataReader.NextResult()" />
+    [Test]
+    public void NextResultTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsFalse(testReader.NextResult());
+        }
+    }
+
+    /// <summary>
+    ///     Test that <see cref="BulkDataReader.RecordsAffected" /> is functioning correctly.
+    /// </summary>
+    /// <remarks>
+    ///     Because this row set represents a data source, this should always return -1;
+    /// </remarks>
+    /// <seealso cref="BulkDataReader.RecordsAffected" />
+    [Test]
+    public void RecordsAffectedTest()
+    {
+        using (var testReader = new BulkDataReaderSubclass())
+        {
+            Assert.IsTrue(testReader.Read());
+
+            Assert.AreEqual(-1, testReader.RecordsAffected);
+        }
+    }
+
+    /// <summary>
+    ///     Test that the <see cref="BulkDataReader" /> <see cref="IDisposable" /> interface is functioning correctly.
+    /// </summary>
+    /// <seealso cref="BulkDataReader.Dispose()" />
+    /// <seealso cref="IDisposable" />
+    [Test]
+    public void DisposableTest()
+    {
+        // Test the Dispose method
         {
             var testReader = new BulkDataReaderSubclass();
 
-            testReader.Close();
+            testReader.Dispose();
 
             Assert.IsTrue(testReader.IsClosed);
         }
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.Depth"/> is functioning correctly.
-        /// </summary>
-        /// <remarks>
-        /// Because nested row sets are not supported, this should always return 0;
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.Depth"/>
-        [Test]
-        public void DepthTest()
+        // Test the finalizer method
         {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
+            var testReader = new BulkDataReaderSubclass();
 
-                Assert.AreEqual(0, testReader.Depth);
-            }
-        }
+            testReader = null;
 
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.GetData(int)"/> is functioning correctly.
-        /// </summary>
-        /// <remarks>
-        /// Because nested row sets are not supported, this should always return null;
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.GetData(int)"/>
-        [Test]
-        public void GetDataTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
+            GC.Collect();
 
-                Assert.IsTrue(testReader.FieldCount > 0);
-
-                Assert.IsNull(testReader.GetData(0));
-            }
-        }
-
-        /// <summary>
-        /// Test <see cref="BulkDataReader.GetValue(int)"/> and related functions.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSubclass"/> to test legal schema combinations.
-        /// </remarks>
-        [Test]
-        public void GetValueTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
-
-                // this[int]
-                for (int column = 0; column < BulkDataReaderSubclass.ExpectedResultSet.Count; column++)
-                {
-                    Assert.AreEqual(testReader[column], BulkDataReaderSubclass.ExpectedResultSet[column]);
-                }
-
-                // this[string]
-                for (int column = 0; column < BulkDataReaderSubclass.ExpectedResultSet.Count; column++)
-                {
-                    Assert.AreEqual(testReader[testReader.GetName(column)], BulkDataReaderSubclass.ExpectedResultSet[column]);
-
-                    Assert.AreEqual(testReader[testReader.GetName(column).ToUpperInvariant()], BulkDataReaderSubclass.ExpectedResultSet[column]);
-                }
-
-                // GetValues
-                {
-                    object[] values = new object[BulkDataReaderSubclass.ExpectedResultSet.Count];
-                    object[] expectedValues = new object[BulkDataReaderSubclass.ExpectedResultSet.Count];
-
-                    Assert.AreEqual(testReader.GetValues(values), values.Length);
-
-                    BulkDataReaderSubclass.ExpectedResultSet.CopyTo(expectedValues, 0);
-
-                    Assert.IsTrue(ArraysMatch(values, expectedValues));
-                }
-
-                // Typed getters
-                {
-                    int currentColumn = 0;
-
-                    Assert.AreEqual(testReader.GetInt64(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-                    {
-                        byte[] expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
-                        int expectedLength = expectedResult.Length;
-                        byte[] buffer = new byte[expectedLength];
-
-                        Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
-
-                        Assert.IsTrue(ArraysMatch(buffer, expectedResult));
-                    }
-
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetBoolean(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.IsDBNull(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn] == null);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetChar(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetChar(currentColumn), ((char[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn])[0]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetChar(currentColumn), ((string)BulkDataReaderSubclass.ExpectedResultSet[currentColumn])[0]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    {
-                        char[] expectedResult = ((string)BulkDataReaderSubclass.ExpectedResultSet[currentColumn]).ToCharArray();
-                        int expectedLength = expectedResult.Length;
-                        char[] buffer = new char[expectedLength];
-
-                        Assert.AreEqual(testReader.GetChars(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
-
-                        Assert.IsTrue(ArraysMatch(buffer, expectedResult));
-                    }
-
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDateTime(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDateTime(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDateTime(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDateTime(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDateTimeOffset(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDateTimeOffset(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDecimal(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDouble(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-                    {
-                        byte[] expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
-                        int expectedLength = expectedResult.Length;
-                        byte[] buffer = new byte[expectedLength];
-
-                        Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
-
-                        Assert.IsTrue(ArraysMatch(buffer, expectedResult));
-                    }
-
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetInt32(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDecimal(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetFloat(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDateTime(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetInt16(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetDecimal(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetTimeSpan(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetTimeSpan(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetByte(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetValue(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetGuid(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-                    {
-                        byte[] expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
-                        int expectedLength = expectedResult.Length;
-                        byte[] buffer = new byte[expectedLength];
-
-                        Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
-
-                        Assert.IsTrue(ArraysMatch(buffer, expectedResult));
-                    }
-
-                    currentColumn++;
-                    {
-                        byte[] expectedResult = (byte[])BulkDataReaderSubclass.ExpectedResultSet[currentColumn];
-                        int expectedLength = expectedResult.Length;
-                        byte[] buffer = new byte[expectedLength];
-
-                        Assert.AreEqual(testReader.GetBytes(currentColumn, 0, buffer, 0, expectedLength), expectedLength);
-
-                        Assert.IsTrue(ArraysMatch(buffer, expectedResult));
-                    }
-
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetValue(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                    currentColumn++;
-
-                    Assert.AreEqual(testReader.GetString(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn]);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Test <see cref="BulkDataReader.GetValue(int)"/> throws a <see cref="ArgumentOutOfRangeException"/> when
-        /// the index is too small.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSubclass"/> to test the method.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.GetValue(int)"/>
-        [Test]
-        public void GetValueIndexTooSmallTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    object unused = testReader.GetValue(-1);
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test <see cref="BulkDataReader.GetValue(int)"/> throws a <see cref="ArgumentOutOfRangeException"/> when
-        /// the index is too large.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSubclass"/> to test the method.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.GetValue(int)"/>
-        [Test]
-        public void GetValueIndexTooLargeTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    object unused = testReader.GetValue(testReader.FieldCount);
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test <see cref="BulkDataReader.GetData(int)"/> throws a <see cref="ArgumentOutOfRangeException"/> when
-        /// the index is too small.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSubclass"/> to test the method.
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.GetValue(int)"/>
-        [Test]
-        public void GetDataIndexTooSmallTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    IDataReader unused = testReader.GetData(-1);
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test <see cref="BulkDataReader.GetValue(int)"/> throws a <see cref="ArgumentOutOfRangeException"/> when
-        /// the index is too large.
-        /// </summary>
-        /// <remarks>
-        /// Uses <see cref="BulkDataReaderSubclass"/> to test the method.
-        /// </remarks>
-        [Test]
-        public void GetDataIndexTooLargeTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
-
-                Assert.Throws<ArgumentOutOfRangeException>(() =>
-                {
-                    IDataReader unused = testReader.GetData(testReader.FieldCount);
-                });
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.IsDBNull(int)"/> functions correctly.
-        /// </summary>
-        /// <seealso cref="BulkDataReader.IsDBNull(int)"/>
-        [Test]
-        public void IsDbNullTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                for (int currentColumn = 0; currentColumn < testReader.FieldCount; currentColumn++)
-                {
-                    Assert.AreEqual(testReader.IsDBNull(currentColumn), BulkDataReaderSubclass.ExpectedResultSet[currentColumn] == null);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.NextResult()"/> is functioning correctly.
-        /// </summary>
-        /// <remarks>
-        /// Because this is a single row set, this should always return false;
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.NextResult()"/>
-        [Test]
-        public void NextResultTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsFalse(testReader.NextResult());
-            }
-        }
-
-        /// <summary>
-        /// Test that <see cref="BulkDataReader.RecordsAffected"/> is functioning correctly.
-        /// </summary>
-        /// <remarks>
-        /// Because this row set represents a data source, this should always return -1;
-        /// </remarks>
-        /// <seealso cref="BulkDataReader.RecordsAffected"/>
-        [Test]
-        public void RecordsAffectedTest()
-        {
-            using (var testReader = new BulkDataReaderSubclass())
-            {
-                Assert.IsTrue(testReader.Read());
-
-                Assert.AreEqual(-1, testReader.RecordsAffected);
-            }
-        }
-
-        /// <summary>
-        /// Test that the <see cref="BulkDataReader"/> <see cref="IDisposable"/> interface is functioning correctly.
-        /// </summary>
-        /// <seealso cref="BulkDataReader.Dispose()"/>
-        /// <seealso cref="IDisposable"/>
-        [Test]
-        public void DisposableTest()
-        {
-            // Test the Dispose method
-            {
-                var testReader = new BulkDataReaderSubclass();
-
-                testReader.Dispose();
-
-                Assert.IsTrue(testReader.IsClosed);
-            }
-
-            // Test the finalizer method
-            {
-                var testReader = new BulkDataReaderSubclass();
-
-                testReader = null;
-
-                GC.Collect();
-
-                GC.WaitForPendingFinalizers();
-            }
-        }
-
-        /// <summary>
-        /// Do the two <typeparamref name="TElementType"/> arrays match exactly?
-        /// </summary>
-        /// <typeparam name="TElementType">
-        /// The type of the array elements.
-        /// </typeparam>
-        /// <param name="left">
-        /// The first <typeparamref name="TElementType"/> array.
-        /// </param>
-        /// <param name="right">
-        /// The second <typeparamref name="TElementType"/> array.
-        /// </param>
-        /// <returns>
-        /// True if the <typeparamref name="TElementType"/> arrays have the same length and contents.
-        /// </returns>
-        private static bool ArraysMatch<TElementType>(TElementType[] left, TElementType[] right)
-        {
-            if (left == null)
-            {
-                throw new ArgumentNullException("left");
-            }
-            else if (right == null)
-            {
-                throw new ArgumentNullException("left");
-            }
-
-            bool result = true;
-
-            if (left.Length != right.Length)
-            {
-                result = false;
-            }
-            else
-            {
-                for (int currentIndex = 0; currentIndex < left.Length; currentIndex++)
-                {
-                    result &= object.Equals(left[currentIndex], right[currentIndex]);
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// A subclass of <see cref="BulkDataReader"/> used for testing its utility functions.
-        /// </summary>
-        private class BulkDataReaderSubclass : BulkDataReader
-        {
-            /// <summary>
-            /// Constructor.
-            /// </summary>
-            public BulkDataReaderSubclass()
-            {
-            }
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.SchemaName"/>.
-            /// </summary>
-            /// <remarks>
-            /// Returns <see cref="BulkDataReaderTests.TestSchemaName"/>.
-            /// </remarks>
-            protected override string SchemaName => BulkDataReaderTests.TestSchemaName;
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.TableName"/>.
-            /// </summary>
-            /// <remarks>
-            /// Returns <see cref="BulkDataReaderTests.TestTableName"/>.
-            /// </remarks>
-            protected override string TableName => BulkDataReaderTests.TestTableName;
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.AddSchemaTableRows()"/>
-            /// </summary>
-            /// <remarks>
-            /// Creates a schema row for the various <see cref="SqlDbType"/> values.
-            /// </remarks>
-            protected override void AddSchemaTableRows()
-            {
-                AddSchemaTableRow("BigInt", null, null, null, true, false, false, SqlDbType.BigInt, null, null, null, null, null);
-                AddSchemaTableRow("Binary_20", 20, null, null, false, true, false, SqlDbType.Binary, null, null, null, null, null);
-                AddSchemaTableRow("Bit", null, null, null, false, false, true, SqlDbType.Bit, null, null, null, null, null);
-                AddSchemaTableRow("Bit_null", null, null, null, false, false, true, SqlDbType.Bit, null, null, null, null, null);
-                AddSchemaTableRow("Char_Char", 1, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
-                AddSchemaTableRow("Char_Char_Array", 1, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
-                AddSchemaTableRow("Char_String", 1, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
-                AddSchemaTableRow("Char_20_String", 20, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
-                AddSchemaTableRow("Date", null, null, null, false, false, false, SqlDbType.Date, null, null, null, null, null);
-                AddSchemaTableRow("DateTime", null, null, null, false, false, false, SqlDbType.DateTime, null, null, null, null, null);
-                AddSchemaTableRow("DateTime2", null, null, null, false, false, false, SqlDbType.DateTime2, null, null, null, null, null);
-                AddSchemaTableRow("DateTime2_5", null, 5, null, false, false, false, SqlDbType.DateTime2, null, null, null, null, null);
-                AddSchemaTableRow("DateTimeOffset", null, null, null, false, false, false, SqlDbType.DateTimeOffset, null, null, null, null, null);
-                AddSchemaTableRow("DateTimeOffset_5", null, 5, null, false, false, false, SqlDbType.DateTimeOffset, null, null, null, null, null);
-                AddSchemaTableRow("Decimal_20_10", null, 20, 10, false, false, false, SqlDbType.Decimal, null, null, null, null, null);
-                AddSchemaTableRow("Float_50", null, 50, null, false, false, false, SqlDbType.Float, null, null, null, null, null);
-                AddSchemaTableRow("Image", null, null, null, false, false, false, SqlDbType.Image, null, null, null, null, null);
-                AddSchemaTableRow("Int", null, null, null, false, false, false, SqlDbType.Int, null, null, null, null, null);
-                AddSchemaTableRow("Money", null, null, null, false, false, false, SqlDbType.Money, null, null, null, null, null);
-                AddSchemaTableRow("NChar_20", 20, null, null, false, false, false, SqlDbType.NChar, null, null, null, null, null);
-                AddSchemaTableRow("NText", null, null, null, false, false, false, SqlDbType.NText, null, null, null, null, null);
-                AddSchemaTableRow("NVarChar_20", 20, null, null, false, false, false, SqlDbType.NVarChar, null, null, null, null, null);
-                AddSchemaTableRow("NVarChar_Max", null, null, null, false, false, false, SqlDbType.NVarChar, null, null, null, null, null);
-                AddSchemaTableRow("Real", null, null, null, false, false, false, SqlDbType.Real, null, null, null, null, null);
-                AddSchemaTableRow("SmallDateTime", null, null, null, false, false, false, SqlDbType.SmallDateTime, null, null, null, null, null);
-                AddSchemaTableRow("SmallInt", null, null, null, false, false, false, SqlDbType.SmallInt, null, null, null, null, null);
-                AddSchemaTableRow("SmallMoney", null, null, null, false, false, false, SqlDbType.SmallMoney, null, null, null, null, null);
-                AddSchemaTableRow("Text", null, null, null, false, false, false, SqlDbType.Text, null, null, null, null, null);
-                AddSchemaTableRow("Time", null, null, null, false, false, false, SqlDbType.Time, null, null, null, null, null);
-                AddSchemaTableRow("Time_5", null, 5, null, false, false, false, SqlDbType.Time, null, null, null, null, null);
-                AddSchemaTableRow("TinyInt", null, null, null, false, false, false, SqlDbType.TinyInt, null, null, null, null, null);
-                AddSchemaTableRow("Udt", null, null, null, false, false, false, SqlDbType.Udt, BulkDataReaderTests.TestUdtSchemaName, BulkDataReaderTests.TestUdtName, null, null, null);
-                AddSchemaTableRow("UniqueIdentifier", null, null, null, false, false, false, SqlDbType.UniqueIdentifier, null, null, null, null, null);
-                AddSchemaTableRow("VarBinary_20", 20, null, null, false, false, false, SqlDbType.VarBinary, null, null, null, null, null);
-                AddSchemaTableRow("VarBinary_Max", null, null, null, false, false, false, SqlDbType.VarBinary, null, null, null, null, null);
-                AddSchemaTableRow("VarChar_20", 20, null, null, false, false, false, SqlDbType.VarChar, null, null, null, null, null);
-                AddSchemaTableRow("VarChar_Max", null, null, null, false, false, false, SqlDbType.VarChar, null, null, null, null, null);
-                AddSchemaTableRow("Variant", null, null, null, false, false, false, SqlDbType.Variant, null, null, null, null, null);
-                AddSchemaTableRow("Xml_Database", null, null, null, false, false, false, SqlDbType.Xml, null, null, BulkDataReaderTests.TestXmlSchemaCollectionDatabaseName, BulkDataReaderTests.TestXmlSchemaCollectionSchemaName, BulkDataReaderTests.TestXmlSchemaCollectionName);
-                AddSchemaTableRow("Xml_Database_XML", null, null, null, false, false, false, SqlDbType.Xml, null, null, BulkDataReaderTests.TestXmlSchemaCollectionDatabaseName, BulkDataReaderTests.TestXmlSchemaCollectionSchemaName, BulkDataReaderTests.TestXmlSchemaCollectionName);
-                AddSchemaTableRow("Xml_Schema", null, null, null, false, false, false, SqlDbType.Xml, null, null, null, BulkDataReaderTests.TestXmlSchemaCollectionSchemaName, BulkDataReaderTests.TestXmlSchemaCollectionName);
-                AddSchemaTableRow("Xml_Xml", null, null, null, false, false, false, SqlDbType.Xml, null, null, null, null, BulkDataReaderTests.TestXmlSchemaCollectionName);
-                AddSchemaTableRow("Xml", null, null, null, false, false, false, SqlDbType.Xml, null, null, null, null, null);
-            }
-
-            /// <summary>
-            /// The result set returned by the <see cref="IDataReader"/>.
-            /// </summary>
-            public static readonly ReadOnlyCollection<object> ExpectedResultSet = new ReadOnlyCollection<object>(new List<object>
-            {
-                10L,
-                new byte[20],
-                true,
-                null,
-                'c',
-                new char[] { 'c' },
-                "c",
-                "char 20",
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTime.UtcNow,
-                DateTimeOffset.UtcNow,
-                DateTimeOffset.UtcNow,
-                10.5M,
-                (double)10.5,
-                new byte[20],
-                (int)10,
-                10.5M,
-                "nchar 20",
-                "ntext",
-                "nvarchar 20",
-                "nvarchar max",
-                10.5F,
-                DateTime.UtcNow,
-                (short)10,
-                10.5M,
-                "text",
-                DateTime.UtcNow.TimeOfDay,
-                DateTime.UtcNow.TimeOfDay,
-                (byte)10,
-                new object(),
-                Guid.NewGuid(),
-                new byte[20],
-                new byte[20],
-                "varchar 20",
-                "varchar max",
-                (int)10,
-                @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
-                @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
-                @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
-                @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
-                @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>"
-            });
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.GetValue(int)"/>
-            /// </summary>
-            /// <param name="i">
-            /// The zero-based column ordinal.
-            /// </param>
-            /// <returns>
-            /// The value of the column in <see cref="ExpectedResultSet"/>.
-            /// </returns>
-            /// <seealso cref="BulkDataReader.GetValue(int)"/>
-            public override object GetValue(int i) => BulkDataReaderSubclass.ExpectedResultSet[i];
-
-            /// <summary>
-            /// The number of rows read.
-            /// </summary>
-            private int _readCount = 0;
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.Read()"/>
-            /// </summary>
-            /// <returns>
-            /// True if there are more rows; otherwise, false.
-            /// </returns>
-            /// <seealso cref="BulkDataReader.Read()"/>
-            public override bool Read() => _readCount++ < 1;
-        }
-
-        private class BulkDataReaderSchemaTest : BulkDataReader
-        {
-            /// <summary>
-            /// Gets or sets a value indicating whether the column is nullable (i.e. optional).
-            /// </summary>
-            public bool AllowDBNull { get; set; }
-
-            /// <summary>
-            /// Gets or sets the name of the column.
-            /// </summary>
-            public string ColumnName { get; set; }
-
-            /// <summary>
-            /// Gets or sets the size of the column which may be null if not applicable.
-            /// </summary>
-            public int? ColumnSize { get; set; }
-
-            /// <summary>
-            /// Gets or sets a value indicating whether the column part of the primary key.
-            /// </summary>
-            public bool IsKey { get; set; }
-
-            /// <summary>
-            /// Gets or sets a value indicating whether the column values are unique (i.e. never duplicated).
-            /// </summary>
-            public bool IsUnique { get; set; }
-
-            /// <summary>
-            /// Gets or sets the precision of the column which may be null if not applicable.
-            /// </summary>
-            public short? NumericPrecision { get; set; }
-
-            /// <summary>
-            /// Gets or sets the scale of the column which may be null if not applicable.
-            /// </summary>
-            public short? NumericScale { get; set; }
-
-            /// <summary>
-            /// Gets or sets the corresponding <see cref="SqlDbType"/>.
-            /// </summary>
-            public SqlDbType ProviderType { get; set; }
-
-            /// <summary>
-            /// Gets or sets the schema name of the UDT.
-            /// </summary>
-            public string UdtSchema { get; set; }
-
-            /// <summary>
-            /// Gets or sets the type name of the UDT.
-            /// </summary>
-            public string UdtType { get; set; }
-
-            /// <summary>
-            /// Gets or sets the schema collection's database name for XML columns. Otherwise, null.
-            /// </summary>
-            public string XmlSchemaCollectionDatabase { get; set; }
-
-            /// <summary>
-            /// Gets or sets the schema collection's name for XML columns. Otherwise, null.
-            /// </summary>
-            public string XmlSchemaCollectionName { get; set; }
-
-            /// <summary>
-            /// Gets or sets the schema collection's scheme name for XML columns. Otherwise, null.
-            /// </summary>
-            public string XmlSchemaCollectionOwningSchema { get; set; }
-
-            /// <summary>
-            /// Constructor.
-            /// </summary>
-            public BulkDataReaderSchemaTest()
-            {
-            }
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.SchemaName"/>.
-            /// </summary>
-            /// <remarks>
-            /// Returns <see cref="BulkDataReaderTests.TestSchemaName"/>.
-            /// </remarks>
-            protected override string SchemaName => BulkDataReaderTests.TestSchemaName;
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.TableName"/>.
-            /// </summary>
-            /// <remarks>
-            /// Returns <see cref="BulkDataReaderTests.TestTableName"/>.
-            /// </remarks>
-            protected override string TableName => BulkDataReaderTests.TestTableName;
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.AddSchemaTableRows()"/>
-            /// </summary>
-            /// <remarks>
-            /// Creates a schema row for the various <see cref="SqlDbType"/> values.
-            /// </remarks>
-            protected override void AddSchemaTableRows() =>
-                AddSchemaTableRow(
-                    ColumnName,
-                    ColumnSize,
-                    NumericPrecision,
-                    NumericScale,
-                    IsUnique,
-                    IsKey,
-                    AllowDBNull,
-                    ProviderType,
-                    UdtSchema,
-                    UdtType,
-                    XmlSchemaCollectionDatabase,
-                    XmlSchemaCollectionOwningSchema,
-                    XmlSchemaCollectionName);
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.GetValue(int)"/>
-            /// </summary>
-            /// <exception cref="InvalidOperationException">
-            /// The test stub is only for testing schema functionality and behaves as if it has no rows.
-            /// </exception>
-            /// <param name="i">
-            /// The zero-based column ordinal.
-            /// </param>
-            /// <returns>
-            /// Never returns.
-            /// </returns>
-            /// <seealso cref="BulkDataReader.GetValue(int)"/>
-            public override object GetValue(int i) => throw new InvalidOperationException("No data.");
-
-            /// <summary>
-            /// See <see cref="BulkDataReader.Read()"/>
-            /// </summary>
-            /// <returns>
-            /// False.
-            /// </returns>
-            /// <seealso cref="BulkDataReader.Read()"/>
-            public override bool Read() => false;
+            GC.WaitForPendingFinalizers();
         }
     }
+
+    /// <summary>
+    ///     Do the two <typeparamref name="TElementType" /> arrays match exactly?
+    /// </summary>
+    /// <typeparam name="TElementType">
+    ///     The type of the array elements.
+    /// </typeparam>
+    /// <param name="left">
+    ///     The first <typeparamref name="TElementType" /> array.
+    /// </param>
+    /// <param name="right">
+    ///     The second <typeparamref name="TElementType" /> array.
+    /// </param>
+    /// <returns>
+    ///     True if the <typeparamref name="TElementType" /> arrays have the same length and contents.
+    /// </returns>
+    private static bool ArraysMatch<TElementType>(TElementType[] left, TElementType[] right)
+    {
+        if (left == null)
+        {
+            throw new ArgumentNullException("left");
+        }
+
+        if (right == null)
+        {
+            throw new ArgumentNullException("left");
+        }
+
+        var result = true;
+
+        if (left.Length != right.Length)
+        {
+            result = false;
+        }
+        else
+        {
+            for (var currentIndex = 0; currentIndex < left.Length; currentIndex++)
+            {
+                result &= Equals(left[currentIndex], right[currentIndex]);
+            }
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    ///     A subclass of <see cref="BulkDataReader" /> used for testing its utility functions.
+    /// </summary>
+    private class BulkDataReaderSubclass : BulkDataReader
+    {
+        /// <summary>
+        ///     The result set returned by the <see cref="IDataReader" />.
+        /// </summary>
+        public static readonly ReadOnlyCollection<object> ExpectedResultSet = new(new List<object>
+        {
+            10L,
+            new byte[20],
+            true,
+            null,
+            'c',
+            new[] { 'c' },
+            "c",
+            "char 20",
+            DateTime.UtcNow,
+            DateTime.UtcNow,
+            DateTime.UtcNow,
+            DateTime.UtcNow,
+            DateTimeOffset.UtcNow,
+            DateTimeOffset.UtcNow,
+            10.5M,
+            10.5,
+            new byte[20],
+            10,
+            10.5M,
+            "nchar 20",
+            "ntext",
+            "nvarchar 20",
+            "nvarchar max",
+            10.5F,
+            DateTime.UtcNow,
+            (short)10,
+            10.5M,
+            "text",
+            DateTime.UtcNow.TimeOfDay,
+            DateTime.UtcNow.TimeOfDay,
+            (byte)10,
+            new(),
+            Guid.NewGuid(),
+            new byte[20],
+            new byte[20],
+            "varchar 20",
+            "varchar max",
+            10,
+            @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
+            @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
+            @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
+            @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
+            @"<?xml version=string.Empty1.0string.Empty encoding=string.Emptyutf-16string.Empty?><body/>",
+        });
+
+        /// <summary>
+        ///     The number of rows read.
+        /// </summary>
+        private int _readCount;
+
+        /// <summary>
+        ///     Constructor.
+        /// </summary>
+        public BulkDataReaderSubclass()
+        {
+        }
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.SchemaName" />.
+        /// </summary>
+        /// <remarks>
+        ///     Returns <see cref="BulkDataReaderTests.TestSchemaName" />.
+        /// </remarks>
+        protected override string SchemaName => TestSchemaName;
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.TableName" />.
+        /// </summary>
+        /// <remarks>
+        ///     Returns <see cref="BulkDataReaderTests.TestTableName" />.
+        /// </remarks>
+        protected override string TableName => TestTableName;
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.AddSchemaTableRows()" />
+        /// </summary>
+        /// <remarks>
+        ///     Creates a schema row for the various <see cref="SqlDbType" /> values.
+        /// </remarks>
+        protected override void AddSchemaTableRows()
+        {
+            AddSchemaTableRow("BigInt", null, null, null, true, false, false, SqlDbType.BigInt, null, null, null, null, null);
+            AddSchemaTableRow("Binary_20", 20, null, null, false, true, false, SqlDbType.Binary, null, null, null, null, null);
+            AddSchemaTableRow("Bit", null, null, null, false, false, true, SqlDbType.Bit, null, null, null, null, null);
+            AddSchemaTableRow("Bit_null", null, null, null, false, false, true, SqlDbType.Bit, null, null, null, null, null);
+            AddSchemaTableRow("Char_Char", 1, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
+            AddSchemaTableRow("Char_Char_Array", 1, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
+            AddSchemaTableRow("Char_String", 1, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
+            AddSchemaTableRow("Char_20_String", 20, null, null, false, false, false, SqlDbType.Char, null, null, null, null, null);
+            AddSchemaTableRow("Date", null, null, null, false, false, false, SqlDbType.Date, null, null, null, null, null);
+            AddSchemaTableRow("DateTime", null, null, null, false, false, false, SqlDbType.DateTime, null, null, null, null, null);
+            AddSchemaTableRow("DateTime2", null, null, null, false, false, false, SqlDbType.DateTime2, null, null, null, null, null);
+            AddSchemaTableRow("DateTime2_5", null, 5, null, false, false, false, SqlDbType.DateTime2, null, null, null, null, null);
+            AddSchemaTableRow("DateTimeOffset", null, null, null, false, false, false, SqlDbType.DateTimeOffset, null, null, null, null, null);
+            AddSchemaTableRow("DateTimeOffset_5", null, 5, null, false, false, false, SqlDbType.DateTimeOffset, null, null, null, null, null);
+            AddSchemaTableRow("Decimal_20_10", null, 20, 10, false, false, false, SqlDbType.Decimal, null, null, null, null, null);
+            AddSchemaTableRow("Float_50", null, 50, null, false, false, false, SqlDbType.Float, null, null, null, null, null);
+            AddSchemaTableRow("Image", null, null, null, false, false, false, SqlDbType.Image, null, null, null, null, null);
+            AddSchemaTableRow("Int", null, null, null, false, false, false, SqlDbType.Int, null, null, null, null, null);
+            AddSchemaTableRow("Money", null, null, null, false, false, false, SqlDbType.Money, null, null, null, null, null);
+            AddSchemaTableRow("NChar_20", 20, null, null, false, false, false, SqlDbType.NChar, null, null, null, null, null);
+            AddSchemaTableRow("NText", null, null, null, false, false, false, SqlDbType.NText, null, null, null, null, null);
+            AddSchemaTableRow("NVarChar_20", 20, null, null, false, false, false, SqlDbType.NVarChar, null, null, null, null, null);
+            AddSchemaTableRow("NVarChar_Max", null, null, null, false, false, false, SqlDbType.NVarChar, null, null, null, null, null);
+            AddSchemaTableRow("Real", null, null, null, false, false, false, SqlDbType.Real, null, null, null, null, null);
+            AddSchemaTableRow("SmallDateTime", null, null, null, false, false, false, SqlDbType.SmallDateTime, null, null, null, null, null);
+            AddSchemaTableRow("SmallInt", null, null, null, false, false, false, SqlDbType.SmallInt, null, null, null, null, null);
+            AddSchemaTableRow("SmallMoney", null, null, null, false, false, false, SqlDbType.SmallMoney, null, null, null, null, null);
+            AddSchemaTableRow("Text", null, null, null, false, false, false, SqlDbType.Text, null, null, null, null, null);
+            AddSchemaTableRow("Time", null, null, null, false, false, false, SqlDbType.Time, null, null, null, null, null);
+            AddSchemaTableRow("Time_5", null, 5, null, false, false, false, SqlDbType.Time, null, null, null, null, null);
+            AddSchemaTableRow("TinyInt", null, null, null, false, false, false, SqlDbType.TinyInt, null, null, null, null, null);
+            AddSchemaTableRow("Udt", null, null, null, false, false, false, SqlDbType.Udt, TestUdtSchemaName, TestUdtName, null, null, null);
+            AddSchemaTableRow("UniqueIdentifier", null, null, null, false, false, false, SqlDbType.UniqueIdentifier, null, null, null, null, null);
+            AddSchemaTableRow("VarBinary_20", 20, null, null, false, false, false, SqlDbType.VarBinary, null, null, null, null, null);
+            AddSchemaTableRow("VarBinary_Max", null, null, null, false, false, false, SqlDbType.VarBinary, null, null, null, null, null);
+            AddSchemaTableRow("VarChar_20", 20, null, null, false, false, false, SqlDbType.VarChar, null, null, null, null, null);
+            AddSchemaTableRow("VarChar_Max", null, null, null, false, false, false, SqlDbType.VarChar, null, null, null, null, null);
+            AddSchemaTableRow("Variant", null, null, null, false, false, false, SqlDbType.Variant, null, null, null, null, null);
+            AddSchemaTableRow("Xml_Database", null, null, null, false, false, false, SqlDbType.Xml, null, null, TestXmlSchemaCollectionDatabaseName, TestXmlSchemaCollectionSchemaName, TestXmlSchemaCollectionName);
+            AddSchemaTableRow("Xml_Database_XML", null, null, null, false, false, false, SqlDbType.Xml, null, null, TestXmlSchemaCollectionDatabaseName, TestXmlSchemaCollectionSchemaName, TestXmlSchemaCollectionName);
+            AddSchemaTableRow("Xml_Schema", null, null, null, false, false, false, SqlDbType.Xml, null, null, null, TestXmlSchemaCollectionSchemaName, TestXmlSchemaCollectionName);
+            AddSchemaTableRow("Xml_Xml", null, null, null, false, false, false, SqlDbType.Xml, null, null, null, null, TestXmlSchemaCollectionName);
+            AddSchemaTableRow("Xml", null, null, null, false, false, false, SqlDbType.Xml, null, null, null, null, null);
+        }
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.GetValue(int)" />
+        /// </summary>
+        /// <param name="i">
+        ///     The zero-based column ordinal.
+        /// </param>
+        /// <returns>
+        ///     The value of the column in <see cref="ExpectedResultSet" />.
+        /// </returns>
+        /// <seealso cref="BulkDataReader.GetValue(int)" />
+        public override object GetValue(int i) => ExpectedResultSet[i];
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.Read()" />
+        /// </summary>
+        /// <returns>
+        ///     True if there are more rows; otherwise, false.
+        /// </returns>
+        /// <seealso cref="BulkDataReader.Read()" />
+        public override bool Read() => _readCount++ < 1;
+    }
+
+    private class BulkDataReaderSchemaTest : BulkDataReader
+    {
+        /// <summary>
+        ///     Constructor.
+        /// </summary>
+        public BulkDataReaderSchemaTest()
+        {
+        }
+
+        /// <summary>
+        ///     Gets or sets a value indicating whether the column is nullable (i.e. optional).
+        /// </summary>
+        public bool AllowDBNull { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the name of the column.
+        /// </summary>
+        public string ColumnName { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the size of the column which may be null if not applicable.
+        /// </summary>
+        public int? ColumnSize { get; set; }
+
+        /// <summary>
+        ///     Gets or sets a value indicating whether the column part of the primary key.
+        /// </summary>
+        public bool IsKey { get; set; }
+
+        /// <summary>
+        ///     Gets or sets a value indicating whether the column values are unique (i.e. never duplicated).
+        /// </summary>
+        public bool IsUnique { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the precision of the column which may be null if not applicable.
+        /// </summary>
+        public short? NumericPrecision { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the scale of the column which may be null if not applicable.
+        /// </summary>
+        public short? NumericScale { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the corresponding <see cref="SqlDbType" />.
+        /// </summary>
+        public SqlDbType ProviderType { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the schema name of the UDT.
+        /// </summary>
+        public string UdtSchema { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the type name of the UDT.
+        /// </summary>
+        public string UdtType { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the schema collection's database name for XML columns. Otherwise, null.
+        /// </summary>
+        public string XmlSchemaCollectionDatabase { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the schema collection's name for XML columns. Otherwise, null.
+        /// </summary>
+        public string XmlSchemaCollectionName { get; set; }
+
+        /// <summary>
+        ///     Gets or sets the schema collection's scheme name for XML columns. Otherwise, null.
+        /// </summary>
+        public string XmlSchemaCollectionOwningSchema { get; set; }
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.SchemaName" />.
+        /// </summary>
+        /// <remarks>
+        ///     Returns <see cref="BulkDataReaderTests.TestSchemaName" />.
+        /// </remarks>
+        protected override string SchemaName => TestSchemaName;
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.TableName" />.
+        /// </summary>
+        /// <remarks>
+        ///     Returns <see cref="BulkDataReaderTests.TestTableName" />.
+        /// </remarks>
+        protected override string TableName => TestTableName;
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.AddSchemaTableRows()" />
+        /// </summary>
+        /// <remarks>
+        ///     Creates a schema row for the various <see cref="SqlDbType" /> values.
+        /// </remarks>
+        protected override void AddSchemaTableRows() =>
+            AddSchemaTableRow(
+                ColumnName,
+                ColumnSize,
+                NumericPrecision,
+                NumericScale,
+                IsUnique,
+                IsKey,
+                AllowDBNull,
+                ProviderType,
+                UdtSchema,
+                UdtType,
+                XmlSchemaCollectionDatabase,
+                XmlSchemaCollectionOwningSchema,
+                XmlSchemaCollectionName);
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.GetValue(int)" />
+        /// </summary>
+        /// <exception cref="InvalidOperationException">
+        ///     The test stub is only for testing schema functionality and behaves as if it has no rows.
+        /// </exception>
+        /// <param name="i">
+        ///     The zero-based column ordinal.
+        /// </param>
+        /// <returns>
+        ///     Never returns.
+        /// </returns>
+        /// <seealso cref="BulkDataReader.GetValue(int)" />
+        public override object GetValue(int i) => throw new InvalidOperationException("No data.");
+
+        /// <summary>
+        ///     See <see cref="BulkDataReader.Read()" />
+        /// </summary>
+        /// <returns>
+        ///     False.
+        /// </returns>
+        /// <seealso cref="BulkDataReader.Read()" />
+        public override bool Read() => false;
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs
index df1b457e12..4fc6a34e0e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentMapperTest.cs
@@ -1,43 +1,45 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class ContentMapperTest
 {
-    [TestFixture]
-    public class ContentMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            var column = new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.Id));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[id]"));
-        }
+        var column = new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.Id));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_Trashed_Property()
-        {
-            var column = new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.Trashed));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[trashed]"));
-        }
+    [Test]
+    public void Can_Map_Trashed_Property()
+    {
+        var column =
+            new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.Trashed));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[trashed]"));
+    }
 
-        [Test]
-        public void Can_Map_Published_Property()
-        {
-            var column = new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.Published));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Document}].[published]"));
-        }
+    [Test]
+    public void Can_Map_Published_Property()
+    {
+        var column =
+            new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.Published));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Document}].[published]"));
+    }
 
-        [Test]
-        public void Can_Map_Version_Property()
-        {
-            var column = new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.VersionId));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.ContentVersion}].[id]"));
-        }
+    [Test]
+    public void Can_Map_Version_Property()
+    {
+        var column =
+            new ContentMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(Content.VersionId));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.ContentVersion}].[id]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs
index 91f1269ec6..0bf1426ab0 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/ContentTypeMapperTest.cs
@@ -1,53 +1,52 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class ContentTypeMapperTest
 {
-    [TestFixture]
-    public class ContentTypeMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoNode].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoNode].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_Name_Property()
-        {
-            // Act
-            string column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Name");
+    [Test]
+    public void Can_Map_Name_Property()
+    {
+        // Act
+        var column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Name");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoNode].[text]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoNode].[text]"));
+    }
 
-        [Test]
-        public void Can_Map_Thumbnail_Property()
-        {
-            // Act
-            string column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Thumbnail");
+    [Test]
+    public void Can_Map_Thumbnail_Property()
+    {
+        // Act
+        var column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Thumbnail");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsContentType].[thumbnail]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsContentType].[thumbnail]"));
+    }
 
-        [Test]
-        public void Can_Map_Description_Property()
-        {
-            // Act
-            string column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Description");
+    [Test]
+    public void Can_Map_Description_Property()
+    {
+        // Act
+        var column = new ContentTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Description");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsContentType].[description]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsContentType].[description]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs
index d67f1f02e2..47039e95cd 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DataTypeMapperTest.cs
@@ -1,54 +1,53 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class DataTypeMapperTest
 {
-    [TestFixture]
-    public class DataTypeMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoNode].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoNode].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_Key_Property()
-        {
-            // Act
-            string column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Key");
+    [Test]
+    public void Can_Map_Key_Property()
+    {
+        // Act
+        var column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Key");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoNode].[uniqueId]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoNode].[uniqueId]"));
+    }
 
-        [Test]
-        public void Can_Map_DatabaseType_Property()
-        {
-            // Act
-            string column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("DatabaseType");
+    [Test]
+    public void Can_Map_DatabaseType_Property()
+    {
+        // Act
+        var column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("DatabaseType");
 
-            // Assert
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[dbType]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[dbType]"));
+    }
 
-        [Test]
-        public void Can_Map_PropertyEditorAlias_Property()
-        {
-            // Act
-            string column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("EditorAlias");
+    [Test]
+    public void Can_Map_PropertyEditorAlias_Property()
+    {
+        // Act
+        var column = new DataTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("EditorAlias");
 
-            // Assert
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[propertyEditorAlias]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[propertyEditorAlias]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs
index 84ed6dda48..bfaa0fda68 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryMapperTest.cs
@@ -1,43 +1,42 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class DictionaryMapperTest
 {
-    [TestFixture]
-    public class DictionaryMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new DictionaryMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new DictionaryMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsDictionary].[pk]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsDictionary].[pk]"));
+    }
 
-        [Test]
-        public void Can_Map_Key_Property()
-        {
-            // Act
-            string column = new DictionaryMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Key");
+    [Test]
+    public void Can_Map_Key_Property()
+    {
+        // Act
+        var column = new DictionaryMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Key");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsDictionary].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsDictionary].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_ItemKey_Property()
-        {
-            // Act
-            string column = new DictionaryMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ItemKey");
+    [Test]
+    public void Can_Map_ItemKey_Property()
+    {
+        // Act
+        var column = new DictionaryMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ItemKey");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsDictionary].[key]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsDictionary].[key]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs
index 4ed7c48f79..d36cf00c0f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/DictionaryTranslationMapperTest.cs
@@ -1,43 +1,45 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class DictionaryTranslationMapperTest
 {
-    [TestFixture]
-    public class DictionaryTranslationMapperTest
+    [Test]
+    public void Can_Map_Key_Property()
     {
-        [Test]
-        public void Can_Map_Key_Property()
-        {
-            // Act
-            string column = new DictionaryTranslationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Key");
+        // Act
+        var column =
+            new DictionaryTranslationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Key");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsLanguageText].[UniqueId]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsLanguageText].[UniqueId]"));
+    }
 
-        [Test]
-        public void Can_Map_Language_Property()
-        {
-            // Act
-            string column = new DictionaryTranslationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Language");
+    [Test]
+    public void Can_Map_Language_Property()
+    {
+        // Act
+        var column =
+            new DictionaryTranslationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Language");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsLanguageText].[languageId]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsLanguageText].[languageId]"));
+    }
 
-        [Test]
-        public void Can_Map_Value_Property()
-        {
-            // Act
-            string column = new DictionaryTranslationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Value");
+    [Test]
+    public void Can_Map_Value_Property()
+    {
+        // Act
+        var column =
+            new DictionaryTranslationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Value");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsLanguageText].[value]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsLanguageText].[value]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs
index 96b6b1b28b..099d5a2888 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/LanguageMapperTest.cs
@@ -1,43 +1,42 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class LanguageMapperTest
 {
-    [TestFixture]
-    public class LanguageMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new LanguageMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new LanguageMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoLanguage].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoLanguage].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_IsoCode_Property()
-        {
-            // Act
-            string column = new LanguageMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("IsoCode");
+    [Test]
+    public void Can_Map_IsoCode_Property()
+    {
+        // Act
+        var column = new LanguageMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("IsoCode");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoLanguage].[languageISOCode]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoLanguage].[languageISOCode]"));
+    }
 
-        [Test]
-        public void Can_Map_CultureName_Property()
-        {
-            // Act
-            string column = new LanguageMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("CultureName");
+    [Test]
+    public void Can_Map_CultureName_Property()
+    {
+        // Act
+        var column = new LanguageMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("CultureName");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoLanguage].[languageCultureName]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoLanguage].[languageCultureName]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs
index b02ea74489..2958e0ba75 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/MediaMapperTest.cs
@@ -1,43 +1,46 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Constants = Umbraco.Cms.Core.Constants;
 using MediaModel = Umbraco.Cms.Core.Models.Media;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class MediaMapperTest
 {
-    [TestFixture]
-    public class MediaMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            var column = new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.Id));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[id]"));
-        }
+        var column =
+            new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.Id));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_Trashed_Property()
-        {
-            var column = new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.Trashed));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[trashed]"));
-        }
+    [Test]
+    public void Can_Map_Trashed_Property()
+    {
+        var column =
+            new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.Trashed));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.Node}].[trashed]"));
+    }
 
-        [Test]
-        public void Can_Map_UpdateDate_Property()
-        {
-            var column = new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.UpdateDate));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.ContentVersion}].[versionDate]"));
-        }
+    [Test]
+    public void Can_Map_UpdateDate_Property()
+    {
+        var column =
+            new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.UpdateDate));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.ContentVersion}].[versionDate]"));
+    }
 
-        [Test]
-        public void Can_Map_Version_Property()
-        {
-            var column = new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.VersionId));
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.ContentVersion}].[id]"));
-        }
+    [Test]
+    public void Can_Map_Version_Property()
+    {
+        var column =
+            new MediaMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map(nameof(MediaModel.VersionId));
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.ContentVersion}].[id]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs
index 3c96895be3..9b3e0965fe 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyGroupMapperTest.cs
@@ -1,43 +1,42 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class PropertyGroupMapperTest
 {
-    [TestFixture]
-    public class PropertyGroupMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new PropertyGroupMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new PropertyGroupMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_SortOrder_Property()
-        {
-            // Act
-            string column = new PropertyGroupMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("SortOrder");
+    [Test]
+    public void Can_Map_SortOrder_Property()
+    {
+        // Act
+        var column = new PropertyGroupMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("SortOrder");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[sortorder]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[sortorder]"));
+    }
 
-        [Test]
-        public void Can_Map_Name_Property()
-        {
-            // Act
-            string column = new PropertyGroupMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Name");
+    [Test]
+    public void Can_Map_Name_Property()
+    {
+        // Act
+        var column = new PropertyGroupMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Name");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[text]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsPropertyTypeGroup].[text]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs
index dce51ae110..08adb758da 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/PropertyTypeMapperTest.cs
@@ -1,74 +1,75 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class PropertyTypeMapperTest
 {
-    [TestFixture]
-    public class PropertyTypeMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsPropertyType].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsPropertyType].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_Alias_Property()
-        {
-            // Act
-            string column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Alias");
+    [Test]
+    public void Can_Map_Alias_Property()
+    {
+        // Act
+        var column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Alias");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsPropertyType].[Alias]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsPropertyType].[Alias]"));
+    }
 
-        [Test]
-        public void Can_Map_DataTypeDefinitionId_Property()
-        {
-            // Act
-            string column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("DataTypeId");
+    [Test]
+    public void Can_Map_DataTypeDefinitionId_Property()
+    {
+        // Act
+        var column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("DataTypeId");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsPropertyType].[dataTypeId]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsPropertyType].[dataTypeId]"));
+    }
 
-        [Test]
-        public void Can_Map_SortOrder_Property()
-        {
-            // Act
-            string column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("SortOrder");
+    [Test]
+    public void Can_Map_SortOrder_Property()
+    {
+        // Act
+        var column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("SortOrder");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[cmsPropertyType].[sortOrder]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[cmsPropertyType].[sortOrder]"));
+    }
 
-        [Test]
-        public void Can_Map_PropertyEditorAlias_Property()
-        {
-            // Act
-            string column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("PropertyEditorAlias");
+    [Test]
+    public void Can_Map_PropertyEditorAlias_Property()
+    {
+        // Act
+        var column =
+            new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("PropertyEditorAlias");
 
-            // Assert
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[propertyEditorAlias]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[propertyEditorAlias]"));
+    }
 
-        [Test]
-        public void Can_Map_DataTypeDatabaseType_Property()
-        {
-            // Act
-            string column = new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ValueStorageType");
+    [Test]
+    public void Can_Map_DataTypeDatabaseType_Property()
+    {
+        // Act
+        var column =
+            new PropertyTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ValueStorageType");
 
-            // Assert
-            Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[dbType]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo($"[{Constants.DatabaseSchema.Tables.DataType}].[dbType]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs
index ede2315127..97b532fef8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationMapperTest.cs
@@ -1,63 +1,62 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class RelationMapperTest
 {
-    [TestFixture]
-    public class RelationMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelation].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelation].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_ChildId_Property()
-        {
-            // Act
-            string column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ChildId");
+    [Test]
+    public void Can_Map_ChildId_Property()
+    {
+        // Act
+        var column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ChildId");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelation].[childId]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelation].[childId]"));
+    }
 
-        [Test]
-        public void Can_Map_Datetime_Property()
-        {
-            // Act
-            string column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("CreateDate");
+    [Test]
+    public void Can_Map_Datetime_Property()
+    {
+        // Act
+        var column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("CreateDate");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelation].[datetime]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelation].[datetime]"));
+    }
 
-        [Test]
-        public void Can_Map_Comment_Property()
-        {
-            // Act
-            string column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Comment");
+    [Test]
+    public void Can_Map_Comment_Property()
+    {
+        // Act
+        var column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Comment");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelation].[comment]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelation].[comment]"));
+    }
 
-        [Test]
-        public void Can_Map_RelationType_Property()
-        {
-            // Act
-            string column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("RelationTypeId");
+    [Test]
+    public void Can_Map_RelationType_Property()
+    {
+        // Act
+        var column = new RelationMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("RelationTypeId");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelation].[relType]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelation].[relType]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs
index bf57d2d7a3..70f854273e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Mappers/RelationTypeMapperTest.cs
@@ -1,53 +1,54 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Mappers;
+
+[TestFixture]
+public class RelationTypeMapperTest
 {
-    [TestFixture]
-    public class RelationTypeMapperTest
+    [Test]
+    public void Can_Map_Id_Property()
     {
-        [Test]
-        public void Can_Map_Id_Property()
-        {
-            // Act
-            string column = new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
+        // Act
+        var column = new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Id");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelationType].[id]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelationType].[id]"));
+    }
 
-        [Test]
-        public void Can_Map_Alias_Property()
-        {
-            // Act
-            string column = new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Alias");
+    [Test]
+    public void Can_Map_Alias_Property()
+    {
+        // Act
+        var column = new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("Alias");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelationType].[alias]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelationType].[alias]"));
+    }
 
-        [Test]
-        public void Can_Map_ChildObjectType_Property()
-        {
-            // Act
-            string column = new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ChildObjectType");
+    [Test]
+    public void Can_Map_ChildObjectType_Property()
+    {
+        // Act
+        var column =
+            new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("ChildObjectType");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelationType].[childObjectType]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelationType].[childObjectType]"));
+    }
 
-        [Test]
-        public void Can_Map_IsBidirectional_Property()
-        {
-            // Act
-            string column = new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("IsBidirectional");
+    [Test]
+    public void Can_Map_IsBidirectional_Property()
+    {
+        // Act
+        var column =
+            new RelationTypeMapper(TestHelper.GetMockSqlContext(), TestHelper.CreateMaps()).Map("IsBidirectional");
 
-            // Assert
-            Assert.That(column, Is.EqualTo("[umbracoRelationType].[dual]"));
-        }
+        // Assert
+        Assert.That(column, Is.EqualTo("[umbracoRelationType].[dual]"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
index 222b2c2b36..a9aac06f0a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlExtensionsTests.cs
@@ -7,251 +7,273 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
-using Umbraco.Cms.Infrastructure.Persistence.Querying;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Persistence.SqlExtensionsStatics;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests;
+
+[TestFixture]
+public class NPocoSqlExtensionsTests : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class NPocoSqlExtensionsTests : BaseUsingSqlSyntax
+    [Test]
+    public void WhereTest()
     {
-        [Test]
-        public void WhereTest()
-        {
-            Sql<ISqlContext> sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<PropertyDataDto>()
-                .Where<PropertyDataDto>(x => x.LanguageId == null);
-            Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] is null))", sql.SQL, sql.SQL);
+        var sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<PropertyDataDto>()
+            .Where<PropertyDataDto>(x => x.LanguageId == null);
+        Assert.AreEqual(
+            "SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] is null))",
+            sql.SQL,
+            sql.SQL);
 
-            sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<PropertyDataDto>()
-                .Where<PropertyDataDto>(x => x.LanguageId == 123);
-            Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] = @0))", sql.SQL, sql.SQL);
+        sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<PropertyDataDto>()
+            .Where<PropertyDataDto>(x => x.LanguageId == 123);
+        Assert.AreEqual(
+            "SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] = @0))",
+            sql.SQL,
+            sql.SQL);
 
-            var id = 123;
+        var id = 123;
 
-            sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<PropertyDataDto>()
-                .Where<PropertyDataDto>(x => x.LanguageId == id);
-            Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] = @0))", sql.SQL, sql.SQL);
+        sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<PropertyDataDto>()
+            .Where<PropertyDataDto>(x => x.LanguageId == id);
+        Assert.AreEqual(
+            "SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] = @0))",
+            sql.SQL,
+            sql.SQL);
 
-            int? nid = 123;
+        int? nid = 123;
 
-            sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<PropertyDataDto>()
-                .Where<PropertyDataDto>(x => x.LanguageId == nid);
-            Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] = @0))", sql.SQL, sql.SQL);
+        sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<PropertyDataDto>()
+            .Where<PropertyDataDto>(x => x.LanguageId == nid);
+        Assert.AreEqual(
+            "SELECT *\nFROM [umbracoPropertyData]\nWHERE (([umbracoPropertyData].[languageId] = @0))",
+            sql.SQL,
+            sql.SQL);
 
-            // but the above comparison fails if @0 is null
-            // what we want is something similar to:
-            sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<PropertyDataDto>()
-                .Where<PropertyDataDto>(x => (nid == null && x.LanguageId == null) || (nid != null && x.LanguageId == nid));
-            Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE ((((@0 is null) AND ([umbracoPropertyData].[languageId] is null)) OR ((@1 is not null) AND ([umbracoPropertyData].[languageId] = @2))))", sql.SQL, sql.SQL);
+        // but the above comparison fails if @0 is null
+        // what we want is something similar to:
+        sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<PropertyDataDto>()
+            .Where<PropertyDataDto>(x => (nid == null && x.LanguageId == null) || (nid != null && x.LanguageId == nid));
+        Assert.AreEqual(
+            "SELECT *\nFROM [umbracoPropertyData]\nWHERE ((((@0 is null) AND ([umbracoPropertyData].[languageId] is null)) OR ((@1 is not null) AND ([umbracoPropertyData].[languageId] = @2))))",
+            sql.SQL,
+            sql.SQL);
 
-            // new SqlNullableEquals method does it automatically
-            // 'course it would be nicer if '==' could do it
-            // see note in ExpressionVisitorBase for SqlNullableEquals
+        // new SqlNullableEquals method does it automatically
+        // 'course it would be nicer if '==' could do it
+        // see note in ExpressionVisitorBase for SqlNullableEquals
 
-            // sql = new Sql<ISqlContext>(SqlContext)
-            //    .Select("*")
-            //    .From<PropertyDataDto>()
-            //    .Where<PropertyDataDto>(x => x.LanguageId.SqlNullableEquals(nid));
-            // Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE ((((@0 is null) AND ([umbracoPropertyData].[languageId] is null)) OR ((@0 is not null) AND ([umbracoPropertyData].[languageId] = @0))))", sql.SQL, sql.SQL);
+        // sql = new Sql<ISqlContext>(SqlContext)
+        //    .Select("*")
+        //    .From<PropertyDataDto>()
+        //    .Where<PropertyDataDto>(x => x.LanguageId.SqlNullableEquals(nid));
+        // Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE ((((@0 is null) AND ([umbracoPropertyData].[languageId] is null)) OR ((@0 is not null) AND ([umbracoPropertyData].[languageId] = @0))))", sql.SQL, sql.SQL);
 
-            // but, the expression above fails with SQL CE, 'specified argument for the function is not valid' in 'isnull' function
-            // so... compare with fallback values
-            sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<PropertyDataDto>()
-                .Where<PropertyDataDto>(x => x.LanguageId.SqlNullableEquals(nid, -1));
-            Assert.AreEqual("SELECT *\nFROM [umbracoPropertyData]\nWHERE ((COALESCE([umbracoPropertyData].[languageId],@0) = COALESCE(@1,@0)))", sql.SQL, sql.SQL);
-        }
+        // but, the expression above fails with SQL CE, 'specified argument for the function is not valid' in 'isnull' function
+        // so... compare with fallback values
+        sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<PropertyDataDto>()
+            .Where<PropertyDataDto>(x => x.LanguageId.SqlNullableEquals(nid, -1));
+        Assert.AreEqual(
+            "SELECT *\nFROM [umbracoPropertyData]\nWHERE ((COALESCE([umbracoPropertyData].[languageId],@0) = COALESCE(@1,@0)))",
+            sql.SQL,
+            sql.SQL);
+    }
 
-        [Test]
-        public void SqlNullableEqualsTest()
-        {
-            int? a, b;
-            a = b = null;
-            Assert.IsTrue(a.SqlNullableEquals(b, -1));
-            b = 2;
-            Assert.IsFalse(a.SqlNullableEquals(b, -1));
-            a = 2;
-            Assert.IsTrue(a.SqlNullableEquals(b, -1));
-            b = null;
-            Assert.IsFalse(a.SqlNullableEquals(b, -1));
-        }
+    [Test]
+    public void SqlNullableEqualsTest()
+    {
+        int? a, b;
+        a = b = null;
+        Assert.IsTrue(a.SqlNullableEquals(b, -1));
+        b = 2;
+        Assert.IsFalse(a.SqlNullableEquals(b, -1));
+        a = 2;
+        Assert.IsTrue(a.SqlNullableEquals(b, -1));
+        b = null;
+        Assert.IsFalse(a.SqlNullableEquals(b, -1));
+    }
 
-        [Test]
-        public void WhereInValueFieldTest()
-        {
-            Sql<ISqlContext> sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<NodeDto>()
-                .WhereIn<NodeDto>(x => x.NodeId, new[] { 1, 2, 3 });
-            Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[id] IN (@0,@1,@2))", sql.SQL);
-        }
+    [Test]
+    public void WhereInValueFieldTest()
+    {
+        var sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<NodeDto>()
+            .WhereIn<NodeDto>(x => x.NodeId, new[] { 1, 2, 3 });
+        Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[id] IN (@0,@1,@2))", sql.SQL);
+    }
 
-        [Test]
-        public void WhereInObjectFieldTest()
-        {
-            // this test used to fail because x => x.Text was evaluated as a lambda
-            // and returned "[umbracoNode].[text] = @0"... had to fix WhereIn.
-            Sql<ISqlContext> sql = new Sql<ISqlContext>(SqlContext)
-                .Select("*")
-                .From<NodeDto>()
-                .WhereIn<NodeDto>(x => x.Text, new[] { "a", "b", "c" });
-            Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[text] IN (@0,@1,@2))", sql.SQL);
-        }
+    [Test]
+    public void WhereInObjectFieldTest()
+    {
+        // this test used to fail because x => x.Text was evaluated as a lambda
+        // and returned "[umbracoNode].[text] = @0"... had to fix WhereIn.
+        var sql = new Sql<ISqlContext>(SqlContext)
+            .Select("*")
+            .From<NodeDto>()
+            .WhereIn<NodeDto>(x => x.Text, new[] { "a", "b", "c" });
+        Assert.AreEqual("SELECT *\nFROM [umbracoNode]\nWHERE ([umbracoNode].[text] IN (@0,@1,@2))", sql.SQL);
+    }
 
-        [Test]
-        public void SelectTests()
-        {
-            // select the whole DTO
-            Sql<ISqlContext> sql = Sql()
-                .Select<Dto1>()
-                .From<Dto1>();
-            Assert.AreEqual("SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value] FROM [dto1]", sql.SQL.NoCrLf());
+    [Test]
+    public void SelectTests()
+    {
+        // select the whole DTO
+        var sql = Sql()
+            .Select<Dto1>()
+            .From<Dto1>();
+        Assert.AreEqual(
+            "SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value] FROM [dto1]",
+            sql.SQL.NoCrLf());
 
-            // select only 1 field
-            sql = Sql()
-                .Select<Dto1>(x => x.Id)
-                .From<Dto1>();
-            Assert.AreEqual("SELECT [dto1].[id] AS [Id] FROM [dto1]", sql.SQL.NoCrLf());
+        // select only 1 field
+        sql = Sql()
+            .Select<Dto1>(x => x.Id)
+            .From<Dto1>();
+        Assert.AreEqual("SELECT [dto1].[id] AS [Id] FROM [dto1]", sql.SQL.NoCrLf());
 
-            // select 2 fields
-            sql = Sql()
-                .Select<Dto1>(x => x.Id, x => x.Name)
-                .From<Dto1>();
-            Assert.AreEqual("SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name] FROM [dto1]", sql.SQL.NoCrLf());
+        // select 2 fields
+        sql = Sql()
+            .Select<Dto1>(x => x.Id, x => x.Name)
+            .From<Dto1>();
+        Assert.AreEqual("SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name] FROM [dto1]", sql.SQL.NoCrLf());
 
-            // select the whole DTO and a referenced DTO
-            sql = Sql()
-                .Select<Dto1>(r => r.Select(x => x.Dto2))
-                .From<Dto1>()
-                .InnerJoin<Dto2>().On<Dto1, Dto2>(left => left.Id, right => right.Dto1Id);
-            Assert.AreEqual(
-                @"SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value]
+        // select the whole DTO and a referenced DTO
+        sql = Sql()
+            .Select<Dto1>(r => r.Select(x => x.Dto2))
+            .From<Dto1>()
+            .InnerJoin<Dto2>().On<Dto1, Dto2>(left => left.Id, right => right.Dto1Id);
+        Assert.AreEqual(
+            @"SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value]
 , [dto2].[id] AS [Dto2__Id], [dto2].[dto1id] AS [Dto2__Dto1Id], [dto2].[name] AS [Dto2__Name]
 FROM [dto1]
-INNER JOIN [dto2] ON [dto1].[id] = [dto2].[dto1id]".NoCrLf(), sql.SQL.NoCrLf(), sql.SQL);
+INNER JOIN [dto2] ON [dto1].[id] = [dto2].[dto1id]".NoCrLf(),
+            sql.SQL.NoCrLf(),
+            sql.SQL);
 
-            // select the whole DTO and nested referenced DTOs
-            sql = Sql()
-                .Select<Dto1>(r => r.Select(x => x.Dto2, r1 => r1.Select(x => x.Dto3)))
-                .From<Dto1>()
-                .InnerJoin<Dto2>().On<Dto1, Dto2>(left => left.Id, right => right.Dto1Id)
-                .InnerJoin<Dto3>().On<Dto2, Dto3>(left => left.Id, right => right.Dto2Id);
-            Assert.AreEqual(
-                @"SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value]
+        // select the whole DTO and nested referenced DTOs
+        sql = Sql()
+            .Select<Dto1>(r => r.Select(x => x.Dto2, r1 => r1.Select(x => x.Dto3)))
+            .From<Dto1>()
+            .InnerJoin<Dto2>().On<Dto1, Dto2>(left => left.Id, right => right.Dto1Id)
+            .InnerJoin<Dto3>().On<Dto2, Dto3>(left => left.Id, right => right.Dto2Id);
+        Assert.AreEqual(
+            @"SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value]
 , [dto2].[id] AS [Dto2__Id], [dto2].[dto1id] AS [Dto2__Dto1Id], [dto2].[name] AS [Dto2__Name]
 , [dto3].[id] AS [Dto2__Dto3__Id], [dto3].[dto2id] AS [Dto2__Dto3__Dto2Id], [dto3].[name] AS [Dto2__Dto3__Name]
 FROM [dto1]
 INNER JOIN [dto2] ON [dto1].[id] = [dto2].[dto1id]
-INNER JOIN [dto3] ON [dto2].[id] = [dto3].[dto2id]".NoCrLf(), sql.SQL.NoCrLf());
+INNER JOIN [dto3] ON [dto2].[id] = [dto3].[dto2id]".NoCrLf(),
+            sql.SQL.NoCrLf());
 
-            // select the whole DTO and referenced DTOs
-            sql = Sql()
-                .Select<Dto1>(r => r.Select(x => x.Dto2s))
-                .From<Dto1>()
-                .InnerJoin<Dto2>().On<Dto1, Dto2>(left => left.Id, right => right.Dto1Id);
-            Assert.AreEqual(
-                @"SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value]
+        // select the whole DTO and referenced DTOs
+        sql = Sql()
+            .Select<Dto1>(r => r.Select(x => x.Dto2s))
+            .From<Dto1>()
+            .InnerJoin<Dto2>().On<Dto1, Dto2>(left => left.Id, right => right.Dto1Id);
+        Assert.AreEqual(
+            @"SELECT [dto1].[id] AS [Id], [dto1].[name] AS [Name], [dto1].[value] AS [Value]
 , [dto2].[id] AS [Dto2s__Id], [dto2].[dto1id] AS [Dto2s__Dto1Id], [dto2].[name] AS [Dto2s__Name]
 FROM [dto1]
-INNER JOIN [dto2] ON [dto1].[id] = [dto2].[dto1id]".NoCrLf(), sql.SQL.NoCrLf());
-        }
+INNER JOIN [dto2] ON [dto1].[id] = [dto2].[dto1id]".NoCrLf(),
+            sql.SQL.NoCrLf());
+    }
 
-        [Test]
-        public void SelectAliasTests()
-        {
-            // and select - not good
-            var sql = Sql()
-                .Select<Dto1>(x => x.Id)
-                .Select<Dto2>(x => x.Id);
-            Assert.AreEqual("SELECT [dto1].[id] AS [Id] SELECT [dto2].[id] AS [Id]".NoCrLf(), sql.SQL.NoCrLf());
+    [Test]
+    public void SelectAliasTests()
+    {
+        // and select - not good
+        var sql = Sql()
+            .Select<Dto1>(x => x.Id)
+            .Select<Dto2>(x => x.Id);
+        Assert.AreEqual("SELECT [dto1].[id] AS [Id] SELECT [dto2].[id] AS [Id]".NoCrLf(), sql.SQL.NoCrLf());
 
-            // and select - good
-            sql = Sql()
-                .Select<Dto1>(x => x.Id)
-                .AndSelect<Dto2>(x => x.Id);
-            Assert.AreEqual("SELECT [dto1].[id] AS [Id] , [dto2].[id] AS [Id]".NoCrLf(), sql.SQL.NoCrLf());
+        // and select - good
+        sql = Sql()
+            .Select<Dto1>(x => x.Id)
+            .AndSelect<Dto2>(x => x.Id);
+        Assert.AreEqual("SELECT [dto1].[id] AS [Id] , [dto2].[id] AS [Id]".NoCrLf(), sql.SQL.NoCrLf());
 
-            // and select + alias
-            sql = Sql()
-                .Select<Dto1>(x => x.Id)
-                .AndSelect<Dto2>(x => Alias(x.Id, "id2"));
-            Assert.AreEqual("SELECT [dto1].[id] AS [Id] , [dto2].[id] AS [id2]".NoCrLf(), sql.SQL.NoCrLf());
-        }
+        // and select + alias
+        sql = Sql()
+            .Select<Dto1>(x => x.Id)
+            .AndSelect<Dto2>(x => Alias(x.Id, "id2"));
+        Assert.AreEqual("SELECT [dto1].[id] AS [Id] , [dto2].[id] AS [id2]".NoCrLf(), sql.SQL.NoCrLf());
+    }
 
-        [Test]
-        public void UpdateTests()
-        {
-            Sql<ISqlContext> sql = Sql()
-                .Update<DataTypeDto>(u => u.Set(x => x.EditorAlias, "Umbraco.ColorPicker"))
-                .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.ColorPickerAlias");
-        }
+    [Test]
+    public void UpdateTests()
+    {
+        var sql = Sql()
+            .Update<DataTypeDto>(u => u.Set(x => x.EditorAlias, "Umbraco.ColorPicker"))
+            .Where<DataTypeDto>(x => x.EditorAlias == "Umbraco.ColorPickerAlias");
+    }
 
-        [TableName("dto1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Dto1
-        {
-            [Column("id")]
-            public int Id { get; set; }
+    [TableName("dto1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Dto1
+    {
+        [Column("id")]
+        public int Id { get; set; }
 
-            [Column("name")]
-            public string Name { get; set; }
+        [Column("name")]
+        public string Name { get; set; }
 
-            [Column("value")]
-            public int Value { get; set; }
+        [Column("value")]
+        public int Value { get; set; }
 
-            [Reference]
-            public Dto2 Dto2 { get; set; }
+        [Reference]
+        public Dto2 Dto2 { get; set; }
 
-            [Reference]
-            public List<Dto2> Dto2s { get; set; }
-        }
+        [Reference]
+        public List<Dto2> Dto2s { get; set; }
+    }
 
-        [TableName("dto2")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Dto2
-        {
-            [Column("id")]
-            public int Id { get; set; }
+    [TableName("dto2")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Dto2
+    {
+        [Column("id")]
+        public int Id { get; set; }
 
-            [Column("dto1id")]
-            public int Dto1Id { get; set; }
+        [Column("dto1id")]
+        public int Dto1Id { get; set; }
 
-            [Column("name")]
-            public string Name { get; set; }
+        [Column("name")]
+        public string Name { get; set; }
 
-            [Reference]
-            public Dto3 Dto3 { get; set; }
-        }
+        [Reference]
+        public Dto3 Dto3 { get; set; }
+    }
 
-        [TableName("dto3")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Dto3
-        {
-            [Column("id")]
-            public int Id { get; set; }
+    [TableName("dto3")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Dto3
+    {
+        [Column("id")]
+        public int Id { get; set; }
 
-            [Column("dto2id")]
-            public int Dto2Id { get; set; }
+        [Column("dto2id")]
+        public int Dto2Id { get; set; }
 
-            [Column("name")]
-            public string Name { get; set; }
-        }
+        [Column("name")]
+        public string Name { get; set; }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
index b32f3e9823..c638e15784 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTemplateTests.cs
@@ -9,210 +9,218 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Mappers;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Extensions;
+using MapperCollection = NPoco.MapperCollection;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests;
+
+[TestFixture]
+public class NPocoSqlTemplateTests
 {
-    [TestFixture]
-    public class NPocoSqlTemplateTests
+    [Test]
+    public void SqlTemplates()
     {
-        [Test]
-        public void SqlTemplates()
-        {
-            var sqlContext = new SqlContext(new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())), DatabaseType.SqlServer2012, Mock.Of<IPocoDataFactory>());
-            var sqlTemplates = new SqlTemplates(sqlContext);
+        var sqlContext = new SqlContext(
+            new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())),
+            DatabaseType.SqlServer2012,
+            Mock.Of<IPocoDataFactory>());
+        var sqlTemplates = new SqlTemplates(sqlContext);
 
-            // this can be used for queries that we know we'll use a *lot* and
-            // want to cache as a (static) template for ever, and ever - note
-            // that using a MemoryCache would allow us to set a size limit, or
-            // something equivalent, to reduce risk of memory explosion
-            Sql<ISqlContext> sql = sqlTemplates.Get("xxx", s => s
-                .SelectAll()
-                .From("zbThing1")
-                .Where("id=@id", new { id = SqlTemplate.Arg("id") })).Sql(new { id = 1 });
+        // this can be used for queries that we know we'll use a *lot* and
+        // want to cache as a (static) template for ever, and ever - note
+        // that using a MemoryCache would allow us to set a size limit, or
+        // something equivalent, to reduce risk of memory explosion
+        var sql = sqlTemplates.Get("xxx", s => s
+            .SelectAll()
+            .From("zbThing1")
+            .Where("id=@id", new { id = SqlTemplate.Arg("id") })).Sql(new { id = 1 });
 
-            Sql<ISqlContext> sql2 = sqlTemplates.Get("xxx", x => throw new InvalidOperationException("Should be cached.")).Sql(1);
+        var sql2 = sqlTemplates.Get("xxx", x => throw new InvalidOperationException("Should be cached.")).Sql(1);
 
-            Sql<ISqlContext> sql3 = sqlTemplates.Get("xxx", x => throw new InvalidOperationException("Should be cached.")).Sql(new { id = 1 });
-        }
+        var sql3 = sqlTemplates.Get("xxx", x => throw new InvalidOperationException("Should be cached."))
+            .Sql(new { id = 1 });
+    }
 
-        [Test]
-        public void SqlTemplateArgs()
-        {
-            var mappers = new NPoco.MapperCollection { new NullableDateMapper() };
-            var factory = new FluentPocoDataFactory((type, iPocoDataFactory) => new PocoDataBuilder(type, mappers).Init(), mappers);
+    [Test]
+    public void SqlTemplateArgs()
+    {
+        var mappers = new MapperCollection { new NullableDateMapper() };
+        var factory = new FluentPocoDataFactory(
+            (type, iPocoDataFactory) => new PocoDataBuilder(type, mappers).Init(),
+            mappers);
 
-            var sqlContext = new SqlContext(new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())), DatabaseType.SQLCe, factory);
-            var sqlTemplates = new SqlTemplates(sqlContext);
+        var sqlContext = new SqlContext(
+            new SqlServerSyntaxProvider(Options.Create(new GlobalSettings())),
+            DatabaseType.SQLCe,
+            factory);
+        var sqlTemplates = new SqlTemplates(sqlContext);
 
-            const string sqlBase = "SELECT [zbThing1].[id] AS [Id], [zbThing1].[name] AS [Name] FROM [zbThing1] WHERE ";
+        const string sqlBase = "SELECT [zbThing1].[id] AS [Id], [zbThing1].[name] AS [Name] FROM [zbThing1] WHERE ";
 
-            SqlTemplate template = sqlTemplates.Get("sql1", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("value")));
+        var template = sqlTemplates.Get("sql1", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("value")));
 
-            Sql<ISqlContext> sql = template.Sql("foo");
-            Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("foo", sql.Arguments[0]);
+        var sql = template.Sql("foo");
+        Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("foo", sql.Arguments[0]);
 
-            sql = template.Sql(123);
-            Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(123, sql.Arguments[0]);
+        sql = template.Sql(123);
+        Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(123, sql.Arguments[0]);
 
-            template = sqlTemplates.Get("sql2", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("value")));
+        template = sqlTemplates.Get("sql2", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("value")));
 
-            sql = template.Sql(new { value = "foo" });
-            Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("foo", sql.Arguments[0]);
+        sql = template.Sql(new { value = "foo" });
+        Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("foo", sql.Arguments[0]);
 
-            sql = template.Sql(new { value = 123 });
-            Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(123, sql.Arguments[0]);
+        sql = template.Sql(new { value = 123 });
+        Assert.AreEqual(sqlBase + "(([zbThing1].[name] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(123, sql.Arguments[0]);
 
-            Assert.Throws<InvalidOperationException>(() => template.Sql(new { xvalue = 123 }));
-            Assert.Throws<InvalidOperationException>(() => template.Sql(new { value = 123, xvalue = 456 }));
+        Assert.Throws<InvalidOperationException>(() => template.Sql(new { xvalue = 123 }));
+        Assert.Throws<InvalidOperationException>(() => template.Sql(new { value = 123, xvalue = 456 }));
 
-            var i = 666;
+        var i = 666;
 
-            template = sqlTemplates.Get("sql3", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .Where<Thing1Dto>(x => x.Id == i));
+        template = sqlTemplates.Get("sql3", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .Where<Thing1Dto>(x => x.Id == i));
 
-            sql = template.Sql("foo");
-            Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("foo", sql.Arguments[0]);
+        sql = template.Sql("foo");
+        Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("foo", sql.Arguments[0]);
 
-            sql = template.Sql(123);
-            Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(123, sql.Arguments[0]);
+        sql = template.Sql(123);
+        Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(123, sql.Arguments[0]);
 
-            // but we cannot name them, because the arg name is the value of "i"
-            // so we have to explicitely create the argument
-            template = sqlTemplates.Get("sql4", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .Where<Thing1Dto>(x => x.Id == SqlTemplate.Arg<int>("i")));
+        // but we cannot name them, because the arg name is the value of "i"
+        // so we have to explicitely create the argument
+        template = sqlTemplates.Get("sql4", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .Where<Thing1Dto>(x => x.Id == SqlTemplate.Arg<int>("i")));
 
-            sql = template.Sql("foo");
-            Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("foo", sql.Arguments[0]);
+        sql = template.Sql("foo");
+        Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("foo", sql.Arguments[0]);
 
-            sql = template.Sql(123);
-            Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(123, sql.Arguments[0]);
+        sql = template.Sql(123);
+        Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(123, sql.Arguments[0]);
 
-            // and thanks to a patched visitor, this now works
-            sql = template.Sql(new { i = "foo" });
-            Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("foo", sql.Arguments[0]);
+        // and thanks to a patched visitor, this now works
+        sql = template.Sql(new { i = "foo" });
+        Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("foo", sql.Arguments[0]);
 
-            sql = template.Sql(new { i = 123 });
-            Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(123, sql.Arguments[0]);
+        sql = template.Sql(new { i = 123 });
+        Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(123, sql.Arguments[0]);
 
-            Assert.Throws<InvalidOperationException>(() => template.Sql(new { j = 123 }));
-            Assert.Throws<InvalidOperationException>(() => template.Sql(new { i = 123, j = 456 }));
+        Assert.Throws<InvalidOperationException>(() => template.Sql(new { j = 123 }));
+        Assert.Throws<InvalidOperationException>(() => template.Sql(new { i = 123, j = 456 }));
 
-            // now with more arguments
-            template = sqlTemplates.Get("sql4a", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .Where<Thing1Dto>(x => x.Id == SqlTemplate.Arg<int>("i") && x.Name == SqlTemplate.Arg<string>("name")));
-            sql = template.Sql(0, 1);
-            Assert.AreEqual(sqlBase + "((([zbThing1].[id] = @0) AND ([zbThing1].[name] = @1)))", sql.SQL.NoCrLf());
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual(0, sql.Arguments[0]);
-            Assert.AreEqual(1, sql.Arguments[1]);
+        // now with more arguments
+        template = sqlTemplates.Get("sql4a", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .Where<Thing1Dto>(x => x.Id == SqlTemplate.Arg<int>("i") && x.Name == SqlTemplate.Arg<string>("name")));
+        sql = template.Sql(0, 1);
+        Assert.AreEqual(sqlBase + "((([zbThing1].[id] = @0) AND ([zbThing1].[name] = @1)))", sql.SQL.NoCrLf());
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual(0, sql.Arguments[0]);
+        Assert.AreEqual(1, sql.Arguments[1]);
 
-            template = sqlTemplates.Get("sql4b", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .Where<Thing1Dto>(x => x.Id == SqlTemplate.Arg<int>("i"))
-                .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("name")));
-            sql = template.Sql(0, 1);
-            Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0)) AND (([zbThing1].[name] = @1))", sql.SQL.NoCrLf());
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual(0, sql.Arguments[0]);
-            Assert.AreEqual(1, sql.Arguments[1]);
+        template = sqlTemplates.Get("sql4b", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .Where<Thing1Dto>(x => x.Id == SqlTemplate.Arg<int>("i"))
+            .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("name")));
+        sql = template.Sql(0, 1);
+        Assert.AreEqual(sqlBase + "(([zbThing1].[id] = @0)) AND (([zbThing1].[name] = @1))", sql.SQL.NoCrLf());
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual(0, sql.Arguments[0]);
+        Assert.AreEqual(1, sql.Arguments[1]);
 
-            // works, magic
-            template = sqlTemplates.Get("sql5", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .WhereIn<Thing1Dto>(x => x.Id, SqlTemplate.ArgIn<int>("i")));
+        // works, magic
+        template = sqlTemplates.Get("sql5", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .WhereIn<Thing1Dto>(x => x.Id, SqlTemplate.ArgIn<int>("i")));
 
-            sql = template.Sql("foo");
-            Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0))", sql.SQL.NoCrLf());
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("foo", sql.Arguments[0]);
+        sql = template.Sql("foo");
+        Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("foo", sql.Arguments[0]);
 
-            sql = template.Sql(new[] { 1, 2, 3 });
-            Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0,@1,@2))", sql.SQL.NoCrLf());
-            Assert.AreEqual(3, sql.Arguments.Length);
-            Assert.AreEqual(1, sql.Arguments[0]);
-            Assert.AreEqual(2, sql.Arguments[1]);
-            Assert.AreEqual(3, sql.Arguments[2]);
+        sql = template.Sql(new[] { 1, 2, 3 });
+        Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0,@1,@2))", sql.SQL.NoCrLf());
+        Assert.AreEqual(3, sql.Arguments.Length);
+        Assert.AreEqual(1, sql.Arguments[0]);
+        Assert.AreEqual(2, sql.Arguments[1]);
+        Assert.AreEqual(3, sql.Arguments[2]);
 
-            template = sqlTemplates.Get("sql5a", s => s.Select<Thing1Dto>().From<Thing1Dto>()
-                .WhereIn<Thing1Dto>(x => x.Id, SqlTemplate.ArgIn<int>("i"))
-                .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("name")));
+        template = sqlTemplates.Get("sql5a", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+            .WhereIn<Thing1Dto>(x => x.Id, SqlTemplate.ArgIn<int>("i"))
+            .Where<Thing1Dto>(x => x.Name == SqlTemplate.Arg<string>("name")));
 
-            sql = template.Sql("foo", "bar");
-            Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0)) AND (([zbThing1].[name] = @1))", sql.SQL.NoCrLf());
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual("foo", sql.Arguments[0]);
-            Assert.AreEqual("bar", sql.Arguments[1]);
+        sql = template.Sql("foo", "bar");
+        Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0)) AND (([zbThing1].[name] = @1))", sql.SQL.NoCrLf());
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual("foo", sql.Arguments[0]);
+        Assert.AreEqual("bar", sql.Arguments[1]);
 
-            sql = template.Sql(new[] { 1, 2, 3 }, "bar");
-            Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0,@1,@2)) AND (([zbThing1].[name] = @3))", sql.SQL.NoCrLf());
-            Assert.AreEqual(4, sql.Arguments.Length);
-            Assert.AreEqual(1, sql.Arguments[0]);
-            Assert.AreEqual(2, sql.Arguments[1]);
-            Assert.AreEqual(3, sql.Arguments[2]);
-            Assert.AreEqual("bar", sql.Arguments[3]);
+        sql = template.Sql(new[] { 1, 2, 3 }, "bar");
+        Assert.AreEqual(sqlBase + "([zbThing1].[id] IN (@0,@1,@2)) AND (([zbThing1].[name] = @3))", sql.SQL.NoCrLf());
+        Assert.AreEqual(4, sql.Arguments.Length);
+        Assert.AreEqual(1, sql.Arguments[0]);
+        Assert.AreEqual(2, sql.Arguments[1]);
+        Assert.AreEqual(3, sql.Arguments[2]);
+        Assert.AreEqual("bar", sql.Arguments[3]);
 
-            // note however that using WhereIn in a template means that the SQL is going
-            // to be parsed and arguments are going to be expanded etc - it *may* be a better
-            // idea to just add the WhereIn to a templated, immutable SQL template
+        // note however that using WhereIn in a template means that the SQL is going
+        // to be parsed and arguments are going to be expanded etc - it *may* be a better
+        // idea to just add the WhereIn to a templated, immutable SQL template
 
-            // more fun...
-            template = sqlTemplates.Get("sql6", s => s.Select<Thing1Dto>().From<Thing1Dto>()
+        // more fun...
+        template = sqlTemplates.Get("sql6", s => s.Select<Thing1Dto>().From<Thing1Dto>()
 
-                // do NOT do this, this is NOT a visited expression
-                //// .Append(" AND whatever=@0", SqlTemplate.Arg<string>("j"))
+            // do NOT do this, this is NOT a visited expression
+            //// .Append(" AND whatever=@0", SqlTemplate.Arg<string>("j"))
 
-                // does not work anymore - due to proper TemplateArg
-                //// instead, directly name the argument
-                ////.Append("AND whatever=@0", "j")
-                ////.Append("AND whatever=@0", "k")
+            // does not work anymore - due to proper TemplateArg
+            //// instead, directly name the argument
+            ////.Append("AND whatever=@0", "j")
+            ////.Append("AND whatever=@0", "k")
 
-                // instead, explicitely create the argument
-                .Append("AND whatever=@0", SqlTemplate.Arg("j"))
-                .Append("AND whatever=@0", SqlTemplate.Arg("k")));
+            // instead, explicitely create the argument
+            .Append("AND whatever=@0", SqlTemplate.Arg("j"))
+            .Append("AND whatever=@0", SqlTemplate.Arg("k")));
 
-            sql = template.Sql(new { j = new[] { 1, 2, 3 }, k = "oops" });
-            Assert.AreEqual(sqlBase.TrimEnd("WHERE ") + "AND whatever=@0,@1,@2 AND whatever=@3", sql.SQL.NoCrLf());
-            Assert.AreEqual(4, sql.Arguments.Length);
-            Assert.AreEqual(1, sql.Arguments[0]);
-            Assert.AreEqual(2, sql.Arguments[1]);
-            Assert.AreEqual(3, sql.Arguments[2]);
-            Assert.AreEqual("oops", sql.Arguments[3]);
-        }
+        sql = template.Sql(new { j = new[] { 1, 2, 3 }, k = "oops" });
+        Assert.AreEqual(sqlBase.TrimEnd("WHERE ") + "AND whatever=@0,@1,@2 AND whatever=@3", sql.SQL.NoCrLf());
+        Assert.AreEqual(4, sql.Arguments.Length);
+        Assert.AreEqual(1, sql.Arguments[0]);
+        Assert.AreEqual(2, sql.Arguments[1]);
+        Assert.AreEqual(3, sql.Arguments[2]);
+        Assert.AreEqual("oops", sql.Arguments[3]);
+    }
 
-        [TableName("zbThing1")]
-        [PrimaryKey("id", AutoIncrement = false)]
-        [ExplicitColumns]
-        public class Thing1Dto
-        {
-            [Column("id")]
-            public int Id { get; set; }
+    [TableName("zbThing1")]
+    [PrimaryKey("id", AutoIncrement = false)]
+    [ExplicitColumns]
+    public class Thing1Dto
+    {
+        [Column("id")]
+        public int Id { get; set; }
 
-            [Column("name")]
-            public string Name { get; set; }
-        }
+        [Column("name")]
+        public string Name { get; set; }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs
index e826af74fd..4de8aef70e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/NPocoTests/NPocoSqlTests.cs
@@ -3,318 +3,344 @@
 
 using System;
 using System.Diagnostics;
-using NPoco;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Persistence;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
-using Umbraco.Cms.Infrastructure.Persistence.Querying;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.NPocoTests;
+
+[TestFixture]
+public class NPocoSqlTests : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class NPocoSqlTests : BaseUsingSqlSyntax
+    [Test]
+    public void Where_Clause_With_Starts_With_Additional_Parameters()
     {
-        [Test]
-        public void Where_Clause_With_Starts_With_Additional_Parameters()
-        {
-            var content = new NodeDto() { NodeId = 123, Path = "-1,123" };
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Path.SqlStartsWith(content.Path, TextColumnType.NVarchar));
+        var content = new NodeDto { NodeId = 123, Path = "-1,123" };
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Path.SqlStartsWith(content.Path, TextColumnType.NVarchar));
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[path]) LIKE upper(@0))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(content.Path + "%", sql.Arguments[0]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[path]) LIKE upper(@0))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(content.Path + "%", sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_With_Starts_With_By_Variable()
-        {
-            var content = new NodeDto() { NodeId = 123, Path = "-1,123" };
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Path.StartsWith(content.Path) && x.NodeId != content.NodeId);
+    [Test]
+    public void Where_Clause_With_Starts_With_By_Variable()
+    {
+        var content = new NodeDto { NodeId = 123, Path = "-1,123" };
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Path.StartsWith(content.Path) && x.NodeId != content.NodeId);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[path]) LIKE upper(@0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual(content.Path + "%", sql.Arguments[0]);
-            Assert.AreEqual(content.NodeId, sql.Arguments[1]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[path]) LIKE upper(@0) AND ([umbracoNode].[id] <> @1)))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual(content.Path + "%", sql.Arguments[0]);
+        Assert.AreEqual(content.NodeId, sql.Arguments[1]);
+    }
 
-        [Test]
-        public void Where_Clause_With_Not_Starts_With()
-        {
-            const int level = 1;
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Level == level && !x.Path.StartsWith("-20"));
+    [Test]
+    public void Where_Clause_With_Not_Starts_With()
+    {
+        const int level = 1;
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Level == level && !x.Path.StartsWith("-20"));
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual(level, sql.Arguments[0]);
-            Assert.AreEqual("-20%", sql.Arguments[1]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual(level, sql.Arguments[0]);
+        Assert.AreEqual("-20%", sql.Arguments[1]);
+    }
 
-        [Test]
-        public void Where_Clause_With_EqualsFalse_Starts_With()
-        {
-            const int level = 1;
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Level == level && x.Path.StartsWith("-20") == false);
+    [Test]
+    public void Where_Clause_With_EqualsFalse_Starts_With()
+    {
+        const int level = 1;
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Level == level && x.Path.StartsWith("-20") == false);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual(level, sql.Arguments[0]);
-            Assert.AreEqual("-20%", sql.Arguments[1]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[level] = @0) AND NOT (upper([umbracoNode].[path]) LIKE upper(@1))))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual(level, sql.Arguments[0]);
+        Assert.AreEqual("-20%", sql.Arguments[1]);
+    }
 
-        [Test]
-        public void Where_Clause_With_Equals_Clause()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Text.Equals("Hello@world.com"));
+    [Test]
+    public void Where_Clause_With_Equals_Clause()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Text.Equals("Hello@world.com"));
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) = upper(@0))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("Hello@world.com", sql.Arguments[0]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) = upper(@0))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("Hello@world.com", sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_With_False_Boolean()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Trashed == false);
+    [Test]
+    public void Where_Clause_With_False_Boolean()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Trashed == false);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(false, sql.Arguments[0]);
-        }
+        Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(false, sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_With_EqualsFalse_Boolean()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>().Where<NodeDto>(x => x.Trashed == false);
+    [Test]
+    public void Where_Clause_With_EqualsFalse_Boolean()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>().Where<NodeDto>(x => x.Trashed == false);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(false, sql.Arguments[0]);
-        }
+        Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(false, sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_With_Boolean()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Trashed);
+    [Test]
+    public void Where_Clause_With_Boolean()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Trashed);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(true, sql.Arguments[0]);
-        }
+        Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ([umbracoNode].[trashed] = @0)", sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(true, sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_With_ToUpper()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Text.ToUpper() == "hello".ToUpper());
+    [Test]
+    public void Where_Clause_With_ToUpper()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Text.ToUpper() == "hello".ToUpper());
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[text]) = upper(@0)))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("hello", sql.Arguments[0]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE ((upper([umbracoNode].[text]) = upper(@0)))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("hello", sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_With_ToString()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Text == 1.ToString());
+    [Test]
+    public void Where_Clause_With_ToString()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Text == 1.ToString());
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[text] = @0))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("1", sql.Arguments[0]);
-        }
+        Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[text] = @0))", sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("1", sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_With_Wildcard()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Text.StartsWith("D"));
+    [Test]
+    public void Where_Clause_With_Wildcard()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Text.StartsWith("D"));
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) LIKE upper(@0))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual("D%", sql.Arguments[0]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE (upper([umbracoNode].[text]) LIKE upper(@0))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual("D%", sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_Single_Constant()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.NodeId == 2);
+    [Test]
+    public void Where_Clause_Single_Constant()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.NodeId == 2);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] = @0))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(1, sql.Arguments.Length);
-            Assert.AreEqual(2, sql.Arguments[0]);
-        }
+        Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] = @0))", sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(1, sql.Arguments.Length);
+        Assert.AreEqual(2, sql.Arguments[0]);
+    }
 
-        [Test]
-        public void Where_Clause_And_Constant()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.NodeId != 2 && x.NodeId != 3);
+    [Test]
+    public void Where_Clause_And_Constant()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.NodeId != 2 && x.NodeId != 3);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[id] <> @0) AND ([umbracoNode].[id] <> @1)))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual(2, sql.Arguments[0]);
-            Assert.AreEqual(3, sql.Arguments[1]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[id] <> @0) AND ([umbracoNode].[id] <> @1)))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual(2, sql.Arguments[0]);
+        Assert.AreEqual(3, sql.Arguments[1]);
+    }
 
-        [Test]
-        public void Where_Clause_Or_Constant()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>()
-                .Where<NodeDto>(x => x.Text == "hello" || x.NodeId == 3);
+    [Test]
+    public void Where_Clause_Or_Constant()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>()
+            .Where<NodeDto>(x => x.Text == "hello" || x.NodeId == 3);
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[text] = @0) OR ([umbracoNode].[id] = @1)))", sql.SQL.Replace("\n", " "));
-            Assert.AreEqual(2, sql.Arguments.Length);
-            Assert.AreEqual("hello", sql.Arguments[0]);
-            Assert.AreEqual(3, sql.Arguments[1]);
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE ((([umbracoNode].[text] = @0) OR ([umbracoNode].[id] = @1)))",
+            sql.SQL.Replace("\n", " "));
+        Assert.AreEqual(2, sql.Arguments.Length);
+        Assert.AreEqual("hello", sql.Arguments[0]);
+        Assert.AreEqual(3, sql.Arguments[1]);
+    }
 
-        [Test]
-        public void Where_Null()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>().WhereNull<NodeDto>(x => x.NodeId);
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] IS NULL))", sql.SQL.Replace("\n", " "));
-        }
+    [Test]
+    public void Where_Null()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>().WhereNull<NodeDto>(x => x.NodeId);
+        Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] IS NULL))", sql.SQL.Replace("\n", " "));
+    }
 
-        [Test]
-        public void Where_Not_Null()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>().WhereNotNull<NodeDto>(x => x.NodeId);
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] IS NOT NULL))", sql.SQL.Replace("\n", " "));
-        }
+    [Test]
+    public void Where_Not_Null()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>().WhereNotNull<NodeDto>(x => x.NodeId);
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE (([umbracoNode].[id] IS NOT NULL))",
+            sql.SQL.Replace("\n", " "));
+    }
 
-        [Test]
-        public void Where_Any()
-        {
-            Sql<ISqlContext> sql = Sql().SelectAll().From<NodeDto>().WhereAny(
-                s => s.Where<NodeDto>(x => x.NodeId == 1),
-                s => s.Where<NodeDto>(x => x.NodeId == 2));
+    [Test]
+    public void Where_Any()
+    {
+        var sql = Sql().SelectAll().From<NodeDto>().WhereAny(
+            s => s.Where<NodeDto>(x => x.NodeId == 1),
+            s => s.Where<NodeDto>(x => x.NodeId == 2));
 
-            Assert.AreEqual("SELECT * FROM [umbracoNode] WHERE (( (([umbracoNode].[id] = @0)) ) OR ( (([umbracoNode].[id] = @1)) ))", sql.SQL.Replace("\n", " "));
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoNode] WHERE (( (([umbracoNode].[id] = @0)) ) OR ( (([umbracoNode].[id] = @1)) ))",
+            sql.SQL.Replace("\n", " "));
+    }
 
-        [Test]
-        public void Can_Select_From_With_Type()
-        {
-            Sql<ISqlContext> expected = Sql();
-            expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]");
+    [Test]
+    public void Can_Select_From_With_Type()
+    {
+        var expected = Sql();
+        expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]");
 
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll().From<ContentDto>();
+        var sql = Sql();
+        sql.SelectAll().From<ContentDto>();
 
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
-            Debug.Print(sql.SQL);
-        }
+        Debug.Print(sql.SQL);
+    }
 
-        [Test]
-        public void Can_InnerJoin_With_Types()
-        {
-            Sql<ISqlContext> expected = Sql();
-            expected.SelectAll()
-                .From($"[{Constants.DatabaseSchema.Tables.DocumentVersion}]")
-                .InnerJoin($"[{Constants.DatabaseSchema.Tables.ContentVersion}]")
-                .On($"[{Constants.DatabaseSchema.Tables.DocumentVersion}].[id] = [{Constants.DatabaseSchema.Tables.ContentVersion}].[id]");
+    [Test]
+    public void Can_InnerJoin_With_Types()
+    {
+        var expected = Sql();
+        expected.SelectAll()
+            .From($"[{Constants.DatabaseSchema.Tables.DocumentVersion}]")
+            .InnerJoin($"[{Constants.DatabaseSchema.Tables.ContentVersion}]")
+            .On(
+                $"[{Constants.DatabaseSchema.Tables.DocumentVersion}].[id] = [{Constants.DatabaseSchema.Tables.ContentVersion}].[id]");
 
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll().From<DocumentVersionDto>()
-                .InnerJoin<ContentVersionDto>()
-                .On<DocumentVersionDto, ContentVersionDto>(left => left.Id, right => right.Id);
+        var sql = Sql();
+        sql.SelectAll().From<DocumentVersionDto>()
+            .InnerJoin<ContentVersionDto>()
+            .On<DocumentVersionDto, ContentVersionDto>(left => left.Id, right => right.Id);
 
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
-            Debug.Print(sql.SQL);
-        }
+        Debug.Print(sql.SQL);
+    }
 
-        [Test]
-        public void Can_OrderBy_With_Type()
-        {
-            Sql<ISqlContext> expected = Sql();
-            expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]").OrderBy($"([{Constants.DatabaseSchema.Tables.Content}].[contentTypeId])");
+    [Test]
+    public void Can_OrderBy_With_Type()
+    {
+        var expected = Sql();
+        expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]")
+            .OrderBy($"([{Constants.DatabaseSchema.Tables.Content}].[contentTypeId])");
 
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll().From<ContentDto>().OrderBy<ContentDto>(x => x.ContentTypeId);
+        var sql = Sql();
+        sql.SelectAll().From<ContentDto>().OrderBy<ContentDto>(x => x.ContentTypeId);
 
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
-            Debug.Print(sql.SQL);
-        }
+        Debug.Print(sql.SQL);
+    }
 
-        [Test]
-        public void Can_GroupBy_With_Type()
-        {
-            Sql<ISqlContext> expected = Sql();
-            expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]").GroupBy($"[{Constants.DatabaseSchema.Tables.Content}].[contentTypeId]");
+    [Test]
+    public void Can_GroupBy_With_Type()
+    {
+        var expected = Sql();
+        expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]")
+            .GroupBy($"[{Constants.DatabaseSchema.Tables.Content}].[contentTypeId]");
 
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll().From<ContentDto>().GroupBy<ContentDto>(x => x.ContentTypeId);
+        var sql = Sql();
+        sql.SelectAll().From<ContentDto>().GroupBy<ContentDto>(x => x.ContentTypeId);
 
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
-            Debug.Print(sql.SQL);
-        }
+        Debug.Print(sql.SQL);
+    }
 
-        [Test]
-        public void Can_Use_Where_Predicate()
-        {
-            Sql<ISqlContext> expected = Sql();
-            expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]").Where($"([{Constants.DatabaseSchema.Tables.Content}].[nodeId] = @0)", 1045);
+    [Test]
+    public void Can_Use_Where_Predicate()
+    {
+        var expected = Sql();
+        expected.SelectAll().From($"[{Constants.DatabaseSchema.Tables.Content}]")
+            .Where($"([{Constants.DatabaseSchema.Tables.Content}].[nodeId] = @0)", 1045);
 
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll().From<ContentDto>().Where<ContentDto>(x => x.NodeId == 1045);
+        var sql = Sql();
+        sql.SelectAll().From<ContentDto>().Where<ContentDto>(x => x.NodeId == 1045);
 
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
-            Debug.Print(sql.SQL);
-        }
+        Debug.Print(sql.SQL);
+    }
 
-        [Test]
-        public void Can_Use_Where_And_Predicate()
-        {
-            Sql<ISqlContext> expected = Sql();
-            expected.SelectAll()
-                .From($"[{Constants.DatabaseSchema.Tables.Content}]")
-                .Where($"([{Constants.DatabaseSchema.Tables.Content}].[nodeId] = @0)", 1045)
-                .Where($"([{Constants.DatabaseSchema.Tables.Content}].[contentTypeId] = @0)", 1050);
+    [Test]
+    public void Can_Use_Where_And_Predicate()
+    {
+        var expected = Sql();
+        expected.SelectAll()
+            .From($"[{Constants.DatabaseSchema.Tables.Content}]")
+            .Where($"([{Constants.DatabaseSchema.Tables.Content}].[nodeId] = @0)", 1045)
+            .Where($"([{Constants.DatabaseSchema.Tables.Content}].[contentTypeId] = @0)", 1050);
 
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll()
-                .From<ContentDto>()
-                .Where<ContentDto>(x => x.NodeId == 1045)
-                .Where<ContentDto>(x => x.ContentTypeId == 1050);
+        var sql = Sql();
+        sql.SelectAll()
+            .From<ContentDto>()
+            .Where<ContentDto>(x => x.NodeId == 1045)
+            .Where<ContentDto>(x => x.ContentTypeId == 1050);
 
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
 
-            Debug.Print(sql.SQL);
-        }
+        Debug.Print(sql.SQL);
+    }
 
-        [Test]
-        public void ForUpdate()
-        {
-            var sessionId = Guid.NewGuid();
+    [Test]
+    public void ForUpdate()
+    {
+        var sessionId = Guid.NewGuid();
 
-            Sql<ISqlContext> sql = Sql()
-                .SelectAll()
-                .From<UserLoginDto>()
-                .Where<UserLoginDto>(x => x.SessionId == sessionId);
+        var sql = Sql()
+            .SelectAll()
+            .From<UserLoginDto>()
+            .Where<UserLoginDto>(x => x.SessionId == sessionId);
 
-            Assert.AreEqual("SELECT * FROM [umbracoUserLogin] WHERE (([umbracoUserLogin].[sessionId] = @0))", sql.SQL.NoCrLf());
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoUserLogin] WHERE (([umbracoUserLogin].[sessionId] = @0))",
+            sql.SQL.NoCrLf());
 
-            sql = sql.ForUpdate();
+        sql = sql.ForUpdate();
 
-            Assert.AreEqual("SELECT * FROM [umbracoUserLogin] WITH (UPDLOCK) WHERE (([umbracoUserLogin].[sessionId] = @0))", sql.SQL.NoCrLf());
-        }
+        Assert.AreEqual(
+            "SELECT * FROM [umbracoUserLogin] WITH (UPDLOCK) WHERE (([umbracoUserLogin].[sessionId] = @0))",
+            sql.SQL.NoCrLf());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
index 7deba34b3d..b8f558d9d3 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ContentTypeRepositorySqlClausesTest.cs
@@ -1,167 +1,168 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
 using System.Diagnostics;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying;
+
+[TestFixture]
+public class ContentTypeRepositorySqlClausesTest : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class ContentTypeRepositorySqlClausesTest : BaseUsingSqlSyntax
+    [Test]
+    public void Can_Verify_Base_Clause()
     {
-        [Test]
-        public void Can_Verify_Base_Clause()
+        var nodeObjectType = Constants.ObjectTypes.DocumentType;
+
+        var expected = Sql();
+        expected.Select("*")
+            .From("[cmsDocumentType]")
+            .RightJoin("[cmsContentType]")
+            .On("[cmsContentType].[nodeId] = [cmsDocumentType].[contentTypeNodeId]")
+            .InnerJoin("[umbracoNode]")
+            .On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
+            .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
+            .Where("([cmsDocumentType].[IsDefault] = @0)", true);
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<ContentTypeTemplateDto>()
+            .RightJoin<ContentTypeDto>()
+            .On<ContentTypeDto, ContentTypeTemplateDto>(left => left.NodeId, right => right.ContentTypeNodeId)
+            .InnerJoin<NodeDto>()
+            .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .Where<NodeDto>(x => x.NodeObjectType == nodeObjectType)
+            .Where<ContentTypeTemplateDto>(x => x.IsDefault == true);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
+        for (var i = 0; i < expected.Arguments.Length; i++)
         {
-            var nodeObjectType = Constants.ObjectTypes.DocumentType;
-
-            var expected = Sql();
-            expected.Select("*")
-                .From("[cmsDocumentType]")
-                .RightJoin("[cmsContentType]")
-                .On("[cmsContentType].[nodeId] = [cmsDocumentType].[contentTypeNodeId]")
-                .InnerJoin("[umbracoNode]")
-                .On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
-                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
-                .Where("([cmsDocumentType].[IsDefault] = @0)", true);
-
-            var sql = Sql();
-            sql.SelectAll()
-                .From<ContentTypeTemplateDto>()
-                .RightJoin<ContentTypeDto>()
-                .On<ContentTypeDto, ContentTypeTemplateDto>(left => left.NodeId, right => right.ContentTypeNodeId)
-                .InnerJoin<NodeDto>()
-                .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == nodeObjectType)
-                .Where<ContentTypeTemplateDto>(x => x.IsDefault == true);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
-            for (int i = 0; i < expected.Arguments.Length; i++)
-            {
-                Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
-            }
-
-            Debug.Print(sql.SQL);
+            Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
         }
 
-        [Test]
-        public void Can_Verify_Base_Where_Clause()
+        Debug.Print(sql.SQL);
+    }
+
+    [Test]
+    public void Can_Verify_Base_Where_Clause()
+    {
+        var nodeObjectType = Constants.ObjectTypes.DocumentType;
+
+        var expected = Sql();
+        expected.SelectAll()
+            .From("[cmsDocumentType]")
+            .RightJoin("[cmsContentType]")
+            .On("[cmsContentType].[nodeId] = [cmsDocumentType].[contentTypeNodeId]")
+            .InnerJoin("[umbracoNode]")
+            .On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
+            .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
+            .Where("[cmsDocumentType].[IsDefault] = @0", true)
+            .Where("([umbracoNode].[id] = @0)", 1050);
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<ContentTypeTemplateDto>()
+            .RightJoin<ContentTypeDto>()
+            .On<ContentTypeDto, ContentTypeTemplateDto>(left => left.NodeId, right => right.ContentTypeNodeId)
+            .InnerJoin<NodeDto>()
+            .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .Where<NodeDto>(x => x.NodeObjectType == nodeObjectType)
+            .Where<ContentTypeTemplateDto>(x => x.IsDefault)
+            .Where<NodeDto>(x => x.NodeId == 1050);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
+        for (var i = 0; i < expected.Arguments.Length; i++)
         {
-            var nodeObjectType = Constants.ObjectTypes.DocumentType;
-
-            var expected = Sql();
-            expected.SelectAll()
-                .From("[cmsDocumentType]")
-                .RightJoin("[cmsContentType]")
-                .On("[cmsContentType].[nodeId] = [cmsDocumentType].[contentTypeNodeId]")
-                .InnerJoin("[umbracoNode]")
-                .On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
-                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("a2cb7800-f571-4787-9638-bc48539a0efb"))
-                .Where("[cmsDocumentType].[IsDefault] = @0", true)
-                .Where("([umbracoNode].[id] = @0)", 1050);
-
-            var sql = Sql();
-            sql.SelectAll()
-                .From<ContentTypeTemplateDto>()
-                .RightJoin<ContentTypeDto>()
-                .On<ContentTypeDto, ContentTypeTemplateDto>(left => left.NodeId, right => right.ContentTypeNodeId)
-                .InnerJoin<NodeDto>()
-                .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == nodeObjectType)
-                .Where<ContentTypeTemplateDto>(x => x.IsDefault)
-                .Where<NodeDto>(x => x.NodeId == 1050);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
-            for (int i = 0; i < expected.Arguments.Length; i++)
-            {
-                Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
-            }
-
-            Debug.Print(sql.SQL);
+            Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
         }
 
-        [Test]
-        public void Can_Verify_PerformQuery_Clause()
+        Debug.Print(sql.SQL);
+    }
+
+    [Test]
+    public void Can_Verify_PerformQuery_Clause()
+    {
+        var expected = Sql();
+        expected.SelectAll()
+            .From("[cmsPropertyTypeGroup]")
+            .RightJoin("[cmsPropertyType]").On("[cmsPropertyTypeGroup].[id] = [cmsPropertyType].[propertyTypeGroupId]")
+            .InnerJoin($"[{Constants.DatabaseSchema.Tables.DataType}]")
+            .On($"[cmsPropertyType].[dataTypeId] = [{Constants.DatabaseSchema.Tables.DataType}].[nodeId]");
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<PropertyTypeGroupDto>()
+            .RightJoin<PropertyTypeDto>()
+            .On<PropertyTypeGroupDto, PropertyTypeDto>(left => left.Id, right => right.PropertyTypeGroupId)
+            .InnerJoin<DataTypeDto>()
+            .On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.NodeId);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Debug.Print(sql.SQL);
+    }
+
+    [Test]
+    public void Can_Verify_AllowedContentTypeIds_Clause()
+    {
+        var expected = Sql();
+        expected.SelectAll()
+            .From("[cmsContentTypeAllowedContentType]")
+            .Where("([cmsContentTypeAllowedContentType].[Id] = @0)", 1050);
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<ContentTypeAllowedContentTypeDto>()
+            .Where<ContentTypeAllowedContentTypeDto>(x => x.Id == 1050);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
+        for (var i = 0; i < expected.Arguments.Length; i++)
         {
-            var expected = Sql();
-            expected.SelectAll()
-                .From("[cmsPropertyTypeGroup]")
-                .RightJoin("[cmsPropertyType]").On("[cmsPropertyTypeGroup].[id] = [cmsPropertyType].[propertyTypeGroupId]")
-                .InnerJoin($"[{Constants.DatabaseSchema.Tables.DataType}]").On($"[cmsPropertyType].[dataTypeId] = [{Constants.DatabaseSchema.Tables.DataType}].[nodeId]");
-
-            var sql = Sql();
-            sql.SelectAll()
-               .From<PropertyTypeGroupDto>()
-               .RightJoin<PropertyTypeDto>()
-               .On<PropertyTypeGroupDto, PropertyTypeDto>(left => left.Id, right => right.PropertyTypeGroupId)
-               .InnerJoin<DataTypeDto>()
-               .On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.NodeId);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Debug.Print(sql.SQL);
+            Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
         }
 
-        [Test]
-        public void Can_Verify_AllowedContentTypeIds_Clause()
+        Debug.Print(sql.SQL);
+    }
+
+    [Test]
+    public void Can_Verify_PropertyGroupCollection_Clause()
+    {
+        var expected = Sql();
+        expected.SelectAll()
+            .From("[cmsPropertyTypeGroup]")
+            .RightJoin("[cmsPropertyType]").On("[cmsPropertyTypeGroup].[id] = [cmsPropertyType].[propertyTypeGroupId]")
+            .InnerJoin($"[{Constants.DatabaseSchema.Tables.DataType}]")
+            .On($"[cmsPropertyType].[dataTypeId] = [{Constants.DatabaseSchema.Tables.DataType}].[nodeId]")
+            .Where("([cmsPropertyType].[contentTypeId] = @0)", 1050);
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<PropertyTypeGroupDto>()
+            .RightJoin<PropertyTypeDto>()
+            .On<PropertyTypeGroupDto, PropertyTypeDto>(left => left.Id, right => right.PropertyTypeGroupId)
+            .InnerJoin<DataTypeDto>()
+            .On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.NodeId)
+            .Where<PropertyTypeDto>(x => x.ContentTypeId == 1050);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
+        for (var i = 0; i < expected.Arguments.Length; i++)
         {
-            var expected = Sql();
-            expected.SelectAll()
-                .From("[cmsContentTypeAllowedContentType]")
-                .Where("([cmsContentTypeAllowedContentType].[Id] = @0)", 1050);
-
-            var sql = Sql();
-            sql.SelectAll()
-               .From<ContentTypeAllowedContentTypeDto>()
-               .Where<ContentTypeAllowedContentTypeDto>(x => x.Id == 1050);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
-            for (int i = 0; i < expected.Arguments.Length; i++)
-            {
-                Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
-            }
-
-            Debug.Print(sql.SQL);
+            Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
         }
 
-        [Test]
-        public void Can_Verify_PropertyGroupCollection_Clause()
-        {
-            var expected = Sql();
-            expected.SelectAll()
-                .From("[cmsPropertyTypeGroup]")
-                .RightJoin("[cmsPropertyType]").On("[cmsPropertyTypeGroup].[id] = [cmsPropertyType].[propertyTypeGroupId]")
-                .InnerJoin($"[{Constants.DatabaseSchema.Tables.DataType}]").On($"[cmsPropertyType].[dataTypeId] = [{Constants.DatabaseSchema.Tables.DataType}].[nodeId]")
-                .Where("([cmsPropertyType].[contentTypeId] = @0)", 1050);
-
-            var sql = Sql();
-            sql.SelectAll()
-               .From<PropertyTypeGroupDto>()
-               .RightJoin<PropertyTypeDto>()
-               .On<PropertyTypeGroupDto, PropertyTypeDto>(left => left.Id, right => right.PropertyTypeGroupId)
-               .InnerJoin<DataTypeDto>()
-               .On<PropertyTypeDto, DataTypeDto>(left => left.DataTypeId, right => right.NodeId)
-               .Where<PropertyTypeDto>(x => x.ContentTypeId == 1050);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
-            for (int i = 0; i < expected.Arguments.Length; i++)
-            {
-                Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
-            }
-
-            Debug.Print(sql.SQL);
-        }
+        Debug.Print(sql.SQL);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
index 02f8c8b71a..cd0268f945 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/DataTypeDefinitionRepositorySqlClausesTest.cs
@@ -5,43 +5,43 @@ using System;
 using System.Diagnostics;
 using NPoco;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying;
+
+[TestFixture]
+public class DataTypeDefinitionRepositorySqlClausesTest : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class DataTypeDefinitionRepositorySqlClausesTest : BaseUsingSqlSyntax
+    [Test]
+    public void Can_Verify_Base_Clause()
     {
-        [Test]
-        public void Can_Verify_Base_Clause()
+        var nodeObjectTypeId = Constants.ObjectTypes.DataType;
+
+        var expected = new Sql();
+        expected.Select("*")
+            .From($"[{Constants.DatabaseSchema.Tables.DataType}]")
+            .InnerJoin("[umbracoNode]")
+            .On($"[{Constants.DatabaseSchema.Tables.DataType}].[nodeId] = [umbracoNode].[id]")
+            .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"));
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<DataTypeDto>()
+            .InnerJoin<NodeDto>()
+            .On<DataTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .Where<NodeDto>(x => x.NodeObjectType == nodeObjectTypeId);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
+        for (var i = 0; i < expected.Arguments.Length; i++)
         {
-            var nodeObjectTypeId = Constants.ObjectTypes.DataType;
-
-            var expected = new Sql();
-            expected.Select("*")
-                .From($"[{Constants.DatabaseSchema.Tables.DataType}]")
-                .InnerJoin("[umbracoNode]").On($"[{Constants.DatabaseSchema.Tables.DataType}].[nodeId] = [umbracoNode].[id]")
-                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("30a2a501-1978-4ddb-a57b-f7efed43ba3c"));
-
-            var sql = Sql();
-            sql.SelectAll()
-               .From<DataTypeDto>()
-               .InnerJoin<NodeDto>()
-               .On<DataTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-               .Where<NodeDto>(x => x.NodeObjectType == nodeObjectTypeId);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
-            for (int i = 0; i < expected.Arguments.Length; i++)
-            {
-                Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
-            }
-
-            Debug.Print(sql.SQL);
+            Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
         }
+
+        Debug.Print(sql.SQL);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs
index b94d8bbaa7..515a221b7b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/ExpressionTests.cs
@@ -2,259 +2,252 @@
 // See LICENSE for more details.
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
-using Microsoft.Extensions.Logging.Abstractions;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Persistence;
 using Umbraco.Cms.Core.PropertyEditors;
-using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Querying;
-using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Infrastructure.Serialization;
-using Umbraco.Cms.Persistence.SqlServer.Services;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying;
+
+[TestFixture]
+public class ExpressionTests : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class ExpressionTests : BaseUsingSqlSyntax
+    [Test]
+    public void Equals_Claus_With_Two_Entity_Values()
     {
-        [Test]
-        public void Equals_Claus_With_Two_Entity_Values()
-        {
-            var dataType = new DataType(new VoidEditor(Mock.Of<IDataValueEditorFactory>()), new ConfigurationEditorJsonSerializer())
-            {
-                Id = 12345
-            };
-            Expression<Func<PropertyType, bool>> predicate = p => p.DataTypeId == dataType.Id;
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<PropertyType>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+        var dataType = new DataType(
+                new VoidEditor(Mock.Of<IDataValueEditorFactory>()),
+                new ConfigurationEditorJsonSerializer())
+        { Id = 12345 };
+        Expression<Func<PropertyType, bool>> predicate = p => p.DataTypeId == dataType.Id;
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<PropertyType>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("([cmsPropertyType].[dataTypeId] = @0)", result);
-            Assert.AreEqual(12345, modelToSqlExpressionHelper.GetSqlParameters()[0]);
-        }
+        Assert.AreEqual("([cmsPropertyType].[dataTypeId] = @0)", result);
+        Assert.AreEqual(12345, modelToSqlExpressionHelper.GetSqlParameters()[0]);
+    }
 
-        [Test]
-        public void Can_Query_With_Content_Type_Alias()
-        {
-            // Arrange
-            Expression<Func<IMedia, bool>> predicate = content => content.ContentType.Alias == "Test";
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Can_Query_With_Content_Type_Alias()
+    {
+        // Arrange
+        Expression<Func<IMedia, bool>> predicate = content => content.ContentType.Alias == "Test";
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("([cmsContentType].[alias] = @0)", result);
-            Assert.AreEqual("Test", modelToSqlExpressionHelper.GetSqlParameters()[0]);
-        }
+        Assert.AreEqual("([cmsContentType].[alias] = @0)", result);
+        Assert.AreEqual("Test", modelToSqlExpressionHelper.GetSqlParameters()[0]);
+    }
 
-        [Test]
-        public void Can_Query_With_Content_Type_Aliases_IEnumerable()
-        {
-            // Arrange - Contains is IEnumerable.Contains extension method
-            var aliases = new[] { "Test1", "Test2" };
-            Expression<Func<IMedia, bool>> predicate = content => aliases.Contains(content.ContentType.Alias);
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Can_Query_With_Content_Type_Aliases_IEnumerable()
+    {
+        // Arrange - Contains is IEnumerable.Contains extension method
+        var aliases = new[] { "Test1", "Test2" };
+        Expression<Func<IMedia, bool>> predicate = content => aliases.Contains(content.ContentType.Alias);
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("[cmsContentType].[alias] IN (@1,@2)", result);
-            Assert.AreEqual("Test1", modelToSqlExpressionHelper.GetSqlParameters()[1]);
-            Assert.AreEqual("Test2", modelToSqlExpressionHelper.GetSqlParameters()[2]);
-        }
+        Assert.AreEqual("[cmsContentType].[alias] IN (@1,@2)", result);
+        Assert.AreEqual("Test1", modelToSqlExpressionHelper.GetSqlParameters()[1]);
+        Assert.AreEqual("Test2", modelToSqlExpressionHelper.GetSqlParameters()[2]);
+    }
 
-        [Test]
-        public void Can_Query_With_Content_Type_Aliases_List()
-        {
-            // Arrange - Contains is List.Contains instance method
-            var aliases = new System.Collections.Generic.List<string> { "Test1", "Test2" };
-            Expression<Func<IMedia, bool>> predicate = content => aliases.Contains(content.ContentType.Alias);
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Can_Query_With_Content_Type_Aliases_List()
+    {
+        // Arrange - Contains is List.Contains instance method
+        var aliases = new List<string> { "Test1", "Test2" };
+        Expression<Func<IMedia, bool>> predicate = content => aliases.Contains(content.ContentType.Alias);
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("[cmsContentType].[alias] IN (@1,@2)", result);
-            Assert.AreEqual("Test1", modelToSqlExpressionHelper.GetSqlParameters()[1]);
-            Assert.AreEqual("Test2", modelToSqlExpressionHelper.GetSqlParameters()[2]);
-        }
+        Assert.AreEqual("[cmsContentType].[alias] IN (@1,@2)", result);
+        Assert.AreEqual("Test1", modelToSqlExpressionHelper.GetSqlParameters()[1]);
+        Assert.AreEqual("Test2", modelToSqlExpressionHelper.GetSqlParameters()[2]);
+    }
 
-        [Test]
-        public void CachedExpression_Can_Verify_Path_StartsWith_Predicate_In_Same_Result()
-        {
-            // Arrange
+    [Test]
+    public void CachedExpression_Can_Verify_Path_StartsWith_Predicate_In_Same_Result()
+    {
+        // Arrange
 
-            // use a single cached expression for multiple expressions and ensure the correct output
-            // is done for both of them.
-            var cachedExpression = new CachedExpression();
+        // use a single cached expression for multiple expressions and ensure the correct output
+        // is done for both of them.
+        var cachedExpression = new CachedExpression();
 
-            Expression<Func<IContent, bool>> predicate1 = content => content.Path.StartsWith("-1");
-            cachedExpression.Wrap(predicate1);
-            var modelToSqlExpressionHelper1 = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
-            var result1 = modelToSqlExpressionHelper1.Visit(cachedExpression);
-            Assert.AreEqual("upper([umbracoNode].[path]) LIKE upper(@0)", result1);
-            Assert.AreEqual("-1%", modelToSqlExpressionHelper1.GetSqlParameters()[0]);
+        Expression<Func<IContent, bool>> predicate1 = content => content.Path.StartsWith("-1");
+        cachedExpression.Wrap(predicate1);
+        var modelToSqlExpressionHelper1 = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
+        var result1 = modelToSqlExpressionHelper1.Visit(cachedExpression);
+        Assert.AreEqual("upper([umbracoNode].[path]) LIKE upper(@0)", result1);
+        Assert.AreEqual("-1%", modelToSqlExpressionHelper1.GetSqlParameters()[0]);
 
-            Expression<Func<IContent, bool>> predicate2 = content => content.Path.StartsWith("-1,123,97");
-            cachedExpression.Wrap(predicate2);
-            var modelToSqlExpressionHelper2 = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
-            var result2 = modelToSqlExpressionHelper2.Visit(cachedExpression);
-            Assert.AreEqual("upper([umbracoNode].[path]) LIKE upper(@0)", result2);
-            Assert.AreEqual("-1,123,97%", modelToSqlExpressionHelper2.GetSqlParameters()[0]);
-        }
+        Expression<Func<IContent, bool>> predicate2 = content => content.Path.StartsWith("-1,123,97");
+        cachedExpression.Wrap(predicate2);
+        var modelToSqlExpressionHelper2 = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
+        var result2 = modelToSqlExpressionHelper2.Visit(cachedExpression);
+        Assert.AreEqual("upper([umbracoNode].[path]) LIKE upper(@0)", result2);
+        Assert.AreEqual("-1,123,97%", modelToSqlExpressionHelper2.GetSqlParameters()[0]);
+    }
 
-        [Test]
-        public void Can_Verify_Path_StartsWith_Predicate_In_Same_Result()
-        {
-            // Arrange
-            Expression<Func<IContent, bool>> predicate = content => content.Path.StartsWith("-1");
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Can_Verify_Path_StartsWith_Predicate_In_Same_Result()
+    {
+        // Arrange
+        Expression<Func<IContent, bool>> predicate = content => content.Path.StartsWith("-1");
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Assert.AreEqual("upper([umbracoNode].[path]) LIKE upper(@0)", result);
-            Assert.AreEqual("-1%", modelToSqlExpressionHelper.GetSqlParameters()[0]);
-        }
+        Assert.AreEqual("upper([umbracoNode].[path]) LIKE upper(@0)", result);
+        Assert.AreEqual("-1%", modelToSqlExpressionHelper.GetSqlParameters()[0]);
+    }
 
-        [Test]
-        public void Can_Verify_ParentId_StartsWith_Predicate_In_Same_Result()
-        {
-            // Arrange
-            Expression<Func<IContent, bool>> predicate = content => content.ParentId == -1;
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Can_Verify_ParentId_StartsWith_Predicate_In_Same_Result()
+    {
+        // Arrange
+        Expression<Func<IContent, bool>> predicate = content => content.ParentId == -1;
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IContent>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("([umbracoNode].[parentId] = @0)", result);
-            Assert.AreEqual(-1, modelToSqlExpressionHelper.GetSqlParameters()[0]);
-        }
+        Assert.AreEqual("([umbracoNode].[parentId] = @0)", result);
+        Assert.AreEqual(-1, modelToSqlExpressionHelper.GetSqlParameters()[0]);
+    }
 
-        [Test]
-        public void Equals_Operator_For_Value_Gets_Escaped()
-        {
-            Expression<Func<IUser, bool>> predicate = user => user.Username == "hello@world.com";
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Equals_Operator_For_Value_Gets_Escaped()
+    {
+        Expression<Func<IUser, bool>> predicate = user => user.Username == "hello@world.com";
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("([umbracoUser].[userLogin] = @0)", result);
-            Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
-        }
+        Assert.AreEqual("([umbracoUser].[userLogin] = @0)", result);
+        Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
+    }
 
-        [Test]
-        public void Equals_Method_For_Value_Gets_Escaped()
-        {
-            var sqlSyntax = new SqlServerSyntaxProvider(Options.Create(new GlobalSettings()));
-            Expression<Func<IUser, bool>> predicate = user => user.Username.Equals("hello@world.com");
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Equals_Method_For_Value_Gets_Escaped()
+    {
+        Expression<Func<IUser, bool>> predicate = user => user.Username.Equals("hello@world.com");
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("upper([umbracoUser].[userLogin]) = upper(@0)", result);
-            Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
-        }
+        Assert.AreEqual("upper([umbracoUser].[userLogin]) = upper(@0)", result);
+        Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
+    }
 
-        [Test]
-        public void Sql_Replace_Mapped()
-        {
-            Expression<Func<IUser, bool>> predicate = user => user.Username.Replace("@world", "@test") == "hello@test.com";
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void Sql_Replace_Mapped()
+    {
+        Expression<Func<IUser, bool>> predicate = user => user.Username.Replace("@world", "@test") == "hello@test.com";
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("(replace([umbracoUser].[userLogin], @1, @2) = @0)", result);
-            Assert.AreEqual("hello@test.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
-            Assert.AreEqual("@world", modelToSqlExpressionHelper.GetSqlParameters()[1]);
-            Assert.AreEqual("@test", modelToSqlExpressionHelper.GetSqlParameters()[2]);
-        }
+        Assert.AreEqual("(replace([umbracoUser].[userLogin], @1, @2) = @0)", result);
+        Assert.AreEqual("hello@test.com", modelToSqlExpressionHelper.GetSqlParameters()[0]);
+        Assert.AreEqual("@world", modelToSqlExpressionHelper.GetSqlParameters()[1]);
+        Assert.AreEqual("@test", modelToSqlExpressionHelper.GetSqlParameters()[2]);
+    }
 
-        [Test]
-        public void Sql_In()
-        {
-            var userNames = new[] { "hello@world.com", "blah@blah.com" };
+    [Test]
+    public void Sql_In()
+    {
+        var userNames = new[] { "hello@world.com", "blah@blah.com" };
 
-            Expression<Func<IUser, bool>> predicate = user => userNames.Contains(user.Username);
-            var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+        Expression<Func<IUser, bool>> predicate = user => userNames.Contains(user.Username);
+        var modelToSqlExpressionHelper = new ModelToSqlExpressionVisitor<IUser>(SqlContext.SqlSyntax, Mappers);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Debug.Print("Model to Sql ExpressionHelper: \n" + result);
+        Debug.Print("Model to Sql ExpressionHelper: \n" + result);
 
-            Assert.AreEqual("[umbracoUser].[userLogin] IN (@1,@2)", result);
-            Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[1]);
-            Assert.AreEqual("blah@blah.com", modelToSqlExpressionHelper.GetSqlParameters()[2]);
-        }
+        Assert.AreEqual("[umbracoUser].[userLogin] IN (@1,@2)", result);
+        Assert.AreEqual("hello@world.com", modelToSqlExpressionHelper.GetSqlParameters()[1]);
+        Assert.AreEqual("blah@blah.com", modelToSqlExpressionHelper.GetSqlParameters()[2]);
+    }
 
-        private string GetSomeValue(string s) => "xx" + s + "xx";
+    private string GetSomeValue(string s) => "xx" + s + "xx";
 
-        private class Foo
-        {
-            public string Value { get; set; }
-        }
+    private class Foo
+    {
+        public string Value { get; set; }
+    }
 
-        [Test]
-        public void StartsWith()
-        {
-            Expression<Func<UserDto, object>> predicate = user => user.Login.StartsWith("aaaaa");
-            var modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
-            var result = modelToSqlExpressionHelper.Visit(predicate);
+    [Test]
+    public void StartsWith()
+    {
+        Expression<Func<UserDto, object>> predicate = user => user.Login.StartsWith("aaaaa");
+        var modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
+        var result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Console.WriteLine(result);
-            Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
+        Console.WriteLine(result);
+        Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
 
-            predicate = user => user.Login.StartsWith(GetSomeValue("aaaaa"));
-            modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
-            result = modelToSqlExpressionHelper.Visit(predicate);
+        predicate = user => user.Login.StartsWith(GetSomeValue("aaaaa"));
+        modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
+        result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Console.WriteLine(result);
-            Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
+        Console.WriteLine(result);
+        Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
 
-            predicate = user => user.Login.StartsWith(GetSomeValue("aaaaa"));
-            modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
-            result = modelToSqlExpressionHelper.Visit(predicate);
+        predicate = user => user.Login.StartsWith(GetSomeValue("aaaaa"));
+        modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
+        result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Console.WriteLine(result);
-            Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
+        Console.WriteLine(result);
+        Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
 
-            var foo = new Foo { Value = "aaaaa" };
-            predicate = user => user.Login.StartsWith(foo.Value);
-            modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
-            result = modelToSqlExpressionHelper.Visit(predicate);
+        var foo = new Foo { Value = "aaaaa" };
+        predicate = user => user.Login.StartsWith(foo.Value);
+        modelToSqlExpressionHelper = new PocoToSqlExpressionVisitor<UserDto>(SqlContext, null);
+        result = modelToSqlExpressionHelper.Visit(predicate);
 
-            Console.WriteLine(result);
-            Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
+        Console.WriteLine(result);
+        Assert.AreEqual("upper([umbracoUser].[userLogin]) LIKE upper(@0)", result);
 
-            // below does not work, we want to output
-            // LIKE concat([group].[name], ',%')
-            // and how would we get the comma there? we'd have to parse .StartsWith(group.Name + ',')
-            // which is going to be quite complicated => no
+        // below does not work, we want to output
+        // LIKE concat([group].[name], ',%')
+        // and how would we get the comma there? we'd have to parse .StartsWith(group.Name + ',')
+        // which is going to be quite complicated => no
 
-            // how can we do user.Login.StartsWith(other.Value) ?? to use in WHERE or JOIN.ON clauses ??
-            //// Expression<Func<UserDto, UserGroupDto, object>> predicate2 = (user, group) => user.Login.StartsWith(group.Name);
-            //// var modelToSqlExpressionHelper2 = new PocoToSqlExpressionVisitor<UserDto, UserGroupDto>(SqlContext, null, null);
-            //// var result2 = modelToSqlExpressionHelper2.Visit(predicate2); // fails, for now
+        // how can we do user.Login.StartsWith(other.Value) ?? to use in WHERE or JOIN.ON clauses ??
+        //// Expression<Func<UserDto, UserGroupDto, object>> predicate2 = (user, group) => user.Login.StartsWith(group.Name);
+        //// var modelToSqlExpressionHelper2 = new PocoToSqlExpressionVisitor<UserDto, UserGroupDto>(SqlContext, null, null);
+        //// var result2 = modelToSqlExpressionHelper2.Visit(predicate2); // fails, for now
 
-            //// Console.WriteLine(result2);
+        //// Console.WriteLine(result2);
 
-            Expression<Func<UserDto, UserGroupDto, object>> predicate3 = (user, group) => SqlExtensionsStatics.SqlText<bool>(user.Login, group.Name, (n1, n2) => $"({n1} LIKE concat({n2}, ',%'))");
-            var modelToSqlExpressionHelper3 = new PocoToSqlExpressionVisitor<UserDto, UserGroupDto>(SqlContext, null, null);
-            var result3 = modelToSqlExpressionHelper3.Visit(predicate3);
+        Expression<Func<UserDto, UserGroupDto, object>> predicate3 = (user, group) =>
+            SqlExtensionsStatics.SqlText<bool>(user.Login, group.Name, (n1, n2) => $"({n1} LIKE concat({n2}, ',%'))");
+        var modelToSqlExpressionHelper3 = new PocoToSqlExpressionVisitor<UserDto, UserGroupDto>(SqlContext, null, null);
+        var result3 = modelToSqlExpressionHelper3.Visit(predicate3);
 
-            Console.WriteLine(result3);
-        }
+        Console.WriteLine(result3);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs
index bb56f40c11..a440639cce 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaRepositorySqlClausesTest.cs
@@ -5,47 +5,46 @@ using System;
 using System.Diagnostics;
 using NPoco;
 using NUnit.Framework;
-using Umbraco.Cms.Infrastructure.Persistence;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying;
+
+[TestFixture]
+public class MediaRepositorySqlClausesTest : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class MediaRepositorySqlClausesTest : BaseUsingSqlSyntax
+    [Test]
+    public void Can_Verify_Base_Clause()
     {
-        [Test]
-        public void Can_Verify_Base_Clause()
+        var nodeObjectTypeId = Constants.ObjectTypes.Media;
+
+        var expected = new Sql();
+        expected.Select("*")
+            .From($"[{Constants.DatabaseSchema.Tables.ContentVersion}]")
+            .InnerJoin($"[{Constants.DatabaseSchema.Tables.Content}]").On(
+                $"[{Constants.DatabaseSchema.Tables.ContentVersion}].[nodeId] = [{Constants.DatabaseSchema.Tables.Content}].[nodeId]")
+            .InnerJoin("[umbracoNode]").On($"[{Constants.DatabaseSchema.Tables.Content}].[nodeId] = [umbracoNode].[id]")
+            .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("b796f64c-1f99-4ffb-b886-4bf4bc011a9c"));
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<ContentVersionDto>()
+            .InnerJoin<ContentDto>()
+            .On<ContentVersionDto, ContentDto>(left => left.NodeId, right => right.NodeId)
+            .InnerJoin<NodeDto>()
+            .On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .Where<NodeDto>(x => x.NodeObjectType == nodeObjectTypeId);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
+        for (var i = 0; i < expected.Arguments.Length; i++)
         {
-            Guid nodeObjectTypeId = Constants.ObjectTypes.Media;
-
-            var expected = new Sql();
-            expected.Select("*")
-                .From($"[{Constants.DatabaseSchema.Tables.ContentVersion}]")
-                .InnerJoin($"[{Constants.DatabaseSchema.Tables.Content}]").On($"[{Constants.DatabaseSchema.Tables.ContentVersion}].[nodeId] = [{Constants.DatabaseSchema.Tables.Content}].[nodeId]")
-                .InnerJoin("[umbracoNode]").On($"[{Constants.DatabaseSchema.Tables.Content}].[nodeId] = [umbracoNode].[id]")
-                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("b796f64c-1f99-4ffb-b886-4bf4bc011a9c"));
-
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll()
-                .From<ContentVersionDto>()
-                .InnerJoin<ContentDto>()
-                .On<ContentVersionDto, ContentDto>(left => left.NodeId, right => right.NodeId)
-                .InnerJoin<NodeDto>()
-                .On<ContentDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == nodeObjectTypeId);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
-            for (int i = 0; i < expected.Arguments.Length; i++)
-            {
-                Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
-            }
-
-            Debug.Print(sql.SQL);
+            Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
         }
+
+        Debug.Print(sql.SQL);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
index fdde0df05a..a10c7826c4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/MediaTypeRepositorySqlClausesTest.cs
@@ -5,44 +5,42 @@ using System;
 using System.Diagnostics;
 using NPoco;
 using NUnit.Framework;
-using Umbraco.Cms.Infrastructure.Persistence;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying;
+
+[TestFixture]
+public class MediaTypeRepositorySqlClausesTest : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class MediaTypeRepositorySqlClausesTest : BaseUsingSqlSyntax
+    [Test]
+    public void Can_Verify_Base_Clause()
     {
-        [Test]
-        public void Can_Verify_Base_Clause()
+        var nodeObjectTypeId = Constants.ObjectTypes.MediaType;
+
+        var expected = new Sql();
+        expected.Select("*")
+            .From("[cmsContentType]")
+            .InnerJoin("[umbracoNode]").On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
+            .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"));
+
+        var sql = Sql();
+        sql.SelectAll()
+            .From<ContentTypeDto>()
+            .InnerJoin<NodeDto>()
+            .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
+            .Where<NodeDto>(x => x.NodeObjectType == nodeObjectTypeId);
+
+        Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
+
+        Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
+        for (var i = 0; i < expected.Arguments.Length; i++)
         {
-            Guid nodeObjectTypeId = Constants.ObjectTypes.MediaType;
-
-            var expected = new Sql();
-            expected.Select("*")
-                .From("[cmsContentType]")
-                .InnerJoin("[umbracoNode]").On("[cmsContentType].[nodeId] = [umbracoNode].[id]")
-                .Where("([umbracoNode].[nodeObjectType] = @0)", new Guid("4ea4382b-2f5a-4c2b-9587-ae9b3cf3602e"));
-
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll()
-                .From<ContentTypeDto>()
-                .InnerJoin<NodeDto>()
-                .On<ContentTypeDto, NodeDto>(left => left.NodeId, right => right.NodeId)
-                .Where<NodeDto>(x => x.NodeObjectType == nodeObjectTypeId);
-
-            Assert.That(sql.SQL, Is.EqualTo(expected.SQL));
-
-            Assert.AreEqual(expected.Arguments.Length, sql.Arguments.Length);
-            for (int i = 0; i < expected.Arguments.Length; i++)
-            {
-                Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
-            }
-
-            Debug.Print(sql.SQL);
+            Assert.AreEqual(expected.Arguments[i], sql.Arguments[i]);
         }
+
+        Debug.Print(sql.SQL);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs
index 7e224251f9..aca6acbc85 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/Querying/QueryBuilderTests.cs
@@ -2,120 +2,117 @@
 // See LICENSE for more details.
 
 using System.Diagnostics;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
-using Umbraco.Cms.Core.Persistence.Querying;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.Dtos;
 using Umbraco.Cms.Infrastructure.Persistence.Querying;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence.Querying;
+
+[TestFixture]
+public class QueryBuilderTests : BaseUsingSqlSyntax
 {
-    [TestFixture]
-    public class QueryBuilderTests : BaseUsingSqlSyntax
+    [Test]
+    public void Can_Build_StartsWith_Query_For_IContent()
     {
-        [Test]
-        public void Can_Build_StartsWith_Query_For_IContent()
-        {
-            // Arrange
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll();
-            sql.From("umbracoNode");
+        // Arrange
+        var sql = Sql();
+        sql.SelectAll();
+        sql.From("umbracoNode");
 
-            IQuery<IContent> query = new Query<IContent>(SqlContext).Where(x => x.Path.StartsWith("-1"));
+        var query = new Query<IContent>(SqlContext).Where(x => x.Path.StartsWith("-1"));
 
-            // Act
-            var translator = new SqlTranslator<IContent>(sql, query);
-            Sql<ISqlContext> result = translator.Translate();
-            string strResult = result.SQL;
+        // Act
+        var translator = new SqlTranslator<IContent>(sql, query);
+        var result = translator.Translate();
+        var strResult = result.SQL;
 
-            string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (upper([umbracoNode].[path]) LIKE upper(@0))";
+        var expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (upper([umbracoNode].[path]) LIKE upper(@0))";
 
-            // Assert
-            Assert.That(strResult, Is.Not.Empty);
-            Assert.That(strResult, Is.EqualTo(expectedResult));
+        // Assert
+        Assert.That(strResult, Is.Not.Empty);
+        Assert.That(strResult, Is.EqualTo(expectedResult));
 
-            Assert.AreEqual(1, result.Arguments.Length);
-            Assert.AreEqual("-1%", sql.Arguments[0]);
+        Assert.AreEqual(1, result.Arguments.Length);
+        Assert.AreEqual("-1%", sql.Arguments[0]);
 
-            Debug.Print(strResult);
-        }
+        Debug.Print(strResult);
+    }
 
-        [Test]
-        public void Can_Build_ParentId_Query_For_IContent()
-        {
-            // Arrange
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll();
-            sql.From("umbracoNode");
+    [Test]
+    public void Can_Build_ParentId_Query_For_IContent()
+    {
+        // Arrange
+        var sql = Sql();
+        sql.SelectAll();
+        sql.From("umbracoNode");
 
-            IQuery<IContent> query = new Query<IContent>(SqlContext).Where(x => x.ParentId == -1);
+        var query = new Query<IContent>(SqlContext).Where(x => x.ParentId == -1);
 
-            // Act
-            var translator = new SqlTranslator<IContent>(sql, query);
-            Sql<ISqlContext> result = translator.Translate();
-            string strResult = result.SQL;
+        // Act
+        var translator = new SqlTranslator<IContent>(sql, query);
+        var result = translator.Translate();
+        var strResult = result.SQL;
 
-            string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([umbracoNode].[parentId] = @0))";
+        var expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([umbracoNode].[parentId] = @0))";
 
-            // Assert
-            Assert.That(strResult, Is.Not.Empty);
-            Assert.That(strResult, Is.EqualTo(expectedResult));
+        // Assert
+        Assert.That(strResult, Is.Not.Empty);
+        Assert.That(strResult, Is.EqualTo(expectedResult));
 
-            Assert.AreEqual(1, result.Arguments.Length);
-            Assert.AreEqual(-1, sql.Arguments[0]);
+        Assert.AreEqual(1, result.Arguments.Length);
+        Assert.AreEqual(-1, sql.Arguments[0]);
 
-            Debug.Print(strResult);
-        }
+        Debug.Print(strResult);
+    }
 
-        [Test]
-        public void Can_Build_ContentTypeAlias_Query_For_IContentType()
-        {
-            // Arrange
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll();
-            sql.From("umbracoNode");
+    [Test]
+    public void Can_Build_ContentTypeAlias_Query_For_IContentType()
+    {
+        // Arrange
+        var sql = Sql();
+        sql.SelectAll();
+        sql.From("umbracoNode");
 
-            IQuery<IContentType> query = new Query<IContentType>(SqlContext).Where(x => x.Alias == "umbTextpage");
+        var query = new Query<IContentType>(SqlContext).Where(x => x.Alias == "umbTextpage");
 
-            // Act
-            var translator = new SqlTranslator<IContentType>(sql, query);
-            Sql<ISqlContext> result = translator.Translate();
-            string strResult = result.SQL;
+        // Act
+        var translator = new SqlTranslator<IContentType>(sql, query);
+        var result = translator.Translate();
+        var strResult = result.SQL;
 
-            string expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([cmsContentType].[alias] = @0))";
+        var expectedResult = "SELECT *\nFROM umbracoNode\nWHERE (([cmsContentType].[alias] = @0))";
 
-            // Assert
-            Assert.That(strResult, Is.Not.Empty);
-            Assert.That(strResult, Is.EqualTo(expectedResult));
-            Assert.AreEqual(1, result.Arguments.Length);
-            Assert.AreEqual("umbTextpage", sql.Arguments[0]);
+        // Assert
+        Assert.That(strResult, Is.Not.Empty);
+        Assert.That(strResult, Is.EqualTo(expectedResult));
+        Assert.AreEqual(1, result.Arguments.Length);
+        Assert.AreEqual("umbTextpage", sql.Arguments[0]);
 
-            Debug.Print(strResult);
-        }
+        Debug.Print(strResult);
+    }
 
-        [Test]
-        public void Can_Build_PublishedDescendants_Query_For_IContent()
-        {
-            const string path = "-1,1046,1076,1089";
-            const int id = 1046;
+    [Test]
+    public void Can_Build_PublishedDescendants_Query_For_IContent()
+    {
+        const string path = "-1,1046,1076,1089";
+        const int id = 1046;
 
-            Sql<ISqlContext> sql = Sql();
-            sql.SelectAll()
-                .From<DocumentDto>(); // the actual SELECT really does not matter
+        var sql = Sql();
+        sql.SelectAll()
+            .From<DocumentDto>(); // the actual SELECT really does not matter
 
-            IQuery<IContent> query = SqlContext.Query<IContent>().Where(x => x.Path.StartsWith(path) && x.Id != id && x.Published && x.Trashed == false);
+        var query = SqlContext.Query<IContent>()
+            .Where(x => x.Path.StartsWith(path) && x.Id != id && x.Published && x.Trashed == false);
 
-            var translator = new SqlTranslator<IContent>(sql, query);
-            Sql<ISqlContext> result = translator.Translate();
+        var translator = new SqlTranslator<IContent>(sql, query);
+        var result = translator.Translate();
 
-            Assert.AreEqual("-1,1046,1076,1089%", result.Arguments[0]);
-            Assert.AreEqual(1046, result.Arguments[1]);
-            Assert.AreEqual(true, result.Arguments[2]);
-            Assert.AreEqual(false, result.Arguments[3]);
-        }
+        Assert.AreEqual("-1,1046,1076,1089%", result.Arguments[0]);
+        Assert.AreEqual(1046, result.Arguments[1]);
+        Assert.AreEqual(true, result.Arguments[2]);
+        Assert.AreEqual(false, result.Arguments[3]);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/SqlAzureDatabaseProviderMetadataTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/SqlAzureDatabaseProviderMetadataTests.cs
index eed43b3aba..692ccc45bd 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/SqlAzureDatabaseProviderMetadataTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Persistence/SqlAzureDatabaseProviderMetadataTests.cs
@@ -1,49 +1,53 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using Umbraco.Cms.Core.Install.Models;
-using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Persistence.SqlServer.Services;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Persistence;
+
+[TestFixture]
+public class SqlAzureDatabaseProviderMetadataTests
 {
-    [TestFixture]
-    public class SqlAzureDatabaseProviderMetadataTests
+    [TestCase("MyServer", "MyDatabase", "MyUser", "MyPassword")]
+    [TestCase("MyServer", "MyDatabase", "MyUser@MyServer", "MyPassword")]
+    [TestCase("tcp:MyServer", "MyDatabase", "MyUser", "MyPassword")]
+    [TestCase("tcp:MyServer", "MyDatabase", "MyUser@MyServer", "MyPassword")]
+    [TestCase("tcp:MyServer,1433", "MyDatabase", "MyUser", "MyPassword")]
+    [TestCase("tcp:MyServer,1433", "MyDatabase", "MyUser@MyServer", "MyPassword")]
+    [TestCase("tcp:MyServer.database.windows.net", "MyDatabase", "MyUser", "MyPassword")]
+    [TestCase("tcp:MyServer.database.windows.net", "MyDatabase", "MyUser@MyServer", "MyPassword")]
+    [TestCase("tcp:MyServer.database.windows.net,1433", "MyDatabase", "MyUser", "MyPassword")]
+    [TestCase("tcp:MyServer.database.windows.net,1433", "MyDatabase", "MyUser@MyServer", "MyPassword")]
+    public void Build_Azure_Connection_String_Regular(string server, string databaseName, string userName, string password)
     {
-        [TestCase("MyServer", "MyDatabase", "MyUser", "MyPassword")]
-        [TestCase("MyServer", "MyDatabase", "MyUser@MyServer", "MyPassword")]
-        [TestCase("tcp:MyServer", "MyDatabase", "MyUser", "MyPassword")]
-        [TestCase("tcp:MyServer", "MyDatabase", "MyUser@MyServer", "MyPassword")]
-        [TestCase("tcp:MyServer,1433", "MyDatabase", "MyUser", "MyPassword")]
-        [TestCase("tcp:MyServer,1433", "MyDatabase", "MyUser@MyServer", "MyPassword")]
-        [TestCase("tcp:MyServer.database.windows.net", "MyDatabase", "MyUser", "MyPassword")]
-        [TestCase("tcp:MyServer.database.windows.net", "MyDatabase", "MyUser@MyServer", "MyPassword")]
-        [TestCase("tcp:MyServer.database.windows.net,1433", "MyDatabase", "MyUser", "MyPassword")]
-        [TestCase("tcp:MyServer.database.windows.net,1433", "MyDatabase", "MyUser@MyServer", "MyPassword")]
-        public void Build_Azure_Connection_String_Regular(string server, string databaseName, string userName, string password)
+        var settings = new DatabaseModel
         {
-            var settings = new DatabaseModel
-            {
-                Server = server, DatabaseName = databaseName, Login = userName, Password = password
-            };
+            Server = server,
+            DatabaseName = databaseName,
+            Login = userName,
+            Password = password,
+        };
 
-            var sut = new SqlAzureDatabaseProviderMetadata();
-            var connectionString = sut.GenerateConnectionString(settings);
-            Assert.AreEqual(connectionString, "Server=tcp:MyServer.database.windows.net,1433;Database=MyDatabase;User ID=MyUser@MyServer;Password=MyPassword");
-        }
+        var sut = new SqlAzureDatabaseProviderMetadata();
+        var connectionString = sut.GenerateConnectionString(settings);
+        Assert.AreEqual(connectionString, "Server=tcp:MyServer.database.windows.net,1433;Database=MyDatabase;User ID=MyUser@MyServer;Password=MyPassword");
+    }
 
-        [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com,1433", "MyDatabase", "MyUser", "MyPassword")]
-        [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com,1433", "MyDatabase", "MyUser@kzeej5z8ty", "MyPassword")]
-        [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com", "MyDatabase", "MyUser", "MyPassword")]
-        [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com", "MyDatabase", "MyUser@kzeej5z8ty", "MyPassword")]
-        public void Build_Azure_Connection_String_CustomServer(string server, string databaseName, string userName, string password)
+    [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com,1433", "MyDatabase", "MyUser", "MyPassword")]
+    [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com,1433", "MyDatabase", "MyUser@kzeej5z8ty", "MyPassword")]
+    [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com", "MyDatabase", "MyUser", "MyPassword")]
+    [TestCase("tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com", "MyDatabase", "MyUser@kzeej5z8ty", "MyPassword")]
+    public void Build_Azure_Connection_String_CustomServer(string server, string databaseName, string userName, string password)
+    {
+        var settings = new DatabaseModel
         {
-            var settings = new DatabaseModel
-            {
-                Server = server, DatabaseName = databaseName, Login = userName, Password = password
-            };
+            Server = server,
+            DatabaseName = databaseName,
+            Login = userName,
+            Password = password,
+        };
 
-            var sut = new SqlAzureDatabaseProviderMetadata();
-            var connectionString = sut.GenerateConnectionString(settings);
-            Assert.AreEqual(connectionString, "Server=tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com,1433;Database=MyDatabase;User ID=MyUser@kzeej5z8ty;Password=MyPassword");
-        }
+        var sut = new SqlAzureDatabaseProviderMetadata();
+        var connectionString = sut.GenerateConnectionString(settings);
+        Assert.AreEqual(connectionString, "Server=tcp:kzeej5z8ty.ssmsawacluster4.windowsazure.mscds.com,1433;Database=MyDatabase;User ID=MyUser@kzeej5z8ty;Password=MyPassword");
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/ContentSerializationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/ContentSerializationTests.cs
index 46824d6386..9c191d2468 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/ContentSerializationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/ContentSerializationTests.cs
@@ -1,110 +1,106 @@
-using Moq;
-using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using Moq;
+using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class ContentSerializationTests
 {
-    [TestFixture]
-    public class ContentSerializationTests
+    [Test]
+    public void GivenACacheModel_WhenItsSerializedAndDeserializedWithAnySerializer_TheResultsAreTheSame()
     {
-        [Test]
-        public void GivenACacheModel_WhenItsSerializedAndDeserializedWithAnySerializer_TheResultsAreTheSame()
-        {
-            var jsonSerializer = new JsonContentNestedDataSerializer();
-            var msgPackSerializer = new MsgPackContentNestedDataSerializer(Mock.Of<IPropertyCacheCompression>());
+        var jsonSerializer = new JsonContentNestedDataSerializer();
+        var msgPackSerializer = new MsgPackContentNestedDataSerializer(Mock.Of<IPropertyCacheCompression>());
 
-            var now = DateTime.Now;
-            var cacheModel = new ContentCacheDataModel
+        var now = DateTime.Now;
+        var cacheModel = new ContentCacheDataModel
+        {
+            PropertyData = new Dictionary<string, PropertyData[]>
             {
-                PropertyData = new Dictionary<string, PropertyData[]>
+                ["propertyOne"] =
+                    new[] { new PropertyData { Culture = "en-US", Segment = "test", Value = "hello world" } },
+                ["propertyTwo"] = new[]
                 {
-                    ["propertyOne"] = new[]
-                    {
-                        new PropertyData
-                        {
-                            Culture = "en-US",
-                            Segment = "test",
-                            Value = "hello world"
-                        }
-                    },
-                    ["propertyTwo"] = new[]
-                    {
-                        new PropertyData
-                        {
-                            Culture = "en-US",
-                            Segment = "test",
-                            Value = "Lorem ipsum"
-                        }
-                    }
+                    new PropertyData { Culture = "en-US", Segment = "test", Value = "Lorem ipsum" },
                 },
-                CultureData = new Dictionary<string, CultureVariation>
-                {
-                    ["en-US"] = new CultureVariation
-                    {
-                        Date = now,
-                        IsDraft = false,
-                        Name = "Home",
-                        UrlSegment = "home"
-                    }
-                },
-                UrlSegment = "home"
-            };
-
-            var content = Mock.Of<IReadOnlyContentBase>(x => x.ContentTypeId == 1);
-
-            var json = jsonSerializer.Serialize(content, cacheModel, false).StringData;
-            var msgPack = msgPackSerializer.Serialize(content, cacheModel, false).ByteData;
-
-            Console.WriteLine(json);
-            Console.WriteLine(msgPackSerializer.ToJson(msgPack));
-
-            var jsonContent = jsonSerializer.Deserialize(content, json, null, false);
-            var msgPackContent = msgPackSerializer.Deserialize(content, null, msgPack, false);
-
-
-            CollectionAssert.AreEqual(jsonContent.CultureData.Keys, msgPackContent.CultureData.Keys);
-            CollectionAssert.AreEqual(jsonContent.PropertyData.Keys, msgPackContent.PropertyData.Keys);
-            CollectionAssert.AreEqual(jsonContent.CultureData.Values, msgPackContent.CultureData.Values, new CultureVariationComparer());
-            CollectionAssert.AreEqual(jsonContent.PropertyData.Values, msgPackContent.PropertyData.Values, new PropertyDataComparer());
-            Assert.AreEqual(jsonContent.UrlSegment, msgPackContent.UrlSegment);
-        }
-
-        public class CultureVariationComparer : Comparer<CultureVariation>
-        {
-            public override int Compare(CultureVariation x, CultureVariation y)
+            },
+            CultureData = new Dictionary<string, CultureVariation>
             {
-                if (x == null && y == null)
-                    return 0;
-                if (x == null && y != null)
-                    return -1;
-                if (x != null && y == null)
-                    return 1;
+                ["en-US"] = new() { Date = now, IsDraft = false, Name = "Home", UrlSegment = "home" },
+            },
+            UrlSegment = "home",
+        };
 
-                return x.Date.CompareTo(y.Date) | x.IsDraft.CompareTo(y.IsDraft) | x.Name.CompareTo(y.Name) | x.UrlSegment.CompareTo(y.UrlSegment);
-            }
-        }
+        var content = Mock.Of<IReadOnlyContentBase>(x => x.ContentTypeId == 1);
 
-        public class PropertyDataComparer : Comparer<PropertyData>
+        var json = jsonSerializer.Serialize(content, cacheModel, false).StringData;
+        var msgPack = msgPackSerializer.Serialize(content, cacheModel, false).ByteData;
+
+        Console.WriteLine(json);
+        Console.WriteLine(msgPackSerializer.ToJson(msgPack));
+
+        var jsonContent = jsonSerializer.Deserialize(content, json, null, false);
+        var msgPackContent = msgPackSerializer.Deserialize(content, null, msgPack, false);
+
+        CollectionAssert.AreEqual(jsonContent.CultureData.Keys, msgPackContent.CultureData.Keys);
+        CollectionAssert.AreEqual(jsonContent.PropertyData.Keys, msgPackContent.PropertyData.Keys);
+        CollectionAssert.AreEqual(jsonContent.CultureData.Values, msgPackContent.CultureData.Values, new CultureVariationComparer());
+        CollectionAssert.AreEqual(jsonContent.PropertyData.Values, msgPackContent.PropertyData.Values, new PropertyDataComparer());
+        Assert.AreEqual(jsonContent.UrlSegment, msgPackContent.UrlSegment);
+    }
+
+    public class CultureVariationComparer : Comparer<CultureVariation>
+    {
+        public override int Compare(CultureVariation x, CultureVariation y)
         {
-            public override int Compare(PropertyData x, PropertyData y)
+            if (x == null && y == null)
             {
-                if (x == null && y == null)
-                    return 0;
-                if (x == null && y != null)
-                    return -1;
-                if (x != null && y == null)
-                    return 1;
-
-                var xVal = x.Value?.ToString() ?? string.Empty;
-                var yVal = y.Value?.ToString() ?? string.Empty;
-
-                return x.Culture.CompareTo(y.Culture) | x.Segment.CompareTo(y.Segment) | xVal.CompareTo(yVal);
+                return 0;
             }
-        }
 
+            if (x == null && y != null)
+            {
+                return -1;
+            }
+
+            if (x != null && y == null)
+            {
+                return 1;
+            }
+
+            return x.Date.CompareTo(y.Date) | x.IsDraft.CompareTo(y.IsDraft) | x.Name.CompareTo(y.Name) |
+                   x.UrlSegment.CompareTo(y.UrlSegment);
+        }
+    }
+
+    public class PropertyDataComparer : Comparer<PropertyData>
+    {
+        public override int Compare(PropertyData x, PropertyData y)
+        {
+            if (x == null && y == null)
+            {
+                return 0;
+            }
+
+            if (x == null && y != null)
+            {
+                return -1;
+            }
+
+            if (x != null && y == null)
+            {
+                return 1;
+            }
+
+            var xVal = x.Value?.ToString() ?? string.Empty;
+            var yVal = y.Value?.ToString() ?? string.Empty;
+
+            return x.Culture.CompareTo(y.Culture) | x.Segment.CompareTo(y.Segment) | xVal.CompareTo(yVal);
+        }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentCacheTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentCacheTests.cs
index 0ef8a856fd..c06aed8415 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentCacheTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentCacheTests.cs
@@ -7,79 +7,68 @@ using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class PublishContentCacheTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class PublishContentCacheTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private IPublishedContentCache _cache;
+        base.Setup();
 
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        var xml = PublishedContentXml.PublishContentCacheTestsXml();
 
-            string xml = PublishedContentXml.PublishContentCacheTestsXml();
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        // configure the Home content type to be composed of another for tests.
+        var compositionType = new ContentType(TestHelper.ShortStringHelper, -1) { Alias = "MyCompositionAlias" };
+        contentTypes.First(x => x.Alias == "Home").AddContentType(compositionType);
 
-            // configure the Home content type to be composed of another for tests.
-            var compositionType = new ContentType(TestHelper.ShortStringHelper, -1)
-            {
-                Alias = "MyCompositionAlias"
-            };
-            contentTypes.First(x => x.Alias == "Home").AddContentType(compositionType);
+        InitializedCache(kits, contentTypes, dataTypes);
 
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
+        _cache = GetPublishedSnapshot().Content;
+    }
 
-            _cache = GetPublishedSnapshot().Content;
-        }
+    private IPublishedContentCache _cache;
 
-        [Test]
-        public void Has_Content()
-        {
-            Assert.IsTrue(_cache.HasContent());
-        }
+    [Test]
+    public void Has_Content() => Assert.IsTrue(_cache.HasContent());
 
+    [Test]
+    public void Get_Root_Docs()
+    {
+        var result = _cache.GetAtRoot().ToArray();
+        Assert.AreEqual(2, result.Length);
+        Assert.AreEqual(1046, result.ElementAt(0).Id);
+        Assert.AreEqual(1172, result.ElementAt(1).Id);
+    }
 
-        [Test]
-        public void Get_Root_Docs()
-        {
-            var result = _cache.GetAtRoot();
-            Assert.AreEqual(2, result.Count());
-            Assert.AreEqual(1046, result.ElementAt(0).Id);
-            Assert.AreEqual(1172, result.ElementAt(1).Id);
-        }
+    [TestCase("/", 1046)]
+    [TestCase("/home", 1046)]
+    [TestCase("/Home", 1046)] // test different cases
+    [TestCase("/home/sub1", 1173)]
+    [TestCase("/Home/sub1", 1173)]
+    [TestCase("/home/Sub1", 1173)] // test different cases
+    [TestCase("/home/Sub'Apostrophe", 1177)]
+    public void Get_Node_By_Route(string route, int nodeId)
+    {
+        var result = _cache.GetByRoute(route, false);
+        Assert.IsNotNull(result);
+        Assert.AreEqual(nodeId, result.Id);
+    }
 
-
-        [TestCase("/", 1046)]
-        [TestCase("/home", 1046)]
-        [TestCase("/Home", 1046)] //test different cases
-        [TestCase("/home/sub1", 1173)]
-        [TestCase("/Home/sub1", 1173)]
-        [TestCase("/home/Sub1", 1173)] //test different cases
-        [TestCase("/home/Sub'Apostrophe", 1177)]
-        public void Get_Node_By_Route(string route, int nodeId)
-        {
-            var result = _cache.GetByRoute(route, false);
-            Assert.IsNotNull(result);
-            Assert.AreEqual(nodeId, result.Id);
-        }
-
-
-
-        [TestCase("/", 1046)]
-        [TestCase("/sub1", 1173)]
-        [TestCase("/Sub1", 1173)]
-        public void Get_Node_By_Route_Hiding_Top_Level_Nodes(string route, int nodeId)
-        {
-            var result = _cache.GetByRoute(route, true);
-            Assert.IsNotNull(result);
-            Assert.AreEqual(nodeId, result.Id);
-        }
+    [TestCase("/", 1046)]
+    [TestCase("/sub1", 1173)]
+    [TestCase("/Sub1", 1173)]
+    public void Get_Node_By_Route_Hiding_Top_Level_Nodes(string route, int nodeId)
+    {
+        var result = _cache.GetByRoute(route, true);
+        Assert.IsNotNull(result);
+        Assert.AreEqual(nodeId, result.Id);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentDataTableTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentDataTableTests.cs
index 80920e071f..7bf07a21f3 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentDataTableTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentDataTableTests.cs
@@ -7,194 +7,190 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+/// <summary>
+///     Unit tests for IPublishedContent and extensions
+/// </summary>
+[TestFixture]
+public class PublishedContentDataTableTests : PublishedSnapshotServiceTestBase
 {
-    /// <summary>
-    /// Unit tests for IPublishedContent and extensions
-    /// </summary>
-    [TestFixture]
-    public class PublishedContentDataTableTests : PublishedSnapshotServiceTestBase
+    private readonly DataType[] _dataTypes = GetDefaultDataTypes();
+
+    private static ContentType CreateContentType(string name, IDataType dataType, IReadOnlyDictionary<string, string> propertyAliasesAndNames)
     {
-        private readonly DataType[] _dataTypes = GetDefaultDataTypes();
-
-        private static ContentType CreateContentType(string name, IDataType dataType, IReadOnlyDictionary<string, string> propertyAliasesAndNames)
+        var contentType = new ContentType(TestHelper.ShortStringHelper, -1)
         {
-            var contentType = new ContentType(TestHelper.ShortStringHelper, -1)
-            {
-                Alias = name,
-                Name = name,
-                Key = Guid.NewGuid(),
-                Id = name.GetHashCode()
-            };
-            foreach(var prop in propertyAliasesAndNames)
-            {
-                contentType.AddPropertyType(new PropertyType(TestHelper.ShortStringHelper, dataType, prop.Key)
-                {
-                    Name = prop.Value
-                });
-            }
-
-            return contentType;
-        }
-
-        private IEnumerable<ContentNodeKit> CreateCache(
-            bool createChildren,
-            IDataType dataType,
-            out ContentType[] contentTypes)
+            Alias = name,
+            Name = name,
+            Key = Guid.NewGuid(),
+            Id = name.GetHashCode(),
+        };
+        foreach (var prop in propertyAliasesAndNames)
         {
-            var result = new List<ContentNodeKit>();
-            var valueCounter = 1;
-            var parentId = 3;
-
-            var properties = new Dictionary<string, string>
+            contentType.AddPropertyType(new PropertyType(TestHelper.ShortStringHelper, dataType, prop.Key)
             {
-                ["property1"] = "Property 1",
-                ["property2"] = "Property 2",
-            };
-
-            ContentType parentContentType = CreateContentType("Parent", dataType, new Dictionary<string, string>(properties)
-                {
-                    ["property3"] = "Property 3"
-                });
-            ContentType childContentType = CreateContentType("Child", dataType, new Dictionary<string, string>(properties)
-            {
-                ["property4"] = "Property 4"
+                Name = prop.Value,
             });
-            ContentType child2ContentType = CreateContentType("Child2", dataType, new Dictionary<string, string>(properties)
+        }
+
+        return contentType;
+    }
+
+    private IEnumerable<ContentNodeKit> CreateCache(
+        bool createChildren,
+        IDataType dataType,
+        out ContentType[] contentTypes)
+    {
+        var result = new List<ContentNodeKit>();
+        var valueCounter = 1;
+        var parentId = 3;
+
+        var properties = new Dictionary<string, string> { ["property1"] = "Property 1", ["property2"] = "Property 2" };
+
+        var parentContentType = CreateContentType(
+            "Parent",
+            dataType,
+            new Dictionary<string, string>(properties) { ["property3"] = "Property 3" });
+        var childContentType = CreateContentType(
+            "Child",
+            dataType,
+            new Dictionary<string, string>(properties) { ["property4"] = "Property 4" });
+        var child2ContentType = CreateContentType(
+            "Child2",
+            dataType,
+            new Dictionary<string, string>(properties) { ["property4"] = "Property 4" });
+
+        contentTypes = new[] { parentContentType, childContentType, child2ContentType };
+
+        var parentData = new ContentDataBuilder()
+            .WithName("Page" + Guid.NewGuid())
+            .WithProperties(new PropertyDataBuilder()
+                .WithPropertyData("property1", "value" + valueCounter)
+                .WithPropertyData("property2", "value" + (valueCounter + 1))
+                .WithPropertyData("property3", "value" + (valueCounter + 2))
+                .Build())
+            .Build();
+
+        var parent = ContentNodeKitBuilder.CreateWithContent(
+            parentContentType.Id,
+            parentId,
+            $"-1,{parentId}",
+            draftData: parentData,
+            publishedData: parentData);
+
+        result.Add(parent);
+
+        if (createChildren)
+        {
+            for (var i = 0; i < 3; i++)
             {
-                ["property4"] = "Property 4"
-            });
+                valueCounter += 3;
+                var childId = parentId + i + 1;
 
-            contentTypes = new[] { parentContentType, childContentType, child2ContentType };
+                var childData = new ContentDataBuilder()
+                    .WithName("Page" + Guid.NewGuid())
+                    .WithProperties(new PropertyDataBuilder()
+                        .WithPropertyData("property1", "value" + valueCounter)
+                        .WithPropertyData("property2", "value" + (valueCounter + 1))
+                        .WithPropertyData("property4", "value" + (valueCounter + 2))
+                        .Build())
+                    .Build();
 
-            ContentData parentData = new ContentDataBuilder()
-                .WithName("Page" + Guid.NewGuid())
-                .WithProperties(new PropertyDataBuilder()                    
-                    .WithPropertyData("property1", "value" + valueCounter)
-                    .WithPropertyData("property2", "value" + (valueCounter + 1))
-                    .WithPropertyData("property3", "value" + (valueCounter + 2))
-                    .Build())
-                .Build();
+                var child = ContentNodeKitBuilder.CreateWithContent(
+                    i > 0 ? childContentType.Id : child2ContentType.Id,
+                    childId,
+                    $"-1,{parentId},{childId}",
+                    i,
+                    draftData: childData,
+                    publishedData: childData);
 
-            ContentNodeKit parent = ContentNodeKitBuilder.CreateWithContent(
-                parentContentType.Id,
-                parentId, $"-1,{parentId}",
-                draftData: parentData,
-                publishedData: parentData);
-
-            result.Add(parent);
-
-            if (createChildren)
-            {
-                for (int i = 0; i < 3; i++)
-                {
-                    valueCounter += 3;
-                    var childId = parentId + i + 1;
-
-                    ContentData childData = new ContentDataBuilder()
-                        .WithName("Page" + Guid.NewGuid())
-                        .WithProperties(new PropertyDataBuilder()
-                            .WithPropertyData("property1", "value" + valueCounter)
-                            .WithPropertyData("property2", "value" + (valueCounter + 1))
-                            .WithPropertyData("property4", "value" + (valueCounter + 2))
-                            .Build())
-                        .Build();
-                    
-                    ContentNodeKit child = ContentNodeKitBuilder.CreateWithContent(
-                        i > 0 ? childContentType.Id : child2ContentType.Id,
-                        childId, $"-1,{parentId},{childId}", i,
-                        draftData: childData,
-                        publishedData: childData);
-
-                    result.Add(child);
-                }
+                result.Add(child);
             }
-
-            return result;
         }
 
-        [Test]
-        public void To_DataTable()
-        {   
-            var cache = CreateCache(true, _dataTypes[0], out ContentType[] contentTypes);
-            InitializedCache(cache, contentTypes, dataTypes: _dataTypes);
+        return result;
+    }
 
-            var snapshot = GetPublishedSnapshot();
-            var root = snapshot.Content.GetAtRoot().First();
+    [Test]
+    public void To_DataTable()
+    {
+        var cache = CreateCache(true, _dataTypes[0], out var contentTypes);
+        InitializedCache(cache, contentTypes, _dataTypes);
 
-            var dt = root.ChildrenAsTable(
-                VariationContextAccessor,
-                ContentTypeService,
-                MediaTypeService,
-                Mock.Of<IMemberTypeService>(),
-                Mock.Of<IPublishedUrlProvider>());
+        var snapshot = GetPublishedSnapshot();
+        var root = snapshot.Content.GetAtRoot().First();
 
-            Assert.AreEqual(11, dt.Columns.Count);
-            Assert.AreEqual(3, dt.Rows.Count);
-            Assert.AreEqual("value4", dt.Rows[0]["Property 1"]);
-            Assert.AreEqual("value5", dt.Rows[0]["Property 2"]);
-            Assert.AreEqual("value6", dt.Rows[0]["Property 4"]);
-            Assert.AreEqual("value7", dt.Rows[1]["Property 1"]);
-            Assert.AreEqual("value8", dt.Rows[1]["Property 2"]);
-            Assert.AreEqual("value9", dt.Rows[1]["Property 4"]);
-            Assert.AreEqual("value10", dt.Rows[2]["Property 1"]);
-            Assert.AreEqual("value11", dt.Rows[2]["Property 2"]);
-            Assert.AreEqual("value12", dt.Rows[2]["Property 4"]);
-        }
+        var dt = root.ChildrenAsTable(
+            VariationContextAccessor,
+            ContentTypeService,
+            MediaTypeService,
+            Mock.Of<IMemberTypeService>(),
+            Mock.Of<IPublishedUrlProvider>());
 
-        [Test]
-        public void To_DataTable_With_Filter()
-        {
-            var cache = CreateCache(true, _dataTypes[0], out ContentType[] contentTypes);
-            InitializedCache(cache, contentTypes, dataTypes: _dataTypes);
+        Assert.AreEqual(11, dt.Columns.Count);
+        Assert.AreEqual(3, dt.Rows.Count);
+        Assert.AreEqual("value4", dt.Rows[0]["Property 1"]);
+        Assert.AreEqual("value5", dt.Rows[0]["Property 2"]);
+        Assert.AreEqual("value6", dt.Rows[0]["Property 4"]);
+        Assert.AreEqual("value7", dt.Rows[1]["Property 1"]);
+        Assert.AreEqual("value8", dt.Rows[1]["Property 2"]);
+        Assert.AreEqual("value9", dt.Rows[1]["Property 4"]);
+        Assert.AreEqual("value10", dt.Rows[2]["Property 1"]);
+        Assert.AreEqual("value11", dt.Rows[2]["Property 2"]);
+        Assert.AreEqual("value12", dt.Rows[2]["Property 4"]);
+    }
 
-            var snapshot = GetPublishedSnapshot();
-            var root = snapshot.Content.GetAtRoot().First();
+    [Test]
+    public void To_DataTable_With_Filter()
+    {
+        var cache = CreateCache(true, _dataTypes[0], out var contentTypes);
+        InitializedCache(cache, contentTypes, _dataTypes);
 
-            var dt = root.ChildrenAsTable(
-                VariationContextAccessor,
-                ContentTypeService,
-                MediaTypeService,
-                Mock.Of<IMemberTypeService>(),
-                Mock.Of<IPublishedUrlProvider>(),
-                "Child");
+        var snapshot = GetPublishedSnapshot();
+        var root = snapshot.Content.GetAtRoot().First();
 
-            Assert.AreEqual(11, dt.Columns.Count);
-            Assert.AreEqual(2, dt.Rows.Count);
-            Assert.AreEqual("value7", dt.Rows[0]["Property 1"]);
-            Assert.AreEqual("value8", dt.Rows[0]["Property 2"]);
-            Assert.AreEqual("value9", dt.Rows[0]["Property 4"]);
-            Assert.AreEqual("value10", dt.Rows[1]["Property 1"]);
-            Assert.AreEqual("value11", dt.Rows[1]["Property 2"]);
-            Assert.AreEqual("value12", dt.Rows[1]["Property 4"]);
-        }
+        var dt = root.ChildrenAsTable(
+            VariationContextAccessor,
+            ContentTypeService,
+            MediaTypeService,
+            Mock.Of<IMemberTypeService>(),
+            Mock.Of<IPublishedUrlProvider>(),
+            "Child");
 
-        [Test]
-        public void To_DataTable_No_Rows()
-        {
-            var cache = CreateCache(false, _dataTypes[0], out ContentType[] contentTypes);
-            InitializedCache(cache, contentTypes, dataTypes: _dataTypes);
+        Assert.AreEqual(11, dt.Columns.Count);
+        Assert.AreEqual(2, dt.Rows.Count);
+        Assert.AreEqual("value7", dt.Rows[0]["Property 1"]);
+        Assert.AreEqual("value8", dt.Rows[0]["Property 2"]);
+        Assert.AreEqual("value9", dt.Rows[0]["Property 4"]);
+        Assert.AreEqual("value10", dt.Rows[1]["Property 1"]);
+        Assert.AreEqual("value11", dt.Rows[1]["Property 2"]);
+        Assert.AreEqual("value12", dt.Rows[1]["Property 4"]);
+    }
 
-            var snapshot = GetPublishedSnapshot();
-            var root = snapshot.Content.GetAtRoot().First();
+    [Test]
+    public void To_DataTable_No_Rows()
+    {
+        var cache = CreateCache(false, _dataTypes[0], out var contentTypes);
+        InitializedCache(cache, contentTypes, _dataTypes);
 
-            var dt = root.ChildrenAsTable(
-                VariationContextAccessor,
-                ContentTypeService,
-                MediaTypeService,
-                Mock.Of<IMemberTypeService>(),
-                Mock.Of<IPublishedUrlProvider>());
+        var snapshot = GetPublishedSnapshot();
+        var root = snapshot.Content.GetAtRoot().First();
 
-            //will return an empty data table
-            Assert.AreEqual(0, dt.Columns.Count);
-            Assert.AreEqual(0, dt.Rows.Count);
-        }
+        var dt = root.ChildrenAsTable(
+            VariationContextAccessor,
+            ContentTypeService,
+            MediaTypeService,
+            Mock.Of<IMemberTypeService>(),
+            Mock.Of<IPublishedUrlProvider>());
 
+        // will return an empty data table
+        Assert.AreEqual(0, dt.Columns.Count);
+        Assert.AreEqual(0, dt.Rows.Count);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentExtensionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentExtensionTests.cs
index c3af93f911..0a71dd6faf 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentExtensionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentExtensionTests.cs
@@ -7,12 +7,30 @@ using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class PublishedContentExtensionTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class PublishedContentExtensionTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private const string XmlContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
+        base.Setup();
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            XmlContent,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        // configure inheritance for content types
+        var baseType = new ContentType(TestHelper.ShortStringHelper, -1) { Alias = "Base" };
+        contentTypes[0].AddContentType(baseType);
+
+        InitializedCache(kits, contentTypes, dataTypes);
+    }
+
+    private const string XmlContent = @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT inherited ANY>
 <!ATTLIST inherited id ID #REQUIRED>
@@ -21,57 +39,38 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
     <inherited id=""1100"" parentID=""-1"" level=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""1"" sortOrder=""1"" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" nodeName=""Home"" urlName=""home"" writerName=""admin"" creatorName=""admin"" path=""-1,1046"" isDoc=""""/>
 </root>";
 
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+    [Test]
+    public void IsDocumentType_NonRecursive_ActualType_ReturnsTrue()
+    {
+        var publishedContent = GetContent(1100);
+        Assert.That(publishedContent.IsDocumentType("Inherited", false));
+    }
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                XmlContent,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+    [Test]
+    public void IsDocumentType_NonRecursive_BaseType_ReturnsFalse()
+    {
+        var publishedContent = GetContent(1100);
+        Assert.That(publishedContent.IsDocumentType("Base", false), Is.False);
+    }
 
-            // configure inheritance for content types
-            var baseType = new ContentType(TestHelper.ShortStringHelper, -1) { Alias = "Base" };
-            contentTypes[0].AddContentType(baseType);
+    [Test]
+    public void IsDocumentType_Recursive_ActualType_ReturnsTrue()
+    {
+        var publishedContent = GetContent(1100);
+        Assert.That(publishedContent.IsDocumentType("Inherited", true));
+    }
 
-            InitializedCache(kits, contentTypes, dataTypes);
-        }
+    [Test]
+    public void IsDocumentType_Recursive_BaseType_ReturnsTrue()
+    {
+        var publishedContent = GetContent(1100);
+        Assert.That(publishedContent.IsDocumentType("Base", true));
+    }
 
-        [Test]
-        public void IsDocumentType_NonRecursive_ActualType_ReturnsTrue()
-        {
-            var publishedContent = GetContent(1100);
-            Assert.That(publishedContent.IsDocumentType("Inherited", false));
-        }
-
-        [Test]
-        public void IsDocumentType_NonRecursive_BaseType_ReturnsFalse()
-        {
-            var publishedContent = GetContent(1100);
-            Assert.That(publishedContent.IsDocumentType("Base", false), Is.False);
-        }
-
-        [Test]
-        public void IsDocumentType_Recursive_ActualType_ReturnsTrue()
-        {
-            var publishedContent = GetContent(1100);
-            Assert.That(publishedContent.IsDocumentType("Inherited", true));
-        }
-
-        [Test]
-        public void IsDocumentType_Recursive_BaseType_ReturnsTrue()
-        {
-            var publishedContent = GetContent(1100);
-            Assert.That(publishedContent.IsDocumentType("Base", true));
-        }
-
-        [Test]
-        public void IsDocumentType_Recursive_InvalidBaseType_ReturnsFalse()
-        {
-            var publishedContent = GetContent(1100);
-            Assert.That(publishedContent.IsDocumentType("invalidbase", true), Is.False);
-        }
+    [Test]
+    public void IsDocumentType_Recursive_InvalidBaseType_ReturnsFalse()
+    {
+        var publishedContent = GetContent(1100);
+        Assert.That(publishedContent.IsDocumentType("invalidbase", true), Is.False);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentLanguageVariantTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentLanguageVariantTests.cs
index a1182a9205..342e08acbe 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentLanguageVariantTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentLanguageVariantTests.cs
@@ -9,372 +9,342 @@ using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class PublishedContentLanguageVariantTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class PublishedContentLanguageVariantTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        [SetUp]
-        public override void Setup()
+        base.Setup();
+
+        var dataTypes = GetDefaultDataTypes();
+        var cache = CreateCache(dataTypes, out var contentTypes);
+
+        InitializedCache(cache, contentTypes, dataTypes);
+    }
+
+    protected override PropertyValueConverterCollection PropertyValueConverterCollection
+    {
+        get
         {
-            base.Setup();
-
-            var dataTypes = GetDefaultDataTypes();
-            var cache = CreateCache(dataTypes, out ContentType[] contentTypes);
-
-            InitializedCache(cache, contentTypes, dataTypes: dataTypes);
-        }
-
-        protected override PropertyValueConverterCollection PropertyValueConverterCollection
-        {
-            get
-            {
-                PropertyValueConverterCollection collection = base.PropertyValueConverterCollection;
-                return new PropertyValueConverterCollection(() => collection.Append(new TestNoValueValueConverter()));
-            }
-        }
-
-        private class TestNoValueValueConverter : SimpleTinyMceValueConverter
-        {
-            public override bool IsConverter(IPublishedPropertyType propertyType)
-                => propertyType.Alias == "noprop";
-
-            // for this test, we return false for IsValue for this property
-            public override bool? IsValue(object value, PropertyValueLevel level) => false;
-        }
-
-        /// <summary>
-        /// Override to mock localization service
-        /// </summary>
-        /// <param name="contentTypes"></param>
-        /// <param name="dataTypes"></param>
-        /// <returns></returns>
-        protected override ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes, IDataType[] dataTypes)
-        {
-            var serviceContext = base.CreateServiceContext(contentTypes, mediaTypes, dataTypes);
-
-            var localizationService = Mock.Get(serviceContext.LocalizationService);
-
-            var languages = new List<Language>
-            {
-                new Language("en-US", "English (United States)")
-                {
-                    Id = 1,
-                    IsDefault = true
-                },
-                new Language("fr", "French")
-                {
-                    Id = 2,
-                },
-                new Language("es", "Spanish")
-                {
-                    Id = 3,
-                    FallbackLanguageId = 1
-                },
-                new Language("it", "Italian")
-                {
-                    Id = 4,
-                    FallbackLanguageId = 3
-                },
-                new Language("de", "German")
-                {
-                    Id = 5
-                },
-                new Language("da", "Danish")
-                {
-                    Id = 6,
-                    FallbackLanguageId = 8
-                },
-                new Language("sv", "Swedish")
-                {
-                    Id = 7,
-                    FallbackLanguageId = 6
-                },
-                new Language("no", "Norweigan")
-                {
-                    Id = 8,
-                    FallbackLanguageId = 7
-                },
-                new Language("nl", "Dutch")
-                {
-                    Id = 9,
-                    FallbackLanguageId = 1
-                }
-            };
-
-            localizationService.Setup(x => x.GetAllLanguages()).Returns(languages);
-            localizationService.Setup(x => x.GetLanguageById(It.IsAny<int>()))
-                .Returns((int id) => languages.SingleOrDefault(y => y.Id == id));
-            localizationService.Setup(x => x.GetLanguageByIsoCode(It.IsAny<string>()))
-                .Returns((string c) => languages.SingleOrDefault(y => y.IsoCode == c));
-
-            return serviceContext;
-        }
-
-        /// <summary>
-        /// Creates a content cache
-        /// </summary>
-        /// <param name="dataTypes"></param>
-        /// <param name="contentTypes"></param>
-        /// <returns></returns>
-        /// <remarks>
-        /// Builds a content hierarchy of 3 nodes, each has a different set of cultural properties.
-        /// The first 2 share the same content type, the last one is a different content type.
-        /// NOTE: The content items themselves are 'Invariant' but their properties are 'Variant' by culture.
-        /// Normally in Umbraco this is prohibited but our APIs and database do actually support that behavior.
-        /// It is simpler to have these tests run this way, else we would need to use WithCultureInfos
-        /// for each item and pass in name values for all cultures we are supporting and then specify the
-        /// default VariationContextAccessor.VariationContext value to be a default culture instead of "".
-        /// </remarks>
-        private IEnumerable<ContentNodeKit> CreateCache(IDataType[] dataTypes, out ContentType[] contentTypes)
-        {
-            var result = new List<ContentNodeKit>();
-
-            var propertyDataTypes = new Dictionary<string, IDataType>
-            {
-                // we only have one data type for this test which will be resolved with string empty.
-                [string.Empty] = dataTypes[0]
-            };
-
-            var contentType1 = new ContentType(ShortStringHelper, -1);
-
-            ContentData item1Data = new ContentDataBuilder()
-                .WithName("Content 1")
-                .WithProperties(new PropertyDataBuilder()
-                    .WithPropertyData("welcomeText", "Welcome")
-                    .WithPropertyData("welcomeText", "Welcome", "en-US")
-                    .WithPropertyData("welcomeText", "Willkommen", "de")
-                    .WithPropertyData("welcomeText", "Welkom", "nl")
-                    .WithPropertyData("welcomeText2", "Welcome")
-                    .WithPropertyData("welcomeText2", "Welcome", "en-US")
-                    .WithPropertyData("noprop", "xxx")
-                    .Build())
-                // build with a dynamically created content type
-                .Build(ShortStringHelper, propertyDataTypes, contentType1, "ContentType1");
-
-            ContentNodeKit item1 = ContentNodeKitBuilder.CreateWithContent(
-                contentType1.Id,
-                1, "-1,1",
-                draftData: item1Data,
-                publishedData: item1Data);
-
-            result.Add(item1);
-
-            ContentData item2Data = new ContentDataBuilder()
-                .WithName("Content 2")
-                .WithProperties(new PropertyDataBuilder()
-                    .WithPropertyData("welcomeText", "Welcome")
-                    .WithPropertyData("welcomeText", "Welcome", "en-US")
-                    .WithPropertyData("noprop", "xxx")
-                    .Build())
-                // build while dynamically updating the same content type
-                .Build(ShortStringHelper, propertyDataTypes, contentType1);
-
-            ContentNodeKit item2 = ContentNodeKitBuilder.CreateWithContent(
-                contentType1.Id,
-                2, "-1,1,2",
-                parentContentId: 1,
-                draftData: item2Data,
-                publishedData: item2Data);
-
-            result.Add(item2);
-
-            var contentType2 = new ContentType(ShortStringHelper, -1);
-
-            ContentData item3Data = new ContentDataBuilder()
-                .WithName("Content 3")
-                .WithProperties(new PropertyDataBuilder()
-                    .WithPropertyData("prop3", "Oxxo")
-                    .WithPropertyData("prop3", "Oxxo", "en-US")
-                    .Build())
-                // build with a dynamically created content type
-                .Build(ShortStringHelper, propertyDataTypes, contentType2, "ContentType2");
-
-            ContentNodeKit item3 = ContentNodeKitBuilder.CreateWithContent(
-                contentType2.Id,
-                3, "-1,1,2,3",
-                parentContentId: 2,
-                draftData: item3Data,
-                publishedData: item3Data);
-
-            result.Add(item3);
-
-            contentTypes = new[] { contentType1, contentType2 };
-
-            return result;
-        }
-
-        [Test]
-        public void Can_Get_Content_For_Populated_Requested_Language()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First();
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "en-US");
-            Assert.AreEqual("Welcome", value);
-        }
-
-        [Test]
-        public void Can_Get_Content_For_Populated_Requested_Non_Default_Language()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First();
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "de");
-            Assert.AreEqual("Willkommen", value);
-        }
-
-        [Test]
-        public void Do_Not_Get_Content_For_Unpopulated_Requested_Language_Without_Fallback()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First();
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "fr");
-            Assert.IsNull(value);
-        }
-
-        [Test]
-        public void Do_Not_Get_Content_For_Unpopulated_Requested_Language_With_Fallback_Unless_Requested()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First();
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "es");
-            Assert.IsNull(value);
-        }
-
-        [Test]
-        public void Can_Get_Content_For_Unpopulated_Requested_Language_With_Fallback()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First();
-            var value = content.Value(PublishedValueFallback, "welcomeText", "es", fallback: Fallback.ToLanguage);
-            Assert.AreEqual("Welcome", value);
-        }
-
-        [Test]
-        public void Can_Get_Content_For_Unpopulated_Requested_Language_With_Fallback_Over_Two_Levels()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First();
-            var value = content.Value(PublishedValueFallback, "welcomeText", "it", fallback: Fallback.To(Fallback.Language, Fallback.Ancestors));
-            Assert.AreEqual("Welcome", value);
-        }
-
-        [Test]
-        public void Do_Not_GetContent_For_Unpopulated_Requested_Language_With_Fallback_Over_That_Loops()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First();
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "no", fallback: Fallback.ToLanguage);
-            Assert.IsNull(value);
-        }
-
-        [Test]
-        public void Do_Not_Get_Content_Recursively_Unless_Requested()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First();            
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText2");
-            Assert.IsNull(value);
-        }
-
-        [Test]
-        public void Can_Get_Content_Recursively()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First();
-            var value = content.Value(PublishedValueFallback, "welcomeText2", fallback: Fallback.ToAncestors);
-            Assert.AreEqual("Welcome", value);
-        }
-
-        [Test]
-        public void Do_Not_Get_Content_Recursively_Unless_Requested2()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First().Children.First();
-            Assert.IsNull(content.GetProperty("welcomeText2"));
-            var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText2");
-            Assert.IsNull(value);
-        }
-
-        [Test]
-        public void Can_Get_Content_Recursively2()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First().Children.First();
-            Assert.IsNull(content.GetProperty("welcomeText2"));
-            var value = content.Value(PublishedValueFallback, "welcomeText2", fallback: Fallback.ToAncestors);
-            Assert.AreEqual("Welcome", value);
-        }
-        
-        [Test]
-        public void Can_Get_Content_Recursively3()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First().Children.First();
-            Assert.IsNull(content.GetProperty("noprop"));
-            var value = content.Value(PublishedValueFallback, "noprop", fallback: Fallback.ToAncestors);
-            // property has no value - based on the converter
-            // but we still get the value (ie, the converter would do something)
-            Assert.AreEqual("xxx", value.ToString());
-        }
-
-        [Test]
-        public void Can_Get_Content_With_Recursive_Priority()
-        {
-            VariationContextAccessor.VariationContext = new VariationContext("nl");
-
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First();
-
-            var value = content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.To(Fallback.Ancestors, Fallback.Language));
-
-            // No Dutch value is directly assigned. Check has fallen back to Dutch value from parent.
-            Assert.AreEqual("Welkom", value);
-        }
-
-        [Test]
-        public void Can_Get_Content_With_Fallback_Language_Priority()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First();
-
-            var value = content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.ToLanguage);
-
-            // No Dutch value is directly assigned.  Check has fallen back to English value from language variant.
-            Assert.AreEqual("Welcome", value);
-        }
-
-        [Test]
-        public void Throws_For_Non_Supported_Fallback()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First();
-
-            Assert.Throws<NotSupportedException>(() => content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.To(999)));
-        }
-
-        [Test]
-        public void Can_Fallback_To_Default_Value()
-        {
-            var snapshot = GetPublishedSnapshot();
-            var content = snapshot.Content.GetAtRoot().First().Children.First();
-
-            // no Dutch value is assigned, so getting null
-            var value = content.Value(PublishedValueFallback, "welcomeText", "nl");
-            Assert.IsNull(value);
-
-            // even if we 'just' provide a default value
-            value = content.Value(PublishedValueFallback, "welcomeText", "nl", defaultValue: "woop");
-            Assert.IsNull(value);
-
-            // but it works with proper fallback settings
-            value = content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.ToDefaultValue, defaultValue: "woop");
-            Assert.AreEqual("woop", value);
+            var collection = base.PropertyValueConverterCollection;
+            return new PropertyValueConverterCollection(() => collection.Append(new TestNoValueValueConverter()));
         }
     }
+
+    private class TestNoValueValueConverter : SimpleTinyMceValueConverter
+    {
+        public override bool IsConverter(IPublishedPropertyType propertyType)
+            => propertyType.Alias == "noprop";
+
+        // for this test, we return false for IsValue for this property
+        public override bool? IsValue(object value, PropertyValueLevel level) => false;
+    }
+
+    /// <summary>
+    ///     Override to mock localization service
+    /// </summary>
+    /// <returns></returns>
+    protected override ServiceContext CreateServiceContext(IContentType[] contentTypes, IMediaType[] mediaTypes, IDataType[] dataTypes)
+    {
+        var serviceContext = base.CreateServiceContext(contentTypes, mediaTypes, dataTypes);
+
+        var localizationService = Mock.Get(serviceContext.LocalizationService);
+
+        var languages = new List<Language>
+        {
+            new("en-US", "English (United States)") { Id = 1, IsDefault = true },
+            new("fr", "French") { Id = 2 },
+            new("es", "Spanish") { Id = 3, FallbackLanguageId = 1 },
+            new("it", "Italian") { Id = 4, FallbackLanguageId = 3 },
+            new("de", "German") { Id = 5 },
+            new Language("da", "Danish") { Id = 6, FallbackLanguageId = 8 },
+            new Language("sv", "Swedish") { Id = 7, FallbackLanguageId = 6 },
+            new Language("no", "Norweigan") { Id = 8, FallbackLanguageId = 7 },
+            new Language("nl", "Dutch") { Id = 9, FallbackLanguageId = 1 },
+        };
+
+        localizationService.Setup(x => x.GetAllLanguages()).Returns(languages);
+        localizationService.Setup(x => x.GetLanguageById(It.IsAny<int>()))
+            .Returns((int id) => languages.SingleOrDefault(y => y.Id == id));
+        localizationService.Setup(x => x.GetLanguageByIsoCode(It.IsAny<string>()))
+            .Returns((string c) => languages.SingleOrDefault(y => y.IsoCode == c));
+
+        return serviceContext;
+    }
+
+    /// <summary>
+    ///     Creates a content cache
+    /// </summary>
+    /// <param name="dataTypes"></param>
+    /// <param name="contentTypes"></param>
+    /// <returns></returns>
+    /// <remarks>
+    ///     Builds a content hierarchy of 3 nodes, each has a different set of cultural properties.
+    ///     The first 2 share the same content type, the last one is a different content type.
+    ///     NOTE: The content items themselves are 'Invariant' but their properties are 'Variant' by culture.
+    ///     Normally in Umbraco this is prohibited but our APIs and database do actually support that behavior.
+    ///     It is simpler to have these tests run this way, else we would need to use WithCultureInfos
+    ///     for each item and pass in name values for all cultures we are supporting and then specify the
+    ///     default VariationContextAccessor.VariationContext value to be a default culture instead of "".
+    /// </remarks>
+    private IEnumerable<ContentNodeKit> CreateCache(IDataType[] dataTypes, out ContentType[] contentTypes)
+    {
+        var result = new List<ContentNodeKit>();
+
+        var propertyDataTypes = new Dictionary<string, IDataType>
+        {
+            // we only have one data type for this test which will be resolved with string empty.
+            [string.Empty] = dataTypes[0],
+        };
+
+        var contentType1 = new ContentType(ShortStringHelper, -1);
+
+        var item1Data = new ContentDataBuilder()
+            .WithName("Content 1")
+            .WithProperties(new PropertyDataBuilder()
+                .WithPropertyData("welcomeText", "Welcome")
+                .WithPropertyData("welcomeText", "Welcome", "en-US")
+                .WithPropertyData("welcomeText", "Willkommen", "de")
+                .WithPropertyData("welcomeText", "Welkom", "nl")
+                .WithPropertyData("welcomeText2", "Welcome")
+                .WithPropertyData("welcomeText2", "Welcome", "en-US")
+                .WithPropertyData("noprop", "xxx")
+                .Build())
+
+            // build with a dynamically created content type
+            .Build(ShortStringHelper, propertyDataTypes, contentType1, "ContentType1");
+
+        var item1 = ContentNodeKitBuilder.CreateWithContent(
+            contentType1.Id,
+            1,
+            "-1,1",
+            draftData: item1Data,
+            publishedData: item1Data);
+
+        result.Add(item1);
+
+        var item2Data = new ContentDataBuilder()
+            .WithName("Content 2")
+            .WithProperties(new PropertyDataBuilder()
+                .WithPropertyData("welcomeText", "Welcome")
+                .WithPropertyData("welcomeText", "Welcome", "en-US")
+                .WithPropertyData("noprop", "xxx")
+                .Build())
+
+            // build while dynamically updating the same content type
+            .Build(ShortStringHelper, propertyDataTypes, contentType1);
+
+        var item2 = ContentNodeKitBuilder.CreateWithContent(
+            contentType1.Id,
+            2,
+            "-1,1,2",
+            parentContentId: 1,
+            draftData: item2Data,
+            publishedData: item2Data);
+
+        result.Add(item2);
+
+        var contentType2 = new ContentType(ShortStringHelper, -1);
+
+        var item3Data = new ContentDataBuilder()
+            .WithName("Content 3")
+            .WithProperties(new PropertyDataBuilder()
+                .WithPropertyData("prop3", "Oxxo")
+                .WithPropertyData("prop3", "Oxxo", "en-US")
+                .Build())
+
+            // build with a dynamically created content type
+            .Build(ShortStringHelper, propertyDataTypes, contentType2, "ContentType2");
+
+        var item3 = ContentNodeKitBuilder.CreateWithContent(
+            contentType2.Id,
+            3,
+            "-1,1,2,3",
+            parentContentId: 2,
+            draftData: item3Data,
+            publishedData: item3Data);
+
+        result.Add(item3);
+
+        contentTypes = new[] { contentType1, contentType2 };
+
+        return result;
+    }
+
+    [Test]
+    public void Can_Get_Content_For_Populated_Requested_Language()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First();
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "en-US");
+        Assert.AreEqual("Welcome", value);
+    }
+
+    [Test]
+    public void Can_Get_Content_For_Populated_Requested_Non_Default_Language()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First();
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "de");
+        Assert.AreEqual("Willkommen", value);
+    }
+
+    [Test]
+    public void Do_Not_Get_Content_For_Unpopulated_Requested_Language_Without_Fallback()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First();
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "fr");
+        Assert.IsNull(value);
+    }
+
+    [Test]
+    public void Do_Not_Get_Content_For_Unpopulated_Requested_Language_With_Fallback_Unless_Requested()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First();
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "es");
+        Assert.IsNull(value);
+    }
+
+    [Test]
+    public void Can_Get_Content_For_Unpopulated_Requested_Language_With_Fallback()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First();
+        var value = content.Value(PublishedValueFallback, "welcomeText", "es", fallback: Fallback.ToLanguage);
+        Assert.AreEqual("Welcome", value);
+    }
+
+    [Test]
+    public void Can_Get_Content_For_Unpopulated_Requested_Language_With_Fallback_Over_Two_Levels()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First();
+        var value = content.Value(PublishedValueFallback, "welcomeText", "it", fallback: Fallback.To(Fallback.Language, Fallback.Ancestors));
+        Assert.AreEqual("Welcome", value);
+    }
+
+    [Test]
+    public void Do_Not_GetContent_For_Unpopulated_Requested_Language_With_Fallback_Over_That_Loops()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First();
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText", "no", fallback: Fallback.ToLanguage);
+        Assert.IsNull(value);
+    }
+
+    [Test]
+    public void Do_Not_Get_Content_Recursively_Unless_Requested()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First();
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText2");
+        Assert.IsNull(value);
+    }
+
+    [Test]
+    public void Can_Get_Content_Recursively()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First();
+        var value = content.Value(PublishedValueFallback, "welcomeText2", fallback: Fallback.ToAncestors);
+        Assert.AreEqual("Welcome", value);
+    }
+
+    [Test]
+    public void Do_Not_Get_Content_Recursively_Unless_Requested2()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First().Children.First();
+        Assert.IsNull(content.GetProperty("welcomeText2"));
+        var value = content.Value(Mock.Of<IPublishedValueFallback>(), "welcomeText2");
+        Assert.IsNull(value);
+    }
+
+    [Test]
+    public void Can_Get_Content_Recursively2()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First().Children.First();
+        Assert.IsNull(content.GetProperty("welcomeText2"));
+        var value = content.Value(PublishedValueFallback, "welcomeText2", fallback: Fallback.ToAncestors);
+        Assert.AreEqual("Welcome", value);
+    }
+
+    [Test]
+    public void Can_Get_Content_Recursively3()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First().Children.First();
+        Assert.IsNull(content.GetProperty("noprop"));
+        var value = content.Value(PublishedValueFallback, "noprop", fallback: Fallback.ToAncestors);
+
+        // property has no value - based on the converter
+        // but we still get the value (ie, the converter would do something)
+        Assert.AreEqual("xxx", value.ToString());
+    }
+
+    [Test]
+    public void Can_Get_Content_With_Recursive_Priority()
+    {
+        VariationContextAccessor.VariationContext = new VariationContext("nl");
+
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First();
+
+        var value = content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.To(Fallback.Ancestors, Fallback.Language));
+
+        // No Dutch value is directly assigned. Check has fallen back to Dutch value from parent.
+        Assert.AreEqual("Welkom", value);
+    }
+
+    [Test]
+    public void Can_Get_Content_With_Fallback_Language_Priority()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First();
+
+        var value = content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.ToLanguage);
+
+        // No Dutch value is directly assigned.  Check has fallen back to English value from language variant.
+        Assert.AreEqual("Welcome", value);
+    }
+
+    [Test]
+    public void Throws_For_Non_Supported_Fallback()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First();
+
+        Assert.Throws<NotSupportedException>(() =>
+            content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.To(999)));
+    }
+
+    [Test]
+    public void Can_Fallback_To_Default_Value()
+    {
+        var snapshot = GetPublishedSnapshot();
+        var content = snapshot.Content.GetAtRoot().First().Children.First();
+
+        // no Dutch value is assigned, so getting null
+        var value = content.Value(PublishedValueFallback, "welcomeText", "nl");
+        Assert.IsNull(value);
+
+        // even if we 'just' provide a default value
+        value = content.Value(PublishedValueFallback, "welcomeText", "nl", defaultValue: "woop");
+        Assert.IsNull(value);
+
+        // but it works with proper fallback settings
+        value = content.Value(PublishedValueFallback, "welcomeText", "nl", fallback: Fallback.ToDefaultValue, defaultValue: "woop");
+        Assert.AreEqual("woop", value);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentTests.cs
index d7a5a2bc48..83908390e9 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedContentTests.cs
@@ -14,970 +14,958 @@ using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class PublishedContentTests : PublishedSnapshotServiceTestBase
 {
-
-    [TestFixture]
-    public class PublishedContentTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private readonly Guid _node1173Guid = Guid.NewGuid();
-        private PublishedModelFactory _publishedModelFactory;
-        private DataType[] _dataTypes;
+        base.Setup();
 
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        var xml = PublishedContentXml.PublishedContentTestXml(1234, _node1173Guid);
 
-            string xml = PublishedContentXml.PublishedContentTestXml(1234, _node1173Guid);
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        _dataTypes = dataTypes;
 
-            _dataTypes = dataTypes;
+        // configure the Home content type to be composed of another for tests.
+        var compositionType = new ContentType(TestHelper.ShortStringHelper, -1) { Alias = "MyCompositionAlias" };
+        contentTypes.First(x => x.Alias == "Home").AddContentType(compositionType);
 
-            // configure the Home content type to be composed of another for tests.
-            var compositionType = new ContentType(TestHelper.ShortStringHelper, -1)
-            {
-                Alias = "MyCompositionAlias"
-            };
-            contentTypes.First(x => x.Alias == "Home").AddContentType(compositionType);
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-        }
-
-        // override to specify our own factory with custom types
-        protected override IPublishedModelFactory PublishedModelFactory
-            => _publishedModelFactory ??= new PublishedModelFactory(
-                    new[] { typeof(Home), typeof(Anything), typeof(CustomDocument) },
-                    PublishedValueFallback);
-
-        [PublishedModel("Home")]
-        internal class Home : PublishedContentModel
-        {
-            public Home(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            { }
-
-            public bool UmbracoNaviHide => this.Value<bool>(Mock.Of<IPublishedValueFallback>(), "umbracoNaviHide");
-        }
-
-        [PublishedModel("anything")]
-        internal class Anything : PublishedContentModel
-        {
-            public Anything(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            { }
-        }
-
-        [PublishedModel("CustomDocument")]
-        internal class CustomDocument : PublishedContentModel
-        {
-            public CustomDocument(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            { }
-        }
-
-        [Test]
-        public void GetNodeByIds()
-        {
-            var snapshot = GetPublishedSnapshot();
-
-            var contentById = snapshot.Content.GetById(1173);
-            Assert.IsNotNull(contentById);
-            var contentByGuid = snapshot.Content.GetById(_node1173Guid);
-            Assert.IsNotNull(contentByGuid);
-            Assert.AreEqual(contentById.Id, contentByGuid.Id);
-            Assert.AreEqual(contentById.Key, contentByGuid.Key);
-
-            contentById = snapshot.Content.GetById(666);
-            Assert.IsNull(contentById);
-            contentByGuid = snapshot.Content.GetById(Guid.NewGuid());
-            Assert.IsNull(contentByGuid);
-        }
-
-        [Test]
-        public void Is_Last_From_Where_Filter_Dynamic_Linq()
-        {
-            var doc = GetContent(1173);
-
-            var items = doc.Children(VariationContextAccessor).Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>())).ToIndexedArray();
-
-            foreach (var item in items)
-            {
-                if (item.Content.Id != 1178)
-                {
-                    Assert.IsFalse(item.IsLast(), $"The item {item.Content.Id} is last");
-                }
-                else
-                {
-                    Assert.IsTrue(item.IsLast(), $"The item {item.Content.Id} is not last");
-                }
-            }
-        }
-
-        [Test]
-        public void Is_Last_From_Where_Filter()
-        {
-            var doc = GetContent(1173);
-
-            var items = doc
-                .Children(VariationContextAccessor)
-                .Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>()))
-                .ToIndexedArray();
-
-            Assert.AreEqual(4, items.Length);
-
-            foreach (var d in items)
-            {
-                switch (d.Content.Id)
-                {
-                    case 1174:
-                        Assert.IsTrue(d.IsFirst());
-                        Assert.IsFalse(d.IsLast());
-                        break;
-                    case 117:
-                        Assert.IsFalse(d.IsFirst());
-                        Assert.IsFalse(d.IsLast());
-                        break;
-                    case 1177:
-                        Assert.IsFalse(d.IsFirst());
-                        Assert.IsFalse(d.IsLast());
-                        break;
-                    case 1178:
-                        Assert.IsFalse(d.IsFirst());
-                        Assert.IsTrue(d.IsLast());
-                        break;
-                    default:
-                        Assert.Fail("Invalid id.");
-                        break;
-                }
-            }
-        }
-
-        [Test]
-        public void Is_Last_From_Where_Filter2()
-        {
-            var doc = GetContent(1173);
-            var ct = doc.ContentType;
-
-            var items = doc.Children(VariationContextAccessor)
-                .Select(x => x.CreateModel(PublishedModelFactory)) // linq, returns IEnumerable<IPublishedContent>
-
-                // only way around this is to make sure every IEnumerable<T> extension
-                // explicitely returns a PublishedContentSet, not an IEnumerable<T>
-
-                .OfType<Home>() // ours, return IEnumerable<Home> (actually a PublishedContentSet<Home>)
-                .Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>())) // so, here it's linq again :-(
-                .ToIndexedArray(); // so, we need that one for the test to pass
-
-            Assert.AreEqual(1, items.Length);
-
-            foreach (var d in items)
-            {
-                switch (d.Content.Id)
-                {
-                    case 1174:
-                        Assert.IsTrue(d.IsFirst());
-                        Assert.IsTrue(d.IsLast());
-                        break;
-                    default:
-                        Assert.Fail("Invalid id.");
-                        break;
-                }
-            }
-        }
-
-        [Test]
-        public void Is_Last_From_Take()
-        {
-            var doc = GetContent(1173);
-
-            var items = doc.Children(VariationContextAccessor).Take(4).ToIndexedArray();
-
-            foreach (var item in items)
-            {
-                if (item.Content.Id != 1178)
-                {
-                    Assert.IsFalse(item.IsLast());
-                }
-                else
-                {
-                    Assert.IsTrue(item.IsLast());
-                }
-            }
-        }
-
-        [Test]
-        public void Is_Last_From_Skip()
-        {
-            var doc = GetContent(1173);
-
-            foreach (var d in doc.Children(VariationContextAccessor).Skip(1).ToIndexedArray())
-            {
-                if (d.Content.Id != 1176)
-                {
-                    Assert.IsFalse(d.IsLast());
-                }
-                else
-                {
-                    Assert.IsTrue(d.IsLast());
-                }
-            }
-        }
-
-        [Test]
-        public void Is_Last_From_Concat()
-        {
-            var doc = GetContent(1173);
-
-            var items = doc.Children(VariationContextAccessor)
-                .Concat(new[] { GetContent(1175), GetContent(4444) })
-                .ToIndexedArray();
-
-            foreach (var item in items)
-            {
-                if (item.Content.Id != 4444)
-                {
-                    Assert.IsFalse(item.IsLast());
-                }
-                else
-                {
-                    Assert.IsTrue(item.IsLast());
-                }
-            }
-        }
-
-        [Test]
-        public void Descendants_Ordered_Properly()
-        {
-            var doc = GetContent(1046);
-
-            var expected = new[] { 1046, 1173, 1174, 117, 1177, 1178, 1179, 1176, 1175, 4444, 1172 };
-            var exindex = 0;
-
-            // must respect the XPath descendants-or-self axis!
-            foreach (var d in doc.DescendantsOrSelf(Mock.Of<IVariationContextAccessor>()))
-            {
-                Assert.AreEqual(expected[exindex++], d.Id);
-            }
-        }
-
-        [Test]
-        public void Get_Property_Value_Recursive()
-        {
-            // TODO: We need to use a different fallback?
-
-            var doc = GetContent(1174);
-            var rVal = doc.Value(PublishedValueFallback, "testRecursive", fallback: Fallback.ToAncestors);
-            var nullVal = doc.Value(PublishedValueFallback, "DoNotFindThis", fallback: Fallback.ToAncestors);
-            Assert.AreEqual("This is the recursive val", rVal);
-            Assert.AreEqual(null, nullVal);
-        }
-
-        [Test]
-        public void Get_Property_Value_Uses_Converter()
-        {
-            var doc = GetContent(1173);
-
-            var propVal = doc.Value(PublishedValueFallback, "content");
-            Assert.IsInstanceOf(typeof(IHtmlEncodedString), propVal);
-            Assert.AreEqual("<div>This is some content</div>", propVal.ToString());
-
-            var propVal2 = doc.Value<IHtmlEncodedString>(PublishedValueFallback, "content");
-            Assert.IsInstanceOf(typeof(IHtmlEncodedString), propVal2);
-            Assert.AreEqual("<div>This is some content</div>", propVal2.ToString());
-
-            var propVal3 = doc.Value(PublishedValueFallback, "Content");
-            Assert.IsInstanceOf(typeof(IHtmlEncodedString), propVal3);
-            Assert.AreEqual("<div>This is some content</div>", propVal3.ToString());
-        }
-
-        [Test]
-        public void Complex_Linq()
-        {
-            var doc = GetContent(1173);
-
-            var result = doc.Ancestors().OrderBy(x => x.Level)
-                .Single()
-                .Descendants(Mock.Of<IVariationContextAccessor>())
-                .FirstOrDefault(x => x.Value<string>(PublishedValueFallback, "selectedNodes", fallback: Fallback.ToDefaultValue, defaultValue: "").Split(',').Contains("1173"));
-
-            Assert.IsNotNull(result);
-        }
-
-        [Test]
-        public void Children_GroupBy_DocumentTypeAlias()
-        {
-            //var home = new AutoPublishedContentType(Guid.NewGuid(), 22, "Home", new PublishedPropertyType[] { });
-            //var custom = new AutoPublishedContentType(Guid.NewGuid(), 23, "CustomDocument", new PublishedPropertyType[] { });
-            //var contentTypes = new Dictionary<string, PublishedContentType>
-            //{
-            //    { home.Alias, home },
-            //    { custom.Alias, custom }
-            //};
-            //ContentTypesCache.GetPublishedContentTypeByAlias = alias => contentTypes[alias];
-
-            var doc = GetContent(1046);
-
-            var found1 = doc.Children(VariationContextAccessor).GroupBy(x => x.ContentType.Alias).ToArray();
-
-            Assert.AreEqual(2, found1.Length);
-            Assert.AreEqual(2, found1.Single(x => x.Key.ToString() == "Home").Count());
-            Assert.AreEqual(1, found1.Single(x => x.Key.ToString() == "CustomDocument").Count());
-        }
-
-        [Test]
-        public void Children_Where_DocumentTypeAlias()
-        {
-            //var home = new AutoPublishedContentType(Guid.NewGuid(), 22, "Home", new PublishedPropertyType[] { });
-            //var custom = new AutoPublishedContentType(Guid.NewGuid(), 23, "CustomDocument", new PublishedPropertyType[] { });
-            //var contentTypes = new Dictionary<string, PublishedContentType>
-            //{
-            //    { home.Alias, home },
-            //    { custom.Alias, custom }
-            //};
-            //ContentTypesCache.GetPublishedContentTypeByAlias = alias => contentTypes[alias];
-
-            var doc = GetContent(1046);
-
-            var found1 = doc.Children(VariationContextAccessor).Where(x => x.ContentType.Alias == "CustomDocument");
-            var found2 = doc.Children(VariationContextAccessor).Where(x => x.ContentType.Alias == "Home");
-
-            Assert.AreEqual(1, found1.Count());
-            Assert.AreEqual(2, found2.Count());
-        }
-
-        [Test]
-        public void Children_Order_By_Update_Date()
-        {
-            var doc = GetContent(1173);
-
-            var ordered = doc.Children(VariationContextAccessor).OrderBy(x => x.UpdateDate);
-
-            var correctOrder = new[] { 1178, 1177, 1174, 1176 };
-            for (var i = 0; i < correctOrder.Length; i++)
-            {
-                Assert.AreEqual(correctOrder[i], ordered.ElementAt(i).Id);
-            }
-
-        }
-
-        [Test]
-        public void FirstChild()
-        {
-            var doc = GetContent(1173); // has child nodes
-            Assert.IsNotNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>()));
-            Assert.IsNotNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>(), x => true));
-            Assert.IsNotNull(doc.FirstChild<IPublishedContent>(Mock.Of<IVariationContextAccessor>()));
-
-            doc = GetContent(1175); // does not have child nodes
-            Assert.IsNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>()));
-            Assert.IsNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>(), x => true));
-            Assert.IsNull(doc.FirstChild<IPublishedContent>(Mock.Of<IVariationContextAccessor>()));
-        }
-
-        [Test]
-        public void FirstChildAsT()
-        {
-            var doc = GetContent(1046); // has child nodes
-
-            var model = doc.FirstChild<Home>(Mock.Of<IVariationContextAccessor>(), x => true); // predicate
-
-            Assert.IsNotNull(model);
-            Assert.IsTrue(model.Id == 1173);
-            Assert.IsInstanceOf<Home>(model);
-            Assert.IsInstanceOf<IPublishedContent>(model);
-
-            doc = GetContent(1175); // does not have child nodes
-            Assert.IsNull(doc.FirstChild<Anything>(Mock.Of<IVariationContextAccessor>()));
-            Assert.IsNull(doc.FirstChild<Anything>(Mock.Of<IVariationContextAccessor>(), x => true));
-        }
-
-        [Test]
-        public void IsComposedOf()
-        {
-            var doc = GetContent(1173);
-
-            var isComposedOf = doc.IsComposedOf("MyCompositionAlias");
-
-            Assert.IsTrue(isComposedOf);
-        }
-
-        [Test]
-        public void HasProperty()
-        {
-            var doc = GetContent(1173);
-
-            var hasProp = doc.HasProperty(Constants.Conventions.Content.UrlAlias);
-
-            Assert.IsTrue(hasProp);
-        }
-
-        [Test]
-        public void HasValue()
-        {
-            var doc = GetContent(1173);
-
-            var hasValue = doc.HasValue(Mock.Of<IPublishedValueFallback>(), Constants.Conventions.Content.UrlAlias);
-            var noValue = doc.HasValue(Mock.Of<IPublishedValueFallback>(), "blahblahblah");
-
-            Assert.IsTrue(hasValue);
-            Assert.IsFalse(noValue);
-        }
-
-        [Test]
-        public void Ancestors_Where_Visible()
-        {
-            var doc = GetContent(1174);
-
-            var whereVisible = doc.Ancestors().Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>()));
-            Assert.AreEqual(1, whereVisible.Count());
-
-        }
-
-        [Test]
-        public void Visible()
-        {
-            var hidden = GetContent(1046);
-            var visible = GetContent(1173);
-
-            Assert.IsFalse(hidden.IsVisible(Mock.Of<IPublishedValueFallback>()));
-            Assert.IsTrue(visible.IsVisible(Mock.Of<IPublishedValueFallback>()));
-        }
-
-        [Test]
-        public void Ancestor_Or_Self()
-        {
-            var doc = GetContent(1173);
-
-            var result = doc.AncestorOrSelf();
-
-            Assert.IsNotNull(result);
-
-            // ancestor-or-self has to be self!
-            Assert.AreEqual(1173, result.Id);
-        }
-
-        [Test]
-        public void U4_4559()
-        {
-            var doc = GetContent(1174);
-            var result = doc.AncestorOrSelf(1);
-            Assert.IsNotNull(result);
-            Assert.AreEqual(1046, result.Id);
-        }
-
-        [Test]
-        public void Ancestors_Or_Self()
-        {
-            var doc = GetContent(1174);
-
-            var result = doc.AncestorsOrSelf().ToArray();
-
-            Assert.IsNotNull(result);
-
-            Assert.AreEqual(3, result.Length);
-            Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new [] { 1174, 1173, 1046 }));
-        }
-
-        [Test]
-        public void Ancestors()
-        {
-            var doc = GetContent(1174);
-
-            var result = doc.Ancestors().ToArray();
-
-            Assert.IsNotNull(result);
-
-            Assert.AreEqual(2, result.Length);
-            Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new [] { 1173, 1046 }));
-        }
-
-        [Test]
-        public void IsAncestor()
-        {
-            // Structure:
-            // - Root : 1046 (no parent)
-            // -- Home: 1173 (parent 1046)
-            // -- Custom Doc: 1178 (parent 1173)
-            // --- Custom Doc2: 1179 (parent: 1178)
-            // -- Custom Doc4: 117 (parent 1173)
-            // - Custom Doc3: 1172 (no parent)
-
-            var home = GetContent(1173);
-            var root = GetContent(1046);
-            var customDoc = GetContent(1178);
-            var customDoc2 = GetContent(1179);
-            var customDoc3 = GetContent(1172);
-            var customDoc4 = GetContent(117);
-
-            Assert.IsTrue(root.IsAncestor(customDoc4));
-            Assert.IsFalse(root.IsAncestor(customDoc3));
-            Assert.IsTrue(root.IsAncestor(customDoc2));
-            Assert.IsTrue(root.IsAncestor(customDoc));
-            Assert.IsTrue(root.IsAncestor(home));
-            Assert.IsFalse(root.IsAncestor(root));
-
-            Assert.IsTrue(home.IsAncestor(customDoc4));
-            Assert.IsFalse(home.IsAncestor(customDoc3));
-            Assert.IsTrue(home.IsAncestor(customDoc2));
-            Assert.IsTrue(home.IsAncestor(customDoc));
-            Assert.IsFalse(home.IsAncestor(home));
-            Assert.IsFalse(home.IsAncestor(root));
-
-            Assert.IsFalse(customDoc.IsAncestor(customDoc4));
-            Assert.IsFalse(customDoc.IsAncestor(customDoc3));
-            Assert.IsTrue(customDoc.IsAncestor(customDoc2));
-            Assert.IsFalse(customDoc.IsAncestor(customDoc));
-            Assert.IsFalse(customDoc.IsAncestor(home));
-            Assert.IsFalse(customDoc.IsAncestor(root));
-
-            Assert.IsFalse(customDoc2.IsAncestor(customDoc4));
-            Assert.IsFalse(customDoc2.IsAncestor(customDoc3));
-            Assert.IsFalse(customDoc2.IsAncestor(customDoc2));
-            Assert.IsFalse(customDoc2.IsAncestor(customDoc));
-            Assert.IsFalse(customDoc2.IsAncestor(home));
-            Assert.IsFalse(customDoc2.IsAncestor(root));
-
-            Assert.IsFalse(customDoc3.IsAncestor(customDoc3));
-        }
-
-        [Test]
-        public void IsAncestorOrSelf()
-        {
-            // Structure:
-            // - Root : 1046 (no parent)
-            // -- Home: 1173 (parent 1046)
-            // -- Custom Doc: 1178 (parent 1173)
-            // --- Custom Doc2: 1179 (parent: 1178)
-            // -- Custom Doc4: 117 (parent 1173)
-            // - Custom Doc3: 1172 (no parent)
-
-            var home = GetContent(1173);
-            var root = GetContent(1046);
-            var customDoc = GetContent(1178);
-            var customDoc2 = GetContent(1179);
-            var customDoc3 = GetContent(1172);
-            var customDoc4 = GetContent(117);
-
-            Assert.IsTrue(root.IsAncestorOrSelf(customDoc4));
-            Assert.IsFalse(root.IsAncestorOrSelf(customDoc3));
-            Assert.IsTrue(root.IsAncestorOrSelf(customDoc2));
-            Assert.IsTrue(root.IsAncestorOrSelf(customDoc));
-            Assert.IsTrue(root.IsAncestorOrSelf(home));
-            Assert.IsTrue(root.IsAncestorOrSelf(root));
-
-            Assert.IsTrue(home.IsAncestorOrSelf(customDoc4));
-            Assert.IsFalse(home.IsAncestorOrSelf(customDoc3));
-            Assert.IsTrue(home.IsAncestorOrSelf(customDoc2));
-            Assert.IsTrue(home.IsAncestorOrSelf(customDoc));
-            Assert.IsTrue(home.IsAncestorOrSelf(home));
-            Assert.IsFalse(home.IsAncestorOrSelf(root));
-
-            Assert.IsFalse(customDoc.IsAncestorOrSelf(customDoc4));
-            Assert.IsFalse(customDoc.IsAncestorOrSelf(customDoc3));
-            Assert.IsTrue(customDoc.IsAncestorOrSelf(customDoc2));
-            Assert.IsTrue(customDoc.IsAncestorOrSelf(customDoc));
-            Assert.IsFalse(customDoc.IsAncestorOrSelf(home));
-            Assert.IsFalse(customDoc.IsAncestorOrSelf(root));
-
-            Assert.IsFalse(customDoc2.IsAncestorOrSelf(customDoc4));
-            Assert.IsFalse(customDoc2.IsAncestorOrSelf(customDoc3));
-            Assert.IsTrue(customDoc2.IsAncestorOrSelf(customDoc2));
-            Assert.IsFalse(customDoc2.IsAncestorOrSelf(customDoc));
-            Assert.IsFalse(customDoc2.IsAncestorOrSelf(home));
-            Assert.IsFalse(customDoc2.IsAncestorOrSelf(root));
-
-            Assert.IsTrue(customDoc4.IsAncestorOrSelf(customDoc4));
-            Assert.IsTrue(customDoc3.IsAncestorOrSelf(customDoc3));
-        }
-
-
-        [Test]
-        public void Descendants_Or_Self()
-        {
-            var doc = GetContent(1046);
-
-            var result = doc.DescendantsOrSelf(Mock.Of<IVariationContextAccessor>()).ToArray();
-
-            Assert.IsNotNull(result);
-
-            Assert.AreEqual(10, result.Count());
-            Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new [] { 1046, 1173, 1174, 1176, 1175 }));
-        }
-
-        [Test]
-        public void Descendants()
-        {
-            var doc = GetContent(1046);
-
-            var result = doc.Descendants(Mock.Of<IVariationContextAccessor>()).ToArray();
-
-            Assert.IsNotNull(result);
-
-            Assert.AreEqual(9, result.Count());
-            Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new [] { 1173, 1174, 1176, 1175, 4444 }));
-        }
-
-        [Test]
-        public void IsDescendant()
-        {
-            // Structure:
-            // - Root : 1046 (no parent)
-            // -- Home: 1173 (parent 1046)
-            // -- Custom Doc: 1178 (parent 1173)
-            // --- Custom Doc2: 1179 (parent: 1178)
-            // -- Custom Doc4: 117 (parent 1173)
-            // - Custom Doc3: 1172 (no parent)
-
-            var home = GetContent(1173);
-            var root = GetContent(1046);
-            var customDoc = GetContent(1178);
-            var customDoc2 = GetContent(1179);
-            var customDoc3 = GetContent(1172);
-            var customDoc4 = GetContent(117);
-
-            Assert.IsFalse(root.IsDescendant(root));
-            Assert.IsFalse(root.IsDescendant(home));
-            Assert.IsFalse(root.IsDescendant(customDoc));
-            Assert.IsFalse(root.IsDescendant(customDoc2));
-            Assert.IsFalse(root.IsDescendant(customDoc3));
-            Assert.IsFalse(root.IsDescendant(customDoc4));
-
-            Assert.IsTrue(home.IsDescendant(root));
-            Assert.IsFalse(home.IsDescendant(home));
-            Assert.IsFalse(home.IsDescendant(customDoc));
-            Assert.IsFalse(home.IsDescendant(customDoc2));
-            Assert.IsFalse(home.IsDescendant(customDoc3));
-            Assert.IsFalse(home.IsDescendant(customDoc4));
-
-            Assert.IsTrue(customDoc.IsDescendant(root));
-            Assert.IsTrue(customDoc.IsDescendant(home));
-            Assert.IsFalse(customDoc.IsDescendant(customDoc));
-            Assert.IsFalse(customDoc.IsDescendant(customDoc2));
-            Assert.IsFalse(customDoc.IsDescendant(customDoc3));
-            Assert.IsFalse(customDoc.IsDescendant(customDoc4));
-
-            Assert.IsTrue(customDoc2.IsDescendant(root));
-            Assert.IsTrue(customDoc2.IsDescendant(home));
-            Assert.IsTrue(customDoc2.IsDescendant(customDoc));
-            Assert.IsFalse(customDoc2.IsDescendant(customDoc2));
-            Assert.IsFalse(customDoc2.IsDescendant(customDoc3));
-            Assert.IsFalse(customDoc2.IsDescendant(customDoc4));
-
-            Assert.IsFalse(customDoc3.IsDescendant(customDoc3));
-        }
-
-        [Test]
-        public void IsDescendantOrSelf()
-        {
-            // Structure:
-            // - Root : 1046 (no parent)
-            // -- Home: 1173 (parent 1046)
-            // -- Custom Doc: 1178 (parent 1173)
-            // --- Custom Doc2: 1179 (parent: 1178)
-            // -- Custom Doc4: 117 (parent 1173)
-            // - Custom Doc3: 1172 (no parent)
-
-            var home = GetContent(1173);
-            var root = GetContent(1046);
-            var customDoc = GetContent(1178);
-            var customDoc2 = GetContent(1179);
-            var customDoc3 = GetContent(1172);
-            var customDoc4 = GetContent(117);
-
-            Assert.IsTrue(root.IsDescendantOrSelf(root));
-            Assert.IsFalse(root.IsDescendantOrSelf(home));
-            Assert.IsFalse(root.IsDescendantOrSelf(customDoc));
-            Assert.IsFalse(root.IsDescendantOrSelf(customDoc2));
-            Assert.IsFalse(root.IsDescendantOrSelf(customDoc3));
-            Assert.IsFalse(root.IsDescendantOrSelf(customDoc4));
-
-            Assert.IsTrue(home.IsDescendantOrSelf(root));
-            Assert.IsTrue(home.IsDescendantOrSelf(home));
-            Assert.IsFalse(home.IsDescendantOrSelf(customDoc));
-            Assert.IsFalse(home.IsDescendantOrSelf(customDoc2));
-            Assert.IsFalse(home.IsDescendantOrSelf(customDoc3));
-            Assert.IsFalse(home.IsDescendantOrSelf(customDoc4));
-
-            Assert.IsTrue(customDoc.IsDescendantOrSelf(root));
-            Assert.IsTrue(customDoc.IsDescendantOrSelf(home));
-            Assert.IsTrue(customDoc.IsDescendantOrSelf(customDoc));
-            Assert.IsFalse(customDoc.IsDescendantOrSelf(customDoc2));
-            Assert.IsFalse(customDoc.IsDescendantOrSelf(customDoc3));
-            Assert.IsFalse(customDoc.IsDescendantOrSelf(customDoc4));
-
-            Assert.IsTrue(customDoc2.IsDescendantOrSelf(root));
-            Assert.IsTrue(customDoc2.IsDescendantOrSelf(home));
-            Assert.IsTrue(customDoc2.IsDescendantOrSelf(customDoc));
-            Assert.IsTrue(customDoc2.IsDescendantOrSelf(customDoc2));
-            Assert.IsFalse(customDoc2.IsDescendantOrSelf(customDoc3));
-            Assert.IsFalse(customDoc2.IsDescendantOrSelf(customDoc4));
-
-            Assert.IsTrue(customDoc3.IsDescendantOrSelf(customDoc3));
-        }
-
-        [Test]
-        public void SiblingsAndSelf()
-        {
-            // Structure:
-            // - Root : 1046 (no parent)
-            // -- Level1.1: 1173 (parent 1046)
-            // --- Level1.1.1: 1174 (parent 1173)
-            // --- Level1.1.2: 117 (parent 1173)
-            // --- Level1.1.3: 1177 (parent 1173)
-            // --- Level1.1.4: 1178 (parent 1173)
-            // ---- Level1.1.4.1: 1179 (parent 1178)
-            // --- Level1.1.5: 1176 (parent 1173)
-            // -- Level1.2: 1175 (parent 1046)
-            // -- Level1.3: 4444 (parent 1046)
-            // - Root : 1172 (no parent)
-
-            var root = GetContent(1046);
-            var level1_1 = GetContent(1173);
-            var level1_1_1 = GetContent(1174);
-            var level1_1_2 = GetContent(117);
-            var level1_1_3 = GetContent(1177);
-            var level1_1_4 = GetContent(1178);
-            var level1_1_5 = GetContent(1176);
-            var level1_2 = GetContent(1175);
-            var level1_3 = GetContent(4444);
-            var root2 = GetContent(1172);
-
-            var publishedSnapshot = GetPublishedSnapshot();
-
-            CollectionAssertAreEqual(new[] { root, root2 }, root.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-
-            CollectionAssertAreEqual(new[] { level1_1, level1_2, level1_3 }, level1_1.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1, level1_2, level1_3 }, level1_2.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1, level1_2, level1_3 }, level1_3.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_1.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_2.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_3.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_4.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_5.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
-
-        }
-
-        [Test]
-        public void Siblings()
-        {
-            // Structure:
-            // - Root : 1046 (no parent)
-            // -- Level1.1: 1173 (parent 1046)
-            // --- Level1.1.1: 1174 (parent 1173)
-            // --- Level1.1.2: 117 (parent 1173)
-            // --- Level1.1.3: 1177 (parent 1173)
-            // --- Level1.1.4: 1178 (parent 1173)
-            // ---- Level1.1.4.1: 1179 (parent 1178)
-            // --- Level1.1.5: 1176 (parent 1173)
-            // -- Level1.2: 1175 (parent 1046)
-            // -- Level1.3: 4444 (parent 1046)
-            // - Root : 1172 (no parent)
-
-            var root = GetContent(1046);
-            var level1_1 = GetContent(1173);
-            var level1_1_1 = GetContent(1174);
-            var level1_1_2 = GetContent(117);
-            var level1_1_3 = GetContent(1177);
-            var level1_1_4 = GetContent(1178);
-            var level1_1_5 = GetContent(1176);
-            var level1_2 = GetContent(1175);
-            var level1_3 = GetContent(4444);
-            var root2 = GetContent(1172);
-
-            var publishedSnapshot = GetPublishedSnapshot();
-
-            CollectionAssertAreEqual(new[] { root2 }, root.Siblings(publishedSnapshot, VariationContextAccessor));
-
-            CollectionAssertAreEqual(new[] { level1_2, level1_3 }, level1_1.Siblings(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1, level1_3 }, level1_2.Siblings(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1, level1_2 }, level1_3.Siblings(publishedSnapshot, VariationContextAccessor));
-
-            CollectionAssertAreEqual(new[] { level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_1.Siblings(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_3, level1_1_4, level1_1_5 }, level1_1_2.Siblings(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_4, level1_1_5 }, level1_1_3.Siblings(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_5 }, level1_1_4.Siblings(publishedSnapshot, VariationContextAccessor));
-            CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4 }, level1_1_5.Siblings(publishedSnapshot, VariationContextAccessor));
-
-        }
-
-        private void CollectionAssertAreEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual)
-        where T : IPublishedContent
-        {
-            var e = expected.Select(x => x.Id);
-            var a = actual.Select(x => x.Id);
-            CollectionAssert.AreEquivalent(e, a, $"\nExpected:\n{string.Join(", ", e)}\n\nActual:\n{string.Join(", ", a)}");
-        }
-
-        [Test]
-        public void FragmentProperty()
-        {
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
-            {
-                yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "detached", _dataTypes[0].Id);
-            }
-
-            var ct = PublishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 0, "alias", CreatePropertyTypes);
-            var pt = ct.GetPropertyType("detached");
-            var prop = new PublishedElementPropertyBase(pt, null, false, PropertyCacheLevel.None, 5548);
-            Assert.IsInstanceOf<int>(prop.GetValue());
-            Assert.AreEqual(5548, prop.GetValue());
-        }
-
-        [Test]
-        public void Fragment2()
-        {
-            IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
-            {
-                yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "legend", _dataTypes[0].Id);
-                yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "image", _dataTypes[0].Id);
-                yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "size", _dataTypes[0].Id);
-            }
-
-            const string val1 = "boom bam";
-            const int val2 = 0;
-            const int val3 = 666;
-
-            var guid = Guid.NewGuid();
-
-            var ct = PublishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 0, "alias", CreatePropertyTypes);
-
-            var c = new ImageWithLegendModel(ct, guid, new Dictionary<string, object>
-            {
-                { "legend", val1 },
-                { "image", val2 },
-                { "size", val3 },
-            }, false);
-
-            Assert.AreEqual(val1, c.Legend);
-            Assert.AreEqual(val3, c.Size);
-        }
-
-        [Test]
-        public void First()
-        {
-            var publishedSnapshot = GetPublishedSnapshot();            
-            var content = publishedSnapshot.Content.GetAtRoot().First();
-            Assert.AreEqual("Home", content.Name(VariationContextAccessor));
-        }
-
-        [Test]
-        public void Distinct()
-        {
-            var items = GetContent(1173)
-                .Children(VariationContextAccessor)
-                .Distinct()
-                .Distinct()
-                .ToIndexedArray();
-
-            Assert.AreEqual(5, items.Length);
-
-            IndexedArrayItem<IPublishedContent> item = items[0];
-            Assert.AreEqual(1174, item.Content.Id);
-            Assert.IsTrue(item.IsFirst());
-            Assert.IsFalse(item.IsLast());
-
-            item = items[^1];
-            Assert.AreEqual(1176, item.Content.Id);
-            Assert.IsFalse(item.IsFirst());
-            Assert.IsTrue(item.IsLast());
-        }
-
-        [Test]
-        public void OfType1()
-        {
-            var publishedSnapshot = GetPublishedSnapshot();
-            var items = publishedSnapshot.Content.GetAtRoot()
-                .OfType<Home>()
-                .Distinct()
-                .ToIndexedArray();
-            Assert.AreEqual(1, items.Length);
-            Assert.IsInstanceOf<Home>(items.First().Content);
-        }
-
-        [Test]
-        public void OfType2()
-        {
-            var publishedSnapshot = GetPublishedSnapshot();
-            var content = publishedSnapshot.Content.GetAtRoot()
-                .OfType<CustomDocument>()
-                .Distinct()
-                .ToIndexedArray();
-            Assert.AreEqual(1, content.Length);
-            Assert.IsInstanceOf<CustomDocument>(content.First().Content);
-        }
-
-        [Test]
-        public void OfType()
-        {
-            var content = GetContent(1173)
-                .Children(VariationContextAccessor)
-                .OfType<Home>()
-                .First(x => x.UmbracoNaviHide == true);
-            Assert.AreEqual(1176, content.Id);
-        }
-
-        [Test]
-        public void Position()
-        {
-            var items = GetContent(1173).Children(VariationContextAccessor)
-                .Where(x => x.Value<int?>(Mock.Of<IPublishedValueFallback>(), "umbracoNaviHide") == 0)
-                .ToIndexedArray();
-
-            Assert.AreEqual(3, items.Length);
-
-            Assert.IsTrue(items.First().IsFirst());
-            Assert.IsFalse(items.First().IsLast());
-            Assert.IsFalse(items.Skip(1).First().IsFirst());
-            Assert.IsFalse(items.Skip(1).First().IsLast());
-            Assert.IsFalse(items.Skip(2).First().IsFirst());
-            Assert.IsTrue(items.Skip(2).First().IsLast());
-        }
-
-        class ImageWithLegendModel : PublishedElement
-        {
-            public ImageWithLegendModel(IPublishedContentType contentType, Guid fragmentKey, Dictionary<string, object> values, bool previewing)
-                : base(contentType, fragmentKey, values, previewing)
-            { }
-
-
-            public string Legend => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "legend");
-
-            public IPublishedContent Image => this.Value<IPublishedContent>(Mock.Of<IPublishedValueFallback>(), "image");
-
-            public int Size => this.Value<int>(Mock.Of<IPublishedValueFallback>(), "size");
-        }
-
-        //[PublishedModel("ContentType2")]
-        //public class ContentType2 : PublishedContentModel
-        //{
-        //    #region Plumbing
-
-        //    public ContentType2(IPublishedContent content, IPublishedValueFallback fallback)
-        //        : base(content, fallback)
-        //    { }
-
-        //    #endregion
-
-        //    public int Prop1 => this.Value<int>(Mock.Of<IPublishedValueFallback>(), "prop1");
-        //}
-
-        //[PublishedModel("ContentType2Sub")]
-        //public class ContentType2Sub : ContentType2
-        //{
-        //    #region Plumbing
-
-        //    public ContentType2Sub(IPublishedContent content, IPublishedValueFallback fallback)
-        //        : base(content, fallback)
-        //    { }
-
-        //    #endregion
-        //}
+        InitializedCache(kits, contentTypes, dataTypes);
     }
+
+    private readonly Guid _node1173Guid = Guid.NewGuid();
+    private PublishedModelFactory _publishedModelFactory;
+    private DataType[] _dataTypes;
+
+    // override to specify our own factory with custom types
+    protected override IPublishedModelFactory PublishedModelFactory
+        => _publishedModelFactory ??= new PublishedModelFactory(
+            new[] { typeof(Home), typeof(Anything), typeof(CustomDocument) },
+            PublishedValueFallback);
+
+    [PublishedModel("Home")]
+    internal class Home : PublishedContentModel
+    {
+        public Home(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
+        {
+        }
+
+        public bool UmbracoNaviHide => this.Value<bool>(Mock.Of<IPublishedValueFallback>(), "umbracoNaviHide");
+    }
+
+    [PublishedModel("anything")]
+    internal class Anything : PublishedContentModel
+    {
+        public Anything(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
+        {
+        }
+    }
+
+    [PublishedModel("CustomDocument")]
+    internal class CustomDocument : PublishedContentModel
+    {
+        public CustomDocument(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
+        {
+        }
+    }
+
+    [Test]
+    public void GetNodeByIds()
+    {
+        var snapshot = GetPublishedSnapshot();
+
+        var contentById = snapshot.Content.GetById(1173);
+        Assert.IsNotNull(contentById);
+        var contentByGuid = snapshot.Content.GetById(_node1173Guid);
+        Assert.IsNotNull(contentByGuid);
+        Assert.AreEqual(contentById.Id, contentByGuid.Id);
+        Assert.AreEqual(contentById.Key, contentByGuid.Key);
+
+        contentById = snapshot.Content.GetById(666);
+        Assert.IsNull(contentById);
+        contentByGuid = snapshot.Content.GetById(Guid.NewGuid());
+        Assert.IsNull(contentByGuid);
+    }
+
+    [Test]
+    public void Is_Last_From_Where_Filter_Dynamic_Linq()
+    {
+        var doc = GetContent(1173);
+
+        var items = doc.Children(VariationContextAccessor).Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>()))
+            .ToIndexedArray();
+
+        foreach (var item in items)
+        {
+            if (item.Content.Id != 1178)
+            {
+                Assert.IsFalse(item.IsLast(), $"The item {item.Content.Id} is last");
+            }
+            else
+            {
+                Assert.IsTrue(item.IsLast(), $"The item {item.Content.Id} is not last");
+            }
+        }
+    }
+
+    [Test]
+    public void Is_Last_From_Where_Filter()
+    {
+        var doc = GetContent(1173);
+
+        var items = doc
+            .Children(VariationContextAccessor)
+            .Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>()))
+            .ToIndexedArray();
+
+        Assert.AreEqual(4, items.Length);
+
+        foreach (var d in items)
+        {
+            switch (d.Content.Id)
+            {
+                case 1174:
+                    Assert.IsTrue(d.IsFirst());
+                    Assert.IsFalse(d.IsLast());
+                    break;
+                case 117:
+                    Assert.IsFalse(d.IsFirst());
+                    Assert.IsFalse(d.IsLast());
+                    break;
+                case 1177:
+                    Assert.IsFalse(d.IsFirst());
+                    Assert.IsFalse(d.IsLast());
+                    break;
+                case 1178:
+                    Assert.IsFalse(d.IsFirst());
+                    Assert.IsTrue(d.IsLast());
+                    break;
+                default:
+                    Assert.Fail("Invalid id.");
+                    break;
+            }
+        }
+    }
+
+    [Test]
+    public void Is_Last_From_Where_Filter2()
+    {
+        var doc = GetContent(1173);
+        var ct = doc.ContentType;
+
+        var items = doc.Children(VariationContextAccessor)
+            .Select(x => x.CreateModel(PublishedModelFactory)) // linq, returns IEnumerable<IPublishedContent>
+
+            // only way around this is to make sure every IEnumerable<T> extension
+            // explicitely returns a PublishedContentSet, not an IEnumerable<T>
+            .OfType<Home>() // ours, return IEnumerable<Home> (actually a PublishedContentSet<Home>)
+            .Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>())) // so, here it's linq again :-(
+            .ToIndexedArray(); // so, we need that one for the test to pass
+
+        Assert.AreEqual(1, items.Length);
+
+        foreach (var d in items)
+        {
+            switch (d.Content.Id)
+            {
+                case 1174:
+                    Assert.IsTrue(d.IsFirst());
+                    Assert.IsTrue(d.IsLast());
+                    break;
+                default:
+                    Assert.Fail("Invalid id.");
+                    break;
+            }
+        }
+    }
+
+    [Test]
+    public void Is_Last_From_Take()
+    {
+        var doc = GetContent(1173);
+
+        var items = doc.Children(VariationContextAccessor).Take(4).ToIndexedArray();
+
+        foreach (var item in items)
+        {
+            if (item.Content.Id != 1178)
+            {
+                Assert.IsFalse(item.IsLast());
+            }
+            else
+            {
+                Assert.IsTrue(item.IsLast());
+            }
+        }
+    }
+
+    [Test]
+    public void Is_Last_From_Skip()
+    {
+        var doc = GetContent(1173);
+
+        foreach (var d in doc.Children(VariationContextAccessor).Skip(1).ToIndexedArray())
+        {
+            if (d.Content.Id != 1176)
+            {
+                Assert.IsFalse(d.IsLast());
+            }
+            else
+            {
+                Assert.IsTrue(d.IsLast());
+            }
+        }
+    }
+
+    [Test]
+    public void Is_Last_From_Concat()
+    {
+        var doc = GetContent(1173);
+
+        var items = doc.Children(VariationContextAccessor)
+            .Concat(new[] { GetContent(1175), GetContent(4444) })
+            .ToIndexedArray();
+
+        foreach (var item in items)
+        {
+            if (item.Content.Id != 4444)
+            {
+                Assert.IsFalse(item.IsLast());
+            }
+            else
+            {
+                Assert.IsTrue(item.IsLast());
+            }
+        }
+    }
+
+    [Test]
+    public void Descendants_Ordered_Properly()
+    {
+        var doc = GetContent(1046);
+
+        var expected = new[] { 1046, 1173, 1174, 117, 1177, 1178, 1179, 1176, 1175, 4444, 1172 };
+        var exindex = 0;
+
+        // must respect the XPath descendants-or-self axis!
+        foreach (var d in doc.DescendantsOrSelf(Mock.Of<IVariationContextAccessor>()))
+        {
+            Assert.AreEqual(expected[exindex++], d.Id);
+        }
+    }
+
+    [Test]
+    public void Get_Property_Value_Recursive()
+    {
+        // TODO: We need to use a different fallback?
+        var doc = GetContent(1174);
+        var rVal = doc.Value(PublishedValueFallback, "testRecursive", fallback: Fallback.ToAncestors);
+        var nullVal = doc.Value(PublishedValueFallback, "DoNotFindThis", fallback: Fallback.ToAncestors);
+        Assert.AreEqual("This is the recursive val", rVal);
+        Assert.AreEqual(null, nullVal);
+    }
+
+    [Test]
+    public void Get_Property_Value_Uses_Converter()
+    {
+        var doc = GetContent(1173);
+
+        var propVal = doc.Value(PublishedValueFallback, "content");
+        Assert.IsInstanceOf(typeof(IHtmlEncodedString), propVal);
+        Assert.AreEqual("<div>This is some content</div>", propVal.ToString());
+
+        var propVal2 = doc.Value<IHtmlEncodedString>(PublishedValueFallback, "content");
+        Assert.IsInstanceOf(typeof(IHtmlEncodedString), propVal2);
+        Assert.AreEqual("<div>This is some content</div>", propVal2.ToString());
+
+        var propVal3 = doc.Value(PublishedValueFallback, "Content");
+        Assert.IsInstanceOf(typeof(IHtmlEncodedString), propVal3);
+        Assert.AreEqual("<div>This is some content</div>", propVal3.ToString());
+    }
+
+    [Test]
+    public void Complex_Linq()
+    {
+        var doc = GetContent(1173);
+
+        var result = doc.Ancestors().OrderBy(x => x.Level)
+            .Single()
+            .Descendants(Mock.Of<IVariationContextAccessor>())
+            .FirstOrDefault(x =>
+                x.Value(PublishedValueFallback, "selectedNodes", fallback: Fallback.ToDefaultValue, defaultValue: string.Empty).Split(',').Contains("1173"));
+
+        Assert.IsNotNull(result);
+    }
+
+    [Test]
+    public void Children_GroupBy_DocumentTypeAlias()
+    {
+        // var home = new AutoPublishedContentType(Guid.NewGuid(), 22, "Home", new PublishedPropertyType[] { });
+        // var custom = new AutoPublishedContentType(Guid.NewGuid(), 23, "CustomDocument", new PublishedPropertyType[] { });
+        // var contentTypes = new Dictionary<string, PublishedContentType>
+        // {
+        //    { home.Alias, home },
+        //    { custom.Alias, custom }
+        // };
+        // ContentTypesCache.GetPublishedContentTypeByAlias = alias => contentTypes[alias];
+        var doc = GetContent(1046);
+
+        var found1 = doc.Children(VariationContextAccessor).GroupBy(x => x.ContentType.Alias).ToArray();
+
+        Assert.AreEqual(2, found1.Length);
+        Assert.AreEqual(2, found1.Single(x => x.Key.ToString() == "Home").Count());
+        Assert.AreEqual(1, found1.Single(x => x.Key.ToString() == "CustomDocument").Count());
+    }
+
+    [Test]
+    public void Children_Where_DocumentTypeAlias()
+    {
+        // var home = new AutoPublishedContentType(Guid.NewGuid(), 22, "Home", new PublishedPropertyType[] { });
+        // var custom = new AutoPublishedContentType(Guid.NewGuid(), 23, "CustomDocument", new PublishedPropertyType[] { });
+        // var contentTypes = new Dictionary<string, PublishedContentType>
+        // {
+        //     { home.Alias, home },
+        //     { custom.Alias, custom }
+        // };
+        // ContentTypesCache.GetPublishedContentTypeByAlias = alias => contentTypes[alias];
+        var doc = GetContent(1046);
+
+        var found1 = doc.Children(VariationContextAccessor).Where(x => x.ContentType.Alias == "CustomDocument");
+        var found2 = doc.Children(VariationContextAccessor).Where(x => x.ContentType.Alias == "Home");
+
+        Assert.AreEqual(1, found1.Count());
+        Assert.AreEqual(2, found2.Count());
+    }
+
+    [Test]
+    public void Children_Order_By_Update_Date()
+    {
+        var doc = GetContent(1173);
+
+        var ordered = doc.Children(VariationContextAccessor).OrderBy(x => x.UpdateDate);
+
+        var correctOrder = new[] { 1178, 1177, 1174, 1176 };
+        for (var i = 0; i < correctOrder.Length; i++)
+        {
+            Assert.AreEqual(correctOrder[i], ordered.ElementAt(i).Id);
+        }
+    }
+
+    [Test]
+    public void FirstChild()
+    {
+        var doc = GetContent(1173); // has child nodes
+        Assert.IsNotNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>()));
+        Assert.IsNotNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>(), x => true));
+        Assert.IsNotNull(doc.FirstChild<IPublishedContent>(Mock.Of<IVariationContextAccessor>()));
+
+        doc = GetContent(1175); // does not have child nodes
+        Assert.IsNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>()));
+        Assert.IsNull(doc.FirstChild(Mock.Of<IVariationContextAccessor>(), x => true));
+        Assert.IsNull(doc.FirstChild<IPublishedContent>(Mock.Of<IVariationContextAccessor>()));
+    }
+
+    [Test]
+    public void FirstChildAsT()
+    {
+        var doc = GetContent(1046); // has child nodes
+
+        var model = doc.FirstChild<Home>(Mock.Of<IVariationContextAccessor>(), x => true); // predicate
+
+        Assert.IsNotNull(model);
+        Assert.IsTrue(model.Id == 1173);
+        Assert.IsInstanceOf<Home>(model);
+        Assert.IsInstanceOf<IPublishedContent>(model);
+
+        doc = GetContent(1175); // does not have child nodes
+        Assert.IsNull(doc.FirstChild<Anything>(Mock.Of<IVariationContextAccessor>()));
+        Assert.IsNull(doc.FirstChild<Anything>(Mock.Of<IVariationContextAccessor>(), x => true));
+    }
+
+    [Test]
+    public void IsComposedOf()
+    {
+        var doc = GetContent(1173);
+
+        var isComposedOf = doc.IsComposedOf("MyCompositionAlias");
+
+        Assert.IsTrue(isComposedOf);
+    }
+
+    [Test]
+    public void HasProperty()
+    {
+        var doc = GetContent(1173);
+
+        var hasProp = doc.HasProperty(Constants.Conventions.Content.UrlAlias);
+
+        Assert.IsTrue(hasProp);
+    }
+
+    [Test]
+    public void HasValue()
+    {
+        var doc = GetContent(1173);
+
+        var hasValue = doc.HasValue(Mock.Of<IPublishedValueFallback>(), Constants.Conventions.Content.UrlAlias);
+        var noValue = doc.HasValue(Mock.Of<IPublishedValueFallback>(), "blahblahblah");
+
+        Assert.IsTrue(hasValue);
+        Assert.IsFalse(noValue);
+    }
+
+    [Test]
+    public void Ancestors_Where_Visible()
+    {
+        var doc = GetContent(1174);
+
+        var whereVisible = doc.Ancestors().Where(x => x.IsVisible(Mock.Of<IPublishedValueFallback>()));
+        Assert.AreEqual(1, whereVisible.Count());
+    }
+
+    [Test]
+    public void Visible()
+    {
+        var hidden = GetContent(1046);
+        var visible = GetContent(1173);
+
+        Assert.IsFalse(hidden.IsVisible(Mock.Of<IPublishedValueFallback>()));
+        Assert.IsTrue(visible.IsVisible(Mock.Of<IPublishedValueFallback>()));
+    }
+
+    [Test]
+    public void Ancestor_Or_Self()
+    {
+        var doc = GetContent(1173);
+
+        var result = doc.AncestorOrSelf();
+
+        Assert.IsNotNull(result);
+
+        // ancestor-or-self has to be self!
+        Assert.AreEqual(1173, result.Id);
+    }
+
+    [Test]
+    public void U4_4559()
+    {
+        var doc = GetContent(1174);
+        var result = doc.AncestorOrSelf(1);
+        Assert.IsNotNull(result);
+        Assert.AreEqual(1046, result.Id);
+    }
+
+    [Test]
+    public void Ancestors_Or_Self()
+    {
+        var doc = GetContent(1174);
+
+        var result = doc.AncestorsOrSelf().ToArray();
+
+        Assert.IsNotNull(result);
+
+        Assert.AreEqual(3, result.Length);
+        Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new[] { 1174, 1173, 1046 }));
+    }
+
+    [Test]
+    public void Ancestors()
+    {
+        var doc = GetContent(1174);
+
+        var result = doc.Ancestors().ToArray();
+
+        Assert.IsNotNull(result);
+
+        Assert.AreEqual(2, result.Length);
+        Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new[] { 1173, 1046 }));
+    }
+
+    [Test]
+    public void IsAncestor()
+    {
+        // Structure:
+        // - Root : 1046 (no parent)
+        // -- Home: 1173 (parent 1046)
+        // -- Custom Doc: 1178 (parent 1173)
+        // --- Custom Doc2: 1179 (parent: 1178)
+        // -- Custom Doc4: 117 (parent 1173)
+        // - Custom Doc3: 1172 (no parent)
+        var home = GetContent(1173);
+        var root = GetContent(1046);
+        var customDoc = GetContent(1178);
+        var customDoc2 = GetContent(1179);
+        var customDoc3 = GetContent(1172);
+        var customDoc4 = GetContent(117);
+
+        Assert.IsTrue(root.IsAncestor(customDoc4));
+        Assert.IsFalse(root.IsAncestor(customDoc3));
+        Assert.IsTrue(root.IsAncestor(customDoc2));
+        Assert.IsTrue(root.IsAncestor(customDoc));
+        Assert.IsTrue(root.IsAncestor(home));
+        Assert.IsFalse(root.IsAncestor(root));
+
+        Assert.IsTrue(home.IsAncestor(customDoc4));
+        Assert.IsFalse(home.IsAncestor(customDoc3));
+        Assert.IsTrue(home.IsAncestor(customDoc2));
+        Assert.IsTrue(home.IsAncestor(customDoc));
+        Assert.IsFalse(home.IsAncestor(home));
+        Assert.IsFalse(home.IsAncestor(root));
+
+        Assert.IsFalse(customDoc.IsAncestor(customDoc4));
+        Assert.IsFalse(customDoc.IsAncestor(customDoc3));
+        Assert.IsTrue(customDoc.IsAncestor(customDoc2));
+        Assert.IsFalse(customDoc.IsAncestor(customDoc));
+        Assert.IsFalse(customDoc.IsAncestor(home));
+        Assert.IsFalse(customDoc.IsAncestor(root));
+
+        Assert.IsFalse(customDoc2.IsAncestor(customDoc4));
+        Assert.IsFalse(customDoc2.IsAncestor(customDoc3));
+        Assert.IsFalse(customDoc2.IsAncestor(customDoc2));
+        Assert.IsFalse(customDoc2.IsAncestor(customDoc));
+        Assert.IsFalse(customDoc2.IsAncestor(home));
+        Assert.IsFalse(customDoc2.IsAncestor(root));
+
+        Assert.IsFalse(customDoc3.IsAncestor(customDoc3));
+    }
+
+    [Test]
+    public void IsAncestorOrSelf()
+    {
+        // Structure:
+        // - Root : 1046 (no parent)
+        // -- Home: 1173 (parent 1046)
+        // -- Custom Doc: 1178 (parent 1173)
+        // --- Custom Doc2: 1179 (parent: 1178)
+        // -- Custom Doc4: 117 (parent 1173)
+        // - Custom Doc3: 1172 (no parent)
+        var home = GetContent(1173);
+        var root = GetContent(1046);
+        var customDoc = GetContent(1178);
+        var customDoc2 = GetContent(1179);
+        var customDoc3 = GetContent(1172);
+        var customDoc4 = GetContent(117);
+
+        Assert.IsTrue(root.IsAncestorOrSelf(customDoc4));
+        Assert.IsFalse(root.IsAncestorOrSelf(customDoc3));
+        Assert.IsTrue(root.IsAncestorOrSelf(customDoc2));
+        Assert.IsTrue(root.IsAncestorOrSelf(customDoc));
+        Assert.IsTrue(root.IsAncestorOrSelf(home));
+        Assert.IsTrue(root.IsAncestorOrSelf(root));
+
+        Assert.IsTrue(home.IsAncestorOrSelf(customDoc4));
+        Assert.IsFalse(home.IsAncestorOrSelf(customDoc3));
+        Assert.IsTrue(home.IsAncestorOrSelf(customDoc2));
+        Assert.IsTrue(home.IsAncestorOrSelf(customDoc));
+        Assert.IsTrue(home.IsAncestorOrSelf(home));
+        Assert.IsFalse(home.IsAncestorOrSelf(root));
+
+        Assert.IsFalse(customDoc.IsAncestorOrSelf(customDoc4));
+        Assert.IsFalse(customDoc.IsAncestorOrSelf(customDoc3));
+        Assert.IsTrue(customDoc.IsAncestorOrSelf(customDoc2));
+        Assert.IsTrue(customDoc.IsAncestorOrSelf(customDoc));
+        Assert.IsFalse(customDoc.IsAncestorOrSelf(home));
+        Assert.IsFalse(customDoc.IsAncestorOrSelf(root));
+
+        Assert.IsFalse(customDoc2.IsAncestorOrSelf(customDoc4));
+        Assert.IsFalse(customDoc2.IsAncestorOrSelf(customDoc3));
+        Assert.IsTrue(customDoc2.IsAncestorOrSelf(customDoc2));
+        Assert.IsFalse(customDoc2.IsAncestorOrSelf(customDoc));
+        Assert.IsFalse(customDoc2.IsAncestorOrSelf(home));
+        Assert.IsFalse(customDoc2.IsAncestorOrSelf(root));
+
+        Assert.IsTrue(customDoc4.IsAncestorOrSelf(customDoc4));
+        Assert.IsTrue(customDoc3.IsAncestorOrSelf(customDoc3));
+    }
+
+    [Test]
+    public void Descendants_Or_Self()
+    {
+        var doc = GetContent(1046);
+
+        var result = doc.DescendantsOrSelf(Mock.Of<IVariationContextAccessor>()).ToArray();
+
+        Assert.IsNotNull(result);
+
+        Assert.AreEqual(10, result.Count());
+        Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new[] { 1046, 1173, 1174, 1176, 1175 }));
+    }
+
+    [Test]
+    public void Descendants()
+    {
+        var doc = GetContent(1046);
+
+        var result = doc.Descendants(Mock.Of<IVariationContextAccessor>()).ToArray();
+
+        Assert.IsNotNull(result);
+
+        Assert.AreEqual(9, result.Count());
+        Assert.IsTrue(result.Select(x => x.Id).ContainsAll(new[] { 1173, 1174, 1176, 1175, 4444 }));
+    }
+
+    [Test]
+    public void IsDescendant()
+    {
+        // Structure:
+        // - Root : 1046 (no parent)
+        // -- Home: 1173 (parent 1046)
+        // -- Custom Doc: 1178 (parent 1173)
+        // --- Custom Doc2: 1179 (parent: 1178)
+        // -- Custom Doc4: 117 (parent 1173)
+        // - Custom Doc3: 1172 (no parent)
+        var home = GetContent(1173);
+        var root = GetContent(1046);
+        var customDoc = GetContent(1178);
+        var customDoc2 = GetContent(1179);
+        var customDoc3 = GetContent(1172);
+        var customDoc4 = GetContent(117);
+
+        Assert.IsFalse(root.IsDescendant(root));
+        Assert.IsFalse(root.IsDescendant(home));
+        Assert.IsFalse(root.IsDescendant(customDoc));
+        Assert.IsFalse(root.IsDescendant(customDoc2));
+        Assert.IsFalse(root.IsDescendant(customDoc3));
+        Assert.IsFalse(root.IsDescendant(customDoc4));
+
+        Assert.IsTrue(home.IsDescendant(root));
+        Assert.IsFalse(home.IsDescendant(home));
+        Assert.IsFalse(home.IsDescendant(customDoc));
+        Assert.IsFalse(home.IsDescendant(customDoc2));
+        Assert.IsFalse(home.IsDescendant(customDoc3));
+        Assert.IsFalse(home.IsDescendant(customDoc4));
+
+        Assert.IsTrue(customDoc.IsDescendant(root));
+        Assert.IsTrue(customDoc.IsDescendant(home));
+        Assert.IsFalse(customDoc.IsDescendant(customDoc));
+        Assert.IsFalse(customDoc.IsDescendant(customDoc2));
+        Assert.IsFalse(customDoc.IsDescendant(customDoc3));
+        Assert.IsFalse(customDoc.IsDescendant(customDoc4));
+
+        Assert.IsTrue(customDoc2.IsDescendant(root));
+        Assert.IsTrue(customDoc2.IsDescendant(home));
+        Assert.IsTrue(customDoc2.IsDescendant(customDoc));
+        Assert.IsFalse(customDoc2.IsDescendant(customDoc2));
+        Assert.IsFalse(customDoc2.IsDescendant(customDoc3));
+        Assert.IsFalse(customDoc2.IsDescendant(customDoc4));
+
+        Assert.IsFalse(customDoc3.IsDescendant(customDoc3));
+    }
+
+    [Test]
+    public void IsDescendantOrSelf()
+    {
+        // Structure:
+        // - Root : 1046 (no parent)
+        // -- Home: 1173 (parent 1046)
+        // -- Custom Doc: 1178 (parent 1173)
+        // --- Custom Doc2: 1179 (parent: 1178)
+        // -- Custom Doc4: 117 (parent 1173)
+        // - Custom Doc3: 1172 (no parent)
+        var home = GetContent(1173);
+        var root = GetContent(1046);
+        var customDoc = GetContent(1178);
+        var customDoc2 = GetContent(1179);
+        var customDoc3 = GetContent(1172);
+        var customDoc4 = GetContent(117);
+
+        Assert.IsTrue(root.IsDescendantOrSelf(root));
+        Assert.IsFalse(root.IsDescendantOrSelf(home));
+        Assert.IsFalse(root.IsDescendantOrSelf(customDoc));
+        Assert.IsFalse(root.IsDescendantOrSelf(customDoc2));
+        Assert.IsFalse(root.IsDescendantOrSelf(customDoc3));
+        Assert.IsFalse(root.IsDescendantOrSelf(customDoc4));
+
+        Assert.IsTrue(home.IsDescendantOrSelf(root));
+        Assert.IsTrue(home.IsDescendantOrSelf(home));
+        Assert.IsFalse(home.IsDescendantOrSelf(customDoc));
+        Assert.IsFalse(home.IsDescendantOrSelf(customDoc2));
+        Assert.IsFalse(home.IsDescendantOrSelf(customDoc3));
+        Assert.IsFalse(home.IsDescendantOrSelf(customDoc4));
+
+        Assert.IsTrue(customDoc.IsDescendantOrSelf(root));
+        Assert.IsTrue(customDoc.IsDescendantOrSelf(home));
+        Assert.IsTrue(customDoc.IsDescendantOrSelf(customDoc));
+        Assert.IsFalse(customDoc.IsDescendantOrSelf(customDoc2));
+        Assert.IsFalse(customDoc.IsDescendantOrSelf(customDoc3));
+        Assert.IsFalse(customDoc.IsDescendantOrSelf(customDoc4));
+
+        Assert.IsTrue(customDoc2.IsDescendantOrSelf(root));
+        Assert.IsTrue(customDoc2.IsDescendantOrSelf(home));
+        Assert.IsTrue(customDoc2.IsDescendantOrSelf(customDoc));
+        Assert.IsTrue(customDoc2.IsDescendantOrSelf(customDoc2));
+        Assert.IsFalse(customDoc2.IsDescendantOrSelf(customDoc3));
+        Assert.IsFalse(customDoc2.IsDescendantOrSelf(customDoc4));
+
+        Assert.IsTrue(customDoc3.IsDescendantOrSelf(customDoc3));
+    }
+
+    [Test]
+    public void SiblingsAndSelf()
+    {
+        // Structure:
+        // - Root : 1046 (no parent)
+        // -- Level1.1: 1173 (parent 1046)
+        // --- Level1.1.1: 1174 (parent 1173)
+        // --- Level1.1.2: 117 (parent 1173)
+        // --- Level1.1.3: 1177 (parent 1173)
+        // --- Level1.1.4: 1178 (parent 1173)
+        // ---- Level1.1.4.1: 1179 (parent 1178)
+        // --- Level1.1.5: 1176 (parent 1173)
+        // -- Level1.2: 1175 (parent 1046)
+        // -- Level1.3: 4444 (parent 1046)
+        // - Root : 1172 (no parent)
+        var root = GetContent(1046);
+        var level1_1 = GetContent(1173);
+        var level1_1_1 = GetContent(1174);
+        var level1_1_2 = GetContent(117);
+        var level1_1_3 = GetContent(1177);
+        var level1_1_4 = GetContent(1178);
+        var level1_1_5 = GetContent(1176);
+        var level1_2 = GetContent(1175);
+        var level1_3 = GetContent(4444);
+        var root2 = GetContent(1172);
+
+        var publishedSnapshot = GetPublishedSnapshot();
+
+        CollectionAssertAreEqual(new[] { root, root2 }, root.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+
+        CollectionAssertAreEqual(new[] { level1_1, level1_2, level1_3 }, level1_1.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1, level1_2, level1_3 }, level1_2.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1, level1_2, level1_3 }, level1_3.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_1.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_2.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_3.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_4.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_5.SiblingsAndSelf(publishedSnapshot, VariationContextAccessor));
+    }
+
+    [Test]
+    public void Siblings()
+    {
+        // Structure:
+        // - Root : 1046 (no parent)
+        // -- Level1.1: 1173 (parent 1046)
+        // --- Level1.1.1: 1174 (parent 1173)
+        // --- Level1.1.2: 117 (parent 1173)
+        // --- Level1.1.3: 1177 (parent 1173)
+        // --- Level1.1.4: 1178 (parent 1173)
+        // ---- Level1.1.4.1: 1179 (parent 1178)
+        // --- Level1.1.5: 1176 (parent 1173)
+        // -- Level1.2: 1175 (parent 1046)
+        // -- Level1.3: 4444 (parent 1046)
+        // - Root : 1172 (no parent)
+        var root = GetContent(1046);
+        var level1_1 = GetContent(1173);
+        var level1_1_1 = GetContent(1174);
+        var level1_1_2 = GetContent(117);
+        var level1_1_3 = GetContent(1177);
+        var level1_1_4 = GetContent(1178);
+        var level1_1_5 = GetContent(1176);
+        var level1_2 = GetContent(1175);
+        var level1_3 = GetContent(4444);
+        var root2 = GetContent(1172);
+
+        var publishedSnapshot = GetPublishedSnapshot();
+
+        CollectionAssertAreEqual(new[] { root2 }, root.Siblings(publishedSnapshot, VariationContextAccessor));
+
+        CollectionAssertAreEqual(new[] { level1_2, level1_3 }, level1_1.Siblings(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1, level1_3 }, level1_2.Siblings(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1, level1_2 }, level1_3.Siblings(publishedSnapshot, VariationContextAccessor));
+
+        CollectionAssertAreEqual(new[] { level1_1_2, level1_1_3, level1_1_4, level1_1_5 }, level1_1_1.Siblings(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_3, level1_1_4, level1_1_5 }, level1_1_2.Siblings(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_4, level1_1_5 }, level1_1_3.Siblings(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_5 }, level1_1_4.Siblings(publishedSnapshot, VariationContextAccessor));
+        CollectionAssertAreEqual(new[] { level1_1_1, level1_1_2, level1_1_3, level1_1_4 }, level1_1_5.Siblings(publishedSnapshot, VariationContextAccessor));
+    }
+
+    private void CollectionAssertAreEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual)
+        where T : IPublishedContent
+    {
+        var e = expected.Select(x => x.Id).ToArray();
+        var a = actual.Select(x => x.Id).ToArray();
+        CollectionAssert.AreEquivalent(e, a, $"\nExpected:\n{string.Join(", ", e)}\n\nActual:\n{string.Join(", ", a)}");
+    }
+
+    [Test]
+    public void FragmentProperty()
+    {
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
+        {
+            yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "detached", _dataTypes[0].Id);
+        }
+
+        var ct = PublishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 0, "alias", CreatePropertyTypes);
+        var pt = ct.GetPropertyType("detached");
+        var prop = new PublishedElementPropertyBase(pt, null, false, PropertyCacheLevel.None, 5548);
+        Assert.IsInstanceOf<int>(prop.GetValue());
+        Assert.AreEqual(5548, prop.GetValue());
+    }
+
+    [Test]
+    public void Fragment2()
+    {
+        IEnumerable<IPublishedPropertyType> CreatePropertyTypes(IPublishedContentType contentType)
+        {
+            yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "legend", _dataTypes[0].Id);
+            yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "image", _dataTypes[0].Id);
+            yield return PublishedContentTypeFactory.CreatePropertyType(contentType, "size", _dataTypes[0].Id);
+        }
+
+        const string val1 = "boom bam";
+        const int val2 = 0;
+        const int val3 = 666;
+
+        var guid = Guid.NewGuid();
+
+        var ct = PublishedContentTypeFactory.CreateContentType(Guid.NewGuid(), 0, "alias", CreatePropertyTypes);
+
+        var c = new ImageWithLegendModel(
+            ct,
+            guid,
+            new Dictionary<string, object> { { "legend", val1 }, { "image", val2 }, { "size", val3 } },
+            false);
+
+        Assert.AreEqual(val1, c.Legend);
+        Assert.AreEqual(val3, c.Size);
+    }
+
+    [Test]
+    public void First()
+    {
+        var publishedSnapshot = GetPublishedSnapshot();
+        var content = publishedSnapshot.Content.GetAtRoot().First();
+        Assert.AreEqual("Home", content.Name(VariationContextAccessor));
+    }
+
+    [Test]
+    public void Distinct()
+    {
+        var items = GetContent(1173)
+            .Children(VariationContextAccessor)
+            .Distinct()
+            .Distinct()
+            .ToIndexedArray();
+
+        Assert.AreEqual(5, items.Length);
+
+        var item = items[0];
+        Assert.AreEqual(1174, item.Content.Id);
+        Assert.IsTrue(item.IsFirst());
+        Assert.IsFalse(item.IsLast());
+
+        item = items[^1];
+        Assert.AreEqual(1176, item.Content.Id);
+        Assert.IsFalse(item.IsFirst());
+        Assert.IsTrue(item.IsLast());
+    }
+
+    [Test]
+    public void OfType1()
+    {
+        var publishedSnapshot = GetPublishedSnapshot();
+        var items = publishedSnapshot.Content.GetAtRoot()
+            .OfType<Home>()
+            .Distinct()
+            .ToIndexedArray();
+        Assert.AreEqual(1, items.Length);
+        Assert.IsInstanceOf<Home>(items.First().Content);
+    }
+
+    [Test]
+    public void OfType2()
+    {
+        var publishedSnapshot = GetPublishedSnapshot();
+        var content = publishedSnapshot.Content.GetAtRoot()
+            .OfType<CustomDocument>()
+            .Distinct()
+            .ToIndexedArray();
+        Assert.AreEqual(1, content.Length);
+        Assert.IsInstanceOf<CustomDocument>(content.First().Content);
+    }
+
+    [Test]
+    public void OfType()
+    {
+        var content = GetContent(1173)
+            .Children(VariationContextAccessor)
+            .OfType<Home>()
+            .First(x => x.UmbracoNaviHide);
+        Assert.AreEqual(1176, content.Id);
+    }
+
+    [Test]
+    public void Position()
+    {
+        var items = GetContent(1173).Children(VariationContextAccessor)
+            .Where(x => x.Value<int?>(Mock.Of<IPublishedValueFallback>(), "umbracoNaviHide") == 0)
+            .ToIndexedArray();
+
+        Assert.AreEqual(3, items.Length);
+
+        Assert.IsTrue(items.First().IsFirst());
+        Assert.IsFalse(items.First().IsLast());
+        Assert.IsFalse(items.Skip(1).First().IsFirst());
+        Assert.IsFalse(items.Skip(1).First().IsLast());
+        Assert.IsFalse(items.Skip(2).First().IsFirst());
+        Assert.IsTrue(items.Skip(2).First().IsLast());
+    }
+
+    private class ImageWithLegendModel : PublishedElement
+    {
+        public ImageWithLegendModel(
+            IPublishedContentType contentType,
+            Guid fragmentKey,
+            Dictionary<string, object> values,
+            bool previewing)
+            : base(contentType, fragmentKey, values, previewing)
+        {
+        }
+
+        public string Legend => this.Value<string>(Mock.Of<IPublishedValueFallback>(), "legend");
+
+        public IPublishedContent Image => this.Value<IPublishedContent>(Mock.Of<IPublishedValueFallback>(), "image");
+
+        public int Size => this.Value<int>(Mock.Of<IPublishedValueFallback>(), "size");
+    }
+
+    // [PublishedModel("ContentType2")]
+    // public class ContentType2 : PublishedContentModel
+    // {
+    //     #region Plumbing
+
+    // public ContentType2(IPublishedContent content, IPublishedValueFallback fallback)
+    // : base(content, fallback)
+    // { }
+
+    // #endregion
+
+    // public int Prop1 => this.Value<int>(Mock.Of<IPublishedValueFallback>(), "prop1");
+    // }
+
+    // [PublishedModel("ContentType2Sub")]
+    // public class ContentType2Sub : ContentType2
+    // {
+    //     #region Plumbing
+
+    // public ContentType2Sub(IPublishedContent content, IPublishedValueFallback fallback)
+    // : base(content, fallback)
+    // { }
+
+    // #endregion
+    // }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedMediaTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedMediaTests.cs
index e24383855c..38a8395bf8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedMediaTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedMediaTests.cs
@@ -6,237 +6,236 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.PublishedCache;
-using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
 using Umbraco.Cms.Infrastructure.Serialization;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+/// <summary>
+///     Tests the typed extension methods on IPublishedContent using the DefaultPublishedMediaStore
+/// </summary>
+[TestFixture]
+public class PublishedMediaTests : PublishedSnapshotServiceTestBase
 {
-    /// <summary>
-    /// Tests the typed extension methods on IPublishedContent using the DefaultPublishedMediaStore
-    /// </summary>
-    [TestFixture]
-    public class PublishedMediaTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        [SetUp]
-        public override void Setup()
+        base.Setup();
+
+        var dataTypes = GetDefaultDataTypes().ToList();
+        var serializer = new ConfigurationEditorJsonSerializer();
+        var rteDataType = new DataType(new VoidEditor("RTE", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 4 };
+        dataTypes.Add(rteDataType);
+        _dataTypes = dataTypes.ToArray();
+
+        _propertyDataTypes = new Dictionary<string, IDataType>
         {
-            base.Setup();
+            // defaults will just use the first one
+            [string.Empty] = _dataTypes[0],
 
-            var dataTypes = GetDefaultDataTypes().ToList();
-            var serializer = new ConfigurationEditorJsonSerializer();
-            var rteDataType = new DataType(new VoidEditor("RTE", Mock.Of<IDataValueEditorFactory>()), serializer) { Id = 4 };
-            dataTypes.Add(rteDataType);
-            _dataTypes = dataTypes.ToArray();
+            // content uses the RTE
+            ["content"] = _dataTypes[1],
+        };
+    }
 
-            _propertyDataTypes = new()
-            {
-                // defaults will just use the first one
-                [string.Empty] = _dataTypes[0],
+    private Dictionary<string, IDataType> _propertyDataTypes;
+    private DataType[] _dataTypes;
 
-                // content uses the RTE
-                ["content"] = _dataTypes[1]
-            };
-        }
+    private ContentNodeKit CreateRoot(out MediaType mediaType)
+    {
+        mediaType = new MediaType(ShortStringHelper, -1);
 
-        private Dictionary<string, IDataType> _propertyDataTypes;
-        private DataType[] _dataTypes;
+        var item1Data = new ContentDataBuilder()
+            .WithName("Content 1")
+            .WithProperties(new PropertyDataBuilder()
+                .WithPropertyData("content", "<div>This is some content</div>")
+                .Build())
 
-        private ContentNodeKit CreateRoot(out MediaType mediaType)
+            // build with a dynamically created media type
+            .Build(ShortStringHelper, _propertyDataTypes, mediaType, "image2");
+
+        var item1 = ContentNodeKitBuilder.CreateWithContent(
+            mediaType.Id,
+            1,
+            "-1,1",
+            draftData: item1Data,
+            publishedData: item1Data);
+
+        return item1;
+    }
+
+    private IEnumerable<ContentNodeKit> CreateChildren(
+        int startId,
+        ContentNodeKit parent,
+        IMediaType mediaType,
+        int count)
+    {
+        for (var i = 0; i < count; i++)
         {
-            mediaType = new MediaType(ShortStringHelper, -1);
+            var id = startId + i + 1;
 
-            ContentData item1Data = new ContentDataBuilder()
-                .WithName("Content 1")
+            var item1Data = new ContentDataBuilder()
+                .WithName("Child " + id)
                 .WithProperties(new PropertyDataBuilder()
                     .WithPropertyData("content", "<div>This is some content</div>")
                     .Build())
-                // build with a dynamically created media type
-                .Build(ShortStringHelper, _propertyDataTypes, mediaType, "image2");
+                .Build();
 
-            ContentNodeKit item1 = ContentNodeKitBuilder.CreateWithContent(
+            var parentPath = parent.Node.Path;
+
+            var item1 = ContentNodeKitBuilder.CreateWithContent(
                 mediaType.Id,
-                1, "-1,1",
+                id,
+                $"{parentPath},{id}",
                 draftData: item1Data,
                 publishedData: item1Data);
 
-            return item1;
+            yield return item1;
         }
+    }
 
-        private IEnumerable<ContentNodeKit> CreateChildren(
-            int startId,
-            ContentNodeKit parent,
-            IMediaType mediaType,
-            int count)
-        {
-            for (int i = 0; i < count; i++)
-            {
-                var id = startId + i + 1;
+    private void InitializeWithHierarchy(
+        out int rootId,
+        out IReadOnlyList<ContentNodeKit> firstLevelChildren,
+        out IReadOnlyList<ContentNodeKit> secondLevelChildren)
+    {
+        var cache = new List<ContentNodeKit>();
+        var root = CreateRoot(out var mediaType);
+        firstLevelChildren = CreateChildren(10, root, mediaType, 3).ToList();
+        secondLevelChildren = CreateChildren(20, firstLevelChildren[0], mediaType, 3).ToList();
+        cache.Add(root);
+        cache.AddRange(firstLevelChildren);
+        cache.AddRange(secondLevelChildren);
+        InitializedCache(null, null, _dataTypes, cache, new[] { mediaType });
+        rootId = root.Node.Id;
+    }
 
-                ContentData item1Data = new ContentDataBuilder()
-                    .WithName("Child " + id)
-                    .WithProperties(new PropertyDataBuilder()
-                        .WithPropertyData("content", "<div>This is some content</div>")
-                        .Build())
-                .Build();
-                
-                var parentPath = parent.Node.Path;
+    [Test]
+    public void Get_Property_Value_Uses_Converter()
+    {
+        var cache = CreateRoot(out var mediaType);
+        InitializedCache(null, null, _dataTypes.ToArray(), new[] { cache }, new[] { mediaType });
 
-                ContentNodeKit item1 = ContentNodeKitBuilder.CreateWithContent(
-                    mediaType.Id,
-                    id, $"{parentPath},{id}",
-                    draftData: item1Data,
-                    publishedData: item1Data);
+        var publishedMedia = GetMedia(1);
 
-                yield return item1;
-            }
-        }
+        var propVal = publishedMedia.Value(PublishedValueFallback, "content");
+        Assert.IsInstanceOf<IHtmlEncodedString>(propVal);
+        Assert.AreEqual("<div>This is some content</div>", propVal.ToString());
 
-        private void InitializeWithHierarchy(
-            out int rootId,
-            out IReadOnlyList<ContentNodeKit> firstLevelChildren,
-            out IReadOnlyList<ContentNodeKit> secondLevelChildren)
-        {
-            var cache = new List<ContentNodeKit>();
-            var root = CreateRoot(out MediaType mediaType);
-            firstLevelChildren = CreateChildren(10, root, mediaType, 3).ToList();
-            secondLevelChildren = CreateChildren(20, firstLevelChildren[0], mediaType, 3).ToList();
-            cache.Add(root);
-            cache.AddRange(firstLevelChildren);
-            cache.AddRange(secondLevelChildren);
-            InitializedCache(null, null, _dataTypes, cache, new[] { mediaType });
-            rootId = root.Node.Id;
-        }
+        var propVal2 = publishedMedia.Value<IHtmlEncodedString>(PublishedValueFallback, "content");
+        Assert.IsInstanceOf<IHtmlEncodedString>(propVal2);
+        Assert.AreEqual("<div>This is some content</div>", propVal2.ToString());
 
-        [Test]
-        public void Get_Property_Value_Uses_Converter()
-        {
-            var cache = CreateRoot(out MediaType mediaType);
-            InitializedCache(null, null, _dataTypes.ToArray(), new[] { cache }, new[] { mediaType });
+        var propVal3 = publishedMedia.Value(PublishedValueFallback, "Content");
+        Assert.IsInstanceOf<IHtmlEncodedString>(propVal3);
+        Assert.AreEqual("<div>This is some content</div>", propVal3.ToString());
+    }
 
-            var publishedMedia = GetMedia(1);
+    [Test]
+    public void Children()
+    {
+        InitializeWithHierarchy(
+            out var rootId,
+            out var firstLevelChildren,
+            out var secondLevelChildren);
 
-            var propVal = publishedMedia.Value(PublishedValueFallback, "content");
-            Assert.IsInstanceOf<IHtmlEncodedString>(propVal);
-            Assert.AreEqual("<div>This is some content</div>", propVal.ToString());
+        var publishedMedia = GetMedia(rootId);
 
-            var propVal2 = publishedMedia.Value<IHtmlEncodedString>(PublishedValueFallback, "content");
-            Assert.IsInstanceOf<IHtmlEncodedString>(propVal2);
-            Assert.AreEqual("<div>This is some content</div>", propVal2.ToString());
+        var rootChildren = publishedMedia.Children(VariationContextAccessor);
+        Assert.IsTrue(rootChildren.Select(x => x.Id).ContainsAll(firstLevelChildren.Select(x => x.Node.Id)));
 
-            var propVal3 = publishedMedia.Value(PublishedValueFallback, "Content");
-            Assert.IsInstanceOf<IHtmlEncodedString>(propVal3);
-            Assert.AreEqual("<div>This is some content</div>", propVal3.ToString());
-        }
+        var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
+        var subChildren = publishedChild1.Children(VariationContextAccessor);
+        Assert.IsTrue(subChildren.Select(x => x.Id).ContainsAll(secondLevelChildren.Select(x => x.Node.Id)));
+    }
 
-        [Test]
-        public void Children()
-        {
-            InitializeWithHierarchy(
-                out var rootId,
-                out IReadOnlyList<ContentNodeKit> firstLevelChildren,
-                out IReadOnlyList<ContentNodeKit> secondLevelChildren);
+    [Test]
+    public void Descendants()
+    {
+        InitializeWithHierarchy(
+            out var rootId,
+            out var firstLevelChildren,
+            out var secondLevelChildren);
 
-            var publishedMedia = GetMedia(rootId);
+        var publishedMedia = GetMedia(rootId);
+        var rootDescendants = publishedMedia.Descendants(VariationContextAccessor);
 
-            var rootChildren = publishedMedia.Children(VariationContextAccessor);
-            Assert.IsTrue(rootChildren.Select(x => x.Id).ContainsAll(firstLevelChildren.Select(x => x.Node.Id)));
+        var descendentIds =
+            firstLevelChildren.Select(x => x.Node.Id).Concat(secondLevelChildren.Select(x => x.Node.Id));
 
-            var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
-            var subChildren = publishedChild1.Children(VariationContextAccessor);
-            Assert.IsTrue(subChildren.Select(x => x.Id).ContainsAll(secondLevelChildren.Select(x => x.Node.Id)));
-        }
+        Assert.IsTrue(rootDescendants.Select(x => x.Id).ContainsAll(descendentIds));
 
-        [Test]
-        public void Descendants()
-        {
-            InitializeWithHierarchy(
-                out var rootId,
-                out IReadOnlyList<ContentNodeKit> firstLevelChildren,
-                out IReadOnlyList<ContentNodeKit> secondLevelChildren);
+        var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
+        var subDescendants = publishedChild1.Descendants(VariationContextAccessor);
+        Assert.IsTrue(subDescendants.Select(x => x.Id).ContainsAll(secondLevelChildren.Select(x => x.Node.Id)));
+    }
 
-            var publishedMedia = GetMedia(rootId);
-            var rootDescendants = publishedMedia.Descendants(VariationContextAccessor);
+    [Test]
+    public void DescendantsOrSelf()
+    {
+        InitializeWithHierarchy(
+            out var rootId,
+            out var firstLevelChildren,
+            out var secondLevelChildren);
 
-            var descendentIds = firstLevelChildren.Select(x => x.Node.Id).Concat(secondLevelChildren.Select(x => x.Node.Id));
+        var publishedMedia = GetMedia(rootId);
+        var rootDescendantsOrSelf = publishedMedia.DescendantsOrSelf(VariationContextAccessor);
+        var descendentAndSelfIds = firstLevelChildren.Select(x => x.Node.Id)
+            .Concat(secondLevelChildren.Select(x => x.Node.Id))
+            .Append(rootId);
 
-            Assert.IsTrue(rootDescendants.Select(x => x.Id).ContainsAll(descendentIds));
+        Assert.IsTrue(rootDescendantsOrSelf.Select(x => x.Id).ContainsAll(descendentAndSelfIds));
 
-            var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
-            var subDescendants = publishedChild1.Descendants(VariationContextAccessor);
-            Assert.IsTrue(subDescendants.Select(x => x.Id).ContainsAll(secondLevelChildren.Select(x => x.Node.Id)));
-        }
+        var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
+        var subDescendantsOrSelf = publishedChild1.DescendantsOrSelf(VariationContextAccessor);
+        Assert.IsTrue(subDescendantsOrSelf.Select(x => x.Id).ContainsAll(
+            secondLevelChildren.Select(x => x.Node.Id).Append(firstLevelChildren[0].Node.Id)));
+    }
 
-        [Test]
-        public void DescendantsOrSelf()
-        {
-            InitializeWithHierarchy(
-                out var rootId,
-                out IReadOnlyList<ContentNodeKit> firstLevelChildren,
-                out IReadOnlyList<ContentNodeKit> secondLevelChildren);
+    [Test]
+    public void Parent()
+    {
+        InitializeWithHierarchy(
+            out var rootId,
+            out var firstLevelChildren,
+            out var secondLevelChildren);
 
-            var publishedMedia = GetMedia(rootId);
-            var rootDescendantsOrSelf = publishedMedia.DescendantsOrSelf(VariationContextAccessor);
-            var descendentAndSelfIds = firstLevelChildren.Select(x => x.Node.Id)
-                .Concat(secondLevelChildren.Select(x => x.Node.Id))
-                .Append(rootId);
+        var publishedMedia = GetMedia(rootId);
+        Assert.AreEqual(null, publishedMedia.Parent);
 
-            Assert.IsTrue(rootDescendantsOrSelf.Select(x => x.Id).ContainsAll(descendentAndSelfIds));
+        var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
+        Assert.AreEqual(publishedMedia.Id, publishedChild1.Parent.Id);
 
-            var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
-            var subDescendantsOrSelf = publishedChild1.DescendantsOrSelf(VariationContextAccessor);
-            Assert.IsTrue(subDescendantsOrSelf.Select(x => x.Id).ContainsAll(
-                secondLevelChildren.Select(x => x.Node.Id).Append(firstLevelChildren[0].Node.Id)));
-        }
+        var publishedSubChild1 = GetMedia(secondLevelChildren[0].Node.Id);
+        Assert.AreEqual(firstLevelChildren[0].Node.Id, publishedSubChild1.Parent.Id);
+    }
 
-        [Test]
-        public void Parent()
-        {
-            InitializeWithHierarchy(
-                out var rootId,
-                out IReadOnlyList<ContentNodeKit> firstLevelChildren,
-                out IReadOnlyList<ContentNodeKit> secondLevelChildren);
+    [Test]
+    public void Ancestors()
+    {
+        InitializeWithHierarchy(
+            out var rootId,
+            out var firstLevelChildren,
+            out var secondLevelChildren);
 
-            var publishedMedia = GetMedia(rootId);
-            Assert.AreEqual(null, publishedMedia.Parent);
-
-            var publishedChild1 = GetMedia(firstLevelChildren[0].Node.Id);
-            Assert.AreEqual(publishedMedia.Id, publishedChild1.Parent.Id);
-
-            var publishedSubChild1 = GetMedia(secondLevelChildren[0].Node.Id);
-            Assert.AreEqual(firstLevelChildren[0].Node.Id, publishedSubChild1.Parent.Id);
-        }
-
-        [Test]
-        public void Ancestors()
-        {
-            InitializeWithHierarchy(
-                out var rootId,
-                out IReadOnlyList<ContentNodeKit> firstLevelChildren,
-                out IReadOnlyList<ContentNodeKit> secondLevelChildren);
-
-            var publishedSubChild1 = GetMedia(secondLevelChildren[0].Node.Id);
-            Assert.IsTrue(publishedSubChild1.Ancestors().Select(x => x.Id)
-                .ContainsAll(new[] { firstLevelChildren[0].Node.Id, rootId }));
-        }
-
-        [Test]
-        public void AncestorsOrSelf()
-        {
-            InitializeWithHierarchy(
-                out var rootId,
-                out IReadOnlyList<ContentNodeKit> firstLevelChildren,
-                out IReadOnlyList<ContentNodeKit> secondLevelChildren);
-
-            var publishedSubChild1 = GetMedia(secondLevelChildren[0].Node.Id);
-            Assert.IsTrue(publishedSubChild1.AncestorsOrSelf().Select(x => x.Id)
-                .ContainsAll(new[] { secondLevelChildren[0].Node.Id, firstLevelChildren[0].Node.Id, rootId }));
-        }
+        var publishedSubChild1 = GetMedia(secondLevelChildren[0].Node.Id);
+        Assert.IsTrue(publishedSubChild1.Ancestors().Select(x => x.Id)
+            .ContainsAll(new[] { firstLevelChildren[0].Node.Id, rootId }));
+    }
 
+    [Test]
+    public void AncestorsOrSelf()
+    {
+        InitializeWithHierarchy(
+            out var rootId,
+            out var firstLevelChildren,
+            out var secondLevelChildren);
 
+        var publishedSubChild1 = GetMedia(secondLevelChildren[0].Node.Id);
+        Assert.IsTrue(publishedSubChild1.AncestorsOrSelf().Select(x => x.Id)
+            .ContainsAll(new[] { secondLevelChildren[0].Node.Id, firstLevelChildren[0].Node.Id, rootId }));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceCollectionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceCollectionTests.cs
index 532c7ccf4b..a0e48069a3 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceCollectionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceCollectionTests.cs
@@ -12,1122 +12,1220 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class PublishedSnapshotServiceCollectionTests : PublishedSnapshotServiceTestBase
 {
-    [TestFixture]
-    public class PublishedSnapshotServiceCollectionTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private ContentType _contentTypeInvariant;
-        private ContentType _contentTypeVariant;
-        private ContentType[] _contentTypes;
+        base.Setup();
 
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
-
-            var propertyType = new PropertyType(TestHelper.ShortStringHelper, "Umbraco.Void.Editor", ValueStorageType.Nvarchar) { Alias = "prop", DataTypeId = 3, Variations = ContentVariation.Nothing };
-            _contentTypeInvariant = new ContentType(TestHelper.ShortStringHelper, -1) { Id = 2, Alias = "itype", Variations = ContentVariation.Nothing };
-            _contentTypeInvariant.AddPropertyType(propertyType);
-
-            propertyType = new PropertyType(TestHelper.ShortStringHelper, "Umbraco.Void.Editor", ValueStorageType.Nvarchar) { Alias = "prop", DataTypeId = 3, Variations = ContentVariation.Culture };
-            _contentTypeVariant = new ContentType(TestHelper.ShortStringHelper, -1) { Id = 3, Alias = "vtype", Variations = ContentVariation.Culture };
-            _contentTypeVariant.AddPropertyType(propertyType);
-
-            _contentTypes = new[]
+        var propertyType =
+            new PropertyType(TestHelper.ShortStringHelper, "Umbraco.Void.Editor", ValueStorageType.Nvarchar)
             {
-                _contentTypeInvariant,
-                _contentTypeVariant
+                Alias = "prop",
+                DataTypeId = 3,
+                Variations = ContentVariation.Nothing,
             };
-        }
+        _contentTypeInvariant =
+            new ContentType(TestHelper.ShortStringHelper, -1)
+            {
+                Id = 2,
+                Alias = "itype",
+                Variations = ContentVariation.Nothing,
+            };
+        _contentTypeInvariant.AddPropertyType(propertyType);
 
-        private IEnumerable<ContentNodeKit> GetNestedVariantKits()
+        propertyType =
+            new PropertyType(TestHelper.ShortStringHelper, "Umbraco.Void.Editor", ValueStorageType.Nvarchar)
+            {
+                Alias = "prop",
+                DataTypeId = 3,
+                Variations = ContentVariation.Culture,
+            };
+        _contentTypeVariant =
+            new ContentType(TestHelper.ShortStringHelper, -1)
+            {
+                Id = 3,
+                Alias = "vtype",
+                Variations = ContentVariation.Culture,
+            };
+        _contentTypeVariant.AddPropertyType(propertyType);
+
+        _contentTypes = new[] { _contentTypeInvariant, _contentTypeVariant };
+    }
+
+    private ContentType _contentTypeInvariant;
+    private ContentType _contentTypeVariant;
+    private ContentType[] _contentTypes;
+
+    private IEnumerable<ContentNodeKit> GetNestedVariantKits()
+    {
+        var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+        // 1x variant (root)
+        yield return CreateVariantKit(1, -1, 1, paths);
+
+        // 1x invariant under root
+        yield return CreateInvariantKit(4, 1, 1, paths);
+
+        // 1x variant under root
+        yield return CreateVariantKit(7, 1, 4, paths);
+
+        // 2x mixed under invariant
+        yield return CreateVariantKit(10, 4, 1, paths);
+        yield return CreateInvariantKit(11, 4, 2, paths);
+
+        // 2x mixed under variant
+        yield return CreateVariantKit(12, 7, 1, paths);
+        yield return CreateInvariantKit(13, 7, 2, paths);
+    }
+
+    private IEnumerable<ContentNodeKit> GetInvariantKits()
+    {
+        var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+        yield return CreateInvariantKit(1, -1, 1, paths);
+        yield return CreateInvariantKit(2, -1, 2, paths);
+        yield return CreateInvariantKit(3, -1, 3, paths);
+
+        yield return CreateInvariantKit(4, 1, 1, paths);
+        yield return CreateInvariantKit(5, 1, 2, paths);
+        yield return CreateInvariantKit(6, 1, 3, paths);
+
+        yield return CreateInvariantKit(7, 2, 3, paths);
+        yield return CreateInvariantKit(8, 2, 2, paths);
+        yield return CreateInvariantKit(9, 2, 1, paths);
+
+        yield return CreateInvariantKit(10, 3, 1, paths);
+
+        yield return CreateInvariantKit(11, 4, 1, paths);
+        yield return CreateInvariantKit(12, 4, 2, paths);
+    }
+
+    private ContentNodeKit CreateInvariantKit(int id, int parentId, int sortOrder, Dictionary<int, string> paths)
+    {
+        if (!paths.TryGetValue(parentId, out var parentPath))
         {
-            var paths = new Dictionary<int, string> { { -1, "-1" } };
-
-            //1x variant (root)
-            yield return CreateVariantKit(1, -1, 1, paths);
-
-            //1x invariant under root
-            yield return CreateInvariantKit(4, 1, 1, paths);
-
-            //1x variant under root
-            yield return CreateVariantKit(7, 1, 4, paths);
-
-            //2x mixed under invariant
-            yield return CreateVariantKit(10, 4, 1, paths);
-            yield return CreateInvariantKit(11, 4, 2, paths);
-
-            //2x mixed under variant
-            yield return CreateVariantKit(12, 7, 1, paths);
-            yield return CreateInvariantKit(13, 7, 2, paths);
+            throw new Exception("Unknown parent.");
         }
 
-        private IEnumerable<ContentNodeKit> GetInvariantKits()
+        var path = paths[id] = parentPath + "," + id;
+        var level = path.Count(x => x == ',');
+        var now = DateTime.Now;
+
+        var contentData = ContentDataBuilder.CreateBasic("N" + id, now);
+
+        return ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            id,
+            path,
+            sortOrder,
+            level,
+            parentId,
+            0,
+            Guid.NewGuid(),
+            DateTime.Now,
+            null,
+            contentData);
+    }
+
+    private IEnumerable<ContentNodeKit> GetVariantKits()
+    {
+        var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+        yield return CreateVariantKit(1, -1, 1, paths);
+        yield return CreateVariantKit(2, -1, 2, paths);
+        yield return CreateVariantKit(3, -1, 3, paths);
+
+        yield return CreateVariantKit(4, 1, 1, paths);
+        yield return CreateVariantKit(5, 1, 2, paths);
+        yield return CreateVariantKit(6, 1, 3, paths);
+
+        yield return CreateVariantKit(7, 2, 3, paths);
+        yield return CreateVariantKit(8, 2, 2, paths);
+        yield return CreateVariantKit(9, 2, 1, paths);
+
+        yield return CreateVariantKit(10, 3, 1, paths);
+
+        yield return CreateVariantKit(11, 4, 1, paths);
+        yield return CreateVariantKit(12, 4, 2, paths);
+    }
+
+    private static Dictionary<string, CultureVariation> GetCultureInfos(int id, DateTime now)
+    {
+        var en = new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
+        var fr = new[] { 1, 3, 4, 6, 7, 9, 10, 12 };
+
+        var infos = new Dictionary<string, CultureVariation>();
+        if (en.Contains(id))
         {
-            var paths = new Dictionary<int, string> { { -1, "-1" } };
-
-            yield return CreateInvariantKit(1, -1, 1, paths);
-            yield return CreateInvariantKit(2, -1, 2, paths);
-            yield return CreateInvariantKit(3, -1, 3, paths);
-
-            yield return CreateInvariantKit(4, 1, 1, paths);
-            yield return CreateInvariantKit(5, 1, 2, paths);
-            yield return CreateInvariantKit(6, 1, 3, paths);
-
-            yield return CreateInvariantKit(7, 2, 3, paths);
-            yield return CreateInvariantKit(8, 2, 2, paths);
-            yield return CreateInvariantKit(9, 2, 1, paths);
-
-            yield return CreateInvariantKit(10, 3, 1, paths);
-
-            yield return CreateInvariantKit(11, 4, 1, paths);
-            yield return CreateInvariantKit(12, 4, 2, paths);
+            infos["en-US"] = new CultureVariation { Name = "N" + id + "-" + "en-US", Date = now, IsDraft = false };
         }
 
-        private ContentNodeKit CreateInvariantKit(int id, int parentId, int sortOrder, Dictionary<int, string> paths)
+        if (fr.Contains(id))
         {
-            if (!paths.TryGetValue(parentId, out var parentPath))
-                throw new Exception("Unknown parent.");
-
-            var path = paths[id] = parentPath + "," + id;
-            var level = path.Count(x => x == ',');
-            var now = DateTime.Now;
-
-            var contentData = ContentDataBuilder.CreateBasic("N" + id, now);
-
-            return ContentNodeKitBuilder.CreateWithContent(
-                _contentTypeInvariant.Id,
-                id, path, sortOrder, level, parentId, 0, Guid.NewGuid(), DateTime.Now,
-                null,
-                contentData);
+            infos["fr-FR"] = new CultureVariation { Name = "N" + id + "-" + "fr-FR", Date = now, IsDraft = false };
         }
 
-        private IEnumerable<ContentNodeKit> GetVariantKits()
+        return infos;
+    }
+
+    private ContentNodeKit CreateVariantKit(int id, int parentId, int sortOrder, Dictionary<int, string> paths)
+    {
+        if (!paths.TryGetValue(parentId, out var parentPath))
         {
-            var paths = new Dictionary<int, string> { { -1, "-1" } };
-
-            yield return CreateVariantKit(1, -1, 1, paths);
-            yield return CreateVariantKit(2, -1, 2, paths);
-            yield return CreateVariantKit(3, -1, 3, paths);
-
-            yield return CreateVariantKit(4, 1, 1, paths);
-            yield return CreateVariantKit(5, 1, 2, paths);
-            yield return CreateVariantKit(6, 1, 3, paths);
-
-            yield return CreateVariantKit(7, 2, 3, paths);
-            yield return CreateVariantKit(8, 2, 2, paths);
-            yield return CreateVariantKit(9, 2, 1, paths);
-
-            yield return CreateVariantKit(10, 3, 1, paths);
-
-            yield return CreateVariantKit(11, 4, 1, paths);
-            yield return CreateVariantKit(12, 4, 2, paths);
+            throw new Exception("Unknown parent.");
         }
 
-        private static Dictionary<string, CultureVariation> GetCultureInfos(int id, DateTime now)
+        var path = paths[id] = parentPath + "," + id;
+        var level = path.Count(x => x == ',');
+        var now = DateTime.Now;
+
+        var contentData = ContentDataBuilder.CreateVariant(
+            "N" + id,
+            GetCultureInfos(id, now),
+            now);
+
+        return ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeVariant.Id,
+            id,
+            path,
+            sortOrder,
+            level,
+            parentId,
+            draftData: null,
+            publishedData: contentData);
+    }
+
+    private IEnumerable<ContentNodeKit> GetVariantWithDraftKits()
+    {
+        var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+        Dictionary<string, CultureVariation> GetCultureInfos(int id, DateTime now)
         {
             var en = new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
             var fr = new[] { 1, 3, 4, 6, 7, 9, 10, 12 };
 
             var infos = new Dictionary<string, CultureVariation>();
             if (en.Contains(id))
+            {
                 infos["en-US"] = new CultureVariation { Name = "N" + id + "-" + "en-US", Date = now, IsDraft = false };
+            }
+
             if (fr.Contains(id))
+            {
                 infos["fr-FR"] = new CultureVariation { Name = "N" + id + "-" + "fr-FR", Date = now, IsDraft = false };
+            }
+
             return infos;
         }
 
-        private ContentNodeKit CreateVariantKit(int id, int parentId, int sortOrder, Dictionary<int, string> paths)
+        ContentNodeKit CreateKit(int id, int parentId, int sortOrder)
         {
             if (!paths.TryGetValue(parentId, out var parentPath))
+            {
                 throw new Exception("Unknown parent.");
+            }
 
             var path = paths[id] = parentPath + "," + id;
             var level = path.Count(x => x == ',');
             var now = DateTime.Now;
 
-            var contentData = ContentDataBuilder.CreateVariant(
-                "N" + id,
-                GetCultureInfos(id, now),
-                now);
-
-            return ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeVariant.Id,
-                id: id, path: path, sortOrder: sortOrder, level: level, parentContentId: parentId, 
-                draftData: null,
-                publishedData: contentData);
-        }
-
-        private IEnumerable<ContentNodeKit> GetVariantWithDraftKits()
-        {
-            var paths = new Dictionary<int, string> { { -1, "-1" } };
-
-            Dictionary<string, CultureVariation> GetCultureInfos(int id, DateTime now)
+            ContentData CreateContentData(bool published)
             {
-                var en = new[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
-                var fr = new[] { 1, 3, 4, 6, 7, 9, 10, 12 };
-
-                var infos = new Dictionary<string, CultureVariation>();
-                if (en.Contains(id))
-                    infos["en-US"] = new CultureVariation { Name = "N" + id + "-" + "en-US", Date = now, IsDraft = false };
-                if (fr.Contains(id))
-                    infos["fr-FR"] = new CultureVariation { Name = "N" + id + "-" + "fr-FR", Date = now, IsDraft = false };
-                return infos;
-            }
-
-            ContentNodeKit CreateKit(int id, int parentId, int sortOrder)
-            {
-                if (!paths.TryGetValue(parentId, out var parentPath))
-                    throw new Exception("Unknown parent.");
-
-                var path = paths[id] = parentPath + "," + id;
-                var level = path.Count(x => x == ',');
-                var now = DateTime.Now;
-
-                ContentData CreateContentData(bool published) => ContentDataBuilder.CreateVariant(
+                return ContentDataBuilder.CreateVariant(
                     "N" + id,
                     GetCultureInfos(id, now),
                     now,
                     published);
-
-                var withDraft = id % 2 == 0;
-                var withPublished = !withDraft;
-
-                return ContentNodeKitBuilder.CreateWithContent(
-                    contentTypeId: _contentTypeVariant.Id,
-                    id: id, path: path, sortOrder: sortOrder, level: level, parentContentId: parentId, 
-                    draftData: withDraft ? CreateContentData(false) : null,
-                    publishedData: withPublished ? CreateContentData(true) : null);
             }
 
-            yield return CreateKit(1, -1, 1);
-            yield return CreateKit(2, -1, 2);
-            yield return CreateKit(3, -1, 3);
+            var withDraft = id % 2 == 0;
+            var withPublished = !withDraft;
 
-            yield return CreateKit(4, 1, 1);
-            yield return CreateKit(5, 1, 2);
-            yield return CreateKit(6, 1, 3);
-
-            yield return CreateKit(7, 2, 3);
-            yield return CreateKit(8, 2, 2);
-            yield return CreateKit(9, 2, 1);
-
-            yield return CreateKit(10, 3, 1);
-
-            yield return CreateKit(11, 4, 1);
-            yield return CreateKit(12, 4, 2);
+            return ContentNodeKitBuilder.CreateWithContent(
+                _contentTypeVariant.Id,
+                id,
+                path,
+                sortOrder,
+                level,
+                parentId,
+                draftData: withDraft ? CreateContentData(false) : null,
+                publishedData: withPublished ? CreateContentData(true) : null);
         }
 
-        [Test]
-        public void EmptyTest()
-        {
-            InitializedCache(Array.Empty<ContentNodeKit>(), _contentTypes);
+        yield return CreateKit(1, -1, 1);
+        yield return CreateKit(2, -1, 2);
+        yield return CreateKit(3, -1, 3);
 
-            var snapshot = GetPublishedSnapshot();
+        yield return CreateKit(4, 1, 1);
+        yield return CreateKit(5, 1, 2);
+        yield return CreateKit(6, 1, 3);
 
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            Assert.AreEqual(0, documents.Length);
-        }
+        yield return CreateKit(7, 2, 3);
+        yield return CreateKit(8, 2, 2);
+        yield return CreateKit(9, 2, 1);
 
-        [Test]
-        public void ChildrenTest()
-        {
-            InitializedCache(GetInvariantKits(), _contentTypes);
+        yield return CreateKit(10, 3, 1);
 
-            var snapshot = GetPublishedSnapshot();
+        yield return CreateKit(11, 4, 1);
+        yield return CreateKit(12, 4, 2);
+    }
 
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1", "N2", "N3");
+    [Test]
+    public void EmptyTest()
+    {
+        InitializedCache(Array.Empty<ContentNodeKit>(), _contentTypes);
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4", "N5", "N6");
+        var snapshot = GetPublishedSnapshot();
 
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N9", "N8", "N7");
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        Assert.AreEqual(0, documents.Length);
+    }
 
-            documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N10");
+    [Test]
+    public void ChildrenTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
 
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N11", "N12");
+        var snapshot = GetPublishedSnapshot();
 
-            documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents);
-        }
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1", "N2", "N3");
 
-        [Test]
-        public void ParentTest()
-        {
-            InitializedCache(GetInvariantKits(), _contentTypes);
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4", "N5", "N6");
 
-            var snapshot = GetPublishedSnapshot();
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N9", "N8", "N7");
 
-            Assert.IsNull(snapshot.Content.GetById(1).Parent);
-            Assert.IsNull(snapshot.Content.GetById(2).Parent);
-            Assert.IsNull(snapshot.Content.GetById(3).Parent);
+        documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N10");
 
-            Assert.AreEqual(1, snapshot.Content.GetById(4).Parent?.Id);
-            Assert.AreEqual(1, snapshot.Content.GetById(5).Parent?.Id);
-            Assert.AreEqual(1, snapshot.Content.GetById(6).Parent?.Id);
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N11", "N12");
 
-            Assert.AreEqual(2, snapshot.Content.GetById(7).Parent?.Id);
-            Assert.AreEqual(2, snapshot.Content.GetById(8).Parent?.Id);
-            Assert.AreEqual(2, snapshot.Content.GetById(9).Parent?.Id);
+        documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents);
+    }
 
-            Assert.AreEqual(3, snapshot.Content.GetById(10).Parent?.Id);
+    [Test]
+    public void ParentTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
 
-            Assert.AreEqual(4, snapshot.Content.GetById(11).Parent?.Id);
-            Assert.AreEqual(4, snapshot.Content.GetById(12).Parent?.Id);
-        }
+        var snapshot = GetPublishedSnapshot();
 
-        [Test]
-        public void MoveToRootTest()
-        {
-            InitializedCache(GetInvariantKits(), _contentTypes);
+        Assert.IsNull(snapshot.Content.GetById(1).Parent);
+        Assert.IsNull(snapshot.Content.GetById(2).Parent);
+        Assert.IsNull(snapshot.Content.GetById(3).Parent);
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+        Assert.AreEqual(1, snapshot.Content.GetById(4).Parent?.Id);
+        Assert.AreEqual(1, snapshot.Content.GetById(5).Parent?.Id);
+        Assert.AreEqual(1, snapshot.Content.GetById(6).Parent?.Id);
 
-            // do some changes
-            var kit = NuCacheContentService.ContentKits[10];
-            NuCacheContentService.ContentKits[10] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: "-1,10", sortOrder: 4, level: 1, parentContentId: -1, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+        Assert.AreEqual(2, snapshot.Content.GetById(7).Parent?.Id);
+        Assert.AreEqual(2, snapshot.Content.GetById(8).Parent?.Id);
+        Assert.AreEqual(2, snapshot.Content.GetById(9).Parent?.Id);
 
-            // notify
-            SnapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(10, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
+        Assert.AreEqual(3, snapshot.Content.GetById(10).Parent?.Id);
 
-            // changes that *I* make are immediately visible on the current snapshot
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1", "N2", "N3", "N10");
+        Assert.AreEqual(4, snapshot.Content.GetById(11).Parent?.Id);
+        Assert.AreEqual(4, snapshot.Content.GetById(12).Parent?.Id);
+    }
 
-            documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents);
+    [Test]
+    public void MoveToRootTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
 
-            Assert.IsNull(snapshot.Content.GetById(10).Parent);
-        }
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
 
-        [Test]
-        public void MoveFromRootTest()
-        {
-            InitializedCache(GetInvariantKits(), _contentTypes);
+        // do some changes
+        var kit = NuCacheContentService.ContentKits[10];
+        NuCacheContentService.ContentKits[10] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            "-1,10",
+            4,
+            1,
+            -1,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+        // notify
+        SnapshotService.Notify(
+            new[] { new ContentCacheRefresher.JsonPayload(10, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
 
-            // do some changes
-            var kit = NuCacheContentService.ContentKits[1];
-            NuCacheContentService.ContentKits[1] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: "-1,3,10,1", sortOrder: 1, level: 1, parentContentId: 10, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+        // changes that *I* make are immediately visible on the current snapshot
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1", "N2", "N3", "N10");
 
-            // notify
-            SnapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
+        documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents);
 
-            // changes that *I* make are immediately visible on the current snapshot
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N2", "N3");
+        Assert.IsNull(snapshot.Content.GetById(10).Parent);
+    }
 
-            documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N1");
+    [Test]
+    public void MoveFromRootTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
 
-            Assert.AreEqual(10, snapshot.Content.GetById(1).Parent?.Id);
-        }
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
 
-        [Test]
-        public void ReOrderTest()
-        {
-            InitializedCache(GetInvariantKits(), _contentTypes);
+        // do some changes
+        var kit = NuCacheContentService.ContentKits[1];
+        NuCacheContentService.ContentKits[1] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            "-1,3,10,1",
+            1,
+            1,
+            10,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+        // notify
+        SnapshotService.Notify(
+            new[] { new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
 
-            // do some changes
-            var kit = NuCacheContentService.ContentKits[7];
-            NuCacheContentService.ContentKits[7] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: kit.Node.Path, sortOrder: 1, level: kit.Node.Level, parentContentId: kit.Node.ParentContentId, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+        // changes that *I* make are immediately visible on the current snapshot
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N2", "N3");
 
-            kit = NuCacheContentService.ContentKits[8];
-            NuCacheContentService.ContentKits[8] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: kit.Node.Path, sortOrder: 3, level: kit.Node.Level, parentContentId: kit.Node.ParentContentId, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+        documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N1");
 
-            kit = NuCacheContentService.ContentKits[9];
-            NuCacheContentService.ContentKits[9] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: kit.Node.Path, sortOrder: 2, level: kit.Node.Level, parentContentId: kit.Node.ParentContentId, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+        Assert.AreEqual(10, snapshot.Content.GetById(1).Parent?.Id);
+    }
 
-            // notify
-            SnapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(kit.Node.ParentContentId, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
+    [Test]
+    public void ReOrderTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
 
-            // changes that *I* make are immediately visible on the current snapshot
-            var documents = snapshot.Content.GetById(kit.Node.ParentContentId).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N7", "N9", "N8");
-        }
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
 
-        [Test]
-        public void MoveTest()
-        {
-            InitializedCache(GetInvariantKits(), _contentTypes);
+        // do some changes
+        var kit = NuCacheContentService.ContentKits[7];
+        NuCacheContentService.ContentKits[7] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            kit.Node.Path,
+            1,
+            kit.Node.Level,
+            kit.Node.ParentContentId,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+        kit = NuCacheContentService.ContentKits[8];
+        NuCacheContentService.ContentKits[8] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            kit.Node.Path,
+            3,
+            kit.Node.Level,
+            kit.Node.ParentContentId,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
 
-            // do some changes
-            var kit = NuCacheContentService.ContentKits[4];
-            NuCacheContentService.ContentKits[4] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: kit.Node.Path, sortOrder: 2, level: kit.Node.Level, parentContentId: kit.Node.ParentContentId, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+        kit = NuCacheContentService.ContentKits[9];
+        NuCacheContentService.ContentKits[9] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            kit.Node.Path,
+            2,
+            kit.Node.Level,
+            kit.Node.ParentContentId,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
 
-            kit = NuCacheContentService.ContentKits[5];
-            NuCacheContentService.ContentKits[5] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: kit.Node.Path, sortOrder: 3, level: kit.Node.Level, parentContentId: kit.Node.ParentContentId, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
-
-            kit = NuCacheContentService.ContentKits[6];
-            NuCacheContentService.ContentKits[6] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: kit.Node.Path, sortOrder: 4, level: kit.Node.Level, parentContentId: kit.Node.ParentContentId, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
-            ;
-
-            kit = NuCacheContentService.ContentKits[7];
-            NuCacheContentService.ContentKits[7] = ContentNodeKitBuilder.CreateWithContent(
-                contentTypeId: _contentTypeInvariant.Id,
-                id: kit.Node.Id, path: "-1,1,7", sortOrder: 1, level: kit.Node.Level, parentContentId: 1, 
-                draftData: null,
-                publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
-
-            // notify
-            SnapshotService.Notify(new[]
+        // notify
+        SnapshotService.Notify(
+            new[]
             {
-                // removal must come first
-                new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.RefreshBranch),
-                new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch)
-            }, out _, out _);
+                new ContentCacheRefresher.JsonPayload(kit.Node.ParentContentId, Guid.Empty, TreeChangeTypes.RefreshBranch),
+            },
+            out _,
+            out _);
 
-            // changes that *I* make are immediately visible on the current snapshot
-            var documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N7", "N4", "N5", "N6");
+        // changes that *I* make are immediately visible on the current snapshot
+        var documents = snapshot.Content.GetById(kit.Node.ParentContentId).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N7", "N9", "N8");
+    }
 
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N9", "N8");
+    [Test]
+    public void MoveTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
 
-            Assert.AreEqual(1, snapshot.Content.GetById(7).Parent?.Id);
-        }
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
 
-        [Test]
-        public void Clear_Branch_Locked()
+        // do some changes
+        var kit = NuCacheContentService.ContentKits[4];
+        NuCacheContentService.ContentKits[4] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            kit.Node.Path,
+            2,
+            kit.Node.Level,
+            kit.Node.ParentContentId,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+
+        kit = NuCacheContentService.ContentKits[5];
+        NuCacheContentService.ContentKits[5] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            kit.Node.Path,
+            3,
+            kit.Node.Level,
+            kit.Node.ParentContentId,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+
+        kit = NuCacheContentService.ContentKits[6];
+        NuCacheContentService.ContentKits[6] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            kit.Node.Path,
+            4,
+            kit.Node.Level,
+            kit.Node.ParentContentId,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+
+        kit = NuCacheContentService.ContentKits[7];
+        NuCacheContentService.ContentKits[7] = ContentNodeKitBuilder.CreateWithContent(
+            _contentTypeInvariant.Id,
+            kit.Node.Id,
+            "-1,1,7",
+            1,
+            kit.Node.Level,
+            1,
+            draftData: null,
+            publishedData: ContentDataBuilder.CreateBasic(kit.PublishedData.Name));
+
+        // notify
+        SnapshotService.Notify(
+            new[]
         {
-            // This test replicates an issue we saw here https://github.com/umbraco/Umbraco-CMS/pull/7907#issuecomment-610259393
-            // The data was sent to me and this replicates it's structure
+            // removal must come first
+            new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.RefreshBranch),
+            new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch),
+        },
+            out _,
+            out _);
 
-            var paths = new Dictionary<int, string> { { -1, "-1" } };
+        // changes that *I* make are immediately visible on the current snapshot
+        var documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N7", "N4", "N5", "N6");
 
-            InitializedCache(new List<ContentNodeKit>
-            {
-                CreateInvariantKit(1, -1, 1, paths),    // first level
-                CreateInvariantKit(2, 1, 1, paths),     // second level
-                CreateInvariantKit(3, 2, 1, paths),     // third level
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N9", "N8");
 
-                CreateInvariantKit(4, 3, 1, paths),     // fourth level (we'll copy this one to the same level)
+        Assert.AreEqual(1, snapshot.Content.GetById(7).Parent?.Id);
+    }
 
-                CreateInvariantKit(5, 4, 1, paths),     // 6th level
+    [Test]
+    public void Clear_Branch_Locked()
+    {
+        // This test replicates an issue we saw here https://github.com/umbraco/Umbraco-CMS/pull/7907#issuecomment-610259393
+        // The data was sent to me and this replicates it's structure
+        var paths = new Dictionary<int, string> { { -1, "-1" } };
 
-                CreateInvariantKit(6, 5, 2, paths),     // 7th level
-                CreateInvariantKit(7, 5, 3, paths),
-                CreateInvariantKit(8, 5, 4, paths),
-                CreateInvariantKit(9, 5, 5, paths),
-                CreateInvariantKit(10, 5, 6, paths)
-            }, _contentTypes);
-
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
-
-            var snapshotService = (PublishedSnapshotService)SnapshotService;
-            var contentStore = snapshotService.GetContentStore();
-            //This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
-            contentStore.CreateSnapshot();
-
-            // notify - which ensures there are 2 generations in the cache meaning each LinkedNode has a Next value.
-            SnapshotService.Notify(new[]
-            {
-                new ContentCacheRefresher.JsonPayload(4, Guid.Empty, TreeChangeTypes.RefreshBranch)
-            }, out _, out _);
-
-            // refresh the branch again, this used to show the issue where a null ref exception would occur
-            // because in the ClearBranchLocked logic, when SetValueLocked was called within a recursive call
-            // to a child, we null out the .Value of the LinkedNode within the while loop because we didn't capture
-            // this value before recursing.
-            Assert.DoesNotThrow(() =>
-                SnapshotService.Notify(new[]
-                {
-                    new ContentCacheRefresher.JsonPayload(4, Guid.Empty, TreeChangeTypes.RefreshBranch)
-                }, out _, out _));
-        }
-
-        [Test]
-        public void NestedVariationChildrenTest()
+        InitializedCache(
+            new List<ContentNodeKit>
         {
-            InitializedCache(GetNestedVariantKits(), _contentTypes);
+            CreateInvariantKit(1, -1, 1, paths), // first level
+            CreateInvariantKit(2, 1, 1, paths), // second level
+            CreateInvariantKit(3, 2, 1, paths), // third level
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+            CreateInvariantKit(4, 3, 1, paths), // fourth level (we'll copy this one to the same level)
 
-            //TEST with en-us variation context
+            CreateInvariantKit(5, 4, 1, paths), // 6th level
 
-            VariationContextAccessor.VariationContext = new VariationContext("en-US");
+            CreateInvariantKit(6, 5, 2, paths), // 7th level
+            CreateInvariantKit(7, 5, 3, paths),
+            CreateInvariantKit(8, 5, 4, paths),
+            CreateInvariantKit(9, 5, 5, paths),
+            CreateInvariantKit(10, 5, 6, paths),
+        },
+            _contentTypes);
 
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1-en-US");
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4", "N7-en-US");
+        var snapshotService = (PublishedSnapshotService)SnapshotService;
+        var contentStore = snapshotService.GetContentStore();
 
-            //Get the invariant and list children, there's a variation context so it should return invariant AND en-us variants
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N10-en-US", "N11");
+        // This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
+        contentStore.CreateSnapshot();
 
-            //Get the variant and list children, there's a variation context so it should return invariant AND en-us variants
-            documents = snapshot.Content.GetById(7).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N12-en-US", "N13");
+        // notify - which ensures there are 2 generations in the cache meaning each LinkedNode has a Next value.
+        SnapshotService.Notify(
+            new[] { new ContentCacheRefresher.JsonPayload(4, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _);
 
-            //TEST with fr-fr variation context
+        // refresh the branch again, this used to show the issue where a null ref exception would occur
+        // because in the ClearBranchLocked logic, when SetValueLocked was called within a recursive call
+        // to a child, we null out the .Value of the LinkedNode within the while loop because we didn't capture
+        // this value before recursing.
+        Assert.DoesNotThrow(() =>
+            SnapshotService.Notify(
+                new[] { new ContentCacheRefresher.JsonPayload(4, Guid.Empty, TreeChangeTypes.RefreshBranch) }, out _, out _));
+    }
 
-            VariationContextAccessor.VariationContext = new VariationContext("fr-FR");
+    [Test]
+    public void NestedVariationChildrenTest()
+    {
+        InitializedCache(GetNestedVariantKits(), _contentTypes);
 
-            documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1-fr-FR");
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4", "N7-fr-FR");
+        // TEST with en-us variation context
+        VariationContextAccessor.VariationContext = new VariationContext("en-US");
 
-            //Get the invariant and list children, there's a variation context so it should return invariant AND en-us variants
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N10-fr-FR", "N11");
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1-en-US");
 
-            //Get the variant and list children, there's a variation context so it should return invariant AND en-us variants
-            documents = snapshot.Content.GetById(7).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N12-fr-FR", "N13");
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4", "N7-en-US");
 
-            //TEST specific cultures
+        // Get the invariant and list children, there's a variation context so it should return invariant AND en-us variants
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N10-en-US", "N11");
 
-            documents = snapshot.Content.GetAtRoot("fr-FR").ToArray();
-            AssertDocuments(documents, "N1-fr-FR");
+        // Get the variant and list children, there's a variation context so it should return invariant AND en-us variants
+        documents = snapshot.Content.GetById(7).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N12-en-US", "N13");
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, "fr-FR").ToArray();
-            AssertDocuments(documents, "N4", "N7-fr-FR"); //NOTE: Returns invariant, this is expected
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, "").ToArray();
-            AssertDocuments(documents, "N4"); //Only returns invariant since that is what was requested
+        // TEST with fr-fr variation context
+        VariationContextAccessor.VariationContext = new VariationContext("fr-FR");
 
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor, "fr-FR").ToArray();
-            AssertDocuments(documents, "N10-fr-FR", "N11"); //NOTE: Returns invariant, this is expected
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor, "").ToArray();
-            AssertDocuments(documents, "N11"); //Only returns invariant since that is what was requested
+        documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1-fr-FR");
 
-            documents = snapshot.Content.GetById(7).Children(VariationContextAccessor, "fr-FR").ToArray();
-            AssertDocuments(documents, "N12-fr-FR", "N13"); //NOTE: Returns invariant, this is expected
-            documents = snapshot.Content.GetById(7).Children(VariationContextAccessor, "").ToArray();
-            AssertDocuments(documents, "N13"); //Only returns invariant since that is what was requested
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4", "N7-fr-FR");
 
-            //TEST without variation context
-            // This will actually convert the culture to "" which will be invariant since that's all it will know how to do
-            // This will return a NULL name for culture specific entities because there is no variation context
+        // Get the invariant and list children, there's a variation context so it should return invariant AND en-us variants
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N10-fr-FR", "N11");
 
-            VariationContextAccessor.VariationContext = null;
+        // Get the variant and list children, there's a variation context so it should return invariant AND en-us variants
+        documents = snapshot.Content.GetById(7).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N12-fr-FR", "N13");
 
-            documents = snapshot.Content.GetAtRoot().ToArray();
-            //will return nothing because there's only variant at root
-            Assert.AreEqual(0, documents.Length);
-            //so we'll continue to getting the known variant, do not fully assert this because the Name will NULL
-            documents = snapshot.Content.GetAtRoot("fr-FR").ToArray();
-            Assert.AreEqual(1, documents.Length);
+        // TEST specific cultures
+        documents = snapshot.Content.GetAtRoot("fr-FR").ToArray();
+        AssertDocuments(documents, "N1-fr-FR");
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4");
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, "fr-FR").ToArray();
+        AssertDocuments(documents, "N4", "N7-fr-FR"); // NOTE: Returns invariant, this is expected
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, string.Empty).ToArray();
+        AssertDocuments(documents, "N4"); // Only returns invariant since that is what was requested
 
-            //Get the invariant and list children
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N11");
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor, "fr-FR").ToArray();
+        AssertDocuments(documents, "N10-fr-FR", "N11"); // NOTE: Returns invariant, this is expected
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor, string.Empty).ToArray();
+        AssertDocuments(documents, "N11"); // Only returns invariant since that is what was requested
 
-            //Get the variant and list children
-            documents = snapshot.Content.GetById(7).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N13");
-        }
+        documents = snapshot.Content.GetById(7).Children(VariationContextAccessor, "fr-FR").ToArray();
+        AssertDocuments(documents, "N12-fr-FR", "N13"); // NOTE: Returns invariant, this is expected
+        documents = snapshot.Content.GetById(7).Children(VariationContextAccessor, string.Empty).ToArray();
+        AssertDocuments(documents, "N13"); // Only returns invariant since that is what was requested
 
-        [Test]
-        public void VariantChildrenTest()
+        // TEST without variation context
+        // This will actually convert the culture to "" which will be invariant since that's all it will know how to do
+        // This will return a NULL name for culture specific entities because there is no variation context
+        VariationContextAccessor.VariationContext = null;
+
+        documents = snapshot.Content.GetAtRoot().ToArray();
+
+        // will return nothing because there's only variant at root
+        Assert.AreEqual(0, documents.Length);
+
+        // so we'll continue to getting the known variant, do not fully assert this because the Name will NULL
+        documents = snapshot.Content.GetAtRoot("fr-FR").ToArray();
+        Assert.AreEqual(1, documents.Length);
+
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4");
+
+        // Get the invariant and list children
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N11");
+
+        // Get the variant and list children
+        documents = snapshot.Content.GetById(7).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N13");
+    }
+
+    [Test]
+    public void VariantChildrenTest()
+    {
+        InitializedCache(GetVariantKits(), _contentTypes);
+
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
+
+        VariationContextAccessor.VariationContext = new VariationContext("en-US");
+
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1-en-US", "N2-en-US", "N3-en-US");
+
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4-en-US", "N5-en-US", "N6-en-US");
+
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N9-en-US", "N8-en-US", "N7-en-US");
+
+        documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N10-en-US");
+
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N11-en-US", "N12-en-US");
+
+        documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents);
+
+        VariationContextAccessor.VariationContext = new VariationContext("fr-FR");
+
+        documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1-fr-FR", "N3-fr-FR");
+
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4-fr-FR", "N6-fr-FR");
+
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N9-fr-FR", "N7-fr-FR");
+
+        documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N10-fr-FR");
+
+        documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N12-fr-FR");
+
+        documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents);
+
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, "*").ToArray();
+        AssertDocuments(documents, "N4-fr-FR", null, "N6-fr-FR");
+        AssertDocuments("en-US", documents, "N4-en-US", "N5-en-US", "N6-en-US");
+
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, "en-US").ToArray();
+        AssertDocuments(documents, "N4-fr-FR", null, "N6-fr-FR");
+        AssertDocuments("en-US", documents, "N4-en-US", "N5-en-US", "N6-en-US");
+
+        documents = snapshot.Content.GetById(1).ChildrenForAllCultures.ToArray();
+        AssertDocuments(documents, "N4-fr-FR", null, "N6-fr-FR");
+        AssertDocuments("en-US", documents, "N4-en-US", "N5-en-US", "N6-en-US");
+
+        documents = snapshot.Content.GetAtRoot("*").ToArray();
+        AssertDocuments(documents, "N1-fr-FR", null, "N3-fr-FR");
+
+        documents = snapshot.Content.GetById(1).DescendantsOrSelf(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N1-fr-FR", "N4-fr-FR", "N12-fr-FR", "N6-fr-FR");
+
+        documents = snapshot.Content.GetById(1).DescendantsOrSelf(VariationContextAccessor, "*").ToArray();
+        AssertDocuments(documents, "N1-fr-FR", "N4-fr-FR", null /*11*/, "N12-fr-FR", null /*5*/, "N6-fr-FR");
+    }
+
+    [Test]
+    public void RemoveTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
+
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
+
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1", "N2", "N3");
+
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4", "N5", "N6");
+
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N9", "N8", "N7");
+
+        // notify
+        SnapshotService.Notify(
+            new[]
         {
-            InitializedCache(GetVariantKits(), _contentTypes);
+            new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.Remove), // remove last
+            new ContentCacheRefresher.JsonPayload(5, Guid.Empty, TreeChangeTypes.Remove), // remove middle
+            new ContentCacheRefresher.JsonPayload(9, Guid.Empty, TreeChangeTypes.Remove), // remove first
+        },
+            out _,
+            out _);
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+        documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1", "N2");
 
-            VariationContextAccessor.VariationContext = new VariationContext("en-US");
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4", "N6");
 
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1-en-US", "N2-en-US", "N3-en-US");
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N8", "N7");
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4-en-US", "N5-en-US", "N6-en-US");
-
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N9-en-US", "N8-en-US", "N7-en-US");
-
-            documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N10-en-US");
-
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N11-en-US", "N12-en-US");
-
-            documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents);
-
-
-            VariationContextAccessor.VariationContext = new VariationContext("fr-FR");
-
-            documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1-fr-FR", "N3-fr-FR");
-
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4-fr-FR", "N6-fr-FR");
-
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N9-fr-FR", "N7-fr-FR");
-
-            documents = snapshot.Content.GetById(3).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N10-fr-FR");
-
-            documents = snapshot.Content.GetById(4).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N12-fr-FR");
-
-            documents = snapshot.Content.GetById(10).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents);
-
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, "*").ToArray();
-            AssertDocuments(documents, "N4-fr-FR", null, "N6-fr-FR");
-            AssertDocuments("en-US", documents, "N4-en-US", "N5-en-US", "N6-en-US");
-
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor, "en-US").ToArray();
-            AssertDocuments(documents, "N4-fr-FR", null, "N6-fr-FR");
-            AssertDocuments("en-US", documents, "N4-en-US", "N5-en-US", "N6-en-US");
-
-            documents = snapshot.Content.GetById(1).ChildrenForAllCultures.ToArray();
-            AssertDocuments(documents, "N4-fr-FR", null, "N6-fr-FR");
-            AssertDocuments("en-US", documents, "N4-en-US", "N5-en-US", "N6-en-US");
-
-
-            documents = snapshot.Content.GetAtRoot("*").ToArray();
-            AssertDocuments(documents, "N1-fr-FR", null, "N3-fr-FR");
-
-            documents = snapshot.Content.GetById(1).DescendantsOrSelf(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N1-fr-FR", "N4-fr-FR", "N12-fr-FR", "N6-fr-FR");
-
-            documents = snapshot.Content.GetById(1).DescendantsOrSelf(VariationContextAccessor, "*").ToArray();
-            AssertDocuments(documents, "N1-fr-FR", "N4-fr-FR", null /*11*/, "N12-fr-FR", null /*5*/, "N6-fr-FR");
-        }
-
-        [Test]
-        public void RemoveTest()
+        // notify
+        SnapshotService.Notify(
+            new[]
         {
-            InitializedCache(GetInvariantKits(), _contentTypes);
+            new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.Remove), // remove first
+            new ContentCacheRefresher.JsonPayload(8, Guid.Empty, TreeChangeTypes.Remove), // remove
+            new ContentCacheRefresher.JsonPayload(7, Guid.Empty, TreeChangeTypes.Remove), // remove
+        },
+            out _,
+            out _);
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+        documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N2");
 
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1", "N2", "N3");
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents);
+    }
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4", "N5", "N6");
+    [Test]
+    public void UpdateTest()
+    {
+        InitializedCache(GetInvariantKits(), _contentTypes);
 
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N9", "N8", "N7");
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
 
-            // notify
-            SnapshotService.Notify(new[]
-            {
-                new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.Remove), // remove last
-                new ContentCacheRefresher.JsonPayload(5, Guid.Empty, TreeChangeTypes.Remove), // remove middle
-                new ContentCacheRefresher.JsonPayload(9, Guid.Empty, TreeChangeTypes.Remove), // remove first
-            }, out _, out _);
+        var snapshotService = (PublishedSnapshotService)SnapshotService;
+        var contentStore = snapshotService.GetContentStore();
 
-            documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1", "N2");
+        var parentNodes = contentStore.Test.GetValues(1);
+        var parentNode = parentNodes[0];
+        AssertLinkedNode(parentNode.contentNode, -1, -1, 2, 4, 6);
+        Assert.AreEqual(1, parentNode.gen);
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4", "N6");
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1", "N2", "N3");
 
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N8", "N7");
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4", "N5", "N6");
 
-            // notify
-            SnapshotService.Notify(new[]
-            {
-                new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.Remove), // remove first
-                new ContentCacheRefresher.JsonPayload(8, Guid.Empty, TreeChangeTypes.Remove), // remove
-                new ContentCacheRefresher.JsonPayload(7, Guid.Empty, TreeChangeTypes.Remove), // remove
-            }, out _, out _);
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N9", "N8", "N7");
 
-            documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N2");
-
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents);
-        }
-
-        [Test]
-        public void UpdateTest()
-        {
-            InitializedCache(GetInvariantKits(), _contentTypes);
-
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
-
-            var snapshotService = (PublishedSnapshotService)SnapshotService;
-            var contentStore = snapshotService.GetContentStore();
-
-            var parentNodes = contentStore.Test.GetValues(1);
-            var parentNode = parentNodes[0];
-            AssertLinkedNode(parentNode.contentNode, -1, -1, 2, 4, 6);
-            Assert.AreEqual(1, parentNode.gen);
-
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1", "N2", "N3");
-
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4", "N5", "N6");
-
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N9", "N8", "N7");
-
-            // notify
-            SnapshotService.Notify(new[]
+        // notify
+        SnapshotService.Notify(
+            new[]
             {
                 new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshBranch),
                 new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.RefreshNode),
-            }, out _, out _);
+            },
+            out _,
+            out _);
 
-            parentNodes = contentStore.Test.GetValues(1);
-            Assert.AreEqual(2, parentNodes.Length);
-            parentNode = parentNodes[1]; // get the first gen
-            AssertLinkedNode(parentNode.contentNode, -1, -1, 2, 4, 6); // the structure should have remained the same
-            Assert.AreEqual(1, parentNode.gen);
-            parentNode = parentNodes[0]; // get the latest gen
-            AssertLinkedNode(parentNode.contentNode, -1, -1, 2, 4, 6); // the structure should have remained the same
-            Assert.AreEqual(2, parentNode.gen);
+        parentNodes = contentStore.Test.GetValues(1);
+        Assert.AreEqual(2, parentNodes.Length);
+        parentNode = parentNodes[1]; // get the first gen
+        AssertLinkedNode(parentNode.contentNode, -1, -1, 2, 4, 6); // the structure should have remained the same
+        Assert.AreEqual(1, parentNode.gen);
+        parentNode = parentNodes[0]; // get the latest gen
+        AssertLinkedNode(parentNode.contentNode, -1, -1, 2, 4, 6); // the structure should have remained the same
+        Assert.AreEqual(2, parentNode.gen);
 
-            documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1", "N2", "N3");
+        documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1", "N2", "N3");
 
-            documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N4", "N5", "N6");
+        documents = snapshot.Content.GetById(1).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N4", "N5", "N6");
 
-            documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
-            AssertDocuments(documents, "N9", "N8", "N7");
+        documents = snapshot.Content.GetById(2).Children(VariationContextAccessor).ToArray();
+        AssertDocuments(documents, "N9", "N8", "N7");
+    }
 
+    [Test]
+    public void AtRootTest()
+    {
+        InitializedCache(GetVariantWithDraftKits(), _contentTypes);
 
+        // get snapshot
+        var snapshot = GetPublishedSnapshot();
+
+        VariationContextAccessor.VariationContext = new VariationContext("en-US");
+
+        // N2 is draft only
+        var documents = snapshot.Content.GetAtRoot().ToArray();
+        AssertDocuments(documents, "N1-en-US", /*"N2-en-US",*/ "N3-en-US");
+
+        documents = snapshot.Content.GetAtRoot(true).ToArray();
+        AssertDocuments(documents, "N1-en-US", "N2-en-US", "N3-en-US");
+    }
+
+    [Test]
+    public void Set_All_Fast_Sorted_Ensure_LastChildContentId()
+    {
+        // see https://github.com/umbraco/Umbraco-CMS/issues/6353
+        IEnumerable<ContentNodeKit> GetKits()
+        {
+            var paths = new Dictionary<int, string> { { -1, "-1" } };
+
+            yield return CreateInvariantKit(1, -1, 1, paths);
+            yield return CreateInvariantKit(2, 1, 1, paths);
         }
 
-        [Test]
-        public void AtRootTest()
+        InitializedCache(GetKits(), _contentTypes);
+
+        var snapshotService = (PublishedSnapshotService)SnapshotService;
+        var contentStore = snapshotService.GetContentStore();
+
+        var parentNodes = contentStore.Test.GetValues(1);
+        var parentNode = parentNodes[0];
+        AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 2);
+
+        SnapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.Remove) }, out _, out _);
+
+        parentNodes = contentStore.Test.GetValues(1);
+        parentNode = parentNodes[0];
+
+        AssertLinkedNode(parentNode.contentNode, -1, -1, -1, -1, -1);
+    }
+
+    [Test]
+    public void Remove_Node_Ensures_Linked_List()
+    {
+        // NOTE: these tests are not using real scopes, in which case a Scope does not control
+        // how the snapshots generations work. We are forcing new snapshot generations manually.
+        IEnumerable<ContentNodeKit> GetKits()
         {
-            InitializedCache(GetVariantWithDraftKits(), _contentTypes);
+            var paths = new Dictionary<int, string> { { -1, "-1" } };
 
-            // get snapshot
-            var snapshot = GetPublishedSnapshot();
+            // root
+            yield return CreateInvariantKit(1, -1, 1, paths);
 
-            VariationContextAccessor.VariationContext = new VariationContext("en-US");
-
-            // N2 is draft only
-
-            var documents = snapshot.Content.GetAtRoot().ToArray();
-            AssertDocuments(documents, "N1-en-US", /*"N2-en-US",*/ "N3-en-US");
-
-            documents = snapshot.Content.GetAtRoot(true).ToArray();
-            AssertDocuments(documents, "N1-en-US", "N2-en-US", "N3-en-US");
+            // children
+            yield return CreateInvariantKit(2, 1, 1, paths);
+            yield return CreateInvariantKit(3, 1, 2, paths); // middle child
+            yield return CreateInvariantKit(4, 1, 3, paths);
         }
 
-        [Test]
-        public void Set_All_Fast_Sorted_Ensure_LastChildContentId()
+        InitializedCache(GetKits(), _contentTypes);
+
+        var snapshotService = (PublishedSnapshotService)SnapshotService;
+        var contentStore = snapshotService.GetContentStore();
+
+        Assert.AreEqual(1, contentStore.Test.LiveGen);
+        Assert.IsTrue(contentStore.Test.NextGen);
+
+        var parentNode = contentStore.Test.GetValues(1)[0];
+        Assert.AreEqual(1, parentNode.gen);
+        AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
+
+        var child1 = contentStore.Test.GetValues(2)[0];
+        Assert.AreEqual(1, child1.gen);
+        AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
+
+        var child2 = contentStore.Test.GetValues(3)[0];
+        Assert.AreEqual(1, child2.gen);
+        AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
+
+        var child3 = contentStore.Test.GetValues(4)[0];
+        Assert.AreEqual(1, child3.gen);
+        AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
+
+        // This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
+        contentStore.CreateSnapshot();
+
+        Assert.IsFalse(contentStore.Test.NextGen);
+
+        SnapshotService.Notify(
+            new[]
         {
-            //see https://github.com/umbraco/Umbraco-CMS/issues/6353
+            new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.Remove), // remove middle child
+        },
+            out _,
+            out _);
 
-            IEnumerable<ContentNodeKit> GetKits()
-            {
-                var paths = new Dictionary<int, string> { { -1, "-1" } };
+        Assert.AreEqual(2, contentStore.Test.LiveGen);
+        Assert.IsTrue(contentStore.Test.NextGen);
 
-                yield return CreateInvariantKit(1, -1, 1, paths);
-                yield return CreateInvariantKit(2, 1, 1, paths);
-            }
+        var parentNodes = contentStore.Test.GetValues(1);
+        Assert.AreEqual(1, parentNodes.Length); // the parent doesn't get changed, not new gen's are added
+        parentNode = parentNodes[0];
+        Assert.AreEqual(1, parentNode.gen); // the parent node's gen has not changed
+        AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
 
-            InitializedCache(GetKits(), _contentTypes);
+        child1 = contentStore.Test.GetValues(2)[0];
+        Assert.AreEqual(2, child1.gen); // there is now 2x gen's of this item
+        AssertLinkedNode(child1.contentNode, 1, -1, 4, -1, -1);
 
-            var snapshotService = (PublishedSnapshotService)SnapshotService;
-            var contentStore = snapshotService.GetContentStore();
+        child2 = contentStore.Test.GetValues(3)[0];
+        Assert.AreEqual(2, child2.gen); // there is now 2x gen's of this item
+        Assert.IsNull(child2.contentNode); // because it doesn't exist anymore
 
-            var parentNodes = contentStore.Test.GetValues(1);
-            var parentNode = parentNodes[0];
-            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 2);
+        child3 = contentStore.Test.GetValues(4)[0];
+        Assert.AreEqual(2, child3.gen); // there is now 2x gen's of this item
+        AssertLinkedNode(child3.contentNode, 1, 2, -1, -1, -1);
+    }
 
-            SnapshotService.Notify(new[]
-            {
-                new ContentCacheRefresher.JsonPayload(2, Guid.Empty, TreeChangeTypes.Remove)
-            }, out _, out _);
+    [Test]
+    public void Refresh_Node_Ensures_Linked_list()
+    {
+        // NOTE: these tests are not using real scopes, in which case a Scope does not control
+        // how the snapshots generations work. We are forcing new snapshot generations manually.
+        IEnumerable<ContentNodeKit> GetKits()
+        {
+            var paths = new Dictionary<int, string> { { -1, "-1" } };
 
-            parentNodes = contentStore.Test.GetValues(1);
-            parentNode = parentNodes[0];
+            // root
+            yield return CreateInvariantKit(100, -1, 1, paths);
 
-            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, -1, -1);
+            // site
+            yield return CreateInvariantKit(2, 100, 1, paths);
+            yield return CreateInvariantKit(1, 100, 2, paths); // middle child
+            yield return CreateInvariantKit(3, 100, 3, paths);
+
+            // children of 1
+            yield return CreateInvariantKit(20, 1, 1, paths);
+            yield return CreateInvariantKit(30, 1, 2, paths);
+            yield return CreateInvariantKit(40, 1, 3, paths);
         }
 
-        [Test]
-        public void Remove_Node_Ensures_Linked_List()
+        InitializedCache(GetKits(), _contentTypes);
+
+        var snapshotService = (PublishedSnapshotService)SnapshotService;
+        var contentStore = snapshotService.GetContentStore();
+
+        Assert.AreEqual(1, contentStore.Test.LiveGen);
+        Assert.IsTrue(contentStore.Test.NextGen);
+
+        var middleNode = contentStore.Test.GetValues(1)[0];
+        Assert.AreEqual(1, middleNode.gen);
+        AssertLinkedNode(middleNode.contentNode, 100, 2, 3, 20, 40);
+
+        // This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
+        contentStore.CreateSnapshot();
+
+        Assert.IsFalse(contentStore.Test.NextGen);
+
+        SnapshotService.Notify(
+            new[] { new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshNode) }, out _, out _);
+
+        Assert.AreEqual(2, contentStore.Test.LiveGen);
+        Assert.IsTrue(contentStore.Test.NextGen);
+
+        middleNode = contentStore.Test.GetValues(1)[0];
+        Assert.AreEqual(2, middleNode.gen);
+        AssertLinkedNode(middleNode.contentNode, 100, 2, 3, 20, 40);
+    }
+
+    /// <summary>
+    ///     This addresses issue: https://github.com/umbraco/Umbraco-CMS/issues/6698
+    /// </summary>
+    /// <remarks>
+    ///     This test mimics if someone were to:
+    ///     1) Unpublish a "middle child"
+    ///     2) Save and publish it
+    ///     3) Publish it with descendants
+    ///     4) Repeat steps 2 and 3
+    ///     Which has caused an exception. To replicate this test:
+    ///     1) RefreshBranch with kits for a branch where the top most node is unpublished
+    ///     2) RefreshBranch with kits for the branch where the top most node is published
+    ///     3) RefreshBranch with kits for the branch where the top most node is published
+    ///     4) RefreshNode
+    ///     5) RefreshBranch with kits for the branch where the top most node is published
+    /// </remarks>
+    [Test]
+    public void Refresh_Branch_With_Alternating_Publish_Flags()
+    {
+        // NOTE: these tests are not using real scopes, in which case a Scope does not control
+        // how the snapshots generations work. We are forcing new snapshot generations manually.
+        IEnumerable<ContentNodeKit> GetKits()
         {
-            // NOTE: these tests are not using real scopes, in which case a Scope does not control
-            // how the snapshots generations work. We are forcing new snapshot generations manually.
+            var paths = new Dictionary<int, string> { { -1, "-1" } };
 
-            IEnumerable<ContentNodeKit> GetKits()
-            {
-                var paths = new Dictionary<int, string> { { -1, "-1" } };
+            // root
+            yield return CreateInvariantKit(100, -1, 1, paths);
 
-                //root
-                yield return CreateInvariantKit(1, -1, 1, paths);
+            // site
+            yield return CreateInvariantKit(2, 100, 1, paths);
+            yield return CreateInvariantKit(1, 100, 2, paths); // middle child
+            yield return CreateInvariantKit(3, 100, 3, paths);
 
-                //children
-                yield return CreateInvariantKit(2, 1, 1, paths);
-                yield return CreateInvariantKit(3, 1, 2, paths); //middle child
-                yield return CreateInvariantKit(4, 1, 3, paths);
-            }
+            // children of 1
+            yield return CreateInvariantKit(20, 1, 1, paths);
+            yield return CreateInvariantKit(30, 1, 2, paths);
+            yield return CreateInvariantKit(40, 1, 3, paths);
+        }
 
-            InitializedCache(GetKits(), _contentTypes);
+        // init with all published
+        InitializedCache(GetKits(), _contentTypes);
 
-            var snapshotService = (PublishedSnapshotService)SnapshotService;
-            var contentStore = snapshotService.GetContentStore();
+        var snapshotService = (PublishedSnapshotService)SnapshotService;
+        var contentStore = snapshotService.GetContentStore();
 
-            Assert.AreEqual(1, contentStore.Test.LiveGen);
-            Assert.IsTrue(contentStore.Test.NextGen);
+        var rootKit = NuCacheContentService.ContentKits[1].Clone(PublishedModelFactory);
 
-            var parentNode = contentStore.Test.GetValues(1)[0];
-            Assert.AreEqual(1, parentNode.gen);
-            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
-
-            var child1 = contentStore.Test.GetValues(2)[0];
-            Assert.AreEqual(1, child1.gen);
-            AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
-
-            var child2 = contentStore.Test.GetValues(3)[0];
-            Assert.AreEqual(1, child2.gen);
-            AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
-
-            var child3 = contentStore.Test.GetValues(4)[0];
-            Assert.AreEqual(1, child3.gen);
-            AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
-
-            //This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
+        void ChangePublishFlagOfRoot(bool published, int assertGen, TreeChangeTypes changeType)
+        {
+            // This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
             contentStore.CreateSnapshot();
 
             Assert.IsFalse(contentStore.Test.NextGen);
 
-            SnapshotService.Notify(new[]
-            {
-                new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.Remove) //remove middle child
-            }, out _, out _);
+            // Change the root publish flag
+            var kit = rootKit.Clone(
+                PublishedModelFactory,
+                published ? null : rootKit.PublishedData,
+                published ? rootKit.PublishedData : null);
+            NuCacheContentService.ContentKits[1] = kit;
 
-            Assert.AreEqual(2, contentStore.Test.LiveGen);
+            SnapshotService.Notify(new[] { new ContentCacheRefresher.JsonPayload(1, Guid.Empty, changeType) }, out _, out _);
+
+            Assert.AreEqual(assertGen, contentStore.Test.LiveGen);
             Assert.IsTrue(contentStore.Test.NextGen);
 
-            var parentNodes = contentStore.Test.GetValues(1);
-            Assert.AreEqual(1, parentNodes.Length); // the parent doesn't get changed, not new gen's are added
-            parentNode = parentNodes[0];
-            Assert.AreEqual(1, parentNode.gen); // the parent node's gen has not changed
-            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
+            // get the latest gen for content Id 1
+            var (gen, contentNode) = contentStore.Test.GetValues(1)[0];
+            Assert.AreEqual(assertGen, gen);
 
-            child1 = contentStore.Test.GetValues(2)[0];
-            Assert.AreEqual(2, child1.gen); // there is now 2x gen's of this item
-            AssertLinkedNode(child1.contentNode, 1, -1, 4, -1, -1);
-
-            child2 = contentStore.Test.GetValues(3)[0];
-            Assert.AreEqual(2, child2.gen); // there is now 2x gen's of this item
-            Assert.IsNull(child2.contentNode);  // because it doesn't exist anymore
-
-            child3 = contentStore.Test.GetValues(4)[0];
-            Assert.AreEqual(2, child3.gen); // there is now 2x gen's of this item
-            AssertLinkedNode(child3.contentNode, 1, 2, -1, -1, -1);
+            // even when unpublishing/re-publishing/etc... the linked list is always maintained
+            AssertLinkedNode(contentNode, 100, 2, 3, 20, 40);
         }
 
-        [Test]
-        public void Refresh_Node_Ensures_Linked_list()
+        // unpublish the root
+        ChangePublishFlagOfRoot(false, 2, TreeChangeTypes.RefreshBranch);
+
+        // publish the root (since it's not published, it will cause a RefreshBranch)
+        ChangePublishFlagOfRoot(true, 3, TreeChangeTypes.RefreshBranch);
+
+        // publish root + descendants
+        ChangePublishFlagOfRoot(true, 4, TreeChangeTypes.RefreshBranch);
+
+        // save/publish the root (since it's already published, it will just cause a RefreshNode
+        ChangePublishFlagOfRoot(true, 5, TreeChangeTypes.RefreshNode);
+
+        // publish root + descendants
+        ChangePublishFlagOfRoot(true, 6, TreeChangeTypes.RefreshBranch);
+    }
+
+    [Test]
+    public void Refresh_Branch_Ensures_Linked_List()
+    {
+        // NOTE: these tests are not using real scopes, in which case a Scope does not control
+        // how the snapshots generations work. We are forcing new snapshot generations manually.
+        IEnumerable<ContentNodeKit> GetKits()
         {
-            // NOTE: these tests are not using real scopes, in which case a Scope does not control
-            // how the snapshots generations work. We are forcing new snapshot generations manually.
+            var paths = new Dictionary<int, string> { { -1, "-1" } };
 
-            IEnumerable<ContentNodeKit> GetKits()
-            {
-                var paths = new Dictionary<int, string> { { -1, "-1" } };
+            // root
+            yield return CreateInvariantKit(1, -1, 1, paths);
 
-                //root
-                yield return CreateInvariantKit(100, -1, 1, paths);
-
-                //site
-                yield return CreateInvariantKit(2, 100, 1, paths);
-                yield return CreateInvariantKit(1, 100, 2, paths); //middle child
-                yield return CreateInvariantKit(3, 100, 3, paths);
-
-                //children of 1
-                yield return CreateInvariantKit(20, 1, 1, paths);
-                yield return CreateInvariantKit(30, 1, 2, paths);
-                yield return CreateInvariantKit(40, 1, 3, paths);
-            }
-
-            InitializedCache(GetKits(), _contentTypes);
-
-            var snapshotService = (PublishedSnapshotService)SnapshotService;
-            var contentStore = snapshotService.GetContentStore();
-
-            Assert.AreEqual(1, contentStore.Test.LiveGen);
-            Assert.IsTrue(contentStore.Test.NextGen);
-
-            var middleNode = contentStore.Test.GetValues(1)[0];
-            Assert.AreEqual(1, middleNode.gen);
-            AssertLinkedNode(middleNode.contentNode, 100, 2, 3, 20, 40);
-
-            //This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
-            contentStore.CreateSnapshot();
-
-            Assert.IsFalse(contentStore.Test.NextGen);
-
-            SnapshotService.Notify(new[]
-            {
-                new ContentCacheRefresher.JsonPayload(1, Guid.Empty, TreeChangeTypes.RefreshNode)
-            }, out _, out _);
-
-            Assert.AreEqual(2, contentStore.Test.LiveGen);
-            Assert.IsTrue(contentStore.Test.NextGen);
-
-            middleNode = contentStore.Test.GetValues(1)[0];
-            Assert.AreEqual(2, middleNode.gen);
-            AssertLinkedNode(middleNode.contentNode, 100, 2, 3, 20, 40);
+            // children
+            yield return CreateInvariantKit(2, 1, 1, paths);
+            yield return CreateInvariantKit(3, 1, 2, paths); // middle child
+            yield return CreateInvariantKit(4, 1, 3, paths);
         }
 
-        /// <summary>
-        /// This addresses issue: https://github.com/umbraco/Umbraco-CMS/issues/6698
-        /// </summary>
-        /// <remarks>
-        /// This test mimics if someone were to:
-        ///  1) Unpublish a "middle child"
-        ///  2) Save and publish it
-        ///  3) Publish it with descendants
-        ///  4) Repeat steps 2 and 3
-        ///
-        /// Which has caused an exception. To replicate this test:
-        ///  1) RefreshBranch with kits for a branch where the top most node is unpublished
-        ///  2) RefreshBranch with kits for the branch where the top most node is published
-        ///  3) RefreshBranch with kits for the branch where the top most node is published
-        ///  4) RefreshNode
-        ///  5) RefreshBranch with kits for the branch where the top most node is published
-        /// </remarks>
-        [Test]
-        public void Refresh_Branch_With_Alternating_Publish_Flags()
+        InitializedCache(GetKits(), _contentTypes);
+
+        var snapshotService = (PublishedSnapshotService)SnapshotService;
+        var contentStore = snapshotService.GetContentStore();
+
+        Assert.AreEqual(1, contentStore.Test.LiveGen);
+        Assert.IsTrue(contentStore.Test.NextGen);
+
+        var parentNode = contentStore.Test.GetValues(1)[0];
+        Assert.AreEqual(1, parentNode.gen);
+        AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
+
+        var child1 = contentStore.Test.GetValues(2)[0];
+        Assert.AreEqual(1, child1.gen);
+        AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
+
+        var child2 = contentStore.Test.GetValues(3)[0];
+        Assert.AreEqual(1, child2.gen);
+        AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
+
+        var child3 = contentStore.Test.GetValues(4)[0];
+        Assert.AreEqual(1, child3.gen);
+        AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
+
+        // This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
+        contentStore.CreateSnapshot();
+
+        Assert.IsFalse(contentStore.Test.NextGen);
+
+        SnapshotService.Notify(
+            new[]
         {
-            // NOTE: these tests are not using real scopes, in which case a Scope does not control
-            // how the snapshots generations work. We are forcing new snapshot generations manually.
+            new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.RefreshBranch), // remove middle child
+        },
+            out _,
+            out _);
 
-            IEnumerable<ContentNodeKit> GetKits()
-            {
-                var paths = new Dictionary<int, string> { { -1, "-1" } };
+        Assert.AreEqual(2, contentStore.Test.LiveGen);
+        Assert.IsTrue(contentStore.Test.NextGen);
 
-                //root
-                yield return CreateInvariantKit(100, -1, 1, paths);
+        var parentNodes = contentStore.Test.GetValues(1);
+        Assert.AreEqual(1, parentNodes.Length); // the parent doesn't get changed, not new gen's are added
+        parentNode = parentNodes[0];
+        Assert.AreEqual(1, parentNode.gen); // the parent node's gen has not changed
+        AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
 
-                //site
-                yield return CreateInvariantKit(2, 100, 1, paths);
-                yield return CreateInvariantKit(1, 100, 2, paths); //middle child
-                yield return CreateInvariantKit(3, 100, 3, paths);
+        child1 = contentStore.Test.GetValues(2)[0];
+        Assert.AreEqual(2, child1.gen); // there is now 2x gen's of this item
+        AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
 
-                //children of 1
-                yield return CreateInvariantKit(20, 1, 1, paths);
-                yield return CreateInvariantKit(30, 1, 2, paths);
-                yield return CreateInvariantKit(40, 1, 3, paths);
-            }
+        child2 = contentStore.Test.GetValues(3)[0];
+        Assert.AreEqual(2, child2.gen); // there is now 2x gen's of this item
+        AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
 
-            //init with all published
-            InitializedCache(GetKits(), _contentTypes);
+        child3 = contentStore.Test.GetValues(4)[0];
+        Assert.AreEqual(2, child3.gen); // there is now 2x gen's of this item
+        AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
+    }
 
-            var snapshotService = (PublishedSnapshotService)SnapshotService;
-            var contentStore = snapshotService.GetContentStore();
+    [Test]
+    public void MultipleCacheIteration()
+    {
+        // see https://github.com/umbraco/Umbraco-CMS/issues/7798
+        InitializedCache(GetInvariantKits(), _contentTypes);
+        var snapshot = GetPublishedSnapshot();
 
-            var rootKit = NuCacheContentService.ContentKits[1].Clone(PublishedModelFactory);
+        var items = snapshot.Content.GetByXPath("/root/itype").ToArray();
+        Assert.AreEqual(items.Count(), items.Count());
+    }
 
-            void ChangePublishFlagOfRoot(bool published, int assertGen, TreeChangeTypes changeType)
-            {
-                //This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
-                contentStore.CreateSnapshot();
+    private void AssertLinkedNode(ContentNode node, int parent, int prevSibling, int nextSibling, int firstChild, int lastChild)
+    {
+        Assert.AreEqual(parent, node.ParentContentId);
+        Assert.AreEqual(prevSibling, node.PreviousSiblingContentId);
+        Assert.AreEqual(nextSibling, node.NextSiblingContentId);
+        Assert.AreEqual(firstChild, node.FirstChildContentId);
+        Assert.AreEqual(lastChild, node.LastChildContentId);
+    }
 
-                Assert.IsFalse(contentStore.Test.NextGen);
-
-                //Change the root publish flag
-                var kit = rootKit.Clone(
-                    PublishedModelFactory,
-                    published ? null : rootKit.PublishedData,
-                    published ? rootKit.PublishedData : null);
-                NuCacheContentService.ContentKits[1] = kit;
-
-                SnapshotService.Notify(new[]
-                {
-                    new ContentCacheRefresher.JsonPayload(1, Guid.Empty, changeType)
-                }, out _, out _);
-
-                Assert.AreEqual(assertGen, contentStore.Test.LiveGen);
-                Assert.IsTrue(contentStore.Test.NextGen);
-
-                //get the latest gen for content Id 1
-                var (gen, contentNode) = contentStore.Test.GetValues(1)[0];
-                Assert.AreEqual(assertGen, gen);
-                //even when unpublishing/re-publishing/etc... the linked list is always maintained
-                AssertLinkedNode(contentNode, 100, 2, 3, 20, 40);
-            }
-
-            //unpublish the root
-            ChangePublishFlagOfRoot(false, 2, TreeChangeTypes.RefreshBranch);
-
-            //publish the root (since it's not published, it will cause a RefreshBranch)
-            ChangePublishFlagOfRoot(true, 3, TreeChangeTypes.RefreshBranch);
-
-            //publish root + descendants
-            ChangePublishFlagOfRoot(true, 4, TreeChangeTypes.RefreshBranch);
-
-            //save/publish the root (since it's already published, it will just cause a RefreshNode
-            ChangePublishFlagOfRoot(true, 5, TreeChangeTypes.RefreshNode);
-
-            //publish root + descendants
-            ChangePublishFlagOfRoot(true, 6, TreeChangeTypes.RefreshBranch);
+    private void AssertDocuments(IPublishedContent[] documents, params string[] names)
+    {
+        Assert.AreEqual(names.Length, documents.Length);
+        for (var i = 0; i < names.Length; i++)
+        {
+            Assert.AreEqual(names[i], documents[i].Name);
         }
+    }
 
-        [Test]
-        public void Refresh_Branch_Ensures_Linked_List()
+    private void AssertDocuments(string culture, IPublishedContent[] documents, params string[] names)
+    {
+        Assert.AreEqual(names.Length, documents.Length);
+        for (var i = 0; i < names.Length; i++)
         {
-            // NOTE: these tests are not using real scopes, in which case a Scope does not control
-            // how the snapshots generations work. We are forcing new snapshot generations manually.
-
-            IEnumerable<ContentNodeKit> GetKits()
-            {
-                var paths = new Dictionary<int, string> { { -1, "-1" } };
-
-                //root
-                yield return CreateInvariantKit(1, -1, 1, paths);
-
-                //children
-                yield return CreateInvariantKit(2, 1, 1, paths);
-                yield return CreateInvariantKit(3, 1, 2, paths); //middle child
-                yield return CreateInvariantKit(4, 1, 3, paths);
-            }
-
-            InitializedCache(GetKits(), _contentTypes);
-
-            var snapshotService = (PublishedSnapshotService)SnapshotService;
-            var contentStore = snapshotService.GetContentStore();
-
-            Assert.AreEqual(1, contentStore.Test.LiveGen);
-            Assert.IsTrue(contentStore.Test.NextGen);
-
-            var parentNode = contentStore.Test.GetValues(1)[0];
-            Assert.AreEqual(1, parentNode.gen);
-            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
-
-            var child1 = contentStore.Test.GetValues(2)[0];
-            Assert.AreEqual(1, child1.gen);
-            AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
-
-            var child2 = contentStore.Test.GetValues(3)[0];
-            Assert.AreEqual(1, child2.gen);
-            AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
-
-            var child3 = contentStore.Test.GetValues(4)[0];
-            Assert.AreEqual(1, child3.gen);
-            AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
-
-            //This will set a flag to force creating a new Gen next time the store is locked (i.e. In Notify)
-            contentStore.CreateSnapshot();
-
-            Assert.IsFalse(contentStore.Test.NextGen);
-
-            SnapshotService.Notify(new[]
-            {
-                new ContentCacheRefresher.JsonPayload(3, Guid.Empty, TreeChangeTypes.RefreshBranch) //remove middle child
-            }, out _, out _);
-
-            Assert.AreEqual(2, contentStore.Test.LiveGen);
-            Assert.IsTrue(contentStore.Test.NextGen);
-
-            var parentNodes = contentStore.Test.GetValues(1);
-            Assert.AreEqual(1, parentNodes.Length); // the parent doesn't get changed, not new gen's are added
-            parentNode = parentNodes[0];
-            Assert.AreEqual(1, parentNode.gen); // the parent node's gen has not changed
-            AssertLinkedNode(parentNode.contentNode, -1, -1, -1, 2, 4);
-
-            child1 = contentStore.Test.GetValues(2)[0];
-            Assert.AreEqual(2, child1.gen); // there is now 2x gen's of this item
-            AssertLinkedNode(child1.contentNode, 1, -1, 3, -1, -1);
-
-            child2 = contentStore.Test.GetValues(3)[0];
-            Assert.AreEqual(2, child2.gen); // there is now 2x gen's of this item
-            AssertLinkedNode(child2.contentNode, 1, 2, 4, -1, -1);
-
-            child3 = contentStore.Test.GetValues(4)[0];
-            Assert.AreEqual(2, child3.gen); // there is now 2x gen's of this item
-            AssertLinkedNode(child3.contentNode, 1, 3, -1, -1, -1);
-        }
-
-        [Test]
-        public void MultipleCacheIteration()
-        {
-            //see https://github.com/umbraco/Umbraco-CMS/issues/7798
-            InitializedCache(GetInvariantKits(), _contentTypes);
-            var snapshot = GetPublishedSnapshot();
-
-            var items = snapshot.Content.GetByXPath("/root/itype");
-            Assert.AreEqual(items.Count(), items.Count());
-        }
-
-        private void AssertLinkedNode(ContentNode node, int parent, int prevSibling, int nextSibling, int firstChild, int lastChild)
-        {
-            Assert.AreEqual(parent, node.ParentContentId);
-            Assert.AreEqual(prevSibling, node.PreviousSiblingContentId);
-            Assert.AreEqual(nextSibling, node.NextSiblingContentId);
-            Assert.AreEqual(firstChild, node.FirstChildContentId);
-            Assert.AreEqual(lastChild, node.LastChildContentId);
-        }
-
-        private void AssertDocuments(IPublishedContent[] documents, params string[] names)
-        {
-            Assert.AreEqual(names.Length, documents.Length);
-            for (var i = 0; i < names.Length; i++)
-                Assert.AreEqual(names[i], documents[i].Name);
-        }
-
-        private void AssertDocuments(string culture, IPublishedContent[] documents, params string[] names)
-        {
-            Assert.AreEqual(names.Length, documents.Length);
-            for (var i = 0; i < names.Length; i++)
-                Assert.AreEqual(names[i], documents[i].Name(VariationContextAccessor, culture));
+            Assert.AreEqual(names[i], documents[i].Name(VariationContextAccessor, culture));
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceContentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceContentTests.cs
index 00c3e965c6..4a017911bc 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceContentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/PublishedSnapshotServiceContentTests.cs
@@ -5,7 +5,6 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services.Changes;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Infrastructure.PublishedCache.DataSource;
@@ -14,185 +13,195 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class PublishedSnapshotServiceContentTests : PublishedSnapshotServiceTestBase
 {
-
-
-    [TestFixture]
-    public class PublishedSnapshotServiceContentTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        private ContentType _contentType;
-        private PropertyType _propertyType;
+        base.Setup();
 
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
-
-            _propertyType = new PropertyType(TestHelper.ShortStringHelper, "Umbraco.Void.Editor", ValueStorageType.Nvarchar) { Alias = "prop", DataTypeId = 3, Variations = ContentVariation.Culture };
-            _contentType = new ContentType(TestHelper.ShortStringHelper, -1) { Id = 2, Alias = "alias-ct", Variations = ContentVariation.Culture };
-            _contentType.AddPropertyType(_propertyType);
-
-            var contentTypes = new[]
+        _propertyType =
+            new PropertyType(TestHelper.ShortStringHelper, "Umbraco.Void.Editor", ValueStorageType.Nvarchar)
             {
-                _contentType
+                Alias = "prop",
+                DataTypeId = 3,
+                Variations = ContentVariation.Culture,
             };
+        _contentType =
+            new ContentType(TestHelper.ShortStringHelper, -1)
+            {
+                Id = 2,
+                Alias = "alias-ct",
+                Variations = ContentVariation.Culture,
+            };
+        _contentType.AddPropertyType(_propertyType);
 
-            InitializedCache(new[] { CreateKit() }, contentTypes);
-        }
+        var contentTypes = new[] { _contentType };
 
-        private ContentNodeKit CreateKit()
+        InitializedCache(new[] { CreateKit() }, contentTypes);
+    }
+
+    private ContentType _contentType;
+    private PropertyType _propertyType;
+
+    private ContentNodeKit CreateKit()
+    {
+        var draftData = new ContentDataBuilder()
+            .WithName("It Works2!")
+            .WithPublished(false)
+            .WithProperties(new Dictionary<string, PropertyData[]>
+            {
+                ["prop"] = new[]
+                {
+                    new PropertyData { Culture = string.Empty, Segment = string.Empty, Value = "val2" },
+                    new PropertyData { Culture = "fr-FR", Segment = string.Empty, Value = "val-fr2" },
+                    new PropertyData { Culture = "en-UK", Segment = string.Empty, Value = "val-uk2" },
+                    new PropertyData { Culture = "dk-DA", Segment = string.Empty, Value = "val-da2" },
+                    new PropertyData { Culture = "de-DE", Segment = string.Empty, Value = "val-de2" },
+                },
+            })
+            .WithCultureInfos(new Dictionary<string, CultureVariation>
+            {
+                // draft data = everything, and IsDraft indicates what's edited
+                ["fr-FR"] = new() { Name = "name-fr2", IsDraft = true, Date = new DateTime(2018, 01, 03, 01, 00, 00) },
+                ["en-UK"] = new() { Name = "name-uk2", IsDraft = true, Date = new DateTime(2018, 01, 04, 01, 00, 00) },
+                ["dk-DA"] = new() { Name = "name-da2", IsDraft = true, Date = new DateTime(2018, 01, 05, 01, 00, 00) },
+                ["de-DE"] = new() { Name = "name-de1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) },
+            })
+            .Build();
+
+        var publishedData = new ContentDataBuilder()
+            .WithName("It Works1!")
+            .WithPublished(true)
+            .WithProperties(new Dictionary<string, PropertyData[]>
+            {
+                ["prop"] = new[]
+                {
+                    new PropertyData { Culture = string.Empty, Segment = string.Empty, Value = "val1" },
+                    new PropertyData { Culture = "fr-FR", Segment = string.Empty, Value = "val-fr1" },
+                    new PropertyData { Culture = "en-UK", Segment = string.Empty, Value = "val-uk1" },
+                },
+            })
+            .WithCultureInfos(new Dictionary<string, CultureVariation>
+            {
+                // published data = only what's actually published, and IsDraft has to be false
+                ["fr-FR"] = new() { Name = "name-fr1", IsDraft = false, Date = new DateTime(2018, 01, 01, 01, 00, 00) },
+                ["en-UK"] = new() { Name = "name-uk1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) },
+                ["de-DE"] = new() { Name = "name-de1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) },
+            })
+            .Build();
+
+        var kit = ContentNodeKitBuilder.CreateWithContent(
+            2,
+            1,
+            "-1,1",
+            0,
+            draftData: draftData,
+            publishedData: publishedData);
+
+        return kit;
+    }
+
+    [Test]
+    public void Verifies_Variant_Data()
+    {
+        // this test implements a full standalone NuCache (based upon a test IDataSource, does not
+        // use any local db files, does not rely on any database) - and tests variations
+
+        // get a snapshot, get a published content
+        var snapshot = GetPublishedSnapshot();
+        var publishedContent = snapshot.Content.GetById(1);
+
+        Assert.IsNotNull(publishedContent);
+        Assert.AreEqual("val1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
+        Assert.AreEqual("val-fr1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "fr-FR"));
+        Assert.AreEqual("val-uk1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "en-UK"));
+
+        Assert.IsNull(publishedContent.Name(VariationContextAccessor)); // no invariant name for varying content
+        Assert.AreEqual("name-fr1", publishedContent.Name(VariationContextAccessor, "fr-FR"));
+        Assert.AreEqual("name-uk1", publishedContent.Name(VariationContextAccessor, "en-UK"));
+
+        var draftContent = snapshot.Content.GetById(true, 1);
+        Assert.AreEqual("val2", draftContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
+        Assert.AreEqual("val-fr2", draftContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "fr-FR"));
+        Assert.AreEqual("val-uk2", draftContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "en-UK"));
+
+        Assert.IsNull(draftContent.Name(VariationContextAccessor)); // no invariant name for varying content
+        Assert.AreEqual("name-fr2", draftContent.Name(VariationContextAccessor, "fr-FR"));
+        Assert.AreEqual("name-uk2", draftContent.Name(VariationContextAccessor, "en-UK"));
+
+        // now french is default
+        VariationContextAccessor.VariationContext = new VariationContext("fr-FR");
+        Assert.AreEqual("val-fr1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
+        Assert.AreEqual("name-fr1", publishedContent.Name(VariationContextAccessor));
+        Assert.AreEqual(new DateTime(2018, 01, 01, 01, 00, 00), publishedContent.CultureDate(VariationContextAccessor));
+
+        // now uk is default
+        VariationContextAccessor.VariationContext = new VariationContext("en-UK");
+        Assert.AreEqual("val-uk1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
+        Assert.AreEqual("name-uk1", publishedContent.Name(VariationContextAccessor));
+        Assert.AreEqual(new DateTime(2018, 01, 02, 01, 00, 00), publishedContent.CultureDate(VariationContextAccessor));
+
+        // invariant needs to be retrieved explicitly, when it's not default
+        Assert.AreEqual("val1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", string.Empty));
+
+        // but,
+        // if the content type / property type does not vary, then it's all invariant again
+        // modify the content type and property type, notify the snapshot service
+        _contentType.Variations = ContentVariation.Nothing;
+        _propertyType.Variations = ContentVariation.Nothing;
+        SnapshotService.Notify(new[]
         {
-            var draftData = new ContentDataBuilder()
-                .WithName("It Works2!")
-                .WithPublished(false)
-                .WithProperties(new Dictionary<string, PropertyData[]>
-                {
-                    ["prop"] = new[]
-                    {
-                        new PropertyData { Culture = "", Segment = "", Value = "val2" },
-                        new PropertyData { Culture = "fr-FR", Segment = "", Value = "val-fr2" },
-                        new PropertyData { Culture = "en-UK", Segment = "", Value = "val-uk2" },
-                        new PropertyData { Culture = "dk-DA", Segment = "", Value = "val-da2" },
-                        new PropertyData { Culture = "de-DE", Segment = "", Value = "val-de2" }
-                    }
-                })
-                .WithCultureInfos(new Dictionary<string, CultureVariation>
-                {
-                    // draft data = everything, and IsDraft indicates what's edited
-                    ["fr-FR"] = new CultureVariation { Name = "name-fr2", IsDraft = true, Date = new DateTime(2018, 01, 03, 01, 00, 00) },
-                    ["en-UK"] = new CultureVariation { Name = "name-uk2", IsDraft = true, Date = new DateTime(2018, 01, 04, 01, 00, 00) },
-                    ["dk-DA"] = new CultureVariation { Name = "name-da2", IsDraft = true, Date = new DateTime(2018, 01, 05, 01, 00, 00) },
-                    ["de-DE"] = new CultureVariation { Name = "name-de1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) }
-                })
-                .Build();
+            new ContentTypeCacheRefresher.JsonPayload("IContentType", publishedContent.ContentType.Id, ContentTypeChangeTypes.RefreshMain),
+        });
 
-            var publishedData = new ContentDataBuilder()
-                .WithName("It Works1!")
-                .WithPublished(true)
-                .WithProperties(new Dictionary<string, PropertyData[]>
-                {
-                    ["prop"] = new[]
-                    {
-                        new PropertyData { Culture = "", Segment = "", Value = "val1" },
-                        new PropertyData { Culture = "fr-FR", Segment = "", Value = "val-fr1" },
-                        new PropertyData { Culture = "en-UK", Segment = "", Value = "val-uk1" }
-                    }
-                })
-                .WithCultureInfos(new Dictionary<string, CultureVariation>
-                {
-                    // published data = only what's actually published, and IsDraft has to be false
-                    ["fr-FR"] = new CultureVariation { Name = "name-fr1", IsDraft = false, Date = new DateTime(2018, 01, 01, 01, 00, 00) },
-                    ["en-UK"] = new CultureVariation { Name = "name-uk1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) },
-                    ["de-DE"] = new CultureVariation { Name = "name-de1", IsDraft = false, Date = new DateTime(2018, 01, 02, 01, 00, 00) }
-                })
-                .Build();
+        // get a new snapshot (nothing changed in the old one), get the published content again
+        var anotherSnapshot = SnapshotService.CreatePublishedSnapshot(null);
+        var againContent = anotherSnapshot.Content.GetById(1);
 
-            var kit = ContentNodeKitBuilder.CreateWithContent(
-                2,
-                1, "-1,1", 0,
-                draftData: draftData,
-                publishedData: publishedData);
+        Assert.AreEqual(ContentVariation.Nothing, againContent.ContentType.Variations);
+        Assert.AreEqual(ContentVariation.Nothing, againContent.ContentType.GetPropertyType("prop").Variations);
 
-            return kit;
-        }
+        // now, "no culture" means "invariant"
+        Assert.AreEqual("It Works1!", againContent.Name(VariationContextAccessor));
+        Assert.AreEqual("val1", againContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
+    }
 
-        [Test]
-        public void Verifies_Variant_Data()
-        {
-            // this test implements a full standalone NuCache (based upon a test IDataSource, does not
-            // use any local db files, does not rely on any database) - and tests variations
+    [Test]
+    public void Verifies_Published_And_Draft_Content()
+    {
+        // get the published published content
+        var snapshot = GetPublishedSnapshot();
+        var c1 = snapshot.Content.GetById(1);
 
-            // get a snapshot, get a published content
-            IPublishedSnapshot snapshot = GetPublishedSnapshot();
-            IPublishedContent publishedContent = snapshot.Content.GetById(1);
+        // published content = nothing is draft here
+        Assert.IsFalse(c1.IsDraft("fr-FR"));
+        Assert.IsFalse(c1.IsDraft("en-UK"));
+        Assert.IsFalse(c1.IsDraft("dk-DA"));
+        Assert.IsFalse(c1.IsDraft("de-DE"));
 
-            Assert.IsNotNull(publishedContent);
-            Assert.AreEqual("val1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
-            Assert.AreEqual("val-fr1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "fr-FR"));
-            Assert.AreEqual("val-uk1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "en-UK"));
+        // and only those with published name, are published
+        Assert.IsTrue(c1.IsPublished("fr-FR"));
+        Assert.IsTrue(c1.IsPublished("en-UK"));
+        Assert.IsFalse(c1.IsDraft("dk-DA"));
+        Assert.IsTrue(c1.IsPublished("de-DE"));
 
-            Assert.IsNull(publishedContent.Name(VariationContextAccessor)); // no invariant name for varying content
-            Assert.AreEqual("name-fr1", publishedContent.Name(VariationContextAccessor, "fr-FR"));
-            Assert.AreEqual("name-uk1", publishedContent.Name(VariationContextAccessor, "en-UK"));
+        // get the draft published content
+        var c2 = snapshot.Content.GetById(true, 1);
 
-            var draftContent = snapshot.Content.GetById(true, 1);
-            Assert.AreEqual("val2", draftContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
-            Assert.AreEqual("val-fr2", draftContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "fr-FR"));
-            Assert.AreEqual("val-uk2", draftContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", "en-UK"));
-
-            Assert.IsNull(draftContent.Name(VariationContextAccessor)); // no invariant name for varying content
-            Assert.AreEqual("name-fr2", draftContent.Name(VariationContextAccessor, "fr-FR"));
-            Assert.AreEqual("name-uk2", draftContent.Name(VariationContextAccessor, "en-UK"));
-
-            // now french is default
-            VariationContextAccessor.VariationContext = new VariationContext("fr-FR");
-            Assert.AreEqual("val-fr1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
-            Assert.AreEqual("name-fr1", publishedContent.Name(VariationContextAccessor));
-            Assert.AreEqual(new DateTime(2018, 01, 01, 01, 00, 00), publishedContent.CultureDate(VariationContextAccessor));
-
-            // now uk is default
-            VariationContextAccessor.VariationContext = new VariationContext("en-UK");
-            Assert.AreEqual("val-uk1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
-            Assert.AreEqual("name-uk1", publishedContent.Name(VariationContextAccessor));
-            Assert.AreEqual(new DateTime(2018, 01, 02, 01, 00, 00), publishedContent.CultureDate(VariationContextAccessor));
-
-            // invariant needs to be retrieved explicitly, when it's not default
-            Assert.AreEqual("val1", publishedContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop", culture: ""));
-
-            // but,
-            // if the content type / property type does not vary, then it's all invariant again
-            // modify the content type and property type, notify the snapshot service
-            _contentType.Variations = ContentVariation.Nothing;
-            _propertyType.Variations = ContentVariation.Nothing;
-            SnapshotService.Notify(new[] { new ContentTypeCacheRefresher.JsonPayload("IContentType", publishedContent.ContentType.Id, ContentTypeChangeTypes.RefreshMain) });
-
-            // get a new snapshot (nothing changed in the old one), get the published content again
-            var anotherSnapshot = SnapshotService.CreatePublishedSnapshot(previewToken: null);
-            var againContent = anotherSnapshot.Content.GetById(1);
-
-            Assert.AreEqual(ContentVariation.Nothing, againContent.ContentType.Variations);
-            Assert.AreEqual(ContentVariation.Nothing, againContent.ContentType.GetPropertyType("prop").Variations);
-
-            // now, "no culture" means "invariant"
-            Assert.AreEqual("It Works1!", againContent.Name(VariationContextAccessor));
-            Assert.AreEqual("val1", againContent.Value<string>(Mock.Of<IPublishedValueFallback>(), "prop"));
-        }
-
-        [Test]
-        public void Verifies_Published_And_Draft_Content()
-        {
-            // get the published published content
-            var snapshot = GetPublishedSnapshot();
-            var c1 = snapshot.Content.GetById(1);
-
-            // published content = nothing is draft here
-            Assert.IsFalse(c1.IsDraft("fr-FR"));
-            Assert.IsFalse(c1.IsDraft("en-UK"));
-            Assert.IsFalse(c1.IsDraft("dk-DA"));
-            Assert.IsFalse(c1.IsDraft("de-DE"));
-
-            // and only those with published name, are published
-            Assert.IsTrue(c1.IsPublished("fr-FR"));
-            Assert.IsTrue(c1.IsPublished("en-UK"));
-            Assert.IsFalse(c1.IsDraft("dk-DA"));
-            Assert.IsTrue(c1.IsPublished("de-DE"));
-
-            // get the draft published content
-            var c2 = snapshot.Content.GetById(true, 1);
-
-            // draft content = we have drafts
-            Assert.IsTrue(c2.IsDraft("fr-FR"));
-            Assert.IsTrue(c2.IsDraft("en-UK"));
-            Assert.IsTrue(c2.IsDraft("dk-DA"));
-            Assert.IsFalse(c2.IsDraft("de-DE")); // except for the one that does not
-
-            // and only those with published name, are published
-            Assert.IsTrue(c2.IsPublished("fr-FR"));
-            Assert.IsTrue(c2.IsPublished("en-UK"));
-            Assert.IsFalse(c2.IsPublished("dk-DA"));
-            Assert.IsTrue(c2.IsPublished("de-DE"));
-        }
+        // draft content = we have drafts
+        Assert.IsTrue(c2.IsDraft("fr-FR"));
+        Assert.IsTrue(c2.IsDraft("en-UK"));
+        Assert.IsTrue(c2.IsDraft("dk-DA"));
+        Assert.IsFalse(c2.IsDraft("de-DE")); // except for the one that does not
 
+        // and only those with published name, are published
+        Assert.IsTrue(c2.IsPublished("fr-FR"));
+        Assert.IsTrue(c2.IsPublished("en-UK"));
+        Assert.IsFalse(c2.IsPublished("dk-DA"));
+        Assert.IsTrue(c2.IsPublished("de-DE"));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/RootNodeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/RootNodeTests.cs
index 1ec48759ad..666eadff08 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/RootNodeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/RootNodeTests.cs
@@ -1,52 +1,48 @@
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
+
+[TestFixture]
+public class RootNodeTests : PublishedSnapshotServiceTestBase
 {
-
-    [TestFixture]
-    public class RootNodeTests : PublishedSnapshotServiceTestBase
+    [SetUp]
+    public override void Setup()
     {
-        [SetUp]
-        public override void Setup()
-        {
-            base.Setup();
+        base.Setup();
 
-            string xml = PublishedContentXml.TestWithDatabaseXml(1234);
+        var xml = PublishedContentXml.TestWithDatabaseXml(1234);
 
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
 
-            InitializedCache(kits, contentTypes, dataTypes);
-        }
+        InitializedCache(kits, contentTypes, dataTypes);
+    }
 
-        [Test]
-        public void PublishedContentHasNoRootNode()
-        {
-            var snapshot = GetPublishedSnapshot();
+    [Test]
+    public void PublishedContentHasNoRootNode()
+    {
+        var snapshot = GetPublishedSnapshot();
 
-            // there is no content node with ID -1
-            var content = snapshot.Content.GetById(-1);
-            Assert.IsNull(content);
+        // there is no content node with ID -1
+        var content = snapshot.Content.GetById(-1);
+        Assert.IsNull(content);
 
-            // content at root has null parent
-            content = snapshot.Content.GetById(1046);
-            Assert.IsNotNull(content);
-            Assert.AreEqual(1, content.Level);
-            Assert.IsNull(content.Parent);
-
-            // non-existing content is null
-            content = snapshot.Content.GetById(666);
-            Assert.IsNull(content);
-        }
+        // content at root has null parent
+        content = snapshot.Content.GetById(1046);
+        Assert.IsNotNull(content);
+        Assert.AreEqual(1, content.Level);
+        Assert.IsNull(content.Parent);
 
+        // non-existing content is null
+        content = snapshot.Content.GetById(666);
+        Assert.IsNull(content);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/UrlRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/UrlRoutesTests.cs
index a2cfe7d0e6..9d4c8efc99 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/UrlRoutesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/PublishedCache/UrlRoutesTests.cs
@@ -1,349 +1,365 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 using Umbraco.Cms.Tests.Common.Published;
 using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache
-{
-    // purpose: test the values returned by PublishedContentCache.GetRouteById
-    // and .GetByRoute (no caching at all, just routing nice URLs) including all
-    // the quirks due to hideTopLevelFromPath and backward compatibility.
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.PublishedCache;
 
-    public class UrlRoutesTests : PublishedSnapshotServiceTestBase
-    {
-        private static string GetXmlContent(int templateId)
-            => @"<?xml version=""1.0"" encoding=""utf-8""?>
+// purpose: test the values returned by PublishedContentCache.GetRouteById
+// and .GetByRoute (no caching at all, just routing nice URLs) including all
+// the quirks due to hideTopLevelFromPath and backward compatibility.
+public class UrlRoutesTests : PublishedSnapshotServiceTestBase
+{
+    private static string GetXmlContent(int templateId)
+        => @"<?xml version=""1.0"" encoding=""utf-8""?>
 <!DOCTYPE root[
 <!ELEMENT Doc ANY>
 <!ATTLIST Doc id ID #REQUIRED>
 ]>
 <root id=""-1"">
-    <Doc id=""1000"" parentID=""-1"" level=""1"" path=""-1,1000"" nodeName=""A"" urlName=""a"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
-        <Doc id=""1001"" parentID=""1000"" level=""2"" path=""-1,1000,1001"" nodeName=""B"" urlName=""b"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" writerName=""admin"" creatorName=""admin"" isDoc="""">
-            <Doc id=""1002"" parentID=""1001"" level=""3"" path=""-1,1000,1001,1002"" nodeName=""C"" urlName=""c"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" writerName=""admin"" creatorName=""admin"" isDoc="""">
-                <Doc id=""1003"" parentID=""1002"" level=""4"" path=""-1,1000,1001,1002,1003"" nodeName=""D"" urlName=""d"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+    <Doc id=""1000"" parentID=""-1"" level=""1"" path=""-1,1000"" nodeName=""A"" urlName=""a"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+        <Doc id=""1001"" parentID=""1000"" level=""2"" path=""-1,1000,1001"" nodeName=""B"" urlName=""b"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+            <Doc id=""1002"" parentID=""1001"" level=""3"" path=""-1,1000,1001,1002"" nodeName=""C"" urlName=""c"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+                <Doc id=""1003"" parentID=""1002"" level=""4"" path=""-1,1000,1001,1002,1003"" nodeName=""D"" urlName=""d"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-07-20T18:06:45"" updateDate=""2012-07-20T19:07:31"" writerName=""admin"" creatorName=""admin"" isDoc="""">
                 </Doc>
             </Doc>
         </Doc>
     </Doc>
-    <Doc id=""2000"" parentID=""-1"" level=""1"" path=""-1,2000"" nodeName=""X"" urlName=""x"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
-        <Doc id=""2001"" parentID=""2000"" level=""2"" path=""-1,2000,2001"" nodeName=""Y"" urlName=""y"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
-            <Doc id=""2002"" parentID=""2001"" level=""3"" path=""-1,2000,2001,2002"" nodeName=""Z"" urlName=""z"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+    <Doc id=""2000"" parentID=""-1"" level=""1"" path=""-1,2000"" nodeName=""X"" urlName=""x"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+        <Doc id=""2001"" parentID=""2000"" level=""2"" path=""-1,2000,2001"" nodeName=""Y"" urlName=""y"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+            <Doc id=""2002"" parentID=""2001"" level=""3"" path=""-1,2000,2001,2002"" nodeName=""Z"" urlName=""z"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
             </Doc>
         </Doc>
-        <Doc id=""2003"" parentID=""2000"" level=""2"" path=""-1,2000,2003"" nodeName=""A"" urlName=""a"" sortOrder=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+        <Doc id=""2003"" parentID=""2000"" level=""2"" path=""-1,2000,2003"" nodeName=""A"" urlName=""a"" sortOrder=""2"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
         </Doc>
-        <Doc id=""2004"" parentID=""2000"" level=""2"" path=""-1,2000,2004"" nodeName=""B"" urlName=""b"" sortOrder=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
-            <Doc id=""2005"" parentID=""2004"" level=""3"" path=""-1,2000,2004,2005"" nodeName=""C"" urlName=""c"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+        <Doc id=""2004"" parentID=""2000"" level=""2"" path=""-1,2000,2004"" nodeName=""B"" urlName=""b"" sortOrder=""3"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+            <Doc id=""2005"" parentID=""2004"" level=""3"" path=""-1,2000,2004,2005"" nodeName=""C"" urlName=""c"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
             </Doc>
-            <Doc id=""2006"" parentID=""2004"" level=""3"" path=""-1,2000,2004,2006"" nodeName=""E"" urlName=""e"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" + templateId + @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
+            <Doc id=""2006"" parentID=""2004"" level=""3"" path=""-1,2000,2004,2006"" nodeName=""E"" urlName=""e"" sortOrder=""1"" writerID=""0"" creatorID=""0"" nodeType=""1044"" template=""" +
+           templateId +
+           @""" createDate=""2012-06-12T14:13:17"" updateDate=""2012-07-20T18:50:43"" writerName=""admin"" creatorName=""admin"" isDoc="""">
             </Doc>
         </Doc>
     </Doc>
 </root>";
 
-        /*
-         * Just so it's documented somewhere, as of jan. 2017, routes obey the following pseudo-code:
+    /*
+     * Just so it's documented somewhere, as of jan. 2017, routes obey the following pseudo-code:
 
 GetByRoute(route, hide = null):
 
-    route is "[id]/[path]"
+route is "[id]/[path]"
 
-    hide = hide ?? global.hide
+hide = hide ?? global.hide
 
-    root = id ? node(id) : document
+root = id ? node(id) : document
 
-    content = cached(route) ?? DetermineIdByRoute(route, hide)
+content = cached(route) ?? DetermineIdByRoute(route, hide)
 
-    # route is "1234/path/to/content", finds "content"
-    # but if there is domain 5678 on "to", the *true* route of "content" is "5678/content"
-    # so although the route does match, we don't cache it
-    # there are not other reason not to cache it
+# route is "1234/path/to/content", finds "content"
+# but if there is domain 5678 on "to", the *true* route of "content" is "5678/content"
+# so although the route does match, we don't cache it
+# there are not other reason not to cache it
 
-    if content and no domain between root and content:
-        cache route (as trusted)
+if content and no domain between root and content:
+    cache route (as trusted)
 
-    return content
+return content
 
 
 DetermineIdByRoute(route, hide):
 
-    route is "[id]/[path]"
+route is "[id]/[path]"
 
-    try return NavigateRoute(id ?? 0, path, hide:hide)
-    return null
+try return NavigateRoute(id ?? 0, path, hide:hide)
+return null
 
 
 NavigateRoute(id, path, hide):
 
-    if path:
-        if id:
-            start = node(id)
-        else:
-            start = document
-
-        # 'navigate ... from ...' uses lowest sortOrder in case of collision
-
-        if hide and ![id]:
-            # if hiding, then for "/foo" we want to look for "/[any]/foo"
-            for each child of start:
-                try return navigate path from child
-
-            # but if it fails, we also want to try "/foo"
-            # fail now if more than one part eg "/foo/bar"
-            if path is "/[any]/...":
-                fail
-
-        try return navigate path from start
-
+if path:
+    if id:
+        start = node(id)
     else:
-        if id:
-            return node(id)
-        else:
-            return root node with lowest sortOrder
+        start = document
+
+    # 'navigate ... from ...' uses lowest sortOrder in case of collision
+
+    if hide and ![id]:
+        # if hiding, then for "/foo" we want to look for "/[any]/foo"
+        for each child of start:
+            try return navigate path from child
+
+        # but if it fails, we also want to try "/foo"
+        # fail now if more than one part eg "/foo/bar"
+        if path is "/[any]/...":
+            fail
+
+    try return navigate path from start
+
+else:
+    if id:
+        return node(id)
+    else:
+        return root node with lowest sortOrder
 
 
 GetRouteById(id):
 
 
-    route = cached(id)
-    if route:
-        return route
-
-    # never cache the route, it may be colliding
-
-    route = DetermineRouteById(id)
-    if route:
-        cache route (as not trusted)
-
+route = cached(id)
+if route:
     return route
 
+# never cache the route, it may be colliding
+
+route = DetermineRouteById(id)
+if route:
+    cache route (as not trusted)
+
+return route
+
 
 
 DetermineRouteById(id):
 
 
-    node = node(id)
+node = node(id)
 
-    walk up from node to domain or root, assemble parts = URL segments
+walk up from node to domain or root, assemble parts = URL segments
 
-    if !domain and global.hide:
-        if id.parent:
-            # got /top/[path]content, can remove /top
+if !domain and global.hide:
+    if id.parent:
+        # got /top/[path]content, can remove /top
+        remove top part
+    else:
+        # got /content, should remove only if it is the
+        # node with lowest sort order
+        root = root node with lowest sortOrder
+        if root == node:
             remove top part
-        else:
-            # got /content, should remove only if it is the
-            # node with lowest sort order
-            root = root node with lowest sortOrder
-            if root == node:
-                remove top part
 
-    compose path from parts
-    route = assemble "[domain.id]/[path]"
-    return route
+compose path from parts
+route = assemble "[domain.id]/[path]"
+return route
 
-         */
+     */
 
-        /*
-         * The Xml structure for the following tests is:
-         *
-         * root
-         *   A 1000
-         *     B 1001
-         *       C 1002
-         *         D 1003
-         *   X 2000
-         *     Y 2001
-         *       Z 2002
-         *     A 2003
-         *     B 2004
-         *       C 2005
-         *       E 2006
-         *
-         */
+    /*
+     * The Xml structure for the following tests is:
+     *
+     * root
+     *   A 1000
+     *     B 1001
+     *       C 1002
+     *         D 1003
+     *   X 2000
+     *     Y 2001
+     *       Z 2002
+     *     A 2003
+     *     B 2004
+     *       C 2005
+     *       E 2006
+     *
+     */
 
-        [TestCase(1000, false, "/a")]
-        [TestCase(1001, false, "/a/b")]
-        [TestCase(1002, false, "/a/b/c")]
-        [TestCase(1003, false, "/a/b/c/d")]
-        [TestCase(2000, false, "/x")]
-        [TestCase(2001, false, "/x/y")]
-        [TestCase(2002, false, "/x/y/z")]
-        [TestCase(2003, false, "/x/a")]
-        [TestCase(2004, false, "/x/b")]
-        [TestCase(2005, false, "/x/b/c")]
-        [TestCase(2006, false, "/x/b/e")]
-        public void GetRouteByIdNoHide(int id, bool hide, string expected)
+    [TestCase(1000, false, "/a")]
+    [TestCase(1001, false, "/a/b")]
+    [TestCase(1002, false, "/a/b/c")]
+    [TestCase(1003, false, "/a/b/c/d")]
+    [TestCase(2000, false, "/x")]
+    [TestCase(2001, false, "/x/y")]
+    [TestCase(2002, false, "/x/y/z")]
+    [TestCase(2003, false, "/x/a")]
+    [TestCase(2004, false, "/x/b")]
+    [TestCase(2005, false, "/x/b/c")]
+    [TestCase(2006, false, "/x/b/e")]
+    public void GetRouteByIdNoHide(int id, bool hide, string expected)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = hide;
+
+        var xml = GetXmlContent(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var cache = GetPublishedSnapshot().Content;
+
+        var route = cache.GetRouteById(false, id);
+        Assert.AreEqual(expected, route);
+    }
+
+    [TestCase(1000, true, "/")]
+    [TestCase(1001, true, "/b")]
+    [TestCase(1002, true, "/b/c")]
+    [TestCase(1003, true, "/b/c/d")]
+    [TestCase(2000, true, "/x")]
+    [TestCase(2001, true, "/y")]
+    [TestCase(2002, true, "/y/z")]
+    [TestCase(2003, true, "/a")]
+    [TestCase(2004, true, "/b")] // collision!
+    [TestCase(2005, true, "/b/c")] // collision!
+    [TestCase(2006, true, "/b/e")] // risky!
+    public void GetRouteByIdHide(int id, bool hide, string expected)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = hide;
+
+        var xml = GetXmlContent(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var cache = GetPublishedSnapshot().Content;
+
+        var route = cache.GetRouteById(false, id);
+        Assert.AreEqual(expected, route);
+    }
+
+    [Test]
+    public void GetRouteByIdCache()
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var xml = GetXmlContent(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var cache = GetPublishedSnapshot().Content;
+
+        var route = cache.GetRouteById(false, 1000);
+        Assert.AreEqual("/a", route);
+    }
+
+    [TestCase("/", false, 1000)]
+    [TestCase("/a", false, 1000)] // yes!
+    [TestCase("/a/b", false, 1001)]
+    [TestCase("/a/b/c", false, 1002)]
+    [TestCase("/a/b/c/d", false, 1003)]
+    [TestCase("/x", false, 2000)]
+    public void GetByRouteNoHide(string route, bool hide, int expected)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = hide;
+
+        var xml = GetXmlContent(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var cache = GetPublishedSnapshot().Content;
+
+        const bool preview = false; // make sure we don't cache - but HOW? should be some sort of switch?!
+        var content = cache.GetByRoute(preview, route);
+        if (expected < 0)
         {
-            GlobalSettings.HideTopLevelNodeFromPath = hide;
-
-            string xml = GetXmlContent(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var cache = GetPublishedSnapshot().Content;
-
-            var route = cache.GetRouteById(false, id);
-            Assert.AreEqual(expected, route);
+            Assert.IsNull(content);
         }
-
-        [TestCase(1000, true, "/")]
-        [TestCase(1001, true, "/b")]
-        [TestCase(1002, true, "/b/c")]
-        [TestCase(1003, true, "/b/c/d")]
-        [TestCase(2000, true, "/x")]
-        [TestCase(2001, true, "/y")]
-        [TestCase(2002, true, "/y/z")]
-        [TestCase(2003, true, "/a")]
-        [TestCase(2004, true, "/b")] // collision!
-        [TestCase(2005, true, "/b/c")] // collision!
-        [TestCase(2006, true, "/b/e")] // risky!
-        public void GetRouteByIdHide(int id, bool hide, string expected)
+        else
         {
-            GlobalSettings.HideTopLevelNodeFromPath = hide;
-
-            string xml = GetXmlContent(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var cache = GetPublishedSnapshot().Content;
-
-            var route = cache.GetRouteById(false, id);
-            Assert.AreEqual(expected, route);
-        }
-
-        [Test]
-        public void GetRouteByIdCache()
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            string xml = GetXmlContent(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var cache = GetPublishedSnapshot().Content;
-
-
-            var route = cache.GetRouteById(false, 1000);
-            Assert.AreEqual("/a", route);
-        }
-
-        [TestCase("/", false, 1000)]
-        [TestCase("/a", false, 1000)] // yes!
-        [TestCase("/a/b", false, 1001)]
-        [TestCase("/a/b/c", false, 1002)]
-        [TestCase("/a/b/c/d", false, 1003)]
-        [TestCase("/x", false, 2000)]
-        public void GetByRouteNoHide(string route, bool hide, int expected)
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = hide;
-
-            string xml = GetXmlContent(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var cache = GetPublishedSnapshot().Content;
-
-            const bool preview = false; // make sure we don't cache - but HOW? should be some sort of switch?!
-            var content = cache.GetByRoute(preview, route);
-            if (expected < 0)
-            {
-                Assert.IsNull(content);
-            }
-            else
-            {
-                Assert.IsNotNull(content);
-                Assert.AreEqual(expected, content.Id);
-            }
-        }
-
-        [TestCase("/", true, 1000)]
-        [TestCase("/a", true, 2003)]
-        [TestCase("/a/b", true, -1)]
-        [TestCase("/x", true, 2000)] // oops!
-        [TestCase("/x/y", true, -1)] // yes!
-        [TestCase("/y", true, 2001)]
-        [TestCase("/y/z", true, 2002)]
-        [TestCase("/b", true, 1001)] // (hence the 2004 collision)
-        [TestCase("/b/c", true, 1002)] // (hence the 2005 collision)
-        public void GetByRouteHide(string route, bool hide, int expected)
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = hide;
-
-            string xml = GetXmlContent(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var cache = GetPublishedSnapshot().Content;
-
-            const bool preview = false; // make sure we don't cache - but HOW? should be some sort of switch?!
-            var content = cache.GetByRoute(preview, route);
-            if (expected < 0)
-            {
-                Assert.IsNull(content);
-            }
-            else
-            {
-                Assert.IsNotNull(content);
-                Assert.AreEqual(expected, content.Id);
-            }
-        }
-
-        [Test]
-        public void GetByRouteCache()
-        {
-            GlobalSettings.HideTopLevelNodeFromPath = false;
-
-            string xml = GetXmlContent(1234);
-
-            IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
-                xml,
-                TestHelper.ShortStringHelper,
-                out ContentType[] contentTypes,
-                out DataType[] dataTypes).ToList();
-
-            InitializedCache(kits, contentTypes, dataTypes: dataTypes);
-
-            var cache = GetPublishedSnapshot().Content;
-
-            var content = cache.GetByRoute(false, "/a/b/c");
             Assert.IsNotNull(content);
-            Assert.AreEqual(1002, content.Id);
+            Assert.AreEqual(expected, content.Id);
         }
     }
+
+    [TestCase("/", true, 1000)]
+    [TestCase("/a", true, 2003)]
+    [TestCase("/a/b", true, -1)]
+    [TestCase("/x", true, 2000)] // oops!
+    [TestCase("/x/y", true, -1)] // yes!
+    [TestCase("/y", true, 2001)]
+    [TestCase("/y/z", true, 2002)]
+    [TestCase("/b", true, 1001)] // (hence the 2004 collision)
+    [TestCase("/b/c", true, 1002)] // (hence the 2005 collision)
+    public void GetByRouteHide(string route, bool hide, int expected)
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = hide;
+
+        var xml = GetXmlContent(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var cache = GetPublishedSnapshot().Content;
+
+        const bool preview = false; // make sure we don't cache - but HOW? should be some sort of switch?!
+        var content = cache.GetByRoute(preview, route);
+        if (expected < 0)
+        {
+            Assert.IsNull(content);
+        }
+        else
+        {
+            Assert.IsNotNull(content);
+            Assert.AreEqual(expected, content.Id);
+        }
+    }
+
+    [Test]
+    public void GetByRouteCache()
+    {
+        GlobalSettings.HideTopLevelNodeFromPath = false;
+
+        var xml = GetXmlContent(1234);
+
+        IEnumerable<ContentNodeKit> kits = PublishedContentXmlAdapter.GetContentNodeKits(
+            xml,
+            TestHelper.ShortStringHelper,
+            out var contentTypes,
+            out var dataTypes).ToList();
+
+        InitializedCache(kits, contentTypes, dataTypes);
+
+        var cache = GetPublishedSnapshot().Content;
+
+        var content = cache.GetByRoute(false, "/a/b/c");
+        Assert.IsNotNull(content);
+        Assert.AreEqual(1002, content.Id);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Runtime/DefaultMainDomKeyGeneratorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Runtime/DefaultMainDomKeyGeneratorTests.cs
index 9b013aa38f..02f7d6b6a2 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Runtime/DefaultMainDomKeyGeneratorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Runtime/DefaultMainDomKeyGeneratorTests.cs
@@ -6,42 +6,41 @@ using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Infrastructure.Runtime;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Runtime
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Runtime;
+
+[TestFixture]
+internal class DefaultMainDomKeyGeneratorTests
 {
-    [TestFixture]
-    internal class DefaultMainDomKeyGeneratorTests
+    [Test]
+    [AutoMoqData]
+    public void GenerateKey_WithConfiguredDiscriminatorValue_AltersHash(
+        [Frozen] IHostingEnvironment hostingEnvironment,
+        [Frozen] GlobalSettings globalSettings,
+        [Frozen] IOptionsMonitor<GlobalSettings> globalSettingsMonitor,
+        DefaultMainDomKeyGenerator sut,
+        string aDiscriminator)
     {
-        [Test]
-        [AutoMoqData]
-        public void GenerateKey_WithConfiguredDiscriminatorValue_AltersHash(
-            [Frozen] IHostingEnvironment hostingEnvironment,
-            [Frozen] GlobalSettings globalSettings,
-            [Frozen] IOptionsMonitor<GlobalSettings> globalSettingsMonitor,
-            DefaultMainDomKeyGenerator sut,
-            string aDiscriminator)
-        {
-            var withoutDiscriminator = sut.GenerateKey();
-            globalSettings.MainDomKeyDiscriminator = aDiscriminator;
-            var withDiscriminator = sut.GenerateKey();
+        var withoutDiscriminator = sut.GenerateKey();
+        globalSettings.MainDomKeyDiscriminator = aDiscriminator;
+        var withDiscriminator = sut.GenerateKey();
 
-            Assert.AreNotEqual(withoutDiscriminator, withDiscriminator);
-        }
+        Assert.AreNotEqual(withoutDiscriminator, withDiscriminator);
+    }
 
-        [Test]
-        [AutoMoqData]
-        public void GenerateKey_WithUnchangedDiscriminatorValue_ReturnsSameValue(
-            [Frozen] IHostingEnvironment hostingEnvironment,
-            [Frozen] GlobalSettings globalSettings,
-            [Frozen] IOptionsMonitor<GlobalSettings> globalSettingsMonitor,
-            DefaultMainDomKeyGenerator sut,
-            string aDiscriminator)
-        {
-            globalSettings.MainDomKeyDiscriminator = aDiscriminator;
+    [Test]
+    [AutoMoqData]
+    public void GenerateKey_WithUnchangedDiscriminatorValue_ReturnsSameValue(
+        [Frozen] IHostingEnvironment hostingEnvironment,
+        [Frozen] GlobalSettings globalSettings,
+        [Frozen] IOptionsMonitor<GlobalSettings> globalSettingsMonitor,
+        DefaultMainDomKeyGenerator sut,
+        string aDiscriminator)
+    {
+        globalSettings.MainDomKeyDiscriminator = aDiscriminator;
 
-            var a = sut.GenerateKey();
-            var b = sut.GenerateKey();
+        var a = sut.GenerateKey();
+        var b = sut.GenerateKey();
 
-            Assert.AreEqual(a, b);
-        }
+        Assert.AreEqual(a, b);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs
index 3d4ded44f2..648b45bb28 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Scoping/ScopeUnitTests.cs
@@ -1,27 +1,21 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using CSharpTest.Net.Interfaces;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
 using Moq;
-using NPoco;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
-using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DistributedLocking;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Persistence.SqlSyntax;
 using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common;
-using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 
 namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
 {
@@ -36,8 +30,11 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
         private ScopeProvider GetScopeProvider(out Mock<IDistributedLockingMechanism> lockingMechanism)
         {
             var loggerFactory = NullLoggerFactory.Instance;
-            var fileSystems = new FileSystems(loggerFactory,
-                Mock.Of<IIOHelper>(), Mock.Of<IOptions<GlobalSettings>>(), Mock.Of<IHostingEnvironment>());
+            var fileSystems = new FileSystems(
+                loggerFactory,
+                Mock.Of<IIOHelper>(),
+                Mock.Of<IOptions<GlobalSettings>>(),
+                Mock.Of<IHostingEnvironment>());
             var mediaFileManager = new MediaFileManager(
                 Mock.Of<IFileSystem>(),
                 Mock.Of<IMediaPathScheme>(),
@@ -67,6 +64,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
             database.Setup(x => x.SqlContext).Returns(sqlContext.Object);
 
             var syntaxProviderMock = new Mock<ISqlSyntaxProvider>();
+
             // Setup mock of ISqlContext to return syntaxProviderMock
             sqlContext.Setup(x => x.SqlSyntax).Returns(syntaxProviderMock.Object);
 
@@ -136,8 +134,10 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
                         innerScope2.EagerWriteLock(Constants.Locks.Languages);
                         innerScope2.Complete();
                     }
+
                     innerScope1.Complete();
                 }
+
                 outerScope.Complete();
             }
 
@@ -191,6 +191,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
                         innerScope2.EagerWriteLock(timeout, Constants.Locks.Languages);
                         innerScope2.Complete();
                     }
+
                     innerScope1.Complete();
                 }
 
@@ -317,6 +318,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
                     Assert.AreEqual(2, outerscope.GetWriteLocks()[innerScope.InstanceId][Constants.Locks.Languages]);
                     innerScope.Complete();
                 }
+
                 Assert.AreEqual(2, outerscope.GetWriteLocks()[outerscope.InstanceId][Constants.Locks.ContentTree]);
                 Assert.IsFalse(outerscope.GetWriteLocks().ContainsKey(innerscopeId));
                 outerscope.Complete();
@@ -348,10 +350,10 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
                     Assert.AreEqual(2, outerscope.GetReadLocks()[innerScope.InstanceId][Constants.Locks.Languages]);
                     innerScope.Complete();
                 }
+
                 Assert.AreEqual(2, outerscope.GetReadLocks()[outerscope.InstanceId][Constants.Locks.ContentTree]);
                 Assert.IsFalse(outerscope.GetReadLocks().ContainsKey(innerscopeId));
 
-
                 outerscope.Complete();
             }
         }
@@ -400,6 +402,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
 
                         innerScope2.Complete();
                     }
+
                     Assert.AreEqual(1, realParentScope.GetWriteLocks()[realParentScope.InstanceId][Constants.Locks.ContentTree], $"innerScope1, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
                     Assert.AreEqual(1, realParentScope.GetWriteLocks()[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"innerScope1, parent instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTypes)}");
                     Assert.AreEqual(1, realParentScope.GetWriteLocks()[innerScope1.InstanceId][Constants.Locks.ContentTree], $"innerScope1, innerScope1 instance, after innserScope2 disposed: {nameof(Constants.Locks.ContentTree)}");
@@ -409,6 +412,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
 
                     innerScope1.Complete();
                 }
+
                 Assert.AreEqual(1, realParentScope.GetWriteLocks()[realParentScope.InstanceId][Constants.Locks.ContentTree], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTree)}");
                 Assert.AreEqual(1, realParentScope.GetWriteLocks()[realParentScope.InstanceId][Constants.Locks.ContentTypes], $"parentScope after inner scopes disposed: {nameof(Constants.Locks.ContentTypes)}");
                 Assert.IsFalse(realParentScope.GetWriteLocks().ContainsKey(innerScope2Id));
@@ -588,11 +592,10 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Scoping
 
             using (var scope = scopeProvider.CreateScope())
             {
-                Assert.AreEqual(0,scope.Depth);
+                Assert.AreEqual(0, scope.Depth);
             }
         }
 
-
         [Test]
         public void Depth_WhenChildScope_ReturnsDepth()
         {
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs
index c2081f2ce4..12b4984bec 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberManagerTests.cs
@@ -14,242 +14,228 @@ using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Net;
 using Umbraco.Cms.Core.PublishedCache;
-using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
+using Umbraco.Cms.Infrastructure.Scoping;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Web.Common.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security;
+
+[TestFixture]
+public class MemberManagerTests
 {
-    [TestFixture]
-    public class MemberManagerTests
+    private MemberUserStore _fakeMemberStore;
+    private Mock<IOptions<IdentityOptions>> _mockIdentityOptions;
+    private Mock<IPasswordHasher<MemberIdentityUser>> _mockPasswordHasher;
+    private Mock<IMemberService> _mockMemberService;
+    private Mock<IServiceProvider> _mockServiceProviders;
+    private Mock<IOptionsSnapshot<MemberPasswordConfigurationSettings>> _mockPasswordConfiguration;
+
+    public MemberManager CreateSut()
     {
-        private MemberUserStore _fakeMemberStore;
-        private Mock<IOptions<IdentityOptions>> _mockIdentityOptions;
-        private Mock<IPasswordHasher<MemberIdentityUser>> _mockPasswordHasher;
-        private Mock<IMemberService> _mockMemberService;
-        private Mock<IServiceProvider> _mockServiceProviders;
-        private Mock<IOptionsSnapshot<MemberPasswordConfigurationSettings>> _mockPasswordConfiguration;
+        var scopeProvider = new Mock<IScopeProvider>().Object;
+        _mockMemberService = new Mock<IMemberService>();
 
-        public MemberManager CreateSut()
+        var mapDefinitions = new List<IMapDefinition>
         {
-            global::Umbraco.Cms.Infrastructure.Scoping.IScopeProvider scopeProvider = new Mock<global::Umbraco.Cms.Infrastructure.Scoping.IScopeProvider>().Object;
-            _mockMemberService = new Mock<IMemberService>();
+            new IdentityMapDefinition(
+                Mock.Of<ILocalizedTextService>(),
+                Mock.Of<IEntityService>(),
+                new TestOptionsSnapshot<GlobalSettings>(new GlobalSettings()),
+                AppCaches.Disabled),
+        };
 
-            var mapDefinitions = new List<IMapDefinition>()
-            {
-                new IdentityMapDefinition(
-                    Mock.Of<ILocalizedTextService>(),
-                    Mock.Of<IEntityService>(),
-                    new TestOptionsSnapshot<GlobalSettings>(new GlobalSettings()),
-                    AppCaches.Disabled),
-            };
+        _fakeMemberStore = new MemberUserStore(
+            _mockMemberService.Object,
+            new UmbracoMapper(new MapDefinitionCollection(() => mapDefinitions), scopeProvider),
+            scopeProvider,
+            new IdentityErrorDescriber(),
+            Mock.Of<IPublishedSnapshotAccessor>(),
+            Mock.Of<IExternalLoginWithKeyService>(),
+            Mock.Of<ITwoFactorLoginService>());
 
-            _fakeMemberStore = new MemberUserStore(
-                _mockMemberService.Object,
-                new UmbracoMapper(new MapDefinitionCollection(() => mapDefinitions), scopeProvider),
-                scopeProvider,
-                new IdentityErrorDescriber(),
-                Mock.Of<IPublishedSnapshotAccessor>(),
-                Mock.Of<IExternalLoginWithKeyService>(),
-                Mock.Of<ITwoFactorLoginService>());
+        _mockIdentityOptions = new Mock<IOptions<IdentityOptions>>();
+        var idOptions = new IdentityOptions { Lockout = { AllowedForNewUsers = false } };
+        _mockIdentityOptions.Setup(o => o.Value).Returns(idOptions);
+        _mockPasswordHasher = new Mock<IPasswordHasher<MemberIdentityUser>>();
 
-            _mockIdentityOptions = new Mock<IOptions<IdentityOptions>>();
-            var idOptions = new IdentityOptions { Lockout = { AllowedForNewUsers = false } };
-            _mockIdentityOptions.Setup(o => o.Value).Returns(idOptions);
-            _mockPasswordHasher = new Mock<IPasswordHasher<MemberIdentityUser>>();
+        var userValidators = new List<IUserValidator<MemberIdentityUser>>();
+        var validator = new Mock<IUserValidator<MemberIdentityUser>>();
+        userValidators.Add(validator.Object);
 
-            var userValidators = new List<IUserValidator<MemberIdentityUser>>();
-            var validator = new Mock<IUserValidator<MemberIdentityUser>>();
-            userValidators.Add(validator.Object);
+        _mockServiceProviders = new Mock<IServiceProvider>();
+        _mockPasswordConfiguration = new Mock<IOptionsSnapshot<MemberPasswordConfigurationSettings>>();
+        _mockPasswordConfiguration.Setup(x => x.Value).Returns(() =>
+            new MemberPasswordConfigurationSettings());
 
-            _mockServiceProviders = new Mock<IServiceProvider>();
-            _mockPasswordConfiguration = new Mock<IOptionsSnapshot<MemberPasswordConfigurationSettings>>();
-            _mockPasswordConfiguration.Setup(x => x.Value).Returns(() =>
-                new MemberPasswordConfigurationSettings()
-                {
+        var pwdValidators = new List<PasswordValidator<MemberIdentityUser>> { new() };
 
-                });
+        var userManager = new MemberManager(
+            new Mock<IIpResolver>().Object,
+            _fakeMemberStore,
+            _mockIdentityOptions.Object,
+            _mockPasswordHasher.Object,
+            userValidators,
+            pwdValidators,
+            new MembersErrorDescriber(Mock.Of<ILocalizedTextService>()),
+            _mockServiceProviders.Object,
+            new Mock<ILogger<UserManager<MemberIdentityUser>>>().Object,
+            _mockPasswordConfiguration.Object,
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IHttpContextAccessor>());
 
-            var pwdValidators = new List<PasswordValidator<MemberIdentityUser>>
-            {
-                new PasswordValidator<MemberIdentityUser>()
-            };
+        validator.Setup(v => v.ValidateAsync(
+                userManager,
+                It.IsAny<MemberIdentityUser>()))
+            .Returns(Task.FromResult(IdentityResult.Success)).Verifiable();
 
-            var userManager = new MemberManager(
-                new Mock<IIpResolver>().Object,
-                _fakeMemberStore,
-                _mockIdentityOptions.Object,
-                _mockPasswordHasher.Object,
-                userValidators,
-                pwdValidators,
-                new MembersErrorDescriber(Mock.Of<ILocalizedTextService>()),
-                _mockServiceProviders.Object,
-                new Mock<ILogger<UserManager<MemberIdentityUser>>>().Object,
-                _mockPasswordConfiguration.Object,
-                Mock.Of<IPublicAccessService>(),
-                Mock.Of<IHttpContextAccessor>());
+        return userManager;
+    }
 
-            validator.Setup(v => v.ValidateAsync(
-                    userManager,
-                    It.IsAny<MemberIdentityUser>()))
-                .Returns(Task.FromResult(IdentityResult.Success)).Verifiable();
+    [Test]
+    public async Task GivenICreateUser_AndTheIdentityResultFailed_ThenIShouldGetAFailedResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser { PasswordConfig = "testConfig" };
 
-            return userManager;
-        }
+        // act
+        var identityResult = await sut.CreateAsync(fakeUser);
 
-        [Test]
-        public async Task GivenICreateUser_AndTheIdentityResultFailed_ThenIShouldGetAFailedResultAsync()
+        // assert
+        Assert.IsFalse(identityResult.Succeeded);
+        Assert.IsFalse(!identityResult.Errors.Any());
+    }
+
+    [Test]
+    public async Task GivenICreateUser_AndTheUserIsNull_ThenIShouldGetAFailedResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        IdentityError[] identityErrors =
         {
-            //arrange
-            MemberManager sut = CreateSut();
-            var fakeUser = new MemberIdentityUser()
-            {
-                PasswordConfig = "testConfig"
-            };
+            new() { Code = "IdentityError1", Description = "There was an identity error when creating a user" },
+        };
 
-            //act
-            IdentityResult identityResult = await sut.CreateAsync(fakeUser);
+        // act
+        Assert.ThrowsAsync<ArgumentNullException>(async () => await sut.CreateAsync(null));
+    }
 
-            //assert
-            Assert.IsFalse(identityResult.Succeeded);
-            Assert.IsFalse(!identityResult.Errors.Any());
+    [Test]
+    public async Task GivenICreateANewUser_AndTheUserIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = CreateValidUser();
 
-        }
+        var fakeMember = CreateMember(fakeUser);
 
+        MockMemberServiceForCreateMember(fakeMember);
 
-        [Test]
-        public async Task GivenICreateUser_AndTheUserIsNull_ThenIShouldGetAFailedResultAsync()
+        // act
+        var identityResult = await sut.CreateAsync(fakeUser);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+    }
+
+    [Test]
+    public async Task GivenAUserExists_AndTheCorrectCredentialsAreProvided_ThenACheckOfCredentialsShouldSucceed()
+    {
+        // arrange
+        var password = "password";
+        var sut = CreateSut();
+
+        var fakeUser = CreateValidUser();
+
+        var fakeMember = CreateMember(fakeUser);
+
+        MockMemberServiceForCreateMember(fakeMember);
+
+        _mockMemberService.Setup(x => x.GetByUsername(It.Is<string>(y => y == fakeUser.UserName))).Returns(fakeMember);
+
+        _mockPasswordHasher
+            .Setup(x => x.VerifyHashedPassword(It.IsAny<MemberIdentityUser>(), It.IsAny<string>(), It.IsAny<string>()))
+            .Returns(PasswordVerificationResult.Success);
+
+        // act
+        await sut.CreateAsync(fakeUser);
+        var result = await sut.ValidateCredentialsAsync(fakeUser.UserName, password);
+
+        // assert
+        Assert.IsTrue(result);
+    }
+
+    [Test]
+    public async Task GivenAUserExists_AndIncorrectCredentialsAreProvided_ThenACheckOfCredentialsShouldFail()
+    {
+        // arrange
+        var password = "password";
+        var sut = CreateSut();
+
+        var fakeUser = CreateValidUser();
+
+        var fakeMember = CreateMember(fakeUser);
+
+        MockMemberServiceForCreateMember(fakeMember);
+
+        _mockMemberService.Setup(x => x.GetByUsername(It.Is<string>(y => y == fakeUser.UserName))).Returns(fakeMember);
+
+        _mockPasswordHasher
+            .Setup(x => x.VerifyHashedPassword(It.IsAny<MemberIdentityUser>(), It.IsAny<string>(), It.IsAny<string>()))
+            .Returns(PasswordVerificationResult.Failed);
+
+        // act
+        await sut.CreateAsync(fakeUser);
+        var result = await sut.ValidateCredentialsAsync(fakeUser.UserName, password);
+
+        // assert
+        Assert.IsFalse(result);
+    }
+
+    [Test]
+    public async Task GivenAUserDoesExists_AndCredentialsAreProvided_ThenACheckOfCredentialsShouldFail()
+    {
+        // arrange
+        var password = "password";
+        var sut = CreateSut();
+
+        _mockMemberService.Setup(x => x.GetByUsername(It.Is<string>(y => y == "testUser"))).Returns((IMember)null);
+
+        // act
+        var result = await sut.ValidateCredentialsAsync("testUser", password);
+
+        // assert
+        Assert.IsFalse(result);
+    }
+
+    private static MemberIdentityUser CreateValidUser() =>
+        new(777)
         {
-            //arrange
-            MemberManager sut = CreateSut();
-            IdentityError[] identityErrors =
-            {
-                new IdentityError()
-                {
-                    Code = "IdentityError1",
-                    Description = "There was an identity error when creating a user"
-                }
-            };
+            UserName = "testUser",
+            Email = "test@test.com",
+            Name = "Test",
+            MemberTypeAlias = "Anything",
+            PasswordConfig = "testConfig",
+            PasswordHash = "hashedPassword",
+        };
 
-            //act
-            Assert.ThrowsAsync<ArgumentNullException>(async () => await sut.CreateAsync(null));
-        }
+    private static IMember CreateMember(MemberIdentityUser fakeUser)
+    {
+        var builder = new MemberTypeBuilder();
+        var memberType = builder.BuildSimpleMemberType();
+        return new Member(memberType) { Id = 777, Username = fakeUser.UserName };
+    }
 
-        [Test]
-        public async Task GivenICreateANewUser_AndTheUserIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
-        {
-            //arrange
-            MemberManager sut = CreateSut();
-            MemberIdentityUser fakeUser = CreateValidUser();
-
-            IMember fakeMember = CreateMember(fakeUser);
-
-            MockMemberServiceForCreateMember(fakeMember);
-
-            //act
-            IdentityResult identityResult = await sut.CreateAsync(fakeUser);
-
-            //assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-        }
-
-        [Test]
-        public async Task GivenAUserExists_AndTheCorrectCredentialsAreProvided_ThenACheckOfCredentialsShouldSucceed()
-        {
-            //arrange
-            var password = "password";
-            MemberManager sut = CreateSut();
-
-            MemberIdentityUser fakeUser = CreateValidUser();
-
-            IMember fakeMember = CreateMember(fakeUser);
-
-            MockMemberServiceForCreateMember(fakeMember);
-
-            _mockMemberService.Setup(x => x.GetByUsername(It.Is<string>(y => y == fakeUser.UserName))).Returns(fakeMember);
-
-            _mockPasswordHasher.Setup(x => x.VerifyHashedPassword(It.IsAny<MemberIdentityUser>(), It.IsAny<string>(), It.IsAny<string>())).Returns(PasswordVerificationResult.Success);
-
-            //act
-            await sut.CreateAsync(fakeUser);
-            var result = await sut.ValidateCredentialsAsync(fakeUser.UserName, password);
-
-            //assert
-            Assert.IsTrue(result);
-        }
-
-        [Test]
-        public async Task GivenAUserExists_AndIncorrectCredentialsAreProvided_ThenACheckOfCredentialsShouldFail()
-        {
-            //arrange
-            var password = "password";
-            MemberManager sut = CreateSut();
-
-            MemberIdentityUser fakeUser = CreateValidUser();
-
-            IMember fakeMember = CreateMember(fakeUser);
-
-            MockMemberServiceForCreateMember(fakeMember);
-
-            _mockMemberService.Setup(x => x.GetByUsername(It.Is<string>(y => y == fakeUser.UserName))).Returns(fakeMember);
-
-            _mockPasswordHasher.Setup(x => x.VerifyHashedPassword(It.IsAny<MemberIdentityUser>(), It.IsAny<string>(), It.IsAny<string>())).Returns(PasswordVerificationResult.Failed);
-
-            //act
-            await sut.CreateAsync(fakeUser);
-            var result = await sut.ValidateCredentialsAsync(fakeUser.UserName, password);
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        [Test]
-        public async Task GivenAUserDoesExists_AndCredentialsAreProvided_ThenACheckOfCredentialsShouldFail()
-        {
-            //arrange
-            var password = "password";
-            MemberManager sut = CreateSut();
-
-            _mockMemberService.Setup(x => x.GetByUsername(It.Is<string>(y => y == "testUser"))).Returns((IMember)null);
-
-            //act
-            var result = await sut.ValidateCredentialsAsync("testUser", password);
-
-            //assert
-            Assert.IsFalse(result);
-        }
-
-        private static MemberIdentityUser CreateValidUser() =>
-            new MemberIdentityUser(777)
-            {
-                UserName = "testUser",
-                Email = "test@test.com",
-                Name = "Test",
-                MemberTypeAlias = "Anything",
-                PasswordConfig = "testConfig",
-                PasswordHash = "hashedPassword"
-            };
-
-        private static IMember CreateMember(MemberIdentityUser fakeUser)
-        {
-            var builder = new MemberTypeBuilder();
-            MemberType memberType = builder.BuildSimpleMemberType();
-            return new Member(memberType)
-            {
-                Id = 777,
-                Username = fakeUser.UserName,
-            };
-        }
-
-        private void MockMemberServiceForCreateMember(IMember fakeMember)
-        {
-            _mockMemberService.Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(fakeMember);
-            _mockMemberService.Setup(x => x.Save(fakeMember));
-        }
+    private void MockMemberServiceForCreateMember(IMember fakeMember)
+    {
+        _mockMemberService
+            .Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+            .Returns(fakeMember);
+        _mockMemberService.Setup(x => x.Save(fakeMember));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs
index c581747c24..8e8b39bb42 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberPasswordHasherTests.cs
@@ -1,4 +1,3 @@
-using System;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
@@ -6,43 +5,108 @@ using Microsoft.Extensions.Options;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Security;
-using Umbraco.Cms.Infrastructure.Security;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Security
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Security;
+
+[TestFixture]
+public class MemberPasswordHasherTests
 {
-    [TestFixture]
-    public class MemberPasswordHasherTests
+    [Test]
+    [TestCase(
+        "Password123!",
+        "AQAAAAEAACcQAAAAEGF/tTVoL6ef3bQPZFYfbgKFu1CDQIAMgyY1N4EDt9jqdG/hsOX93X1U6LNvlIQ3mw==",
+        null,
+        ExpectedResult = PasswordVerificationResult.Success,
+        Description = "AspNetCoreIdentityPasswordHash: Correct password")]
+    [TestCase(
+        "wrongPassword",
+        "AQAAAAEAACcQAAAAEGF/tTVoL6ef3bQPZFYfbgKFu1CDQIAMgyY1N4EDt9jqdG/hsOX93X1U6LNvlIQ3mw==",
+        null,
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "AspNetCoreIdentityPasswordHash: Wrong password")]
+    [TestCase(
+        "Password123!",
+        "yDiU2YyuYZU4jz6F0fpErQ==BxNRHkXBVyJs9gwWF6ktWdfDwYf5bwm+rvV7tOcNNx8=",
+        null,
+        ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded,
+        Description = "GivenALegacyPasswordHash: Correct password")]
+    [TestCase(
+        "wrongPassword",
+        "yDiU2YyuYZU4jz6F0fpErQ==BxNRHkXBVyJs9gwWF6ktWdfDwYf5bwm+rvV7tOcNNx8=",
+        null,
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "GivenALegacyPasswordHash: Wrong password")]
+    [TestCase(
+        "Password123!",
+        "AJszAsQqxOYbASKfL3JVUu6cjU18ouizXDfX4j7wLlir8SWj2yQaTepE9e5bIohIsQ==",
+        null,
+        ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded,
+        Description = "GivenALegacyPasswordHash: Correct password")]
+    [TestCase(
+        "wrongPassword",
+        "AJszAsQqxOYbASKfL3JVUu6cjU18ouizXDfX4j7wLlir8SWj2yQaTepE9e5bIohIsQ==",
+        null,
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "GivenALegacyPasswordHash: Wrong password")]
+    [TestCase(
+        "1234567890",
+        "1234567890",
+        null,
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "ClearText: Correct password, but not supported")]
+    [TestCase(
+        "wrongPassword",
+        "1234567890",
+        null,
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "ClearText: Wrong password")]
+    [TestCase(
+        "1234567890",
+        "XyFRG4/xJ5JGQJYqqIFK70BjHdM=",
+        null,
+        ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded,
+        Description = "Hashed: Correct password")]
+    [TestCase(
+        "wrongPassword",
+        "XyFRG4/xJ5JGQJYqqIFK70BjHdM=",
+        null,
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "Hashed: Wrong password")]
+    [TestCase(
+        "1234567890",
+        "K2JPOhoqNoysfnnD67QsWDSliHrjoSTRTvv9yiaKf30=",
+        "1D43BFA074DF6DCEF6E44A7F5B5F56CDDD60BE198FBBB0222C96A5BD696F3CAA",
+        ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded,
+        Description = "Encrypted: Correct password and correct decryptionKey")]
+    [TestCase(
+        "wrongPassword",
+        "K2JPOhoqNoysfnnD67QsWDSliHrjoSTRTvv9yiaKf30=",
+        "1D43BFA074DF6DCEF6E44A7F5B5F56CDDD60BE198FBBB0222C96A5BD696F3CAA",
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "Encrypted: Wrong password but correct decryptionKey")]
+    [TestCase(
+        "1234567890",
+        "qiuwRr4K7brpTcIzLFfR3iGG9zj4/z4ewHCVZmYUDKM=",
+        "B491B602E0CE1D52450A8089FD2013B340743A7EFCC12B039BD11977A083ACA1",
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "Encrypted: Correct password but wrong decryptionKey")]
+    [TestCase(
+        "1234567890",
+        "qiuwRr4K7brpTcIzLFfR3iGG9zj4/z4ewHCVZmYUDKM=",
+        "InvalidDecryptionKey",
+        ExpectedResult = PasswordVerificationResult.Failed,
+        Description = "Encrypted: Invalid decryptionKey")]
+    public PasswordVerificationResult VerifyHashedPassword(string password, string encryptedPassword, string decryptionKey)
     {
-        [Test]
-        [TestCase("Password123!", "AQAAAAEAACcQAAAAEGF/tTVoL6ef3bQPZFYfbgKFu1CDQIAMgyY1N4EDt9jqdG/hsOX93X1U6LNvlIQ3mw==", null,  ExpectedResult = PasswordVerificationResult.Success, Description = "AspNetCoreIdentityPasswordHash: Correct password")]
-        [TestCase("wrongPassword", "AQAAAAEAACcQAAAAEGF/tTVoL6ef3bQPZFYfbgKFu1CDQIAMgyY1N4EDt9jqdG/hsOX93X1U6LNvlIQ3mw==", null,  ExpectedResult = PasswordVerificationResult.Failed, Description = "AspNetCoreIdentityPasswordHash: Wrong password")]
-        [TestCase("Password123!", "yDiU2YyuYZU4jz6F0fpErQ==BxNRHkXBVyJs9gwWF6ktWdfDwYf5bwm+rvV7tOcNNx8=", null,  ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded, Description = "GivenALegacyPasswordHash: Correct password")]
-        [TestCase("wrongPassword", "yDiU2YyuYZU4jz6F0fpErQ==BxNRHkXBVyJs9gwWF6ktWdfDwYf5bwm+rvV7tOcNNx8=", null,  ExpectedResult = PasswordVerificationResult.Failed, Description = "GivenALegacyPasswordHash: Wrong password")]
-        [TestCase("Password123!", "AJszAsQqxOYbASKfL3JVUu6cjU18ouizXDfX4j7wLlir8SWj2yQaTepE9e5bIohIsQ==", null,  ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded, Description = "GivenALegacyPasswordHash: Correct password")]
-        [TestCase("wrongPassword", "AJszAsQqxOYbASKfL3JVUu6cjU18ouizXDfX4j7wLlir8SWj2yQaTepE9e5bIohIsQ==", null,  ExpectedResult = PasswordVerificationResult.Failed, Description = "GivenALegacyPasswordHash: Wrong password")]
-        [TestCase("1234567890", "1234567890", null,  ExpectedResult = PasswordVerificationResult.Failed, Description = "ClearText: Correct password, but not supported")]
-        [TestCase("wrongPassword", "1234567890", null, ExpectedResult = PasswordVerificationResult.Failed, Description = "ClearText: Wrong password")]
-        [TestCase("1234567890", "XyFRG4/xJ5JGQJYqqIFK70BjHdM=",  null, ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded, Description = "Hashed: Correct password")]
-        [TestCase("wrongPassword", "XyFRG4/xJ5JGQJYqqIFK70BjHdM=", null,  ExpectedResult = PasswordVerificationResult.Failed, Description = "Hashed: Wrong password")]
-        [TestCase("1234567890", "K2JPOhoqNoysfnnD67QsWDSliHrjoSTRTvv9yiaKf30=", "1D43BFA074DF6DCEF6E44A7F5B5F56CDDD60BE198FBBB0222C96A5BD696F3CAA", ExpectedResult = PasswordVerificationResult.SuccessRehashNeeded, Description = "Encrypted: Correct password and correct decryptionKey")]
-        [TestCase("wrongPassword", "K2JPOhoqNoysfnnD67QsWDSliHrjoSTRTvv9yiaKf30=", "1D43BFA074DF6DCEF6E44A7F5B5F56CDDD60BE198FBBB0222C96A5BD696F3CAA", ExpectedResult = PasswordVerificationResult.Failed, Description = "Encrypted: Wrong password but correct decryptionKey")]
-        [TestCase("1234567890", "qiuwRr4K7brpTcIzLFfR3iGG9zj4/z4ewHCVZmYUDKM=", "B491B602E0CE1D52450A8089FD2013B340743A7EFCC12B039BD11977A083ACA1", ExpectedResult = PasswordVerificationResult.Failed, Description = "Encrypted: Correct password but wrong decryptionKey")]
-        [TestCase("1234567890", "qiuwRr4K7brpTcIzLFfR3iGG9zj4/z4ewHCVZmYUDKM=", "InvalidDecryptionKey", ExpectedResult = PasswordVerificationResult.Failed, Description = "Encrypted: Invalid decryptionKey")]
-        public PasswordVerificationResult VerifyHashedPassword(string password, string encryptedPassword, string decryptionKey)
-        {
-            var member = new MemberIdentityUser() { PasswordConfig = null };
+        var member = new MemberIdentityUser { PasswordConfig = null };
 
-            var sut = new MemberPasswordHasher(
-                new LegacyPasswordSecurity(),
-                new JsonNetSerializer(),
-                Options.Create<LegacyPasswordMigrationSettings>(new LegacyPasswordMigrationSettings()
-                {
-                    MachineKeyDecryptionKey = decryptionKey
-                }),
-                NullLoggerFactory.Instance.CreateLogger<MemberPasswordHasher>());
+        var sut = new MemberPasswordHasher(
+            new LegacyPasswordSecurity(),
+            new JsonNetSerializer(),
+            Options.Create(new LegacyPasswordMigrationSettings { MachineKeyDecryptionKey = decryptionKey }),
+            NullLoggerFactory.Instance.CreateLogger<MemberPasswordHasher>());
 
-            return sut.VerifyHashedPassword(member, encryptedPassword, password);
-        }
+        return sut.VerifyHashedPassword(member, encryptedPassword, password);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs
index a82534c940..c7f8c4c2f5 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberRoleStoreTests.cs
@@ -11,383 +11,391 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security;
+
+[TestFixture]
+public class MemberRoleStoreTests
 {
-    [TestFixture]
-    public class MemberRoleStoreTests
+    [SetUp]
+    public void SetUp()
     {
-        private Mock<IMemberGroupService> _mockMemberGroupService;
-        private IdentityErrorDescriber ErrorDescriber => new IdentityErrorDescriber();
-        private UmbracoIdentityRoleBuilder _roleBuilder;
-        private MemberGroupBuilder _groupBuilder;
-
-        public MemberRoleStore CreateSut()
-        {
-            _mockMemberGroupService = new Mock<IMemberGroupService>();
-            return new MemberRoleStore(
-                _mockMemberGroupService.Object,
-                ErrorDescriber);
-        }
-
-        [SetUp]
-        public void SetUp()
-        {
-            _roleBuilder = new UmbracoIdentityRoleBuilder();
-            _groupBuilder = new MemberGroupBuilder();
-        }
-
-        [Test]
-        public void GivenICreateAMemberRole_AndTheGroupIsNull_ThenIShouldGetAFailedIdentityResult()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            var fakeCancellationToken = new CancellationToken();
-
-            // act
-            Action actual = () => sut.CreateAsync(null, fakeCancellationToken);
-
-            // assert
-            Assert.That(actual, Throws.ArgumentNullException);
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenICreateAMemberRole_AndTheGroupIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithTestName("777").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            IMemberGroup mockMemberGroup = Mock.Of<IMemberGroup>(m =>
-                m.Name == "fakeGroupName" && m.CreatorId == 77);
-
-            _mockMemberGroupService.Setup(x => x.Save(mockMemberGroup));
-
-            // act
-            IdentityResult identityResult = await sut.CreateAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-            _mockMemberGroupService.Verify(x => x.Save(It.IsAny<MemberGroup>()));
-        }
-
-        [Test]
-        public async Task GivenIUpdateAMemberRole_AndTheGroupExistsWithTheSameName_ThenIShouldGetASuccessResultAsyncButNoUpdatesMade()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();            
-            var fakeCancellationToken = new CancellationToken() { };
-
-            IMemberGroup mockMemberGroup = Mock.Of<IMemberGroup>(m =>
-                m.Name == "fakeGroupName" && m.CreatorId == 777);
-
-            _mockMemberGroupService.Setup(x => x.GetById(777)).Returns(mockMemberGroup);
-            _mockMemberGroupService.Setup(x => x.Save(mockMemberGroup));
-
-            // act
-            IdentityResult identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-            _mockMemberGroupService.Verify(x => x.GetById(777));
-        }
-
-        [Test]
-        public async Task GivenIUpdateAMemberRole_AndTheGroupExistsWithADifferentSameName_ThenIShouldGetASuccessResultAsyncWithUpdatesMade()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithName("fakeGroup777").WithId("777").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            IMemberGroup mockMemberGroup = Mock.Of<IMemberGroup>(m =>
-                m.Name == "fakeGroupName" && m.CreatorId == 777);
-
-            _mockMemberGroupService.Setup(x => x.GetById(777)).Returns(mockMemberGroup);
-            _mockMemberGroupService.Setup(x => x.Save(mockMemberGroup));
-
-            // act
-            IdentityResult identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-            _mockMemberGroupService.Verify(x => x.Save(It.IsAny<IMemberGroup>()));
-            _mockMemberGroupService.Verify(x => x.GetById(777));
-        }
-
-        [Test]
-        public async Task GivenIUpdateAMemberRole_AndTheGroupDoesntExist_ThenIShouldGetAFailureResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithTestName("777").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            // act
-            IdentityResult identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded == false);
-            Assert.IsTrue(identityResult.Errors.Any(x => x.Code == "IdentityMemberGroupNotFound" && x.Description == "Member group not found"));
-            _mockMemberGroupService.Verify(x => x.GetById(777));
-        }
-
-        [Test]
-        public async Task GivenIUpdateAMemberRole_AndTheIdCannotBeParsedToAnInt_ThenIShouldGetAFailureResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithTestName("7a77").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            // act
-            IdentityResult identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded == false);
-            Assert.IsTrue(identityResult.Errors.Any(x => x.Code == "IdentityIdParseError" && x.Description == "Cannot parse ID to int"));
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public void GivenIUpdateAMemberRole_AndTheRoleIsNull_ThenAnExceptionShouldBeThrown()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            // act
-            Action actual = () => sut.UpdateAsync(null, fakeCancellationToken);
-
-            // assert
-            Assert.That(actual, Throws.ArgumentNullException);
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenIDeleteAMemberRole_AndItExists_ThenTheMemberGroupShouldBeDeleted_AndIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithTestName("777").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            IMemberGroup mockMemberGroup = Mock.Of<IMemberGroup>(m =>
-                m.Name == "fakeGroupName" && m.CreatorId == 77);
-
-            _mockMemberGroupService.Setup(x => x.GetById(777)).Returns(mockMemberGroup);
-
-            // act
-            IdentityResult identityResult = await sut.DeleteAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-            _mockMemberGroupService.Verify(x => x.GetById(777));
-            _mockMemberGroupService.Verify(x => x.Delete(mockMemberGroup));
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenIDeleteAMemberRole_AndTheIdCannotBeParsedToAnInt_ThenTheMemberGroupShouldNotBeDeleted_AndIShouldGetAnArgumentException()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithTestName("7a77").Build();            
-            var fakeCancellationToken = new CancellationToken() { };
-
-            IMemberGroup mockMemberGroup = Mock.Of<IMemberGroup>(m =>
-                m.Name == "fakeGroupName" && m.CreatorId == 77);
-
-
-            // act
-            Assert.ThrowsAsync<ArgumentException>(async () => await sut.DeleteAsync(fakeRole, fakeCancellationToken));
-        }
-
-
-        [Test]
-        public async Task GivenIDeleteAMemberRole_AndItDoesntExist_ThenTheMemberGroupShouldNotBeDeleted_AndIShouldGetAFailResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithTestName("777").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            IMemberGroup mockMemberGroup = Mock.Of<IMemberGroup>(m =>
-                m.Name == "fakeGroupName" && m.CreatorId == 77);
-
-
-            // act
-            IdentityResult identityResult = await sut.DeleteAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded == false);
-            Assert.IsTrue(identityResult.Errors.Any(x => x.Code == "IdentityMemberGroupNotFound" && x.Description == "Member group not found"));
-            _mockMemberGroupService.Verify(x => x.GetById(777));
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenIFindAMemberRoleByRoleKey_AndRoleKeyExists_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
-            int fakeRoleId = 777;
-
-            IMemberGroup fakeMemberGroup = _groupBuilder.WithName("fakeGroupName").WithCreatorId(123).WithId(777).WithKey(Guid.NewGuid()).Build();
-
-            _mockMemberGroupService.Setup(x => x.GetById(fakeRoleId)).Returns(fakeMemberGroup);
-
-            // act
-            IdentityRole actual = await sut.FindByIdAsync(fakeRole.Id);
-
-            // assert
-            Assert.AreEqual(fakeRole.Name, actual.Name);
-            Assert.AreEqual(fakeRole.Id, actual.Id);
-            _mockMemberGroupService.Verify(x => x.GetById(fakeRoleId));
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenIFindAMemberRoleByRoleId_AndIdCannotBeParsedToAnIntOrGuid_ThenIShouldGetAFailureResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithTestName("7a77").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            // act
-            Action actual = () => sut.FindByIdAsync(fakeRole.Id, fakeCancellationToken);
-
-            // assert
-            Assert.That(actual, Throws.TypeOf<ArgumentOutOfRangeException>());
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenIFindAMemberRoleByRoleId_AndIdCannotBeParsedToAnIntButCanBeToGuid_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
-
-            var fakeRoleGuid = Guid.NewGuid();
-
-            IMemberGroup fakeMemberGroup = _groupBuilder.WithName("fakeGroupName").WithCreatorId(123).WithId(777).WithKey(fakeRoleGuid).Build();
-
-            _mockMemberGroupService.Setup(x => x.GetById(fakeRoleGuid)).Returns(fakeMemberGroup);
-
-            // act
-            IdentityRole actual = await sut.FindByIdAsync(fakeRoleGuid.ToString());
-
-            // assert
-            Assert.AreEqual(fakeRole.Name, actual.Name);
-            Assert.AreEqual(fakeRole.Id, actual.Id);
-            _mockMemberGroupService.Verify(x => x.GetById(fakeRoleGuid));
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-
-        [Test]
-        public async Task GivenIFindAMemberRoleByRoleId_AndIdCannotBeParsedToAGuidButCanBeToInt_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
-
-            var fakeRoleId = 777;
-
-            IMemberGroup fakeMemberGroup = _groupBuilder.WithName("fakeGroupName").WithCreatorId(123).WithId(777).WithKey(Guid.NewGuid()).Build();
-
-            _mockMemberGroupService.Setup(x => x.GetById(fakeRoleId)).Returns(fakeMemberGroup);
-
-            // act
-            IdentityRole actual = await sut.FindByIdAsync(fakeRoleId.ToString());
-
-            // assert
-            Assert.AreEqual(fakeRole.Name, actual.Name);
-            Assert.AreEqual(fakeRole.Id, actual.Id);
-            _mockMemberGroupService.Verify(x => x.GetById(fakeRoleId));
-            _mockMemberGroupService.VerifyNoOtherCalls();
-        }
-
-
-        [Test]
-        public async Task GivenIFindAMemberRoleByRoleName_AndRoleNameExists_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
-
-            IMemberGroup mockMemberGroup = Mock.Of<IMemberGroup>(m =>
-                m.Name == "fakeGroupName" &&
-                m.CreatorId == 123 &&
-                m.Id == 777);
-
-
-            _mockMemberGroupService.Setup(x => x.GetByName(fakeRole.Name)).Returns(mockMemberGroup);
-
-            // act
-            IdentityRole actual = await sut.FindByNameAsync(fakeRole.Name);
-
-            // assert
-            Assert.AreEqual(fakeRole.Name, actual.Name);
-            Assert.AreEqual(fakeRole.Id, actual.Id);
-            _mockMemberGroupService.Verify(x => x.GetByName(fakeRole.Name));
-        }
-
-        [Test]
-        public void GivenIFindAMemberRoleByRoleName_AndTheNameIsNull_ThenIShouldGetAnArgumentException()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithId("777").Build();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            // act
-            Action actual = () => sut.FindByNameAsync(fakeRole.Name, fakeCancellationToken);
-
-            // assert
-            Assert.That(actual, Throws.ArgumentNullException);
-            _mockMemberGroupService.VerifyNoOtherCalls();
-
-        }
-
-        [Test]
-        public void GivenIGetAMemberRoleId_AndTheRoleIsNull_ThenIShouldGetAnArgumentException()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            var fakeCancellationToken = new CancellationToken() { };
-
-            // act
-            Action actual = () => sut.GetRoleIdAsync(null, fakeCancellationToken);
-
-            // assert
-            Assert.That(actual, Throws.ArgumentNullException);
-        }
-
-        [Test]
-        public void GivenIGetAMemberRoleId_AndTheRoleIsNotNull_ThenIShouldGetTheMemberRole()
-        {
-            // arrange
-            MemberRoleStore sut = CreateSut();
-            UmbracoIdentityRole fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
-            string fakeRoleId = fakeRole.Id;
-
-            var fakeCancellationToken = new CancellationToken();
-
-            // act
-            Task<string> actual = sut.GetRoleIdAsync(fakeRole, fakeCancellationToken);
-
-            // assert
-            Assert.AreEqual(fakeRoleId, actual.Result);
-        }
+        _roleBuilder = new UmbracoIdentityRoleBuilder();
+        _groupBuilder = new MemberGroupBuilder();
+    }
+
+    private Mock<IMemberGroupService> _mockMemberGroupService;
+
+    private IdentityErrorDescriber ErrorDescriber => new();
+
+    private UmbracoIdentityRoleBuilder _roleBuilder;
+
+    private MemberGroupBuilder _groupBuilder;
+
+    public MemberRoleStore CreateSut()
+    {
+        _mockMemberGroupService = new Mock<IMemberGroupService>();
+        return new MemberRoleStore(
+            _mockMemberGroupService.Object,
+            ErrorDescriber);
+    }
+
+    [Test]
+    public void GivenICreateAMemberRole_AndTheGroupIsNull_ThenIShouldGetAFailedIdentityResult()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        Action actual = () => sut.CreateAsync(null, fakeCancellationToken);
+
+        // assert
+        Assert.That(actual, Throws.ArgumentNullException);
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task GivenICreateAMemberRole_AndTheGroupIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithTestName("777").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        var mockMemberGroup = Mock.Of<IMemberGroup>(m =>
+            m.Name == "fakeGroupName" && m.CreatorId == 77);
+
+        _mockMemberGroupService.Setup(x => x.Save(mockMemberGroup));
+
+        // act
+        var identityResult = await sut.CreateAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+        _mockMemberGroupService.Verify(x => x.Save(It.IsAny<MemberGroup>()));
+    }
+
+    [Test]
+    public async Task
+        GivenIUpdateAMemberRole_AndTheGroupExistsWithTheSameName_ThenIShouldGetASuccessResultAsyncButNoUpdatesMade()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        var mockMemberGroup = Mock.Of<IMemberGroup>(m =>
+            m.Name == "fakeGroupName" && m.CreatorId == 777);
+
+        _mockMemberGroupService.Setup(x => x.GetById(777)).Returns(mockMemberGroup);
+        _mockMemberGroupService.Setup(x => x.Save(mockMemberGroup));
+
+        // act
+        var identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+        _mockMemberGroupService.Verify(x => x.GetById(777));
+    }
+
+    [Test]
+    public async Task
+        GivenIUpdateAMemberRole_AndTheGroupExistsWithADifferentSameName_ThenIShouldGetASuccessResultAsyncWithUpdatesMade()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithName("fakeGroup777").WithId("777").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        var mockMemberGroup = Mock.Of<IMemberGroup>(m =>
+            m.Name == "fakeGroupName" && m.CreatorId == 777);
+
+        _mockMemberGroupService.Setup(x => x.GetById(777)).Returns(mockMemberGroup);
+        _mockMemberGroupService.Setup(x => x.Save(mockMemberGroup));
+
+        // act
+        var identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+        _mockMemberGroupService.Verify(x => x.Save(It.IsAny<IMemberGroup>()));
+        _mockMemberGroupService.Verify(x => x.GetById(777));
+    }
+
+    [Test]
+    public async Task GivenIUpdateAMemberRole_AndTheGroupDoesntExist_ThenIShouldGetAFailureResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithTestName("777").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        var identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded == false);
+        Assert.IsTrue(identityResult.Errors.Any(x =>
+            x.Code == "IdentityMemberGroupNotFound" && x.Description == "Member group not found"));
+        _mockMemberGroupService.Verify(x => x.GetById(777));
+    }
+
+    [Test]
+    public async Task GivenIUpdateAMemberRole_AndTheIdCannotBeParsedToAnInt_ThenIShouldGetAFailureResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithTestName("7a77").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        var identityResult = await sut.UpdateAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded == false);
+        Assert.IsTrue(identityResult.Errors.Any(x =>
+            x.Code == "IdentityIdParseError" && x.Description == "Cannot parse ID to int"));
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public void GivenIUpdateAMemberRole_AndTheRoleIsNull_ThenAnExceptionShouldBeThrown()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        Action actual = () => sut.UpdateAsync(null, fakeCancellationToken);
+
+        // assert
+        Assert.That(actual, Throws.ArgumentNullException);
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task
+        GivenIDeleteAMemberRole_AndItExists_ThenTheMemberGroupShouldBeDeleted_AndIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithTestName("777").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        var mockMemberGroup = Mock.Of<IMemberGroup>(m =>
+            m.Name == "fakeGroupName" && m.CreatorId == 77);
+
+        _mockMemberGroupService.Setup(x => x.GetById(777)).Returns(mockMemberGroup);
+
+        // act
+        var identityResult = await sut.DeleteAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+        _mockMemberGroupService.Verify(x => x.GetById(777));
+        _mockMemberGroupService.Verify(x => x.Delete(mockMemberGroup));
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task
+        GivenIDeleteAMemberRole_AndTheIdCannotBeParsedToAnInt_ThenTheMemberGroupShouldNotBeDeleted_AndIShouldGetAnArgumentException()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithTestName("7a77").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        var mockMemberGroup = Mock.Of<IMemberGroup>(m =>
+            m.Name == "fakeGroupName" && m.CreatorId == 77);
+
+        // act
+        Assert.ThrowsAsync<ArgumentException>(async () => await sut.DeleteAsync(fakeRole, fakeCancellationToken));
+    }
+
+    [Test]
+    public async Task
+        GivenIDeleteAMemberRole_AndItDoesntExist_ThenTheMemberGroupShouldNotBeDeleted_AndIShouldGetAFailResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithTestName("777").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        var mockMemberGroup = Mock.Of<IMemberGroup>(m =>
+            m.Name == "fakeGroupName" && m.CreatorId == 77);
+
+        // act
+        var identityResult = await sut.DeleteAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded == false);
+        Assert.IsTrue(identityResult.Errors.Any(x =>
+            x.Code == "IdentityMemberGroupNotFound" && x.Description == "Member group not found"));
+        _mockMemberGroupService.Verify(x => x.GetById(777));
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task GivenIFindAMemberRoleByRoleKey_AndRoleKeyExists_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
+        var fakeRoleId = 777;
+
+        IMemberGroup fakeMemberGroup = _groupBuilder.WithName("fakeGroupName").WithCreatorId(123).WithId(777)
+            .WithKey(Guid.NewGuid()).Build();
+
+        _mockMemberGroupService.Setup(x => x.GetById(fakeRoleId)).Returns(fakeMemberGroup);
+
+        // act
+        IdentityRole actual = await sut.FindByIdAsync(fakeRole.Id);
+
+        // assert
+        Assert.AreEqual(fakeRole.Name, actual.Name);
+        Assert.AreEqual(fakeRole.Id, actual.Id);
+        _mockMemberGroupService.Verify(x => x.GetById(fakeRoleId));
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task GivenIFindAMemberRoleByRoleId_AndIdCannotBeParsedToAnIntOrGuid_ThenIShouldGetAFailureResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithTestName("7a77").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        Action actual = () => sut.FindByIdAsync(fakeRole.Id, fakeCancellationToken);
+
+        // assert
+        Assert.That(actual, Throws.TypeOf<ArgumentOutOfRangeException>());
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task
+        GivenIFindAMemberRoleByRoleId_AndIdCannotBeParsedToAnIntButCanBeToGuid_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
+
+        var fakeRoleGuid = Guid.NewGuid();
+
+        IMemberGroup fakeMemberGroup = _groupBuilder.WithName("fakeGroupName").WithCreatorId(123).WithId(777)
+            .WithKey(fakeRoleGuid).Build();
+
+        _mockMemberGroupService.Setup(x => x.GetById(fakeRoleGuid)).Returns(fakeMemberGroup);
+
+        // act
+        IdentityRole actual = await sut.FindByIdAsync(fakeRoleGuid.ToString());
+
+        // assert
+        Assert.AreEqual(fakeRole.Name, actual.Name);
+        Assert.AreEqual(fakeRole.Id, actual.Id);
+        _mockMemberGroupService.Verify(x => x.GetById(fakeRoleGuid));
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task
+        GivenIFindAMemberRoleByRoleId_AndIdCannotBeParsedToAGuidButCanBeToInt_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
+
+        var fakeRoleId = 777;
+
+        IMemberGroup fakeMemberGroup = _groupBuilder.WithName("fakeGroupName").WithCreatorId(123).WithId(777)
+            .WithKey(Guid.NewGuid()).Build();
+
+        _mockMemberGroupService.Setup(x => x.GetById(fakeRoleId)).Returns(fakeMemberGroup);
+
+        // act
+        IdentityRole actual = await sut.FindByIdAsync(fakeRoleId.ToString());
+
+        // assert
+        Assert.AreEqual(fakeRole.Name, actual.Name);
+        Assert.AreEqual(fakeRole.Id, actual.Id);
+        _mockMemberGroupService.Verify(x => x.GetById(fakeRoleId));
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task GivenIFindAMemberRoleByRoleName_AndRoleNameExists_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
+
+        var mockMemberGroup = Mock.Of<IMemberGroup>(m =>
+            m.Name == "fakeGroupName" &&
+            m.CreatorId == 123 &&
+            m.Id == 777);
+
+        _mockMemberGroupService.Setup(x => x.GetByName(fakeRole.Name)).Returns(mockMemberGroup);
+
+        // act
+        IdentityRole actual = await sut.FindByNameAsync(fakeRole.Name);
+
+        // assert
+        Assert.AreEqual(fakeRole.Name, actual.Name);
+        Assert.AreEqual(fakeRole.Id, actual.Id);
+        _mockMemberGroupService.Verify(x => x.GetByName(fakeRole.Name));
+    }
+
+    [Test]
+    public void GivenIFindAMemberRoleByRoleName_AndTheNameIsNull_ThenIShouldGetAnArgumentException()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithId("777").Build();
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        Action actual = () => sut.FindByNameAsync(fakeRole.Name, fakeCancellationToken);
+
+        // assert
+        Assert.That(actual, Throws.ArgumentNullException);
+        _mockMemberGroupService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public void GivenIGetAMemberRoleId_AndTheRoleIsNull_ThenIShouldGetAnArgumentException()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        Action actual = () => sut.GetRoleIdAsync(null, fakeCancellationToken);
+
+        // assert
+        Assert.That(actual, Throws.ArgumentNullException);
+    }
+
+    [Test]
+    public void GivenIGetAMemberRoleId_AndTheRoleIsNotNull_ThenIShouldGetTheMemberRole()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeRole = _roleBuilder.WithName("fakeGroupName").WithId("777").Build();
+        var fakeRoleId = fakeRole.Id;
+
+        var fakeCancellationToken = CancellationToken.None;
+
+        // act
+        var actual = sut.GetRoleIdAsync(fakeRole, fakeCancellationToken);
+
+        // assert
+        Assert.AreEqual(fakeRoleId, actual.Result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs
index 0773da9c3f..083ed00bae 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/MemberUserStoreTests.cs
@@ -15,240 +15,250 @@ using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.UnitTests.Umbraco.Core.ShortStringHelper;
+using IScopeProvider = Umbraco.Cms.Infrastructure.Scoping.IScopeProvider;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security;
+
+[TestFixture]
+public class MemberUserStoreTests
 {
-    [TestFixture]
-    public class MemberUserStoreTests
+    private Mock<IMemberService> _mockMemberService;
+
+    public MemberUserStore CreateSut()
     {
-        private Mock<IMemberService> _mockMemberService;
+        _mockMemberService = new Mock<IMemberService>();
+        var mockScope = new Mock<IScope>();
+        var mockScopeProvider = new Mock<IScopeProvider>();
+        mockScopeProvider
+            .Setup(x => x.CreateScope(
+                It.IsAny<IsolationLevel>(),
+                It.IsAny<RepositoryCacheMode>(),
+                It.IsAny<IEventDispatcher>(),
+                It.IsAny<IScopedNotificationPublisher>(),
+                It.IsAny<bool?>(),
+                It.IsAny<bool>(),
+                It.IsAny<bool>()))
+            .Returns(mockScope.Object);
 
-        public MemberUserStore CreateSut()
+        return new MemberUserStore(
+            _mockMemberService.Object,
+            new UmbracoMapper(new MapDefinitionCollection(() => new List<IMapDefinition>()), mockScopeProvider.Object),
+            mockScopeProvider.Object,
+            new IdentityErrorDescriber(),
+            Mock.Of<IPublishedSnapshotAccessor>(),
+            Mock.Of<IExternalLoginWithKeyService>(),
+            Mock.Of<ITwoFactorLoginService>());
+    }
+
+    [Test]
+    public async Task GivenISetNormalizedUserName_ThenIShouldGetASuccessResult()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser { UserName = "MyName" };
+
+        // act
+        await sut.SetNormalizedUserNameAsync(fakeUser, "NewName", CancellationToken.None);
+
+        // assert
+        Assert.AreEqual("NewName", fakeUser.UserName);
+        Assert.AreEqual("NewName", await sut.GetNormalizedUserNameAsync(fakeUser, CancellationToken.None));
+    }
+
+    [Test]
+    public async Task GivenICreateUser_AndTheUserIsNull_ThenIShouldGetAFailedResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+
+        // act
+        var actual = await sut.CreateAsync(null);
+
+        // assert
+        Assert.IsFalse(actual.Succeeded);
+        Assert.IsTrue(actual.Errors.Any(x =>
+            x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
+        _mockMemberService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task GivenICreateUser_AndTheUserDoesNotHaveIdentity_ThenIShouldGetAFailedResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser();
+
+        IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
+        var mockMember = Mock.Of<IMember>(m =>
+            m.Name == "fakeName" &&
+            m.Email == "fakeemail@umbraco.com" &&
+            m.Username == "fakeUsername" &&
+            m.RawPasswordValue == "fakePassword" &&
+            m.ContentTypeAlias == fakeMemberType.Alias &&
+            m.HasIdentity == false);
+
+        _mockMemberService
+            .Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+            .Returns(mockMember);
+        _mockMemberService.Setup(x => x.Save(mockMember));
+
+        // act
+        var actual = await sut.CreateAsync(null);
+
+        // assert
+        Assert.IsFalse(actual.Succeeded);
+        Assert.IsTrue(actual.Errors.Any(x =>
+            x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
+        _mockMemberService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task GivenICreateANewUser_AndTheUserIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser();
+
+        IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
+        var mockMember = Mock.Of<IMember>(m =>
+            m.Name == "fakeName" &&
+            m.Email == "fakeemail@umbraco.com" &&
+            m.Username == "fakeUsername" &&
+            m.RawPasswordValue == "fakePassword" &&
+            m.Comments == "hello" &&
+            m.ContentTypeAlias == fakeMemberType.Alias &&
+            m.HasIdentity == true);
+
+        _mockMemberService
+            .Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()))
+            .Returns(mockMember);
+        _mockMemberService.Setup(x => x.Save(mockMember));
+
+        // act
+        var identityResult = await sut.CreateAsync(fakeUser, CancellationToken.None);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+        _mockMemberService.Verify(x =>
+            x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()));
+        _mockMemberService.Verify(x => x.Save(mockMember));
+    }
+
+    [Test]
+    public async Task GivenIUpdateAUser_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser
         {
-            _mockMemberService = new Mock<IMemberService>();
-            var mockScope = new Mock<IScope>();
-            var mockScopeProvider = new Mock<global::Umbraco.Cms.Infrastructure.Scoping.IScopeProvider>();
-            mockScopeProvider
-                .Setup(x => x.CreateScope(It.IsAny<IsolationLevel>(), It.IsAny<RepositoryCacheMode>(), It.IsAny<IEventDispatcher>(), It.IsAny<IScopedNotificationPublisher>(), It.IsAny<bool?>(), It.IsAny<bool>(), It.IsAny<bool>()))
-                .Returns(mockScope.Object);
+            Id = "123",
+            Name = "fakeName",
+            Email = "fakeemail@umbraco.com",
+            UserName = "fakeUsername",
+            Comments = "hello",
+            LastLoginDateUtc = DateTime.UtcNow,
+            LastPasswordChangeDateUtc = DateTime.UtcNow,
+            EmailConfirmed = true,
+            AccessFailedCount = 3,
+            LockoutEnd = DateTime.UtcNow.AddDays(10),
+            IsApproved = true,
+            PasswordHash = "abcde",
+            SecurityStamp = "abc",
+        };
+        fakeUser.Roles.Add(new IdentityUserRole<string> { RoleId = "role1", UserId = "123" });
+        fakeUser.Roles.Add(new IdentityUserRole<string> { RoleId = "role2", UserId = "123" });
 
-            return new MemberUserStore(
-                _mockMemberService.Object,
-                new UmbracoMapper(new MapDefinitionCollection(() => new List<IMapDefinition>()), mockScopeProvider.Object),
-                mockScopeProvider.Object,
-                new IdentityErrorDescriber(),
-                Mock.Of<IPublishedSnapshotAccessor>(),
-                Mock.Of<IExternalLoginWithKeyService>(),
-                Mock.Of<ITwoFactorLoginService>()
-                );
-        }
+        IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
+        var mockMember = Mock.Of<IMember>(m =>
+            m.Id == 123 &&
+            m.Name == "a" &&
+            m.Email == "a@b.com" &&
+            m.Username == "c" &&
+            m.RawPasswordValue == "d" &&
+            m.Comments == "e" &&
+            m.ContentTypeAlias == fakeMemberType.Alias &&
+            m.HasIdentity == true &&
+            m.EmailConfirmedDate == DateTime.MinValue &&
+            m.FailedPasswordAttempts == 0 &&
+            m.LastLockoutDate == DateTime.MinValue &&
+            m.IsApproved == false &&
+            m.RawPasswordValue == "xyz" &&
+            m.SecurityStamp == "xyz");
 
-        [Test]
-        public async Task GivenISetNormalizedUserName_ThenIShouldGetASuccessResult()
+        _mockMemberService.Setup(x => x.Save(mockMember));
+        _mockMemberService.Setup(x => x.GetById(123)).Returns(mockMember);
+
+        // act
+        var identityResult = await sut.UpdateAsync(fakeUser, CancellationToken.None);
+
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+
+        Assert.AreEqual(fakeUser.Name, mockMember.Name);
+        Assert.AreEqual(fakeUser.Email, mockMember.Email);
+        Assert.AreEqual(fakeUser.UserName, mockMember.Username);
+        Assert.AreEqual(fakeUser.Comments, mockMember.Comments);
+        Assert.AreEqual(fakeUser.LastPasswordChangeDateUtc.Value.ToLocalTime(), mockMember.LastPasswordChangeDate);
+        Assert.AreEqual(fakeUser.LastLoginDateUtc.Value.ToLocalTime(), mockMember.LastLoginDate);
+        Assert.AreEqual(fakeUser.AccessFailedCount, mockMember.FailedPasswordAttempts);
+        Assert.AreEqual(fakeUser.IsLockedOut, mockMember.IsLockedOut);
+        Assert.AreEqual(fakeUser.IsApproved, mockMember.IsApproved);
+        Assert.AreEqual(fakeUser.PasswordHash, mockMember.RawPasswordValue);
+        Assert.AreEqual(fakeUser.SecurityStamp, mockMember.SecurityStamp);
+        Assert.AreNotEqual(DateTime.MinValue, mockMember.EmailConfirmedDate.Value);
+
+        _mockMemberService.Verify(x => x.Save(mockMember));
+        _mockMemberService.Verify(x => x.GetById(123));
+        _mockMemberService.Verify(x => x.ReplaceRoles(new[] { 123 }, new[] { "role1", "role2" }));
+    }
+
+    [Test]
+    public async Task GivenIDeleteUser_AndTheUserIsNotPresent_ThenIShouldGetAFailedResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+
+        // act
+        var actual = await sut.DeleteAsync(null);
+
+        // assert
+        Assert.IsTrue(actual.Succeeded == false);
+        Assert.IsTrue(actual.Errors.Any(x =>
+            x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
+        _mockMemberService.VerifyNoOtherCalls();
+    }
+
+    [Test]
+    public async Task GivenIDeleteUser_AndTheUserIsDeletedCorrectly_ThenIShouldGetASuccessResultAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser(777);
+        var fakeCancellationToken = CancellationToken.None;
+
+        IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
+        IMember mockMember = new Member(fakeMemberType)
         {
-            // arrange
-            MemberUserStore sut = CreateSut();
-            var fakeUser = new MemberIdentityUser()
-            {
-                UserName = "MyName"
-            };
+            Id = 777,
+            Name = "fakeName",
+            Email = "fakeemail@umbraco.com",
+            Username = "fakeUsername",
+            RawPasswordValue = "fakePassword",
+        };
 
-            // act
-            await sut.SetNormalizedUserNameAsync(fakeUser, "NewName", CancellationToken.None);
+        _mockMemberService.Setup(x => x.GetById(mockMember.Id)).Returns(mockMember);
+        _mockMemberService.Setup(x => x.Delete(mockMember));
 
-            // assert
-            Assert.AreEqual("NewName", fakeUser.UserName);
-            Assert.AreEqual("NewName", await sut.GetNormalizedUserNameAsync(fakeUser, CancellationToken.None));
-        }
+        // act
+        var identityResult = await sut.DeleteAsync(fakeUser, fakeCancellationToken);
 
-        [Test]
-        public async Task GivenICreateUser_AndTheUserIsNull_ThenIShouldGetAFailedResultAsync()
-        {
-            // arrange
-            MemberUserStore sut = CreateSut();
-
-            // act
-            IdentityResult actual = await sut.CreateAsync(null);
-
-            // assert
-            Assert.IsFalse(actual.Succeeded);
-            Assert.IsTrue(actual.Errors.Any(x => x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
-            _mockMemberService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenICreateUser_AndTheUserDoesNotHaveIdentity_ThenIShouldGetAFailedResultAsync()
-        {
-            // arrange
-            MemberUserStore sut = CreateSut();
-            var fakeUser = new MemberIdentityUser();
-
-            IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
-            IMember mockMember = Mock.Of<IMember>(m =>
-                m.Name == "fakeName" &&
-                m.Email == "fakeemail@umbraco.com" &&
-                m.Username == "fakeUsername" &&
-                m.RawPasswordValue == "fakePassword" &&
-                m.ContentTypeAlias == fakeMemberType.Alias &&
-                m.HasIdentity == false);
-
-            _mockMemberService.Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(mockMember);
-            _mockMemberService.Setup(x => x.Save(mockMember));
-
-            // act
-            IdentityResult actual = await sut.CreateAsync(null);
-
-            // assert
-            Assert.IsFalse(actual.Succeeded);
-            Assert.IsTrue(actual.Errors.Any(x => x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
-            _mockMemberService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenICreateANewUser_AndTheUserIsPopulatedCorrectly_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberUserStore sut = CreateSut();
-            var fakeUser = new MemberIdentityUser();
-
-            IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
-            IMember mockMember = Mock.Of<IMember>(m =>
-                m.Name == "fakeName" &&
-                m.Email == "fakeemail@umbraco.com" &&
-                m.Username == "fakeUsername" &&
-                m.RawPasswordValue == "fakePassword" &&
-                m.Comments == "hello" &&
-                m.ContentTypeAlias == fakeMemberType.Alias &&
-                m.HasIdentity == true);
-
-            _mockMemberService.Setup(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>())).Returns(mockMember);
-            _mockMemberService.Setup(x => x.Save(mockMember));
-
-            // act
-            IdentityResult identityResult = await sut.CreateAsync(fakeUser, CancellationToken.None);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-            _mockMemberService.Verify(x => x.CreateMember(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>()));
-            _mockMemberService.Verify(x => x.Save(mockMember));
-        }
-
-        [Test]
-        public async Task GivenIUpdateAUser_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberUserStore sut = CreateSut();
-            var fakeUser = new MemberIdentityUser
-            {
-                Id = "123",
-                Name = "fakeName",
-                Email = "fakeemail@umbraco.com",
-                UserName = "fakeUsername",
-                Comments = "hello",
-                LastLoginDateUtc = DateTime.UtcNow,
-                LastPasswordChangeDateUtc = DateTime.UtcNow,
-                EmailConfirmed = true,
-                AccessFailedCount = 3,
-                LockoutEnd = DateTime.UtcNow.AddDays(10),
-                IsApproved = true,
-                PasswordHash = "abcde",
-                SecurityStamp = "abc"
-            };
-            fakeUser.Roles.Add(new IdentityUserRole<string> { RoleId = "role1", UserId = "123" });
-            fakeUser.Roles.Add(new IdentityUserRole<string> { RoleId = "role2", UserId = "123" });
-
-
-            IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
-            IMember mockMember = Mock.Of<IMember>(m =>
-                m.Id == 123 &&
-                m.Name == "a" &&
-                m.Email == "a@b.com" &&
-                m.Username == "c" &&
-                m.RawPasswordValue == "d" &&
-                m.Comments == "e" &&
-                m.ContentTypeAlias == fakeMemberType.Alias &&
-                m.HasIdentity == true &&
-                m.EmailConfirmedDate == DateTime.MinValue &&
-                m.FailedPasswordAttempts == 0 &&
-                m.LastLockoutDate == DateTime.MinValue &&
-                m.IsApproved == false &&
-                m.RawPasswordValue == "xyz" &&
-                m.SecurityStamp == "xyz");
-
-            _mockMemberService.Setup(x => x.Save(mockMember));
-            _mockMemberService.Setup(x => x.GetById(123)).Returns(mockMember);
-
-            // act
-            IdentityResult identityResult = await sut.UpdateAsync(fakeUser, CancellationToken.None);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-
-            Assert.AreEqual(fakeUser.Name, mockMember.Name);
-            Assert.AreEqual(fakeUser.Email, mockMember.Email);
-            Assert.AreEqual(fakeUser.UserName, mockMember.Username);
-            Assert.AreEqual(fakeUser.Comments, mockMember.Comments);
-            Assert.AreEqual(fakeUser.LastPasswordChangeDateUtc.Value.ToLocalTime(), mockMember.LastPasswordChangeDate);
-            Assert.AreEqual(fakeUser.LastLoginDateUtc.Value.ToLocalTime(), mockMember.LastLoginDate);
-            Assert.AreEqual(fakeUser.AccessFailedCount, mockMember.FailedPasswordAttempts);
-            Assert.AreEqual(fakeUser.IsLockedOut, mockMember.IsLockedOut);
-            Assert.AreEqual(fakeUser.IsApproved, mockMember.IsApproved);
-            Assert.AreEqual(fakeUser.PasswordHash, mockMember.RawPasswordValue);
-            Assert.AreEqual(fakeUser.SecurityStamp, mockMember.SecurityStamp);
-            Assert.AreNotEqual(DateTime.MinValue, mockMember.EmailConfirmedDate.Value);
-
-            _mockMemberService.Verify(x => x.Save(mockMember));
-            _mockMemberService.Verify(x => x.GetById(123));
-            _mockMemberService.Verify(x => x.ReplaceRoles(new[] { 123 }, new[] { "role1", "role2" }));
-        }
-
-        [Test]
-        public async Task GivenIDeleteUser_AndTheUserIsNotPresent_ThenIShouldGetAFailedResultAsync()
-        {
-            // arrange
-            MemberUserStore sut = CreateSut();
-
-            // act
-            IdentityResult actual = await sut.DeleteAsync(null);
-
-            // assert
-            Assert.IsTrue(actual.Succeeded == false);
-            Assert.IsTrue(actual.Errors.Any(x => x.Code == "IdentityErrorUserStore" && x.Description == "Value cannot be null. (Parameter 'user')"));
-            _mockMemberService.VerifyNoOtherCalls();
-        }
-
-        [Test]
-        public async Task GivenIDeleteUser_AndTheUserIsDeletedCorrectly_ThenIShouldGetASuccessResultAsync()
-        {
-            // arrange
-            MemberUserStore sut = CreateSut();
-            var fakeUser = new MemberIdentityUser(777);
-            var fakeCancellationToken = new CancellationToken() { };
-
-            IMemberType fakeMemberType = new MemberType(new MockShortStringHelper(), 77);
-            IMember mockMember = new Member(fakeMemberType)
-            {
-                Id = 777,
-                Name = "fakeName",
-                Email = "fakeemail@umbraco.com",
-                Username = "fakeUsername",
-                RawPasswordValue = "fakePassword"
-            };
-
-            _mockMemberService.Setup(x => x.GetById(mockMember.Id)).Returns(mockMember);
-            _mockMemberService.Setup(x => x.Delete(mockMember));
-
-            // act
-            IdentityResult identityResult = await sut.DeleteAsync(fakeUser, fakeCancellationToken);
-
-            // assert
-            Assert.IsTrue(identityResult.Succeeded);
-            Assert.IsTrue(!identityResult.Errors.Any());
-            _mockMemberService.Verify(x => x.GetById(mockMember.Id));
-            _mockMemberService.Verify(x => x.Delete(mockMember));
-            _mockMemberService.VerifyNoOtherCalls();
-        }
+        // assert
+        Assert.IsTrue(identityResult.Succeeded);
+        Assert.IsTrue(!identityResult.Errors.Any());
+        _mockMemberService.Verify(x => x.GetById(mockMember.Id));
+        _mockMemberService.Verify(x => x.Delete(mockMember));
+        _mockMemberService.VerifyNoOtherCalls();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
index fd8907a451..669790b28b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/NoOpLookupNormalizerTests.cs
@@ -5,56 +5,55 @@ using System;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security;
+
+public class NoopLookupNormalizerTests
 {
-    public class NoopLookupNormalizerTests
+    [Test]
+    public void NormalizeName_Expect_Input_Returned()
     {
-        [Test]
-        public void NormalizeName_Expect_Input_Returned()
-        {
-            var name = Guid.NewGuid().ToString();
-            var sut = new NoopLookupNormalizer();
+        var name = Guid.NewGuid().ToString();
+        var sut = new NoopLookupNormalizer();
 
-            var normalizedName = sut.NormalizeName(name);
+        var normalizedName = sut.NormalizeName(name);
 
-            Assert.AreEqual(name, normalizedName);
-        }
+        Assert.AreEqual(name, normalizedName);
+    }
 
-        [Test]
-        public void NormalizeEmail_Expect_Input_Returned()
-        {
-            var email = $"{Guid.NewGuid()}@umbraco";
-            var sut = new NoopLookupNormalizer();
+    [Test]
+    public void NormalizeEmail_Expect_Input_Returned()
+    {
+        var email = $"{Guid.NewGuid()}@umbraco";
+        var sut = new NoopLookupNormalizer();
 
-            var normalizedEmail = sut.NormalizeEmail(email);
+        var normalizedEmail = sut.NormalizeEmail(email);
 
-            Assert.AreEqual(email, normalizedEmail);
-        }
+        Assert.AreEqual(email, normalizedEmail);
+    }
 
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [TestCase(" ")]
-        public void NormalizeName_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string name)
-        {
-            var sut = new NoopLookupNormalizer();
+    [Test]
+    [TestCase(null)]
+    [TestCase("")]
+    [TestCase(" ")]
+    public void NormalizeName_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string name)
+    {
+        var sut = new NoopLookupNormalizer();
 
-            var normalizedName = sut.NormalizeName(name);
+        var normalizedName = sut.NormalizeName(name);
 
-            Assert.AreEqual(name, normalizedName);
-        }
+        Assert.AreEqual(name, normalizedName);
+    }
 
-        [Test]
-        [TestCase(null)]
-        [TestCase("")]
-        [TestCase(" ")]
-        public void NormalizeEmail_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string email)
-        {
-            var sut = new NoopLookupNormalizer();
+    [Test]
+    [TestCase(null)]
+    [TestCase("")]
+    [TestCase(" ")]
+    public void NormalizeEmail_When_Name_Null_Or_Whitespace_Expect_Same_Returned(string email)
+    {
+        var sut = new NoopLookupNormalizer();
 
-            var normalizedEmail = sut.NormalizeEmail(email);
+        var normalizedEmail = sut.NormalizeEmail(email);
 
-            Assert.AreEqual(email, normalizedEmail);
-        }
+        Assert.AreEqual(email, normalizedEmail);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/UmbracoPasswordHasherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/UmbracoPasswordHasherTests.cs
index db4ec3392f..c01ff5a611 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/UmbracoPasswordHasherTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Security/UmbracoPasswordHasherTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Security.Cryptography;
-using System.Text;
 using AutoFixture.NUnit3;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Options;
@@ -11,117 +8,116 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Security;
+
+[TestFixture]
+public class UmbracoPasswordHasherTests
 {
-    [TestFixture]
-    public class UmbracoPasswordHasherTests
+    // Technically MD5, HMACSHA384 & HMACSHA512 were also possible but opt in as opposed to historic defaults.
+    [Test]
+    [InlineAutoMoqData("HMACSHA256", "Umbraco9Rocks!", "uB/pLEhhe1W7EtWMv/pSgg==1y8+aso9+h3AKRtJXlVYeg2TZKJUr64hccj82ZZ7Ksk=")] // Actually HMACSHA256
+    [InlineAutoMoqData("SHA1", "Umbraco9Rocks!", "6tZGfG9NTxJJYp19Fac9og==zzRggqANxhb+CbD/VabEt8cIde8=")] // When SHA1 is set on machine key.
+    public void VerifyHashedPassword_ValidHashWithoutLegacyEncoding_ReturnsSuccessRehashNeeded(
+        string algorithm,
+        string providedPassword,
+        string hashedPassword,
+        [Frozen] IJsonSerializer jsonSerializer,
+        TestUserStub aUser,
+        UmbracoPasswordHasher<TestUserStub> sut)
     {
-        // Technically MD5, HMACSHA384 & HMACSHA512 were also possible but opt in as opposed to historic defaults.
-        [Test]
-        [InlineAutoMoqData("HMACSHA256", "Umbraco9Rocks!", "uB/pLEhhe1W7EtWMv/pSgg==1y8+aso9+h3AKRtJXlVYeg2TZKJUr64hccj82ZZ7Ksk=")] // Actually HMACSHA256
-        [InlineAutoMoqData("SHA1", "Umbraco9Rocks!", "6tZGfG9NTxJJYp19Fac9og==zzRggqANxhb+CbD/VabEt8cIde8=")] // When SHA1 is set on machine key.
-        public void VerifyHashedPassword_ValidHashWithoutLegacyEncoding_ReturnsSuccessRehashNeeded(
-            string algorithm,
-            string providedPassword,
-            string hashedPassword,
-            [Frozen] IJsonSerializer jsonSerializer,
-            TestUserStub aUser,
-            UmbracoPasswordHasher<TestUserStub> sut)
+        Mock.Get(jsonSerializer)
+            .Setup(x => x.Deserialize<PersistedPasswordSettings>(It.IsAny<string>()))
+            .Returns(new PersistedPasswordSettings { HashAlgorithm = algorithm });
+
+        var result = sut.VerifyHashedPassword(aUser, hashedPassword, providedPassword);
+
+        Assert.AreEqual(PasswordVerificationResult.SuccessRehashNeeded, result);
+    }
+
+    [Test]
+    [InlineAutoMoqData("HMACSHA1", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
+    [InlineAutoMoqData("HMACSHA256", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
+    [InlineAutoMoqData("FOOBARBAZQUX", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
+    [InlineAutoMoqData("", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
+    [InlineAutoMoqData(null, "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
+    public void VerifyHashedPassword_ValidHashWithLegacyEncoding_ReturnsSuccessRehashNeeded(
+        string algorithm,
+        string providedPassword,
+        string hashedPassword,
+        [Frozen] IJsonSerializer jsonSerializer,
+        TestUserStub aUser,
+        UmbracoPasswordHasher<TestUserStub> sut)
+    {
+        Mock.Get(jsonSerializer)
+            .Setup(x => x.Deserialize<PersistedPasswordSettings>(It.IsAny<string>()))
+            .Returns(new PersistedPasswordSettings { HashAlgorithm = algorithm });
+
+        var result = sut.VerifyHashedPassword(aUser, hashedPassword, providedPassword);
+
+        Assert.AreEqual(PasswordVerificationResult.SuccessRehashNeeded, result);
+    }
+
+    [Test]
+    [InlineAutoMoqData("HMACSHA256", "Umbraco9Rocks!", "aB/cDeFaBcDefAbcD/EfaB==1y8+aso9+h3AKRtJXlVYeg2TZKJUr64hccj82ZZ7Ksk=")]
+    public void VerifyHashedPassword_WithIncorrectPassword_ReturnsFailed(
+        string algorithm,
+        string providedPassword,
+        string hashedPassword,
+        [Frozen] IJsonSerializer jsonSerializer,
+        TestUserStub aUser,
+        UmbracoPasswordHasher<TestUserStub> sut)
+    {
+        Mock.Get(jsonSerializer)
+            .Setup(x => x.Deserialize<PersistedPasswordSettings>(It.IsAny<string>()))
+            .Returns(new PersistedPasswordSettings { HashAlgorithm = algorithm });
+
+        var result = sut.VerifyHashedPassword(aUser, hashedPassword, providedPassword);
+
+        Assert.AreEqual(PasswordVerificationResult.Failed, result);
+    }
+
+    [Test]
+    [AutoMoqData]
+    public void VerifyHashedPassword_WithIdentityV1OrV2StyleHash_ReturnsSuccessRehashNeeded(
+        TestUserStub aUser,
+        UmbracoPasswordHasher<TestUserStub> sut)
+    {
+        var options = Options.Create(new PasswordHasherOptions
         {
-            Mock.Get(jsonSerializer)
-                .Setup(x => x.Deserialize<PersistedPasswordSettings>(It.IsAny<string>()))
-                .Returns(new PersistedPasswordSettings{ HashAlgorithm = algorithm });
+            CompatibilityMode = PasswordHasherCompatibilityMode.IdentityV2,
+        });
 
-            var result = sut.VerifyHashedPassword(aUser, hashedPassword, providedPassword);
+        var upstreamHasher = new PasswordHasher<TestUserStub>(options);
 
-            Assert.AreEqual(PasswordVerificationResult.SuccessRehashNeeded, result);
-        }
+        const string password = "Umbraco9Rocks!";
+        var identityV1Or2StyleHash = upstreamHasher.HashPassword(aUser, password);
+        var result = sut.VerifyHashedPassword(aUser, identityV1Or2StyleHash, password);
 
-        [Test]
-        [InlineAutoMoqData("HMACSHA1", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
-        [InlineAutoMoqData("HMACSHA256", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
-        [InlineAutoMoqData("FOOBARBAZQUX", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
-        [InlineAutoMoqData("", "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
-        [InlineAutoMoqData(null, "Umbraco9Rocks!", "t0U8atXTX/efNCtTafukwZeIpr8=")]
-        public void VerifyHashedPassword_ValidHashWithLegacyEncoding_ReturnsSuccessRehashNeeded(
-            string algorithm,
-            string providedPassword,
-            string hashedPassword,
-            [Frozen] IJsonSerializer jsonSerializer,
-            TestUserStub aUser,
-            UmbracoPasswordHasher<TestUserStub> sut)
+        Assert.AreEqual(PasswordVerificationResult.SuccessRehashNeeded, result);
+    }
+
+    [Test]
+    [AutoMoqData]
+    public void VerifyHashedPassword_WithIdentityV3StyleHash_ReturnsSuccess(
+        TestUserStub aUser,
+        UmbracoPasswordHasher<TestUserStub> sut)
+    {
+        var options = Options.Create(new PasswordHasherOptions
         {
-            Mock.Get(jsonSerializer)
-                .Setup(x => x.Deserialize<PersistedPasswordSettings>(It.IsAny<string>()))
-                .Returns(new PersistedPasswordSettings { HashAlgorithm = algorithm });
+            CompatibilityMode = PasswordHasherCompatibilityMode.IdentityV3,
+        });
 
-            var result = sut.VerifyHashedPassword(aUser, hashedPassword, providedPassword);
+        var upstreamHasher = new PasswordHasher<TestUserStub>(options);
 
-            Assert.AreEqual(PasswordVerificationResult.SuccessRehashNeeded, result);
-        }
+        const string password = "Umbraco9Rocks!";
+        var identityV1Or2StyleHash = upstreamHasher.HashPassword(aUser, password);
+        var result = sut.VerifyHashedPassword(aUser, identityV1Or2StyleHash, password);
 
-        [Test]
-        [InlineAutoMoqData("HMACSHA256", "Umbraco9Rocks!", "aB/cDeFaBcDefAbcD/EfaB==1y8+aso9+h3AKRtJXlVYeg2TZKJUr64hccj82ZZ7Ksk=")]
-        public void VerifyHashedPassword_WithIncorrectPassword_ReturnsFailed(
-            string algorithm,
-            string providedPassword,
-            string hashedPassword,
-            [Frozen] IJsonSerializer jsonSerializer,
-            TestUserStub aUser,
-            UmbracoPasswordHasher<TestUserStub> sut)
-        {
-            Mock.Get(jsonSerializer)
-                .Setup(x => x.Deserialize<PersistedPasswordSettings>(It.IsAny<string>()))
-                .Returns(new PersistedPasswordSettings { HashAlgorithm = algorithm });
+        Assert.AreEqual(PasswordVerificationResult.Success, result);
+    }
 
-            var result = sut.VerifyHashedPassword(aUser, hashedPassword, providedPassword);
-
-            Assert.AreEqual(PasswordVerificationResult.Failed, result);
-        }
-
-        [Test]
-        [AutoMoqData]
-        public void VerifyHashedPassword_WithIdentityV1OrV2StyleHash_ReturnsSuccessRehashNeeded(
-            TestUserStub aUser,
-            UmbracoPasswordHasher<TestUserStub> sut)
-        {
-            var options = Options.Create(new PasswordHasherOptions
-            {
-                CompatibilityMode = PasswordHasherCompatibilityMode.IdentityV2
-            });
-
-            var upstreamHasher = new PasswordHasher<TestUserStub>(options);
-
-            const string password = "Umbraco9Rocks!";
-            var identityV1Or2StyleHash = upstreamHasher.HashPassword(aUser, password);
-            var result = sut.VerifyHashedPassword(aUser, identityV1Or2StyleHash, password);
-
-            Assert.AreEqual(PasswordVerificationResult.SuccessRehashNeeded, result);
-        }
-
-        [Test]
-        [AutoMoqData]
-        public void VerifyHashedPassword_WithIdentityV3StyleHash_ReturnsSuccess(
-            TestUserStub aUser,
-            UmbracoPasswordHasher<TestUserStub> sut)
-        {
-            var options = Options.Create(new PasswordHasherOptions
-            {
-                CompatibilityMode = PasswordHasherCompatibilityMode.IdentityV3
-            });
-
-            var upstreamHasher = new PasswordHasher<TestUserStub>(options);
-
-            const string password = "Umbraco9Rocks!";
-            var identityV1Or2StyleHash = upstreamHasher.HashPassword(aUser, password);
-            var result = sut.VerifyHashedPassword(aUser, identityV1Or2StyleHash, password);
-
-            Assert.AreEqual(PasswordVerificationResult.Success, result);
-        }
-
-        public class TestUserStub : UmbracoIdentityUser
-        {
-            public TestUserStub() => PasswordConfig = "not null or empty";
-        }
+    public class TestUserStub : UmbracoIdentityUser
+    {
+        public TestUserStub() => PasswordConfig = "not null or empty";
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/AutoInterningStringConverterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/AutoInterningStringConverterTests.cs
index 472536351b..ee9c147a42 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/AutoInterningStringConverterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/AutoInterningStringConverterTests.cs
@@ -1,64 +1,56 @@
-using Newtonsoft.Json;
-using NUnit.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
+using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Serialization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Serialization;
+
+[TestFixture]
+public class AutoInterningStringConverterTests
 {
-    [TestFixture]
-    public class AutoInterningStringConverterTests
+    [Test]
+    public void Intern_Property_String()
     {
-        [Test]
-        public void Intern_Property_String()
+        var str1 = "Hello";
+        var obj = new Test { Name = str1 + Guid.NewGuid() };
+
+        // ensure the raw value is not interned
+        Assert.IsNull(string.IsInterned(obj.Name));
+
+        var serialized = JsonConvert.SerializeObject(obj);
+        obj = JsonConvert.DeserializeObject<Test>(serialized);
+
+        Assert.IsNotNull(string.IsInterned(obj.Name));
+    }
+
+    [Test]
+    public void Intern_Property_Dictionary()
+    {
+        var str1 = "key";
+        var obj = new Test
         {
-            var str1 = "Hello";
-            var obj = new Test
-            {
-                Name = str1 + Guid.NewGuid()
-            };
+            Values = new Dictionary<string, int> { [str1 + Guid.NewGuid()] = 0, [str1 + Guid.NewGuid()] = 1 },
+        };
 
-            // ensure the raw value is not interned
-            Assert.IsNull(string.IsInterned(obj.Name));
+        // ensure the raw value is not interned
+        Assert.IsNull(string.IsInterned(obj.Values.Keys.First()));
+        Assert.IsNull(string.IsInterned(obj.Values.Keys.Last()));
 
-            var serialized = JsonConvert.SerializeObject(obj);
-            obj = JsonConvert.DeserializeObject<Test>(serialized);
+        var serialized = JsonConvert.SerializeObject(obj);
+        obj = JsonConvert.DeserializeObject<Test>(serialized);
 
-            Assert.IsNotNull(string.IsInterned(obj.Name));
-        }
+        Assert.IsNotNull(string.IsInterned(obj.Values.Keys.First()));
+        Assert.IsNotNull(string.IsInterned(obj.Values.Keys.Last()));
+    }
 
-        [Test]
-        public void Intern_Property_Dictionary()
-        {
-            var str1 = "key";
-            var obj = new Test
-            {
-                Values = new Dictionary<string, int>
-                {
-                    [str1 + Guid.NewGuid()] = 0,
-                    [str1 + Guid.NewGuid()] = 1
-                }
-            };
+    public class Test
+    {
+        [JsonConverter(typeof(AutoInterningStringConverter))]
+        public string Name { get; set; }
 
-            // ensure the raw value is not interned
-            Assert.IsNull(string.IsInterned(obj.Values.Keys.First()));
-            Assert.IsNull(string.IsInterned(obj.Values.Keys.Last()));
-
-            var serialized = JsonConvert.SerializeObject(obj);
-            obj = JsonConvert.DeserializeObject<Test>(serialized);
-
-            Assert.IsNotNull(string.IsInterned(obj.Values.Keys.First()));
-            Assert.IsNotNull(string.IsInterned(obj.Values.Keys.Last()));
-        }
-
-        public class Test
-        {
-            [JsonConverter(typeof(AutoInterningStringConverter))]
-            public string Name { get; set; }
-
-            [JsonConverter(typeof(AutoInterningStringKeyCaseInsensitiveDictionaryConverter<int>))]
-            public Dictionary<string, int> Values { get; set; } = new Dictionary<string, int>();
-        }
+        [JsonConverter(typeof(AutoInterningStringKeyCaseInsensitiveDictionaryConverter<int>))]
+        public Dictionary<string, int> Values { get; set; } = new();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs
index 6b11953290..6f5f143891 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Serialization/JsonNetSerializerTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using Newtonsoft.Json;
@@ -6,80 +6,76 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Serialization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Serialization;
+
+[TestFixture]
+public class JsonNetSerializerTests
 {
-    [TestFixture]
-    public class JsonNetSerializerTests
+    private IJsonSerializer Sut => new JsonNetSerializer();
+
+    [Test]
+    public void DeserializeSubset__Subset_as_integer()
     {
-        private IJsonSerializer Sut => new JsonNetSerializer();
+        var expected = 3;
+        var key = "int";
+        var full = $"{{\"{key}\": {expected}}}";
 
-        [Test]
-        public void DeserializeSubset__Subset_as_integer()
-        {
-            var expected = 3;
-            var key = "int";
-            var full = $"{{\"{key}\": {expected}}}";
+        var actual = Sut.DeserializeSubset<int>(full, key);
 
-            var actual = Sut.DeserializeSubset<int>(full, key);
+        Assert.AreEqual(expected, actual);
+    }
 
-            Assert.AreEqual(expected, actual);
-        }
+    [Test]
+    public void DeserializeSubset__Subset_as_string()
+    {
+        var expected = "test";
+        var key = "text";
+        var full = $"{{\"{key}\": \"{expected}\"}}";
 
-        [Test]
-        public void DeserializeSubset__Subset_as_string()
-        {
-            var expected = "test";
-            var key = "text";
-            var full = $"{{\"{key}\": \"{expected}\"}}";
+        var actual = Sut.DeserializeSubset<string>(full, key);
 
-            var actual = Sut.DeserializeSubset<string>(full, key);
+        Assert.AreEqual(expected, actual);
+    }
 
-            Assert.AreEqual(expected, actual);
-        }
+    [Test]
+    public void DeserializeSubset__Subset_nested_value_as_string()
+    {
+        var expected = "test";
+        var key = "text";
+        var key2 = "text2";
+        var full = $"{{\"{key}\": {{\"{key2}\": \"{expected}\"}}}}";
 
-        [Test]
-        public void DeserializeSubset__Subset_nested_value_as_string()
-        {
-            var expected = "test";
-            var key = "text";
-            var key2 = "text2";
-            var full = $"{{\"{key}\": {{\"{key2}\": \"{expected}\"}}}}";
+        var actual = Sut.DeserializeSubset<string>(full, key + "." + key2);
 
-            var actual = Sut.DeserializeSubset<string>(full, key + "." + key2);
+        Assert.AreEqual(expected, actual);
+    }
 
-            Assert.AreEqual(expected, actual);
-        }
+    [Test]
+    public void DeserializeSubset__Subset_value_as_object()
+    {
+        var expected = new MyStruct { Key = "Test" };
+        var key = nameof(MyStruct.Key);
+        var full = $"{{\"{key}\": {JsonConvert.SerializeObject(expected)}";
 
-        [Test]
-        public void DeserializeSubset__Subset_value_as_object()
-        {
-            var expected = new MyStruct()
-            {
-                Key = "Test"
-            };
-            var key = nameof(MyStruct.Key);
-            var full = $"{{\"{key}\": {JsonConvert.SerializeObject(expected)}";
+        var actual = Sut.DeserializeSubset<MyStruct>(full, key);
 
-            var actual = Sut.DeserializeSubset<MyStruct>(full, key);
+        Assert.AreEqual(expected, actual);
+    }
 
-            Assert.AreEqual(expected, actual);
-        }
+    [Test]
+    public void DeserializeSubset__Subset_value_as_array()
+    {
+        var expected = new[] { "test" };
+        var key = "text";
+        var full = $"{{\"{key}\": {JsonConvert.SerializeObject(expected)}";
 
-        [Test]
-        public void DeserializeSubset__Subset_value_as_array()
-        {
-            var expected = new[] { "test" };
-            var key = "text";
-            var full = $"{{\"{key}\": {JsonConvert.SerializeObject(expected)}";
+        var actual = Sut.DeserializeSubset<string[]>(full, key);
 
-            var actual = Sut.DeserializeSubset<string[]>(full, key);
+        Assert.AreEqual(expected, actual);
+    }
 
-            Assert.AreEqual(expected, actual);
-        }
-
-        private struct MyStruct
-        {
-            public string Key { get; set; }
-        }
+    private struct MyStruct
+    {
+        public string Key { get; set; }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs
index ad4cb80113..9acf9ab8ab 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/AmbiguousEventTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System;
@@ -7,100 +7,98 @@ using System.Text;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+public class AmbiguousEventTests
 {
-    [TestFixture]
-    public class AmbiguousEventTests
+    [Explicit]
+    [TestCase(typeof(ContentService))]
+    [TestCase(typeof(MediaService))]
+    public void ListAmbiguousEvents(Type serviceType)
     {
-        [Explicit]
-        [TestCase(typeof(ContentService))]
-        [TestCase(typeof(MediaService))]
-        public void ListAmbiguousEvents(Type serviceType)
+        var typedEventHandler = typeof(TypedEventHandler<,>);
+
+        // get all events
+        var events = serviceType.GetEvents(BindingFlags.Static | BindingFlags.Public);
+
+        string TypeName(Type type)
         {
-            var typedEventHandler = typeof(TypedEventHandler<,>);
-
-            // get all events
-            var events = serviceType.GetEvents(BindingFlags.Static | BindingFlags.Public);
-
-            string TypeName(Type type)
+            if (!type.IsGenericType)
             {
-                if (!type.IsGenericType)
-                {
-                    return type.Name;
-                }
-
-                var sb = new StringBuilder();
-                TypeNameSb(type, sb);
-                return sb.ToString();
+                return type.Name;
             }
 
-            void TypeNameSb(Type type, StringBuilder sb)
+            var sb = new StringBuilder();
+            TypeNameSb(type, sb);
+            return sb.ToString();
+        }
+
+        void TypeNameSb(Type type, StringBuilder sb)
+        {
+            var name = type.Name;
+            var pos = name.IndexOf('`');
+            name = pos > 0 ? name.Substring(0, pos) : name;
+            sb.Append(name);
+            if (!type.IsGenericType)
             {
-                var name = type.Name;
-                var pos = name.IndexOf('`');
-                name = pos > 0 ? name.Substring(0, pos) : name;
-                sb.Append(name);
-                if (!type.IsGenericType)
-                {
-                    return;
-                }
-
-                sb.Append("<");
-                var first = true;
-                foreach (var arg in type.GetGenericArguments())
-                {
-                    if (first)
-                    {
-                        first = false;
-                    }
-                    else
-                    {
-                        sb.Append(", ");
-                    }
-
-                    TypeNameSb(arg, sb);
-                }
-
-                sb.Append(">");
+                return;
             }
 
-            foreach (var e in events)
+            sb.Append("<");
+            var first = true;
+            foreach (var arg in type.GetGenericArguments())
             {
-                // only continue if this is a TypedEventHandler
-                if (!e.EventHandlerType.IsGenericType)
+                if (first)
                 {
-                    continue;
+                    first = false;
+                }
+                else
+                {
+                    sb.Append(", ");
                 }
 
-                var typeDef = e.EventHandlerType.GetGenericTypeDefinition();
-                if (typedEventHandler != typeDef)
-                {
-                    continue;
-                }
-
-                // get the event args type
-                var eventArgsType = e.EventHandlerType.GenericTypeArguments[1];
-
-                // try to find the event back, based upon sender type + args type
-                // exclude -ing (eg Saving) events, we don't deal with them in EventDefinitionBase (they always trigger)
-                var found = EventNameExtractor.FindEvents(serviceType, eventArgsType, EventNameExtractor.MatchIngNames);
-
-                if (found.Length == 1)
-                {
-                    continue;
-                }
-
-                if (found.Length == 0)
-                {
-                    Console.WriteLine($"{typeof(ContentService).Name}  {e.Name}  {TypeName(eventArgsType)}  NotFound");
-                    continue;
-                }
-
-                Console.WriteLine($"{typeof(ContentService).Name}  {e.Name}  {TypeName(eventArgsType)}  Ambiguous");
-                Console.WriteLine("\t" + string.Join(", ", found));
+                TypeNameSb(arg, sb);
             }
+
+            sb.Append(">");
+        }
+
+        foreach (var e in events)
+        {
+            // only continue if this is a TypedEventHandler
+            if (!e.EventHandlerType.IsGenericType)
+            {
+                continue;
+            }
+
+            var typeDef = e.EventHandlerType.GetGenericTypeDefinition();
+            if (typedEventHandler != typeDef)
+            {
+                continue;
+            }
+
+            // get the event args type
+            var eventArgsType = e.EventHandlerType.GenericTypeArguments[1];
+
+            // try to find the event back, based upon sender type + args type
+            // exclude -ing (eg Saving) events, we don't deal with them in EventDefinitionBase (they always trigger)
+            var found = EventNameExtractor.FindEvents(serviceType, eventArgsType, EventNameExtractor.MatchIngNames);
+
+            if (found.Length == 1)
+            {
+                continue;
+            }
+
+            if (found.Length == 0)
+            {
+                Console.WriteLine($"{typeof(ContentService).Name}  {e.Name}  {TypeName(eventArgsType)}  NotFound");
+                continue;
+            }
+
+            Console.WriteLine($"{typeof(ContentService).Name}  {e.Name}  {TypeName(eventArgsType)}  Ambiguous");
+            Console.WriteLine("\t" + string.Join(", ", found));
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs
index 848d634409..47d1248115 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/LocalizedTextServiceTests.cs
@@ -10,382 +10,371 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+public class LocalizedTextServiceTests
 {
-    [TestFixture]
-    public class LocalizedTextServiceTests
+    private static readonly ILoggerFactory s_loggerFactory = NullLoggerFactory.Instance;
+
+    [Test]
+    public void Using_Dictionary_Gets_All_Stored_Values()
     {
-        private static readonly ILoggerFactory s_loggerFactory = NullLoggerFactory.Instance;
-
-        [Test]
-        public void Using_Dictionary_Gets_All_Stored_Values()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+            {
                 {
-                    {
-                        culture, new Lazy<IDictionary<string, IDictionary<string, string>>>(() => new Dictionary<string, IDictionary<string, string>>
+                    culture,
+                    new Lazy<IDictionary<string, IDictionary<string, string>>>(() =>
+                        new Dictionary<string, IDictionary<string, string>>
                         {
                             {
-                                "testArea1", new Dictionary<string, string>
-                                {
-                                    { "testKey1", "testValue1" },
-                                    { "testKey2", "testValue2" }
-                                }
+                                "testArea1",
+                                new Dictionary<string, string> { { "testKey1", "testValue1" }, { "testKey2", "testValue2" } }
                             },
                             {
-                                "testArea2", new Dictionary<string, string>
-                                {
-                                    { "blah1", "blahValue1" },
-                                    { "blah2", "blahValue2" }
-                                }
+                                "testArea2",
+                                new Dictionary<string, string> { { "blah1", "blahValue1" }, { "blah2", "blahValue2" } }
                             },
                         })
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
 
-            IDictionary<string, string> result = txtService.GetAllStoredValues(culture);
+        var result = txtService.GetAllStoredValues(culture);
 
-            Assert.AreEqual(4, result.Count);
-            Assert.AreEqual("testArea1/testKey1", result.ElementAt(0).Key);
-            Assert.AreEqual("testArea1/testKey2", result.ElementAt(1).Key);
-            Assert.AreEqual("testArea2/blah1", result.ElementAt(2).Key);
-            Assert.AreEqual("testArea2/blah2", result.ElementAt(3).Key);
-            Assert.AreEqual("testValue1", result["testArea1/testKey1"]);
-            Assert.AreEqual("testValue2", result["testArea1/testKey2"]);
-            Assert.AreEqual("blahValue1", result["testArea2/blah1"]);
-            Assert.AreEqual("blahValue2", result["testArea2/blah2"]);
-        }
+        Assert.AreEqual(4, result.Count);
+        Assert.AreEqual("testArea1/testKey1", result.ElementAt(0).Key);
+        Assert.AreEqual("testArea1/testKey2", result.ElementAt(1).Key);
+        Assert.AreEqual("testArea2/blah1", result.ElementAt(2).Key);
+        Assert.AreEqual("testArea2/blah2", result.ElementAt(3).Key);
+        Assert.AreEqual("testValue1", result["testArea1/testKey1"]);
+        Assert.AreEqual("testValue2", result["testArea1/testKey2"]);
+        Assert.AreEqual("blahValue1", result["testArea2/blah1"]);
+        Assert.AreEqual("blahValue2", result["testArea2/blah2"]);
+    }
 
-        [Test]
-        public void Using_XDocument_Gets_All_Stored_Values()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<XDocument>>
+    [Test]
+    public void Using_XDocument_Gets_All_Stored_Values()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
                 {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement(
+                            "language",
                             new XElement(
-                                "language",
-                                new XElement("area", new XAttribute("alias", "testArea1"),
-                                    new XElement("key", new XAttribute("alias", "testKey1"), "testValue1"),
-                                    new XElement("key", new XAttribute("alias", "testKey2"), "testValue2")),
-                                new XElement("area", new XAttribute("alias", "testArea2"),
-                                    new XElement("key", new XAttribute("alias", "blah1"), "blahValue1"),
-                                    new XElement("key", new XAttribute("alias", "blah2"), "blahValue2")))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            IDictionary<string, string> result = txtService.GetAllStoredValues(culture);
-
-            Assert.AreEqual(4, result.Count());
-            Assert.AreEqual("testArea1/testKey1", result.ElementAt(0).Key);
-            Assert.AreEqual("testArea1/testKey2", result.ElementAt(1).Key);
-            Assert.AreEqual("testArea2/blah1", result.ElementAt(2).Key);
-            Assert.AreEqual("testArea2/blah2", result.ElementAt(3).Key);
-            Assert.AreEqual("testValue1", result["testArea1/testKey1"]);
-            Assert.AreEqual("testValue2", result["testArea1/testKey2"]);
-            Assert.AreEqual("blahValue1", result["testArea2/blah1"]);
-            Assert.AreEqual("blahValue2", result["testArea2/blah2"]);
-        }
-
-        [Test]
-        public void Using_XDocument_Gets_All_Stored_Values_With_Duplicates()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                  new Dictionary<CultureInfo, Lazy<XDocument>>
-                {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
+                                "area",
+                                new XAttribute("alias", "testArea1"),
+                                new XElement("key", new XAttribute("alias", "testKey1"), "testValue1"),
+                                new XElement("key", new XAttribute("alias", "testKey2"), "testValue2")),
                             new XElement(
-                                "language",
-                                new XElement("area", new XAttribute("alias", "testArea1"),
-                                    new XElement("key", new XAttribute("alias", "testKey1"), "testValue1"),
-                                    new XElement("key", new XAttribute("alias", "testKey1"), "testValue1")))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
+                                "area",
+                                new XAttribute("alias", "testArea2"),
+                                new XElement("key", new XAttribute("alias", "blah1"), "blahValue1"),
+                                new XElement("key", new XAttribute("alias", "blah2"), "blahValue2")))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
 
-            IDictionary<string, string> result = txtService.GetAllStoredValues(culture);
+        var result = txtService.GetAllStoredValues(culture);
 
-            Assert.AreEqual(1, result.Count());
-        }
+        Assert.AreEqual(4, result.Count());
+        Assert.AreEqual("testArea1/testKey1", result.ElementAt(0).Key);
+        Assert.AreEqual("testArea1/testKey2", result.ElementAt(1).Key);
+        Assert.AreEqual("testArea2/blah1", result.ElementAt(2).Key);
+        Assert.AreEqual("testArea2/blah2", result.ElementAt(3).Key);
+        Assert.AreEqual("testValue1", result["testArea1/testKey1"]);
+        Assert.AreEqual("testValue2", result["testArea1/testKey2"]);
+        Assert.AreEqual("blahValue1", result["testArea2/blah1"]);
+        Assert.AreEqual("blahValue2", result["testArea2/blah2"]);
+    }
 
-        [Test]
-        public void Using_Dictionary_Returns_Text_With_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+    [Test]
+    public void Using_XDocument_Gets_All_Stored_Values_With_Duplicates()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
                 {
-                    {
-                        culture, new Lazy<IDictionary<string, IDictionary<string, string>>>(() => new Dictionary<string, IDictionary<string, string>>
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement(
+                            "language",
+                            new XElement(
+                                "area",
+                                new XAttribute("alias", "testArea1"),
+                                new XElement("key", new XAttribute("alias", "testKey1"), "testValue1"),
+                                new XElement("key", new XAttribute("alias", "testKey1"), "testValue1")))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.GetAllStoredValues(culture);
+
+        Assert.AreEqual(1, result.Count());
+    }
+
+    [Test]
+    public void Using_Dictionary_Returns_Text_With_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+            {
+                {
+                    culture,
+                    new Lazy<IDictionary<string, IDictionary<string, string>>>(() =>
+                        new Dictionary<string, IDictionary<string, string>>
+                        {
+                            { "testArea", new Dictionary<string, string> { { "testKey", "testValue" } } },
+                        })
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("testArea/testKey", culture);
+
+        Assert.AreEqual("testValue", result);
+    }
+
+    [Test]
+    public void Using_Dictionary_Returns_Text_Without_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+            {
+                {
+                    culture,
+                    new Lazy<IDictionary<string, IDictionary<string, string>>>(() =>
+                        new Dictionary<string, IDictionary<string, string>>
+                        {
+                            { "testArea", new Dictionary<string, string> { { "testKey", "testValue" } } },
+                        })
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("testKey", culture);
+
+        Assert.AreEqual("testValue", result);
+    }
+
+    [Test]
+    public void Using_Dictionary_Returns_Default_Text_When_Not_Found_With_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+            {
+                {
+                    culture,
+                    new Lazy<IDictionary<string, IDictionary<string, string>>>(() =>
+                        new Dictionary<string, IDictionary<string, string>>
+                        {
+                            { "testArea", new Dictionary<string, string> { { "testKey", "testValue" } } },
+                        })
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("testArea/doNotFind", culture);
+
+        // NOTE: Based on how legacy works, the default text does not contain the area, just the key
+        Assert.AreEqual("[doNotFind]", result);
+    }
+
+    [Test]
+    public void Using_Dictionary_Returns_Default_Text_When_Not_Found_Without_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+            {
+                {
+                    culture,
+                    new Lazy<IDictionary<string, IDictionary<string, string>>>(() =>
+                        new Dictionary<string, IDictionary<string, string>>
+                        {
+                            { "testArea", new Dictionary<string, string> { { "testKey", "testValue" } } },
+                        })
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("doNotFind", culture);
+
+        Assert.AreEqual("[doNotFind]", result);
+    }
+
+    [Test]
+    public void Using_Dictionary_Returns_Tokenized_Text()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+            {
+                {
+                    culture,
+                    new Lazy<IDictionary<string, IDictionary<string, string>>>(() =>
+                        new Dictionary<string, IDictionary<string, string>>
                         {
                             {
-                                "testArea", new Dictionary<string, string>
-                                {
-                                    { "testKey", "testValue" }
-                                }
-                            }
+                                "testArea",
+                                new Dictionary<string, string> { { "testKey", "Hello %0%, you are such a %1% %2%" } }
+                            },
                         })
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
 
-            string result = txtService.Localize("testArea/testKey", culture);
+        var result = txtService.Localize(
+            "testKey",
+            culture,
+            new Dictionary<string, string> { { "0", "world" }, { "1", "great" }, { "2", "planet" } });
 
-            Assert.AreEqual("testValue", result);
-        }
+        Assert.AreEqual("Hello world, you are such a great planet", result);
+    }
 
-        [Test]
-        public void Using_Dictionary_Returns_Text_Without_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+    [Test]
+    public void Using_XDocument_Returns_Text_With_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
                 {
-                    {
-                        culture, new Lazy<IDictionary<string, IDictionary<string, string>>>(() => new Dictionary<string, IDictionary<string, string>>
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement("area", new XAttribute("alias", "testArea"), new XElement("key", new XAttribute("alias", "testKey"), "testValue"))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("testArea/testKey", culture);
+
+        Assert.AreEqual("testValue", result);
+    }
+
+    [Test]
+    public void Using_XDocument_Returns_Text_Without_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
+                {
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement("area", new XAttribute("alias", "testArea"), new XElement("key", new XAttribute("alias", "testKey"), "testValue"))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("testKey", culture);
+
+        Assert.AreEqual("testValue", result);
+    }
+
+    [Test]
+    public void Using_XDocument_Returns_Default_Text_When_Not_Found_With_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
+                {
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement("area", new XAttribute("alias", "testArea"), new XElement("key", new XAttribute("alias", "testKey"), "testValue"))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("testArea/doNotFind", culture);
+
+        // NOTE: Based on how legacy works, the default text does not contain the area, just the key
+        Assert.AreEqual("[doNotFind]", result);
+    }
+
+    [Test]
+    public void Using_XDocument_Returns_Default_Text_When_Not_Found_Without_Area()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
+                {
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement("area", new XAttribute("alias", "testArea"), new XElement("key", new XAttribute("alias", "testKey"), "testValue"))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("doNotFind", culture);
+
+        Assert.AreEqual("[doNotFind]", result);
+    }
+
+    [Test]
+    public void Using_XDocument_Returns_Tokenized_Text()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
+                {
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement(
+                            "area",
+                            new XAttribute("alias", "testArea"),
+                            new XElement("key", new XAttribute("alias", "testKey"), "Hello %0%, you are such a %1% %2%"))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
+
+        var result = txtService.Localize("testKey", culture, new Dictionary<string, string> { { "0", "world" }, { "1", "great" }, { "2", "planet" } });
+
+        Assert.AreEqual("Hello world, you are such a great planet", result);
+    }
+
+    [Test]
+    public void Using_Dictionary_Returns_Default_Text__When_No_Culture_Found()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+            {
+                {
+                    culture,
+                    new Lazy<IDictionary<string, IDictionary<string, string>>>(() =>
+                        new Dictionary<string, IDictionary<string, string>>
                         {
-                            {
-                                "testArea", new Dictionary<string, string>
-                                {
-                                    { "testKey", "testValue" }
-                                }
-                            }
+                            { "testArea", new Dictionary<string, string> { { "testKey", "testValue" } } },
                         })
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
 
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
+        Assert.AreEqual("[testKey]", txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU")));
+    }
 
-            string result = txtService.Localize("testKey", culture);
-
-            Assert.AreEqual("testValue", result);
-        }
-
-        [Test]
-        public void Using_Dictionary_Returns_Default_Text_When_Not_Found_With_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
+    [Test]
+    public void Using_XDocument_Returns_Default_Text_When_No_Culture_Found()
+    {
+        var culture = CultureInfo.GetCultureInfo("en-US");
+        var txtService = new LocalizedTextService(
+            new Dictionary<CultureInfo, Lazy<XDocument>>
+            {
                 {
-                    {
-                        culture, new Lazy<IDictionary<string, IDictionary<string, string>>>(() => new Dictionary<string, IDictionary<string, string>>
-                        {
-                            {
-                                "testArea", new Dictionary<string, string>
-                                {
-                                    { "testKey", "testValue" }
-                                }
-                            }
-                        })
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
+                    culture, new Lazy<XDocument>(() => new XDocument(
+                        new XElement("area", new XAttribute("alias", "testArea"), new XElement("key", new XAttribute("alias", "testKey"), "testValue"))))
+                },
+            },
+            s_loggerFactory.CreateLogger<LocalizedTextService>());
 
-            string result = txtService.Localize("testArea/doNotFind", culture);
-
-            // NOTE: Based on how legacy works, the default text does not contain the area, just the key
-            Assert.AreEqual("[doNotFind]", result);
-        }
-
-        [Test]
-        public void Using_Dictionary_Returns_Default_Text_When_Not_Found_Without_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
-                {
-                    {
-                        culture, new Lazy<IDictionary<string, IDictionary<string, string>>>(() => new Dictionary<string, IDictionary<string, string>>
-                        {
-                            {
-                                "testArea", new Dictionary<string, string>
-                                {
-                                    { "testKey", "testValue" }
-                                }
-                            }
-                        })
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            string result = txtService.Localize("doNotFind", culture);
-
-            Assert.AreEqual("[doNotFind]", result);
-        }
-
-        [Test]
-        public void Using_Dictionary_Returns_Tokenized_Text()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
-                {
-                    {
-                        culture, new Lazy<IDictionary<string, IDictionary<string, string>>>(() => new Dictionary<string, IDictionary<string, string>>
-                        {
-                            {
-                                "testArea", new Dictionary<string, string>
-                                {
-                                    { "testKey", "Hello %0%, you are such a %1% %2%" }
-                                }
-                            }
-                        })
-
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            string result = txtService.Localize(
-                "testKey",
-                culture,
-                new Dictionary<string, string> { { "0", "world" }, { "1", "great" }, { "2", "planet" } });
-
-            Assert.AreEqual("Hello world, you are such a great planet", result);
-        }
-
-        [Test]
-        public void Using_XDocument_Returns_Text_With_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<XDocument>>
-                {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
-                            new XElement("area", new XAttribute("alias", "testArea"),
-                                new XElement("key", new XAttribute("alias", "testKey"),
-                                    "testValue"))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            string result = txtService.Localize("testArea/testKey", culture);
-
-            Assert.AreEqual("testValue", result);
-        }
-
-        [Test]
-        public void Using_XDocument_Returns_Text_Without_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<XDocument>>
-                {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
-                            new XElement("area", new XAttribute("alias", "testArea"),
-                                new XElement("key", new XAttribute("alias", "testKey"),
-                                    "testValue"))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            string result = txtService.Localize("testKey", culture);
-
-            Assert.AreEqual("testValue", result);
-        }
-
-        [Test]
-        public void Using_XDocument_Returns_Default_Text_When_Not_Found_With_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<XDocument>>
-                {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
-                            new XElement("area", new XAttribute("alias", "testArea"),
-                                new XElement("key", new XAttribute("alias", "testKey"),
-                                    "testValue"))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            string result = txtService.Localize("testArea/doNotFind", culture);
-
-            // NOTE: Based on how legacy works, the default text does not contain the area, just the key
-            Assert.AreEqual("[doNotFind]", result);
-        }
-
-        [Test]
-        public void Using_XDocument_Returns_Default_Text_When_Not_Found_Without_Area()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<XDocument>>
-                {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
-                            new XElement("area", new XAttribute("alias", "testArea"),
-                                new XElement("key", new XAttribute("alias", "testKey"),
-                                    "testValue"))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            string result = txtService.Localize("doNotFind", culture);
-
-            Assert.AreEqual("[doNotFind]", result);
-        }
-
-        [Test]
-        public void Using_XDocument_Returns_Tokenized_Text()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<XDocument>>
-                {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
-                            new XElement("area", new XAttribute("alias", "testArea"),
-                                new XElement("key", new XAttribute("alias", "testKey"),
-                                    "Hello %0%, you are such a %1% %2%"))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            string result = txtService.Localize("testKey", culture,
-                new Dictionary<string, string> { { "0", "world" }, { "1", "great" }, { "2", "planet" } });
-
-            Assert.AreEqual("Hello world, you are such a great planet", result);
-        }
-
-        [Test]
-        public void Using_Dictionary_Returns_Default_Text__When_No_Culture_Found()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<IDictionary<string, IDictionary<string, string>>>>
-                {
-                    {
-                        culture, new Lazy<IDictionary<string, IDictionary<string, string>>>(() => new Dictionary<string, IDictionary<string, string>>
-                        {
-                            {
-                                "testArea", new Dictionary<string, string>
-                                {
-                                    { "testKey", "testValue" }
-                                }
-                            }
-                        })
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            Assert.AreEqual("[testKey]", txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU")));
-        }
-
-        [Test]
-        public void Using_XDocument_Returns_Default_Text_When_No_Culture_Found()
-        {
-            var culture = CultureInfo.GetCultureInfo("en-US");
-            var txtService = new LocalizedTextService(
-                new Dictionary<CultureInfo, Lazy<XDocument>>
-                {
-                    {
-                        culture, new Lazy<XDocument>(() => new XDocument(
-                            new XElement("area", new XAttribute("alias", "testArea"),
-                                new XElement("key", new XAttribute("alias", "testKey"), "testValue"))))
-                    }
-                }, s_loggerFactory.CreateLogger<LocalizedTextService>());
-
-            Assert.AreEqual("[testKey]", txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU")));
-        }
+        Assert.AreEqual("[testKey]", txtService.Localize("testArea/testKey", CultureInfo.GetCultureInfo("en-AU")));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs
index 942ba8cf4a..736e124324 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Infrastructure/Services/PropertyValidationServiceTests.cs
@@ -6,184 +6,293 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.PropertyEditors.Validators;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Core.Services.Implement;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Serialization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Infrastructure.Services;
+
+[TestFixture]
+public class PropertyValidationServiceTests
 {
-    [TestFixture]
-    public class PropertyValidationServiceTests
+    private IShortStringHelper ShortStringHelper => new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+
+    private void MockObjects(out PropertyValidationService validationService, out IDataType dt)
     {
-        private IShortStringHelper ShortStringHelper => new DefaultShortStringHelper(new DefaultShortStringHelperConfig());
+        var textService = new Mock<ILocalizedTextService>();
+        textService.Setup(x =>
+                x.Localize(It.IsAny<string>(), It.IsAny<string>(), Thread.CurrentThread.CurrentCulture, null))
+            .Returns("Localized text");
 
-        private void MockObjects(out PropertyValidationService validationService, out IDataType dt)
-        {
-            var textService = new Mock<ILocalizedTextService>();
-            textService.Setup(x => x.Localize(It.IsAny<string>(),It.IsAny<string>(), Thread.CurrentThread.CurrentCulture, null)).Returns("Localized text");
+        var dataTypeService = new Mock<IDataTypeService>();
+        var dataType = Mock.Of<IDataType>(
+            x => x.Configuration == string.Empty // irrelevant but needs a value
+                 && x.DatabaseType == ValueStorageType.Nvarchar
+                 && x.EditorAlias == Constants.PropertyEditors.Aliases.TextBox);
+        dataTypeService.Setup(x => x.GetDataType(It.IsAny<int>())).Returns(() => dataType);
+        dt = dataType;
 
-            var dataTypeService = new Mock<IDataTypeService>();
-            IDataType dataType = Mock.Of<IDataType>(
-                x => x.Configuration == (object)string.Empty // irrelevant but needs a value
-                     && x.DatabaseType == ValueStorageType.Nvarchar
-                     && x.EditorAlias == Constants.PropertyEditors.Aliases.TextBox);
-            dataTypeService.Setup(x => x.GetDataType(It.IsAny<int>())).Returns(() => dataType);
-            dt = dataType;
+        // new data editor that returns a TextOnlyValueEditor which will do the validation for the properties
+        var dataEditor = Mock.Of<IDataEditor>(
+            x => x.Type == EditorType.PropertyValue
+                 && x.Alias == Constants.PropertyEditors.Aliases.TextBox);
+        Mock.Get(dataEditor).Setup(x => x.GetValueEditor(It.IsAny<object>()))
+            .Returns(new CustomTextOnlyValueEditor(
+                new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"),
+                textService.Object,
+                Mock.Of<IShortStringHelper>(),
+                new JsonNetSerializer(),
+                Mock.Of<IIOHelper>()));
 
-            // new data editor that returns a TextOnlyValueEditor which will do the validation for the properties
-            IDataEditor dataEditor = Mock.Of<IDataEditor>(
-                x => x.Type == EditorType.PropertyValue
-                     && x.Alias == Constants.PropertyEditors.Aliases.TextBox);
-            Mock.Get(dataEditor).Setup(x => x.GetValueEditor(It.IsAny<object>()))
-                .Returns(new CustomTextOnlyValueEditor(new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"),   textService.Object, Mock.Of<IShortStringHelper>(), new JsonNetSerializer(), Mock.Of<IIOHelper>()));
+        var propEditors = new PropertyEditorCollection(new DataEditorCollection(() => new[] { dataEditor }));
 
-            var propEditors = new PropertyEditorCollection(new DataEditorCollection(() => new[] { dataEditor }));
+        validationService = new PropertyValidationService(propEditors, dataTypeService.Object, Mock.Of<ILocalizedTextService>(), new ValueEditorCache());
+    }
 
-            validationService = new PropertyValidationService(propEditors, dataTypeService.Object, Mock.Of<ILocalizedTextService>(), new ValueEditorCache());
-        }
+    [Test]
+    public void Validate_Invariant_Properties_On_Variant_Default_Culture()
+    {
+        MockObjects(out var validationService, out var dataType);
 
-        [Test]
-        public void Validate_Invariant_Properties_On_Variant_Default_Culture()
-        {
-            MockObjects(out PropertyValidationService validationService, out IDataType dataType);
+        var p1 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test1")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p1.SetValue("Hello", "en-US");
+        var p2 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test2")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p2.SetValue("Hello");
+        var p3 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test3")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p3.SetValue(null, "en-US"); // invalid
+        var p4 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test4")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p4.SetValue(null); // invalid
 
-            var p1 = new Property(new PropertyType(ShortStringHelper, dataType, "test1") { Mandatory = true, Variations = ContentVariation.Culture });
-            p1.SetValue("Hello", "en-US");
-            var p2 = new Property(new PropertyType(ShortStringHelper, dataType, "test2") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p2.SetValue("Hello", null);
-            var p3 = new Property(new PropertyType(ShortStringHelper, dataType, "test3") { Mandatory = true, Variations = ContentVariation.Culture });
-            p3.SetValue(null, "en-US"); // invalid
-            var p4 = new Property(new PropertyType(ShortStringHelper, dataType, "test4") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p4.SetValue(null, null); // invalid
+        var content = Mock.Of<IContent>(
+            x => x.Published == true // set to published, the default culture will validate invariant anyways
+                 && x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
 
-            IContent content = Mock.Of<IContent>(
-                x => x.Published == true // set to published, the default culture will validate invariant anyways
-                     && x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
+        var result =
+            validationService.IsPropertyDataValid(content, out var invalid, CultureImpact.Explicit("en-US", true));
 
-            bool result = validationService.IsPropertyDataValid(content, out IProperty[] invalid, CultureImpact.Explicit("en-US", true));
+        Assert.IsFalse(result);
+        Assert.AreEqual(2, invalid.Length);
+    }
 
-            Assert.IsFalse(result);
-            Assert.AreEqual(2, invalid.Length);
-        }
+    [Test]
+    public void Validate_Invariant_Properties_On_Variant_Non_Default_Culture()
+    {
+        MockObjects(out var validationService, out var dataType);
 
-        [Test]
-        public void Validate_Invariant_Properties_On_Variant_Non_Default_Culture()
-        {
-            MockObjects(out PropertyValidationService validationService, out IDataType dataType);
+        var p1 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test1")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p1.SetValue("Hello", "en-US");
+        var p2 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test2")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p2.SetValue("Hello");
+        var p3 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test3")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p3.SetValue(null, "en-US"); // invalid
+        var p4 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test4")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p4.SetValue(null); // invalid
 
-            var p1 = new Property(new PropertyType(ShortStringHelper, dataType, "test1") { Mandatory = true, Variations = ContentVariation.Culture });
-            p1.SetValue("Hello", "en-US");
-            var p2 = new Property(new PropertyType(ShortStringHelper, dataType, "test2") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p2.SetValue("Hello", null);
-            var p3 = new Property(new PropertyType(ShortStringHelper, dataType, "test3") { Mandatory = true, Variations = ContentVariation.Culture });
-            p3.SetValue(null, "en-US"); // invalid
-            var p4 = new Property(new PropertyType(ShortStringHelper, dataType, "test4") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p4.SetValue(null, null); // invalid
+        var content = Mock.Of<IContent>(
+            x =>
+                x.Published ==
+                false // set to not published, the non default culture will need to validate invariant too
+                && x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
 
-            IContent content = Mock.Of<IContent>(
-                x => x.Published == false // set to not published, the non default culture will need to validate invariant too
-                     && x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
+        var result =
+            validationService.IsPropertyDataValid(content, out var invalid, CultureImpact.Explicit("en-US", false));
 
-            bool result = validationService.IsPropertyDataValid(content, out IProperty[] invalid, CultureImpact.Explicit("en-US", false));
+        Assert.IsFalse(result);
+        Assert.AreEqual(2, invalid.Length);
+    }
 
-            Assert.IsFalse(result);
-            Assert.AreEqual(2, invalid.Length);
-        }
+    [Test]
+    public void Validate_Variant_Properties_On_Variant()
+    {
+        MockObjects(out var validationService, out var dataType);
 
-        [Test]
-        public void Validate_Variant_Properties_On_Variant()
-        {
-            MockObjects(out PropertyValidationService validationService, out IDataType dataType);
+        var p1 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test1")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p1.SetValue(null, "en-US"); // invalid
+        var p2 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test2")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p2.SetValue(null); // invalid
+        var p3 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test3")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p3.SetValue(null, "en-US"); // ignored because the impact isn't the default lang + the content is published
+        var p4 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test4")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p4.SetValue(null); // ignored because the impact isn't the default lang + the content is published
 
-            var p1 = new Property(new PropertyType(ShortStringHelper, dataType, "test1") { Mandatory = true, Variations = ContentVariation.Culture });
-            p1.SetValue(null, "en-US"); // invalid
-            var p2 = new Property(new PropertyType(ShortStringHelper, dataType, "test2") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p2.SetValue(null, null); // invalid
-            var p3 = new Property(new PropertyType(ShortStringHelper, dataType, "test3") { Mandatory = true, Variations = ContentVariation.Culture });
-            p3.SetValue(null, "en-US"); // ignored because the impact isn't the default lang + the content is published
-            var p4 = new Property(new PropertyType(ShortStringHelper, dataType, "test4") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p4.SetValue(null, null); // ignored because the impact isn't the default lang + the content is published
+        var content = Mock.Of<IContent>(
+            x => x.Published == true // set to published
+                 && x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
 
-            IContent content = Mock.Of<IContent>(
-                x => x.Published == true // set to published
-                     && x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
+        var result =
+            validationService.IsPropertyDataValid(content, out var invalid, CultureImpact.Explicit("en-US", false));
 
-            bool result = validationService.IsPropertyDataValid(content, out IProperty[] invalid, CultureImpact.Explicit("en-US", false));
+        Assert.IsFalse(result);
+        Assert.AreEqual(2, invalid.Length);
+    }
 
-            Assert.IsFalse(result);
-            Assert.AreEqual(2, invalid.Length);
-        }
+    [Test]
+    public void Validate_Invariant_Properties_On_Invariant()
+    {
+        MockObjects(out var validationService, out var dataType);
 
-        [Test]
-        public void Validate_Invariant_Properties_On_Invariant()
-        {
-            MockObjects(out PropertyValidationService validationService, out IDataType dataType);
+        var p1 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test1")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p1.SetValue(null, "en-US"); // ignored since this is variant
+        var p2 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test2")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p2.SetValue(null); // invalid
+        var p3 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test3")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p3.SetValue("Hello", "en-US"); // ignored since this is variant
+        var p4 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test4")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p4.SetValue(null); // invalid
 
-            var p1 = new Property(new PropertyType(ShortStringHelper, dataType, "test1") { Mandatory = true, Variations = ContentVariation.Culture });
-            p1.SetValue(null, "en-US"); // ignored since this is variant
-            var p2 = new Property(new PropertyType(ShortStringHelper, dataType, "test2") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p2.SetValue(null, null); // invalid
-            var p3 = new Property(new PropertyType(ShortStringHelper, dataType, "test3") { Mandatory = true, Variations = ContentVariation.Culture });
-            p3.SetValue("Hello", "en-US"); // ignored since this is variant
-            var p4 = new Property(new PropertyType(ShortStringHelper, dataType, "test4") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p4.SetValue(null, null); // invalid
+        var content = Mock.Of<IContent>(
+            x => x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
 
-            IContent content = Mock.Of<IContent>(
-                x => x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
+        var result = validationService.IsPropertyDataValid(content, out var invalid, CultureImpact.Invariant);
 
-            bool result = validationService.IsPropertyDataValid(content, out IProperty[] invalid, CultureImpact.Invariant);
+        Assert.IsFalse(result);
+        Assert.AreEqual(2, invalid.Length);
+    }
 
-            Assert.IsFalse(result);
-            Assert.AreEqual(2, invalid.Length);
-        }
+    [Test]
+    public void Validate_Properties_On_All()
+    {
+        MockObjects(out var validationService, out var dataType);
 
-        [Test]
-        public void Validate_Properties_On_All()
-        {
-            MockObjects(out PropertyValidationService validationService, out IDataType dataType);
+        var p1 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test1")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p1.SetValue(null, "en-US"); // invalid
+        var p2 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test2")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p2.SetValue(null); // invalid
+        var p3 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test3")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Culture,
+            });
+        p3.SetValue(null, "en-US"); // invalid
+        var p4 = new Property(
+            new PropertyType(ShortStringHelper, dataType, "test4")
+            {
+                Mandatory = true,
+                Variations = ContentVariation.Nothing,
+            });
+        p4.SetValue(null); // invalid
 
-            var p1 = new Property(new PropertyType(ShortStringHelper, dataType, "test1") { Mandatory = true, Variations = ContentVariation.Culture });
-            p1.SetValue(null, "en-US"); // invalid
-            var p2 = new Property(new PropertyType(ShortStringHelper, dataType, "test2") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p2.SetValue(null, null); // invalid
-            var p3 = new Property(new PropertyType(ShortStringHelper, dataType, "test3") { Mandatory = true, Variations = ContentVariation.Culture });
-            p3.SetValue(null, "en-US"); // invalid
-            var p4 = new Property(new PropertyType(ShortStringHelper, dataType, "test4") { Mandatory = true, Variations = ContentVariation.Nothing });
-            p4.SetValue(null, null); // invalid
+        var content = Mock.Of<IContent>(
+            x => x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
 
-            IContent content = Mock.Of<IContent>(
-                x => x.Properties == new PropertyCollection(new[] { p1, p2, p3, p4 }));
+        var result = validationService.IsPropertyDataValid(content, out var invalid, CultureImpact.All);
 
-            bool result = validationService.IsPropertyDataValid(content, out IProperty[] invalid, CultureImpact.All);
+        Assert.IsFalse(result);
+        Assert.AreEqual(4, invalid.Length);
+    }
 
-            Assert.IsFalse(result);
-            Assert.AreEqual(4, invalid.Length);
-        }
+    // used so we can inject a mock - we should fix the base class DataValueEditor to be able to have the ILocalizedTextField passed
+    // in to create the Requried and Regex validators so we aren't using singletons
+    private class CustomTextOnlyValueEditor : TextOnlyValueEditor
+    {
+        private readonly ILocalizedTextService _textService;
 
-        // used so we can inject a mock - we should fix the base class DataValueEditor to be able to have the ILocalizedTextField passed
-        // in to create the Requried and Regex validators so we aren't using singletons
-        private class CustomTextOnlyValueEditor : TextOnlyValueEditor
-        {
-            private readonly ILocalizedTextService _textService;
+        public CustomTextOnlyValueEditor(
+            DataEditorAttribute attribute,
+            ILocalizedTextService textService,
+            IShortStringHelper shortStringHelper,
+            IJsonSerializer jsonSerializer,
+            IIOHelper ioHelper)
+            : base(attribute, textService, shortStringHelper, jsonSerializer, ioHelper) => _textService = textService;
 
-            public CustomTextOnlyValueEditor(
-                DataEditorAttribute attribute,
-                ILocalizedTextService textService,
-                IShortStringHelper shortStringHelper,
-                IJsonSerializer jsonSerializer,
-                IIOHelper ioHelper)
-                : base(attribute, textService, shortStringHelper, jsonSerializer, ioHelper) => _textService = textService;
+        public override IValueRequiredValidator RequiredValidator => new RequiredValidator(_textService);
 
-            public override IValueRequiredValidator RequiredValidator => new RequiredValidator(_textService);
-
-            public override IValueFormatValidator FormatValidator => new RegexValidator(_textService, null);
-        }
+        public override IValueFormatValidator FormatValidator => new RegexValidator(_textService, null);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
index 73f38da362..614d24b2d7 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/BuilderTests.cs
@@ -7,49 +7,49 @@ using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
+using Umbraco.Cms.Core.Exceptions;
 using Umbraco.Cms.Core.Models.PublishedContent;
-using Umbraco.Cms.Core.Semver;
 using Umbraco.Cms.Infrastructure.ModelsBuilder;
 using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded;
+
+[TestFixture]
+public class BuilderTests
 {
-    [TestFixture]
-    public class BuilderTests
+    [Test]
+    public void GenerateSimpleType()
     {
-        [Test]
-        public void GenerateSimpleType()
+        // Umbraco returns nice, pascal-cased names.
+        var type1 = new TypeModel
         {
-            // Umbraco returns nice, pascal-cased names.
-            var type1 = new TypeModel
-            {
-                Id = 1,
-                Alias = "type1",
-                ClrName = "Type1",
-                Name = "type1Name",
-                ParentId = 0,
-                BaseType = null,
-                ItemType = TypeModel.ItemTypes.Content,
-            };
-            type1.Properties.Add(new PropertyModel
-            {
-                Alias = "prop1",
-                ClrName = "Prop1",
-                Name = "prop1Name",
-                ModelClrType = typeof(string),
-            });
+            Id = 1,
+            Alias = "type1",
+            ClrName = "Type1",
+            Name = "type1Name",
+            ParentId = 0,
+            BaseType = null,
+            ItemType = TypeModel.ItemTypes.Content,
+        };
+        type1.Properties.Add(new PropertyModel
+        {
+            Alias = "prop1",
+            ClrName = "Prop1",
+            Name = "prop1Name",
+            ModelClrType = typeof(string),
+        });
 
-            TypeModel[] types = new[] { type1 };
+        TypeModel[] types = { type1 };
 
-            var modelsBuilderConfig = new ModelsBuilderSettings();
-            var builder = new TextBuilder(modelsBuilderConfig, types);
+        var modelsBuilderConfig = new ModelsBuilderSettings();
+        var builder = new TextBuilder(modelsBuilderConfig, types);
 
-            var sb = new StringBuilder();
-            builder.Generate(sb, builder.GetModelsToGenerate().First());
-            var gen = sb.ToString();
+        var sb = new StringBuilder();
+        builder.Generate(sb, builder.GetModelsToGenerate().First());
+        var gen = sb.ToString();
 
-            SemVersion version = ApiVersion.Current.Version;
-            var expected = @"//------------------------------------------------------------------------------
+        var version = ApiVersion.Current.Version;
+        var expected = @"//------------------------------------------------------------------------------
 // <auto-generated>
 //   This code was generated by a tool.
 //
@@ -75,15 +75,19 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		public new const string ModelTypeAlias = ""type1"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
 			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Type1, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -103,66 +107,67 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 		///<summary>
 		/// prop1Name
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		[ImplementPropertyType(""prop1"")]
 		public virtual string Prop1 => this.Value<string>(_publishedValueFallback, ""prop1"");
 	}
 }
 ";
-            Console.WriteLine(gen);
-            Assert.AreEqual(expected.ClearLf(), gen);
-        }
+        Console.WriteLine(gen);
+        Assert.AreEqual(expected.ClearLf(), gen);
+    }
 
-        [Test]
-        public void GenerateSimpleType_Ambiguous_Issue()
+    [Test]
+    public void GenerateSimpleType_Ambiguous_Issue()
+    {
+        // Umbraco returns nice, pascal-cased names.
+        var type1 = new TypeModel
         {
-            // Umbraco returns nice, pascal-cased names.
-            var type1 = new TypeModel
-            {
-                Id = 1,
-                Alias = "type1",
-                ClrName = "Type1",
-                ParentId = 0,
-                BaseType = null,
-                ItemType = TypeModel.ItemTypes.Content,
-            };
-            type1.Properties.Add(new PropertyModel
-            {
-                Alias = "foo",
-                ClrName = "Foo",
-                ModelClrType = typeof(IEnumerable<>).MakeGenericType(ModelType.For("foo")),
-            });
+            Id = 1,
+            Alias = "type1",
+            ClrName = "Type1",
+            ParentId = 0,
+            BaseType = null,
+            ItemType = TypeModel.ItemTypes.Content,
+        };
+        type1.Properties.Add(new PropertyModel
+        {
+            Alias = "foo",
+            ClrName = "Foo",
+            ModelClrType = typeof(IEnumerable<>).MakeGenericType(ModelType.For("foo")),
+        });
 
-            var type2 = new TypeModel
-            {
-                Id = 2,
-                Alias = "foo",
-                ClrName = "Foo",
-                ParentId = 0,
-                BaseType = null,
-                ItemType = TypeModel.ItemTypes.Element,
-            };
+        var type2 = new TypeModel
+        {
+            Id = 2,
+            Alias = "foo",
+            ClrName = "Foo",
+            ParentId = 0,
+            BaseType = null,
+            ItemType = TypeModel.ItemTypes.Element,
+        };
 
-            TypeModel[] types = new[] { type1, type2 };
+        TypeModel[] types = { type1, type2 };
 
-            var modelsBuilderConfig = new ModelsBuilderSettings();
-            var builder = new TextBuilder(modelsBuilderConfig, types)
-            {
-                ModelsNamespace = "Umbraco.Cms.Web.Common.PublishedModels"
-            };
+        var modelsBuilderConfig = new ModelsBuilderSettings();
+        var builder = new TextBuilder(modelsBuilderConfig, types)
+        {
+            ModelsNamespace = "Umbraco.Cms.Web.Common.PublishedModels",
+        };
 
-            var sb1 = new StringBuilder();
-            builder.Generate(sb1, builder.GetModelsToGenerate().Skip(1).First());
-            var gen1 = sb1.ToString();
-            Console.WriteLine(gen1);
+        var sb1 = new StringBuilder();
+        builder.Generate(sb1, builder.GetModelsToGenerate().Skip(1).First());
+        var gen1 = sb1.ToString();
+        Console.WriteLine(gen1);
 
-            var sb = new StringBuilder();
-            builder.Generate(sb, builder.GetModelsToGenerate().First());
-            var gen = sb.ToString();
+        var sb = new StringBuilder();
+        builder.Generate(sb, builder.GetModelsToGenerate().First());
+        var gen = sb.ToString();
 
-            SemVersion version = ApiVersion.Current.Version;
-            var expected = @"//------------------------------------------------------------------------------
+        var version = ApiVersion.Current.Version;
+        var expected = @"//------------------------------------------------------------------------------
 // <auto-generated>
 //   This code was generated by a tool.
 //
@@ -187,15 +192,19 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		public new const string ModelTypeAlias = ""type1"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
 			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Type1, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -212,116 +221,119 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 
 		// properties
 
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                       @""")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		[ImplementPropertyType(""foo"")]
-		public virtual global::System.Collections.Generic.IEnumerable<global::" + modelsBuilderConfig.ModelsNamespace + @".Foo> Foo => this.Value<global::System.Collections.Generic.IEnumerable<global::" + modelsBuilderConfig.ModelsNamespace + @".Foo>>(_publishedValueFallback, ""foo"");
+		public virtual global::System.Collections.Generic.IEnumerable<global::" + modelsBuilderConfig.ModelsNamespace +
+                       @".Foo> Foo => this.Value<global::System.Collections.Generic.IEnumerable<global::" +
+                       modelsBuilderConfig.ModelsNamespace + @".Foo>>(_publishedValueFallback, ""foo"");
 	}
 }
 ";
-            Console.WriteLine(gen);
-            Assert.AreEqual(expected.ClearLf(), gen);
+        Console.WriteLine(gen);
+        Assert.AreEqual(expected.ClearLf(), gen);
+    }
+
+    [Test]
+    public void GenerateAmbiguous()
+    {
+        var type1 = new TypeModel
+        {
+            Id = 1,
+            Alias = "type1",
+            ClrName = "Type1",
+            ParentId = 0,
+            BaseType = null,
+            ItemType = TypeModel.ItemTypes.Content,
+            IsMixin = true,
+        };
+        type1.Properties.Add(new PropertyModel
+        {
+            Alias = "prop1",
+            ClrName = "Prop1",
+            ModelClrType = typeof(IPublishedContent),
+        });
+        type1.Properties.Add(new PropertyModel
+        {
+            Alias = "prop2",
+            ClrName = "Prop2",
+            ModelClrType = typeof(StringBuilder),
+        });
+        type1.Properties.Add(new PropertyModel
+        {
+            Alias = "prop3",
+            ClrName = "Prop3",
+            ModelClrType = typeof(BootFailedException),
+        });
+        TypeModel[] types = { type1 };
+
+        var modelsBuilderConfig = new ModelsBuilderSettings();
+        var builder = new TextBuilder(modelsBuilderConfig, types)
+        {
+            ModelsNamespace = "Umbraco.ModelsBuilder.Models", // forces conflict with Umbraco.ModelsBuilder.Umbraco
+        };
+
+        var sb = new StringBuilder();
+        foreach (var model in builder.GetModelsToGenerate())
+        {
+            builder.Generate(sb, model);
         }
 
-        [Test]
-        public void GenerateAmbiguous()
+        var gen = sb.ToString();
+
+        Console.WriteLine(gen);
+
+        Assert.IsTrue(gen.Contains(" global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent Prop1"));
+        Assert.IsTrue(gen.Contains(" global::System.Text.StringBuilder Prop2"));
+        Assert.IsTrue(gen.Contains(" global::Umbraco.Cms.Core.Exceptions.BootFailedException Prop3"));
+    }
+
+    [Test]
+    public void GenerateInheritedType()
+    {
+        var parentType = new TypeModel
         {
-            var type1 = new TypeModel
-            {
-                Id = 1,
-                Alias = "type1",
-                ClrName = "Type1",
-                ParentId = 0,
-                BaseType = null,
-                ItemType = TypeModel.ItemTypes.Content,
-                IsMixin = true,
-            };
-            type1.Properties.Add(new PropertyModel
-            {
-                Alias = "prop1",
-                ClrName = "Prop1",
-                ModelClrType = typeof(IPublishedContent),
-            });
-            type1.Properties.Add(new PropertyModel
-            {
-                Alias = "prop2",
-                ClrName = "Prop2",
-                ModelClrType = typeof(StringBuilder),
-            });
-            type1.Properties.Add(new PropertyModel
-            {
-                Alias = "prop3",
-                ClrName = "Prop3",
-                ModelClrType = typeof(global::Umbraco.Cms.Core.Exceptions.BootFailedException),
-            });
-            TypeModel[] types = new[] { type1 };
-
-            var modelsBuilderConfig = new ModelsBuilderSettings();
-            var builder = new TextBuilder(modelsBuilderConfig, types)
-            {
-                ModelsNamespace = "Umbraco.ModelsBuilder.Models" // forces conflict with Umbraco.ModelsBuilder.Umbraco
-            };
-
-            var sb = new StringBuilder();
-            foreach (TypeModel model in builder.GetModelsToGenerate())
-            {
-                builder.Generate(sb, model);
-            }
-
-            var gen = sb.ToString();
-
-            Console.WriteLine(gen);
-
-            Assert.IsTrue(gen.Contains(" global::Umbraco.Cms.Core.Models.PublishedContent.IPublishedContent Prop1"));
-            Assert.IsTrue(gen.Contains(" global::System.Text.StringBuilder Prop2"));
-            Assert.IsTrue(gen.Contains(" global::Umbraco.Cms.Core.Exceptions.BootFailedException Prop3"));
-        }
-
-        [Test]
-        public void GenerateInheritedType()
+            Id = 1,
+            Alias = "parentType",
+            ClrName = "ParentType",
+            Name = "parentTypeName",
+            ParentId = 0,
+            IsParent = true,
+            BaseType = null,
+            ItemType = TypeModel.ItemTypes.Content,
+        };
+        parentType.Properties.Add(new PropertyModel
         {
-            var parentType = new TypeModel
-            {
-                Id = 1,
-                Alias = "parentType",
-                ClrName = "ParentType",
-                Name = "parentTypeName",
-                ParentId = 0,
-                IsParent = true,
-                BaseType = null,
-                ItemType = TypeModel.ItemTypes.Content,
-            };
-            parentType.Properties.Add(new PropertyModel
-            {
-                Alias = "prop1",
-                ClrName = "Prop1",
-                Name = "prop1Name",
-                ModelClrType = typeof(string),
-            });
+            Alias = "prop1",
+            ClrName = "Prop1",
+            Name = "prop1Name",
+            ModelClrType = typeof(string),
+        });
 
-            var childType = new TypeModel
-            {
-                Id = 2,
-                Alias = "childType",
-                ClrName = "ChildType",
-                Name = "childTypeName",
-                ParentId = 1,
-                BaseType = parentType,
-                ItemType = TypeModel.ItemTypes.Content,
-            };
+        var childType = new TypeModel
+        {
+            Id = 2,
+            Alias = "childType",
+            ClrName = "ChildType",
+            Name = "childTypeName",
+            ParentId = 1,
+            BaseType = parentType,
+            ItemType = TypeModel.ItemTypes.Content,
+        };
 
-            TypeModel[] docTypes = new[] { parentType, childType };
+        TypeModel[] docTypes = { parentType, childType };
 
-            var modelsBuilderConfig = new ModelsBuilderSettings();
-            var builder = new TextBuilder(modelsBuilderConfig, docTypes);
+        var modelsBuilderConfig = new ModelsBuilderSettings();
+        var builder = new TextBuilder(modelsBuilderConfig, docTypes);
 
-            var sb = new StringBuilder();
-            builder.Generate(sb, builder.GetModelsToGenerate().First());
-            var genParent = sb.ToString();
+        var sb = new StringBuilder();
+        builder.Generate(sb, builder.GetModelsToGenerate().First());
+        var genParent = sb.ToString();
 
-            SemVersion version = ApiVersion.Current.Version;
+        var version = ApiVersion.Current.Version;
 
-            var expectedParent = @"//------------------------------------------------------------------------------
+        var expectedParent = @"//------------------------------------------------------------------------------
 // <auto-generated>
 //   This code was generated by a tool.
 //
@@ -347,15 +359,19 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                             @""")]
 		public new const string ModelTypeAlias = ""parentType"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                             @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                             @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
 			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                             @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<ParentType, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -375,21 +391,22 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 		///<summary>
 		/// prop1Name
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                             @""")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		[ImplementPropertyType(""prop1"")]
 		public virtual string Prop1 => this.Value<string>(_publishedValueFallback, ""prop1"");
 	}
 }
 ";
-            Console.WriteLine(genParent);
-            Assert.AreEqual(expectedParent.ClearLf(), genParent);
+        Console.WriteLine(genParent);
+        Assert.AreEqual(expectedParent.ClearLf(), genParent);
 
-            var sb2 = new StringBuilder();
-            builder.Generate(sb2, builder.GetModelsToGenerate().Skip(1).First());
-            var genChild = sb2.ToString();
+        var sb2 = new StringBuilder();
+        builder.Generate(sb2, builder.GetModelsToGenerate().Skip(1).First());
+        var genChild = sb2.ToString();
 
-            var expectedChild = @"//------------------------------------------------------------------------------
+        var expectedChild = @"//------------------------------------------------------------------------------
 // <auto-generated>
 //   This code was generated by a tool.
 //
@@ -415,15 +432,19 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                            @""")]
 		public new const string ModelTypeAlias = ""childType"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                            @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                            @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
 			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                            @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<ChildType, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -443,66 +464,65 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 }
 ";
 
-            Console.WriteLine(genChild);
-            Assert.AreEqual(expectedChild.ClearLf(), genChild);
+        Console.WriteLine(genChild);
+        Assert.AreEqual(expectedChild.ClearLf(), genChild);
+    }
 
-        }
-
-        [Test]
-        public void GenerateComposedType()
+    [Test]
+    public void GenerateComposedType()
+    {
+        // Umbraco returns nice, pascal-cased names.
+        var composition1 = new TypeModel
         {
-            // Umbraco returns nice, pascal-cased names.
-            var composition1 = new TypeModel
-            {
-                Id = 2,
-                Alias = "composition1",
-                ClrName = "Composition1",
-                Name = "composition1Name",
-                ParentId = 0,
-                BaseType = null,
-                ItemType = TypeModel.ItemTypes.Content,
-                IsMixin = true,
-            };
-            composition1.Properties.Add(new PropertyModel
-            {
-                Alias = "compositionProp",
-                ClrName = "CompositionProp",
-                Name = "compositionPropName",
-                ModelClrType = typeof(string),
-                ClrTypeName = typeof(string).FullName
-            });
+            Id = 2,
+            Alias = "composition1",
+            ClrName = "Composition1",
+            Name = "composition1Name",
+            ParentId = 0,
+            BaseType = null,
+            ItemType = TypeModel.ItemTypes.Content,
+            IsMixin = true,
+        };
+        composition1.Properties.Add(new PropertyModel
+        {
+            Alias = "compositionProp",
+            ClrName = "CompositionProp",
+            Name = "compositionPropName",
+            ModelClrType = typeof(string),
+            ClrTypeName = typeof(string).FullName,
+        });
 
-            var type1 = new TypeModel
-            {
-                Id = 1,
-                Alias = "type1",
-                ClrName = "Type1",
-                Name = "type1Name",
-                ParentId = 0,
-                BaseType = null,
-                ItemType = TypeModel.ItemTypes.Content,
-            };
-            type1.Properties.Add(new PropertyModel
-            {
-                Alias = "prop1",
-                ClrName = "Prop1",
-                Name = "prop1Name",
-                ModelClrType = typeof(string),
-            });
-            type1.MixinTypes.Add(composition1);
+        var type1 = new TypeModel
+        {
+            Id = 1,
+            Alias = "type1",
+            ClrName = "Type1",
+            Name = "type1Name",
+            ParentId = 0,
+            BaseType = null,
+            ItemType = TypeModel.ItemTypes.Content,
+        };
+        type1.Properties.Add(new PropertyModel
+        {
+            Alias = "prop1",
+            ClrName = "Prop1",
+            Name = "prop1Name",
+            ModelClrType = typeof(string),
+        });
+        type1.MixinTypes.Add(composition1);
 
-            TypeModel[] types = new[] { type1, composition1 };
+        TypeModel[] types = { type1, composition1 };
 
-            var modelsBuilderConfig = new ModelsBuilderSettings();
-            var builder = new TextBuilder(modelsBuilderConfig, types);
+        var modelsBuilderConfig = new ModelsBuilderSettings();
+        var builder = new TextBuilder(modelsBuilderConfig, types);
 
-            SemVersion version = ApiVersion.Current.Version;
+        var version = ApiVersion.Current.Version;
 
-            var sb = new StringBuilder();
-            builder.Generate(sb, builder.GetModelsToGenerate().First());
-            var genComposed = sb.ToString();
+        var sb = new StringBuilder();
+        builder.Generate(sb, builder.GetModelsToGenerate().First());
+        var genComposed = sb.ToString();
 
-            var expectedComposed = @"//------------------------------------------------------------------------------
+        var expectedComposed = @"//------------------------------------------------------------------------------
 // <auto-generated>
 //   This code was generated by a tool.
 //
@@ -528,15 +548,19 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                               @""")]
 		public new const string ModelTypeAlias = ""type1"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                               @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                               @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
 			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                               @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Type1, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -556,7 +580,8 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 		///<summary>
 		/// prop1Name
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                               @""")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		[ImplementPropertyType(""prop1"")]
 		public virtual string Prop1 => this.Value<string>(_publishedValueFallback, ""prop1"");
@@ -564,21 +589,22 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 		///<summary>
 		/// compositionPropName
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                               @""")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		[ImplementPropertyType(""compositionProp"")]
 		public virtual string CompositionProp => global::Umbraco.Cms.Web.Common.PublishedModels.Composition1.GetCompositionProp(this, _publishedValueFallback);
 	}
 }
 ";
-            Console.WriteLine(genComposed);
-            Assert.AreEqual(expectedComposed.ClearLf(), genComposed);
+        Console.WriteLine(genComposed);
+        Assert.AreEqual(expectedComposed.ClearLf(), genComposed);
 
-            var sb2 = new StringBuilder();
-            builder.Generate(sb2, builder.GetModelsToGenerate().Skip(1).First());
-            var genComposition = sb2.ToString();
+        var sb2 = new StringBuilder();
+        builder.Generate(sb2, builder.GetModelsToGenerate().Skip(1).First());
+        var genComposition = sb2.ToString();
 
-            var expectedComposition = @"//------------------------------------------------------------------------------
+        var expectedComposition = @"//------------------------------------------------------------------------------
 // <auto-generated>
 //   This code was generated by a tool.
 //
@@ -603,7 +629,8 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 	public partial interface IComposition1 : IPublishedContent
 	{
 		/// <summary>compositionPropName</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                                  @""")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		string CompositionProp { get; }
 	}
@@ -614,15 +641,19 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 	{
 		// helpers
 #pragma warning disable 0109 // new is redundant
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                                  @""")]
 		public new const string ModelTypeAlias = ""composition1"";
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                                  @""")]
 		public new const PublishedItemType ModelItemType = PublishedItemType.Content;
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                                  @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public new static IPublishedContentType GetModelContentType(IPublishedSnapshotAccessor publishedSnapshotAccessor)
 			=> PublishedModelUtility.GetModelContentType(publishedSnapshotAccessor, ModelItemType, ModelTypeAlias);
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                                  @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public static IPublishedPropertyType GetModelPropertyType<TValue>(IPublishedSnapshotAccessor publishedSnapshotAccessor, Expression<Func<Composition1, TValue>> selector)
 			=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(publishedSnapshotAccessor), selector);
@@ -642,176 +673,174 @@ namespace Umbraco.Cms.Web.Common.PublishedModels
 		///<summary>
 		/// compositionPropName
 		///</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                                  @""")]
 		[global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		[ImplementPropertyType(""compositionProp"")]
 		public virtual string CompositionProp => GetCompositionProp(this, _publishedValueFallback);
 
 		/// <summary>Static getter for compositionPropName</summary>
-		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version + @""")]
+		[global::System.CodeDom.Compiler.GeneratedCodeAttribute(""Umbraco.ModelsBuilder.Embedded"", """ + version +
+                                  @""")]
 		[return: global::System.Diagnostics.CodeAnalysis.MaybeNull]
 		public static string GetCompositionProp(IComposition1 that, IPublishedValueFallback publishedValueFallback) => that.Value<string>(publishedValueFallback, ""compositionProp"");
 	}
 }
 ";
 
-            Console.WriteLine(genComposition);
-            Assert.AreEqual(expectedComposition.ClearLf(), genComposition);
-        }
-
-        [TestCase("int", typeof(int))]
-        [TestCase("global::System.Collections.Generic.IEnumerable<int>", typeof(IEnumerable<int>))]
-        [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTestsClass1", typeof(BuilderTestsClass1))]
-        [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTests.Class1", typeof(Class1))]
-        public void WriteClrType(string expected, Type input)
-        {
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            var builder = new TextBuilder
-            {
-                ModelsNamespaceForTests = "ModelsNamespace"
-            };
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, input);
-            Assert.AreEqual(expected, sb.ToString());
-        }
-
-        [TestCase("int", typeof(int))]
-        [TestCase("global::System.Collections.Generic.IEnumerable<int>", typeof(IEnumerable<int>))]
-        [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTestsClass1", typeof(BuilderTestsClass1))]
-        [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTests.Class1", typeof(Class1))]
-        public void WriteClrTypeUsing(string expected, Type input)
-        {
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            var builder = new TextBuilder();
-            builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder");
-            builder.ModelsNamespaceForTests = "ModelsNamespace";
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, input);
-            Assert.AreEqual(expected, sb.ToString());
-        }
-
-        [Test]
-        public void WriteClrType_WithUsing()
-        {
-            var builder = new TextBuilder();
-            builder.Using.Add("System.Text");
-            builder.ModelsNamespaceForTests = "Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Models";
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(StringBuilder));
-
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            Assert.AreEqual("global::System.Text.StringBuilder", sb.ToString());
-        }
-
-        [Test]
-        public void WriteClrTypeAnother_WithoutUsing()
-        {
-            var builder = new TextBuilder
-            {
-                ModelsNamespaceForTests = "Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Models"
-            };
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(StringBuilder));
-            Assert.AreEqual("global::System.Text.StringBuilder", sb.ToString());
-        }
-
-        [Test]
-        public void WriteClrType_Ambiguous1()
-        {
-            var builder = new TextBuilder();
-            builder.Using.Add("System.Text");
-            builder.Using.Add("Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
-            builder.ModelsNamespaceForTests = "SomeRandomNamespace";
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
-
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            Assert.AreEqual("global::System.Text.ASCIIEncoding", sb.ToString());
-        }
-
-        [Test]
-        public void WriteClrType_Ambiguous()
-        {
-            var builder = new TextBuilder();
-            builder.Using.Add("System.Text");
-            builder.Using.Add("Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
-            builder.ModelsNamespaceForTests = "SomeBorkedNamespace";
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
-
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            Assert.AreEqual("global::System.Text.ASCIIEncoding", sb.ToString());
-        }
-
-        [Test]
-        public void WriteClrType_Ambiguous2()
-        {
-            var builder = new TextBuilder();
-            builder.Using.Add("System.Text");
-            builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
-            builder.ModelsNamespaceForTests = "SomeRandomNamespace";
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(ASCIIEncoding));
-
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            Assert.AreEqual("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.ASCIIEncoding", sb.ToString());
-        }
-
-        [Test]
-        public void WriteClrType_AmbiguousNot()
-        {
-            var builder = new TextBuilder();
-            builder.Using.Add("System.Text");
-            builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
-            builder.ModelsNamespaceForTests = "Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Models";
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(ASCIIEncoding));
-
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            Assert.AreEqual("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.ASCIIEncoding", sb.ToString());
-        }
-
-        [Test]
-        public void WriteClrType_AmbiguousWithNested()
-        {
-            var builder = new TextBuilder();
-            builder.Using.Add("System.Text");
-            builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
-            builder.ModelsNamespaceForTests = "SomeRandomNamespace";
-            var sb = new StringBuilder();
-            builder.WriteClrType(sb, typeof(ASCIIEncoding.Nested));
-
-            // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
-            // which means global:: syntax will be applied to most things
-            Assert.AreEqual("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.ASCIIEncoding.Nested", sb.ToString());
-        }
-
-        public class Class1
-        {
-        }
+        Console.WriteLine(genComposition);
+        Assert.AreEqual(expectedComposition.ClearLf(), genComposition);
     }
 
-    // make it public to be ambiguous (see above)
-    public class ASCIIEncoding
+    [TestCase("int", typeof(int))]
+    [TestCase("global::System.Collections.Generic.IEnumerable<int>", typeof(IEnumerable<int>))]
+    [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTestsClass1", typeof(BuilderTestsClass1))]
+    [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTests.Class1", typeof(Class1))]
+    public void WriteClrType(string expected, Type input)
     {
-        // can we handle nested types?
-        public class Nested
-        {
-        }
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        var builder = new TextBuilder { ModelsNamespaceForTests = "ModelsNamespace" };
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, input);
+        Assert.AreEqual(expected, sb.ToString());
     }
 
-    public class BuilderTestsClass1
+    [TestCase("int", typeof(int))]
+    [TestCase("global::System.Collections.Generic.IEnumerable<int>", typeof(IEnumerable<int>))]
+    [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTestsClass1", typeof(BuilderTestsClass1))]
+    [TestCase("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.BuilderTests.Class1", typeof(Class1))]
+    public void WriteClrTypeUsing(string expected, Type input)
     {
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        var builder = new TextBuilder();
+        builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder");
+        builder.ModelsNamespaceForTests = "ModelsNamespace";
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, input);
+        Assert.AreEqual(expected, sb.ToString());
     }
 
-    public class System
+    [Test]
+    public void WriteClrType_WithUsing()
+    {
+        var builder = new TextBuilder();
+        builder.Using.Add("System.Text");
+        builder.ModelsNamespaceForTests = "Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Models";
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, typeof(StringBuilder));
+
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        Assert.AreEqual("global::System.Text.StringBuilder", sb.ToString());
+    }
+
+    [Test]
+    public void WriteClrTypeAnother_WithoutUsing()
+    {
+        var builder = new TextBuilder
+        {
+            ModelsNamespaceForTests = "Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Models",
+        };
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, typeof(StringBuilder));
+        Assert.AreEqual("global::System.Text.StringBuilder", sb.ToString());
+    }
+
+    [Test]
+    public void WriteClrType_Ambiguous1()
+    {
+        var builder = new TextBuilder();
+        builder.Using.Add("System.Text");
+        builder.Using.Add("Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
+        builder.ModelsNamespaceForTests = "SomeRandomNamespace";
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
+
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        Assert.AreEqual("global::System.Text.ASCIIEncoding", sb.ToString());
+    }
+
+    [Test]
+    public void WriteClrType_Ambiguous()
+    {
+        var builder = new TextBuilder();
+        builder.Using.Add("System.Text");
+        builder.Using.Add("Umbraco.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
+        builder.ModelsNamespaceForTests = "SomeBorkedNamespace";
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, typeof(global::System.Text.ASCIIEncoding));
+
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        Assert.AreEqual("global::System.Text.ASCIIEncoding", sb.ToString());
+    }
+
+    [Test]
+    public void WriteClrType_Ambiguous2()
+    {
+        var builder = new TextBuilder();
+        builder.Using.Add("System.Text");
+        builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
+        builder.ModelsNamespaceForTests = "SomeRandomNamespace";
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, typeof(ASCIIEncoding));
+
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        Assert.AreEqual("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.ASCIIEncoding", sb.ToString());
+    }
+
+    [Test]
+    public void WriteClrType_AmbiguousNot()
+    {
+        var builder = new TextBuilder();
+        builder.Using.Add("System.Text");
+        builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
+        builder.ModelsNamespaceForTests = "Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Models";
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, typeof(ASCIIEncoding));
+
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        Assert.AreEqual("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.ASCIIEncoding", sb.ToString());
+    }
+
+    [Test]
+    public void WriteClrType_AmbiguousWithNested()
+    {
+        var builder = new TextBuilder();
+        builder.Using.Add("System.Text");
+        builder.Using.Add("Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded");
+        builder.ModelsNamespaceForTests = "SomeRandomNamespace";
+        var sb = new StringBuilder();
+        builder.WriteClrType(sb, typeof(ASCIIEncoding.Nested));
+
+        // note - these assertions differ from the original tests in MB because in the embedded version, the result of Builder.IsAmbiguousSymbol is always true
+        // which means global:: syntax will be applied to most things
+        Assert.AreEqual("global::Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded.ASCIIEncoding.Nested", sb.ToString());
+    }
+
+    public class Class1
     {
     }
 }
+
+// make it public to be ambiguous (see above)
+public class ASCIIEncoding
+{
+    // can we handle nested types?
+    public class Nested
+    {
+    }
+}
+
+public class BuilderTestsClass1
+{
+}
+
+public class System
+{
+}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs
index b80ab5dfe6..27b0203acf 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/StringExtensions.cs
@@ -1,10 +1,9 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
-    {
-        public static string ClearLf(this string s) => s.Replace("\r", string.Empty);
-    }
+    public static string ClearLf(this string s) => s.Replace("\r", string.Empty);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
index ec949f81c2..fcacaadeee 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.ModelsBuilder.Embedded/UmbracoApplicationTests.cs
@@ -7,57 +7,56 @@ using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.ModelsBuilder;
 using Umbraco.Cms.Infrastructure.ModelsBuilder.Building;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.ModelsBuilder.Embedded;
+
+[TestFixture]
+public class UmbracoApplicationTests
 {
-    [TestFixture]
-    public class UmbracoApplicationTests
+    //// [Test]
+    //// public void Test()
+    //// {
+    ////    // start and terminate
+    ////    using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
+    ////    { }
+
+    //// // start and terminate
+    ////    using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
+    ////    { }
+
+    //// // start, use and terminate
+    ////    using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
+    ////    {
+    ////        var types = app.GetContentTypes();
+    ////    }
+    //// }
+
+    [Test]
+    public void ThrowsOnDuplicateAliases()
     {
-        //// [Test]
-        //// public void Test()
-        //// {
-        ////    // start and terminate
-        ////    using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
-        ////    { }
-
-        //// // start and terminate
-        ////    using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
-        ////    { }
-
-        //// // start, use and terminate
-        ////    using (var app = Application.GetApplication(TestOptions.ConnectionString, TestOptions.DatabaseProvider))
-        ////    {
-        ////        var types = app.GetContentTypes();
-        ////    }
-        //// }
-
-        [Test]
-        public void ThrowsOnDuplicateAliases()
+        var typeModels = new List<TypeModel>
         {
-            var typeModels = new List<TypeModel>
-            {
-                new TypeModel { ItemType = TypeModel.ItemTypes.Content, Alias = "content1" },
-                new TypeModel { ItemType = TypeModel.ItemTypes.Content, Alias = "content2" },
-                new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "media1" },
-                new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "media2" },
-                new TypeModel { ItemType = TypeModel.ItemTypes.Member, Alias = "member1" },
-                new TypeModel { ItemType = TypeModel.ItemTypes.Member, Alias = "member2" },
-            };
+            new() { ItemType = TypeModel.ItemTypes.Content, Alias = "content1" },
+            new() { ItemType = TypeModel.ItemTypes.Content, Alias = "content2" },
+            new() { ItemType = TypeModel.ItemTypes.Media, Alias = "media1" },
+            new() { ItemType = TypeModel.ItemTypes.Media, Alias = "media2" },
+            new() { ItemType = TypeModel.ItemTypes.Member, Alias = "member1" },
+            new() { ItemType = TypeModel.ItemTypes.Member, Alias = "member2" },
+        };
 
-            Assert.AreEqual(6, UmbracoServices.EnsureDistinctAliases(typeModels).Count);
+        Assert.AreEqual(6, UmbracoServices.EnsureDistinctAliases(typeModels).Count);
 
-            typeModels.Add(new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "content1" });
+        typeModels.Add(new TypeModel { ItemType = TypeModel.ItemTypes.Media, Alias = "content1" });
 
-            try
-            {
-                UmbracoServices.EnsureDistinctAliases(typeModels);
-            }
-            catch (NotSupportedException e)
-            {
-                Console.WriteLine(e.Message);
-                return;
-            }
-
-            Assert.Fail("Expected NotSupportedException.");
+        try
+        {
+            UmbracoServices.EnsureDistinctAliases(typeModels);
         }
+        catch (NotSupportedException e)
+        {
+            Console.WriteLine(e.Message);
+            return;
+        }
+
+        Assert.Fail("Expected NotSupportedException.");
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs
index b8e4953c50..b7e0823561 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.PublishedCache.NuCache/SnapDictionaryTests.cs
@@ -9,1174 +9,1173 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Scoping;
 using Umbraco.Cms.Infrastructure.PublishedCache;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.PublishedCache.NuCache
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.PublishedCache.NuCache;
+
+[TestFixture]
+public class SnapDictionaryTests
 {
-    [TestFixture]
-    public class SnapDictionaryTests
+    [Test]
+    public void LiveGenUpdate()
     {
-        [Test]
-        public void LiveGenUpdate()
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        Assert.AreEqual(0, d.Test.GetValues(1).Length);
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Clear(1);
+        Assert.AreEqual(0, d.Test.GetValues(1).Length); // gone
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(0, d.Test.FloorGen);
+    }
+
+    [Test]
+    public void OtherGenUpdate()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        Assert.AreEqual(0, d.Test.GetValues(1).Length);
+        Assert.AreEqual(0, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s = d.CreateSnapshot();
+        Assert.AreEqual(1, s.Gen);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 2
+        d.Clear(1);
+        Assert.AreEqual(2, d.Test.GetValues(1).Length); // there
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        Assert.AreEqual(0, d.Test.FloorGen);
+
+        GC.KeepAlive(s);
+    }
+
+    [Test]
+    public void MissingReturnsNull()
+    {
+        var d = new SnapDictionary<int, string>();
+        var s = d.CreateSnapshot();
+
+        Assert.IsNull(s.Get(1));
+    }
+
+    [Test]
+    public void DeletedReturnsNull()
+    {
+        var d = new SnapDictionary<int, string>();
+
+        // gen 1
+        d.Set(1, "one");
+
+        var s1 = d.CreateSnapshot();
+        Assert.AreEqual("one", s1.Get(1));
+
+        // gen 2
+        d.Clear(1);
+
+        var s2 = d.CreateSnapshot();
+        Assert.IsNull(s2.Get(1));
+
+        Assert.AreEqual("one", s1.Get(1));
+    }
+
+    [Retry(5)] // TODO make this test non-flaky.
+    [Test]
+    public async Task CollectValues()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s1 = d.CreateSnapshot();
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 2
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "one");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s2 = d.CreateSnapshot();
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 3
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+        d.Set(1, "one");
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var tv = d.Test.GetValues(1);
+        Assert.AreEqual(3, tv[0].Gen);
+        Assert.AreEqual(2, tv[1].Gen);
+        Assert.AreEqual(1, tv[2].Gen);
+
+        Assert.AreEqual(0, d.Test.FloorGen);
+
+        // nothing to collect
+        await d.CollectAsync();
+        GC.KeepAlive(s1);
+        GC.KeepAlive(s2);
+        Assert.AreEqual(0, d.Test.FloorGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(2, d.SnapCount);
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+
+        // one snapshot to collect
+        s1 = null;
+        GC.Collect();
+        GC.KeepAlive(s2);
+        await d.CollectAsync();
+        Assert.AreEqual(1, d.Test.FloorGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(1, d.SnapCount);
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        // another snapshot to collect
+        s2 = null;
+        GC.Collect();
+        await d.CollectAsync();
+        Assert.AreEqual(2, d.Test.FloorGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(0, d.SnapCount);
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+    }
+
+    [Test]
+    public async Task ProperlyCollects()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        for (var i = 0; i < 32; i++)
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            Assert.AreEqual(0, d.Test.GetValues(1).Length);
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Clear(1);
-            Assert.AreEqual(0, d.Test.GetValues(1).Length); // gone
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(0, d.Test.FloorGen);
-        }
-
-        [Test]
-        public void OtherGenUpdate()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            Assert.AreEqual(0, d.Test.GetValues(1).Length);
-            Assert.AreEqual(0, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s = d.CreateSnapshot();
-            Assert.AreEqual(1, s.Gen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 2
-            d.Clear(1);
-            Assert.AreEqual(2, d.Test.GetValues(1).Length); // there
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            Assert.AreEqual(0, d.Test.FloorGen);
-
-            GC.KeepAlive(s);
-        }
-
-        [Test]
-        public void MissingReturnsNull()
-        {
-            var d = new SnapDictionary<int, string>();
-            SnapDictionary<int, string>.Snapshot s = d.CreateSnapshot();
-
-            Assert.IsNull(s.Get(1));
-        }
-
-        [Test]
-        public void DeletedReturnsNull()
-        {
-            var d = new SnapDictionary<int, string>();
-
-            // gen 1
-            d.Set(1, "one");
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            Assert.AreEqual("one", s1.Get(1));
-
-            // gen 2
-            d.Clear(1);
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-            Assert.IsNull(s2.Get(1));
-
-            Assert.AreEqual("one", s1.Get(1));
-        }
-
-        [Retry(5)] // TODO make this test non-flaky.
-        [Test]
-        public async Task CollectValues()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 2
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "one");
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 3
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-            d.Set(1, "one");
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.TestHelper.GenVal[] tv = d.Test.GetValues(1);
-            Assert.AreEqual(3, tv[0].Gen);
-            Assert.AreEqual(2, tv[1].Gen);
-            Assert.AreEqual(1, tv[2].Gen);
-
-            Assert.AreEqual(0, d.Test.FloorGen);
-
-            // nothing to collect
-            await d.CollectAsync();
-            GC.KeepAlive(s1);
-            GC.KeepAlive(s2);
-            Assert.AreEqual(0, d.Test.FloorGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(2, d.SnapCount);
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-            // one snapshot to collect
-            s1 = null;
-            GC.Collect();
-            GC.KeepAlive(s2);
-            await d.CollectAsync();
-            Assert.AreEqual(1, d.Test.FloorGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(1, d.SnapCount);
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            // another snapshot to collect
-            s2 = null;
-            GC.Collect();
-            await d.CollectAsync();
-            Assert.AreEqual(2, d.Test.FloorGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(0, d.SnapCount);
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-        }
-
-        [Test]
-        public async Task ProperlyCollects()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            for (int i = 0; i < 32; i++)
-            {
-                d.Set(i, i.ToString());
-                d.CreateSnapshot().Dispose();
-            }
-
-            Assert.AreEqual(32, d.GenCount);
-            Assert.AreEqual(0, d.SnapCount); // because we've disposed them
-
-            await d.CollectAsync();
-            Assert.AreEqual(32, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual(0, d.GenCount);
-            Assert.AreEqual(0, d.SnapCount);
-            Assert.AreEqual(32, d.Count);
-
-            for (int i = 0; i < 32; i++)
-            {
-                d.Set(i, null);
-            }
-
+            d.Set(i, i.ToString());
             d.CreateSnapshot().Dispose();
-
-            // because we haven't collected yet, but disposed nevertheless
-            Assert.AreEqual(1, d.GenCount);
-            Assert.AreEqual(0, d.SnapCount);
-            Assert.AreEqual(32, d.Count);
-
-            // once we collect, they are all gone
-            // since noone is interested anymore
-            await d.CollectAsync();
-            Assert.AreEqual(0, d.GenCount);
-            Assert.AreEqual(0, d.SnapCount);
-            Assert.AreEqual(0, d.Count);
         }
 
-        [Retry(5)] // TODO make this test non-flaky.
-        [Test]
-        public async Task CollectNulls()
+        Assert.AreEqual(32, d.GenCount);
+        Assert.AreEqual(0, d.SnapCount); // because we've disposed them
+
+        await d.CollectAsync();
+        Assert.AreEqual(32, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual(0, d.GenCount);
+        Assert.AreEqual(0, d.SnapCount);
+        Assert.AreEqual(32, d.Count);
+
+        for (var i = 0; i < 32; i++)
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 2
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "one");
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 3
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-            d.Set(1, "one");
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-            d.Clear(1);
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.TestHelper.GenVal[] tv = d.Test.GetValues(1);
-            Assert.AreEqual(3, tv[0].Gen);
-            Assert.AreEqual(2, tv[1].Gen);
-            Assert.AreEqual(1, tv[2].Gen);
-
-            Assert.AreEqual(0, d.Test.FloorGen);
-
-            // nothing to collect
-            await d.CollectAsync();
-            GC.KeepAlive(s1);
-            GC.KeepAlive(s2);
-            Assert.AreEqual(0, d.Test.FloorGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(2, d.SnapCount);
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-            // one snapshot to collect
-            s1 = null;
-            GC.Collect();
-            GC.KeepAlive(s2);
-            await d.CollectAsync();
-            Assert.AreEqual(1, d.Test.FloorGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(1, d.SnapCount);
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            // another snapshot to collect
-            s2 = null;
-            GC.Collect();
-            await d.CollectAsync();
-            Assert.AreEqual(2, d.Test.FloorGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(0, d.SnapCount);
-
-            // and everything is gone?
-            // no, cannot collect the live gen because we'd need to lock
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            d.CreateSnapshot();
-            GC.Collect();
-            await d.CollectAsync();
-
-            // poof, gone
-            Assert.AreEqual(0, d.Test.GetValues(1).Length);
+            d.Set(i, null);
         }
 
-        [Test]
-        [Retry(5)] // TODO make this test non-flaky.
-        public async Task EventuallyCollectNulls()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
+        d.CreateSnapshot().Dispose();
 
-            Assert.AreEqual(0, d.Test.GetValues(1).Length);
+        // because we haven't collected yet, but disposed nevertheless
+        Assert.AreEqual(1, d.GenCount);
+        Assert.AreEqual(0, d.SnapCount);
+        Assert.AreEqual(32, d.Count);
 
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        // once we collect, they are all gone
+        // since noone is interested anymore
+        await d.CollectAsync();
+        Assert.AreEqual(0, d.GenCount);
+        Assert.AreEqual(0, d.SnapCount);
+        Assert.AreEqual(0, d.Count);
+    }
 
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
+    [Retry(5)] // TODO make this test non-flaky.
+    [Test]
+    public async Task CollectNulls()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
 
-            await d.CollectAsync();
-            SnapDictionary<int, string>.TestHelper.GenVal[] tv = d.Test.GetValues(1);
-            Assert.AreEqual(1, tv.Length);
-            Assert.AreEqual(1, tv[0].Gen);
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
 
-            SnapDictionary<int, string>.Snapshot s = d.CreateSnapshot();
-            Assert.AreEqual("one", s.Get(1));
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
 
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
+        var s1 = d.CreateSnapshot();
 
-            Assert.AreEqual(1, d.Count);
-            Assert.AreEqual(1, d.SnapCount);
-            Assert.AreEqual(1, d.GenCount);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
 
-            // gen 2
-            d.Clear(1);
-            tv = d.Test.GetValues(1);
-            Assert.AreEqual(2, tv.Length);
-            Assert.AreEqual(2, tv[0].Gen);
+        // gen 2
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "one");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
 
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
 
-            Assert.AreEqual(1, d.Count);
-            Assert.AreEqual(1, d.SnapCount);
-            Assert.AreEqual(1, d.GenCount);
+        var s2 = d.CreateSnapshot();
 
-            // nothing to collect
-            await d.CollectAsync();
-            GC.KeepAlive(s);
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
 
-            Assert.AreEqual(1, d.Count);
-            Assert.AreEqual(1, d.SnapCount);
-            Assert.AreEqual(1, d.GenCount);
+        // gen 3
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+        d.Set(1, "one");
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+        d.Clear(1);
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
 
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
 
-            // collect snapshot
-            // don't collect liveGen+
-            s = null; // without being disposed
-            GC.Collect(); // should release the generation reference
-            await d.CollectAsync();
+        var tv = d.Test.GetValues(1);
+        Assert.AreEqual(3, tv[0].Gen);
+        Assert.AreEqual(2, tv[1].Gen);
+        Assert.AreEqual(1, tv[2].Gen);
 
-            Assert.AreEqual(1, d.Test.GetValues(1).Length); // "one" value is gone
-            Assert.AreEqual(1, d.Count); // still have 1 item
-            Assert.AreEqual(0, d.SnapCount); // snapshot is gone
-            Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
+        Assert.AreEqual(0, d.Test.FloorGen);
 
-            // liveGen/nextGen
-            s = d.CreateSnapshot();
-            s = null;
+        // nothing to collect
+        await d.CollectAsync();
+        GC.KeepAlive(s1);
+        GC.KeepAlive(s2);
+        Assert.AreEqual(0, d.Test.FloorGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(2, d.SnapCount);
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
 
-            // collect liveGen
-            GC.Collect();
+        // one snapshot to collect
+        s1 = null;
+        GC.Collect();
+        GC.KeepAlive(s2);
+        await d.CollectAsync();
+        Assert.AreEqual(1, d.Test.FloorGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(1, d.SnapCount);
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
 
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out global::Umbraco.Cms.Infrastructure.PublishedCache.Snap.GenObj genObj));
-            genObj = null;
+        // another snapshot to collect
+        s2 = null;
+        GC.Collect();
+        await d.CollectAsync();
+        Assert.AreEqual(2, d.Test.FloorGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(0, d.SnapCount);
 
-            // in Release mode, it works, but in Debug mode, the weak reference is still alive
-            // and for some reason we need to do this to ensure it is collected
+        // and everything is gone?
+        // no, cannot collect the live gen because we'd need to lock
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        d.CreateSnapshot();
+        GC.Collect();
+        await d.CollectAsync();
+
+        // poof, gone
+        Assert.AreEqual(0, d.Test.GetValues(1).Length);
+    }
+
+    [Test]
+    [Retry(5)] // TODO make this test non-flaky.
+    public async Task EventuallyCollectNulls()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        Assert.AreEqual(0, d.Test.GetValues(1).Length);
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        await d.CollectAsync();
+        var tv = d.Test.GetValues(1);
+        Assert.AreEqual(1, tv.Length);
+        Assert.AreEqual(1, tv[0].Gen);
+
+        var s = d.CreateSnapshot();
+        Assert.AreEqual("one", s.Get(1));
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        Assert.AreEqual(1, d.Count);
+        Assert.AreEqual(1, d.SnapCount);
+        Assert.AreEqual(1, d.GenCount);
+
+        // gen 2
+        d.Clear(1);
+        tv = d.Test.GetValues(1);
+        Assert.AreEqual(2, tv.Length);
+        Assert.AreEqual(2, tv[0].Gen);
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        Assert.AreEqual(1, d.Count);
+        Assert.AreEqual(1, d.SnapCount);
+        Assert.AreEqual(1, d.GenCount);
+
+        // nothing to collect
+        await d.CollectAsync();
+        GC.KeepAlive(s);
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Count);
+        Assert.AreEqual(1, d.SnapCount);
+        Assert.AreEqual(1, d.GenCount);
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        // collect snapshot
+        // don't collect liveGen+
+        s = null; // without being disposed
+        GC.Collect(); // should release the generation reference
+        await d.CollectAsync();
+
+        Assert.AreEqual(1, d.Test.GetValues(1).Length); // "one" value is gone
+        Assert.AreEqual(1, d.Count); // still have 1 item
+        Assert.AreEqual(0, d.SnapCount); // snapshot is gone
+        Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
+
+        // liveGen/nextGen
+        s = d.CreateSnapshot();
+        s = null;
+
+        // collect liveGen
+        GC.Collect();
+
+        Assert.IsTrue(d.Test.GenObjs.TryPeek(out var genObj));
+        genObj = null;
+
+        // in Release mode, it works, but in Debug mode, the weak reference is still alive
+        // and for some reason we need to do this to ensure it is collected
 #if DEBUG
-            await d.CollectAsync();
-            GC.Collect();
+        await d.CollectAsync();
+        GC.Collect();
 #endif
 
-            Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
-            Assert.IsFalse(genObj.WeakGenRef.IsAlive); // snapshot is gone, along with its reference
+        Assert.IsTrue(d.Test.GenObjs.TryPeek(out genObj));
+        Assert.IsFalse(genObj.WeakGenRef.IsAlive); // snapshot is gone, along with its reference
 
-            await d.CollectAsync();
+        await d.CollectAsync();
 
-            Assert.AreEqual(0, d.Test.GetValues(1).Length); // null value is gone
-            Assert.AreEqual(0, d.Count); // item is gone
-            Assert.AreEqual(0, d.Test.GenObjs.Count);
-            Assert.AreEqual(0, d.SnapCount); // snapshot is gone
-            Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
+        Assert.AreEqual(0, d.Test.GetValues(1).Length); // null value is gone
+        Assert.AreEqual(0, d.Count); // item is gone
+        Assert.AreEqual(0, d.Test.GenObjs.Count);
+        Assert.AreEqual(0, d.SnapCount); // snapshot is gone
+        Assert.AreEqual(0, d.GenCount); // and generation has been dequeued
+    }
+
+    [Test]
+    public async Task CollectDisposedSnapshots()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s1 = d.CreateSnapshot();
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 2
+        d.Set(1, "two");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s2 = d.CreateSnapshot();
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 3
+        d.Set(1, "three");
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s3 = d.CreateSnapshot();
+
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        Assert.AreEqual(3, d.SnapCount);
+
+        s1.Dispose();
+        await d.CollectAsync();
+        Assert.AreEqual(2, d.SnapCount);
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        s2.Dispose();
+        await d.CollectAsync();
+        Assert.AreEqual(1, d.SnapCount);
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        s3.Dispose();
+        await d.CollectAsync();
+        Assert.AreEqual(0, d.SnapCount);
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+    }
+
+    [Retry(5)] // TODO make this test non-flaky.
+    [Test]
+    public async Task CollectGcSnapshots()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s1 = d.CreateSnapshot();
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 2
+        d.Set(1, "two");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s2 = d.CreateSnapshot();
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        // gen 3
+        d.Set(1, "three");
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s3 = d.CreateSnapshot();
+
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+
+        Assert.AreEqual(3, d.SnapCount);
+
+        s1 = s2 = s3 = null;
+
+        await d.CollectAsync();
+        Assert.AreEqual(3, d.SnapCount);
+        Assert.AreEqual(3, d.Test.GetValues(1).Length);
+
+        GC.Collect();
+        await d.CollectAsync();
+        Assert.AreEqual(0, d.SnapCount);
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+    }
+
+    [Retry(5)] // TODO make this test non-flaky.
+    [Test]
+    public async Task RandomTest1()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        d.Set(1, "one");
+        d.Set(2, "two");
+
+        var s1 = d.CreateSnapshot();
+        var v1 = s1.Get(1);
+        Assert.AreEqual("one", v1);
+
+        d.Set(1, "uno");
+
+        var s2 = d.CreateSnapshot();
+        var v2 = s2.Get(1);
+        Assert.AreEqual("uno", v2);
+
+        v1 = s1.Get(1);
+        Assert.AreEqual("one", v1);
+
+        Assert.AreEqual(2, d.SnapCount);
+
+        s1 = null;
+        GC.Collect();
+        await d.CollectAsync();
+
+        GC.Collect();
+        await d.CollectAsync();
+
+        Assert.AreEqual(1, d.SnapCount);
+        v2 = s2.Get(1);
+        Assert.AreEqual("uno", v2);
+
+        s2 = null;
+        GC.Collect();
+        await d.CollectAsync();
+
+        Assert.AreEqual(0, d.SnapCount);
+    }
+
+    [Retry(5)] // TODO make this test non-flaky.
+    [Test]
+    public async Task RandomTest2()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        d.Set(1, "one");
+        d.Set(2, "two");
+
+        var s1 = d.CreateSnapshot();
+        var v1 = s1.Get(1);
+        Assert.AreEqual("one", v1);
+
+        d.Clear(1);
+
+        var s2 = d.CreateSnapshot();
+        var v2 = s2.Get(1);
+        Assert.AreEqual(null, v2);
+
+        v1 = s1.Get(1);
+        Assert.AreEqual("one", v1);
+
+        Assert.AreEqual(2, d.SnapCount);
+
+        s1 = null;
+        GC.Collect();
+        await d.CollectAsync();
+
+        GC.Collect();
+        await d.CollectAsync();
+
+        Assert.AreEqual(1, d.SnapCount);
+        v2 = s2.Get(1);
+        Assert.AreEqual(null, v2);
+
+        s2 = null;
+        GC.Collect();
+        await d.CollectAsync();
+
+        Assert.AreEqual(0, d.SnapCount);
+    }
+
+    [Test]
+    public void WriteLockingFirstSnapshot()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        using (d.GetScopedWriteLock(GetScopeProvider()))
+        {
+            var s1 = d.CreateSnapshot();
+
+            Assert.AreEqual(0, s1.Gen);
+            Assert.AreEqual(1, d.Test.LiveGen);
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.IsNull(s1.Get(1));
         }
 
-        [Test]
-        public async Task CollectDisposedSnapshots()
+        var s2 = d.CreateSnapshot();
+
+        Assert.AreEqual(1, s2.Gen);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual("one", s2.Get(1));
+    }
+
+    [Test]
+    public void WriteLocking()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s1 = d.CreateSnapshot();
+
+        Assert.AreEqual(1, s1.Gen);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual("one", s1.Get(1));
+
+        // gen 2
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s2 = d.CreateSnapshot();
+
+        Assert.AreEqual(2, s2.Gen);
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual("uno", s2.Get(1));
+
+        using (d.GetScopedWriteLock(GetScopeProvider()))
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 2
-            d.Set(1, "two");
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
             // gen 3
-            d.Set(1, "three");
+            Assert.AreEqual(2, d.Test.GetValues(1).Length);
+            d.SetLocked(1, "ein");
             Assert.AreEqual(3, d.Test.GetValues(1).Length);
 
             Assert.AreEqual(3, d.Test.LiveGen);
             Assert.IsTrue(d.Test.NextGen);
 
-            SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
+            var s3 = d.CreateSnapshot();
 
+            Assert.AreEqual(2, s3.Gen);
             Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            Assert.AreEqual(3, d.SnapCount);
-
-            s1.Dispose();
-            await d.CollectAsync();
-            Assert.AreEqual(2, d.SnapCount);
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            s2.Dispose();
-            await d.CollectAsync();
-            Assert.AreEqual(1, d.SnapCount);
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            s3.Dispose();
-            await d.CollectAsync();
-            Assert.AreEqual(0, d.SnapCount);
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
+            Assert.IsTrue(d.Test.NextGen); // has NOT changed when (non) creating snapshot
+            Assert.AreEqual("uno", s3.Get(1));
         }
 
-        [Retry(5)] // TODO make this test non-flaky.
-        [Test]
-        public async Task CollectGcSnapshots()
+        var s4 = d.CreateSnapshot();
+
+        Assert.AreEqual(3, s4.Gen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual("ein", s4.Get(1));
+    }
+
+    [Test]
+    public void NestedWriteLocking1()
+    {
+        var d = new SnapDictionary<int, string>();
+        var t = d.Test;
+        t.CollectAuto = false;
+
+        Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+        // no scope context: writers nest, last one to be disposed commits
+        var scopeProvider = GetScopeProvider();
+
+        using (var w1 = d.GetScopedWriteLock(scopeProvider))
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 2
-            d.Set(1, "two");
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            // gen 3
-            d.Set(1, "three");
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
-
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-
-            Assert.AreEqual(3, d.SnapCount);
-
-            s1 = s2 = s3 = null;
-
-            await d.CollectAsync();
-            Assert.AreEqual(3, d.SnapCount);
-            Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-            GC.Collect();
-            await d.CollectAsync();
-            Assert.AreEqual(0, d.SnapCount);
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-        }
-
-        [Retry(5)] // TODO make this test non-flaky.
-        [Test]
-        public async Task RandomTest1()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            d.Set(1, "one");
-            d.Set(2, "two");
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            string v1 = s1.Get(1);
-            Assert.AreEqual("one", v1);
-
-            d.Set(1, "uno");
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-            string v2 = s2.Get(1);
-            Assert.AreEqual("uno", v2);
-
-            v1 = s1.Get(1);
-            Assert.AreEqual("one", v1);
-
-            Assert.AreEqual(2, d.SnapCount);
-
-            s1 = null;
-            GC.Collect();
-            await d.CollectAsync();
-
-            GC.Collect();
-            await d.CollectAsync();
-
-            Assert.AreEqual(1, d.SnapCount);
-            v2 = s2.Get(1);
-            Assert.AreEqual("uno", v2);
-
-            s2 = null;
-            GC.Collect();
-            await d.CollectAsync();
-
-            Assert.AreEqual(0, d.SnapCount);
-        }
-
-        [Retry(5)] // TODO make this test non-flaky.
-        [Test]
-        public async Task RandomTest2()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            d.Set(1, "one");
-            d.Set(2, "two");
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            string v1 = s1.Get(1);
-            Assert.AreEqual("one", v1);
-
-            d.Clear(1);
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-            string v2 = s2.Get(1);
-            Assert.AreEqual(null, v2);
-
-            v1 = s1.Get(1);
-            Assert.AreEqual("one", v1);
-
-            Assert.AreEqual(2, d.SnapCount);
-
-            s1 = null;
-            GC.Collect();
-            await d.CollectAsync();
-
-            GC.Collect();
-            await d.CollectAsync();
-
-            Assert.AreEqual(1, d.SnapCount);
-            v2 = s2.Get(1);
-            Assert.AreEqual(null, v2);
-
-            s2 = null;
-            GC.Collect();
-            await d.CollectAsync();
-
-            Assert.AreEqual(0, d.SnapCount);
-        }
-
-        [Test]
-        public void WriteLockingFirstSnapshot()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            using (d.GetScopedWriteLock(GetScopeProvider()))
-            {
-                SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-
-                Assert.AreEqual(0, s1.Gen);
-                Assert.AreEqual(1, d.Test.LiveGen);
-                Assert.IsTrue(d.Test.NextGen);
-                Assert.IsNull(s1.Get(1));
-            }
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, s2.Gen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual("one", s2.Get(1));
-        }
-
-        [Test]
-        public void WriteLocking()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            // gen 2
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
-            Assert.AreEqual(2, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            Assert.AreEqual(2, s2.Gen);
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual("uno", s2.Get(1));
-
-            using (d.GetScopedWriteLock(GetScopeProvider()))
-            {
-                // gen 3
-                Assert.AreEqual(2, d.Test.GetValues(1).Length);
-                d.SetLocked(1, "ein");
-                Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-                Assert.AreEqual(3, d.Test.LiveGen);
-                Assert.IsTrue(d.Test.NextGen);
-
-                SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
-
-                Assert.AreEqual(2, s3.Gen);
-                Assert.AreEqual(3, d.Test.LiveGen);
-                Assert.IsTrue(d.Test.NextGen); // has NOT changed when (non) creating snapshot
-                Assert.AreEqual("uno", s3.Get(1));
-            }
-
-            SnapDictionary<int, string>.Snapshot s4 = d.CreateSnapshot();
-
-            Assert.AreEqual(3, s4.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual("ein", s4.Get(1));
-        }
-
-        [Test]
-        public void NestedWriteLocking1()
-        {
-            var d = new SnapDictionary<int, string>();
-            SnapDictionary<int, string>.TestHelper t = d.Test;
-            t.CollectAuto = false;
-
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            // no scope context: writers nest, last one to be disposed commits
-            ICoreScopeProvider scopeProvider = GetScopeProvider();
-
-            using (IDisposable w1 = d.GetScopedWriteLock(scopeProvider))
-            {
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.IsTrue(t.IsLocked);
-                Assert.IsTrue(t.NextGen);
-
-                Assert.Throws<InvalidOperationException>(() =>
-                {
-                    using (IDisposable w2 = d.GetScopedWriteLock(scopeProvider))
-                    {
-                    }
-                });
-
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.IsTrue(t.IsLocked);
-                Assert.IsTrue(t.NextGen);
-
-                Assert.AreEqual(0, d.CreateSnapshot().Gen);
-            }
-
             Assert.AreEqual(1, t.LiveGen);
-            Assert.IsFalse(t.IsLocked);
+            Assert.IsTrue(t.IsLocked);
             Assert.IsTrue(t.NextGen);
 
-            Assert.AreEqual(1, d.CreateSnapshot().Gen);
-        }
-
-        [Test]
-        public void NestedWriteLocking2()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            Assert.AreEqual(0, d.CreateSnapshot().Gen);
-
-            // scope context: writers enlist
-            var scopeContext = new ScopeContext();
-            ICoreScopeProvider scopeProvider = GetScopeProvider(scopeContext);
-
-            using (IDisposable w1 = d.GetScopedWriteLock(scopeProvider))
+            Assert.Throws<InvalidOperationException>(() =>
             {
-                // This one is interesting, although we don't allow recursive locks, since this is
-                // using the same ScopeContext/key, the lock acquisition is only done once.
-                using (IDisposable w2 = d.GetScopedWriteLock(scopeProvider))
+                using (var w2 = d.GetScopedWriteLock(scopeProvider))
                 {
-                    Assert.AreSame(w1, w2);
-
-                    d.SetLocked(1, "one");
                 }
-            }
-        }
+            });
 
-        [Test]
-        public void NestedWriteLocking3()
-        {
-            var d = new SnapDictionary<int, string>();
-            SnapDictionary<int, string>.TestHelper t = d.Test;
-            t.CollectAuto = false;
+            Assert.AreEqual(1, t.LiveGen);
+            Assert.IsTrue(t.IsLocked);
+            Assert.IsTrue(t.NextGen);
 
             Assert.AreEqual(0, d.CreateSnapshot().Gen);
+        }
 
-            var scopeContext = new ScopeContext();
-            ICoreScopeProvider scopeProvider1 = GetScopeProvider();
-            ICoreScopeProvider scopeProvider2 = GetScopeProvider(scopeContext);
+        Assert.AreEqual(1, t.LiveGen);
+        Assert.IsFalse(t.IsLocked);
+        Assert.IsTrue(t.NextGen);
 
-            using (IDisposable w1 = d.GetScopedWriteLock(scopeProvider1))
+        Assert.AreEqual(1, d.CreateSnapshot().Gen);
+    }
+
+    [Test]
+    public void NestedWriteLocking2()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+        // scope context: writers enlist
+        var scopeContext = new ScopeContext();
+        var scopeProvider = GetScopeProvider(scopeContext);
+
+        using (var w1 = d.GetScopedWriteLock(scopeProvider))
+        {
+            // This one is interesting, although we don't allow recursive locks, since this is
+            // using the same ScopeContext/key, the lock acquisition is only done once.
+            using (var w2 = d.GetScopedWriteLock(scopeProvider))
             {
-                Assert.AreEqual(1, t.LiveGen);
-                Assert.IsTrue(t.IsLocked);
-                Assert.IsTrue(t.NextGen);
+                Assert.AreSame(w1, w2);
 
-                Assert.Throws<InvalidOperationException>(() =>
+                d.SetLocked(1, "one");
+            }
+        }
+    }
+
+    [Test]
+    public void NestedWriteLocking3()
+    {
+        var d = new SnapDictionary<int, string>();
+        var t = d.Test;
+        t.CollectAuto = false;
+
+        Assert.AreEqual(0, d.CreateSnapshot().Gen);
+
+        var scopeContext = new ScopeContext();
+        var scopeProvider1 = GetScopeProvider();
+        var scopeProvider2 = GetScopeProvider(scopeContext);
+
+        using (var w1 = d.GetScopedWriteLock(scopeProvider1))
+        {
+            Assert.AreEqual(1, t.LiveGen);
+            Assert.IsTrue(t.IsLocked);
+            Assert.IsTrue(t.NextGen);
+
+            Assert.Throws<InvalidOperationException>(() =>
+            {
+                using (var w2 = d.GetScopedWriteLock(scopeProvider2))
                 {
-                    using (IDisposable w2 = d.GetScopedWriteLock(scopeProvider2))
-                    {
-                    }
-                });
-            }
+                }
+            });
         }
+    }
 
-        [Test]
-        public void WriteLocking2()
+    [Test]
+    public void WriteLocking2()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s1 = d.CreateSnapshot();
+
+        Assert.AreEqual(1, s1.Gen);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual("one", s1.Get(1));
+
+        // gen 2
+        Assert.AreEqual(1, d.Test.GetValues(1).Length);
+        d.Set(1, "uno");
+        Assert.AreEqual(2, d.Test.GetValues(1).Length);
+
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s2 = d.CreateSnapshot();
+
+        Assert.AreEqual(2, s2.Gen);
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual("uno", s2.Get(1));
+
+        var scopeProvider = GetScopeProvider();
+        using (d.GetScopedWriteLock(scopeProvider))
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            // gen 2
-            Assert.AreEqual(1, d.Test.GetValues(1).Length);
-            d.Set(1, "uno");
+            // gen 3
             Assert.AreEqual(2, d.Test.GetValues(1).Length);
+            d.SetLocked(1, "ein");
+            Assert.AreEqual(3, d.Test.GetValues(1).Length);
 
-            Assert.AreEqual(2, d.Test.LiveGen);
+            Assert.AreEqual(3, d.Test.LiveGen);
             Assert.IsTrue(d.Test.NextGen);
 
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
+            var s3 = d.CreateSnapshot();
 
-            Assert.AreEqual(2, s2.Gen);
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual("uno", s2.Get(1));
-
-            ICoreScopeProvider scopeProvider = GetScopeProvider();
-            using (d.GetScopedWriteLock(scopeProvider))
-            {
-                // gen 3
-                Assert.AreEqual(2, d.Test.GetValues(1).Length);
-                d.SetLocked(1, "ein");
-                Assert.AreEqual(3, d.Test.GetValues(1).Length);
-
-                Assert.AreEqual(3, d.Test.LiveGen);
-                Assert.IsTrue(d.Test.NextGen);
-
-                SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
-
-                Assert.AreEqual(2, s3.Gen);
-                Assert.AreEqual(3, d.Test.LiveGen);
-                Assert.IsTrue(d.Test.NextGen); // has NOT changed when (non) creating snapshot
-                Assert.AreEqual("uno", s3.Get(1));
-            }
-
-            SnapDictionary<int, string>.Snapshot s4 = d.CreateSnapshot();
-
-            Assert.AreEqual(3, s4.Gen);
+            Assert.AreEqual(2, s3.Gen);
             Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual("ein", s4.Get(1));
+            Assert.IsTrue(d.Test.NextGen); // has NOT changed when (non) creating snapshot
+            Assert.AreEqual("uno", s3.Get(1));
         }
 
-        [Test]
-        public void WriteLocking3()
+        var s4 = d.CreateSnapshot();
+
+        Assert.AreEqual(3, s4.Gen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual("ein", s4.Get(1));
+    }
+
+    [Test]
+    public void WriteLocking3()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        var s1 = d.CreateSnapshot();
+        Assert.AreEqual(1, s1.Gen);
+        Assert.AreEqual("one", s1.Get(1));
+
+        d.Set(1, "uno");
+        var s2 = d.CreateSnapshot();
+        Assert.AreEqual(2, s2.Gen);
+        Assert.AreEqual("uno", s2.Get(1));
+
+        var scopeProvider = GetScopeProvider();
+        using (d.GetScopedWriteLock(scopeProvider))
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
+            // creating a snapshot in a write-lock does NOT return the "current" content
+            // it uses the previous snapshot, so new snapshot created only on release
+            d.SetLocked(1, "ein");
+            var s3 = d.CreateSnapshot();
+            Assert.AreEqual(2, s3.Gen);
+            Assert.AreEqual("uno", s3.Get(1));
 
-            // gen 1
-            d.Set(1, "one");
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            d.Set(1, "uno");
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-            Assert.AreEqual(2, s2.Gen);
-            Assert.AreEqual("uno", s2.Get(1));
-
-            ICoreScopeProvider scopeProvider = GetScopeProvider();
-            using (d.GetScopedWriteLock(scopeProvider))
-            {
-                // creating a snapshot in a write-lock does NOT return the "current" content
-                // it uses the previous snapshot, so new snapshot created only on release
-                d.SetLocked(1, "ein");
-                SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
-                Assert.AreEqual(2, s3.Gen);
-                Assert.AreEqual("uno", s3.Get(1));
-
-                // but live snapshot contains changes
-                SnapDictionary<int, string>.Snapshot ls = d.Test.LiveSnapshot;
-                Assert.AreEqual("ein", ls.Get(1));
-                Assert.AreEqual(3, ls.Gen);
-            }
-
-            SnapDictionary<int, string>.Snapshot s4 = d.CreateSnapshot();
-            Assert.AreEqual(3, s4.Gen);
-            Assert.AreEqual("ein", s4.Get(1));
+            // but live snapshot contains changes
+            var ls = d.Test.LiveSnapshot;
+            Assert.AreEqual("ein", ls.Get(1));
+            Assert.AreEqual(3, ls.Gen);
         }
 
-        [Test]
-        public void ScopeLocking1()
+        var s4 = d.CreateSnapshot();
+        Assert.AreEqual(3, s4.Gen);
+        Assert.AreEqual("ein", s4.Get(1));
+    }
+
+    [Test]
+    public void ScopeLocking1()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        var s1 = d.CreateSnapshot();
+        Assert.AreEqual(1, s1.Gen);
+        Assert.AreEqual("one", s1.Get(1));
+
+        d.Set(1, "uno");
+        var s2 = d.CreateSnapshot();
+        Assert.AreEqual(2, s2.Gen);
+        Assert.AreEqual("uno", s2.Get(1));
+
+        var scopeContext = new ScopeContext();
+        var scopeProvider = GetScopeProvider(scopeContext);
+        using (d.GetScopedWriteLock(scopeProvider))
         {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
+            // creating a snapshot in a write-lock does NOT return the "current" content
+            // it uses the previous snapshot, so new snapshot created only on release
+            d.SetLocked(1, "ein");
+            var s3 = d.CreateSnapshot();
+            Assert.AreEqual(2, s3.Gen);
+            Assert.AreEqual("uno", s3.Get(1));
 
-            // gen 1
-            d.Set(1, "one");
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            d.Set(1, "uno");
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-            Assert.AreEqual(2, s2.Gen);
-            Assert.AreEqual("uno", s2.Get(1));
-
-            var scopeContext = new ScopeContext();
-            ICoreScopeProvider scopeProvider = GetScopeProvider(scopeContext);
-            using (d.GetScopedWriteLock(scopeProvider))
-            {
-                // creating a snapshot in a write-lock does NOT return the "current" content
-                // it uses the previous snapshot, so new snapshot created only on release
-                d.SetLocked(1, "ein");
-                SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
-                Assert.AreEqual(2, s3.Gen);
-                Assert.AreEqual("uno", s3.Get(1));
-
-                // but live snapshot contains changes
-                SnapDictionary<int, string>.Snapshot ls = d.Test.LiveSnapshot;
-                Assert.AreEqual("ein", ls.Get(1));
-                Assert.AreEqual(3, ls.Gen);
-            }
-
-            SnapDictionary<int, string>.Snapshot s4 = d.CreateSnapshot();
-            Assert.AreEqual(2, s4.Gen);
-            Assert.AreEqual("uno", s4.Get(1));
-
-            scopeContext.ScopeExit(true);
-
-            SnapDictionary<int, string>.Snapshot s5 = d.CreateSnapshot();
-            Assert.AreEqual(3, s5.Gen);
-            Assert.AreEqual("ein", s5.Get(1));
+            // but live snapshot contains changes
+            var ls = d.Test.LiveSnapshot;
+            Assert.AreEqual("ein", ls.Get(1));
+            Assert.AreEqual(3, ls.Gen);
         }
 
-        [Test]
-        public void ScopeLocking2()
+        var s4 = d.CreateSnapshot();
+        Assert.AreEqual(2, s4.Gen);
+        Assert.AreEqual("uno", s4.Get(1));
+
+        scopeContext.ScopeExit(true);
+
+        var s5 = d.CreateSnapshot();
+        Assert.AreEqual(3, s5.Gen);
+        Assert.AreEqual("ein", s5.Get(1));
+    }
+
+    [Test]
+    public void ScopeLocking2()
+    {
+        var d = new SnapDictionary<int, string>();
+        var t = d.Test;
+        t.CollectAuto = false;
+
+        // gen 1
+        d.Set(1, "one");
+        var s1 = d.CreateSnapshot();
+        Assert.AreEqual(1, s1.Gen);
+        Assert.AreEqual("one", s1.Get(1));
+
+        d.Set(1, "uno");
+        var s2 = d.CreateSnapshot();
+        Assert.AreEqual(2, s2.Gen);
+        Assert.AreEqual("uno", s2.Get(1));
+
+        Assert.AreEqual(2, t.LiveGen);
+        Assert.IsFalse(t.NextGen);
+
+        var scopeContext = new ScopeContext();
+        var scopeProvider = GetScopeProvider(scopeContext);
+        using (d.GetScopedWriteLock(scopeProvider))
         {
-            var d = new SnapDictionary<int, string>();
-            SnapDictionary<int, string>.TestHelper t = d.Test;
-            t.CollectAuto = false;
+            // creating a snapshot in a write-lock does NOT return the "current" content
+            // it uses the previous snapshot, so new snapshot created only on release
+            d.SetLocked(1, "ein");
+            var s3 = d.CreateSnapshot();
+            Assert.AreEqual(2, s3.Gen);
+            Assert.AreEqual("uno", s3.Get(1));
 
-            // gen 1
-            d.Set(1, "one");
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            d.Set(1, "uno");
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-            Assert.AreEqual(2, s2.Gen);
-            Assert.AreEqual("uno", s2.Get(1));
-
-            Assert.AreEqual(2, t.LiveGen);
-            Assert.IsFalse(t.NextGen);
-
-            var scopeContext = new ScopeContext();
-            ICoreScopeProvider scopeProvider = GetScopeProvider(scopeContext);
-            using (d.GetScopedWriteLock(scopeProvider))
-            {
-                // creating a snapshot in a write-lock does NOT return the "current" content
-                // it uses the previous snapshot, so new snapshot created only on release
-                d.SetLocked(1, "ein");
-                SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
-                Assert.AreEqual(2, s3.Gen);
-                Assert.AreEqual("uno", s3.Get(1));
-
-                // we made some changes, so a next gen is required
-                Assert.AreEqual(3, t.LiveGen);
-                Assert.IsTrue(t.NextGen);
-                Assert.IsTrue(t.IsLocked);
-
-                // but live snapshot contains changes
-                SnapDictionary<int, string>.Snapshot ls = t.LiveSnapshot;
-                Assert.AreEqual("ein", ls.Get(1));
-                Assert.AreEqual(3, ls.Gen);
-            }
-
-            // nothing is committed until scope exits
+            // we made some changes, so a next gen is required
             Assert.AreEqual(3, t.LiveGen);
             Assert.IsTrue(t.NextGen);
             Assert.IsTrue(t.IsLocked);
 
-            // no changes until exit
-            SnapDictionary<int, string>.Snapshot s4 = d.CreateSnapshot();
-            Assert.AreEqual(2, s4.Gen);
-            Assert.AreEqual("uno", s4.Get(1));
-
-            scopeContext.ScopeExit(false);
-
-            // now things have changed
-            Assert.AreEqual(2, t.LiveGen);
-            Assert.IsFalse(t.NextGen);
-            Assert.IsFalse(t.IsLocked);
-
-            // no changes since not completed
-            SnapDictionary<int, string>.Snapshot s5 = d.CreateSnapshot();
-            Assert.AreEqual(2, s5.Gen);
-            Assert.AreEqual("uno", s5.Get(1));
+            // but live snapshot contains changes
+            var ls = t.LiveSnapshot;
+            Assert.AreEqual("ein", ls.Get(1));
+            Assert.AreEqual(3, ls.Gen);
         }
 
-        [Test]
-        public void GetAll()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
+        // nothing is committed until scope exits
+        Assert.AreEqual(3, t.LiveGen);
+        Assert.IsTrue(t.NextGen);
+        Assert.IsTrue(t.IsLocked);
 
-            Assert.AreEqual(0, d.Test.GetValues(1).Length);
+        // no changes until exit
+        var s4 = d.CreateSnapshot();
+        Assert.AreEqual(2, s4.Gen);
+        Assert.AreEqual("uno", s4.Get(1));
 
-            d.Set(1, "one");
-            d.Set(2, "two");
-            d.Set(3, "three");
-            d.Set(4, "four");
+        scopeContext.ScopeExit(false);
 
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            string[] all = s1.GetAll().ToArray();
-            Assert.AreEqual(4, all.Length);
-            Assert.AreEqual("one", all[0]);
-            Assert.AreEqual("four", all[3]);
+        // now things have changed
+        Assert.AreEqual(2, t.LiveGen);
+        Assert.IsFalse(t.NextGen);
+        Assert.IsFalse(t.IsLocked);
 
-            d.Set(1, "uno");
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            all = s1.GetAll().ToArray();
-            Assert.AreEqual(4, all.Length);
-            Assert.AreEqual("one", all[0]);
-            Assert.AreEqual("four", all[3]);
-
-            all = s2.GetAll().ToArray();
-            Assert.AreEqual(4, all.Length);
-            Assert.AreEqual("uno", all[0]);
-            Assert.AreEqual("four", all[3]);
-        }
-
-        [Test]
-        public void DontPanic()
-        {
-            var d = new SnapDictionary<int, string>();
-            d.Test.CollectAuto = false;
-
-            Assert.IsNull(d.Test.GenObj);
-
-            // gen 1
-            d.Set(1, "one");
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNull(d.Test.GenObj);
-
-            SnapDictionary<int, string>.Snapshot s1 = d.CreateSnapshot();
-            Assert.IsFalse(d.Test.NextGen);
-            Assert.AreEqual(1, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(1, d.Test.GenObj.Gen);
-
-            Assert.AreEqual(1, s1.Gen);
-            Assert.AreEqual("one", s1.Get(1));
-
-            d.Set(1, "uno");
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(2, d.Test.LiveGen);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(1, d.Test.GenObj.Gen);
-
-            var scopeContext = new ScopeContext();
-            ICoreScopeProvider scopeProvider = GetScopeProvider(scopeContext);
-
-            // scopeProvider.Context == scopeContext -> writer is scoped
-            // writer is scope contextual and scoped
-            //  when disposed, nothing happens
-            //  when the context exists, the writer is released
-            using (d.GetScopedWriteLock(scopeProvider))
-            {
-                d.SetLocked(1, "ein");
-                Assert.IsTrue(d.Test.NextGen);
-                Assert.AreEqual(3, d.Test.LiveGen);
-                Assert.IsNotNull(d.Test.GenObj);
-                Assert.AreEqual(2, d.Test.GenObj.Gen);
-            }
-
-            // writer has not released
-            Assert.IsTrue(d.Test.IsLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-
-            // nothing changed
-            Assert.IsTrue(d.Test.NextGen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-
-            // panic!
-            SnapDictionary<int, string>.Snapshot s2 = d.CreateSnapshot();
-
-            Assert.IsTrue(d.Test.IsLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            // release writer
-            scopeContext.ScopeExit(true);
-
-            Assert.IsFalse(d.Test.IsLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(2, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsTrue(d.Test.NextGen);
-
-            SnapDictionary<int, string>.Snapshot s3 = d.CreateSnapshot();
-
-            Assert.IsFalse(d.Test.IsLocked);
-            Assert.IsNotNull(d.Test.GenObj);
-            Assert.AreEqual(3, d.Test.GenObj.Gen);
-            Assert.AreEqual(3, d.Test.LiveGen);
-            Assert.IsFalse(d.Test.NextGen);
-        }
-
-        private ICoreScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
-        {
-            ICoreScopeProvider scopeProvider = Mock.Of<ICoreScopeProvider>();
-            Mock.Get(scopeProvider)
-                .Setup(x => x.Context).Returns(scopeContext);
-            return scopeProvider;
-        }
+        // no changes since not completed
+        var s5 = d.CreateSnapshot();
+        Assert.AreEqual(2, s5.Gen);
+        Assert.AreEqual("uno", s5.Get(1));
     }
 
-    /// <summary>
-    /// Used for tests so that we don't have to wrap every Set/Clear call in locks
-    /// </summary>
-    public static class SnapDictionaryExtensions
+    [Test]
+    public void GetAll()
     {
-        internal static void Set<TKey, TValue>(this SnapDictionary<TKey, TValue> d, TKey key, TValue value)
-            where TValue : class
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        Assert.AreEqual(0, d.Test.GetValues(1).Length);
+
+        d.Set(1, "one");
+        d.Set(2, "two");
+        d.Set(3, "three");
+        d.Set(4, "four");
+
+        var s1 = d.CreateSnapshot();
+        var all = s1.GetAll().ToArray();
+        Assert.AreEqual(4, all.Length);
+        Assert.AreEqual("one", all[0]);
+        Assert.AreEqual("four", all[3]);
+
+        d.Set(1, "uno");
+        var s2 = d.CreateSnapshot();
+
+        all = s1.GetAll().ToArray();
+        Assert.AreEqual(4, all.Length);
+        Assert.AreEqual("one", all[0]);
+        Assert.AreEqual("four", all[3]);
+
+        all = s2.GetAll().ToArray();
+        Assert.AreEqual(4, all.Length);
+        Assert.AreEqual("uno", all[0]);
+        Assert.AreEqual("four", all[3]);
+    }
+
+    [Test]
+    public void DontPanic()
+    {
+        var d = new SnapDictionary<int, string>();
+        d.Test.CollectAuto = false;
+
+        Assert.IsNull(d.Test.GenObj);
+
+        // gen 1
+        d.Set(1, "one");
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsNull(d.Test.GenObj);
+
+        var s1 = d.CreateSnapshot();
+        Assert.IsFalse(d.Test.NextGen);
+        Assert.AreEqual(1, d.Test.LiveGen);
+        Assert.IsNotNull(d.Test.GenObj);
+        Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+        Assert.AreEqual(1, s1.Gen);
+        Assert.AreEqual("one", s1.Get(1));
+
+        d.Set(1, "uno");
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(2, d.Test.LiveGen);
+        Assert.IsNotNull(d.Test.GenObj);
+        Assert.AreEqual(1, d.Test.GenObj.Gen);
+
+        var scopeContext = new ScopeContext();
+        var scopeProvider = GetScopeProvider(scopeContext);
+
+        // scopeProvider.Context == scopeContext -> writer is scoped
+        // writer is scope contextual and scoped
+        //  when disposed, nothing happens
+        //  when the context exists, the writer is released
+        using (d.GetScopedWriteLock(scopeProvider))
         {
-            using (d.GetScopedWriteLock(GetScopeProvider()))
-            {
-                d.SetLocked(key, value);
-            }
+            d.SetLocked(1, "ein");
+            Assert.IsTrue(d.Test.NextGen);
+            Assert.AreEqual(3, d.Test.LiveGen);
+            Assert.IsNotNull(d.Test.GenObj);
+            Assert.AreEqual(2, d.Test.GenObj.Gen);
         }
 
-        internal static void Clear<TKey, TValue>(this SnapDictionary<TKey, TValue> d)
-            where TValue : class
-        {
-            using (d.GetScopedWriteLock(GetScopeProvider()))
-            {
-                d.ClearLocked();
-            }
-        }
+        // writer has not released
+        Assert.IsTrue(d.Test.IsLocked);
+        Assert.IsNotNull(d.Test.GenObj);
+        Assert.AreEqual(2, d.Test.GenObj.Gen);
 
-        internal static void Clear<TKey, TValue>(this SnapDictionary<TKey, TValue> d, TKey key)
-            where TValue : class
-        {
-            using (d.GetScopedWriteLock(GetScopeProvider()))
-            {
-                d.ClearLocked(key);
-            }
-        }
+        // nothing changed
+        Assert.IsTrue(d.Test.NextGen);
+        Assert.AreEqual(3, d.Test.LiveGen);
 
-        private static ICoreScopeProvider GetScopeProvider()
-        {
-            ICoreScopeProvider scopeProvider = Mock.Of<ICoreScopeProvider>();
-            Mock.Get(scopeProvider)
-                .Setup(x => x.Context).Returns(() => null);
-            return scopeProvider;
-        }
+        // panic!
+        var s2 = d.CreateSnapshot();
+
+        Assert.IsTrue(d.Test.IsLocked);
+        Assert.IsNotNull(d.Test.GenObj);
+        Assert.AreEqual(2, d.Test.GenObj.Gen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        // release writer
+        scopeContext.ScopeExit(true);
+
+        Assert.IsFalse(d.Test.IsLocked);
+        Assert.IsNotNull(d.Test.GenObj);
+        Assert.AreEqual(2, d.Test.GenObj.Gen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsTrue(d.Test.NextGen);
+
+        var s3 = d.CreateSnapshot();
+
+        Assert.IsFalse(d.Test.IsLocked);
+        Assert.IsNotNull(d.Test.GenObj);
+        Assert.AreEqual(3, d.Test.GenObj.Gen);
+        Assert.AreEqual(3, d.Test.LiveGen);
+        Assert.IsFalse(d.Test.NextGen);
+    }
+
+    private ICoreScopeProvider GetScopeProvider(ScopeContext scopeContext = null)
+    {
+        var scopeProvider = Mock.Of<ICoreScopeProvider>();
+        Mock.Get(scopeProvider)
+            .Setup(x => x.Context).Returns(scopeContext);
+        return scopeProvider;
+    }
+}
+
+/// <summary>
+///     Used for tests so that we don't have to wrap every Set/Clear call in locks
+/// </summary>
+public static class SnapDictionaryExtensions
+{
+    internal static void Set<TKey, TValue>(this SnapDictionary<TKey, TValue> d, TKey key, TValue value)
+        where TValue : class
+    {
+        using (d.GetScopedWriteLock(GetScopeProvider()))
+        {
+            d.SetLocked(key, value);
+        }
+    }
+
+    internal static void Clear<TKey, TValue>(this SnapDictionary<TKey, TValue> d)
+        where TValue : class
+    {
+        using (d.GetScopedWriteLock(GetScopeProvider()))
+        {
+            d.ClearLocked();
+        }
+    }
+
+    internal static void Clear<TKey, TValue>(this SnapDictionary<TKey, TValue> d, TKey key)
+        where TValue : class
+    {
+        using (d.GetScopedWriteLock(GetScopeProvider()))
+        {
+            d.ClearLocked(key);
+        }
+    }
+
+    private static ICoreScopeProvider GetScopeProvider()
+    {
+        var scopeProvider = Mock.Of<ICoreScopeProvider>();
+        Mock.Get(scopeProvider)
+            .Setup(x => x.Context).Returns(() => null);
+        return scopeProvider;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs
index 9182dfe241..e423444132 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/AllowedContentTypeDetail.cs
@@ -1,14 +1,13 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+public class AllowedContentTypeDetail
 {
-    public class AllowedContentTypeDetail
-    {
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        public string Alias { get; set; }
+    public string Alias { get; set; }
 
-        public int SortOrder { get; set; }
-    }
+    public int SortOrder { get; set; }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs
index 2efe4df18d..1f8d1c136c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/ContentTypeBuilderTests.cs
@@ -8,134 +8,135 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class ContentTypeBuilderTests
 {
-    [TestFixture]
-    public class ContentTypeBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 99;
-            var testKey = Guid.NewGuid();
-            const string testAlias = "mediaType";
-            const string testName = "Content Type";
-            const string testPropertyGroupName = "Content";
-            const int testParentId = 98;
-            const int testCreatorId = 22;
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const int testLevel = 3;
-            const string testPath = "-1, 4, 10";
-            const int testSortOrder = 5;
-            const string testDescription = "The description";
-            const string testIcon = "icon";
-            const string testThumbnail = "thumnail";
-            const bool testTrashed = true;
-            const int testPropertyTypeIdsIncrementingFrom = 200;
-            var testPropertyType1 = new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
-            var testPropertyType2 = new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
-            var testTemplate1 = new TemplateDetail { Id = 200, Alias = "template1", Name = "Template 1" };
-            var testTemplate2 = new TemplateDetail { Id = 201, Alias = "template2", Name = "Template 2" };
-            var testAllowedContentType1 = new AllowedContentTypeDetail { Id = 300, Alias = "subType1", SortOrder = 1 };
-            var testAllowedContentType2 = new AllowedContentTypeDetail { Id = 301, Alias = "subType2", SortOrder = 2 };
+        // Arrange
+        const int testId = 99;
+        var testKey = Guid.NewGuid();
+        const string testAlias = "mediaType";
+        const string testName = "Content Type";
+        const string testPropertyGroupName = "Content";
+        const int testParentId = 98;
+        const int testCreatorId = 22;
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const int testLevel = 3;
+        const string testPath = "-1, 4, 10";
+        const int testSortOrder = 5;
+        const string testDescription = "The description";
+        const string testIcon = "icon";
+        const string testThumbnail = "thumnail";
+        const bool testTrashed = true;
+        const int testPropertyTypeIdsIncrementingFrom = 200;
+        var testPropertyType1 =
+            new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
+        var testPropertyType2 =
+            new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
+        var testTemplate1 = new TemplateDetail { Id = 200, Alias = "template1", Name = "Template 1" };
+        var testTemplate2 = new TemplateDetail { Id = 201, Alias = "template2", Name = "Template 2" };
+        var testAllowedContentType1 = new AllowedContentTypeDetail { Id = 300, Alias = "subType1", SortOrder = 1 };
+        var testAllowedContentType2 = new AllowedContentTypeDetail { Id = 301, Alias = "subType2", SortOrder = 2 };
 
-            var builder = new ContentTypeBuilder();
+        var builder = new ContentTypeBuilder();
 
-            // Act
-            IContentType contentType = builder
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithAlias(testAlias)
-                .WithName(testName)
-                .WithCreatorId(testCreatorId)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithParentId(testParentId)
-                .WithLevel(testLevel)
-                .WithPath(testPath)
-                .WithSortOrder(testSortOrder)
-                .WithDescription(testDescription)
-                .WithIcon(testIcon)
-                .WithThumbnail(testThumbnail)
-                .WithTrashed(testTrashed)
-                .WithPropertyTypeIdsIncrementingFrom(200)
-                .AddPropertyGroup()
-                    .WithName(testPropertyGroupName)
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithAlias(testPropertyType1.Alias)
-                        .WithName(testPropertyType1.Name)
-                        .WithSortOrder(testPropertyType1.SortOrder)
-                        .WithDataTypeId(testPropertyType1.DataTypeId)
-                        .Done()
-                    .AddPropertyType()
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithAlias(testPropertyType2.Alias)
-                        .WithName(testPropertyType2.Name)
-                        .WithSortOrder(testPropertyType2.SortOrder)
-                        .WithDataTypeId(testPropertyType2.DataTypeId)
-                        .Done()
-                    .Done()
-                .AddAllowedTemplate()
-                    .WithId(testTemplate1.Id)
-                    .WithAlias(testTemplate1.Alias)
-                    .WithName(testTemplate1.Name)
-                    .Done()
-                .AddAllowedTemplate()
-                    .WithId(testTemplate2.Id)
-                    .WithAlias(testTemplate2.Alias)
-                    .WithName(testTemplate2.Name)
-                    .Done()
-                .WithDefaultTemplateId(testTemplate1.Id)
-                .AddAllowedContentType()
-                    .WithId(testAllowedContentType1.Id)
-                    .WithAlias(testAllowedContentType1.Alias)
-                    .WithSortOrder(testAllowedContentType1.SortOrder)
-                    .Done()
-                .AddAllowedContentType()
-                    .WithId(testAllowedContentType2.Id)
-                    .WithAlias(testAllowedContentType2.Alias)
-                    .WithSortOrder(testAllowedContentType2.SortOrder)
-                    .Done()
-                .Build();
+        // Act
+        var contentType = builder
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithAlias(testAlias)
+            .WithName(testName)
+            .WithCreatorId(testCreatorId)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithParentId(testParentId)
+            .WithLevel(testLevel)
+            .WithPath(testPath)
+            .WithSortOrder(testSortOrder)
+            .WithDescription(testDescription)
+            .WithIcon(testIcon)
+            .WithThumbnail(testThumbnail)
+            .WithTrashed(testTrashed)
+            .WithPropertyTypeIdsIncrementingFrom(200)
+            .AddPropertyGroup()
+            .WithName(testPropertyGroupName)
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias(testPropertyType1.Alias)
+            .WithName(testPropertyType1.Name)
+            .WithSortOrder(testPropertyType1.SortOrder)
+            .WithDataTypeId(testPropertyType1.DataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias(testPropertyType2.Alias)
+            .WithName(testPropertyType2.Name)
+            .WithSortOrder(testPropertyType2.SortOrder)
+            .WithDataTypeId(testPropertyType2.DataTypeId)
+            .Done()
+            .Done()
+            .AddAllowedTemplate()
+            .WithId(testTemplate1.Id)
+            .WithAlias(testTemplate1.Alias)
+            .WithName(testTemplate1.Name)
+            .Done()
+            .AddAllowedTemplate()
+            .WithId(testTemplate2.Id)
+            .WithAlias(testTemplate2.Alias)
+            .WithName(testTemplate2.Name)
+            .Done()
+            .WithDefaultTemplateId(testTemplate1.Id)
+            .AddAllowedContentType()
+            .WithId(testAllowedContentType1.Id)
+            .WithAlias(testAllowedContentType1.Alias)
+            .WithSortOrder(testAllowedContentType1.SortOrder)
+            .Done()
+            .AddAllowedContentType()
+            .WithId(testAllowedContentType2.Id)
+            .WithAlias(testAllowedContentType2.Alias)
+            .WithSortOrder(testAllowedContentType2.SortOrder)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, contentType.Id);
-            Assert.AreEqual(testAlias, contentType.Alias);
-            Assert.AreEqual(testName, contentType.Name);
-            Assert.AreEqual(testKey, contentType.Key);
-            Assert.AreEqual(testCreateDate, contentType.CreateDate);
-            Assert.AreEqual(testUpdateDate, contentType.UpdateDate);
-            Assert.AreEqual(testCreatorId, contentType.CreatorId);
-            Assert.AreEqual(testParentId, contentType.ParentId);
-            Assert.AreEqual(testLevel, contentType.Level);
-            Assert.AreEqual(testPath, contentType.Path);
-            Assert.AreEqual(testSortOrder, contentType.SortOrder);
-            Assert.AreEqual(testDescription, contentType.Description);
-            Assert.AreEqual(testIcon, contentType.Icon);
-            Assert.AreEqual(testThumbnail, contentType.Thumbnail);
-            Assert.AreEqual(testTrashed, contentType.Trashed);
-            Assert.IsFalse(contentType.IsContainer);
-            Assert.AreEqual(2, contentType.PropertyTypes.Count());
+        // Assert
+        Assert.AreEqual(testId, contentType.Id);
+        Assert.AreEqual(testAlias, contentType.Alias);
+        Assert.AreEqual(testName, contentType.Name);
+        Assert.AreEqual(testKey, contentType.Key);
+        Assert.AreEqual(testCreateDate, contentType.CreateDate);
+        Assert.AreEqual(testUpdateDate, contentType.UpdateDate);
+        Assert.AreEqual(testCreatorId, contentType.CreatorId);
+        Assert.AreEqual(testParentId, contentType.ParentId);
+        Assert.AreEqual(testLevel, contentType.Level);
+        Assert.AreEqual(testPath, contentType.Path);
+        Assert.AreEqual(testSortOrder, contentType.SortOrder);
+        Assert.AreEqual(testDescription, contentType.Description);
+        Assert.AreEqual(testIcon, contentType.Icon);
+        Assert.AreEqual(testThumbnail, contentType.Thumbnail);
+        Assert.AreEqual(testTrashed, contentType.Trashed);
+        Assert.IsFalse(contentType.IsContainer);
+        Assert.AreEqual(2, contentType.PropertyTypes.Count());
 
-            IOrderedEnumerable<int> propertyTypeIds = contentType.PropertyTypes.Select(x => x.Id).OrderBy(x => x);
-            Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 1, propertyTypeIds.Min());
-            Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 2, propertyTypeIds.Max());
+        var propertyTypeIds = contentType.PropertyTypes.Select(x => x.Id).OrderBy(x => x).ToArray();
+        Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 1, propertyTypeIds.Min());
+        Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 2, propertyTypeIds.Max());
 
-            var allowedTemplates = contentType.AllowedTemplates.ToList();
-            Assert.AreEqual(2, allowedTemplates.Count);
-            Assert.AreEqual(testTemplate1.Id, allowedTemplates[0].Id);
-            Assert.AreEqual(testTemplate1.Alias, allowedTemplates[0].Alias);
-            Assert.AreEqual(testTemplate1.Name, allowedTemplates[0].Name);
-            Assert.AreEqual(testTemplate1.Id, contentType.DefaultTemplate.Id);
+        var allowedTemplates = contentType.AllowedTemplates.ToList();
+        Assert.AreEqual(2, allowedTemplates.Count);
+        Assert.AreEqual(testTemplate1.Id, allowedTemplates[0].Id);
+        Assert.AreEqual(testTemplate1.Alias, allowedTemplates[0].Alias);
+        Assert.AreEqual(testTemplate1.Name, allowedTemplates[0].Name);
+        Assert.AreEqual(testTemplate1.Id, contentType.DefaultTemplate.Id);
 
-            var allowedContentTypes = contentType.AllowedContentTypes.ToList();
-            Assert.AreEqual(2, allowedContentTypes.Count);
-            Assert.AreEqual(testAllowedContentType1.Id, allowedContentTypes[0].Id.Value);
-            Assert.AreEqual(testAllowedContentType1.Alias, allowedContentTypes[0].Alias);
-            Assert.AreEqual(testAllowedContentType1.SortOrder, allowedContentTypes[0].SortOrder);
-        }
+        var allowedContentTypes = contentType.AllowedContentTypes.ToList();
+        Assert.AreEqual(2, allowedContentTypes.Count);
+        Assert.AreEqual(testAllowedContentType1.Id, allowedContentTypes[0].Id.Value);
+        Assert.AreEqual(testAllowedContentType1.Alias, allowedContentTypes[0].Alias);
+        Assert.AreEqual(testAllowedContentType1.SortOrder, allowedContentTypes[0].SortOrder);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs
index 41bfa1dc13..4e09407467 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DataTypeBuilderTests.cs
@@ -3,45 +3,39 @@
 
 using System.Collections.Generic;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class DataTypeBuilderTests
 {
-    [TestFixture]
-    public class DataTypeBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 3123;
-            const string testEditorAlias = "testAlias";
-            const string testEditorName = "Test Name";
+        // Arrange
+        const int testId = 3123;
+        const string testEditorAlias = "testAlias";
+        const string testEditorName = "Test Name";
 
-            var builder = new DataTypeBuilder();
+        var builder = new DataTypeBuilder();
 
-            // Act
-            DataType dataType = builder
-                .WithId(testId)
-                .AddEditor()
-                    .WithAlias(testEditorAlias)
-                    .WithName(testEditorName)
-                    .WithDefaultConfiguration(new Dictionary<string, object>
-                        {
-                            { "value1", "value1" },
-                            { "value2", "value2" },
-                        })
-                    .Done()
-                .Build();
+        // Act
+        var dataType = builder
+            .WithId(testId)
+            .AddEditor()
+            .WithAlias(testEditorAlias)
+            .WithName(testEditorName)
+            .WithDefaultConfiguration(new Dictionary<string, object> { { "value1", "value1" }, { "value2", "value2" } })
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, dataType.Id);
-            Assert.AreEqual(testEditorAlias, dataType.Editor.Alias);
-            Assert.AreEqual(testEditorName, dataType.Editor.Name);
-            Assert.AreEqual(2, dataType.Editor.DefaultConfiguration.Count);
-            Assert.AreEqual("value1", dataType.Editor.DefaultConfiguration["value1"]);
-        }
+        // Assert
+        Assert.AreEqual(testId, dataType.Id);
+        Assert.AreEqual(testEditorAlias, dataType.Editor.Alias);
+        Assert.AreEqual(testEditorName, dataType.Editor.Name);
+        Assert.AreEqual(2, dataType.Editor.DefaultConfiguration.Count);
+        Assert.AreEqual("value1", dataType.Editor.DefaultConfiguration["value1"]);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs
index e9e0c85584..d2ae193ccb 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/DocumentEntitySlimBuilderTests.cs
@@ -4,81 +4,79 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class DocumentEntitySlimBuilderTests
 {
-    [TestFixture]
-    public class DocumentEntitySlimBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 11;
-            const string testName = "Test";
-            const int testCreatorId = 22;
-            const int testLevel = 3;
-            const string testPath = "-1,23";
-            const int testParentId = 5;
-            const int testSortOrder = 6;
-            const bool testHasChildren = true;
-            const bool testPublished = true;
-            const string testContentTypeAlias = "test1";
-            const string testContentTypeIcon = "icon";
-            const string testContentTypeThumbnail = "thumb";
-            var testKey = Guid.NewGuid();
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
-            var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
+        // Arrange
+        const int testId = 11;
+        const string testName = "Test";
+        const int testCreatorId = 22;
+        const int testLevel = 3;
+        const string testPath = "-1,23";
+        const int testParentId = 5;
+        const int testSortOrder = 6;
+        const bool testHasChildren = true;
+        const bool testPublished = true;
+        const string testContentTypeAlias = "test1";
+        const string testContentTypeIcon = "icon";
+        const string testContentTypeThumbnail = "thumb";
+        var testKey = Guid.NewGuid();
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
+        var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
 
-            var builder = new DocumentEntitySlimBuilder();
+        var builder = new DocumentEntitySlimBuilder();
 
-            // Act
-            DocumentEntitySlim item = builder
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithCreatorId(testCreatorId)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithName(testName)
-                .WithParentId(testParentId)
-                .WithSortOrder(testSortOrder)
-                .WithLevel(testLevel)
-                .WithPath(testPath)
-                .WithContentTypeAlias(testContentTypeAlias)
-                .WithContentTypeIcon(testContentTypeIcon)
-                .WithContentTypeThumbnail(testContentTypeThumbnail)
-                .WithHasChildren(testHasChildren)
-                .WithPublished(testPublished)
-                .AddAdditionalData()
-                    .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
-                    .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
-                    .Done()
-                .Build();
+        // Act
+        var item = builder
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithCreatorId(testCreatorId)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithName(testName)
+            .WithParentId(testParentId)
+            .WithSortOrder(testSortOrder)
+            .WithLevel(testLevel)
+            .WithPath(testPath)
+            .WithContentTypeAlias(testContentTypeAlias)
+            .WithContentTypeIcon(testContentTypeIcon)
+            .WithContentTypeThumbnail(testContentTypeThumbnail)
+            .WithHasChildren(testHasChildren)
+            .WithPublished(testPublished)
+            .AddAdditionalData()
+            .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
+            .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, item.Id);
-            Assert.AreEqual(testKey, item.Key);
-            Assert.AreEqual(testName, item.Name);
-            Assert.AreEqual(testCreateDate, item.CreateDate);
-            Assert.AreEqual(testUpdateDate, item.UpdateDate);
-            Assert.AreEqual(testCreatorId, item.CreatorId);
-            Assert.AreEqual(testParentId, item.ParentId);
-            Assert.AreEqual(testSortOrder, item.SortOrder);
-            Assert.AreEqual(testPath, item.Path);
-            Assert.AreEqual(testLevel, item.Level);
-            Assert.AreEqual(testContentTypeAlias, item.ContentTypeAlias);
-            Assert.AreEqual(testContentTypeIcon, item.ContentTypeIcon);
-            Assert.AreEqual(testContentTypeThumbnail, item.ContentTypeThumbnail);
-            Assert.AreEqual(testHasChildren, item.HasChildren);
-            Assert.AreEqual(testPublished, item.Published);
-            Assert.AreEqual(2, item.AdditionalData.Count);
-            Assert.AreEqual(testAdditionalData1.Value, item.AdditionalData[testAdditionalData1.Key]);
-            Assert.AreEqual(testAdditionalData2.Value, item.AdditionalData[testAdditionalData2.Key]);
-        }
+        // Assert
+        Assert.AreEqual(testId, item.Id);
+        Assert.AreEqual(testKey, item.Key);
+        Assert.AreEqual(testName, item.Name);
+        Assert.AreEqual(testCreateDate, item.CreateDate);
+        Assert.AreEqual(testUpdateDate, item.UpdateDate);
+        Assert.AreEqual(testCreatorId, item.CreatorId);
+        Assert.AreEqual(testParentId, item.ParentId);
+        Assert.AreEqual(testSortOrder, item.SortOrder);
+        Assert.AreEqual(testPath, item.Path);
+        Assert.AreEqual(testLevel, item.Level);
+        Assert.AreEqual(testContentTypeAlias, item.ContentTypeAlias);
+        Assert.AreEqual(testContentTypeIcon, item.ContentTypeIcon);
+        Assert.AreEqual(testContentTypeThumbnail, item.ContentTypeThumbnail);
+        Assert.AreEqual(testHasChildren, item.HasChildren);
+        Assert.AreEqual(testPublished, item.Published);
+        Assert.AreEqual(2, item.AdditionalData.Count);
+        Assert.AreEqual(testAdditionalData1.Value, item.AdditionalData[testAdditionalData1.Key]);
+        Assert.AreEqual(testAdditionalData2.Value, item.AdditionalData[testAdditionalData2.Key]);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs
index 8d54f84b64..1853dabb92 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/LanguageBuilderTests.cs
@@ -3,31 +3,29 @@
 
 using System.Globalization;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class LanguageBuilderTests
 {
-    [TestFixture]
-    public class LanguageBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            var builder = new LanguageBuilder();
+        // Arrange
+        var builder = new LanguageBuilder();
 
-            var expected = CultureInfo.GetCultureInfo("en-GB");
+        var expected = CultureInfo.GetCultureInfo("en-GB");
 
-            // Act
-            ILanguage language = builder
-                .WithCultureInfo(expected.Name)
-                .Build();
+        // Act
+        var language = builder
+            .WithCultureInfo(expected.Name)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(expected.Name, language.IsoCode);
-            Assert.AreEqual(expected.EnglishName, language.CultureName);
-        }
+        // Assert
+        Assert.AreEqual(expected.Name, language.IsoCode);
+        Assert.AreEqual(expected.EnglishName, language.CultureName);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs
index 5ef76bf935..37f2cd1953 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MacroBuilderTests.cs
@@ -3,75 +3,73 @@
 
 using System;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class MacroBuilderTests
 {
-    [TestFixture]
-    public class MacroBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int id = 1;
-            var key = Guid.NewGuid();
-            const bool useInEditor = true;
-            const int cacheDuration = 3;
-            const string alias = "test";
-            const string name = "Test";
-            const string source = "~/script.cshtml";
-            const bool cacheByPage = false;
-            const bool cacheByMember = true;
-            const bool dontRender = true;
-            const int propertyId = 6;
-            const string propertyAlias = "rewq";
-            const string propertyName = "REWQ";
-            const int propertySortOrder = 1;
-            const string propertyEditorAlias = "asdfasdf";
+        // Arrange
+        const int id = 1;
+        var key = Guid.NewGuid();
+        const bool useInEditor = true;
+        const int cacheDuration = 3;
+        const string alias = "test";
+        const string name = "Test";
+        const string source = "~/script.cshtml";
+        const bool cacheByPage = false;
+        const bool cacheByMember = true;
+        const bool dontRender = true;
+        const int propertyId = 6;
+        const string propertyAlias = "rewq";
+        const string propertyName = "REWQ";
+        const int propertySortOrder = 1;
+        const string propertyEditorAlias = "asdfasdf";
 
-            var builder = new MacroBuilder();
+        var builder = new MacroBuilder();
 
-            // Act
-            Macro macro = builder
-                .WithId(id)
-                .WithKey(key)
-                .WithUseInEditor(useInEditor)
-                .WithCacheDuration(cacheDuration)
-                .WithAlias(alias)
-                .WithName(name)
-                .WithSource(source)
-                .WithCacheByPage(cacheByPage)
-                .WithCacheByMember(cacheByMember)
-                .WithDontRender(dontRender)
-                .AddProperty()
-                    .WithId(propertyId)
-                    .WithAlias(propertyAlias)
-                    .WithName(propertyName)
-                    .WithSortOrder(propertySortOrder)
-                    .WithEditorAlias(propertyEditorAlias)
-                    .Done()
-                .Build();
+        // Act
+        var macro = builder
+            .WithId(id)
+            .WithKey(key)
+            .WithUseInEditor(useInEditor)
+            .WithCacheDuration(cacheDuration)
+            .WithAlias(alias)
+            .WithName(name)
+            .WithSource(source)
+            .WithCacheByPage(cacheByPage)
+            .WithCacheByMember(cacheByMember)
+            .WithDontRender(dontRender)
+            .AddProperty()
+            .WithId(propertyId)
+            .WithAlias(propertyAlias)
+            .WithName(propertyName)
+            .WithSortOrder(propertySortOrder)
+            .WithEditorAlias(propertyEditorAlias)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(id, macro.Id);
-            Assert.AreEqual(key, macro.Key);
-            Assert.AreEqual(useInEditor, macro.UseInEditor);
-            Assert.AreEqual(cacheDuration, macro.CacheDuration);
-            Assert.AreEqual(alias, macro.Alias);
-            Assert.AreEqual(name, macro.Name);
-            Assert.AreEqual(source, macro.MacroSource);
-            Assert.AreEqual(cacheByPage, macro.CacheByPage);
-            Assert.AreEqual(cacheByMember, macro.CacheByMember);
-            Assert.AreEqual(dontRender, macro.DontRender);
-            Assert.AreEqual(1, macro.Properties.Count);
-            Assert.AreEqual(propertyId, macro.Properties[0].Id);
-            Assert.AreEqual(propertyAlias, macro.Properties[0].Alias);
-            Assert.AreEqual(propertyName, macro.Properties[0].Name);
-            Assert.AreEqual(propertySortOrder, macro.Properties[0].SortOrder);
-            Assert.AreEqual(propertyEditorAlias, macro.Properties[0].EditorAlias);
-        }
+        // Assert
+        Assert.AreEqual(id, macro.Id);
+        Assert.AreEqual(key, macro.Key);
+        Assert.AreEqual(useInEditor, macro.UseInEditor);
+        Assert.AreEqual(cacheDuration, macro.CacheDuration);
+        Assert.AreEqual(alias, macro.Alias);
+        Assert.AreEqual(name, macro.Name);
+        Assert.AreEqual(source, macro.MacroSource);
+        Assert.AreEqual(cacheByPage, macro.CacheByPage);
+        Assert.AreEqual(cacheByMember, macro.CacheByMember);
+        Assert.AreEqual(dontRender, macro.DontRender);
+        Assert.AreEqual(1, macro.Properties.Count);
+        Assert.AreEqual(propertyId, macro.Properties[0].Id);
+        Assert.AreEqual(propertyAlias, macro.Properties[0].Alias);
+        Assert.AreEqual(propertyName, macro.Properties[0].Name);
+        Assert.AreEqual(propertySortOrder, macro.Properties[0].SortOrder);
+        Assert.AreEqual(propertyEditorAlias, macro.Properties[0].EditorAlias);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs
index 515dfb4728..70b68d4500 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MediaTypeBuilderTests.cs
@@ -4,106 +4,107 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class MediaTypeBuilderTests
 {
-    [TestFixture]
-    public class MediaTypeBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 99;
-            var testKey = Guid.NewGuid();
-            const string testAlias = "mediaType";
-            const string testName = "Media Type";
-            const string testPropertyGroupName = "Additional Content";
-            const int testParentId = 98;
-            const int testCreatorId = 22;
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const int testLevel = 3;
-            const string testPath = "-1, 4, 10";
-            const int testSortOrder = 5;
-            const string testDescription = "The description";
-            const string testIcon = "icon";
-            const string testThumbnail = "thumnail";
-            const bool testTrashed = true;
-            const int testPropertyTypeIdsIncrementingFrom = 200;
-            var testPropertyType1 = new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
-            var testPropertyType2 = new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
+        // Arrange
+        const int testId = 99;
+        var testKey = Guid.NewGuid();
+        const string testAlias = "mediaType";
+        const string testName = "Media Type";
+        const string testPropertyGroupName = "Additional Content";
+        const int testParentId = 98;
+        const int testCreatorId = 22;
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const int testLevel = 3;
+        const string testPath = "-1, 4, 10";
+        const int testSortOrder = 5;
+        const string testDescription = "The description";
+        const string testIcon = "icon";
+        const string testThumbnail = "thumnail";
+        const bool testTrashed = true;
+        const int testPropertyTypeIdsIncrementingFrom = 200;
+        var testPropertyType1 =
+            new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
+        var testPropertyType2 =
+            new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
 
-            var builder = new MediaTypeBuilder();
+        var builder = new MediaTypeBuilder();
 
-            // Act
-            IMediaType mediaType = builder
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithAlias(testAlias)
-                .WithName(testName)
-                .WithCreatorId(testCreatorId)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithParentId(testParentId)
-                .WithLevel(testLevel)
-                .WithPath(testPath)
-                .WithSortOrder(testSortOrder)
-                .WithDescription(testDescription)
-                .WithIcon(testIcon)
-                .WithThumbnail(testThumbnail)
-                .WithTrashed(testTrashed)
-                .WithPropertyTypeIdsIncrementingFrom(200)
-                .WithMediaPropertyGroup()
-                .AddPropertyGroup()
-                    .WithId(1)
-                    .WithName(testPropertyGroupName)
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                        .WithValueStorageType(ValueStorageType.Nvarchar)
-                        .WithAlias(testPropertyType1.Alias)
-                        .WithName(testPropertyType1.Name)
-                        .WithSortOrder(testPropertyType1.SortOrder)
-                        .WithDataTypeId(testPropertyType1.DataTypeId)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithAlias(testPropertyType2.Alias)
-                        .WithName(testPropertyType2.Name)
-                        .WithSortOrder(testPropertyType2.SortOrder)
-                        .WithDataTypeId(testPropertyType2.DataTypeId)
-                        .Done()
-                    .Done()
-                .Build();
+        // Act
+        var mediaType = builder
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithAlias(testAlias)
+            .WithName(testName)
+            .WithCreatorId(testCreatorId)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithParentId(testParentId)
+            .WithLevel(testLevel)
+            .WithPath(testPath)
+            .WithSortOrder(testSortOrder)
+            .WithDescription(testDescription)
+            .WithIcon(testIcon)
+            .WithThumbnail(testThumbnail)
+            .WithTrashed(testTrashed)
+            .WithPropertyTypeIdsIncrementingFrom(200)
+            .WithMediaPropertyGroup()
+            .AddPropertyGroup()
+            .WithId(1)
+            .WithName(testPropertyGroupName)
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithValueStorageType(ValueStorageType.Nvarchar)
+            .WithAlias(testPropertyType1.Alias)
+            .WithName(testPropertyType1.Name)
+            .WithSortOrder(testPropertyType1.SortOrder)
+            .WithDataTypeId(testPropertyType1.DataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias(testPropertyType2.Alias)
+            .WithName(testPropertyType2.Name)
+            .WithSortOrder(testPropertyType2.SortOrder)
+            .WithDataTypeId(testPropertyType2.DataTypeId)
+            .Done()
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, mediaType.Id);
-            Assert.AreEqual(testAlias, mediaType.Alias);
-            Assert.AreEqual(testName, mediaType.Name);
-            Assert.AreEqual(testKey, mediaType.Key);
-            Assert.AreEqual(testCreateDate, mediaType.CreateDate);
-            Assert.AreEqual(testUpdateDate, mediaType.UpdateDate);
-            Assert.AreEqual(testCreatorId, mediaType.CreatorId);
-            Assert.AreEqual(testParentId, mediaType.ParentId);
-            Assert.AreEqual(testLevel, mediaType.Level);
-            Assert.AreEqual(testPath, mediaType.Path);
-            Assert.AreEqual(testSortOrder, mediaType.SortOrder);
-            Assert.AreEqual(testDescription, mediaType.Description);
-            Assert.AreEqual(testIcon, mediaType.Icon);
-            Assert.AreEqual(testThumbnail, mediaType.Thumbnail);
-            Assert.AreEqual(testTrashed, mediaType.Trashed);
-            Assert.IsFalse(mediaType.IsContainer);
-            Assert.AreEqual(7, mediaType.PropertyTypes.Count());   // 5 from media properties group, 2 custom
+        // Assert
+        Assert.AreEqual(testId, mediaType.Id);
+        Assert.AreEqual(testAlias, mediaType.Alias);
+        Assert.AreEqual(testName, mediaType.Name);
+        Assert.AreEqual(testKey, mediaType.Key);
+        Assert.AreEqual(testCreateDate, mediaType.CreateDate);
+        Assert.AreEqual(testUpdateDate, mediaType.UpdateDate);
+        Assert.AreEqual(testCreatorId, mediaType.CreatorId);
+        Assert.AreEqual(testParentId, mediaType.ParentId);
+        Assert.AreEqual(testLevel, mediaType.Level);
+        Assert.AreEqual(testPath, mediaType.Path);
+        Assert.AreEqual(testSortOrder, mediaType.SortOrder);
+        Assert.AreEqual(testDescription, mediaType.Description);
+        Assert.AreEqual(testIcon, mediaType.Icon);
+        Assert.AreEqual(testThumbnail, mediaType.Thumbnail);
+        Assert.AreEqual(testTrashed, mediaType.Trashed);
+        Assert.IsFalse(mediaType.IsContainer);
+        Assert.AreEqual(7, mediaType.PropertyTypes.Count()); // 5 from media properties group, 2 custom
 
-            IOrderedEnumerable<int> propertyTypeIds = mediaType.PropertyTypes.Select(x => x.Id).OrderBy(x => x);
-            Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 1, propertyTypeIds.Min());
-            Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 7, propertyTypeIds.Max());
-        }
+        var propertyTypeIds = mediaType.PropertyTypes.Select(x => x.Id).OrderBy(x => x).ToArray();
+        Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 1, propertyTypeIds.Min());
+        Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 7, propertyTypeIds.Max());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
index 6cddecc473..7323709e3c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberBuilderTests.cs
@@ -9,146 +9,154 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class MemberBuilderTests
 {
-    [TestFixture]
-    public class MemberBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
+        // Arrange
+        const int testMemberTypeId = 99;
+        const string testMemberTypeAlias = "memberType";
+        const string testMemberTypeName = "Member Type";
+        const string testMemberTypePropertyGroupName = "Content";
+        const int testId = 10;
+        const string testName = "Fred";
+        const string testUsername = "fred";
+        const string testRawPasswordValue = "raw pass";
+        const string testEmail = "email@email.com";
+        const int testCreatorId = 22;
+        const int testLevel = 3;
+        const string testPath = "-1, 4, 10";
+        const bool testIsApproved = true;
+        const bool testIsLockedOut = true;
+        const int testSortOrder = 5;
+        const bool testTrashed = false;
+        var testKey = Guid.NewGuid();
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const int testFailedPasswordAttempts = 22;
+        var testLastLockoutDate = DateTime.Now.AddHours(-2);
+        var testLastLoginDate = DateTime.Now.AddHours(-3);
+        var testLastPasswordChangeDate = DateTime.Now.AddHours(-4);
+        var testPropertyType1 =
+            new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
+        var testPropertyType2 =
+            new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
+        var testPropertyType3 = new PropertyTypeDetail
         {
-            // Arrange
-            const int testMemberTypeId = 99;
-            const string testMemberTypeAlias = "memberType";
-            const string testMemberTypeName = "Member Type";
-            const string testMemberTypePropertyGroupName = "Content";
-            const int testId = 10;
-            const string testName = "Fred";
-            const string testUsername = "fred";
-            const string testRawPasswordValue = "raw pass";
-            const string testEmail = "email@email.com";
-            const int testCreatorId = 22;
-            const int testLevel = 3;
-            const string testPath = "-1, 4, 10";
-            const bool testIsApproved = true;
-            const bool testIsLockedOut = true;
-            const int testSortOrder = 5;
-            const bool testTrashed = false;
-            var testKey = Guid.NewGuid();
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const int testFailedPasswordAttempts = 22;
-            DateTime testLastLockoutDate = DateTime.Now.AddHours(-2);
-            DateTime testLastLoginDate = DateTime.Now.AddHours(-3);
-            DateTime testLastPasswordChangeDate = DateTime.Now.AddHours(-4);
-            var testPropertyType1 = new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
-            var testPropertyType2 = new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
-            var testPropertyType3 = new PropertyTypeDetail { Alias = "author", Name = "Author", Description = "Writer of the article", SortOrder = 1, DataTypeId = -88 };
-            var testGroups = new string[] { "group1", "group2" };
-            var testPropertyData1 = new KeyValuePair<string, object>("title", "Name member");
-            var testPropertyData2 = new KeyValuePair<string, object>("bodyText", "This is a subpage");
-            var testPropertyData3 = new KeyValuePair<string, object>("author", "John Doe");
-            var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
-            var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
-            const int testPropertyIdsIncrementingFrom = 200;
+            Alias = "author",
+            Name = "Author",
+            Description = "Writer of the article",
+            SortOrder = 1,
+            DataTypeId = -88,
+        };
+        var testGroups = new[] { "group1", "group2" };
+        var testPropertyData1 = new KeyValuePair<string, object>("title", "Name member");
+        var testPropertyData2 = new KeyValuePair<string, object>("bodyText", "This is a subpage");
+        var testPropertyData3 = new KeyValuePair<string, object>("author", "John Doe");
+        var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
+        var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
+        const int testPropertyIdsIncrementingFrom = 200;
 
-            var builder = new MemberBuilder();
+        var builder = new MemberBuilder();
 
-            // Act
-            Member member = builder
-                .AddMemberType()
-                    .WithId(testMemberTypeId)
-                    .WithAlias(testMemberTypeAlias)
-                    .WithName(testMemberTypeName)
-                    .WithMembershipPropertyGroup()
-                    .AddPropertyGroup()
-                        .WithId(1)
-                        .WithName(testMemberTypePropertyGroupName)
-                        .WithSortOrder(1)
-                        .AddPropertyType()
-                            .WithAlias(testPropertyType1.Alias)
-                            .WithName(testPropertyType1.Name)
-                            .WithSortOrder(testPropertyType1.SortOrder)
-                            .WithDataTypeId(testPropertyType1.DataTypeId)
-                            .Done()
-                        .AddPropertyType()
-                            .WithValueStorageType(ValueStorageType.Ntext)
-                            .WithAlias(testPropertyType2.Alias)
-                            .WithName(testPropertyType2.Name)
-                            .WithSortOrder(testPropertyType2.SortOrder)
-                            .WithDataTypeId(testPropertyType2.DataTypeId)
-                            .Done()
-                        .AddPropertyType()
-                            .WithAlias(testPropertyType3.Alias)
-                            .WithName(testPropertyType3.Name)
-                            .WithDescription(testPropertyType3.Description)
-                            .WithSortOrder(testPropertyType3.SortOrder)
-                            .WithDataTypeId(testPropertyType3.DataTypeId)
-                            .Done()
-                        .Done()
-                    .Done()
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithName(testName)
-                .WithLogin(testUsername, testRawPasswordValue)
-                .WithEmail(testEmail)
-                .WithCreatorId(testCreatorId)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithLevel(testLevel)
-                .WithPath(testPath)
-                .WithFailedPasswordAttempts(testFailedPasswordAttempts)
-                .WithIsApproved(testIsApproved)
-                .WithIsLockedOut(testIsLockedOut, testLastLockoutDate)
-                .WithLastLoginDate(testLastLoginDate)
-                .WithLastPasswordChangeDate(testLastPasswordChangeDate)
-                .WithSortOrder(testSortOrder)
-                .WithTrashed(testTrashed)
-                .AddMemberGroups()
-                    .WithValue(testGroups[0])
-                    .WithValue(testGroups[1])
-                    .Done()
-                .AddAdditionalData()
-                    .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
-                    .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
-                    .Done()
-                .WithPropertyIdsIncrementingFrom(200)
-                .AddPropertyData()
-                    .WithKeyValue(testPropertyData1.Key, testPropertyData1.Value)
-                    .WithKeyValue(testPropertyData2.Key, testPropertyData2.Value)
-                    .WithKeyValue(testPropertyData3.Key, testPropertyData3.Value)
-                    .Done()
-                .Build();
+        // Act
+        var member = builder
+            .AddMemberType()
+            .WithId(testMemberTypeId)
+            .WithAlias(testMemberTypeAlias)
+            .WithName(testMemberTypeName)
+            .WithMembershipPropertyGroup()
+            .AddPropertyGroup()
+            .WithId(1)
+            .WithName(testMemberTypePropertyGroupName)
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias(testPropertyType1.Alias)
+            .WithName(testPropertyType1.Name)
+            .WithSortOrder(testPropertyType1.SortOrder)
+            .WithDataTypeId(testPropertyType1.DataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias(testPropertyType2.Alias)
+            .WithName(testPropertyType2.Name)
+            .WithSortOrder(testPropertyType2.SortOrder)
+            .WithDataTypeId(testPropertyType2.DataTypeId)
+            .Done()
+            .AddPropertyType()
+            .WithAlias(testPropertyType3.Alias)
+            .WithName(testPropertyType3.Name)
+            .WithDescription(testPropertyType3.Description)
+            .WithSortOrder(testPropertyType3.SortOrder)
+            .WithDataTypeId(testPropertyType3.DataTypeId)
+            .Done()
+            .Done()
+            .Done()
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithName(testName)
+            .WithLogin(testUsername, testRawPasswordValue)
+            .WithEmail(testEmail)
+            .WithCreatorId(testCreatorId)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithLevel(testLevel)
+            .WithPath(testPath)
+            .WithFailedPasswordAttempts(testFailedPasswordAttempts)
+            .WithIsApproved(testIsApproved)
+            .WithIsLockedOut(testIsLockedOut, testLastLockoutDate)
+            .WithLastLoginDate(testLastLoginDate)
+            .WithLastPasswordChangeDate(testLastPasswordChangeDate)
+            .WithSortOrder(testSortOrder)
+            .WithTrashed(testTrashed)
+            .AddMemberGroups()
+            .WithValue(testGroups[0])
+            .WithValue(testGroups[1])
+            .Done()
+            .AddAdditionalData()
+            .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
+            .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
+            .Done()
+            .WithPropertyIdsIncrementingFrom(200)
+            .AddPropertyData()
+            .WithKeyValue(testPropertyData1.Key, testPropertyData1.Value)
+            .WithKeyValue(testPropertyData2.Key, testPropertyData2.Value)
+            .WithKeyValue(testPropertyData3.Key, testPropertyData3.Value)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testMemberTypeId, member.ContentTypeId);
-            Assert.AreEqual(testMemberTypeAlias, member.ContentType.Alias);
-            Assert.AreEqual(testMemberTypeName, member.ContentType.Name);
-            Assert.AreEqual(testId, member.Id);
-            Assert.AreEqual(testKey, member.Key);
-            Assert.AreEqual(testName, member.Name);
-            Assert.AreEqual(testCreateDate, member.CreateDate);
-            Assert.AreEqual(testUpdateDate, member.UpdateDate);
-            Assert.AreEqual(testCreatorId, member.CreatorId);
-            Assert.AreEqual(testFailedPasswordAttempts, member.FailedPasswordAttempts);
-            Assert.AreEqual(testIsApproved, member.IsApproved);
-            Assert.AreEqual(testIsLockedOut, member.IsLockedOut);
-            Assert.AreEqual(testLastLockoutDate, member.LastLockoutDate);
-            Assert.AreEqual(testLastLoginDate, member.LastLoginDate);
-            Assert.AreEqual(testLastPasswordChangeDate, member.LastPasswordChangeDate);
-            Assert.AreEqual(testGroups, member.Groups.ToArray());
-            Assert.AreEqual(4, member.Properties.Count);   // 1 from membership properties group, 3 custom
-            Assert.AreEqual(testPropertyData1.Value, member.GetValue<string>(testPropertyData1.Key));
-            Assert.AreEqual(testPropertyData2.Value, member.GetValue<string>(testPropertyData2.Key));
-            Assert.AreEqual(testPropertyData3.Value, member.GetValue<string>(testPropertyData3.Key));
+        // Assert
+        Assert.AreEqual(testMemberTypeId, member.ContentTypeId);
+        Assert.AreEqual(testMemberTypeAlias, member.ContentType.Alias);
+        Assert.AreEqual(testMemberTypeName, member.ContentType.Name);
+        Assert.AreEqual(testId, member.Id);
+        Assert.AreEqual(testKey, member.Key);
+        Assert.AreEqual(testName, member.Name);
+        Assert.AreEqual(testCreateDate, member.CreateDate);
+        Assert.AreEqual(testUpdateDate, member.UpdateDate);
+        Assert.AreEqual(testCreatorId, member.CreatorId);
+        Assert.AreEqual(testFailedPasswordAttempts, member.FailedPasswordAttempts);
+        Assert.AreEqual(testIsApproved, member.IsApproved);
+        Assert.AreEqual(testIsLockedOut, member.IsLockedOut);
+        Assert.AreEqual(testLastLockoutDate, member.LastLockoutDate);
+        Assert.AreEqual(testLastLoginDate, member.LastLoginDate);
+        Assert.AreEqual(testLastPasswordChangeDate, member.LastPasswordChangeDate);
+        Assert.AreEqual(testGroups, member.Groups.ToArray());
+        Assert.AreEqual(4, member.Properties.Count); // 1 from membership properties group, 3 custom
+        Assert.AreEqual(testPropertyData1.Value, member.GetValue<string>(testPropertyData1.Key));
+        Assert.AreEqual(testPropertyData2.Value, member.GetValue<string>(testPropertyData2.Key));
+        Assert.AreEqual(testPropertyData3.Value, member.GetValue<string>(testPropertyData3.Key));
 
-            IOrderedEnumerable<int> propertyIds = member.Properties.Select(x => x.Id).OrderBy(x => x);
-            Assert.AreEqual(testPropertyIdsIncrementingFrom + 1, propertyIds.Min());
-            Assert.AreEqual(testPropertyIdsIncrementingFrom + 4, propertyIds.Max());
+        var propertyIds = member.Properties.Select(x => x.Id).OrderBy(x => x).ToArray();
+        Assert.AreEqual(testPropertyIdsIncrementingFrom + 1, propertyIds.Min());
+        Assert.AreEqual(testPropertyIdsIncrementingFrom + 4, propertyIds.Max());
 
-            Assert.AreEqual(2, member.AdditionalData.Count);
-            Assert.AreEqual(testAdditionalData1.Value, member.AdditionalData[testAdditionalData1.Key]);
-            Assert.AreEqual(testAdditionalData2.Value, member.AdditionalData[testAdditionalData2.Key]);
-        }
+        Assert.AreEqual(2, member.AdditionalData.Count);
+        Assert.AreEqual(testAdditionalData1.Value, member.AdditionalData[testAdditionalData1.Key]);
+        Assert.AreEqual(testAdditionalData2.Value, member.AdditionalData[testAdditionalData2.Key]);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs
index 9072a49b2c..76a230c6a0 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberGroupBuilderTests.cs
@@ -4,54 +4,54 @@
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class MemberGroupBuilderTests
 {
-    [TestFixture]
-    public class MemberGroupBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 6;
-            const string testName = "Test Group";
-            const int testCreatorId = 4;
-            var testKey = Guid.NewGuid();
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
-            var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
+        // Arrange
+        const int testId = 6;
+        const string testName = "Test Group";
+        const int testCreatorId = 4;
+        var testKey = Guid.NewGuid();
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        var testAdditionalData1 = new KeyValuePair<string, object>("test1", 123);
+        var testAdditionalData2 = new KeyValuePair<string, object>("test2", "hello");
 
-            var builder = new MemberGroupBuilder();
+        var builder = new MemberGroupBuilder();
 
-            // Act
-            MemberGroup group = builder
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithName(testName)
-                .WithCreatorId(testCreatorId)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .AddAdditionalData()
-                    .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
-                    .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
-                    .Done()
-                .Build();
+        // Act
+        var group = builder
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithName(testName)
+            .WithCreatorId(testCreatorId)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .AddAdditionalData()
+            .WithKeyValue(testAdditionalData1.Key, testAdditionalData1.Value)
+            .WithKeyValue(testAdditionalData2.Key, testAdditionalData2.Value)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, group.Id);
-            Assert.AreEqual(testKey, group.Key);
-            Assert.AreEqual(testName, group.Name);
-            Assert.AreEqual(testCreateDate, group.CreateDate);
-            Assert.AreEqual(testUpdateDate, group.UpdateDate);
-            Assert.AreEqual(testCreatorId, group.CreatorId);
-            Assert.AreEqual(3, group.AdditionalData.Count); // previousName is added as part of the MemberGroup construction, plus the 2 we've added.
-            Assert.AreEqual(testAdditionalData1.Value, group.AdditionalData[testAdditionalData1.Key]);
-            Assert.AreEqual(testAdditionalData2.Value, group.AdditionalData[testAdditionalData2.Key]);
-        }
+        // Assert
+        Assert.AreEqual(testId, group.Id);
+        Assert.AreEqual(testKey, group.Key);
+        Assert.AreEqual(testName, group.Name);
+        Assert.AreEqual(testCreateDate, group.CreateDate);
+        Assert.AreEqual(testUpdateDate, group.UpdateDate);
+        Assert.AreEqual(testCreatorId, group.CreatorId);
+
+        // previousName is added as part of the MemberGroup construction, plus the 2 we've added.
+        Assert.AreEqual(3, group.AdditionalData.Count);
+        Assert.AreEqual(testAdditionalData1.Value, group.AdditionalData[testAdditionalData1.Key]);
+        Assert.AreEqual(testAdditionalData2.Value, group.AdditionalData[testAdditionalData2.Key]);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs
index 239674aaa8..52fb71d820 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/MemberTypeBuilderTests.cs
@@ -5,111 +5,112 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class MemberTypeBuilderTests
 {
-    [TestFixture]
-    public class MemberTypeBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 99;
-            var testKey = Guid.NewGuid();
-            const string testAlias = "memberType";
-            const string testName = "Member Type";
-            const string testPropertyGroupName = "Content";
-            const int testParentId = 98;
-            const int testCreatorId = 22;
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const int testLevel = 3;
-            const string testPath = "-1, 4, 10";
-            const int testSortOrder = 5;
-            const string testDescription = "The description";
-            const string testIcon = "icon";
-            const string testThumbnail = "thumnail";
-            const bool testTrashed = true;
-            const int testPropertyTypeIdsIncrementingFrom = 200;
-            var testPropertyType1 = new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
-            var testPropertyType2 = new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
-            var testPropertyData1 = new KeyValuePair<string, object>("title", "Name member");
+        // Arrange
+        const int testId = 99;
+        var testKey = Guid.NewGuid();
+        const string testAlias = "memberType";
+        const string testName = "Member Type";
+        const string testPropertyGroupName = "Content";
+        const int testParentId = 98;
+        const int testCreatorId = 22;
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const int testLevel = 3;
+        const string testPath = "-1, 4, 10";
+        const int testSortOrder = 5;
+        const string testDescription = "The description";
+        const string testIcon = "icon";
+        const string testThumbnail = "thumnail";
+        const bool testTrashed = true;
+        const int testPropertyTypeIdsIncrementingFrom = 200;
+        var testPropertyType1 =
+            new PropertyTypeDetail { Alias = "title", Name = "Title", SortOrder = 1, DataTypeId = -88 };
+        var testPropertyType2 =
+            new PropertyTypeDetail { Alias = "bodyText", Name = "Body Text", SortOrder = 2, DataTypeId = -87 };
+        var testPropertyData1 = new KeyValuePair<string, object>("title", "Name member");
 
-            var builder = new MemberTypeBuilder();
+        var builder = new MemberTypeBuilder();
 
-            // Act
-            IMemberType memberType = builder
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithAlias(testAlias)
-                .WithName(testName)
-                .WithCreatorId(testCreatorId)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithParentId(testParentId)
-                .WithLevel(testLevel)
-                .WithPath(testPath)
-                .WithSortOrder(testSortOrder)
-                .WithDescription(testDescription)
-                .WithIcon(testIcon)
-                .WithThumbnail(testThumbnail)
-                .WithTrashed(testTrashed)
-                .WithPropertyTypeIdsIncrementingFrom(200)
-                .WithMembershipPropertyGroup()
-                .AddPropertyGroup()
-                    .WithId(1)
-                    .WithName(testPropertyGroupName)
-                    .WithSortOrder(1)
-                    .AddPropertyType()
-                        .WithAlias(testPropertyType1.Alias)
-                        .WithName(testPropertyType1.Name)
-                        .WithSortOrder(testPropertyType1.SortOrder)
-                        .Done()
-                    .AddPropertyType()
-                        .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
-                        .WithValueStorageType(ValueStorageType.Ntext)
-                        .WithAlias(testPropertyType2.Alias)
-                        .WithName(testPropertyType2.Name)
-                        .WithSortOrder(testPropertyType2.SortOrder)
-                        .WithDataTypeId(testPropertyType2.DataTypeId)
-                        .Done()
-                    .Done()
-                .WithMemberCanEditProperty(testPropertyType1.Alias, true)
-                .WithMemberCanViewProperty(testPropertyType2.Alias, true)
-                .Build();
+        // Act
+        var memberType = builder
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithAlias(testAlias)
+            .WithName(testName)
+            .WithCreatorId(testCreatorId)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithParentId(testParentId)
+            .WithLevel(testLevel)
+            .WithPath(testPath)
+            .WithSortOrder(testSortOrder)
+            .WithDescription(testDescription)
+            .WithIcon(testIcon)
+            .WithThumbnail(testThumbnail)
+            .WithTrashed(testTrashed)
+            .WithPropertyTypeIdsIncrementingFrom(200)
+            .WithMembershipPropertyGroup()
+            .AddPropertyGroup()
+            .WithId(1)
+            .WithName(testPropertyGroupName)
+            .WithSortOrder(1)
+            .AddPropertyType()
+            .WithAlias(testPropertyType1.Alias)
+            .WithName(testPropertyType1.Name)
+            .WithSortOrder(testPropertyType1.SortOrder)
+            .Done()
+            .AddPropertyType()
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.TextBox)
+            .WithValueStorageType(ValueStorageType.Ntext)
+            .WithAlias(testPropertyType2.Alias)
+            .WithName(testPropertyType2.Name)
+            .WithSortOrder(testPropertyType2.SortOrder)
+            .WithDataTypeId(testPropertyType2.DataTypeId)
+            .Done()
+            .Done()
+            .WithMemberCanEditProperty(testPropertyType1.Alias, true)
+            .WithMemberCanViewProperty(testPropertyType2.Alias, true)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, memberType.Id);
-            Assert.AreEqual(testAlias, memberType.Alias);
-            Assert.AreEqual(testName, memberType.Name);
-            Assert.AreEqual(testKey, memberType.Key);
-            Assert.AreEqual(testCreateDate, memberType.CreateDate);
-            Assert.AreEqual(testUpdateDate, memberType.UpdateDate);
-            Assert.AreEqual(testCreatorId, memberType.CreatorId);
-            Assert.AreEqual(testParentId, memberType.ParentId);
-            Assert.AreEqual(testLevel, memberType.Level);
-            Assert.AreEqual(testPath, memberType.Path);
-            Assert.AreEqual(testSortOrder, memberType.SortOrder);
-            Assert.AreEqual(testDescription, memberType.Description);
-            Assert.AreEqual(testIcon, memberType.Icon);
-            Assert.AreEqual(testThumbnail, memberType.Thumbnail);
-            Assert.AreEqual(testTrashed, memberType.Trashed);
-            Assert.IsFalse(memberType.IsContainer);
-            Assert.AreEqual(3, memberType.PropertyTypes.Count());   // 1 from membership properties group, 2 custom
+        // Assert
+        Assert.AreEqual(testId, memberType.Id);
+        Assert.AreEqual(testAlias, memberType.Alias);
+        Assert.AreEqual(testName, memberType.Name);
+        Assert.AreEqual(testKey, memberType.Key);
+        Assert.AreEqual(testCreateDate, memberType.CreateDate);
+        Assert.AreEqual(testUpdateDate, memberType.UpdateDate);
+        Assert.AreEqual(testCreatorId, memberType.CreatorId);
+        Assert.AreEqual(testParentId, memberType.ParentId);
+        Assert.AreEqual(testLevel, memberType.Level);
+        Assert.AreEqual(testPath, memberType.Path);
+        Assert.AreEqual(testSortOrder, memberType.SortOrder);
+        Assert.AreEqual(testDescription, memberType.Description);
+        Assert.AreEqual(testIcon, memberType.Icon);
+        Assert.AreEqual(testThumbnail, memberType.Thumbnail);
+        Assert.AreEqual(testTrashed, memberType.Trashed);
+        Assert.IsFalse(memberType.IsContainer);
+        Assert.AreEqual(3, memberType.PropertyTypes.Count()); // 1 from membership properties group, 2 custom
 
-            IOrderedEnumerable<int> propertyTypeIds = memberType.PropertyTypes.Select(x => x.Id).OrderBy(x => x);
-            Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 1, propertyTypeIds.Min());
-            Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 3, propertyTypeIds.Max());
+        var propertyTypeIds = memberType.PropertyTypes.Select(x => x.Id).OrderBy(x => x).ToArray();
+        Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 1, propertyTypeIds.Min());
+        Assert.AreEqual(testPropertyTypeIdsIncrementingFrom + 3, propertyTypeIds.Max());
 
-            Assert.IsTrue(memberType.MemberCanEditProperty(testPropertyType1.Alias));
-            Assert.IsFalse(memberType.MemberCanViewProperty(testPropertyType1.Alias));
-            Assert.IsTrue(memberType.MemberCanViewProperty(testPropertyType2.Alias));
-            Assert.IsFalse(memberType.MemberCanEditProperty(testPropertyType2.Alias));
-        }
+        Assert.IsTrue(memberType.MemberCanEditProperty(testPropertyType1.Alias));
+        Assert.IsFalse(memberType.MemberCanViewProperty(testPropertyType1.Alias));
+        Assert.IsTrue(memberType.MemberCanViewProperty(testPropertyType2.Alias));
+        Assert.IsFalse(memberType.MemberCanEditProperty(testPropertyType2.Alias));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs
index 33626f2f97..a2aec5a216 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyBuilderTests.cs
@@ -3,44 +3,42 @@
 
 using System;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class PropertyBuilderTests
 {
-    [TestFixture]
-    public class PropertyBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 4;
-            var testKey = Guid.NewGuid();
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            var testPropertyTypeId = 3;
+        // Arrange
+        const int testId = 4;
+        var testKey = Guid.NewGuid();
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        var testPropertyTypeId = 3;
 
-            var builder = new PropertyBuilder();
+        var builder = new PropertyBuilder();
 
-            // Act
-            IProperty property = builder
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .AddPropertyType()
-                    .WithId(testPropertyTypeId)
-                    .Done()
-                .Build();
+        // Act
+        var property = builder
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .AddPropertyType()
+            .WithId(testPropertyTypeId)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, property.Id);
-            Assert.AreEqual(testCreateDate, property.CreateDate);
-            Assert.AreEqual(testUpdateDate, property.UpdateDate);
-            Assert.AreEqual(testKey, property.Key);
-            Assert.AreEqual(testPropertyTypeId, property.PropertyType.Id);
-        }
+        // Assert
+        Assert.AreEqual(testId, property.Id);
+        Assert.AreEqual(testCreateDate, property.CreateDate);
+        Assert.AreEqual(testUpdateDate, property.UpdateDate);
+        Assert.AreEqual(testKey, property.Key);
+        Assert.AreEqual(testPropertyTypeId, property.PropertyType.Id);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs
index 5060a0b351..ab1740151d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyGroupBuilderTests.cs
@@ -3,51 +3,49 @@
 
 using System;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class PropertyGroupBuilderTests
 {
-    [TestFixture]
-    public class PropertyGroupBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 77;
-            var testKey = Guid.NewGuid();
-            const string testName = "Group1";
-            const int testSortOrder = 555;
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const int testPropertyTypeId = 3;
+        // Arrange
+        const int testId = 77;
+        var testKey = Guid.NewGuid();
+        const string testName = "Group1";
+        const int testSortOrder = 555;
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const int testPropertyTypeId = 3;
 
-            var builder = new PropertyGroupBuilder();
+        var builder = new PropertyGroupBuilder();
 
-            // Act
-            PropertyGroup propertyGroup = builder
-                .WithId(testId)
-                .WithCreateDate(testCreateDate)
-                .WithName(testName)
-                .WithSortOrder(testSortOrder)
-                .WithKey(testKey)
-                .WithUpdateDate(testUpdateDate)
-                .AddPropertyType()
-                    .WithId(3)
-                    .Done()
-                .Build();
+        // Act
+        var propertyGroup = builder
+            .WithId(testId)
+            .WithCreateDate(testCreateDate)
+            .WithName(testName)
+            .WithSortOrder(testSortOrder)
+            .WithKey(testKey)
+            .WithUpdateDate(testUpdateDate)
+            .AddPropertyType()
+            .WithId(3)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, propertyGroup.Id);
-            Assert.AreEqual(testName, propertyGroup.Name);
-            Assert.AreEqual(testSortOrder, propertyGroup.SortOrder);
-            Assert.AreEqual(testCreateDate, propertyGroup.CreateDate);
-            Assert.AreEqual(testUpdateDate, propertyGroup.UpdateDate);
-            Assert.AreEqual(testKey, propertyGroup.Key);
-            Assert.AreEqual(1, propertyGroup.PropertyTypes.Count);
-            Assert.AreEqual(testPropertyTypeId, propertyGroup.PropertyTypes[0].Id);
-        }
+        // Assert
+        Assert.AreEqual(testId, propertyGroup.Id);
+        Assert.AreEqual(testName, propertyGroup.Name);
+        Assert.AreEqual(testSortOrder, propertyGroup.SortOrder);
+        Assert.AreEqual(testCreateDate, propertyGroup.CreateDate);
+        Assert.AreEqual(testUpdateDate, propertyGroup.UpdateDate);
+        Assert.AreEqual(testKey, propertyGroup.Key);
+        Assert.AreEqual(1, propertyGroup.PropertyTypes.Count);
+        Assert.AreEqual(testPropertyTypeId, propertyGroup.PropertyTypes[0].Id);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs
index 32a60247b6..903fd50b0f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeBuilderTests.cs
@@ -7,69 +7,68 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class PropertyTypeBuilderTests
 {
-    [TestFixture]
-    public class PropertyTypeBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 3;
-            var testKey = Guid.NewGuid();
-            const string testPropertyEditorAlias = "TestPropertyEditor";
-            const ValueStorageType testValueStorageType = ValueStorageType.Nvarchar;
-            const string testAlias = "test";
-            const string testName = "Test";
-            const int testSortOrder = 9;
-            const int testDataTypeId = 5;
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const string testDescription = "testing";
-            const int testPropertyGroupId = 11;
-            const bool testMandatory = true;
-            const string testMandatoryMessage = "Field is required";
-            const string testValidationRegExp = "xxxx";
-            const string testValidationRegExpMessage = "Field must match pattern";
+        // Arrange
+        const int testId = 3;
+        var testKey = Guid.NewGuid();
+        const string testPropertyEditorAlias = "TestPropertyEditor";
+        const ValueStorageType testValueStorageType = ValueStorageType.Nvarchar;
+        const string testAlias = "test";
+        const string testName = "Test";
+        const int testSortOrder = 9;
+        const int testDataTypeId = 5;
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const string testDescription = "testing";
+        const int testPropertyGroupId = 11;
+        const bool testMandatory = true;
+        const string testMandatoryMessage = "Field is required";
+        const string testValidationRegExp = "xxxx";
+        const string testValidationRegExpMessage = "Field must match pattern";
 
-            var builder = new PropertyTypeBuilder();
+        var builder = new PropertyTypeBuilder();
 
-            // Act
-            PropertyType propertyType = builder
-                .WithId(testId)
-                .WithPropertyEditorAlias(testPropertyEditorAlias)
-                .WithValueStorageType(testValueStorageType)
-                .WithAlias(testAlias)
-                .WithName(testName)
-                .WithSortOrder(testSortOrder)
-                .WithDataTypeId(testDataTypeId)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithDescription(testDescription)
-                .WithKey(testKey)
-                .WithPropertyGroupId(testPropertyGroupId)
-                .WithMandatory(testMandatory, testMandatoryMessage)
-                .WithValidationRegExp(testValidationRegExp, testValidationRegExpMessage)
-                .Build();
+        // Act
+        var propertyType = builder
+            .WithId(testId)
+            .WithPropertyEditorAlias(testPropertyEditorAlias)
+            .WithValueStorageType(testValueStorageType)
+            .WithAlias(testAlias)
+            .WithName(testName)
+            .WithSortOrder(testSortOrder)
+            .WithDataTypeId(testDataTypeId)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithDescription(testDescription)
+            .WithKey(testKey)
+            .WithPropertyGroupId(testPropertyGroupId)
+            .WithMandatory(testMandatory, testMandatoryMessage)
+            .WithValidationRegExp(testValidationRegExp, testValidationRegExpMessage)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, propertyType.Id);
-            Assert.AreEqual(testPropertyEditorAlias, propertyType.PropertyEditorAlias);
-            Assert.AreEqual(testValueStorageType, propertyType.ValueStorageType);
-            Assert.AreEqual(testAlias, propertyType.Alias);
-            Assert.AreEqual(testName, propertyType.Name);
-            Assert.AreEqual(testSortOrder, propertyType.SortOrder);
-            Assert.AreEqual(testDataTypeId, propertyType.DataTypeId);
-            Assert.AreEqual(testCreateDate, propertyType.CreateDate);
-            Assert.AreEqual(testUpdateDate, propertyType.UpdateDate);
-            Assert.AreEqual(testDescription, propertyType.Description);
-            Assert.AreEqual(testKey, propertyType.Key);
-            Assert.AreEqual(testPropertyGroupId, propertyType.PropertyGroupId.Value);
-            Assert.AreEqual(testMandatory, propertyType.Mandatory);
-            Assert.AreEqual(testMandatoryMessage, propertyType.MandatoryMessage);
-            Assert.AreEqual(testValidationRegExp, propertyType.ValidationRegExp);
-            Assert.AreEqual(testValidationRegExpMessage, propertyType.ValidationRegExpMessage);
-        }
+        // Assert
+        Assert.AreEqual(testId, propertyType.Id);
+        Assert.AreEqual(testPropertyEditorAlias, propertyType.PropertyEditorAlias);
+        Assert.AreEqual(testValueStorageType, propertyType.ValueStorageType);
+        Assert.AreEqual(testAlias, propertyType.Alias);
+        Assert.AreEqual(testName, propertyType.Name);
+        Assert.AreEqual(testSortOrder, propertyType.SortOrder);
+        Assert.AreEqual(testDataTypeId, propertyType.DataTypeId);
+        Assert.AreEqual(testCreateDate, propertyType.CreateDate);
+        Assert.AreEqual(testUpdateDate, propertyType.UpdateDate);
+        Assert.AreEqual(testDescription, propertyType.Description);
+        Assert.AreEqual(testKey, propertyType.Key);
+        Assert.AreEqual(testPropertyGroupId, propertyType.PropertyGroupId.Value);
+        Assert.AreEqual(testMandatory, propertyType.Mandatory);
+        Assert.AreEqual(testMandatoryMessage, propertyType.MandatoryMessage);
+        Assert.AreEqual(testValidationRegExp, propertyType.ValidationRegExp);
+        Assert.AreEqual(testValidationRegExpMessage, propertyType.ValidationRegExpMessage);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs
index 67f993fe69..8a32d6f2f5 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/PropertyTypeDetail.cs
@@ -1,18 +1,17 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+public class PropertyTypeDetail
 {
-    public class PropertyTypeDetail
-    {
-        public string Alias { get; set; }
+    public string Alias { get; set; }
 
-        public string Name { get; set; }
+    public string Name { get; set; }
 
-        public string Description { get; set; } = string.Empty;
+    public string Description { get; set; } = string.Empty;
 
-        public int SortOrder { get; set; }
+    public int SortOrder { get; set; }
 
-        public int DataTypeId { get; set; }
-    }
+    public int DataTypeId { get; set; }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs
index bde8b8f092..907a0d56a9 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationBuilderTests.cs
@@ -7,65 +7,64 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class RelationBuilderTests
 {
-    [TestFixture]
-    public class RelationBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int parentId = 9;
-            const int childId = 8;
-            const int id = 4;
-            var key = Guid.NewGuid();
-            DateTime createDate = DateTime.Now.AddHours(-1);
-            DateTime updateDate = DateTime.Now;
-            const string comment = "test comment";
-            const int relationTypeId = 66;
-            const string relationTypeAlias = "test";
-            const string relationTypeName = "name";
-            var parentObjectType = Guid.NewGuid();
-            var childObjectType = Guid.NewGuid();
+        // Arrange
+        const int parentId = 9;
+        const int childId = 8;
+        const int id = 4;
+        var key = Guid.NewGuid();
+        var createDate = DateTime.Now.AddHours(-1);
+        var updateDate = DateTime.Now;
+        const string comment = "test comment";
+        const int relationTypeId = 66;
+        const string relationTypeAlias = "test";
+        const string relationTypeName = "name";
+        var parentObjectType = Guid.NewGuid();
+        var childObjectType = Guid.NewGuid();
 
-            var builder = new RelationBuilder();
+        var builder = new RelationBuilder();
 
-            // Act
-            Relation relation = builder
-                .BetweenIds(parentId, childId)
-                .WithId(id)
-                .WithComment(comment)
-                .WithCreateDate(createDate)
-                .WithUpdateDate(updateDate)
-                .WithKey(key)
-                .AddRelationType()
-                    .WithId(relationTypeId)
-                    .WithAlias(relationTypeAlias)
-                    .WithName(relationTypeName)
-                    .WithIsBidirectional(false)
-                    .WithIsDependency(true)
-                    .WithParentObjectType(parentObjectType)
-                    .WithChildObjectType(childObjectType)
-                    .Done()
-                .Build();
+        // Act
+        var relation = builder
+            .BetweenIds(parentId, childId)
+            .WithId(id)
+            .WithComment(comment)
+            .WithCreateDate(createDate)
+            .WithUpdateDate(updateDate)
+            .WithKey(key)
+            .AddRelationType()
+            .WithId(relationTypeId)
+            .WithAlias(relationTypeAlias)
+            .WithName(relationTypeName)
+            .WithIsBidirectional(false)
+            .WithIsDependency(true)
+            .WithParentObjectType(parentObjectType)
+            .WithChildObjectType(childObjectType)
+            .Done()
+            .Build();
 
-            // Assert
-            Assert.AreEqual(parentId, relation.ParentId);
-            Assert.AreEqual(childId, relation.ChildId);
-            Assert.AreEqual(id, relation.Id);
-            Assert.AreEqual(createDate, relation.CreateDate);
-            Assert.AreEqual(updateDate, relation.UpdateDate);
-            Assert.AreEqual(key, relation.Key);
-            Assert.AreEqual(comment, relation.Comment);
-            Assert.AreEqual(relationTypeId, relation.RelationType.Id);
-            Assert.AreEqual(relationTypeAlias, relation.RelationType.Alias);
-            Assert.AreEqual(relationTypeName, relation.RelationType.Name);
-            Assert.IsFalse(relation.RelationType.IsBidirectional);
-            
-            Assert.IsTrue((relation.RelationType as IRelationTypeWithIsDependency).IsDependency);
-            Assert.AreEqual(parentObjectType, relation.RelationType.ParentObjectType);
-            Assert.AreEqual(childObjectType, relation.RelationType.ChildObjectType);
-        }
+        // Assert
+        Assert.AreEqual(parentId, relation.ParentId);
+        Assert.AreEqual(childId, relation.ChildId);
+        Assert.AreEqual(id, relation.Id);
+        Assert.AreEqual(createDate, relation.CreateDate);
+        Assert.AreEqual(updateDate, relation.UpdateDate);
+        Assert.AreEqual(key, relation.Key);
+        Assert.AreEqual(comment, relation.Comment);
+        Assert.AreEqual(relationTypeId, relation.RelationType.Id);
+        Assert.AreEqual(relationTypeAlias, relation.RelationType.Alias);
+        Assert.AreEqual(relationTypeName, relation.RelationType.Name);
+        Assert.IsFalse(relation.RelationType.IsBidirectional);
+
+        Assert.IsTrue((relation.RelationType as IRelationTypeWithIsDependency).IsDependency);
+        Assert.AreEqual(parentObjectType, relation.RelationType.ParentObjectType);
+        Assert.AreEqual(childObjectType, relation.RelationType.ChildObjectType);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs
index e99f5ae273..6e15d908ea 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/RelationTypeBuilderTests.cs
@@ -3,60 +3,58 @@
 
 using System;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class RelationTypeBuilderTests
 {
-    [TestFixture]
-    public class RelationTypeBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int id = 3;
-            const string alias = "test";
-            const string name = "Test";
-            var key = Guid.NewGuid();
-            DateTime createDate = DateTime.Now.AddHours(-2);
-            DateTime updateDate = DateTime.Now.AddHours(-1);
-            DateTime deleteDate = DateTime.Now;
-            var parentObjectType = Guid.NewGuid();
-            var childObjectType = Guid.NewGuid();
-            const bool isBidirectional = true;
-            const bool isDependency = true;
+        // Arrange
+        const int id = 3;
+        const string alias = "test";
+        const string name = "Test";
+        var key = Guid.NewGuid();
+        var createDate = DateTime.Now.AddHours(-2);
+        var updateDate = DateTime.Now.AddHours(-1);
+        var deleteDate = DateTime.Now;
+        var parentObjectType = Guid.NewGuid();
+        var childObjectType = Guid.NewGuid();
+        const bool isBidirectional = true;
+        const bool isDependency = true;
 
-            var builder = new RelationTypeBuilder();
+        var builder = new RelationTypeBuilder();
 
-            // Act
-            var relationType = builder
-                .WithId(id)
-                .WithAlias(alias)
-                .WithName(name)
-                .WithKey(key)
-                .WithCreateDate(createDate)
-                .WithUpdateDate(updateDate)
-                .WithDeleteDate(deleteDate)
-                .WithParentObjectType(parentObjectType)
-                .WithChildObjectType(childObjectType)
-                .WithIsBidirectional(isBidirectional)
-                .WithIsDependency(isDependency)
-                .Build();
+        // Act
+        var relationType = builder
+            .WithId(id)
+            .WithAlias(alias)
+            .WithName(name)
+            .WithKey(key)
+            .WithCreateDate(createDate)
+            .WithUpdateDate(updateDate)
+            .WithDeleteDate(deleteDate)
+            .WithParentObjectType(parentObjectType)
+            .WithChildObjectType(childObjectType)
+            .WithIsBidirectional(isBidirectional)
+            .WithIsDependency(isDependency)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(id, relationType.Id);
-            Assert.AreEqual(alias, relationType.Alias);
-            Assert.AreEqual(name, relationType.Name);
-            Assert.AreEqual(key, relationType.Key);
-            Assert.AreEqual(createDate, relationType.CreateDate);
-            Assert.AreEqual(updateDate, relationType.UpdateDate);
-            Assert.AreEqual(deleteDate, relationType.DeleteDate);
-            Assert.AreEqual(parentObjectType, relationType.ParentObjectType);
-            Assert.AreEqual(childObjectType, relationType.ChildObjectType);
-            Assert.AreEqual(isBidirectional, relationType.IsBidirectional);
-            Assert.AreEqual(isDependency, relationType.IsDependency);
-        }
+        // Assert
+        Assert.AreEqual(id, relationType.Id);
+        Assert.AreEqual(alias, relationType.Alias);
+        Assert.AreEqual(name, relationType.Name);
+        Assert.AreEqual(key, relationType.Key);
+        Assert.AreEqual(createDate, relationType.CreateDate);
+        Assert.AreEqual(updateDate, relationType.UpdateDate);
+        Assert.AreEqual(deleteDate, relationType.DeleteDate);
+        Assert.AreEqual(parentObjectType, relationType.ParentObjectType);
+        Assert.AreEqual(childObjectType, relationType.ChildObjectType);
+        Assert.AreEqual(isBidirectional, relationType.IsBidirectional);
+        Assert.AreEqual(isDependency, relationType.IsDependency);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs
index 4b7c58c104..9ec15f5458 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/StylesheetBuilderTests.cs
@@ -3,33 +3,31 @@
 
 using System.IO;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Tests.Common.Builders;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class StylesheetBuilderTests
 {
-    [TestFixture]
-    public class StylesheetBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            var testPath = WebPath.PathSeparator + WebPath.Combine("css", "styles.css");
-            const string testContent = @"body { color:#000; } .bold {font-weight:bold;}";
+        // Arrange
+        var testPath = WebPath.PathSeparator + WebPath.Combine("css", "styles.css");
+        const string testContent = @"body { color:#000; } .bold {font-weight:bold;}";
 
-            var builder = new StylesheetBuilder();
+        var builder = new StylesheetBuilder();
 
-            // Act
-            Stylesheet stylesheet = builder
-                .WithPath(testPath)
-                .WithContent(testContent)
-                .Build();
+        // Act
+        var stylesheet = builder
+            .WithPath(testPath)
+            .WithContent(testContent)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(Path.DirectorySeparatorChar + Path.Combine("css", "styles.css"), stylesheet.Path);
-            Assert.AreEqual(testContent, stylesheet.Content);
-        }
+        // Assert
+        Assert.AreEqual(Path.DirectorySeparatorChar + Path.Combine("css", "styles.css"), stylesheet.Path);
+        Assert.AreEqual(testContent, stylesheet.Content);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs
index 88695cd48b..f8b5b4fd6d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateBuilderTests.cs
@@ -7,53 +7,52 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class TemplateBuilderTests
 {
-    [TestFixture]
-    public class TemplateBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 3;
-            const string testAlias = "test";
-            const string testName = "Test";
-            var testKey = Guid.NewGuid();
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const string testPath = "-1,3";
-            const string testContent = "blah";
-            const string testMasterTemplateAlias = "master";
-            const int testMasterTemplateId = 88;
+        // Arrange
+        const int testId = 3;
+        const string testAlias = "test";
+        const string testName = "Test";
+        var testKey = Guid.NewGuid();
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const string testPath = "-1,3";
+        const string testContent = "blah";
+        const string testMasterTemplateAlias = "master";
+        const int testMasterTemplateId = 88;
 
-            var builder = new TemplateBuilder();
+        var builder = new TemplateBuilder();
 
-            // Act
-            ITemplate template = builder
-                .WithId(3)
-                .WithAlias(testAlias)
-                .WithName(testName)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithKey(testKey)
-                .WithPath(testPath)
-                .WithContent(testContent)
-                .AsMasterTemplate(testMasterTemplateAlias, testMasterTemplateId)
-                .Build();
+        // Act
+        var template = builder
+            .WithId(3)
+            .WithAlias(testAlias)
+            .WithName(testName)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithKey(testKey)
+            .WithPath(testPath)
+            .WithContent(testContent)
+            .AsMasterTemplate(testMasterTemplateAlias, testMasterTemplateId)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, template.Id);
-            Assert.AreEqual(testAlias, template.Alias);
-            Assert.AreEqual(testName, template.Name);
-            Assert.AreEqual(testCreateDate, template.CreateDate);
-            Assert.AreEqual(testUpdateDate, template.UpdateDate);
-            Assert.AreEqual(testKey, template.Key);
-            Assert.AreEqual(testPath, template.Path);
-            Assert.AreEqual(testContent, template.Content);
-            Assert.IsTrue(template.IsMasterTemplate);
-            Assert.AreEqual(testMasterTemplateAlias, template.MasterTemplateAlias);
-            Assert.AreEqual(testMasterTemplateId, ((Template)template).MasterTemplateId.Value);
-        }
+        // Assert
+        Assert.AreEqual(testId, template.Id);
+        Assert.AreEqual(testAlias, template.Alias);
+        Assert.AreEqual(testName, template.Name);
+        Assert.AreEqual(testCreateDate, template.CreateDate);
+        Assert.AreEqual(testUpdateDate, template.UpdateDate);
+        Assert.AreEqual(testKey, template.Key);
+        Assert.AreEqual(testPath, template.Path);
+        Assert.AreEqual(testContent, template.Content);
+        Assert.IsTrue(template.IsMasterTemplate);
+        Assert.AreEqual(testMasterTemplateAlias, template.MasterTemplateAlias);
+        Assert.AreEqual(testMasterTemplateId, ((Template)template).MasterTemplateId.Value);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs
index 53a9875382..558af7136c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/TemplateDetail.cs
@@ -1,14 +1,13 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+public class TemplateDetail
 {
-    public class TemplateDetail
-    {
-        public int Id { get; set; }
+    public int Id { get; set; }
 
-        public string Alias { get; set; }
+    public string Alias { get; set; }
 
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs
index deb3e1a0f6..455868358f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserBuilderTests.cs
@@ -3,76 +3,74 @@
 
 using System;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class UserBuilderTests
 {
-    [TestFixture]
-    public class UserBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 10;
-            const string testName = "Fred";
-            const string testUsername = "fred";
-            const string testRawPasswordValue = "raw pass";
-            const string testEmail = "email@email.com";
-            const bool testIsApproved = true;
-            const bool testIsLockedOut = true;
-            var testKey = Guid.NewGuid();
-            DateTime testCreateDate = DateTime.Now.AddHours(-1);
-            DateTime testUpdateDate = DateTime.Now;
-            const int testFailedPasswordAttempts = 22;
-            DateTime testLastLockoutDate = DateTime.Now.AddHours(-2);
-            DateTime testLastLoginDate = DateTime.Now.AddHours(-3);
-            DateTime testLastPasswordChangeDate = DateTime.Now.AddHours(-4);
-            var testComments = "comments";
-            var testSessionTimeout = 5;
-            var testStartContentIds = new[] { 3 };
-            var testStartMediaIds = new[] { 8 };
+        // Arrange
+        const int testId = 10;
+        const string testName = "Fred";
+        const string testUsername = "fred";
+        const string testRawPasswordValue = "raw pass";
+        const string testEmail = "email@email.com";
+        const bool testIsApproved = true;
+        const bool testIsLockedOut = true;
+        var testKey = Guid.NewGuid();
+        var testCreateDate = DateTime.Now.AddHours(-1);
+        var testUpdateDate = DateTime.Now;
+        const int testFailedPasswordAttempts = 22;
+        var testLastLockoutDate = DateTime.Now.AddHours(-2);
+        var testLastLoginDate = DateTime.Now.AddHours(-3);
+        var testLastPasswordChangeDate = DateTime.Now.AddHours(-4);
+        var testComments = "comments";
+        var testSessionTimeout = 5;
+        var testStartContentIds = new[] { 3 };
+        var testStartMediaIds = new[] { 8 };
 
-            var builder = new UserBuilder();
+        var builder = new UserBuilder();
 
-            // Act
-            User user = builder
-                .WithId(testId)
-                .WithKey(testKey)
-                .WithName(testName)
-                .WithLogin(testUsername, testRawPasswordValue)
-                .WithEmail(testEmail)
-                .WithCreateDate(testCreateDate)
-                .WithUpdateDate(testUpdateDate)
-                .WithFailedPasswordAttempts(testFailedPasswordAttempts)
-                .WithIsApproved(testIsApproved)
-                .WithIsLockedOut(testIsLockedOut, testLastLockoutDate)
-                .WithLastLoginDate(testLastLoginDate)
-                .WithLastPasswordChangeDate(testLastPasswordChangeDate)
-                .WithComments(testComments)
-                .WithSessionTimeout(5)
-                .WithStartContentIds(new[] { 3 })
-                .WithStartMediaIds(new[] { 8 })
-                .Build();
+        // Act
+        var user = builder
+            .WithId(testId)
+            .WithKey(testKey)
+            .WithName(testName)
+            .WithLogin(testUsername, testRawPasswordValue)
+            .WithEmail(testEmail)
+            .WithCreateDate(testCreateDate)
+            .WithUpdateDate(testUpdateDate)
+            .WithFailedPasswordAttempts(testFailedPasswordAttempts)
+            .WithIsApproved(testIsApproved)
+            .WithIsLockedOut(testIsLockedOut, testLastLockoutDate)
+            .WithLastLoginDate(testLastLoginDate)
+            .WithLastPasswordChangeDate(testLastPasswordChangeDate)
+            .WithComments(testComments)
+            .WithSessionTimeout(5)
+            .WithStartContentIds(new[] { 3 })
+            .WithStartMediaIds(new[] { 8 })
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, user.Id);
-            Assert.AreEqual(testKey, user.Key);
-            Assert.AreEqual(testName, user.Name);
-            Assert.AreEqual(testCreateDate, user.CreateDate);
-            Assert.AreEqual(testUpdateDate, user.UpdateDate);
-            Assert.AreEqual(testFailedPasswordAttempts, user.FailedPasswordAttempts);
-            Assert.AreEqual(testIsApproved, user.IsApproved);
-            Assert.AreEqual(testIsLockedOut, user.IsLockedOut);
-            Assert.AreEqual(testLastLockoutDate, user.LastLockoutDate);
-            Assert.AreEqual(testLastLoginDate, user.LastLoginDate);
-            Assert.AreEqual(testLastPasswordChangeDate, user.LastPasswordChangeDate);
-            Assert.AreEqual(testComments, user.Comments);
-            Assert.AreEqual(testSessionTimeout, user.SessionTimeout);
-            Assert.AreEqual(testStartContentIds, user.StartContentIds);
-            Assert.AreEqual(testStartMediaIds, user.StartMediaIds);
-        }
+        // Assert
+        Assert.AreEqual(testId, user.Id);
+        Assert.AreEqual(testKey, user.Key);
+        Assert.AreEqual(testName, user.Name);
+        Assert.AreEqual(testCreateDate, user.CreateDate);
+        Assert.AreEqual(testUpdateDate, user.UpdateDate);
+        Assert.AreEqual(testFailedPasswordAttempts, user.FailedPasswordAttempts);
+        Assert.AreEqual(testIsApproved, user.IsApproved);
+        Assert.AreEqual(testIsLockedOut, user.IsLockedOut);
+        Assert.AreEqual(testLastLockoutDate, user.LastLockoutDate);
+        Assert.AreEqual(testLastLoginDate, user.LastLoginDate);
+        Assert.AreEqual(testLastPasswordChangeDate, user.LastPasswordChangeDate);
+        Assert.AreEqual(testComments, user.Comments);
+        Assert.AreEqual(testSessionTimeout, user.SessionTimeout);
+        Assert.AreEqual(testStartContentIds, user.StartContentIds);
+        Assert.AreEqual(testStartMediaIds, user.StartMediaIds);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs
index 71c5b5835a..8f6a95c3a6 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/UserGroupBuilderTests.cs
@@ -3,51 +3,49 @@
 
 using System.Linq;
 using NUnit.Framework;
-using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class UserGroupBuilderTests
 {
-    [TestFixture]
-    public class UserGroupBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const int testId = 10;
-            const string testAlias = "test";
-            const string testName = "Test";
-            const int testUserCount = 11;
-            const string testIcon = "icon";
-            const string testPermissions = "abc";
-            const int testStartContentId = 3;
-            const int testStartMediaId = 8;
+        // Arrange
+        const int testId = 10;
+        const string testAlias = "test";
+        const string testName = "Test";
+        const int testUserCount = 11;
+        const string testIcon = "icon";
+        const string testPermissions = "abc";
+        const int testStartContentId = 3;
+        const int testStartMediaId = 8;
 
-            var builder = new UserGroupBuilder();
+        var builder = new UserGroupBuilder();
 
-            // Act
-            IUserGroup userGroup = builder
-                .WithId(testId)
-                .WithAlias(testAlias)
-                .WithName(testName)
-                .WithUserCount(testUserCount)
-                .WithIcon(testIcon)
-                .WithPermissions(testPermissions)
-                .WithStartContentId(testStartContentId)
-                .WithStartMediaId(testStartMediaId)
-                .Build();
+        // Act
+        var userGroup = builder
+            .WithId(testId)
+            .WithAlias(testAlias)
+            .WithName(testName)
+            .WithUserCount(testUserCount)
+            .WithIcon(testIcon)
+            .WithPermissions(testPermissions)
+            .WithStartContentId(testStartContentId)
+            .WithStartMediaId(testStartMediaId)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(testId, userGroup.Id);
-            Assert.AreEqual(testAlias, userGroup.Alias);
-            Assert.AreEqual(testName, userGroup.Name);
-            Assert.AreEqual(testUserCount, userGroup.UserCount);
-            Assert.AreEqual(testIcon, userGroup.Icon);
-            Assert.AreEqual(testPermissions.Length, userGroup.Permissions.Count());
-            Assert.AreEqual(testStartContentId, userGroup.StartContentId);
-            Assert.AreEqual(testStartMediaId, userGroup.StartMediaId);
-        }
+        // Assert
+        Assert.AreEqual(testId, userGroup.Id);
+        Assert.AreEqual(testAlias, userGroup.Alias);
+        Assert.AreEqual(testName, userGroup.Name);
+        Assert.AreEqual(testUserCount, userGroup.UserCount);
+        Assert.AreEqual(testIcon, userGroup.Icon);
+        Assert.AreEqual(testPermissions.Length, userGroup.Permissions.Count());
+        Assert.AreEqual(testStartContentId, userGroup.StartContentId);
+        Assert.AreEqual(testStartMediaId, userGroup.StartMediaId);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs
index efe5f96c76..d126bd4097 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.Common/Builders/XmlDocumentBuilderTests.cs
@@ -1,31 +1,29 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Xml;
 using NUnit.Framework;
 using Umbraco.Cms.Tests.Common.Builders;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Tests.Common.Builders;
+
+[TestFixture]
+public class XmlDocumentBuilderTests
 {
-    [TestFixture]
-    public class XmlDocumentBuilderTests
+    [Test]
+    public void Is_Built_Correctly()
     {
-        [Test]
-        public void Is_Built_Correctly()
-        {
-            // Arrange
-            const string content =
-                @"<?xml version=""1.0"" encoding=""utf-8""?><root id=""-1""></root>";
+        // Arrange
+        const string content =
+            @"<?xml version=""1.0"" encoding=""utf-8""?><root id=""-1""></root>";
 
-            var builder = new XmlDocumentBuilder();
+        var builder = new XmlDocumentBuilder();
 
-            // Act
-            XmlDocument xml = builder
-                .WithContent(content)
-                .Build();
+        // Act
+        var xml = builder
+            .WithContent(content)
+            .Build();
 
-            // Assert
-            Assert.AreEqual(content, xml.OuterXml);
-        }
+        // Assert
+        Assert.AreEqual(content, xml.OuterXml);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs
index 7b638c29d1..1a72c871e1 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/AdminUsersHandlerTests.cs
@@ -10,8 +10,8 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
-using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Editors;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
@@ -19,187 +19,200 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Web.BackOffice.Authorization;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class AdminUsersHandlerTests
 {
-    public class AdminUsersHandlerTests
+    private const string SingleUserEditQueryStringName = "id";
+    private const string MultipleUserEditQueryStringName = "ids";
+
+    private const int Admin1UserId = 0;
+    private const int Admin2UserId = 1;
+    private const int NonAdmin1UserId = 2;
+    private const int NonAdmin2UserId = 3;
+    private const int NonAdmin3UserId = 4;
+
+    [Test]
+    public async Task Missing_QueryString_Value_Is_Authorized()
     {
-        private const string SingleUserEditQueryStringName = "id";
-        private const string MultipleUserEditQueryStringName = "ids";
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler("xxx");
 
-        private const int Admin1UserId = 0;
-        private const int Admin2UserId = 1;
-        private const int NonAdmin1UserId = 2;
-        private const int NonAdmin2UserId = 3;
-        private const int NonAdmin3UserId = 4;
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Missing_QueryString_Value_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            AdminUsersHandler sut = CreateHandler(queryStringName: "xxx");
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    [Test]
+    public async Task Non_Integer_QueryString_Value_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(queryStringValue: "xxx");
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Non_Integer_QueryString_Value_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            AdminUsersHandler sut = CreateHandler(queryStringValue: "xxx");
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    [Test]
+    public async Task Editing_Single_Admin_User_By_Admin_User_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(
+            queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture),
+            editingWithAdmin: true);
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Editing_Single_Admin_User_By_Admin_User_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            AdminUsersHandler sut = CreateHandler(queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture), editingWithAdmin: true);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    [Test]
+    public async Task Editing_Single_Admin_User_By_Non_Admin_User_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture));
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Editing_Single_Admin_User_By_Non_Admin_User_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            AdminUsersHandler sut = CreateHandler(queryStringValue: Admin2UserId.ToString(CultureInfo.InvariantCulture));
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    [Test]
+    public async Task Editing_Single_Non_Admin_User_By_Non_Admin_User_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(queryStringValue: NonAdmin2UserId.ToString(CultureInfo.InvariantCulture));
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Editing_Single_Non_Admin_User_By_Non_Admin_User_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            AdminUsersHandler sut = CreateHandler(queryStringValue: NonAdmin2UserId.ToString(CultureInfo.InvariantCulture));
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    [Test]
+    public async Task Editing_Multiple_Users_Including_Admins_By_Admin_User_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
+        var sut = CreateHandler(MultipleUserEditQueryStringName, $"{Admin2UserId},{NonAdmin2UserId}", true);
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Editing_Multiple_Users_Including_Admins_By_Admin_User_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(queryStringName: MultipleUserEditQueryStringName);
-            AdminUsersHandler sut = CreateHandler(queryStringName: MultipleUserEditQueryStringName, queryStringValue: $"{Admin2UserId},{NonAdmin2UserId}", editingWithAdmin: true);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    [Test]
+    public async Task Editing_Multiple_Users_Including_Admins_By_Non_Admin_User_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
+        var sut = CreateHandler(MultipleUserEditQueryStringName, $"{Admin2UserId},{NonAdmin2UserId}");
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Editing_Multiple_Users_Including_Admins_By_Non_Admin_User_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(queryStringName: MultipleUserEditQueryStringName);
-            AdminUsersHandler sut = CreateHandler(queryStringName: MultipleUserEditQueryStringName, queryStringValue: $"{Admin2UserId},{NonAdmin2UserId}");
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    [Test]
+    public async Task Editing_Multiple_Users_Not_Including_Admins_By_Non_Admin_User_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(MultipleUserEditQueryStringName);
+        var sut = CreateHandler(MultipleUserEditQueryStringName, $"{NonAdmin2UserId},{NonAdmin3UserId}");
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Editing_Multiple_Users_Not_Including_Admins_By_Non_Admin_User_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(queryStringName: MultipleUserEditQueryStringName);
-            AdminUsersHandler sut = CreateHandler(queryStringName: MultipleUserEditQueryStringName, queryStringValue: $"{NonAdmin2UserId},{NonAdmin3UserId}");
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            await sut.HandleAsync(authHandlerContext);
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(
+        string queryStringName = SingleUserEditQueryStringName)
+    {
+        var requirement = new AdminUsersRequirement(queryStringName);
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+    private AdminUsersHandler CreateHandler(
+        string queryStringName = SingleUserEditQueryStringName,
+        string queryStringValue = "",
+        bool editingWithAdmin = false)
+    {
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringName, queryStringValue);
+        CreateMockUserServiceAndSecurityAccessor(editingWithAdmin, out var mockUserService, out var mockBackOfficeSecurityAccessor);
+        var userEditorAuthorizationHelper = CreateUserEditorAuthorizationHelper();
+        return new AdminUsersHandler(
+            mockHttpContextAccessor.Object,
+            mockUserService.Object,
+            mockBackOfficeSecurityAccessor.Object,
+            userEditorAuthorizationHelper);
+    }
 
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(string queryStringName = SingleUserEditQueryStringName)
-        {
-            var requirement = new AdminUsersRequirement(queryStringName);
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
+    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringName, string queryStringValue)
+    {
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var mockHttpContext = new Mock<HttpContext>();
+        var mockHttpRequest = new Mock<HttpRequest>();
+        var queryParams = new Dictionary<string, StringValues> { { queryStringName, queryStringValue } };
+        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
+        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
+        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
+        return mockHttpContextAccessor;
+    }
 
-        private AdminUsersHandler CreateHandler(string queryStringName = SingleUserEditQueryStringName, string queryStringValue = "", bool editingWithAdmin = false)
-        {
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringName, queryStringValue);
-            CreateMockUserServiceAndSecurityAccessor(editingWithAdmin, out Mock<IUserService> mockUserService, out Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor);
-            UserEditorAuthorizationHelper userEditorAuthorizationHelper = CreateUserEditorAuthorizationHelper();
-            return new AdminUsersHandler(mockHttpContextAccessor.Object, mockUserService.Object, mockBackOfficeSecurityAccessor.Object, userEditorAuthorizationHelper);
-        }
+    private static void CreateMockUserServiceAndSecurityAccessor(
+        bool editingWithAdmin,
+        out Mock<IUserService> mockUserService,
+        out Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor)
+    {
+        mockUserService = new Mock<IUserService>();
+        var adminUser1 = CreateUser(Admin1UserId, mockUserService, true);
+        var adminUser2 = CreateUser(Admin2UserId, mockUserService, true);
+        var nonAdminUser1 = CreateUser(NonAdmin1UserId, mockUserService);
+        var nonAdminUser2 = CreateUser(NonAdmin2UserId, mockUserService);
+        var nonAdminUser3 = CreateUser(NonAdmin3UserId, mockUserService);
 
-        private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringName, string queryStringValue)
-        {
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var mockHttpContext = new Mock<HttpContext>();
-            var mockHttpRequest = new Mock<HttpRequest>();
-            var queryParams = new Dictionary<string, StringValues>
-            {
-                { queryStringName, queryStringValue },
-            };
-            mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-            mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-            mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-            return mockHttpContextAccessor;
-        }
+        // Single user requests have been setup in the create user operations, but
+        // we also need to mock the responses when multiple users are being editing.
+        mockUserService
+            .Setup(x => x.GetUsersById(It.Is<int[]>(y =>
+                y.Length == 2 && y[0] == Admin2UserId && y[1] == NonAdmin2UserId)))
+            .Returns(new List<IUser> { adminUser2, nonAdminUser2 });
+        mockUserService
+            .Setup(x => x.GetUsersById(It.Is<int[]>(y =>
+                y.Length == 2 && y[0] == NonAdmin2UserId && y[1] == NonAdmin3UserId)))
+            .Returns(new List<IUser> { nonAdminUser2, nonAdminUser3 });
 
-        private static void CreateMockUserServiceAndSecurityAccessor(bool editingWithAdmin, out Mock<IUserService> mockUserService, out Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor)
-        {
-            mockUserService = new Mock<IUserService>();
-            var globalSettings = new GlobalSettings();
-            User adminUser1 = CreateUser(Admin1UserId, mockUserService, true);
-            User adminUser2 = CreateUser(Admin2UserId, mockUserService, true);
-            User nonAdminUser1 = CreateUser(NonAdmin1UserId, mockUserService);
-            User nonAdminUser2 = CreateUser(NonAdmin2UserId, mockUserService);
-            User nonAdminUser3 = CreateUser(NonAdmin3UserId, mockUserService);
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(editingWithAdmin ? adminUser1 : nonAdminUser1);
+        mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+    }
 
-            // Single user requests have been setup in the create user operations, but
-            // we also need to mock the responses when multiple users are being editing.
-            mockUserService
-                .Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 2 && y[0] == Admin2UserId && y[1] == NonAdmin2UserId)))
-                .Returns(new List<IUser> { adminUser2, nonAdminUser2 });
-            mockUserService
-                .Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 2 && y[0] == NonAdmin2UserId && y[1] == NonAdmin3UserId)))
-                .Returns(new List<IUser> { nonAdminUser2, nonAdminUser3 });
+    private static User CreateUser(int id, Mock<IUserService> mockUserService, bool isAdmin = false)
+    {
+        var user = new UserBuilder()
+            .WithId(id)
+            .AddUserGroup()
+            .WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Constants.Security.EditorGroupAlias)
+            .Done()
+            .Build();
 
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(editingWithAdmin ? adminUser1 : nonAdminUser1);
-            mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-        }
+        mockUserService
+            .Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 1 && y[0] == id)))
+            .Returns(new List<IUser> { user });
 
-        private static User CreateUser(int id, Mock<IUserService> mockUserService, bool isAdmin = false)
-        {
-            User user = new UserBuilder()
-                .WithId(id)
-                .AddUserGroup()
-                    .WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Constants.Security.EditorGroupAlias)
-                    .Done()
-                .Build();
+        return user;
+    }
 
-            mockUserService
-                .Setup(x => x.GetUsersById(It.Is<int[]>(y => y.Length == 1 && y[0] == id)))
-                .Returns(new List<IUser> { user });
-
-            return user;
-        }
-
-        private static UserEditorAuthorizationHelper CreateUserEditorAuthorizationHelper()
-        {
-            var mockContentService = new Mock<IContentService>();
-            var mockMediaService = new Mock<IMediaService>();
-            var mockEntityService = new Mock<IEntityService>();
-            return new UserEditorAuthorizationHelper(mockContentService.Object, mockMediaService.Object, mockEntityService.Object, AppCaches.Disabled);
-        }
+    private static UserEditorAuthorizationHelper CreateUserEditorAuthorizationHelper()
+    {
+        var mockContentService = new Mock<IContentService>();
+        var mockMediaService = new Mock<IMediaService>();
+        var mockEntityService = new Mock<IEntityService>();
+        return new UserEditorAuthorizationHelper(
+            mockContentService.Object,
+            mockMediaService.Object,
+            mockEntityService.Object,
+            AppCaches.Disabled);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
index 1bdcb58c73..6d0fb48382 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
@@ -14,114 +14,117 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Web.BackOffice.Authorization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class BackOfficeHandlerTests
 {
-    public class BackOfficeHandlerTests
+    [Test]
+    public async Task Runtime_State_Install_Is_Authorized()
     {
-        [Test]
-        public async Task Runtime_State_Install_Is_Authorized()
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(RuntimeLevel.Install);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task Runtime_State_Upgrade_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(RuntimeLevel.Upgrade);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task Unauthenticated_User_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler();
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task Authenticated_User_Is_Not_Authorized_When_Not_Approved_And_Approval_Required()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(true);
+        var sut = CreateHandler(currentUserIsAuthenticated: true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task Authenticated_User_Is_Authorized_When_Not_Approved_And_Approval_Not_Required()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(currentUserIsAuthenticated: true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task Authenticated_User_Is_Authorized_When_Approved_And_Approval_Required()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(true);
+        var sut = CreateHandler(currentUserIsAuthenticated: true, currentUserIsApproved: true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(bool requireApproval = false)
+    {
+        var requirement = new BackOfficeRequirement(requireApproval);
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
+
+    private BackOfficeHandler CreateHandler(
+        RuntimeLevel runtimeLevel = RuntimeLevel.Run,
+        bool currentUserIsAuthenticated = false,
+        bool currentUserIsApproved = false)
+    {
+        var mockBackOfficeSecurityAccessor =
+            CreateMockBackOfficeSecurityAccessor(currentUserIsAuthenticated, currentUserIsApproved);
+        var mockRuntimeState = CreateMockRuntimeState(runtimeLevel);
+        return new BackOfficeHandler(mockBackOfficeSecurityAccessor.Object, mockRuntimeState.Object);
+    }
+
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(
+        bool currentUserIsAuthenticated, bool currentUserIsApproved)
+    {
+        var user = new UserBuilder()
+            .WithIsApproved(currentUserIsApproved)
+            .Build();
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.Setup(x => x.IsAuthenticated()).Returns(currentUserIsAuthenticated);
+        if (currentUserIsAuthenticated)
         {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            BackOfficeHandler sut = CreateHandler(runtimeLevel: RuntimeLevel.Install);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
+            mockBackOfficeSecurity.Setup(x => x.CurrentUser).Returns(user);
         }
 
-        [Test]
-        public async Task Runtime_State_Upgrade_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            BackOfficeHandler sut = CreateHandler(runtimeLevel: RuntimeLevel.Upgrade);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
 
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Unauthenticated_User_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            BackOfficeHandler sut = CreateHandler();
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Authenticated_User_Is_Not_Authorized_When_Not_Approved_And_Approval_Required()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(requireApproval: true);
-            BackOfficeHandler sut = CreateHandler(currentUserIsAuthenticated: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Authenticated_User_Is_Authorized_When_Not_Approved_And_Approval_Not_Required()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            BackOfficeHandler sut = CreateHandler(currentUserIsAuthenticated: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Authenticated_User_Is_Authorized_When_Approved_And_Approval_Required()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(requireApproval: true);
-            BackOfficeHandler sut = CreateHandler(currentUserIsAuthenticated: true, currentUserIsApproved: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(bool requireApproval = false)
-        {
-            var requirement = new BackOfficeRequirement(requireApproval);
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
-
-        private BackOfficeHandler CreateHandler(RuntimeLevel runtimeLevel = RuntimeLevel.Run, bool currentUserIsAuthenticated = false, bool currentUserIsApproved = false)
-        {
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(currentUserIsAuthenticated, currentUserIsApproved);
-            Mock<IRuntimeState> mockRuntimeState = CreateMockRuntimeState(runtimeLevel);
-            return new BackOfficeHandler(mockBackOfficeSecurityAccessor.Object, mockRuntimeState.Object);
-        }
-
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(bool currentUserIsAuthenticated, bool currentUserIsApproved)
-        {
-            global::Umbraco.Cms.Core.Models.Membership.User user = new UserBuilder()
-                .WithIsApproved(currentUserIsApproved)
-                .Build();
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.Setup(x => x.IsAuthenticated()).Returns(currentUserIsAuthenticated);
-            if (currentUserIsAuthenticated)
-            {
-                mockBackOfficeSecurity.Setup(x => x.CurrentUser).Returns(user);
-            }
-
-            mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
-
-        private static Mock<IRuntimeState> CreateMockRuntimeState(RuntimeLevel runtimeLevel)
-        {
-            var mockRuntimeState = new Mock<IRuntimeState>();
-            mockRuntimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
-            return mockRuntimeState;
-        }
+    private static Mock<IRuntimeState> CreateMockRuntimeState(RuntimeLevel runtimeLevel)
+    {
+        var mockRuntimeState = new Mock<IRuntimeState>();
+        mockRuntimeState.SetupGet(x => x.Level).Returns(runtimeLevel);
+        return mockRuntimeState;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs
index c035812441..148601bad9 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsPublishBranchHandlerTests.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Entities;
@@ -17,139 +18,161 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Web.BackOffice.Authorization;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class ContentPermissionsPublishBranchHandlerTests
 {
-    public class ContentPermissionsPublishBranchHandlerTests
+    private const int NodeId = 1000;
+    private const int DescendentNodeId1 = 1001;
+    private const int DescendentNodeId2 = 1002;
+
+    [Test]
+    public async Task User_With_Access_To_All_Descendent_Nodes_Is_Authorized()
     {
-        private const int NodeId = 1000;
-        private const int DescendentNodeId1 = 1001;
-        private const int DescendentNodeId2 = 1002;
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockUserService = CreateMockUserService(
+            NodeId,
+            new Dictionary<int, string[]> { { DescendentNodeId1, new[] { "A" } }, { DescendentNodeId2, new[] { "A" } } });
+        var sut = CreateHandler(mockUserService.Object, NodeId);
 
-        [Test]
-        public async Task User_With_Access_To_All_Descendent_Nodes_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IUserService> mockUserService = CreateMockUserService(NodeId, new Dictionary<int, string[]>
-            {
-                { DescendentNodeId1, new string[] { "A" } },
-                { DescendentNodeId2, new string[] { "A" } }
-            });
-            ContentPermissionsPublishBranchHandler sut = CreateHandler(mockUserService.Object, NodeId);
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-            mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(2));
-        }
-
-        [Test]
-        public async Task User_Without_Access_To_One_Descendent_Node_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IUserService> mockUserService = CreateMockUserService(NodeId, new Dictionary<int, string[]>
-            {
-                { DescendentNodeId1, new string[] { "A" } },
-                { DescendentNodeId2, new string[] { "B" } }
-            });
-            ContentPermissionsPublishBranchHandler sut = CreateHandler(mockUserService.Object, NodeId);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(2));
-        }
-
-        [Test]
-        public async Task User_Without_Access_To_First_Descendent_Node_Is_Not_Authorized_And_Checks_Exit_Early()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IUserService> mockUserService = CreateMockUserService(NodeId, new Dictionary<int, string[]>
-            {
-                { DescendentNodeId1, new string[] { "B" } },
-                { DescendentNodeId2, new string[] { "A" } }
-            });
-            ContentPermissionsPublishBranchHandler sut = CreateHandler(mockUserService.Object, NodeId);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(1));
-        }
-
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-        {
-            var requirement = new ContentPermissionsPublishBranchRequirement('A');
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            IContent resource = CreateContent(NodeId);
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
-
-        private static Mock<IUserService> CreateMockUserService(int parentNodeId, Dictionary<int, string[]> descendendNodePermissionsForPath)
-        {
-            var mockUserService = new Mock<IUserService>();
-
-            mockUserService
-                .Setup(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.Is<string>(y => y == $"{Constants.System.RootString},{parentNodeId.ToString(CultureInfo.InvariantCulture)},{DescendentNodeId1}")))
-                .Returns(new EntityPermissionSet(parentNodeId, new EntityPermissionCollection(new List<EntityPermission> { new EntityPermission(1, parentNodeId, descendendNodePermissionsForPath[DescendentNodeId1]) })));
-            mockUserService
-                .Setup(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.Is<string>(y => y == $"{Constants.System.RootString},{parentNodeId.ToString(CultureInfo.InvariantCulture)},{DescendentNodeId1},{DescendentNodeId2}")))
-                .Returns(new EntityPermissionSet(parentNodeId, new EntityPermissionCollection(new List<EntityPermission> { new EntityPermission(1, parentNodeId, descendendNodePermissionsForPath[DescendentNodeId2]) })));
-
-            return mockUserService;
-        }
-
-        private ContentPermissionsPublishBranchHandler CreateHandler(IUserService userService, int nodeId)
-        {
-            Mock<IEntityService> mockEntityService = CreateMockEntityService();
-            ContentPermissions contentPermissions = CreateContentPermissions(mockEntityService.Object, userService, nodeId);
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
-            return new ContentPermissionsPublishBranchHandler(mockEntityService.Object, contentPermissions, mockBackOfficeSecurityAccessor.Object);
-        }
-
-        private static Mock<IEntityService> CreateMockEntityService()
-        {
-            long totalRecords;
-            var mockEntityService = new Mock<IEntityService>();
-            mockEntityService
-                .Setup(x => x.GetPagedDescendants(It.Is<int>(y => y == NodeId), It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document), It.IsAny<long>(), It.IsAny<int>(), out totalRecords, It.IsAny<IQuery<IUmbracoEntity>>(), It.IsAny<Ordering>()))
-                .Returns(new List<IEntitySlim>
-                {
-                    new EntitySlim { Id = DescendentNodeId1, Path = $"-1,{NodeId},{DescendentNodeId1}" },
-                    new EntitySlim { Id = DescendentNodeId2, Path = $"-1,{NodeId},{DescendentNodeId1},{DescendentNodeId2}" }
-                });
-            return mockEntityService;
-        }
-
-        private static ContentPermissions CreateContentPermissions(IEntityService entityService, IUserService userService, int nodeId)
-        {
-            var mockContentService = new Mock<IContentService>();
-            mockContentService
-                .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-                .Returns(CreateContent(nodeId));
-
-            return new ContentPermissions(userService, mockContentService.Object, entityService, AppCaches.Disabled);
-        }
-
-        private static IContent CreateContent(int nodeId)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            return ContentBuilder.CreateBasicContent(contentType, nodeId);
-        }
-
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
-        {
-            User user = CreateUser();
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
-
-        private static User CreateUser() =>
-            new UserBuilder()
-                .Build();
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+        mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(2));
     }
+
+    [Test]
+    public async Task User_Without_Access_To_One_Descendent_Node_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockUserService = CreateMockUserService(
+            NodeId,
+            new Dictionary<int, string[]> { { DescendentNodeId1, new[] { "A" } }, { DescendentNodeId2, new[] { "B" } } });
+        var sut = CreateHandler(mockUserService.Object, NodeId);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(2));
+    }
+
+    [Test]
+    public async Task User_Without_Access_To_First_Descendent_Node_Is_Not_Authorized_And_Checks_Exit_Early()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockUserService = CreateMockUserService(
+            NodeId,
+            new Dictionary<int, string[]> { { DescendentNodeId1, new[] { "B" } }, { DescendentNodeId2, new[] { "A" } } });
+        var sut = CreateHandler(mockUserService.Object, NodeId);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        mockUserService.Verify(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.IsAny<string>()), Times.Exactly(1));
+    }
+
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
+    {
+        var requirement = new ContentPermissionsPublishBranchRequirement('A');
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = CreateContent(NodeId);
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
+
+    private static Mock<IUserService> CreateMockUserService(
+        int parentNodeId,
+        Dictionary<int, string[]> descendendNodePermissionsForPath)
+    {
+        var mockUserService = new Mock<IUserService>();
+
+        mockUserService
+            .Setup(x => x.GetPermissionsForPath(
+                It.IsAny<IUser>(),
+                It.Is<string>(y =>
+                    y ==
+                    $"{Constants.System.RootString},{parentNodeId.ToString(CultureInfo.InvariantCulture)},{DescendentNodeId1}")))
+            .Returns(new EntityPermissionSet(
+                parentNodeId,
+                new EntityPermissionCollection(new List<EntityPermission>
+                {
+                    new(1, parentNodeId, descendendNodePermissionsForPath[DescendentNodeId1]),
+                })));
+        mockUserService
+            .Setup(x => x.GetPermissionsForPath(
+                It.IsAny<IUser>(),
+                It.Is<string>(y =>
+                    y ==
+                    $"{Constants.System.RootString},{parentNodeId.ToString(CultureInfo.InvariantCulture)},{DescendentNodeId1},{DescendentNodeId2}")))
+            .Returns(new EntityPermissionSet(
+                parentNodeId,
+                new EntityPermissionCollection(new List<EntityPermission>
+                {
+                    new(1, parentNodeId, descendendNodePermissionsForPath[DescendentNodeId2]),
+                })));
+
+        return mockUserService;
+    }
+
+    private ContentPermissionsPublishBranchHandler CreateHandler(IUserService userService, int nodeId)
+    {
+        var mockEntityService = CreateMockEntityService();
+        var contentPermissions = CreateContentPermissions(mockEntityService.Object, userService, nodeId);
+        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
+        return new ContentPermissionsPublishBranchHandler(mockEntityService.Object, contentPermissions, mockBackOfficeSecurityAccessor.Object);
+    }
+
+    private static Mock<IEntityService> CreateMockEntityService()
+    {
+        long totalRecords;
+        var mockEntityService = new Mock<IEntityService>();
+        mockEntityService
+            .Setup(x => x.GetPagedDescendants(
+                It.Is<int>(y => y == NodeId),
+                It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document),
+                It.IsAny<long>(),
+                It.IsAny<int>(),
+                out totalRecords,
+                It.IsAny<IQuery<IUmbracoEntity>>(),
+                It.IsAny<Ordering>()))
+            .Returns(new List<IEntitySlim>
+            {
+                new EntitySlim { Id = DescendentNodeId1, Path = $"-1,{NodeId},{DescendentNodeId1}" },
+                new EntitySlim
+                {
+                    Id = DescendentNodeId2, Path = $"-1,{NodeId},{DescendentNodeId1},{DescendentNodeId2}",
+                },
+            });
+        return mockEntityService;
+    }
+
+    private static ContentPermissions CreateContentPermissions(IEntityService entityService, IUserService userService, int nodeId)
+    {
+        var mockContentService = new Mock<IContentService>();
+        mockContentService
+            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
+            .Returns(CreateContent(nodeId));
+
+        return new ContentPermissions(userService, mockContentService.Object, entityService, AppCaches.Disabled);
+    }
+
+    private static IContent CreateContent(int nodeId)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        return ContentBuilder.CreateBasicContent(contentType, nodeId);
+    }
+
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
+    {
+        var user = CreateUser();
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
+
+    private static User CreateUser() =>
+        new UserBuilder()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs
index 15cf625341..32cfd66439 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsQueryStringHandlerTests.cs
@@ -19,228 +19,249 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Web.BackOffice.Authorization;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class ContentPermissionsQueryStringHandlerTests
 {
-    public class ContentPermissionsQueryStringHandlerTests
+    private const string QueryStringName = "id";
+    private const int NodeId = 1000;
+    private static readonly Guid s_nodeGuid = Guid.NewGuid();
+
+    private static readonly Udi s_nodeUdi =
+        UdiParser.Parse($"umb://document/{s_nodeGuid.ToString().ToLowerInvariant().Replace("-", string.Empty)}");
+
+    [Test]
+    public async Task Node_Id_From_Requirement_With_Permission_Is_Authorized()
     {
-        private const string QueryStringName = "id";
-        private const int NodeId = 1000;
-        private static readonly Guid s_nodeGuid = Guid.NewGuid();
-        private static readonly Udi s_nodeUdi = UdiParser.Parse($"umb://document/{s_nodeGuid.ToString().ToLowerInvariant().Replace("-", string.Empty)}");
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor();
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
 
-        [Test]
-        public async Task Node_Id_From_Requirement_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor();
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "A" });
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Node_Id_From_Requirement_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor();
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "B" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            AssertContentCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Id_Missing_From_Requirement_And_QueryString_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringName: "xxx");
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "A" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Node_Integer_Id_From_QueryString_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "A" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-            AssertContentCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Integer_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "B" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            AssertContentCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Udi_Id_From_QueryString_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "A" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-            AssertContentCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Udi_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "B" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            AssertContentCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Guid_Id_From_QueryString_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "A" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-            AssertContentCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Guid_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "B" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            AssertContentCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Invalid_Id_From_QueryString_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: "invalid");
-            ContentPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new string[] { "A" });
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(int? nodeId = null)
-        {
-            const char Permission = 'A';
-            ContentPermissionsQueryStringRequirement requirement = nodeId.HasValue
-                ? new ContentPermissionsQueryStringRequirement(nodeId.Value, Permission)
-                : new ContentPermissionsQueryStringRequirement(Permission, QueryStringName);
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
-
-        private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringName = QueryStringName, string queryStringValue = "")
-        {
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var mockHttpContext = new Mock<HttpContext>();
-            var mockHttpRequest = new Mock<HttpRequest>();
-            var queryParams = new Dictionary<string, StringValues>
-            {
-                { queryStringName, queryStringValue },
-            };
-            mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-            mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-            mockHttpContext.SetupGet(x => x.Items).Returns(new Dictionary<object, object>());
-            mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-            return mockHttpContextAccessor;
-        }
-
-        private ContentPermissionsQueryStringHandler CreateHandler(IHttpContextAccessor httpContextAccessor, int nodeId, string[] permissionsForPath)
-        {
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
-            Mock<IEntityService> mockEntityService = CreateMockEntityService();
-            ContentPermissions contentPermissions = CreateContentPermissions(mockEntityService.Object, nodeId, permissionsForPath);
-            return new ContentPermissionsQueryStringHandler(mockBackOfficeSecurityAccessor.Object, httpContextAccessor, mockEntityService.Object, contentPermissions);
-        }
-
-        private static Mock<IEntityService> CreateMockEntityService()
-        {
-            var mockEntityService = new Mock<IEntityService>();
-            mockEntityService
-                .Setup(x => x.GetId(It.Is<Udi>(y => y == s_nodeUdi)))
-                .Returns(Attempt<int>.Succeed(NodeId));
-            mockEntityService
-                .Setup(x => x.GetId(It.Is<Guid>(y => y == s_nodeGuid), It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document)))
-                .Returns(Attempt<int>.Succeed(NodeId));
-            return mockEntityService;
-        }
-
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
-        {
-            User user = CreateUser();
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
-
-        private static User CreateUser() =>
-            new UserBuilder()
-                .Build();
-
-        private static ContentPermissions CreateContentPermissions(IEntityService entityService, int nodeId, string[] permissionsForPath)
-        {
-            var mockUserService = new Mock<IUserService>();
-
-            mockUserService
-                .Setup(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.Is<string>(y => y == $"{Constants.System.RootString},{nodeId.ToInvariantString()}")))
-                .Returns(new EntityPermissionSet(nodeId, new EntityPermissionCollection(new List<EntityPermission> { new EntityPermission(1, nodeId, permissionsForPath) })));
-
-            var mockContentService = new Mock<IContentService>();
-            mockContentService
-                .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-                .Returns(CreateContent(nodeId));
-
-            return new ContentPermissions(mockUserService.Object, mockContentService.Object, entityService, AppCaches.Disabled);
-        }
-
-        private static IContent CreateContent(int nodeId)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            return ContentBuilder.CreateBasicContent(contentType, nodeId);
-        }
-
-        private static void AssertContentCached(Mock<IHttpContextAccessor> mockHttpContextAccessor) =>
-            Assert.AreEqual(NodeId, ((IContent)mockHttpContextAccessor.Object.HttpContext.Items[typeof(IContent).ToString()]).Id);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
     }
+
+    [Test]
+    public async Task Node_Id_From_Requirement_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor();
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        AssertContentCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Id_Missing_From_Requirement_And_QueryString_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor("xxx");
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task Node_Integer_Id_From_QueryString_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+        AssertContentCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Integer_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        AssertContentCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Udi_Id_From_QueryString_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+        AssertContentCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Udi_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        AssertContentCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Guid_Id_From_QueryString_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+        AssertContentCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Guid_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "B" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        AssertContentCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Invalid_Id_From_QueryString_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: "invalid");
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, new[] { "A" });
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(int? nodeId = null)
+    {
+        const char Permission = 'A';
+        var requirement = nodeId.HasValue
+            ? new ContentPermissionsQueryStringRequirement(nodeId.Value, Permission)
+            : new ContentPermissionsQueryStringRequirement(Permission);
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
+
+    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(
+        string queryStringName = QueryStringName,
+        string queryStringValue = "")
+    {
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var mockHttpContext = new Mock<HttpContext>();
+        var mockHttpRequest = new Mock<HttpRequest>();
+        var queryParams = new Dictionary<string, StringValues> { { queryStringName, queryStringValue } };
+        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
+        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
+        mockHttpContext.SetupGet(x => x.Items).Returns(new Dictionary<object, object>());
+        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
+        return mockHttpContextAccessor;
+    }
+
+    private ContentPermissionsQueryStringHandler CreateHandler(
+        IHttpContextAccessor httpContextAccessor,
+        int nodeId,
+        string[] permissionsForPath)
+    {
+        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
+        var mockEntityService = CreateMockEntityService();
+        var contentPermissions = CreateContentPermissions(mockEntityService.Object, nodeId, permissionsForPath);
+        return new ContentPermissionsQueryStringHandler(
+            mockBackOfficeSecurityAccessor.Object,
+            httpContextAccessor,
+            mockEntityService.Object,
+            contentPermissions);
+    }
+
+    private static Mock<IEntityService> CreateMockEntityService()
+    {
+        var mockEntityService = new Mock<IEntityService>();
+        mockEntityService
+            .Setup(x => x.GetId(It.Is<Udi>(y => y == s_nodeUdi)))
+            .Returns(Attempt<int>.Succeed(NodeId));
+        mockEntityService
+            .Setup(x => x.GetId(
+                It.Is<Guid>(y => y == s_nodeGuid),
+                It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document)))
+            .Returns(Attempt<int>.Succeed(NodeId));
+        return mockEntityService;
+    }
+
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
+    {
+        var user = CreateUser();
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
+
+    private static User CreateUser() =>
+        new UserBuilder()
+            .Build();
+
+    private static ContentPermissions CreateContentPermissions(
+        IEntityService entityService,
+        int nodeId,
+        string[] permissionsForPath)
+    {
+        var mockUserService = new Mock<IUserService>();
+
+        mockUserService
+            .Setup(x => x.GetPermissionsForPath(
+                It.IsAny<IUser>(),
+                It.Is<string>(y => y == $"{Constants.System.RootString},{nodeId.ToInvariantString()}")))
+            .Returns(new EntityPermissionSet(
+                nodeId,
+                new EntityPermissionCollection(new List<EntityPermission> { new(1, nodeId, permissionsForPath) })));
+
+        var mockContentService = new Mock<IContentService>();
+        mockContentService
+            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
+            .Returns(CreateContent(nodeId));
+
+        return new ContentPermissions(
+            mockUserService.Object,
+            mockContentService.Object,
+            entityService,
+            AppCaches.Disabled);
+    }
+
+    private static IContent CreateContent(int nodeId)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        return ContentBuilder.CreateBasicContent(contentType, nodeId);
+    }
+
+    private static void AssertContentCached(Mock<IHttpContextAccessor> mockHttpContextAccessor) =>
+        Assert.AreEqual(
+            NodeId,
+            ((IContent)mockHttpContextAccessor.Object.HttpContext.Items[typeof(IContent).ToString()]).Id);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs
index effc5d6f12..60ceb37ada 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/ContentPermissionsResourceHandlerTests.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Membership;
@@ -15,112 +16,120 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Web.BackOffice.Authorization;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class ContentPermissionsResourceHandlerTests
 {
-    public class ContentPermissionsResourceHandlerTests
+    private const int NodeId = 1000;
+
+    [Test]
+    public async Task Resource_With_Node_Id_With_Permission_Is_Authorized()
     {
-        private const int NodeId = 1000;
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
+        var sut = CreateHandler(NodeId, new[] { "A" });
 
-        [Test]
-        public async Task Resource_With_Node_Id_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId, createWithNodeId: true);
-            ContentPermissionsResourceHandler sut = CreateHandler(NodeId, new string[] { "A" });
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+    [Test]
+    public async Task Resource_With_Content_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
+        var sut = CreateHandler(NodeId, new[] { "A" });
 
-        [Test]
-        public async Task Resource_With_Content_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-            ContentPermissionsResourceHandler sut = CreateHandler(NodeId, new string[] { "A" });
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+    [Test]
+    public async Task Resource_With_Node_Id_Withou_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
+        var sut = CreateHandler(NodeId, new[] { "B" });
 
-        [Test]
-        public async Task Resource_With_Node_Id_Withou_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId, createWithNodeId: true);
-            ContentPermissionsResourceHandler sut = CreateHandler(NodeId, new string[] { "B" });
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
+    [Test]
+    public async Task Resource_With_Content_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
+        var sut = CreateHandler(NodeId, new[] { "B" });
 
-        [Test]
-        public async Task Resource_With_Content_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-            ContentPermissionsResourceHandler sut = CreateHandler(NodeId, new string[] { "B" });
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(
+        int nodeId,
+        bool createWithNodeId = false)
+    {
+        var requirement = new ContentPermissionsResourceRequirement();
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var content = CreateContent(nodeId);
+        var permissions = new List<char> { 'A' }.AsReadOnly();
+        var resource = createWithNodeId
+            ? new ContentPermissionsResource(content, nodeId, permissions)
+            : new ContentPermissionsResource(content, permissions);
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
 
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(int nodeId, bool createWithNodeId = false)
-        {
-            var requirement = new ContentPermissionsResourceRequirement();
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            IContent content = CreateContent(nodeId);
-            System.Collections.ObjectModel.ReadOnlyCollection<char> permissions = new List<char> { 'A' }.AsReadOnly();
-            ContentPermissionsResource resource = createWithNodeId
-                ? new ContentPermissionsResource(content, nodeId, permissions)
-                : new ContentPermissionsResource(content, permissions);
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
+    private static IContent CreateContent(int nodeId)
+    {
+        var contentType = ContentTypeBuilder.CreateBasicContentType();
+        return ContentBuilder.CreateBasicContent(contentType, nodeId);
+    }
 
-        private static IContent CreateContent(int nodeId)
-        {
-            ContentType contentType = ContentTypeBuilder.CreateBasicContentType();
-            return ContentBuilder.CreateBasicContent(contentType, nodeId);
-        }
+    private ContentPermissionsResourceHandler CreateHandler(int nodeId, string[] permissionsForPath)
+    {
+        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
+        var contentPermissions = CreateContentPermissions(nodeId, permissionsForPath);
+        return new ContentPermissionsResourceHandler(mockBackOfficeSecurityAccessor.Object, contentPermissions);
+    }
 
-        private ContentPermissionsResourceHandler CreateHandler(int nodeId, string[] permissionsForPath)
-        {
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor();
-            ContentPermissions contentPermissions = CreateContentPermissions(nodeId, permissionsForPath);
-            return new ContentPermissionsResourceHandler(mockBackOfficeSecurityAccessor.Object, contentPermissions);
-        }
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
+    {
+        var user = CreateUser();
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
 
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor()
-        {
-            User user = CreateUser();
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
+    private static User CreateUser() =>
+        new UserBuilder()
+            .Build();
 
-        private static User CreateUser() =>
-            new UserBuilder()
-                .Build();
+    private static ContentPermissions CreateContentPermissions(int nodeId, string[] permissionsForPath)
+    {
+        var mockUserService = new Mock<IUserService>();
 
-        private static ContentPermissions CreateContentPermissions(int nodeId, string[] permissionsForPath)
-        {
-            var mockUserService = new Mock<IUserService>();
+        mockUserService
+            .Setup(x => x.GetPermissionsForPath(
+                It.IsAny<IUser>(),
+                It.Is<string>(y => y == $"{Constants.System.RootString},{nodeId.ToInvariantString()}")))
+            .Returns(new EntityPermissionSet(
+                nodeId,
+                new EntityPermissionCollection(new List<EntityPermission> { new(1, nodeId, permissionsForPath) })));
 
-            mockUserService
-                .Setup(x => x.GetPermissionsForPath(It.IsAny<IUser>(), It.Is<string>(y => y == $"{Constants.System.RootString},{nodeId.ToInvariantString()}")))
-                .Returns(new EntityPermissionSet(nodeId, new EntityPermissionCollection(new List<EntityPermission> { new EntityPermission(1, nodeId, permissionsForPath) })));
+        var mockContentService = new Mock<IContentService>();
+        mockContentService
+            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
+            .Returns(CreateContent(nodeId));
 
-            var mockContentService = new Mock<IContentService>();
-            mockContentService
-                .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-                .Returns(CreateContent(nodeId));
-
-            var mockEntityService = new Mock<IEntityService>();
-            return new ContentPermissions(mockUserService.Object, mockContentService.Object, mockEntityService.Object, AppCaches.Disabled);
-        }
+        var mockEntityService = new Mock<IEntityService>();
+        return new ContentPermissions(
+            mockUserService.Object,
+            mockContentService.Object,
+            mockEntityService.Object,
+            AppCaches.Disabled);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
index 56f51450b0..fd664d2b5d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
@@ -10,52 +10,52 @@ using NUnit.Framework;
 using Umbraco.Cms.Web.BackOffice.Authorization;
 using Umbraco.Cms.Web.BackOffice.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class DenyLocalLoginHandlerTests
 {
-    public class DenyLocalLoginHandlerTests
+    [Test]
+    public async Task With_Deny_Local_Login_Is_Not_Authorized()
     {
-        [Test]
-        public async Task With_Deny_Local_Login_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            DenyLocalLoginHandler sut = CreateHandler(denyLocalLogin: true);
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(true);
 
-            await sut.HandleAsync(authHandlerContext);
+        await sut.HandleAsync(authHandlerContext);
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
 
-        [Test]
-        public async Task Without_Deny_Local_Login_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            DenyLocalLoginHandler sut = CreateHandler();
+    [Test]
+    public async Task Without_Deny_Local_Login_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler();
 
-            await sut.HandleAsync(authHandlerContext);
+        await sut.HandleAsync(authHandlerContext);
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-        {
-            var requirement = new DenyLocalLoginRequirement();
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
+    {
+        var requirement = new DenyLocalLoginRequirement();
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
 
-        private DenyLocalLoginHandler CreateHandler(bool denyLocalLogin = false)
-        {
-            Mock<IBackOfficeExternalLoginProviders> mockBackOfficeExternalLoginProviders = CreateMockBackOfficeExternalLoginProviders(denyLocalLogin);
+    private DenyLocalLoginHandler CreateHandler(bool denyLocalLogin = false)
+    {
+        var mockBackOfficeExternalLoginProviders = CreateMockBackOfficeExternalLoginProviders(denyLocalLogin);
 
-            return new DenyLocalLoginHandler(mockBackOfficeExternalLoginProviders.Object);
-        }
+        return new DenyLocalLoginHandler(mockBackOfficeExternalLoginProviders.Object);
+    }
 
-        private static Mock<IBackOfficeExternalLoginProviders> CreateMockBackOfficeExternalLoginProviders(bool denyLocalLogin)
-        {
-            var mockBackOfficeExternalLoginProviders = new Mock<IBackOfficeExternalLoginProviders>();
-            mockBackOfficeExternalLoginProviders.Setup(x => x.HasDenyLocalLogin()).Returns(denyLocalLogin);
-            return mockBackOfficeExternalLoginProviders;
-        }
+    private static Mock<IBackOfficeExternalLoginProviders> CreateMockBackOfficeExternalLoginProviders(
+        bool denyLocalLogin)
+    {
+        var mockBackOfficeExternalLoginProviders = new Mock<IBackOfficeExternalLoginProviders>();
+        mockBackOfficeExternalLoginProviders.Setup(x => x.HasDenyLocalLogin()).Returns(denyLocalLogin);
+        return mockBackOfficeExternalLoginProviders;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs
index c4215ea722..b01ce38dfb 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsQueryStringHandlerTests.cs
@@ -19,193 +19,204 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Web.BackOffice.Authorization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class MediaPermissionsQueryStringHandlerTests
 {
-    public class MediaPermissionsQueryStringHandlerTests
+    private const string QueryStringName = "id";
+    private const int NodeId = 1000;
+    private static readonly Guid s_nodeGuid = Guid.NewGuid();
+
+    private static readonly Udi s_nodeUdi =
+        UdiParser.Parse($"umb://document/{s_nodeGuid.ToString().ToLowerInvariant().Replace("-", string.Empty)}");
+
+    [Test]
+    public async Task Node_Id_Missing_From_QueryString_Is_Authorized()
     {
-        private const string QueryStringName = "id";
-        private const int NodeId = 1000;
-        private static readonly Guid s_nodeGuid = Guid.NewGuid();
-        private static readonly Udi s_nodeUdi = UdiParser.Parse($"umb://document/{s_nodeGuid.ToString().ToLowerInvariant().Replace("-", string.Empty)}");
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor("xxx");
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
 
-        [Test]
-        public async Task Node_Id_Missing_From_QueryString_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringName: "xxx");
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Node_Integer_Id_From_QueryString_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-            AssertMediaCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Integer_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, startMediaId: 1001);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            AssertMediaCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Udi_Id_From_QueryString_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-            AssertMediaCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Udi_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, startMediaId: 1001);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            AssertMediaCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Guid_Id_From_QueryString_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-            AssertMediaCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Guid_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, startMediaId: 1001);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-            AssertMediaCached(mockHttpContextAccessor);
-        }
-
-        [Test]
-        public async Task Node_Invalid_Id_From_QueryString_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: "invalid");
-            MediaPermissionsQueryStringHandler sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-        {
-            var requirement = new MediaPermissionsQueryStringRequirement(QueryStringName);
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
-
-        private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringName = QueryStringName, string queryStringValue = "")
-        {
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var mockHttpContext = new Mock<HttpContext>();
-            var mockHttpRequest = new Mock<HttpRequest>();
-            var queryParams = new Dictionary<string, StringValues>
-            {
-                { queryStringName, queryStringValue },
-            };
-            mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-            mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-            mockHttpContext.SetupGet(x => x.Items).Returns(new Dictionary<object, object>());
-            mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-            return mockHttpContextAccessor;
-        }
-
-        private MediaPermissionsQueryStringHandler CreateHandler(IHttpContextAccessor httpContextAccessor, int nodeId, int startMediaId = -1)
-        {
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(startMediaId);
-            Mock<IEntityService> mockEntityService = CreateMockEntityService();
-            MediaPermissions mediaPermissions = CreateMediaPermissions(mockEntityService.Object, nodeId);
-            return new MediaPermissionsQueryStringHandler(mockBackOfficeSecurityAccessor.Object, httpContextAccessor, mockEntityService.Object, mediaPermissions);
-        }
-
-        private static Mock<IEntityService> CreateMockEntityService()
-        {
-            var mockEntityService = new Mock<IEntityService>();
-            mockEntityService
-                .Setup(x => x.GetId(It.Is<Udi>(y => y == s_nodeUdi)))
-                .Returns(Attempt<int>.Succeed(NodeId));
-            mockEntityService
-                .Setup(x => x.GetId(It.Is<Guid>(y => y == s_nodeGuid), It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document)))
-                .Returns(Attempt<int>.Succeed(NodeId));
-            return mockEntityService;
-        }
-
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(int startMediaId)
-        {
-            User user = CreateUser(startMediaId);
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
-
-        private static User CreateUser(int startMediaId) =>
-            new UserBuilder()
-                .WithStartMediaId(startMediaId)
-                .Build();
-
-        private static MediaPermissions CreateMediaPermissions(IEntityService entityService, int nodeId)
-        {
-            var mockMediaService = new Mock<IMediaService>();
-            mockMediaService
-                .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-                .Returns(CreateMedia(nodeId));
-
-            return new MediaPermissions(mockMediaService.Object, entityService, AppCaches.Disabled);
-        }
-
-        private static IMedia CreateMedia(int nodeId)
-        {
-            MediaType mediaType = MediaTypeBuilder.CreateSimpleMediaType("image", "Image");
-            return MediaBuilder.CreateSimpleMedia(mediaType, "Test image", -1, nodeId);
-        }
-
-        private static void AssertMediaCached(Mock<IHttpContextAccessor> mockHttpContextAccessor) =>
-            Assert.AreEqual(NodeId, ((IMedia)mockHttpContextAccessor.Object.HttpContext.Items[typeof(IMedia).ToString()]).Id);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
     }
+
+    [Test]
+    public async Task Node_Integer_Id_From_QueryString_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+        AssertMediaCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Integer_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: NodeId.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, 1001);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        AssertMediaCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Udi_Id_From_QueryString_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+        AssertMediaCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Udi_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeUdi.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, 1001);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        AssertMediaCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Guid_Id_From_QueryString_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+        AssertMediaCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Guid_Id_From_QueryString_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: s_nodeGuid.ToString());
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId, 1001);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+        AssertMediaCached(mockHttpContextAccessor);
+    }
+
+    [Test]
+    public async Task Node_Invalid_Id_From_QueryString_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue: "invalid");
+        var sut = CreateHandler(mockHttpContextAccessor.Object, NodeId);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
+    {
+        var requirement = new MediaPermissionsQueryStringRequirement(QueryStringName);
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
+
+    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(
+        string queryStringName = QueryStringName,
+        string queryStringValue = "")
+    {
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var mockHttpContext = new Mock<HttpContext>();
+        var mockHttpRequest = new Mock<HttpRequest>();
+        var queryParams = new Dictionary<string, StringValues> { { queryStringName, queryStringValue } };
+        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
+        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
+        mockHttpContext.SetupGet(x => x.Items).Returns(new Dictionary<object, object>());
+        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
+        return mockHttpContextAccessor;
+    }
+
+    private MediaPermissionsQueryStringHandler CreateHandler(
+        IHttpContextAccessor httpContextAccessor,
+        int nodeId,
+        int startMediaId = -1)
+    {
+        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(startMediaId);
+        var mockEntityService = CreateMockEntityService();
+        var mediaPermissions = CreateMediaPermissions(mockEntityService.Object, nodeId);
+        return new MediaPermissionsQueryStringHandler(
+            mockBackOfficeSecurityAccessor.Object,
+            httpContextAccessor,
+            mockEntityService.Object,
+            mediaPermissions);
+    }
+
+    private static Mock<IEntityService> CreateMockEntityService()
+    {
+        var mockEntityService = new Mock<IEntityService>();
+        mockEntityService
+            .Setup(x => x.GetId(It.Is<Udi>(y => y == s_nodeUdi)))
+            .Returns(Attempt<int>.Succeed(NodeId));
+        mockEntityService
+            .Setup(x => x.GetId(
+                It.Is<Guid>(y => y == s_nodeGuid),
+                It.Is<UmbracoObjectTypes>(y => y == UmbracoObjectTypes.Document)))
+            .Returns(Attempt<int>.Succeed(NodeId));
+        return mockEntityService;
+    }
+
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(int startMediaId)
+    {
+        var user = CreateUser(startMediaId);
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
+
+    private static User CreateUser(int startMediaId) =>
+        new UserBuilder()
+            .WithStartMediaId(startMediaId)
+            .Build();
+
+    private static MediaPermissions CreateMediaPermissions(IEntityService entityService, int nodeId)
+    {
+        var mockMediaService = new Mock<IMediaService>();
+        mockMediaService
+            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
+            .Returns(CreateMedia(nodeId));
+
+        return new MediaPermissions(mockMediaService.Object, entityService, AppCaches.Disabled);
+    }
+
+    private static IMedia CreateMedia(int nodeId)
+    {
+        var mediaType = MediaTypeBuilder.CreateSimpleMediaType("image", "Image");
+        return MediaBuilder.CreateSimpleMedia(mediaType, "Test image", -1, nodeId);
+    }
+
+    private static void AssertMediaCached(Mock<IHttpContextAccessor> mockHttpContextAccessor) =>
+        Assert.AreEqual(
+            NodeId,
+            ((IMedia)mockHttpContextAccessor.Object.HttpContext.Items[typeof(IMedia).ToString()]).Id);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs
index 18d7e503df..fb31411660 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/MediaPermissionsResourceHandlerTests.cs
@@ -15,104 +15,105 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Web.BackOffice.Authorization;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class MediaPermissionsResourceHandlerTests
 {
-    public class MediaPermissionsResourceHandlerTests
+    private const int NodeId = 1000;
+
+    [Test]
+    public async Task Resource_With_Node_Id_With_Permission_Is_Authorized()
     {
-        private const int NodeId = 1000;
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
+        var sut = CreateHandler(NodeId);
 
-        [Test]
-        public async Task Resource_With_Node_Id_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId, createWithNodeId: true);
-            MediaPermissionsResourceHandler sut = CreateHandler(NodeId);
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+    [Test]
+    public async Task Resource_With_Media_With_Permission_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
+        var sut = CreateHandler(NodeId);
 
-        [Test]
-        public async Task Resource_With_Media_With_Permission_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-            MediaPermissionsResourceHandler sut = CreateHandler(NodeId);
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
+    [Test]
+    public async Task Resource_With_Node_Id_Withou_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId, true);
+        var sut = CreateHandler(NodeId, 1001);
 
-        [Test]
-        public async Task Resource_With_Node_Id_Withou_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId, createWithNodeId: true);
-            MediaPermissionsResourceHandler sut = CreateHandler(NodeId, startMediaId: 1001);
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
+    [Test]
+    public async Task Resource_With_Media_Without_Permission_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
+        var sut = CreateHandler(NodeId, 1001);
 
-        [Test]
-        public async Task Resource_With_Media_Without_Permission_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext(NodeId);
-            MediaPermissionsResourceHandler sut = CreateHandler(NodeId, startMediaId: 1001);
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(
+        int nodeId,
+        bool createWithNodeId = false)
+    {
+        var requirement = new MediaPermissionsResourceRequirement();
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var media = CreateMedia(nodeId);
+        var resource = createWithNodeId
+            ? new MediaPermissionsResource(nodeId)
+            : new MediaPermissionsResource(media);
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
 
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext(int nodeId, bool createWithNodeId = false)
-        {
-            var requirement = new MediaPermissionsResourceRequirement();
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            IMedia media = CreateMedia(nodeId);
-            MediaPermissionsResource resource = createWithNodeId
-                ? new MediaPermissionsResource(nodeId)
-                : new MediaPermissionsResource(media);
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
+    private static IMedia CreateMedia(int nodeId)
+    {
+        var mediaType = MediaTypeBuilder.CreateSimpleMediaType("image", "Image");
+        return MediaBuilder.CreateSimpleMedia(mediaType, "Test image", -1, nodeId);
+    }
 
-        private static IMedia CreateMedia(int nodeId)
-        {
-            MediaType mediaType = MediaTypeBuilder.CreateSimpleMediaType("image", "Image");
-            return MediaBuilder.CreateSimpleMedia(mediaType, "Test image", -1, nodeId);
-        }
+    private MediaPermissionsResourceHandler CreateHandler(int nodeId, int startMediaId = -1)
+    {
+        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(startMediaId);
+        var contentPermissions = CreateMediaPermissions(nodeId);
+        return new MediaPermissionsResourceHandler(mockBackOfficeSecurityAccessor.Object, contentPermissions);
+    }
 
-        private MediaPermissionsResourceHandler CreateHandler(int nodeId, int startMediaId = -1)
-        {
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(startMediaId);
-            MediaPermissions contentPermissions = CreateMediaPermissions(nodeId);
-            return new MediaPermissionsResourceHandler(mockBackOfficeSecurityAccessor.Object, contentPermissions);
-        }
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(int startMediaId)
+    {
+        var user = CreateUser(startMediaId);
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
 
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(int startMediaId)
-        {
-            User user = CreateUser(startMediaId);
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
+    private static User CreateUser(int startMediaId) =>
+        new UserBuilder()
+            .WithStartMediaId(startMediaId)
+            .Build();
 
-        private static User CreateUser(int startMediaId) =>
-            new UserBuilder()
-                .WithStartMediaId(startMediaId)
-                .Build();
+    private static MediaPermissions CreateMediaPermissions(int nodeId)
+    {
+        var mockMediaService = new Mock<IMediaService>();
+        mockMediaService
+            .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
+            .Returns(CreateMedia(nodeId));
 
-        private static MediaPermissions CreateMediaPermissions(int nodeId)
-        {
-            var mockMediaService = new Mock<IMediaService>();
-            mockMediaService
-                .Setup(x => x.GetById(It.Is<int>(y => y == nodeId)))
-                .Returns(CreateMedia(nodeId));
-
-            var mockEntityService = new Mock<IEntityService>();
-            return new MediaPermissions(mockMediaService.Object, mockEntityService.Object, AppCaches.Disabled);
-        }
+        var mockEntityService = new Mock<IEntityService>();
+        return new MediaPermissions(mockMediaService.Object, mockEntityService.Object, AppCaches.Disabled);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs
index b34918523c..d4b1bcf7a9 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/SectionHandlerTests.cs
@@ -7,82 +7,88 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Web.BackOffice.Authorization;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class SectionHandlerTests
 {
-    public class SectionHandlerTests
+    [Test]
+    public async Task Unauthorized_User_Is_Not_Authorized()
     {
-        [Test]
-        public async Task Unauthorized_User_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            SectionHandler sut = CreateHandler();
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler();
 
-            await sut.HandleAsync(authHandlerContext);
+        await sut.HandleAsync(authHandlerContext);
 
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task User_With_Section_Access_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            SectionHandler sut = CreateHandler(userIsAuthorized: true, userCanAccessContentSection: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task User_Without_Section_Access_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            SectionHandler sut = CreateHandler(userIsAuthorized: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-        {
-            var requirement = new SectionRequirement(Constants.Applications.Content, Constants.Applications.Media);
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
-
-        private SectionHandler CreateHandler(bool userIsAuthorized = false, bool userCanAccessContentSection = false)
-        {
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(userIsAuthorized, userCanAccessContentSection);
-
-            return new SectionHandler(mockBackOfficeSecurityAccessor.Object);
-        }
-
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(bool userIsAuthorized, bool userCanAccessContentSection)
-        {
-            User user = CreateUser();
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(userIsAuthorized ? user : null);
-            mockBackOfficeSecurity
-                .Setup(x => x.UserHasSectionAccess(Constants.Applications.Content, It.Is<IUser>(y => y.Username == user.Username)))
-                .Returns(userCanAccessContentSection);
-            mockBackOfficeSecurity
-                .Setup(x => x.UserHasSectionAccess(Constants.Applications.Media, It.Is<IUser>(y => y.Username == user.Username)))
-                .Returns(false);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
-
-        private static User CreateUser() =>
-            new UserBuilder()
-                .Build();
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
     }
+
+    [Test]
+    public async Task User_With_Section_Access_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(true, true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task User_Without_Section_Access_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
+
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
+    {
+        var requirement = new SectionRequirement(Constants.Applications.Content, Constants.Applications.Media);
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
+
+    private SectionHandler CreateHandler(bool userIsAuthorized = false, bool userCanAccessContentSection = false)
+    {
+        var mockBackOfficeSecurityAccessor =
+            CreateMockBackOfficeSecurityAccessor(userIsAuthorized, userCanAccessContentSection);
+
+        return new SectionHandler(mockBackOfficeSecurityAccessor.Object);
+    }
+
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(
+        bool userIsAuthorized,
+        bool userCanAccessContentSection)
+    {
+        var user = CreateUser();
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(userIsAuthorized ? user : null);
+        mockBackOfficeSecurity
+            .Setup(x => x.UserHasSectionAccess(
+                Constants.Applications.Content,
+                It.Is<IUser>(y => y.Username == user.Username)))
+            .Returns(userCanAccessContentSection);
+        mockBackOfficeSecurity
+            .Setup(x => x.UserHasSectionAccess(
+                Constants.Applications.Media,
+                It.Is<IUser>(y => y.Username == user.Username)))
+            .Returns(false);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
+
+    private static User CreateUser() =>
+        new UserBuilder()
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs
index 547372a4ae..1404df11ff 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/TreeHandlerTests.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
@@ -14,99 +15,104 @@ using Umbraco.Cms.Core.Trees;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Web.BackOffice.Authorization;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class TreeHandlerTests
 {
-    public class TreeHandlerTests
+    private const string Tree1Alias = "Tree1";
+    private const string Tree2Alias = "Tree2";
+
+    [Test]
+    public async Task Unauthorized_User_Is_Not_Authorized()
     {
-        private const string Tree1Alias = "Tree1";
-        private const string Tree2Alias = "Tree2";
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler();
 
-        [Test]
-        public async Task Unauthorized_User_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            TreeHandler sut = CreateHandler();
+        await sut.HandleAsync(authHandlerContext);
 
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task User_With_Access_To_Tree_Section_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            TreeHandler sut = CreateHandler(userIsAuthorized: true, userCanAccessContentSection: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task User_Without_Access_To_Tree_Section_Is_Not_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            TreeHandler sut = CreateHandler(userIsAuthorized: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-        {
-            var requirement = new TreeRequirement(Tree1Alias, Tree2Alias);
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
-
-        private TreeHandler CreateHandler(bool userIsAuthorized = false, bool userCanAccessContentSection = false)
-        {
-            Mock<ITreeService> mockTreeService = CreateMockTreeService();
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(userIsAuthorized, userCanAccessContentSection);
-
-            return new TreeHandler(mockTreeService.Object, mockBackOfficeSecurityAccessor.Object);
-        }
-
-        private static Mock<ITreeService> CreateMockTreeService()
-        {
-            var mockTreeService = new Mock<ITreeService>();
-            mockTreeService
-                .Setup(x => x.GetByAlias(It.Is<string>(y => y == Tree1Alias)))
-                .Returns(CreateTree(Tree1Alias, Constants.Applications.Content));
-            mockTreeService
-                .Setup(x => x.GetByAlias(It.Is<string>(y => y == Tree2Alias)))
-                .Returns(CreateTree(Tree2Alias, Constants.Applications.Media));
-            return mockTreeService;
-        }
-
-        private static Tree CreateTree(string alias, string sectionAlias) =>
-            new TreeBuilder()
-                .WithAlias(alias)
-                .WithSectionAlias(sectionAlias)
-                .Build();
-
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(bool userIsAuthorized, bool userCanAccessContentSection)
-        {
-            User user = CreateUser();
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(userIsAuthorized ? user : null);
-            mockBackOfficeSecurity
-                .Setup(x => x.UserHasSectionAccess(Constants.Applications.Content, It.Is<IUser>(y => y.Username == user.Username)))
-                .Returns(userCanAccessContentSection);
-            mockBackOfficeSecurity
-                .Setup(x => x.UserHasSectionAccess(Constants.Applications.Media, It.Is<IUser>(y => y.Username == user.Username)))
-                .Returns(false);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
-
-        private static User CreateUser() => new UserBuilder()
-                .Build();
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
     }
+
+    [Test]
+    public async Task User_With_Access_To_Tree_Section_Is_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(true, true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task User_Without_Access_To_Tree_Section_Is_Not_Authorized()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
+
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
+    {
+        var requirement = new TreeRequirement(Tree1Alias, Tree2Alias);
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
+
+    private TreeHandler CreateHandler(bool userIsAuthorized = false, bool userCanAccessContentSection = false)
+    {
+        var mockTreeService = CreateMockTreeService();
+        var mockBackOfficeSecurityAccessor =
+            CreateMockBackOfficeSecurityAccessor(userIsAuthorized, userCanAccessContentSection);
+
+        return new TreeHandler(mockTreeService.Object, mockBackOfficeSecurityAccessor.Object);
+    }
+
+    private static Mock<ITreeService> CreateMockTreeService()
+    {
+        var mockTreeService = new Mock<ITreeService>();
+        mockTreeService
+            .Setup(x => x.GetByAlias(It.Is<string>(y => y == Tree1Alias)))
+            .Returns(CreateTree(Tree1Alias, Constants.Applications.Content));
+        mockTreeService
+            .Setup(x => x.GetByAlias(It.Is<string>(y => y == Tree2Alias)))
+            .Returns(CreateTree(Tree2Alias, Constants.Applications.Media));
+        return mockTreeService;
+    }
+
+    private static Tree CreateTree(string alias, string sectionAlias) =>
+        new TreeBuilder()
+            .WithAlias(alias)
+            .WithSectionAlias(sectionAlias)
+            .Build();
+
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(
+        bool userIsAuthorized,
+        bool userCanAccessContentSection)
+    {
+        var user = CreateUser();
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(userIsAuthorized ? user : null);
+        mockBackOfficeSecurity
+            .Setup(x => x.UserHasSectionAccess(
+                Constants.Applications.Content,
+                It.Is<IUser>(y => y.Username == user.Username)))
+            .Returns(userCanAccessContentSection);
+        mockBackOfficeSecurity
+            .Setup(x => x.UserHasSectionAccess(
+                Constants.Applications.Media,
+                It.Is<IUser>(y => y.Username == user.Username)))
+            .Returns(false);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
+
+    private static User CreateUser() => new UserBuilder()
+        .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs
index 7ff68aca52..0850075375 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/UserGroupHandlerTests.cs
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using Moq;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
@@ -16,164 +17,174 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Web.BackOffice.Authorization;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization;
+
+public class UserGroupHandlerTests
 {
-    public class UserGroupHandlerTests
+    private const string QueryStringName = "id";
+
+    private const int Group1Id = 1;
+    private const string Group1Alias = "group1";
+    private const int Group2Id = 2;
+    private const string Group2Alias = "group2";
+    private const int Group3Id = 3;
+    private const string Group3Alias = "group3";
+
+    [Test]
+    public async Task Missing_QueryString_Value_Is_Authorized()
     {
-        private const string QueryStringName = "id";
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler();
 
-        private const int Group1Id = 1;
-        private const string Group1Alias = "group1";
-        private const int Group2Id = 2;
-        private const string Group2Alias = "group2";
-        private const int Group3Id = 3;
-        private const string Group3Alias = "group3";
+        await sut.HandleAsync(authHandlerContext);
 
-        [Test]
-        public async Task Missing_QueryString_Value_Is_Authorized()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            UserGroupHandler sut = CreateHandler();
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task Admin_User_Is_Authorised()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            UserGroupHandler sut = CreateHandler(queryStringValue: Group1Id.ToString(), userIsAdmin: true);
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task User_Matching_Single_Requested_Group_Id_Is_Authorised()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            UserGroupHandler sut = CreateHandler(queryStringValue: Group1Id.ToString());
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task User_Matching_Only_One_Of_Requested_Group_Ids_Is_NOT_Authorised()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            UserGroupHandler sut = CreateHandler(queryStringValue: $"{Group1Id},{Group2Id}");
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsTrue(authHandlerContext.HasFailed);
-        }
-
-        [Test]
-        public async Task User_Not_Matching_Single_Requested_Group_Id_Is_Not_Authorised()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            UserGroupHandler sut = CreateHandler(queryStringValue: Group2Id.ToString());
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        [Test]
-        public async Task User_Not_Matching_Any_Of_Requested_Group_Ids_Is_Not_Authorised()
-        {
-            AuthorizationHandlerContext authHandlerContext = CreateAuthorizationHandlerContext();
-            UserGroupHandler sut = CreateHandler(queryStringValue: $"{Group2Id},{Group3Id}");
-
-            await sut.HandleAsync(authHandlerContext);
-
-            Assert.IsFalse(authHandlerContext.HasSucceeded);
-        }
-
-        private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
-        {
-            var requirement = new UserGroupRequirement(QueryStringName);
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
-            object resource = new object();
-            return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
-        }
-
-        private UserGroupHandler CreateHandler(string queryStringValue = "", bool userIsAdmin = false)
-        {
-            Mock<IHttpContextAccessor> mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue);
-
-            Mock<IUserService> mockUserService = CreateMockUserService();
-
-            var mockContentService = new Mock<IContentService>();
-            var mockMediaService = new Mock<IMediaService>();
-            var mockEntityService = new Mock<IEntityService>();
-
-            Mock<IBackOfficeSecurityAccessor> mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(userIsAdmin);
-
-            return new UserGroupHandler(mockHttpContextAccessor.Object, mockUserService.Object, mockContentService.Object, mockMediaService.Object, mockEntityService.Object, mockBackOfficeSecurityAccessor.Object, AppCaches.Disabled);
-        }
-
-        private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringValue)
-        {
-            var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
-            var mockHttpContext = new Mock<HttpContext>();
-            var mockHttpRequest = new Mock<HttpRequest>();
-            var queryParams = new Dictionary<string, StringValues>
-            {
-                { QueryStringName, queryStringValue },
-            };
-            mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
-            mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
-            mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
-            return mockHttpContextAccessor;
-        }
-
-        private Mock<IUserService> CreateMockUserService()
-        {
-            var mockUserService = new Mock<IUserService>();
-            mockUserService
-                .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 1 && y[0] == Group1Id)))
-                .Returns(new List<IUserGroup> { CreateUserGroup(Group1Id, Group1Alias) });
-            mockUserService
-                .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 1 && y[0] == Group2Id)))
-                .Returns(new List<IUserGroup> { CreateUserGroup(Group2Id, Group2Alias) });
-            mockUserService
-                .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 2 && y[0] == Group1Id && y[1] == Group2Id)))
-                .Returns(new List<IUserGroup> { CreateUserGroup(Group1Id, Group1Alias), CreateUserGroup(Group2Id, Group2Alias) });
-            mockUserService
-                .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 2 && y[0] == Group2Id && y[1] == Group3Id)))
-                .Returns(new List<IUserGroup> { CreateUserGroup(Group2Id, Group2Alias), CreateUserGroup(Group3Id, Group3Alias) });
-            return mockUserService;
-        }
-
-        private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(bool userIsAdmin)
-        {
-            User user = CreateUser(userIsAdmin);
-            var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
-            var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
-            mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
-            return mockBackOfficeSecurityAccessor;
-        }
-
-        private static User CreateUser(bool isAdmin = false) =>
-            new UserBuilder()
-                .AddUserGroup()
-                    .WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Group1Alias)
-                    .Done()
-                .Build();
-
-        private IUserGroup CreateUserGroup(int id, string alias) =>
-            new UserGroupBuilder()
-                .WithId(id)
-                .WithAlias(alias)
-                .Build();
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
     }
+
+    [Test]
+    public async Task Admin_User_Is_Authorised()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(Group1Id.ToString(), true);
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task User_Matching_Single_Requested_Group_Id_Is_Authorised()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(Group1Id.ToString());
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task User_Matching_Only_One_Of_Requested_Group_Ids_Is_NOT_Authorised()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler($"{Group1Id},{Group2Id}");
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsTrue(authHandlerContext.HasFailed);
+    }
+
+    [Test]
+    public async Task User_Not_Matching_Single_Requested_Group_Id_Is_Not_Authorised()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler(Group2Id.ToString());
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
+
+    [Test]
+    public async Task User_Not_Matching_Any_Of_Requested_Group_Ids_Is_Not_Authorised()
+    {
+        var authHandlerContext = CreateAuthorizationHandlerContext();
+        var sut = CreateHandler($"{Group2Id},{Group3Id}");
+
+        await sut.HandleAsync(authHandlerContext);
+
+        Assert.IsFalse(authHandlerContext.HasSucceeded);
+    }
+
+    private static AuthorizationHandlerContext CreateAuthorizationHandlerContext()
+    {
+        var requirement = new UserGroupRequirement();
+        var user = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>()));
+        var resource = new object();
+        return new AuthorizationHandlerContext(new List<IAuthorizationRequirement> { requirement }, user, resource);
+    }
+
+    private UserGroupHandler CreateHandler(string queryStringValue = "", bool userIsAdmin = false)
+    {
+        var mockHttpContextAccessor = CreateMockHttpContextAccessor(queryStringValue);
+
+        var mockUserService = CreateMockUserService();
+
+        var mockContentService = new Mock<IContentService>();
+        var mockMediaService = new Mock<IMediaService>();
+        var mockEntityService = new Mock<IEntityService>();
+
+        var mockBackOfficeSecurityAccessor = CreateMockBackOfficeSecurityAccessor(userIsAdmin);
+
+        return new UserGroupHandler(
+            mockHttpContextAccessor.Object,
+            mockUserService.Object,
+            mockContentService.Object,
+            mockMediaService.Object,
+            mockEntityService.Object,
+            mockBackOfficeSecurityAccessor.Object,
+            AppCaches.Disabled);
+    }
+
+    private static Mock<IHttpContextAccessor> CreateMockHttpContextAccessor(string queryStringValue)
+    {
+        var mockHttpContextAccessor = new Mock<IHttpContextAccessor>();
+        var mockHttpContext = new Mock<HttpContext>();
+        var mockHttpRequest = new Mock<HttpRequest>();
+        var queryParams = new Dictionary<string, StringValues> { { QueryStringName, queryStringValue } };
+        mockHttpRequest.SetupGet(x => x.Query).Returns(new QueryCollection(queryParams));
+        mockHttpContext.SetupGet(x => x.Request).Returns(mockHttpRequest.Object);
+        mockHttpContextAccessor.SetupGet(x => x.HttpContext).Returns(mockHttpContext.Object);
+        return mockHttpContextAccessor;
+    }
+
+    private Mock<IUserService> CreateMockUserService()
+    {
+        var mockUserService = new Mock<IUserService>();
+        mockUserService
+            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 1 && y[0] == Group1Id)))
+            .Returns(new List<IUserGroup> { CreateUserGroup(Group1Id, Group1Alias) });
+        mockUserService
+            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 1 && y[0] == Group2Id)))
+            .Returns(new List<IUserGroup> { CreateUserGroup(Group2Id, Group2Alias) });
+        mockUserService
+            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 2 && y[0] == Group1Id && y[1] == Group2Id)))
+            .Returns(new List<IUserGroup>
+            {
+                CreateUserGroup(Group1Id, Group1Alias),
+                CreateUserGroup(Group2Id, Group2Alias),
+            });
+        mockUserService
+            .Setup(x => x.GetAllUserGroups(It.Is<int[]>(y => y.Length == 2 && y[0] == Group2Id && y[1] == Group3Id)))
+            .Returns(new List<IUserGroup>
+            {
+                CreateUserGroup(Group2Id, Group2Alias),
+                CreateUserGroup(Group3Id, Group3Alias),
+            });
+        return mockUserService;
+    }
+
+    private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(bool userIsAdmin)
+    {
+        var user = CreateUser(userIsAdmin);
+        var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
+        mockBackOfficeSecurity.SetupGet(x => x.CurrentUser).Returns(user);
+        var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
+        mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
+        return mockBackOfficeSecurityAccessor;
+    }
+
+    private static User CreateUser(bool isAdmin = false) =>
+        new UserBuilder()
+            .AddUserGroup()
+            .WithAlias(isAdmin ? Constants.Security.AdminGroupAlias : Group1Alias)
+            .Done()
+            .Build();
+
+    private IUserGroup CreateUserGroup(int id, string alias) =>
+        new UserGroupBuilder()
+            .WithId(id)
+            .WithAlias(alias)
+            .Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/CollectionBuilders/TreeCollectionBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/CollectionBuilders/TreeCollectionBuilderTests.cs
index 5392d50ebd..a3384f73f4 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/CollectionBuilders/TreeCollectionBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/CollectionBuilders/TreeCollectionBuilderTests.cs
@@ -3,34 +3,41 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Trees;
 using Umbraco.Cms.Web.BackOffice.Trees;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.CollectionBuilders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.CollectionBuilders;
+
+public class TreeCollectionBuilderTests
 {
-    public class TreeCollectionBuilderTests
+    [Test]
+    public void Adding_Tree_To_Collection_Builder()
     {
-        [Test]
-        public void Adding_Tree_To_Collection_Builder()
-        {
-            var collectionBuilder = new TreeCollectionBuilder();
-            var treeDefinition = new Tree(0, "test", "test", "test", "test", TreeUse.Main, typeof(LanguageTreeController), false);
+        var collectionBuilder = new TreeCollectionBuilder();
+        var treeDefinition = new Tree(
+            0,
+            "test",
+            "test",
+            "test",
+            "test",
+            TreeUse.Main,
+            typeof(LanguageTreeController),
+            false);
 
-            collectionBuilder.AddTree(treeDefinition);
-            var collection = collectionBuilder.CreateCollection(null);
+        collectionBuilder.AddTree(treeDefinition);
+        var collection = collectionBuilder.CreateCollection(null);
 
-            Assert.AreEqual(1, collection.Count);
-            Assert.AreEqual(treeDefinition, collection.FirstOrDefault());
-        }
+        Assert.AreEqual(1, collection.Count);
+        Assert.AreEqual(treeDefinition, collection.FirstOrDefault());
+    }
 
-        [Test]
-        public void Remove_Tree_From_Collection_Builder()
-        {
-            var collectionBuilder = new TreeCollectionBuilder();
-            var treeDefinition = new Tree(0, "test", "test", "test", "test", TreeUse.Main, typeof(LanguageTreeController), false);
+    [Test]
+    public void Remove_Tree_From_Collection_Builder()
+    {
+        var collectionBuilder = new TreeCollectionBuilder();
+        var treeDefinition = new Tree(0, "test", "test", "test", "test", TreeUse.Main, typeof(LanguageTreeController), false);
 
-            collectionBuilder.AddTree(treeDefinition);
-            collectionBuilder.RemoveTreeController<LanguageTreeController>();
-            var collection = collectionBuilder.CreateCollection(null);
+        collectionBuilder.AddTree(treeDefinition);
+        collectionBuilder.RemoveTreeController<LanguageTreeController>();
+        var collection = collectionBuilder.CreateCollection(null);
 
-            Assert.AreEqual(0, collection.Count);
-        }
+        Assert.AreEqual(0, collection.Count);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
index b2b14ceab2..53bc6b0801 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -24,251 +24,252 @@ using Umbraco.Cms.Tests.Common.Builders;
 using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers;
+
+[TestFixture]
+public class ContentControllerTests
 {
-    [TestFixture]
-    public class ContentControllerTests
+    [Test]
+    public void Root_Node_With_Domains_Causes_No_Warning()
     {
-        [Test]
-        public void Root_Node_With_Domains_Causes_No_Warning()
-        {
-            // Setup domain service
-            var domainServiceMock = new Mock<IDomainService>();
-            domainServiceMock.Setup(x => x.GetAssignedDomains(1060, It.IsAny<bool>()))
-                .Returns(new []{new UmbracoDomain("/", "da-dk"), new UmbracoDomain("/en", "en-us")});
+        // Setup domain service
+        var domainServiceMock = new Mock<IDomainService>();
+        domainServiceMock.Setup(x => x.GetAssignedDomains(1060, It.IsAny<bool>()))
+            .Returns(new[] { new UmbracoDomain("/", "da-dk"), new UmbracoDomain("/en", "en-us") });
 
-            // Create content, we need to specify and ID in order to be able to configure domain service
-            Content rootNode = new ContentBuilder()
-                .WithContentType(CreateContentType())
-                .WithId(1060)
-                .AddContentCultureInfosCollection()
-                    .AddCultureInfos()
-                        .WithCultureIso("da-dk")
-                    .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("en-us")
-                    .Done()
-                .Done()
-                .Build();
+        // Create content, we need to specify and ID in order to be able to configure domain service
+        var rootNode = new ContentBuilder()
+            .WithContentType(CreateContentType())
+            .WithId(1060)
+            .AddContentCultureInfosCollection()
+            .AddCultureInfos()
+            .WithCultureIso("da-dk")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("en-us")
+            .Done()
+            .Done()
+            .Build();
 
-            var culturesPublished = new []{ "en-us", "da-dk" };
-            var notifications = new SimpleNotificationModel();
+        var culturesPublished = new[] { "en-us", "da-dk" };
+        var notifications = new SimpleNotificationModel();
 
-            ContentController contentController = CreateContentController(domainServiceMock.Object);
-            contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
+        var contentController = CreateContentController(domainServiceMock.Object);
+        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
 
-            Assert.IsEmpty(notifications.Notifications);
-        }
-
-        [Test]
-        public void Node_With_Single_Published_Culture_Causes_No_Warning()
-        {
-            var domainServiceMock = new Mock<IDomainService>();
-            domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-                .Returns(Enumerable.Empty<IDomain>());
-
-            Content rootNode = new ContentBuilder()
-                .WithContentType(CreateContentType())
-                .WithId(1060)
-                .AddContentCultureInfosCollection()
-                    .AddCultureInfos()
-                        .WithCultureIso("da-dk")
-                        .Done()
-                .Done()
-                .Build();
-
-            var culturesPublished = new []{"da-dk" };
-            var notifications = new SimpleNotificationModel();
-
-            ContentController contentController = CreateContentController(domainServiceMock.Object);
-            contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-
-            Assert.IsEmpty(notifications.Notifications);
-        }
-
-        [Test]
-        public void Root_Node_Without_Domains_Causes_SingleWarning()
-        {
-            var domainServiceMock = new Mock<IDomainService>();
-            domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-                .Returns(Enumerable.Empty<IDomain>());
-
-            Content rootNode = new ContentBuilder()
-                .WithContentType(CreateContentType())
-                .WithId(1060)
-                .AddContentCultureInfosCollection()
-                    .AddCultureInfos()
-                        .WithCultureIso("da-dk")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("en-us")
-                        .Done()
-                .Done()
-                .Build();
-
-            var culturesPublished = new []{ "en-us", "da-dk" };
-            var notifications = new SimpleNotificationModel();
-
-            ContentController contentController = CreateContentController(domainServiceMock.Object);
-            contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-            Assert.AreEqual(1, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-        }
-
-        [Test]
-        public void One_Warning_Per_Culture_Being_Published()
-        {
-            var domainServiceMock = new Mock<IDomainService>();
-            domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-                .Returns(new []{new UmbracoDomain("/", "da-dk")});
-
-
-            Content rootNode = new ContentBuilder()
-                .WithContentType(CreateContentType())
-                .WithId(1060)
-                .AddContentCultureInfosCollection()
-                    .AddCultureInfos()
-                        .WithCultureIso("da-dk")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("en-us")
-                        .Done()
-                .Done()
-                .Build();
-
-            var culturesPublished = new []{ "en-us", "da-dk", "nl-bk", "se-sv" };
-            var notifications = new SimpleNotificationModel();
-
-            ContentController contentController = CreateContentController(domainServiceMock.Object);
-            contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-            Assert.AreEqual(3, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-        }
-
-        [Test]
-        public void Ancestor_Domains_Counts()
-        {
-            var rootId = 1060;
-            var level1Id = 1061;
-            var level2Id = 1062;
-            var level3Id = 1063;
-
-            var domainServiceMock = new Mock<IDomainService>();
-            domainServiceMock.Setup(x => x.GetAssignedDomains(rootId, It.IsAny<bool>()))
-                .Returns(new[] { new UmbracoDomain("/", "da-dk") });
-
-            domainServiceMock.Setup(x => x.GetAssignedDomains(level1Id, It.IsAny<bool>()))
-                .Returns(new[] { new UmbracoDomain("/en", "en-us") });
-
-            domainServiceMock.Setup(x => x.GetAssignedDomains(level2Id, It.IsAny<bool>()))
-                .Returns(new[] { new UmbracoDomain("/se", "se-sv"), new UmbracoDomain("/nl", "nl-bk") });
-
-            Content level3Node = new ContentBuilder()
-                .WithContentType(CreateContentType())
-                .WithId(level3Id)
-                .WithPath($"-1,{rootId},{level1Id},{level2Id},{level3Id}")
-                .AddContentCultureInfosCollection()
-                    .AddCultureInfos()
-                        .WithCultureIso("da-dk")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("en-us")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("se-sv")
-                    .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("nl-bk")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("de-de")
-                        .Done()
-                .Done()
-                .Build();
-
-            var culturesPublished = new []{ "en-us", "da-dk", "nl-bk", "se-sv", "de-de" };
-
-            ContentController contentController = CreateContentController(domainServiceMock.Object);
-            var notifications = new SimpleNotificationModel();
-
-            contentController.AddDomainWarnings(level3Node, culturesPublished, notifications);
-            // We expect one error because all domains except "de-de" is registered somewhere in the ancestor path
-            Assert.AreEqual(1, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-        }
-
-        [Test]
-        public void Only_Warns_About_Cultures_Being_Published()
-        {
-            var domainServiceMock = new Mock<IDomainService>();
-            domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
-                .Returns(new []{new UmbracoDomain("/", "da-dk")});
-
-            Content rootNode = new ContentBuilder()
-                .WithContentType(CreateContentType())
-                .WithId(1060)
-                .AddContentCultureInfosCollection()
-                    .AddCultureInfos()
-                        .WithCultureIso("da-dk")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("en-us")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("se-sv")
-                        .Done()
-                    .AddCultureInfos()
-                        .WithCultureIso("de-de")
-                        .Done()
-                .Done()
-                .Build();
-
-            var culturesPublished = new []{ "en-us", "se-sv" };
-            var notifications = new SimpleNotificationModel();
-
-            ContentController contentController = CreateContentController(domainServiceMock.Object);
-            contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
-
-            // We only get two errors, one for each culture being published, so no errors from previously published cultures.
-            Assert.AreEqual(2, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
-        }
-
-        private ContentController CreateContentController(IDomainService domainService)
-        {
-            // We have to configure ILocalizedTextService to return a new string every time Localize is called
-            // Otherwise it won't add the notification because it skips dupes
-            var localizedTextServiceMock = new Mock<ILocalizedTextService>();
-            localizedTextServiceMock.Setup(x => x.Localize(It.IsAny<string>(),
-                It.IsAny<string>(), It.IsAny<CultureInfo>(), It.IsAny<IDictionary<string, string>>()))
-                .Returns(() => Guid.NewGuid().ToString());
-
-            var controller = new ContentController(
-                Mock.Of<ICultureDictionary>(),
-                NullLoggerFactory.Instance,
-                Mock.Of<IShortStringHelper>(),
-                Mock.Of<IEventMessagesFactory>(),
-                localizedTextServiceMock.Object,
-                new PropertyEditorCollection(new DataEditorCollection(() => null)),
-                Mock.Of<IContentService>(),
-                Mock.Of<IUserService>(),
-                Mock.Of<IBackOfficeSecurityAccessor>(),
-                Mock.Of<IContentTypeService>(),
-                Mock.Of<IUmbracoMapper>(),
-                Mock.Of<IPublishedUrlProvider>(),
-                domainService,
-                Mock.Of<IDataTypeService>(),
-                Mock.Of<ILocalizationService>(),
-                Mock.Of<IFileService>(),
-                Mock.Of<INotificationService>(),
-                new ActionCollection(() => null),
-                Mock.Of<ISqlContext>(),
-                Mock.Of<IJsonSerializer>(),
-                Mock.Of<ICoreScopeProvider>(),
-                Mock.Of<IAuthorizationService>(),
-                Mock.Of<IContentVersionService>()
-            );
-
-            return controller;
-        }
-
-        private IContentType CreateContentType() =>
-            new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
+        Assert.IsEmpty(notifications.Notifications);
     }
+
+    [Test]
+    public void Node_With_Single_Published_Culture_Causes_No_Warning()
+    {
+        var domainServiceMock = new Mock<IDomainService>();
+        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
+            .Returns(Enumerable.Empty<IDomain>());
+
+        var rootNode = new ContentBuilder()
+            .WithContentType(CreateContentType())
+            .WithId(1060)
+            .AddContentCultureInfosCollection()
+            .AddCultureInfos()
+            .WithCultureIso("da-dk")
+            .Done()
+            .Done()
+            .Build();
+
+        var culturesPublished = new[] { "da-dk" };
+        var notifications = new SimpleNotificationModel();
+
+        var contentController = CreateContentController(domainServiceMock.Object);
+        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
+
+        Assert.IsEmpty(notifications.Notifications);
+    }
+
+    [Test]
+    public void Root_Node_Without_Domains_Causes_SingleWarning()
+    {
+        var domainServiceMock = new Mock<IDomainService>();
+        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
+            .Returns(Enumerable.Empty<IDomain>());
+
+        var rootNode = new ContentBuilder()
+            .WithContentType(CreateContentType())
+            .WithId(1060)
+            .AddContentCultureInfosCollection()
+            .AddCultureInfos()
+            .WithCultureIso("da-dk")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("en-us")
+            .Done()
+            .Done()
+            .Build();
+
+        var culturesPublished = new[] { "en-us", "da-dk" };
+        var notifications = new SimpleNotificationModel();
+
+        var contentController = CreateContentController(domainServiceMock.Object);
+        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
+        Assert.AreEqual(1, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+    }
+
+    [Test]
+    public void One_Warning_Per_Culture_Being_Published()
+    {
+        var domainServiceMock = new Mock<IDomainService>();
+        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
+            .Returns(new[] { new UmbracoDomain("/", "da-dk") });
+
+        var rootNode = new ContentBuilder()
+            .WithContentType(CreateContentType())
+            .WithId(1060)
+            .AddContentCultureInfosCollection()
+            .AddCultureInfos()
+            .WithCultureIso("da-dk")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("en-us")
+            .Done()
+            .Done()
+            .Build();
+
+        var culturesPublished = new[] { "en-us", "da-dk", "nl-bk", "se-sv" };
+        var notifications = new SimpleNotificationModel();
+
+        var contentController = CreateContentController(domainServiceMock.Object);
+        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
+        Assert.AreEqual(3, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+    }
+
+    [Test]
+    public void Ancestor_Domains_Counts()
+    {
+        var rootId = 1060;
+        var level1Id = 1061;
+        var level2Id = 1062;
+        var level3Id = 1063;
+
+        var domainServiceMock = new Mock<IDomainService>();
+        domainServiceMock.Setup(x => x.GetAssignedDomains(rootId, It.IsAny<bool>()))
+            .Returns(new[] { new UmbracoDomain("/", "da-dk") });
+
+        domainServiceMock.Setup(x => x.GetAssignedDomains(level1Id, It.IsAny<bool>()))
+            .Returns(new[] { new UmbracoDomain("/en", "en-us") });
+
+        domainServiceMock.Setup(x => x.GetAssignedDomains(level2Id, It.IsAny<bool>()))
+            .Returns(new[] { new UmbracoDomain("/se", "se-sv"), new UmbracoDomain("/nl", "nl-bk") });
+
+        var level3Node = new ContentBuilder()
+            .WithContentType(CreateContentType())
+            .WithId(level3Id)
+            .WithPath($"-1,{rootId},{level1Id},{level2Id},{level3Id}")
+            .AddContentCultureInfosCollection()
+            .AddCultureInfos()
+            .WithCultureIso("da-dk")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("en-us")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("se-sv")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("nl-bk")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("de-de")
+            .Done()
+            .Done()
+            .Build();
+
+        var culturesPublished = new[] { "en-us", "da-dk", "nl-bk", "se-sv", "de-de" };
+
+        var contentController = CreateContentController(domainServiceMock.Object);
+        var notifications = new SimpleNotificationModel();
+
+        contentController.AddDomainWarnings(level3Node, culturesPublished, notifications);
+
+        // We expect one error because all domains except "de-de" is registered somewhere in the ancestor path
+        Assert.AreEqual(1, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+    }
+
+    [Test]
+    public void Only_Warns_About_Cultures_Being_Published()
+    {
+        var domainServiceMock = new Mock<IDomainService>();
+        domainServiceMock.Setup(x => x.GetAssignedDomains(It.IsAny<int>(), It.IsAny<bool>()))
+            .Returns(new[] { new UmbracoDomain("/", "da-dk") });
+
+        var rootNode = new ContentBuilder()
+            .WithContentType(CreateContentType())
+            .WithId(1060)
+            .AddContentCultureInfosCollection()
+            .AddCultureInfos()
+            .WithCultureIso("da-dk")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("en-us")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("se-sv")
+            .Done()
+            .AddCultureInfos()
+            .WithCultureIso("de-de")
+            .Done()
+            .Done()
+            .Build();
+
+        var culturesPublished = new[] { "en-us", "se-sv" };
+        var notifications = new SimpleNotificationModel();
+
+        var contentController = CreateContentController(domainServiceMock.Object);
+        contentController.AddDomainWarnings(rootNode, culturesPublished, notifications);
+
+        // We only get two errors, one for each culture being published, so no errors from previously published cultures.
+        Assert.AreEqual(2, notifications.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
+    }
+
+    private ContentController CreateContentController(IDomainService domainService)
+    {
+        // We have to configure ILocalizedTextService to return a new string every time Localize is called
+        // Otherwise it won't add the notification because it skips dupes
+        var localizedTextServiceMock = new Mock<ILocalizedTextService>();
+        localizedTextServiceMock.Setup(x => x.Localize(
+                It.IsAny<string>(),
+                It.IsAny<string>(),
+                It.IsAny<CultureInfo>(),
+                It.IsAny<IDictionary<string, string>>()))
+            .Returns(() => Guid.NewGuid().ToString());
+
+        var controller = new ContentController(
+            Mock.Of<ICultureDictionary>(),
+            NullLoggerFactory.Instance,
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IEventMessagesFactory>(),
+            localizedTextServiceMock.Object,
+            new PropertyEditorCollection(new DataEditorCollection(() => null)),
+            Mock.Of<IContentService>(),
+            Mock.Of<IUserService>(),
+            Mock.Of<IBackOfficeSecurityAccessor>(),
+            Mock.Of<IContentTypeService>(),
+            Mock.Of<IUmbracoMapper>(),
+            Mock.Of<IPublishedUrlProvider>(),
+            domainService,
+            Mock.Of<IDataTypeService>(),
+            Mock.Of<ILocalizationService>(),
+            Mock.Of<IFileService>(),
+            Mock.Of<INotificationService>(),
+            new ActionCollection(() => null),
+            Mock.Of<ISqlContext>(),
+            Mock.Of<IJsonSerializer>(),
+            Mock.Of<ICoreScopeProvider>(),
+            Mock.Of<IAuthorizationService>(),
+            Mock.Of<IContentVersionService>());
+
+        return controller;
+    }
+
+    private IContentType CreateContentType() =>
+        new ContentTypeBuilder().WithContentVariation(ContentVariation.Culture).Build();
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
index 7d7de45950..10fb0bbb36 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
@@ -7,7 +7,6 @@ using AngleSharp.Common;
 using AutoFixture.NUnit3;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -42,110 +41,74 @@ using Umbraco.Cms.Web.Common.ActionsResults;
 using Umbraco.Cms.Web.Common.Security;
 using MemberMapDefinition = Umbraco.Cms.Web.BackOffice.Mapping.MemberMapDefinition;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers;
+
+[TestFixture]
+public class MemberControllerUnitTests
 {
-    [TestFixture]
-    public class MemberControllerUnitTests
+    private IUmbracoMapper _mapper;
+
+    [Test]
+    [AutoMoqData]
+    public void PostSaveMember_WhenMemberIsNull_ExpectFailureResponse(
+        MemberController sut)
     {
-        private IUmbracoMapper _mapper;
+        // arrange
+        // act
+        var exception = Assert.ThrowsAsync<ArgumentNullException>(() => sut.PostSave(null));
 
-        [Test]
-        [AutoMoqData]
-        public void PostSaveMember_WhenMemberIsNull_ExpectFailureResponse(
-            MemberController sut)
-        {
-            // arrange
-            // act
-            ArgumentNullException exception = Assert.ThrowsAsync<ArgumentNullException>(() => sut.PostSave(null));
+        // assert
+        Assert.That(
+            exception.Message,
+            Is.EqualTo("Value cannot be null. (Parameter 'The member content item was null')"));
+    }
 
-            // assert
-            Assert.That(exception.Message, Is.EqualTo("Value cannot be null. (Parameter 'The member content item was null')"));
-        }
+    [Test]
+    [AutoMoqData]
+    public void PostSaveMember_WhenModelStateIsNotValid_ExpectFailureResponse(
+        [Frozen] IMemberManager umbracoMembersUserManager,
+        IMemberService memberService,
+        IMemberTypeService memberTypeService,
+        IMemberGroupService memberGroupService,
+        IDataTypeService dataTypeService,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        IOptions<GlobalSettings> globalSettings,
+        IUser user)
+    {
+        // arrange
+        SetupMemberTestData(out var fakeMemberData, out _, ContentSaveAction.SaveNew);
+        var sut = CreateSut(
+            memberService,
+            memberTypeService,
+            memberGroupService,
+            umbracoMembersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            passwordChanger,
+            globalSettings);
+        sut.ModelState.AddModelError("key", "Invalid model state");
 
-        [Test]
-        [AutoMoqData]
-        public void PostSaveMember_WhenModelStateIsNotValid_ExpectFailureResponse(
-            [Frozen] IMemberManager umbracoMembersUserManager,
-            IMemberService memberService,
-            IMemberTypeService memberTypeService,
-            IMemberGroupService memberGroupService,
-            IDataTypeService dataTypeService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IPasswordChanger<MemberIdentityUser> passwordChanger,
-            IOptions<GlobalSettings> globalSettings,
-            IUser user)
-        {
-            // arrange
-            Member member = SetupMemberTestData(out MemberSave fakeMemberData, out MemberDisplay memberDisplay, ContentSaveAction.SaveNew);
-            MemberController sut = CreateSut(memberService, memberTypeService, memberGroupService, umbracoMembersUserManager, dataTypeService, backOfficeSecurityAccessor, passwordChanger, globalSettings, user);
-            sut.ModelState.AddModelError("key", "Invalid model state");
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
 
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
+        // act
+        var result = sut.PostSave(fakeMemberData).Result;
+        var validation = result.Result as ValidationErrorResult;
 
-            var value = new MemberDisplay();
+        // assert
+        Assert.IsNotNull(result.Result);
+        Assert.IsNull(result.Value);
+        Assert.AreEqual(StatusCodes.Status400BadRequest, validation?.StatusCode);
+    }
 
-            // act
-            ActionResult<MemberDisplay> result = sut.PostSave(fakeMemberData).Result;
-            var validation = result.Result as ValidationErrorResult;
-
-            // assert
-            Assert.IsNotNull(result.Result);
-            Assert.IsNull(result.Value);
-            Assert.AreEqual(StatusCodes.Status400BadRequest, validation?.StatusCode);
-        }
-
-        [Test]
-        [AutoMoqData]
-        public async Task PostSaveMember_SaveNew_NoCustomField_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
-            [Frozen] IMemberManager umbracoMembersUserManager,
-            IMemberService memberService,
-            IMemberTypeService memberTypeService,
-            IMemberGroupService memberGroupService,
-            IDataTypeService dataTypeService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IBackOfficeSecurity backOfficeSecurity,
-            IPasswordChanger<MemberIdentityUser> passwordChanger,
-             IOptions<GlobalSettings> globalSettings,
-            IUser user)
-        {
-            // arrange
-            Member member = SetupMemberTestData(out MemberSave fakeMemberData, out MemberDisplay memberDisplay, ContentSaveAction.SaveNew);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => Array.Empty<string>());
-            Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
-            Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
-            Mock.Get(memberService).SetupSequence(
-                x => x.GetByEmail(It.IsAny<string>()))
-                .Returns(() => null)
-                .Returns(() => member);
-            Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
-
-            MemberController sut = CreateSut(memberService, memberTypeService, memberGroupService, umbracoMembersUserManager, dataTypeService, backOfficeSecurityAccessor, passwordChanger, globalSettings, user);
-
-            // act
-            ActionResult<MemberDisplay> result = await sut.PostSave(fakeMemberData);
-
-            // assert
-            Assert.IsNull(result.Result);
-            Assert.IsNotNull(result.Value);
-            AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
-        }
-
-        [Test]
-        [AutoMoqData]
-        public async Task PostSaveMember_SaveNew_CustomField_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
+    [Test]
+    [AutoMoqData]
+    public async Task PostSaveMember_SaveNew_NoCustomField_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
         [Frozen] IMemberManager umbracoMembersUserManager,
         IMemberService memberService,
         IMemberTypeService memberTypeService,
@@ -156,555 +119,648 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
         IPasswordChanger<MemberIdentityUser> passwordChanger,
         IOptions<GlobalSettings> globalSettings,
         IUser user)
-        {
-            // arrange
-            Member member = SetupMemberTestData(out MemberSave fakeMemberData, out MemberDisplay memberDisplay, ContentSaveAction.SaveNew);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => Array.Empty<string>());
-            Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
-            Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
-            Mock.Get(memberService).SetupSequence(
+    {
+        // arrange
+        var member = SetupMemberTestData(out var fakeMemberData, out var memberDisplay, ContentSaveAction.SaveNew);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => Array.Empty<string>());
+        Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
+        Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
+        Mock.Get(memberService).SetupSequence(
                 x => x.GetByEmail(It.IsAny<string>()))
-                .Returns(() => null)
-                .Returns(() => member);
-            Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
+            .Returns(() => null)
+            .Returns(() => member);
+        Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
 
-            MemberController sut = CreateSut(memberService, memberTypeService, memberGroupService, umbracoMembersUserManager, dataTypeService, backOfficeSecurityAccessor, passwordChanger, globalSettings, user);
+        var sut = CreateSut(
+            memberService,
+            memberTypeService,
+            memberGroupService,
+            umbracoMembersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            passwordChanger,
+            globalSettings);
 
-            // act
-            ActionResult<MemberDisplay> result = await sut.PostSave(fakeMemberData);
+        // act
+        var result = await sut.PostSave(fakeMemberData);
 
-            // assert
-            Assert.IsNull(result.Result);
-            Assert.IsNotNull(result.Value);
-            AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
-        }
+        // assert
+        Assert.IsNull(result.Result);
+        Assert.IsNotNull(result.Value);
+        AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
+    }
 
+    [Test]
+    [AutoMoqData]
+    public async Task PostSaveMember_SaveNew_CustomField_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
+        [Frozen] IMemberManager umbracoMembersUserManager,
+        IMemberService memberService,
+        IMemberTypeService memberTypeService,
+        IMemberGroupService memberGroupService,
+        IDataTypeService dataTypeService,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IBackOfficeSecurity backOfficeSecurity,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        IOptions<GlobalSettings> globalSettings,
+        IUser user)
+    {
+        // arrange
+        var member = SetupMemberTestData(out var fakeMemberData, out var memberDisplay, ContentSaveAction.SaveNew);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => Array.Empty<string>());
+        Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
+        Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
+        Mock.Get(memberService).SetupSequence(
+                x => x.GetByEmail(It.IsAny<string>()))
+            .Returns(() => null)
+            .Returns(() => member);
+        Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
 
-        [Test]
-        [AutoMoqData]
-        public async Task PostSaveMember_SaveExisting_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
-            [Frozen] IMemberManager umbracoMembersUserManager,
-            IMemberService memberService,
-            IMemberTypeService memberTypeService,
-            IMemberGroupService memberGroupService,
-            IDataTypeService dataTypeService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IBackOfficeSecurity backOfficeSecurity,
-            IPasswordChanger<MemberIdentityUser> passwordChanger,
-            IOptions<GlobalSettings> globalSettings,
-            IUser user)
+        var sut = CreateSut(
+            memberService,
+            memberTypeService,
+            memberGroupService,
+            umbracoMembersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            passwordChanger,
+            globalSettings);
+
+        // act
+        var result = await sut.PostSave(fakeMemberData);
+
+        // assert
+        Assert.IsNull(result.Result);
+        Assert.IsNotNull(result.Value);
+        AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
+    }
+
+    [Test]
+    [AutoMoqData]
+    public async Task PostSaveMember_SaveExisting_WhenAllIsSetupCorrectly_ExpectSuccessResponse(
+        [Frozen] IMemberManager umbracoMembersUserManager,
+        IMemberService memberService,
+        IMemberTypeService memberTypeService,
+        IMemberGroupService memberGroupService,
+        IDataTypeService dataTypeService,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IBackOfficeSecurity backOfficeSecurity,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        IOptions<GlobalSettings> globalSettings,
+        IUser user)
+    {
+        // arrange
+        var member = SetupMemberTestData(out var fakeMemberData, out var memberDisplay, ContentSaveAction.Save);
+        var membersIdentityUser = new MemberIdentityUser(123);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => membersIdentityUser);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.UpdateAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => Array.Empty<string>());
+        Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
+        Mock.Get(globalSettings);
+
+        SetupUserAccess(backOfficeSecurityAccessor, backOfficeSecurity, user);
+        SetupPasswordSuccess(umbracoMembersUserManager, passwordChanger);
+
+        Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
+        Mock.Get(memberService).Setup(x => x.GetById(It.IsAny<int>())).Returns(() => member);
+        Mock.Get(memberService).SetupSequence(
+                x => x.GetByEmail(It.IsAny<string>()))
+            .Returns(() => null)
+            .Returns(() => member);
+
+        var sut = CreateSut(
+            memberService,
+            memberTypeService,
+            memberGroupService,
+            umbracoMembersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            passwordChanger,
+            globalSettings);
+
+        // act
+        var result = await sut.PostSave(fakeMemberData);
+
+        // assert
+        Assert.IsNull(result.Result);
+        Assert.IsNotNull(result.Value);
+        AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
+    }
+
+    [Test]
+    [AutoMoqData]
+    public async Task PostSaveMember_SaveExisting_WhenAllIsSetupWithPasswordIncorrectly_ExpectFailureResponse(
+        [Frozen] IMemberManager umbracoMembersUserManager,
+        IMemberService memberService,
+        IMemberTypeService memberTypeService,
+        IMemberGroupService memberGroupService,
+        IDataTypeService dataTypeService,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IBackOfficeSecurity backOfficeSecurity,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        IOptions<GlobalSettings> globalSettings,
+        IUser user)
+    {
+        // arrange
+        var member = SetupMemberTestData(out var fakeMemberData, out _, ContentSaveAction.Save);
+        var membersIdentityUser = new MemberIdentityUser(123);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => membersIdentityUser);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.UpdateAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
+        Mock.Get(globalSettings);
+
+        SetupUserAccess(backOfficeSecurityAccessor, backOfficeSecurity, user);
+        SetupPasswordSuccess(umbracoMembersUserManager, passwordChanger, false);
+
+        Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
+        Mock.Get(memberService).SetupSequence(
+                x => x.GetByEmail(It.IsAny<string>()))
+            .Returns(() => null)
+            .Returns(() => member);
+
+        var sut = CreateSut(
+            memberService,
+            memberTypeService,
+            memberGroupService,
+            umbracoMembersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            passwordChanger,
+            globalSettings);
+
+        // act
+        var result = await sut.PostSave(fakeMemberData);
+
+        // assert
+        Assert.IsNotNull(result.Result);
+        Assert.IsNull(result.Value);
+    }
+
+    private static void SetupUserAccess(IBackOfficeSecurityAccessor backOfficeSecurityAccessor, IBackOfficeSecurity backOfficeSecurity, IUser user)
+    {
+        Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
+        Mock.Get(user).Setup(x => x.AllowedSections).Returns(new[] { "member" });
+        Mock.Get(backOfficeSecurity).Setup(x => x.CurrentUser).Returns(user);
+    }
+
+    private static void SetupPasswordSuccess(
+        IMemberManager umbracoMembersUserManager,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        bool successful = true)
+    {
+        var passwordChanged = new PasswordChangedModel { ChangeError = null, ResetPassword = null };
+        if (!successful)
         {
-            // arrange
-            Member member = SetupMemberTestData(out MemberSave fakeMemberData, out MemberDisplay memberDisplay, ContentSaveAction.Save);
-            var membersIdentityUser = new MemberIdentityUser(123);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => membersIdentityUser);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.UpdateAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => Array.Empty<string>());
-            Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
-            Mock.Get(globalSettings);
-
-            SetupUserAccess(backOfficeSecurityAccessor, backOfficeSecurity, user);
-            SetupPasswordSuccess(umbracoMembersUserManager, passwordChanger);
-
-            Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
-            Mock.Get(memberService).Setup(x => x.GetById(It.IsAny<int>())).Returns(() => member);
-            Mock.Get(memberService).SetupSequence(
-                    x => x.GetByEmail(It.IsAny<string>()))
-                .Returns(() => null)
-                .Returns(() => member);
-
-
-            MemberController sut = CreateSut(memberService, memberTypeService, memberGroupService, umbracoMembersUserManager, dataTypeService, backOfficeSecurityAccessor, passwordChanger, globalSettings, user);
-
-            // act
-            ActionResult<MemberDisplay> result = await sut.PostSave(fakeMemberData);
-
-            // assert
-            Assert.IsNull(result.Result);
-            Assert.IsNotNull(result.Value);
-            AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
+            var attempt = Attempt.Fail(passwordChanged);
+            Mock.Get(passwordChanger)
+                .Setup(x => x.ChangePasswordWithIdentityAsync(
+                    It.IsAny<ChangingPasswordModel>(),
+                    umbracoMembersUserManager))
+                .ReturnsAsync(() => attempt);
         }
-
-        [Test]
-        [AutoMoqData]
-        public async Task PostSaveMember_SaveExisting_WhenAllIsSetupWithPasswordIncorrectly_ExpectFailureResponse(
-            [Frozen] IMemberManager umbracoMembersUserManager,
-            IMemberService memberService,
-            IMemberTypeService memberTypeService,
-            IMemberGroupService memberGroupService,
-            IDataTypeService dataTypeService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IBackOfficeSecurity backOfficeSecurity,
-            IPasswordChanger<MemberIdentityUser> passwordChanger,
-            IOptions<GlobalSettings> globalSettings,
-            IUser user)
+        else
         {
-            // arrange
-            Member member = SetupMemberTestData(out MemberSave fakeMemberData, out MemberDisplay memberDisplay, ContentSaveAction.Save);
-            var membersIdentityUser = new MemberIdentityUser(123);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => membersIdentityUser);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.UpdateAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
-            Mock.Get(globalSettings);
-
-            SetupUserAccess(backOfficeSecurityAccessor, backOfficeSecurity, user);
-            SetupPasswordSuccess(umbracoMembersUserManager, passwordChanger, false);
-
-            Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
-            Mock.Get(memberService).SetupSequence(
-                    x => x.GetByEmail(It.IsAny<string>()))
-                .Returns(() => null)
-                .Returns(() => member);
-
-
-            MemberController sut = CreateSut(memberService, memberTypeService, memberGroupService, umbracoMembersUserManager, dataTypeService, backOfficeSecurityAccessor, passwordChanger, globalSettings, user);
-
-            // act
-            ActionResult<MemberDisplay> result = await sut.PostSave(fakeMemberData);
-
-            // assert
-            Assert.IsNotNull(result.Result);
-            Assert.IsNull(result.Value);
+            var attempt = Attempt.Succeed(passwordChanged);
+            Mock.Get(passwordChanger)
+                .Setup(x => x.ChangePasswordWithIdentityAsync(
+                    It.IsAny<ChangingPasswordModel>(),
+                    umbracoMembersUserManager))
+                .ReturnsAsync(() => attempt);
         }
+    }
 
-        private static void SetupUserAccess(IBackOfficeSecurityAccessor backOfficeSecurityAccessor, IBackOfficeSecurity backOfficeSecurity, IUser user)
-        {
-            Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
-            Mock.Get(user).Setup(x => x.AllowedSections).Returns(new[] { "member" });
-            Mock.Get(backOfficeSecurity).Setup(x => x.CurrentUser).Returns(user);
-        }
+    [Test]
+    [AutoMoqData]
+    public void PostSaveMember_SaveNew_WhenMemberEmailAlreadyExists_ExpectFailResponse(
+        [Frozen] IMemberManager umbracoMembersUserManager,
+        IMemberService memberService,
+        IMemberTypeService memberTypeService,
+        IMemberGroupService memberGroupService,
+        IDataTypeService dataTypeService,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IBackOfficeSecurity backOfficeSecurity,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        IOptions<GlobalSettings> globalSettings,
+        IUser user)
+    {
+        // arrange
+        var member = SetupMemberTestData(out var fakeMemberData, out _, ContentSaveAction.SaveNew);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
+        Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.AddToRolesAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<IEnumerable<string>>()))
+            .ReturnsAsync(() => IdentityResult.Success);
 
-        private static void SetupPasswordSuccess(IMemberManager umbracoMembersUserManager, IPasswordChanger<MemberIdentityUser> passwordChanger, bool successful = true)
-        {
-            var passwordChanged = new PasswordChangedModel()
-            {
-                ChangeError = null,
-                ResetPassword = null
-            };
-            if (!successful)
-            {
-                var attempt = Attempt.Fail<PasswordChangedModel>(passwordChanged);
-                Mock.Get(passwordChanger)
-                   .Setup(x => x.ChangePasswordWithIdentityAsync(It.IsAny<ChangingPasswordModel>(), umbracoMembersUserManager))
-                   .ReturnsAsync(() => attempt);
-            }
-            else
-            {
-                var attempt = Attempt.Succeed<PasswordChangedModel>(passwordChanged);
-                Mock.Get(passwordChanger)
-                    .Setup(x => x.ChangePasswordWithIdentityAsync(It.IsAny<ChangingPasswordModel>(), umbracoMembersUserManager))
-                    .ReturnsAsync(() => attempt);
-            }
-        }
+        Mock.Get(memberService).SetupSequence(
+                x => x.GetByEmail(It.IsAny<string>()))
+            .Returns(() => member);
 
-        [Test]
-        [AutoMoqData]
-        public void PostSaveMember_SaveNew_WhenMemberEmailAlreadyExists_ExpectFailResponse(
-            [Frozen] IMemberManager umbracoMembersUserManager,
-            IMemberService memberService,
-            IMemberTypeService memberTypeService,
-            IMemberGroupService memberGroupService,
-            IDataTypeService dataTypeService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IBackOfficeSecurity backOfficeSecurity,
-            IPasswordChanger<MemberIdentityUser> passwordChanger,
-            IOptions<GlobalSettings> globalSettings,
-            IUser user)
-        {
-            // arrange
-            Member member = SetupMemberTestData(out MemberSave fakeMemberData, out MemberDisplay memberDisplay, ContentSaveAction.SaveNew);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.CreateAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
-            Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.AddToRolesAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<IEnumerable<string>>()))
-                .ReturnsAsync(() => IdentityResult.Success);
+        var sut = CreateSut(
+            memberService,
+            memberTypeService,
+            memberGroupService,
+            umbracoMembersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            passwordChanger,
+            globalSettings);
 
-            Mock.Get(memberService).SetupSequence(
-                    x => x.GetByEmail(It.IsAny<string>()))
-                .Returns(() => member);
+        // act
+        var result = sut.PostSave(fakeMemberData).Result;
+        var validation = result.Result as ValidationErrorResult;
 
-            MemberController sut = CreateSut(memberService, memberTypeService, memberGroupService, umbracoMembersUserManager, dataTypeService, backOfficeSecurityAccessor, passwordChanger, globalSettings, user);
+        // assert
+        Assert.IsNotNull(result.Result);
+        Assert.IsNull(result.Value);
+        Assert.AreEqual(StatusCodes.Status400BadRequest, validation?.StatusCode);
+    }
 
-            // act
-            ActionResult<MemberDisplay> result = sut.PostSave(fakeMemberData).Result;
-            var validation = result.Result as ValidationErrorResult;
+    [Test]
+    [AutoMoqData]
+    public async Task PostSaveMember_SaveExistingMember_WithNoRoles_Add1Role_ExpectSuccessResponse(
+        [Frozen] IMemberManager umbracoMembersUserManager,
+        IMemberService memberService,
+        IMemberTypeService memberTypeService,
+        IMemberGroupService memberGroupService,
+        IDataTypeService dataTypeService,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IBackOfficeSecurity backOfficeSecurity,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        IOptions<GlobalSettings> globalSettings,
+        IUser user)
+    {
+        // arrange
+        var roleName = "anyrole";
+        IMember member = SetupMemberTestData(out var fakeMemberData, out var memberDisplay, ContentSaveAction.Save);
+        fakeMemberData.Groups = new List<string> { roleName };
+        var membersIdentityUser = new MemberIdentityUser(123);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => membersIdentityUser);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.UpdateAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.AddToRolesAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<IEnumerable<string>>()))
+            .ReturnsAsync(() => IdentityResult.Success);
+        Mock.Get(umbracoMembersUserManager)
+            .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
+            .ReturnsAsync(() => Array.Empty<string>());
 
-            // assert
-            Assert.IsNotNull(result.Result);
-            Assert.IsNull(result.Value);
-            Assert.AreEqual(StatusCodes.Status400BadRequest, validation?.StatusCode);
-        }
+        Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
+        Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
+        Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
+        Mock.Get(memberService).Setup(x => x.GetById(It.IsAny<int>())).Returns(() => member);
 
-        [Test]
-        [AutoMoqData]
-        public async Task PostSaveMember_SaveExistingMember_WithNoRoles_Add1Role_ExpectSuccessResponse(
-            [Frozen] IMemberManager umbracoMembersUserManager,
-            IMemberService memberService,
-            IMemberTypeService memberTypeService,
-            IMemberGroupService memberGroupService,
-            IDataTypeService dataTypeService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IBackOfficeSecurity backOfficeSecurity,
-            IPasswordChanger<MemberIdentityUser> passwordChanger,
-            IOptions<GlobalSettings> globalSettings,
-            IUser user)
-        {
-            // arrange
-            var roleName = "anyrole";
-            IMember member = SetupMemberTestData(out MemberSave fakeMemberData, out MemberDisplay memberDisplay, ContentSaveAction.Save);
-            fakeMemberData.Groups = new List<string>()
-            {
-                roleName
-            };
-            var membersIdentityUser = new MemberIdentityUser(123);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => membersIdentityUser);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.ValidatePasswordAsync(It.IsAny<string>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.UpdateAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.AddToRolesAsync(It.IsAny<MemberIdentityUser>(), It.IsAny<IEnumerable<string>>()))
-                .ReturnsAsync(() => IdentityResult.Success);
-            Mock.Get(umbracoMembersUserManager)
-                .Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
-                .ReturnsAsync(() => Array.Empty<string>());
+        SetupUserAccess(backOfficeSecurityAccessor, backOfficeSecurity, user);
+        SetupPasswordSuccess(umbracoMembersUserManager, passwordChanger);
 
-            Mock.Get(memberTypeService).Setup(x => x.GetDefault()).Returns("fakeAlias");
-            Mock.Get(backOfficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(backOfficeSecurity);
-            Mock.Get(memberService).Setup(x => x.GetByUsername(It.IsAny<string>())).Returns(() => member);
-            Mock.Get(memberService).Setup(x => x.GetById(It.IsAny<int>())).Returns(() => member);
+        Mock.Get(memberService).SetupSequence(
+                x => x.GetByEmail(It.IsAny<string>()))
+            .Returns(() => null)
+            .Returns(() => member);
+        var sut = CreateSut(
+            memberService,
+            memberTypeService,
+            memberGroupService,
+            umbracoMembersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            passwordChanger,
+            globalSettings);
 
-            SetupUserAccess(backOfficeSecurityAccessor, backOfficeSecurity, user);
-            SetupPasswordSuccess(umbracoMembersUserManager, passwordChanger);
+        // act
+        var result = await sut.PostSave(fakeMemberData);
 
-            Mock.Get(memberService).SetupSequence(
-                    x => x.GetByEmail(It.IsAny<string>()))
-                .Returns(() => null)
-                .Returns(() => member);
-            MemberController sut = CreateSut(memberService, memberTypeService, memberGroupService, umbracoMembersUserManager, dataTypeService, backOfficeSecurityAccessor, passwordChanger, globalSettings, user);
+        // assert
+        Assert.IsNull(result.Result);
+        Assert.IsNotNull(result.Value);
+        Mock.Get(umbracoMembersUserManager)
+            .Verify(u => u.GetRolesAsync(membersIdentityUser));
+        Mock.Get(umbracoMembersUserManager)
+            .Verify(u => u.AddToRolesAsync(membersIdentityUser, new[] { roleName }));
+        Mock.Get(umbracoMembersUserManager)
+            .Verify(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()));
+        Mock.Get(memberService)
+            .Verify(m => m.Save(It.IsAny<Member>()));
+        AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
+    }
 
-            // act
-            ActionResult<MemberDisplay> result = await sut.PostSave(fakeMemberData);
+    /// <summary>
+    ///     Create member controller to test
+    /// </summary>
+    /// <param name="memberService">Member service</param>
+    /// <param name="memberTypeService">Member type service</param>
+    /// <param name="memberGroupService">Member group service</param>
+    /// <param name="membersUserManager">Members user manager</param>
+    /// <param name="dataTypeService">Data type service</param>
+    /// <param name="backOfficeSecurityAccessor">Back office security accessor</param>
+    /// <param name="passwordChanger">Password changer class</param>
+    /// <param name="globalSettings">The global settings</param>
+    /// <returns>A member controller for the tests</returns>
+    private MemberController CreateSut(
+        IMemberService memberService,
+        IMemberTypeService memberTypeService,
+        IMemberGroupService memberGroupService,
+        IUmbracoUserManager<MemberIdentityUser> membersUserManager,
+        IDataTypeService dataTypeService,
+        IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+        IPasswordChanger<MemberIdentityUser> passwordChanger,
+        IOptions<GlobalSettings> globalSettings)
+    {
+        var httpContextAccessor = new HttpContextAccessor();
 
-            // assert
-            Assert.IsNull(result.Result);
-            Assert.IsNotNull(result.Value);
-            Mock.Get(umbracoMembersUserManager)
-                .Verify(u => u.GetRolesAsync(membersIdentityUser));
-            Mock.Get(umbracoMembersUserManager)
-               .Verify(u => u.AddToRolesAsync(membersIdentityUser, new[] { roleName }));
-            Mock.Get(umbracoMembersUserManager)
-                .Verify(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()));
-            Mock.Get(memberService)
-                .Verify(m => m.Save(It.IsAny<Member>()));
-            AssertMemberDisplayPropertiesAreEqual(memberDisplay, result.Value);
-        }
+        var mockShortStringHelper = new MockShortStringHelper();
+        var textService = new Mock<ILocalizedTextService>();
+        var contentTypeBaseServiceProvider = new Mock<IContentTypeBaseServiceProvider>();
+        contentTypeBaseServiceProvider.Setup(x => x.GetContentTypeOf(It.IsAny<IContentBase>()))
+            .Returns(new ContentType(mockShortStringHelper, 123));
+        var contentAppFactories = new Mock<List<IContentAppFactory>>();
+        var mockContentAppFactoryCollection = new Mock<ILogger<ContentAppFactoryCollection>>();
+        var hybridBackOfficeSecurityAccessor = new BackOfficeSecurityAccessor(httpContextAccessor);
+        var contentAppFactoryCollection = new ContentAppFactoryCollection(
+            () => contentAppFactories.Object,
+            mockContentAppFactoryCollection.Object,
+            hybridBackOfficeSecurityAccessor);
+        var mockUserService = new Mock<IUserService>();
+        var commonMapper = new CommonMapper(
+            mockUserService.Object,
+            contentTypeBaseServiceProvider.Object,
+            contentAppFactoryCollection,
+            textService.Object);
+        var mockCultureDictionary = new Mock<ICultureDictionary>();
 
-        /// <summary>
-        /// Create member controller to test
-        /// </summary>
-        /// <param name="memberService">Member service</param>
-        /// <param name="memberTypeService">Member type service</param>
-        /// <param name="memberGroupService">Member group service</param>
-        /// <param name="membersUserManager">Members user manager</param>
-        /// <param name="dataTypeService">Data type service</param>
-        /// <param name="backOfficeSecurityAccessor">Back office security accessor</param>
-        /// <param name="mockPasswordChanger">Password changer class</param>
-        /// <returns>A member controller for the tests</returns>
-        private MemberController CreateSut(
-            IMemberService memberService,
-            IMemberTypeService memberTypeService,
-            IMemberGroupService memberGroupService,
-            IUmbracoUserManager<MemberIdentityUser> membersUserManager,
-            IDataTypeService dataTypeService,
-            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
-            IPasswordChanger<MemberIdentityUser> passwordChanger,
-            IOptions<GlobalSettings> globalSettings,
-            IUser user)
-        {
-            var httpContextAccessor = new HttpContextAccessor();
+        var mockPasswordConfig = new Mock<IOptions<MemberPasswordConfigurationSettings>>();
+        mockPasswordConfig.Setup(x => x.Value).Returns(() => new MemberPasswordConfigurationSettings());
+        var dataEditor = Mock.Of<IDataEditor>(
+            x => x.Type == EditorType.PropertyValue
+                 && x.Alias == Constants.PropertyEditors.Aliases.Label);
+        Mock.Get(dataEditor).Setup(x => x.GetValueEditor()).Returns(new TextOnlyValueEditor(
+            new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"),
+            textService.Object,
+            Mock.Of<IShortStringHelper>(),
+            Mock.Of<IJsonSerializer>(),
+            Mock.Of<IIOHelper>()));
 
-            var mockShortStringHelper = new MockShortStringHelper();
-            var textService = new Mock<ILocalizedTextService>();
-            var contentTypeBaseServiceProvider = new Mock<IContentTypeBaseServiceProvider>();
-            contentTypeBaseServiceProvider.Setup(x => x.GetContentTypeOf(It.IsAny<IContentBase>())).Returns(new ContentType(mockShortStringHelper, 123));
-            var contentAppFactories = new Mock<List<IContentAppFactory>>();
-            var mockContentAppFactoryCollection = new Mock<ILogger<ContentAppFactoryCollection>>();
-            var hybridBackOfficeSecurityAccessor = new BackOfficeSecurityAccessor(httpContextAccessor);
-            var contentAppFactoryCollection = new ContentAppFactoryCollection(
-                () => contentAppFactories.Object,
-                mockContentAppFactoryCollection.Object,
-                hybridBackOfficeSecurityAccessor);
-            var mockUserService = new Mock<IUserService>();
-            var commonMapper = new CommonMapper(
-                mockUserService.Object,
-                contentTypeBaseServiceProvider.Object,
-                contentAppFactoryCollection,
-                textService.Object);
-            var mockCultureDictionary = new Mock<ICultureDictionary>();
+        var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(() => new[] { dataEditor }));
 
-            var mockPasswordConfig = new Mock<IOptions<MemberPasswordConfigurationSettings>>();
-            mockPasswordConfig.Setup(x => x.Value).Returns(() => new MemberPasswordConfigurationSettings());
-            IDataEditor dataEditor = Mock.Of<IDataEditor>(
-                x => x.Type == EditorType.PropertyValue
-                     && x.Alias == Constants.PropertyEditors.Aliases.Label);
-            Mock.Get(dataEditor).Setup(x => x.GetValueEditor()).Returns(new TextOnlyValueEditor( new DataEditorAttribute(Constants.PropertyEditors.Aliases.TextBox, "Test Textbox", "textbox"), textService.Object, Mock.Of<IShortStringHelper>(), Mock.Of<IJsonSerializer>(), Mock.Of<IIOHelper>()));
-
-            var propertyEditorCollection = new PropertyEditorCollection(new DataEditorCollection(() => new[] { dataEditor }));
-
-            IMapDefinition memberMapDefinition = new MemberMapDefinition(
-                commonMapper,
-                new CommonTreeNodeMapper(Mock.Of<LinkGenerator>()),
-                new MemberTabsAndPropertiesMapper(
-                    mockCultureDictionary.Object,
-                    backOfficeSecurityAccessor,
-                    textService.Object,
-                    memberTypeService,
-                    memberService,
-                    memberGroupService,
-                    mockPasswordConfig.Object,
-                    contentTypeBaseServiceProvider.Object,
-                    propertyEditorCollection));
-
-            var map = new MapDefinitionCollection(() => new List<IMapDefinition>()
-            {
-                new global::Umbraco.Cms.Core.Models.Mapping.MemberMapDefinition(),
-                memberMapDefinition,
-                new ContentTypeMapDefinition(
-                    commonMapper,
-                    propertyEditorCollection,
-                    dataTypeService,
-                    new Mock<IFileService>().Object,
-                    new Mock<IContentTypeService>().Object,
-                    new Mock<IMediaTypeService>().Object,
-                    memberTypeService,
-                    new Mock<ILoggerFactory>().Object,
-                    mockShortStringHelper,
-                    globalSettings,
-                    new Mock<IHostingEnvironment>().Object,
-                    new Mock<IOptionsMonitor<ContentSettings>>().Object)
-            });
-            var scopeProvider = Mock.Of<ICoreScopeProvider>(x => x.CreateCoreScope(
-                It.IsAny<IsolationLevel>(),
-                It.IsAny<RepositoryCacheMode>(),
-                It.IsAny<IEventDispatcher>(),
-                It.IsAny<IScopedNotificationPublisher>(),
-                It.IsAny<bool?>(),
-                It.IsAny<bool>(),
-                It.IsAny<bool>()) == Mock.Of<ICoreScope>());
-
-            _mapper = new UmbracoMapper(map, scopeProvider);
-
-            return new MemberController(
-                new DefaultCultureDictionary(
-                    new Mock<ILocalizationService>().Object,
-                    NoAppCache.Instance),
-                new LoggerFactory(),
-                mockShortStringHelper,
-                new DefaultEventMessagesFactory(
-                    new Mock<IEventMessagesAccessor>().Object),
-                textService.Object,
-                propertyEditorCollection,
-                _mapper,
-                memberService,
-                memberTypeService,
-                (IMemberManager)membersUserManager,
-                dataTypeService,
+        IMapDefinition memberMapDefinition = new MemberMapDefinition(
+            commonMapper,
+            new CommonTreeNodeMapper(Mock.Of<LinkGenerator>()),
+            new MemberTabsAndPropertiesMapper(
+                mockCultureDictionary.Object,
                 backOfficeSecurityAccessor,
-                new ConfigurationEditorJsonSerializer(),
-                passwordChanger,
-                scopeProvider
-                );
-        }
+                textService.Object,
+                memberTypeService,
+                memberService,
+                memberGroupService,
+                mockPasswordConfig.Object,
+                contentTypeBaseServiceProvider.Object,
+                propertyEditorCollection));
 
-        /// <summary>
-        /// Setup all standard member data for test
-        /// </summary>
-        private Member SetupMemberTestData(
-            out MemberSave fakeMemberData,
-            out MemberDisplay memberDisplay,
-            ContentSaveAction contentAction)
+        var map = new MapDefinitionCollection(() => new List<IMapDefinition>
         {
-            // arrange
-            MemberType memberType = MemberTypeBuilder.CreateSimpleMemberType();
-            Member member = MemberBuilder.CreateSimpleMember(memberType, "Test Member", "test@example.com", "123", "test");
-            var memberId = 123;
-            member.Id = memberId;
+            new Cms.Core.Models.Mapping.MemberMapDefinition(),
+            memberMapDefinition,
+            new ContentTypeMapDefinition(
+                commonMapper,
+                propertyEditorCollection,
+                dataTypeService,
+                new Mock<IFileService>().Object,
+                new Mock<IContentTypeService>().Object,
+                new Mock<IMediaTypeService>().Object,
+                memberTypeService,
+                new Mock<ILoggerFactory>().Object,
+                mockShortStringHelper,
+                globalSettings,
+                new Mock<IHostingEnvironment>().Object,
+                new Mock<IOptionsMonitor<ContentSettings>>().Object),
+        });
+        var scopeProvider = Mock.Of<ICoreScopeProvider>(x => x.CreateCoreScope(
+            It.IsAny<IsolationLevel>(),
+            It.IsAny<RepositoryCacheMode>(),
+            It.IsAny<IEventDispatcher>(),
+            It.IsAny<IScopedNotificationPublisher>(),
+            It.IsAny<bool?>(),
+            It.IsAny<bool>(),
+            It.IsAny<bool>()) == Mock.Of<ICoreScope>());
 
-            // TODO: replace with builder for MemberSave and MemberDisplay
-            fakeMemberData = new MemberSave()
-            {
-                Id = memberId,
-                SortOrder = member.SortOrder,
-                ContentTypeId = memberType.Id,
-                Key = member.Key,
-                Password = new ChangingPasswordModel()
-                {
-                    Id = 456,
-                    NewPassword = member.RawPasswordValue,
-                    OldPassword = null
-                },
-                Name = member.Name,
-                Email = member.Email,
-                Username = member.Username,
-                PersistedContent = member,
-                PropertyCollectionDto = new ContentPropertyCollectionDto()
-                {
-                },
-                Groups = new List<string>(),
-                //Alias = "fakeAlias",
-                ContentTypeAlias = member.ContentTypeAlias,
-                Action = contentAction,
-                Icon = "icon-document",
-                Path = member.Path
-            };
+        _mapper = new UmbracoMapper(map, scopeProvider);
 
-            memberDisplay = new MemberDisplay
+        return new MemberController(
+            new DefaultCultureDictionary(
+                new Mock<ILocalizationService>().Object,
+                NoAppCache.Instance),
+            new LoggerFactory(),
+            mockShortStringHelper,
+            new DefaultEventMessagesFactory(
+                new Mock<IEventMessagesAccessor>().Object),
+            textService.Object,
+            propertyEditorCollection,
+            _mapper,
+            memberService,
+            memberTypeService,
+            (IMemberManager)membersUserManager,
+            dataTypeService,
+            backOfficeSecurityAccessor,
+            new ConfigurationEditorJsonSerializer(),
+            passwordChanger,
+            scopeProvider);
+    }
+
+    /// <summary>
+    ///     Setup all standard member data for test
+    /// </summary>
+    private Member SetupMemberTestData(
+        out MemberSave fakeMemberData,
+        out MemberDisplay memberDisplay,
+        ContentSaveAction contentAction)
+    {
+        // arrange
+        var memberType = MemberTypeBuilder.CreateSimpleMemberType();
+        var member = MemberBuilder.CreateSimpleMember(memberType, "Test Member", "test@example.com", "123", "test");
+        var memberId = 123;
+        member.Id = memberId;
+
+        // TODO: replace with builder for MemberSave and MemberDisplay
+        fakeMemberData = new MemberSave
+        {
+            Id = memberId,
+            SortOrder = member.SortOrder,
+            ContentTypeId = memberType.Id,
+            Key = member.Key,
+            Password = new ChangingPasswordModel { Id = 456, NewPassword = member.RawPasswordValue, OldPassword = null },
+            Name = member.Name,
+            Email = member.Email,
+            Username = member.Username,
+            PersistedContent = member,
+            PropertyCollectionDto = new ContentPropertyCollectionDto(),
+            Groups = new List<string>(),
+
+            // Alias = "fakeAlias",
+            ContentTypeAlias = member.ContentTypeAlias,
+            Action = contentAction,
+            Icon = "icon-document",
+            Path = member.Path,
+        };
+
+        memberDisplay = new MemberDisplay
+        {
+            Id = memberId,
+            SortOrder = member.SortOrder,
+            ContentTypeId = memberType.Id,
+            Key = member.Key,
+            Name = member.Name,
+            Email = member.Email,
+            Username = member.Username,
+
+            // Alias = "fakeAlias",
+            ContentTypeAlias = member.ContentTypeAlias,
+            ContentType = new ContentTypeBasic(),
+            ContentTypeName = member.ContentType.Name,
+            Icon = fakeMemberData.Icon,
+            Path = member.Path,
+            Tabs = new List<Tab<ContentPropertyDisplay>>
             {
-                Id = memberId,
-                SortOrder = member.SortOrder,
-                ContentTypeId = memberType.Id,
-                Key = member.Key,
-                Name = member.Name,
-                Email = member.Email,
-                Username = member.Username,
-                //Alias = "fakeAlias",
-                ContentTypeAlias = member.ContentTypeAlias,
-                ContentType = new ContentTypeBasic(),
-                ContentTypeName = member.ContentType.Name,
-                Icon = fakeMemberData.Icon,
-                Path = member.Path,
-                Tabs = new List<Tab<ContentPropertyDisplay>>
+                new()
                 {
-                    new()
+                    Alias = "test",
+                    Id = 77,
+                    Properties = new List<ContentPropertyDisplay>
                     {
-                        Alias = "test",
-                        Id = 77,
-                        Properties = new List<ContentPropertyDisplay>
+                        new() { Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}login" },
+                        new() { Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}email" },
+                        new()
                         {
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}login",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}email",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}password",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}membergroup",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}failedPasswordAttempts",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}approved",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lockedOut",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lastLockoutDate",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lastLoginDate",
-                            },
-                            new()
-                            {
-                                Alias = $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lastPasswordChangeDate",
-                            },
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}password",
+                        },
+                        new()
+                        {
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}membergroup",
+                        },
+                        new()
+                        {
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}failedPasswordAttempts",
+                        },
+                        new()
+                        {
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}approved",
+                        },
+                        new()
+                        {
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lockedOut",
+                        },
+                        new()
+                        {
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lastLockoutDate",
+                        },
+                        new()
+                        {
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lastLoginDate",
+                        },
+                        new()
+                        {
+                            Alias =
+                                $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}lastPasswordChangeDate",
                         },
                     },
                 },
-            };
+            },
+        };
 
-            return member;
-        }
+        return member;
+    }
 
-        /// <summary>
-        /// Check all member properties are equal
-        /// </summary>
-        /// <param name="memberDisplay"></param>
-        /// <param name="resultValue"></param>
-        private void AssertMemberDisplayPropertiesAreEqual(MemberDisplay memberDisplay, MemberDisplay resultValue)
+    /// <summary>
+    ///     Check all member properties are equal
+    /// </summary>
+    /// <param name="memberDisplay"></param>
+    /// <param name="resultValue"></param>
+    private void AssertMemberDisplayPropertiesAreEqual(MemberDisplay memberDisplay, MemberDisplay resultValue)
+    {
+        Assert.AreNotSame(memberDisplay, resultValue);
+        Assert.AreEqual(memberDisplay.Id, resultValue.Id);
+        Assert.AreEqual(memberDisplay.Alias, resultValue.Alias);
+        Assert.AreEqual(memberDisplay.Username, resultValue.Username);
+        Assert.AreEqual(memberDisplay.Email, resultValue.Email);
+        Assert.AreEqual(memberDisplay.AdditionalData, resultValue.AdditionalData);
+        Assert.AreEqual(memberDisplay.ContentApps, resultValue.ContentApps);
+        Assert.AreEqual(memberDisplay.ContentType.Alias, resultValue.ContentType.Alias);
+        Assert.AreEqual(memberDisplay.ContentTypeAlias, resultValue.ContentTypeAlias);
+        Assert.AreEqual(memberDisplay.ContentTypeName, resultValue.ContentTypeName);
+        Assert.AreEqual(memberDisplay.ContentTypeId, resultValue.ContentTypeId);
+        Assert.AreEqual(memberDisplay.Icon, resultValue.Icon);
+        Assert.AreEqual(memberDisplay.Errors, resultValue.Errors);
+        Assert.AreEqual(memberDisplay.Key, resultValue.Key);
+        Assert.AreEqual(memberDisplay.Name, resultValue.Name);
+        Assert.AreEqual(memberDisplay.Path, resultValue.Path);
+        Assert.AreEqual(memberDisplay.SortOrder, resultValue.SortOrder);
+        Assert.AreEqual(memberDisplay.Trashed, resultValue.Trashed);
+        Assert.AreEqual(memberDisplay.TreeNodeUrl, resultValue.TreeNodeUrl);
+
+        // TODO: can we check create/update dates when saving?
+        // Assert.AreEqual(memberDisplay.CreateDate, resultValue.CreateDate);
+        // Assert.AreEqual(memberDisplay.UpdateDate, resultValue.UpdateDate);
+
+        // TODO: check all properties
+        Assert.AreEqual(memberDisplay.Properties.Count(), resultValue.Properties.Count());
+        Assert.AreNotSame(memberDisplay.Properties, resultValue.Properties);
+        for (var index = 0; index < resultValue.Properties.Count(); index++)
         {
-            Assert.AreNotSame(memberDisplay, resultValue);
-            Assert.AreEqual(memberDisplay.Id, resultValue.Id);
-            Assert.AreEqual(memberDisplay.Alias, resultValue.Alias);
-            Assert.AreEqual(memberDisplay.Username, resultValue.Username);
-            Assert.AreEqual(memberDisplay.Email, resultValue.Email);
-            Assert.AreEqual(memberDisplay.AdditionalData, resultValue.AdditionalData);
-            Assert.AreEqual(memberDisplay.ContentApps, resultValue.ContentApps);
-            Assert.AreEqual(memberDisplay.ContentType.Alias, resultValue.ContentType.Alias);
-            Assert.AreEqual(memberDisplay.ContentTypeAlias, resultValue.ContentTypeAlias);
-            Assert.AreEqual(memberDisplay.ContentTypeName, resultValue.ContentTypeName);
-            Assert.AreEqual(memberDisplay.ContentTypeId, resultValue.ContentTypeId);
-            Assert.AreEqual(memberDisplay.Icon, resultValue.Icon);
-            Assert.AreEqual(memberDisplay.Errors, resultValue.Errors);
-            Assert.AreEqual(memberDisplay.Key, resultValue.Key);
-            Assert.AreEqual(memberDisplay.Name, resultValue.Name);
-            Assert.AreEqual(memberDisplay.Path, resultValue.Path);
-            Assert.AreEqual(memberDisplay.SortOrder, resultValue.SortOrder);
-            Assert.AreEqual(memberDisplay.Trashed, resultValue.Trashed);
-            Assert.AreEqual(memberDisplay.TreeNodeUrl, resultValue.TreeNodeUrl);
+            Assert.AreNotSame(
+                memberDisplay.Properties.GetItemByIndex(index),
+                resultValue.Properties.GetItemByIndex(index));
 
-            //TODO: can we check create/update dates when saving?
-            //Assert.AreEqual(memberDisplay.CreateDate, resultValue.CreateDate);
-            //Assert.AreEqual(memberDisplay.UpdateDate, resultValue.UpdateDate);
-
-            //TODO: check all properties
-            Assert.AreEqual(memberDisplay.Properties.Count(), resultValue.Properties.Count());
-            Assert.AreNotSame(memberDisplay.Properties, resultValue.Properties);
-            for (var index = 0; index < resultValue.Properties.Count(); index++)
-            {
-                Assert.AreNotSame(memberDisplay.Properties.GetItemByIndex(index), resultValue.Properties.GetItemByIndex(index));
-                //Assert.AreEqual(memberDisplay.Properties.GetItemByIndex(index), resultValue.Properties.GetItemByIndex(index));
-            }
+            // Assert.AreEqual(memberDisplay.Properties.GetItemByIndex(index), resultValue.Properties.GetItemByIndex(index));
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
index 473cd240b7..bddc4b70d0 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/UsersControllerTests.cs
@@ -10,26 +10,25 @@ using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers
-{
-    [TestFixture]
-    public class UsersControllerTests
-    {
-        [Test]
-        [AutoMoqData]
-        public void PostUnlockUsers_When_User_Lockout_Update_Fails_Expect_Failure_Response(
-            [Frozen] IBackOfficeUserManager backOfficeUserManager,
-            UsersController sut,
-            BackOfficeIdentityUser user,
-            int[] userIds,
-            string expectedMessage)
-        {
-            Mock.Get(backOfficeUserManager)
-                .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
-                .ReturnsAsync(user);
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Controllers;
 
-            var result = sut.PostUnlockUsers(userIds).Result as ObjectResult;
-            Assert.AreEqual(StatusCodes.Status400BadRequest, result.StatusCode);
-        }
+[TestFixture]
+public class UsersControllerTests
+{
+    [Test]
+    [AutoMoqData]
+    public void PostUnlockUsers_When_User_Lockout_Update_Fails_Expect_Failure_Response(
+        [Frozen] IBackOfficeUserManager backOfficeUserManager,
+        UsersController sut,
+        BackOfficeIdentityUser user,
+        int[] userIds,
+        string expectedMessage)
+    {
+        Mock.Get(backOfficeUserManager)
+            .Setup(x => x.FindByIdAsync(It.IsAny<string>()))
+            .ReturnsAsync(user);
+
+        var result = sut.PostUnlockUsers(userIds).Result as ObjectResult;
+        Assert.AreEqual(StatusCodes.Status400BadRequest, result.StatusCode);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs
index dd2c4cd424..abbd5cae2d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Extensions/ModelStateExtensionsTests.cs
@@ -1,133 +1,130 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Services;
-using Umbraco.Cms.Web.BackOffice.Extensions;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Extensions;
+
+[TestFixture]
+public class ModelStateExtensionsTests
 {
-    [TestFixture]
-    public class ModelStateExtensionsTests
+    [Test]
+    public void Get_Cultures_With_Errors()
     {
-        [Test]
-        public void Get_Cultures_With_Errors()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
-            ms.AddPropertyError(new ValidationResult("title missing"), "title", "en-US"); // variant property
+        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
+        ms.AddPropertyError(new ValidationResult("title missing"), "title", "en-US"); // variant property
 
-            IReadOnlyList<(string culture, string segment)> result = ms.GetVariantsWithErrors("en-US");
+        var result = ms.GetVariantsWithErrors("en-US");
 
-            // even though there are 2 errors, they are both for en-US since that is the default language and one of the errors is for an invariant property
-            Assert.AreEqual(1, result.Count);
-            Assert.AreEqual("en-US", result[0].culture);
+        // even though there are 2 errors, they are both for en-US since that is the default language and one of the errors is for an invariant property
+        Assert.AreEqual(1, result.Count);
+        Assert.AreEqual("en-US", result[0].culture);
 
-            ms = new ModelStateDictionary();
-            ms.AddVariantValidationError("en-US", null, "generic culture error");
+        ms = new ModelStateDictionary();
+        ms.AddVariantValidationError("en-US", null, "generic culture error");
 
-            result = ms.GetVariantsWithErrors("en-US");
+        result = ms.GetVariantsWithErrors("en-US");
 
-            Assert.AreEqual(1, result.Count);
-            Assert.AreEqual("en-US", result[0].culture);
-        }
+        Assert.AreEqual(1, result.Count);
+        Assert.AreEqual("en-US", result[0].culture);
+    }
 
-        [Test]
-        public void Get_Cultures_With_Property_Errors()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+    [Test]
+    public void Get_Cultures_With_Property_Errors()
+    {
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
-            ms.AddPropertyError(new ValidationResult("title missing"), "title", "en-US"); // variant property
+        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
+        ms.AddPropertyError(new ValidationResult("title missing"), "title", "en-US"); // variant property
 
-            IReadOnlyList<(string culture, string segment)> result = ms.GetVariantsWithPropertyErrors("en-US");
+        var result = ms.GetVariantsWithPropertyErrors("en-US");
 
-            // even though there are 2 errors, they are both for en-US since that is the default language and one of the errors is for an invariant property
-            Assert.AreEqual(1, result.Count);
-            Assert.AreEqual("en-US", result[0].culture);
-        }
+        // even though there are 2 errors, they are both for en-US since that is the default language and one of the errors is for an invariant property
+        Assert.AreEqual(1, result.Count);
+        Assert.AreEqual("en-US", result[0].culture);
+    }
 
-        [Test]
-        public void Add_Invariant_Property_Error()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+    [Test]
+    public void Add_Invariant_Property_Error()
+    {
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
+        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null); // invariant property
 
-            Assert.AreEqual("_Properties.headerImage.invariant.null", ms.Keys.First());
-        }
+        Assert.AreEqual("_Properties.headerImage.invariant.null", ms.Keys.First());
+    }
 
-        [Test]
-        public void Add_Variant_Property_Error()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+    [Test]
+    public void Add_Variant_Property_Error()
+    {
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", "en-US"); // variant property
+        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", "en-US"); // variant property
 
-            Assert.AreEqual("_Properties.headerImage.en-US.null", ms.Keys.First());
-        }
+        Assert.AreEqual("_Properties.headerImage.en-US.null", ms.Keys.First());
+    }
 
-        [Test]
-        public void Add_Invariant_Segment_Property_Error()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+    [Test]
+    public void Add_Invariant_Segment_Property_Error()
+    {
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null, "mySegment"); // invariant/segment property
+        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", null, "mySegment"); // invariant/segment property
 
-            Assert.AreEqual("_Properties.headerImage.invariant.mySegment", ms.Keys.First());
-        }
+        Assert.AreEqual("_Properties.headerImage.invariant.mySegment", ms.Keys.First());
+    }
 
-        [Test]
-        public void Add_Variant_Segment_Property_Error()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+    [Test]
+    public void Add_Variant_Segment_Property_Error()
+    {
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", "en-US", "mySegment"); // variant/segment property
+        ms.AddPropertyError(new ValidationResult("no header image"), "headerImage", "en-US", "mySegment"); // variant/segment property
 
-            Assert.AreEqual("_Properties.headerImage.en-US.mySegment", ms.Keys.First());
-        }
+        Assert.AreEqual("_Properties.headerImage.en-US.mySegment", ms.Keys.First());
+    }
 
-        [Test]
-        public void Add_Invariant_Segment_Field_Property_Error()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+    [Test]
+    public void Add_Invariant_Segment_Field_Property_Error()
+    {
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image", new[] { "myField" }), "headerImage", null, "mySegment"); // invariant/segment property
+        ms.AddPropertyError(new ValidationResult("no header image", new[] { "myField" }), "headerImage", null, "mySegment"); // invariant/segment property
 
-            Assert.AreEqual("_Properties.headerImage.invariant.mySegment.myField", ms.Keys.First());
-        }
+        Assert.AreEqual("_Properties.headerImage.invariant.mySegment.myField", ms.Keys.First());
+    }
 
-        [Test]
-        public void Add_Variant_Segment_Field_Property_Error()
-        {
-            var ms = new ModelStateDictionary();
-            var localizationService = new Mock<ILocalizationService>();
-            localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
+    [Test]
+    public void Add_Variant_Segment_Field_Property_Error()
+    {
+        var ms = new ModelStateDictionary();
+        var localizationService = new Mock<ILocalizationService>();
+        localizationService.Setup(x => x.GetDefaultLanguageIsoCode()).Returns("en-US");
 
-            ms.AddPropertyError(new ValidationResult("no header image", new[] { "myField" }), "headerImage", "en-US", "mySegment"); // variant/segment property
+        ms.AddPropertyError(new ValidationResult("no header image", new[] { "myField" }), "headerImage", "en-US", "mySegment"); // variant/segment property
 
-            Assert.AreEqual("_Properties.headerImage.en-US.mySegment.myField", ms.Keys.First());
-        }
+        Assert.AreEqual("_Properties.headerImage.en-US.mySegment.myField", ms.Keys.First());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs
index 5dd39fcf80..5a4f153a26 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/AppendUserModifiedHeaderAttributeTests.cs
@@ -8,123 +8,123 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Primitives;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Models.Membership;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Web.BackOffice.Filters;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
+
+[TestFixture]
+public class AppendUserModifiedHeaderAttributeTests
 {
-    [TestFixture]
-    public class AppendUserModifiedHeaderAttributeTests
+    [Test]
+    public void Appends_Header_When_No_User_Parameter_Provider()
     {
-        [Test]
-        public void Appends_Header_When_No_User_Parameter_Provider()
+        // Arrange
+        var context = CreateContext();
+        var attribute = new AppendUserModifiedHeaderAttribute();
+
+        // Act
+        attribute.OnActionExecuting(context);
+
+        // Assert
+        context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out var headerValue);
+        Assert.AreEqual("1", headerValue[0]);
+    }
+
+    [Test]
+    public void Does_Not_Append_Header_If_Already_Exists()
+    {
+        // Arrange
+        var context = CreateContext("0");
+        var attribute = new AppendUserModifiedHeaderAttribute();
+
+        // Act
+        attribute.OnActionExecuting(context);
+
+        // Assert
+        context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out var headerValue);
+        Assert.AreEqual("0", headerValue[0]);
+    }
+
+    [Test]
+    public void Does_Not_Append_Header_When_User_Id_Parameter_Provided_And_Does_Not_Match_Current_User()
+    {
+        // Arrange
+        var context = CreateContext(actionArgument: new KeyValuePair<string, object>("UserId", 99));
+        var userIdParameter = "UserId";
+        var attribute = new AppendUserModifiedHeaderAttribute(userIdParameter);
+
+        // Act
+        attribute.OnActionExecuting(context);
+
+        // Assert
+        Assert.IsFalse(context.HttpContext.Response.Headers.ContainsKey("X-Umb-User-Modified"));
+    }
+
+    [Test]
+    public void Appends_Header_When_User_Id_Parameter_Provided_And_Does_Not_Match_Current_User()
+    {
+        // Arrange
+        var context = CreateContext(actionArgument: new KeyValuePair<string, object>("UserId", 100));
+        var userIdParameter = "UserId";
+        var attribute = new AppendUserModifiedHeaderAttribute(userIdParameter);
+
+        // Act
+        attribute.OnActionExecuting(context);
+
+        // Assert
+        context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out var headerValue);
+        Assert.AreEqual("1", headerValue[0]);
+    }
+
+    private static ActionExecutingContext CreateContext(
+        string headerValue = null,
+        KeyValuePair<string, object> actionArgument = default)
+    {
+        var httpContext = new DefaultHttpContext();
+        if (!string.IsNullOrEmpty(headerValue))
         {
-            // Arrange
-            ActionExecutingContext context = CreateContext();
-            var attribute = new AppendUserModifiedHeaderAttribute();
-
-            // Act
-            attribute.OnActionExecuting(context);
-
-            // Assert
-            context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out StringValues headerValue);
-            Assert.AreEqual("1", headerValue[0]);
+            httpContext.Response.Headers.Add("X-Umb-User-Modified", headerValue);
         }
 
-        [Test]
-        public void Does_Not_Append_Header_If_Already_Exists()
+        var currentUserMock = new Mock<IUser>();
+        currentUserMock
+            .SetupGet(x => x.Id)
+            .Returns(100);
+
+        var backofficeSecurityMock = new Mock<IBackOfficeSecurity>();
+        backofficeSecurityMock
+            .SetupGet(x => x.CurrentUser)
+            .Returns(currentUserMock.Object);
+
+        var backofficeSecurityAccessorMock = new Mock<IBackOfficeSecurityAccessor>();
+        backofficeSecurityAccessorMock
+            .SetupGet(x => x.BackOfficeSecurity)
+            .Returns(backofficeSecurityMock.Object);
+
+        var serviceProviderMock = new Mock<IServiceProvider>();
+        serviceProviderMock
+            .Setup(x => x.GetService(typeof(IBackOfficeSecurityAccessor)))
+            .Returns(backofficeSecurityAccessorMock.Object);
+
+        httpContext.RequestServices = serviceProviderMock.Object;
+
+        var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
+
+        var context = new ActionExecutingContext(
+            actionContext,
+            new List<IFilterMetadata>(),
+            new Dictionary<string, object>(),
+            new Mock<Controller>().Object);
+
+        if (!EqualityComparer<KeyValuePair<string, object>>.Default.Equals(actionArgument, default))
         {
-            // Arrange
-            ActionExecutingContext context = CreateContext(headerValue: "0");
-            var attribute = new AppendUserModifiedHeaderAttribute();
-
-            // Act
-            attribute.OnActionExecuting(context);
-
-            // Assert
-            context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out StringValues headerValue);
-            Assert.AreEqual("0", headerValue[0]);
+            context.ActionArguments.Add(actionArgument);
         }
 
-        [Test]
-        public void Does_Not_Append_Header_When_User_Id_Parameter_Provided_And_Does_Not_Match_Current_User()
-        {
-            // Arrange
-            ActionExecutingContext context = CreateContext(actionArgument: new KeyValuePair<string, object>("UserId", 99));
-            var userIdParameter = "UserId";
-            var attribute = new AppendUserModifiedHeaderAttribute(userIdParameter);
-
-            // Act
-            attribute.OnActionExecuting(context);
-
-            // Assert
-            Assert.IsFalse(context.HttpContext.Response.Headers.ContainsKey("X-Umb-User-Modified"));
-        }
-
-        [Test]
-        public void Appends_Header_When_User_Id_Parameter_Provided_And_Does_Not_Match_Current_User()
-        {
-            // Arrange
-            ActionExecutingContext context = CreateContext(actionArgument: new KeyValuePair<string, object>("UserId", 100));
-            var userIdParameter = "UserId";
-            var attribute = new AppendUserModifiedHeaderAttribute(userIdParameter);
-
-            // Act
-            attribute.OnActionExecuting(context);
-
-            // Assert
-            context.HttpContext.Response.Headers.TryGetValue("X-Umb-User-Modified", out StringValues headerValue);
-            Assert.AreEqual("1", headerValue[0]);
-        }
-
-        private static ActionExecutingContext CreateContext(string headerValue = null, KeyValuePair<string, object> actionArgument = default)
-        {
-            var httpContext = new DefaultHttpContext();
-            if (!string.IsNullOrEmpty(headerValue))
-            {
-                httpContext.Response.Headers.Add("X-Umb-User-Modified", headerValue);
-            }
-
-            var currentUserMock = new Mock<IUser>();
-            currentUserMock
-                .SetupGet(x => x.Id)
-                .Returns(100);
-
-            var backofficeSecurityMock = new Mock<IBackOfficeSecurity>();
-            backofficeSecurityMock
-                .SetupGet(x => x.CurrentUser)
-                .Returns(currentUserMock.Object);
-
-            var backofficeSecurityAccessorMock = new Mock<IBackOfficeSecurityAccessor>();
-            backofficeSecurityAccessorMock
-                .SetupGet(x => x.BackOfficeSecurity)
-                .Returns(backofficeSecurityMock.Object);
-
-            var serviceProviderMock = new Mock<IServiceProvider>();
-            serviceProviderMock
-                .Setup(x => x.GetService(typeof(IBackOfficeSecurityAccessor)))
-                .Returns(backofficeSecurityAccessorMock.Object);
-
-            httpContext.RequestServices = serviceProviderMock.Object;
-
-            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
-
-            var context = new ActionExecutingContext(
-                actionContext,
-                new List<IFilterMetadata>(),
-                new Dictionary<string, object>(),
-                new Mock<Controller>().Object);
-
-            if (!EqualityComparer<KeyValuePair<string, object>>.Default.Equals(actionArgument, default))
-            {
-                context.ActionArguments.Add(actionArgument);
-            }
-
-            return context;
-        }
+        return context;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
index 4a18ecf393..97181a743e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ContentModelValidatorTests.cs
@@ -9,103 +9,106 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.PropertyEditors.Validation;
 using Umbraco.Cms.Web.BackOffice.PropertyEditors.Validation;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters
- {
-     [TestFixture]
-     public class ContentModelValidatorTests
-     {
-         [Test]
-         public void Test_Serializer()
-         {
-             var nestedLevel2 = new ComplexEditorValidationResult();
-             var id1 = Guid.NewGuid();
-             var addressInfoElementTypeResult = new ComplexEditorElementTypeValidationResult("addressInfo", id1);
-             var cityPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("city");
-             cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is invalid"));
-             cityPropertyTypeResult.AddValidationResult(new ValidationResult("City cannot be empty"));
-             cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is not in Australia", new[] { "country" }));
-             cityPropertyTypeResult.AddValidationResult(new ValidationResult("Not a capital city", new[] { "capital" }));
-             addressInfoElementTypeResult.ValidationResults.Add(cityPropertyTypeResult);
-             nestedLevel2.ValidationResults.Add(addressInfoElementTypeResult);
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
 
-             var nestedLevel1 = new ComplexEditorValidationResult();
-             var id2 = Guid.NewGuid();
-             var addressBookElementTypeResult = new ComplexEditorElementTypeValidationResult("addressBook", id2);
-             var addressesPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("addresses");
-             addressesPropertyTypeResult.AddValidationResult(new ValidationResult("Must have at least 3 addresses", new[] { "counter" }));
-             addressesPropertyTypeResult.AddValidationResult(nestedLevel2); // This is a nested result within the level 1
-             addressBookElementTypeResult.ValidationResults.Add(addressesPropertyTypeResult);
-             var bookNamePropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("bookName");
-             bookNamePropertyTypeResult.AddValidationResult(new ValidationResult("Invalid address book name", new[] { "book" }));
-             addressBookElementTypeResult.ValidationResults.Add(bookNamePropertyTypeResult);
-             nestedLevel1.ValidationResults.Add(addressBookElementTypeResult);
+[TestFixture]
+public class ContentModelValidatorTests
+{
+    [Test]
+    public void Test_Serializer()
+    {
+        var nestedLevel2 = new ComplexEditorValidationResult();
+        var id1 = Guid.NewGuid();
+        var addressInfoElementTypeResult = new ComplexEditorElementTypeValidationResult("addressInfo", id1);
+        var cityPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("city");
+        cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is invalid"));
+        cityPropertyTypeResult.AddValidationResult(new ValidationResult("City cannot be empty"));
+        cityPropertyTypeResult.AddValidationResult(new ValidationResult("City is not in Australia", new[] { "country" }));
+        cityPropertyTypeResult.AddValidationResult(new ValidationResult("Not a capital city", new[] { "capital" }));
+        addressInfoElementTypeResult.ValidationResults.Add(cityPropertyTypeResult);
+        nestedLevel2.ValidationResults.Add(addressInfoElementTypeResult);
 
-             var id3 = Guid.NewGuid();
-             var addressBookElementTypeResult2 = new ComplexEditorElementTypeValidationResult("addressBook", id3);
-             var addressesPropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("addresses");
-             addressesPropertyTypeResult2.AddValidationResult(new ValidationResult("Must have at least 2 addresses", new[] { "counter" }));
-             addressBookElementTypeResult2.ValidationResults.Add(addressesPropertyTypeResult);
-             var bookNamePropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("bookName");
-             bookNamePropertyTypeResult2.AddValidationResult(new ValidationResult("Name is too long"));
-             addressBookElementTypeResult2.ValidationResults.Add(bookNamePropertyTypeResult2);
-             nestedLevel1.ValidationResults.Add(addressBookElementTypeResult2);
+        var nestedLevel1 = new ComplexEditorValidationResult();
+        var id2 = Guid.NewGuid();
+        var addressBookElementTypeResult = new ComplexEditorElementTypeValidationResult("addressBook", id2);
+        var addressesPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("addresses");
+        addressesPropertyTypeResult.AddValidationResult(new ValidationResult("Must have at least 3 addresses", new[] { "counter" }));
+        addressesPropertyTypeResult.AddValidationResult(nestedLevel2); // This is a nested result within the level 1
+        addressBookElementTypeResult.ValidationResults.Add(addressesPropertyTypeResult);
+        var bookNamePropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("bookName");
+        bookNamePropertyTypeResult.AddValidationResult(
+            new ValidationResult("Invalid address book name", new[] { "book" }));
+        addressBookElementTypeResult.ValidationResults.Add(bookNamePropertyTypeResult);
+        nestedLevel1.ValidationResults.Add(addressBookElementTypeResult);
 
-             // books is the outer most validation result and doesn't have it's own direct ValidationResult errors
-             var outerError = new ComplexEditorValidationResult();
-             var id4 = Guid.NewGuid();
-             var addressBookCollectionElementTypeResult = new ComplexEditorElementTypeValidationResult("addressBookCollection", id4);
-             var booksPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("books");
-             booksPropertyTypeResult.AddValidationResult(nestedLevel1); // books is the outer most validation result
-             addressBookCollectionElementTypeResult.ValidationResults.Add(booksPropertyTypeResult);
-             outerError.ValidationResults.Add(addressBookCollectionElementTypeResult);
+        var id3 = Guid.NewGuid();
+        var addressBookElementTypeResult2 = new ComplexEditorElementTypeValidationResult("addressBook", id3);
+        var addressesPropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("addresses");
+        addressesPropertyTypeResult2.AddValidationResult(new ValidationResult("Must have at least 2 addresses", new[] { "counter" }));
+        addressBookElementTypeResult2.ValidationResults.Add(addressesPropertyTypeResult);
+        var bookNamePropertyTypeResult2 = new ComplexEditorPropertyTypeValidationResult("bookName");
+        bookNamePropertyTypeResult2.AddValidationResult(new ValidationResult("Name is too long"));
+        addressBookElementTypeResult2.ValidationResults.Add(bookNamePropertyTypeResult2);
+        nestedLevel1.ValidationResults.Add(addressBookElementTypeResult2);
 
-             var serialized = JsonConvert.SerializeObject(outerError, Formatting.Indented, new ValidationResultConverter());
-             Console.WriteLine(serialized);
+        // books is the outer most validation result and doesn't have it's own direct ValidationResult errors
+        var outerError = new ComplexEditorValidationResult();
+        var id4 = Guid.NewGuid();
+        var addressBookCollectionElementTypeResult =
+            new ComplexEditorElementTypeValidationResult("addressBookCollection", id4);
+        var booksPropertyTypeResult = new ComplexEditorPropertyTypeValidationResult("books");
+        booksPropertyTypeResult.AddValidationResult(nestedLevel1); // books is the outer most validation result
+        addressBookCollectionElementTypeResult.ValidationResults.Add(booksPropertyTypeResult);
+        outerError.ValidationResults.Add(addressBookCollectionElementTypeResult);
 
-             JArray jsonError = JsonConvert.DeserializeObject<JArray>(serialized);
+        var serialized = JsonConvert.SerializeObject(outerError, Formatting.Indented, new ValidationResultConverter());
+        Console.WriteLine(serialized);
 
-             Assert.IsNotNull(jsonError.SelectToken("$[0]"));
-             Assert.AreEqual(id4.ToString(), jsonError.SelectToken("$[0].$id").Value<string>());
-             Assert.AreEqual("addressBookCollection", jsonError.SelectToken("$[0].$elementTypeAlias").Value<string>());
-             Assert.AreEqual(string.Empty, jsonError.SelectToken("$[0].ModelState['_Properties.books.invariant.null'][0]").Value<string>());
+        var jsonError = JsonConvert.DeserializeObject<JArray>(serialized);
 
-             var error0 = jsonError.SelectToken("$[0].books") as JArray;
-             Assert.IsNotNull(error0);
-             Assert.AreEqual(id2.ToString(), error0.SelectToken("$[0].$id").Value<string>());
-             Assert.AreEqual("addressBook", error0.SelectToken("$[0].$elementTypeAlias").Value<string>());
-             Assert.IsNotNull(error0.SelectToken("$[0].ModelState"));
-             Assert.AreEqual(string.Empty, error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
-             var error1 = error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
-             Assert.IsNotNull(error1);
-             Assert.AreEqual(1, error1.Count);
-             var error2 = error0.SelectToken("$[0].ModelState['_Properties.bookName.invariant.null.book']") as JArray;
-             Assert.IsNotNull(error2);
-             Assert.AreEqual(1, error2.Count);
+        Assert.IsNotNull(jsonError.SelectToken("$[0]"));
+        Assert.AreEqual(id4.ToString(), jsonError.SelectToken("$[0].$id").Value<string>());
+        Assert.AreEqual("addressBookCollection", jsonError.SelectToken("$[0].$elementTypeAlias").Value<string>());
+        Assert.AreEqual(string.Empty, jsonError.SelectToken("$[0].ModelState['_Properties.books.invariant.null'][0]").Value<string>());
 
-             Assert.AreEqual(id3.ToString(), error0.SelectToken("$[1].$id").Value<string>());
-             Assert.AreEqual("addressBook", error0.SelectToken("$[1].$elementTypeAlias").Value<string>());
-             Assert.IsNotNull(error0.SelectToken("$[1].ModelState"));
-             Assert.AreEqual(string.Empty, error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
-             var error6 = error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
-             Assert.IsNotNull(error6);
-             Assert.AreEqual(1, error6.Count);
-             var error7 = error0.SelectToken("$[1].ModelState['_Properties.bookName.invariant.null']") as JArray;
-             Assert.IsNotNull(error7);
-             Assert.AreEqual(1, error7.Count);
+        var error0 = jsonError.SelectToken("$[0].books") as JArray;
+        Assert.IsNotNull(error0);
+        Assert.AreEqual(id2.ToString(), error0.SelectToken("$[0].$id").Value<string>());
+        Assert.AreEqual("addressBook", error0.SelectToken("$[0].$elementTypeAlias").Value<string>());
+        Assert.IsNotNull(error0.SelectToken("$[0].ModelState"));
+        Assert.AreEqual(string.Empty, error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
+        var error1 = error0.SelectToken("$[0].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
+        Assert.IsNotNull(error1);
+        Assert.AreEqual(1, error1.Count);
+        var error2 = error0.SelectToken("$[0].ModelState['_Properties.bookName.invariant.null.book']") as JArray;
+        Assert.IsNotNull(error2);
+        Assert.AreEqual(1, error2.Count);
 
-             Assert.IsNotNull(error0.SelectToken("$[0].addresses"));
-             Assert.AreEqual(id1.ToString(), error0.SelectToken("$[0].addresses[0].$id").Value<string>());
-             Assert.AreEqual("addressInfo", error0.SelectToken("$[0].addresses[0].$elementTypeAlias").Value<string>());
-             Assert.IsNotNull(error0.SelectToken("$[0].addresses[0].ModelState"));
-             var error3 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.country']") as JArray;
-             Assert.IsNotNull(error3);
-             Assert.AreEqual(1, error3.Count);
-             var error4 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.capital']") as JArray;
-             Assert.IsNotNull(error4);
-             Assert.AreEqual(1, error4.Count);
-             var error5 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null']") as JArray;
-             Assert.IsNotNull(error5);
-             Assert.AreEqual(2, error5.Count);
-         }
-     }
- }
+        Assert.AreEqual(id3.ToString(), error0.SelectToken("$[1].$id").Value<string>());
+        Assert.AreEqual("addressBook", error0.SelectToken("$[1].$elementTypeAlias").Value<string>());
+        Assert.IsNotNull(error0.SelectToken("$[1].ModelState"));
+        Assert.AreEqual(string.Empty, error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null'][0]").Value<string>());
+        var error6 = error0.SelectToken("$[1].ModelState['_Properties.addresses.invariant.null.counter']") as JArray;
+        Assert.IsNotNull(error6);
+        Assert.AreEqual(1, error6.Count);
+        var error7 = error0.SelectToken("$[1].ModelState['_Properties.bookName.invariant.null']") as JArray;
+        Assert.IsNotNull(error7);
+        Assert.AreEqual(1, error7.Count);
+
+        Assert.IsNotNull(error0.SelectToken("$[0].addresses"));
+        Assert.AreEqual(id1.ToString(), error0.SelectToken("$[0].addresses[0].$id").Value<string>());
+        Assert.AreEqual("addressInfo", error0.SelectToken("$[0].addresses[0].$elementTypeAlias").Value<string>());
+        Assert.IsNotNull(error0.SelectToken("$[0].addresses[0].ModelState"));
+        var error3 =
+            error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.country']") as JArray;
+        Assert.IsNotNull(error3);
+        Assert.AreEqual(1, error3.Count);
+        var error4 =
+            error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null.capital']") as JArray;
+        Assert.IsNotNull(error4);
+        Assert.AreEqual(1, error4.Count);
+        var error5 = error0.SelectToken("$[0].addresses[0].ModelState['_Properties.city.invariant.null']") as JArray;
+        Assert.IsNotNull(error5);
+        Assert.AreEqual(2, error5.Count);
+    }
+}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs
index 4da095c121..08e704c692 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/FilterAllowedOutgoingContentAttributeTests.cs
@@ -19,159 +19,158 @@ using Umbraco.Cms.Tests.Common.Builders.Extensions;
 using Umbraco.Cms.Web.BackOffice.Filters;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
+
+[TestFixture]
+public class FilterAllowedOutgoingContentAttributeTests
 {
-    [TestFixture]
-    public class FilterAllowedOutgoingContentAttributeTests
+    [Test]
+    public void GetValueFromResponse_Already_EnumerableContent()
     {
-        [Test]
-        public void GetValueFromResponse_Already_EnumerableContent()
+        var expected = new List<ContentItemBasic> { new() };
+
+        var att = new FilterAllowedOutgoingContentFilter(
+            expected.GetType(),
+            null,
+            ActionBrowse.ActionLetter,
+            Mock.Of<IUserService>(),
+            Mock.Of<IEntityService>(),
+            AppCaches.Disabled,
+            Mock.Of<IBackOfficeSecurityAccessor>());
+
+        var result = att.GetValueFromResponse(new ObjectResult(expected));
+
+        Assert.AreEqual(expected, result);
+    }
+
+    [Test]
+    public void GetValueFromResponse_From_Property()
+    {
+        var expected = new List<ContentItemBasic> { new() };
+        var container = new MyTestClass { MyList = expected };
+
+        var att = new FilterAllowedOutgoingContentFilter(
+            expected.GetType(),
+            nameof(MyTestClass.MyList),
+            ActionBrowse.ActionLetter,
+            Mock.Of<IUserService>(),
+            Mock.Of<IEntityService>(),
+            AppCaches.Disabled,
+            Mock.Of<IBackOfficeSecurityAccessor>());
+
+        var result = att.GetValueFromResponse(new ObjectResult(container));
+
+        Assert.AreEqual(expected, result);
+    }
+
+    [Test]
+    public void GetValueFromResponse_Returns_Null_Not_Found_Property()
+    {
+        var expected = new List<ContentItemBasic> { new() };
+        var container = new MyTestClass { MyList = expected };
+
+        var att = new FilterAllowedOutgoingContentFilter(
+            expected.GetType(),
+            "DontFind",
+            ActionBrowse.ActionLetter,
+            Mock.Of<IUserService>(),
+            Mock.Of<IEntityService>(),
+            AppCaches.Disabled,
+            Mock.Of<IBackOfficeSecurityAccessor>());
+
+        var actual = att.GetValueFromResponse(new ObjectResult(container));
+
+        Assert.IsNull(actual);
+    }
+
+    [Test]
+    public void Filter_On_Start_Node()
+    {
+        var user = CreateUser(9, 5);
+        var userServiceMock = new Mock<IUserService>();
+        var userService = userServiceMock.Object;
+        var entityServiceMock = new Mock<IEntityService>();
+        entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
+            .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 5 && entity.Path == "-1,5") });
+        var entityService = entityServiceMock.Object;
+
+        var list = new List<ContentItemBasic>();
+        var att = new FilterAllowedOutgoingContentFilter(
+            list.GetType(),
+            null,
+            ActionBrowse.ActionLetter,
+            userService,
+            entityService,
+            AppCaches.Disabled,
+            Mock.Of<IBackOfficeSecurityAccessor>());
+
+        var path = string.Empty;
+        for (var i = 0; i < 10; i++)
         {
-            var expected = new List<ContentItemBasic>() { new ContentItemBasic() };
-
-            var att = new FilterAllowedOutgoingContentFilter(
-                expected.GetType(),
-                null,
-                ActionBrowse.ActionLetter,
-                Mock.Of<IUserService>(),
-                Mock.Of<IEntityService>(),
-                AppCaches.Disabled,
-                Mock.Of<IBackOfficeSecurityAccessor>());
-
-            dynamic result = att.GetValueFromResponse(new ObjectResult(expected));
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [Test]
-        public void GetValueFromResponse_From_Property()
-        {
-            var expected = new List<ContentItemBasic>() { new ContentItemBasic() };
-            var container = new MyTestClass() { MyList = expected };
-
-            var att = new FilterAllowedOutgoingContentFilter(
-                expected.GetType(),
-                nameof(MyTestClass.MyList),
-                ActionBrowse.ActionLetter,
-                Mock.Of<IUserService>(),
-                Mock.Of<IEntityService>(),
-                AppCaches.Disabled,
-                Mock.Of<IBackOfficeSecurityAccessor>());
-
-            dynamic result = att.GetValueFromResponse(new ObjectResult(container));
-
-            Assert.AreEqual(expected, result);
-        }
-
-        [Test]
-        public void GetValueFromResponse_Returns_Null_Not_Found_Property()
-        {
-            var expected = new List<ContentItemBasic>() { new ContentItemBasic() };
-            var container = new MyTestClass() { MyList = expected };
-
-            var att = new FilterAllowedOutgoingContentFilter(
-                expected.GetType(),
-                "DontFind",
-                ActionBrowse.ActionLetter,
-                Mock.Of<IUserService>(),
-                Mock.Of<IEntityService>(),
-                AppCaches.Disabled,
-                Mock.Of<IBackOfficeSecurityAccessor>());
-
-            dynamic actual = att.GetValueFromResponse(new ObjectResult(container));
-
-            Assert.IsNull(actual);
-        }
-
-        [Test]
-        public void Filter_On_Start_Node()
-        {
-            IUser user = CreateUser(id: 9, startContentId: 5);
-            var userServiceMock = new Mock<IUserService>();
-            IUserService userService = userServiceMock.Object;
-            var entityServiceMock = new Mock<IEntityService>();
-            entityServiceMock.Setup(x => x.GetAllPaths(It.IsAny<UmbracoObjectTypes>(), It.IsAny<int[]>()))
-                .Returns(new[] { Mock.Of<TreeEntityPath>(entity => entity.Id == 5 && entity.Path == "-1,5") });
-            IEntityService entityService = entityServiceMock.Object;
-
-            var list = new List<ContentItemBasic>();
-            var att = new FilterAllowedOutgoingContentFilter(
-                list.GetType(),
-                null,
-                ActionBrowse.ActionLetter,
-                userService,
-                entityService,
-                AppCaches.Disabled,
-                Mock.Of<IBackOfficeSecurityAccessor>());
-
-            var path = string.Empty;
-            for (var i = 0; i < 10; i++)
+            if (i > 0 && path.EndsWith(",") == false)
             {
-                if (i > 0 && path.EndsWith(",") == false)
-                {
-                    path += ",";
-                }
-
-                path += i.ToInvariantString();
-                list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = i, Path = path });
+                path += ",";
             }
 
-            att.FilterBasedOnStartNode(list, user);
-
-            Assert.AreEqual(5, list.Count);
-       }
-
-        [Test]
-        public void Filter_On_Permissions()
-        {
-            var list = new List<ContentItemBasic>();
-            for (var i = 0; i < 10; i++)
-            {
-                list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = -1 });
-            }
-
-            var ids = list.Select(x => (int)x.Id).ToArray();
-
-            IUser user = CreateUser(id: 9, startContentId: 0);
-
-            var userServiceMock = new Mock<IUserService>();
-
-            // We're only assigning 3 nodes browse permissions so that is what we expect as a result
-            var permissions = new EntityPermissionCollection
-            {
-                new EntityPermission(9876, 1, new string[] { ActionBrowse.ActionLetter.ToString() }),
-                new EntityPermission(9876, 2, new string[] { ActionBrowse.ActionLetter.ToString() }),
-                new EntityPermission(9876, 3, new string[] { ActionBrowse.ActionLetter.ToString() }),
-                new EntityPermission(9876, 4, new string[] { ActionUpdate.ActionLetter.ToString() })
-            };
-            userServiceMock.Setup(x => x.GetPermissions(user, ids)).Returns(permissions);
-            IUserService userService = userServiceMock.Object;
-
-            var att = new FilterAllowedOutgoingContentFilter(
-                list.GetType(),
-                null,
-                ActionBrowse.ActionLetter,
-                userService,
-                Mock.Of<IEntityService>(),
-                AppCaches.Disabled,
-                Mock.Of<IBackOfficeSecurityAccessor>());
-            att.FilterBasedOnPermissions(list, user);
-
-            Assert.AreEqual(3, list.Count);
-            Assert.AreEqual(1, list.ElementAt(0).Id);
-            Assert.AreEqual(2, list.ElementAt(1).Id);
-            Assert.AreEqual(3, list.ElementAt(2).Id);
+            path += i.ToInvariantString();
+            list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = i, Path = path });
         }
 
-        private IUser CreateUser(int id = 0, int? startContentId = null) =>
-            new UserBuilder()
-                .WithId(id)
-                .WithStartContentIds(startContentId.HasValue ? new[] { startContentId.Value } : new int[0])
-                .Build();
+        att.FilterBasedOnStartNode(list, user);
 
-        private class MyTestClass
+        Assert.AreEqual(5, list.Count);
+    }
+
+    [Test]
+    public void Filter_On_Permissions()
+    {
+        var list = new List<ContentItemBasic>();
+        for (var i = 0; i < 10; i++)
         {
-            public IEnumerable<ContentItemBasic> MyList { get; set; }
+            list.Add(new ContentItemBasic { Id = i, Name = "Test" + i, ParentId = -1 });
         }
+
+        var ids = list.Select(x => (int)x.Id).ToArray();
+
+        var user = CreateUser(9, 0);
+
+        var userServiceMock = new Mock<IUserService>();
+
+        // We're only assigning 3 nodes browse permissions so that is what we expect as a result
+        var permissions = new EntityPermissionCollection
+        {
+            new(9876, 1, new[] { ActionBrowse.ActionLetter.ToString() }),
+            new(9876, 2, new[] { ActionBrowse.ActionLetter.ToString() }),
+            new(9876, 3, new[] { ActionBrowse.ActionLetter.ToString() }),
+            new(9876, 4, new[] { ActionUpdate.ActionLetter.ToString() }),
+        };
+        userServiceMock.Setup(x => x.GetPermissions(user, ids)).Returns(permissions);
+        var userService = userServiceMock.Object;
+
+        var att = new FilterAllowedOutgoingContentFilter(
+            list.GetType(),
+            null,
+            ActionBrowse.ActionLetter,
+            userService,
+            Mock.Of<IEntityService>(),
+            AppCaches.Disabled,
+            Mock.Of<IBackOfficeSecurityAccessor>());
+        att.FilterBasedOnPermissions(list, user);
+
+        Assert.AreEqual(3, list.Count);
+        Assert.AreEqual(1, list.ElementAt(0).Id);
+        Assert.AreEqual(2, list.ElementAt(1).Id);
+        Assert.AreEqual(3, list.ElementAt(2).Id);
+    }
+
+    private IUser CreateUser(int id = 0, int? startContentId = null) =>
+        new UserBuilder()
+            .WithId(id)
+            .WithStartContentIds(startContentId.HasValue ? new[] { startContentId.Value } : new int[0])
+            .Build();
+
+    private class MyTestClass
+    {
+        public IEnumerable<ContentItemBasic> MyList { get; set; }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs
index 49508fbac4..0248c02216 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Filters/ValidationFilterAttributeTests.cs
@@ -12,57 +12,56 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Web.BackOffice.Filters;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Filters;
+
+[TestFixture]
+public class ValidationFilterAttributeTests
 {
-    [TestFixture]
-    public class ValidationFilterAttributeTests
+    [Test]
+    public void Does_Not_Set_Result_When_No_Errors_In_Model_State()
     {
-        [Test]
-        public void Does_Not_Set_Result_When_No_Errors_In_Model_State()
+        // Arrange
+        var context = CreateContext();
+        var attribute = new ValidationFilterAttribute();
+
+        // Act
+        attribute.OnActionExecuting(context);
+
+        // Assert
+        Assert.IsNull(context.Result);
+    }
+
+    [Test]
+    public void Returns_Bad_Request_When_Errors_In_Model_State()
+    {
+        // Arrange
+        var context = CreateContext(true);
+        var attribute = new ValidationFilterAttribute();
+
+        // Act
+        attribute.OnActionExecuting(context);
+
+        // Assert
+        var typedResult = context.Result as BadRequestObjectResult;
+        Assert.IsNotNull(typedResult);
+    }
+
+    private static ActionExecutingContext CreateContext(bool withError = false)
+    {
+        var httpContext = new DefaultHttpContext();
+
+        var modelState = new ModelStateDictionary();
+        if (withError)
         {
-            // Arrange
-            ActionExecutingContext context = CreateContext();
-            var attribute = new ValidationFilterAttribute();
-
-            // Act
-            attribute.OnActionExecuting(context);
-
-            // Assert
-            Assert.IsNull(context.Result);
+            modelState.AddModelError(string.Empty, "Error");
         }
 
-        [Test]
-        public void Returns_Bad_Request_When_Errors_In_Model_State()
-        {
-            // Arrange
-            ActionExecutingContext context = CreateContext(withError: true);
-            var attribute = new ValidationFilterAttribute();
+        var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor(), modelState);
 
-            // Act
-            attribute.OnActionExecuting(context);
-
-            // Assert
-            var typedResult = context.Result as BadRequestObjectResult;
-            Assert.IsNotNull(typedResult);
-        }
-
-        private static ActionExecutingContext CreateContext(bool withError = false)
-        {
-            var httpContext = new DefaultHttpContext();
-
-            var modelState = new ModelStateDictionary();
-            if (withError)
-            {
-                modelState.AddModelError(string.Empty, "Error");
-            }
-
-            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor(), modelState);
-
-            return new ActionExecutingContext(
-                actionContext,
-                new List<IFilterMetadata>(),
-                new Dictionary<string, object>(),
-                new Mock<Controller>().Object);
-        }
+        return new ActionExecutingContext(
+            actionContext,
+            new List<IFilterMetadata>(),
+            new Dictionary<string, object>(),
+            new Mock<Controller>().Object);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilderTests.cs
index 06cf2fad43..9ea6bfe02d 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeAuthenticationBuilderTests.cs
@@ -6,39 +6,32 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Web.BackOffice.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security;
+
+[TestFixture]
+public class BackOfficeAuthenticationBuilderTests
 {
-    [TestFixture]
-    public class BackOfficeAuthenticationBuilderTests
+    [Test]
+    public void EnsureBackOfficeScheme_When_Backoffice_Auth_Scheme_Expect_Updated_SignInScheme()
     {
-        [Test]
-        public void EnsureBackOfficeScheme_When_Backoffice_Auth_Scheme_Expect_Updated_SignInScheme()
-        {
-            var scheme = $"{Constants.Security.BackOfficeExternalAuthenticationTypePrefix}test";
-            var options = new RemoteAuthenticationOptions
-            {
-                SignInScheme = "my_cookie"
-            };
+        var scheme = $"{Constants.Security.BackOfficeExternalAuthenticationTypePrefix}test";
+        var options = new RemoteAuthenticationOptions { SignInScheme = "my_cookie" };
 
-            var sut = new BackOfficeAuthenticationBuilder.EnsureBackOfficeScheme<RemoteAuthenticationOptions>();
-            sut.PostConfigure(scheme, options);
+        var sut = new BackOfficeAuthenticationBuilder.EnsureBackOfficeScheme<RemoteAuthenticationOptions>();
+        sut.PostConfigure(scheme, options);
 
-            Assert.AreEqual(options.SignInScheme, Constants.Security.BackOfficeExternalAuthenticationType);
-        }
-
-        [Test]
-        public void EnsureBackOfficeScheme_When_Not_Backoffice_Auth_Scheme_Expect_No_Change()
-        {
-            var scheme = "test";
-            var options = new RemoteAuthenticationOptions
-            {
-                SignInScheme = "my_cookie"
-            };
-
-            var sut = new BackOfficeAuthenticationBuilder.EnsureBackOfficeScheme<RemoteAuthenticationOptions>();
-            sut.PostConfigure(scheme, options);
-
-            Assert.AreNotEqual(options.SignInScheme, Constants.Security.BackOfficeExternalAuthenticationType);
-        }
+        Assert.AreEqual(options.SignInScheme, Constants.Security.BackOfficeExternalAuthenticationType);
     }
-}
\ No newline at end of file
+
+    [Test]
+    public void EnsureBackOfficeScheme_When_Not_Backoffice_Auth_Scheme_Expect_No_Change()
+    {
+        var scheme = "test";
+        var options = new RemoteAuthenticationOptions { SignInScheme = "my_cookie" };
+
+        var sut = new BackOfficeAuthenticationBuilder.EnsureBackOfficeScheme<RemoteAuthenticationOptions>();
+        sut.PostConfigure(scheme, options);
+
+        Assert.AreNotEqual(options.SignInScheme, Constants.Security.BackOfficeExternalAuthenticationType);
+    }
+}
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
index 9754c2b0ab..b1881c132e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Security/BackOfficeCookieManagerTests.cs
@@ -14,105 +14,112 @@ using Umbraco.Cms.Tests.UnitTests.TestHelpers;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.BackOffice.Security;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.BackOffice.Security;
+
+[TestFixture]
+public class BackOfficeCookieManagerTests
 {
-    [TestFixture]
-    public class BackOfficeCookieManagerTests
+    [Test]
+    public void ShouldAuthenticateRequest_When_Not_Configured()
     {
-        [Test]
-        public void ShouldAuthenticateRequest_When_Not_Configured()
-        {
-            var globalSettings = new GlobalSettings();
+        var globalSettings = new GlobalSettings();
 
-            IRuntimeState runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Install);
-            var mgr = new BackOfficeCookieManager(
-                Mock.Of<IUmbracoContextAccessor>(),
-                runtime,
-                new UmbracoRequestPaths(Options.Create(globalSettings), TestHelper.GetHostingEnvironment()),
-                Mock.Of<IBasicAuthService>());
+        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Install);
+        var mgr = new BackOfficeCookieManager(
+            Mock.Of<IUmbracoContextAccessor>(),
+            runtime,
+            new UmbracoRequestPaths(Options.Create(globalSettings), TestHelper.GetHostingEnvironment()),
+            Mock.Of<IBasicAuthService>());
 
-            var result = mgr.ShouldAuthenticateRequest("/umbraco");
+        var result = mgr.ShouldAuthenticateRequest("/umbraco");
 
-            Assert.IsFalse(result);
-        }
+        Assert.IsFalse(result);
+    }
 
-        [Test]
-        public void ShouldAuthenticateRequest_When_Configured()
-        {
-            var globalSettings = new GlobalSettings();
+    [Test]
+    public void ShouldAuthenticateRequest_When_Configured()
+    {
+        var globalSettings = new GlobalSettings();
 
-            IRuntimeState runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
-            var mgr = new BackOfficeCookieManager(
-                Mock.Of<IUmbracoContextAccessor>(),
-                runtime,
-                new UmbracoRequestPaths(
-                    Options.Create(globalSettings),
-                    Mock.Of<IHostingEnvironment>(x => x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco")),
-                Mock.Of<IBasicAuthService>());
+        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
+        var mgr = new BackOfficeCookieManager(
+            Mock.Of<IUmbracoContextAccessor>(),
+            runtime,
+            new UmbracoRequestPaths(
+                Options.Create(globalSettings),
+                Mock.Of<IHostingEnvironment>(x =>
+                    x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco")),
+            Mock.Of<IBasicAuthService>());
 
-            var result = mgr.ShouldAuthenticateRequest("/umbraco");
+        var result = mgr.ShouldAuthenticateRequest("/umbraco");
 
-            Assert.IsTrue(result);
-        }
+        Assert.IsTrue(result);
+    }
 
-        [Test]
-        public void ShouldAuthenticateRequest_Is_Back_Office()
-        {
-            var globalSettings = new GlobalSettings();
+    [Test]
+    public void ShouldAuthenticateRequest_Is_Back_Office()
+    {
+        var globalSettings = new GlobalSettings();
 
-            IRuntimeState runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
+        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
 
-            GenerateAuthPaths(out var remainingTimeoutSecondsPath, out var isAuthPath);
+        GenerateAuthPaths(out var remainingTimeoutSecondsPath, out var isAuthPath);
 
-            var mgr = new BackOfficeCookieManager(
-                Mock.Of<IUmbracoContextAccessor>(),
-                runtime,
-                new UmbracoRequestPaths(
-                    Options.Create(globalSettings),
-                    Mock.Of<IHostingEnvironment>(x => x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" && x.ToAbsolute(Constants.SystemDirectories.Install) == "/install")),
-                Mock.Of<IBasicAuthService>());
+        var mgr = new BackOfficeCookieManager(
+            Mock.Of<IUmbracoContextAccessor>(),
+            runtime,
+            new UmbracoRequestPaths(
+                Options.Create(globalSettings),
+                Mock.Of<IHostingEnvironment>(x =>
+                    x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" &&
+                    x.ToAbsolute(Constants.SystemDirectories.Install) == "/install")),
+            Mock.Of<IBasicAuthService>());
 
-            var result = mgr.ShouldAuthenticateRequest(remainingTimeoutSecondsPath);
-            Assert.IsTrue(result);
+        var result = mgr.ShouldAuthenticateRequest(remainingTimeoutSecondsPath);
+        Assert.IsTrue(result);
 
-            result = mgr.ShouldAuthenticateRequest(isAuthPath);
-            Assert.IsTrue(result);
-        }
+        result = mgr.ShouldAuthenticateRequest(isAuthPath);
+        Assert.IsTrue(result);
+    }
 
-        [Test]
-        public void ShouldAuthenticateRequest_Not_Back_Office()
-        {
-            var globalSettings = new GlobalSettings();
+    [Test]
+    public void ShouldAuthenticateRequest_Not_Back_Office()
+    {
+        var globalSettings = new GlobalSettings();
 
-            IRuntimeState runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
+        var runtime = Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run);
 
-            var mgr = new BackOfficeCookieManager(
-                Mock.Of<IUmbracoContextAccessor>(),
-                runtime,
-                new UmbracoRequestPaths(
-                    Options.Create(globalSettings),
-                    Mock.Of<IHostingEnvironment>(x => x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" && x.ToAbsolute(Constants.SystemDirectories.Install) == "/install")),
-                Mock.Of<IBasicAuthService>());
+        var mgr = new BackOfficeCookieManager(
+            Mock.Of<IUmbracoContextAccessor>(),
+            runtime,
+            new UmbracoRequestPaths(
+                Options.Create(globalSettings),
+                Mock.Of<IHostingEnvironment>(x =>
+                    x.ApplicationVirtualPath == "/" && x.ToAbsolute(globalSettings.UmbracoPath) == "/umbraco" &&
+                    x.ToAbsolute(Constants.SystemDirectories.Install) == "/install")),
+            Mock.Of<IBasicAuthService>());
 
-            var result = mgr.ShouldAuthenticateRequest("/notbackoffice");
-            Assert.IsFalse(result);
-            result = mgr.ShouldAuthenticateRequest("/umbraco/api/notbackoffice");
-            Assert.IsFalse(result);
-            result = mgr.ShouldAuthenticateRequest("/umbraco/surface/notbackoffice");
-            Assert.IsFalse(result);
-        }
+        var result = mgr.ShouldAuthenticateRequest("/notbackoffice");
+        Assert.IsFalse(result);
+        result = mgr.ShouldAuthenticateRequest("/umbraco/api/notbackoffice");
+        Assert.IsFalse(result);
+        result = mgr.ShouldAuthenticateRequest("/umbraco/surface/notbackoffice");
+        Assert.IsFalse(result);
+    }
 
-        private void GenerateAuthPaths(out string remainingTimeoutSecondsPath, out string isAuthPath)
-        {
-            var controllerName = ControllerExtensions.GetControllerName<AuthenticationController>();
+    private void GenerateAuthPaths(out string remainingTimeoutSecondsPath, out string isAuthPath)
+    {
+        var controllerName = ControllerExtensions.GetControllerName<AuthenticationController>();
 
-            // this path is not a back office request even though it's in the same controller - it's a 'special' endpoint
-            var rPath = remainingTimeoutSecondsPath = $"/umbraco/{Constants.Web.Mvc.BackOfficePathSegment}/{Constants.Web.Mvc.BackOfficeApiArea}/{controllerName}/{nameof(AuthenticationController.GetRemainingTimeoutSeconds)}".ToLower();
+        // this path is not a back office request even though it's in the same controller - it's a 'special' endpoint
+        var rPath = remainingTimeoutSecondsPath =
+            $"/umbraco/{Constants.Web.Mvc.BackOfficePathSegment}/{Constants.Web.Mvc.BackOfficeApiArea}/{controllerName}/{nameof(AuthenticationController.GetRemainingTimeoutSeconds)}"
+                .ToLower();
 
-            // this is on the same controller but is considered a back office request
-            var aPath = isAuthPath = $"/umbraco/{Constants.Web.Mvc.BackOfficePathSegment}/{Constants.Web.Mvc.BackOfficeApiArea}/{controllerName}/{nameof(AuthenticationController.IsAuthenticated)}".ToLower();
-        }
+        // this is on the same controller but is considered a back office request
+        var aPath = isAuthPath =
+            $"/umbraco/{Constants.Web.Mvc.BackOfficePathSegment}/{Constants.Web.Mvc.BackOfficeApiArea}/{controllerName}/{nameof(AuthenticationController.IsAuthenticated)}"
+                .ToLower();
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs
index 5b4ce0835f..95853847e3 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ContentModelSerializationTests.cs
@@ -9,79 +9,71 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration
-{
-    [TestFixture]
-    public class ContentModelSerializationTests
-    {
-        [Test]
-        public void Content_Display_To_Json()
-        {
-            // create 3 tabs with 3 properties each
-            var tabs = new List<Tab<ContentPropertyDisplay>>();
-            for (var tabIndex = 0; tabIndex < 3; tabIndex++)
-            {
-                var props = new List<ContentPropertyDisplay>();
-                for (var propertyIndex = 0; propertyIndex < 3; propertyIndex++)
-                {
-                    props.Add(new ContentPropertyDisplay
-                    {
-                        Alias = "property" + propertyIndex,
-                        Label = "Property " + propertyIndex,
-                        Id = propertyIndex,
-                        Value = "value" + propertyIndex,
-                        Config = new Dictionary<string, object> { { propertyIndex.ToInvariantString(), "value" } },
-                        Description = "Description " + propertyIndex,
-                        View = "~/Views/View" + propertyIndex,
-                        HideLabel = false
-                    });
-                }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration;
 
-                tabs.Add(new Tab<ContentPropertyDisplay>()
+[TestFixture]
+public class ContentModelSerializationTests
+{
+    [Test]
+    public void Content_Display_To_Json()
+    {
+        // create 3 tabs with 3 properties each
+        var tabs = new List<Tab<ContentPropertyDisplay>>();
+        for (var tabIndex = 0; tabIndex < 3; tabIndex++)
+        {
+            var props = new List<ContentPropertyDisplay>();
+            for (var propertyIndex = 0; propertyIndex < 3; propertyIndex++)
+            {
+                props.Add(new ContentPropertyDisplay
                 {
-                    Alias = "Tab" + tabIndex,
-                    Label = "Tab" + tabIndex,
-                    Properties = props
+                    Alias = "property" + propertyIndex,
+                    Label = "Property " + propertyIndex,
+                    Id = propertyIndex,
+                    Value = "value" + propertyIndex,
+                    Config = new Dictionary<string, object> { { propertyIndex.ToInvariantString(), "value" } },
+                    Description = "Description " + propertyIndex,
+                    View = "~/Views/View" + propertyIndex,
+                    HideLabel = false,
                 });
             }
 
-            var displayModel = new ContentItemDisplay
+            tabs.Add(new Tab<ContentPropertyDisplay>
             {
-                Id = 1234,
-                Variants = new List<ContentVariantDisplay>
-                {
-                    new ContentVariantDisplay
-                    {
-                        Name = "Test",
-                        Tabs = tabs
-                    }
-                }
-            };
+                Alias = "Tab" + tabIndex,
+                Label = "Tab" + tabIndex,
+                Properties = props,
+            });
+        }
 
-            var json = JsonConvert.SerializeObject(displayModel);
+        var displayModel = new ContentItemDisplay
+        {
+            Id = 1234,
+            Variants = new List<ContentVariantDisplay> { new() { Name = "Test", Tabs = tabs } },
+        };
 
-            var jObject = JObject.Parse(json);
+        var json = JsonConvert.SerializeObject(displayModel);
 
-            Assert.AreEqual("1234", jObject["id"].ToString());
-            Assert.AreEqual("Test", jObject["variants"][0]["name"].ToString());
+        var jObject = JObject.Parse(json);
 
-            JToken jsonTabs = jObject["variants"][0]["tabs"];
-            Assert.AreEqual(3, jsonTabs.Count());
-            for (var tab = 0; tab < jsonTabs.Count(); tab++)
+        Assert.AreEqual("1234", jObject["id"].ToString());
+        Assert.AreEqual("Test", jObject["variants"][0]["name"].ToString());
+
+        var jsonTabs = jObject["variants"][0]["tabs"];
+        Assert.AreEqual(3, jsonTabs.Count());
+        for (var tab = 0; tab < jsonTabs.Count(); tab++)
+        {
+            Assert.AreEqual("Tab" + tab, jsonTabs[tab]["alias"].ToString());
+            Assert.AreEqual("Tab" + tab, jsonTabs[tab]["label"].ToString());
+            Assert.AreEqual(3, jsonTabs[tab]["properties"].Count());
+            for (var prop = 0; prop < jsonTabs[tab]["properties"].Count(); prop++)
             {
-                Assert.AreEqual("Tab" + tab, jsonTabs[tab]["alias"].ToString());
-                Assert.AreEqual("Tab" + tab, jsonTabs[tab]["label"].ToString());
-                Assert.AreEqual(3, jsonTabs[tab]["properties"].Count());
-                for (var prop = 0; prop < jsonTabs[tab]["properties"].Count(); prop++)
-                {
-                    Assert.AreEqual("property" + prop, jsonTabs[tab]["properties"][prop]["alias"].ToString());
-                    Assert.AreEqual("Property " + prop, jsonTabs[tab]["properties"][prop]["label"].ToString());
-                    Assert.AreEqual(prop, jsonTabs[tab]["properties"][prop]["id"].Value<int>());
-                    Assert.AreEqual("value" + prop, jsonTabs[tab]["properties"][prop]["value"].ToString());
-                    Assert.AreEqual("{\"" + prop + "\":\"value\"}", jsonTabs[tab]["properties"][prop]["config"].ToString(Formatting.None));
-                    Assert.AreEqual("Description " + prop, jsonTabs[tab]["properties"][prop]["description"].ToString());
-                    Assert.AreEqual(false, jsonTabs[tab]["properties"][prop]["hideLabel"].Value<bool>());
-                }
+                Assert.AreEqual("property" + prop, jsonTabs[tab]["properties"][prop]["alias"].ToString());
+                Assert.AreEqual("Property " + prop, jsonTabs[tab]["properties"][prop]["label"].ToString());
+                Assert.AreEqual(prop, jsonTabs[tab]["properties"][prop]["id"].Value<int>());
+                Assert.AreEqual("value" + prop, jsonTabs[tab]["properties"][prop]["value"].ToString());
+                Assert.AreEqual("{\"" + prop + "\":\"value\"}", jsonTabs[tab]["properties"][prop]["config"].ToString(Formatting.None));
+                Assert.AreEqual("Description " + prop, jsonTabs[tab]["properties"][prop]["description"].ToString());
+                Assert.AreEqual(false, jsonTabs[tab]["properties"][prop]["hideLabel"].Value<bool>());
             }
         }
     }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs
index f47e631cc8..123195df7a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/JsInitializationTests.cs
@@ -1,22 +1,22 @@
-// Copyright (c) Umbraco.
+// Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.WebAssets;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration
-{
-    [TestFixture]
-    public class JsInitializationTests
-    {
-        [Test]
-        public void Parse_Main()
-        {
-            var result = BackOfficeJavaScriptInitializer.WriteScript("[World]", "Hello", "Blah");
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration;
 
-            Assert.AreEqual(
-                @"LazyLoad.js([World], function () {
+[TestFixture]
+public class JsInitializationTests
+{
+    [Test]
+    public void Parse_Main()
+    {
+        var result = BackOfficeJavaScriptInitializer.WriteScript("[World]", "Hello", "Blah");
+
+        Assert.AreEqual(
+            @"LazyLoad.js([World], function () {
     //we need to set the legacy UmbClientMgr path
     if ((typeof UmbClientMgr) !== ""undefined"") {
         UmbClientMgr.setUmbracoPath('Hello');
@@ -27,7 +27,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration
         angular.bootstrap(document, ['Blah']);
 
     });
-});".StripWhitespace(), result.StripWhitespace());
-        }
+});".StripWhitespace(),
+            result.StripWhitespace());
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs
index e4bb0e4d27..04d11d6b91 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/AngularIntegration/ServerVariablesParserTests.cs
@@ -6,38 +6,36 @@ using System.Threading.Tasks;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Events;
-using Umbraco.Cms.Core.WebAssets;
 using Umbraco.Cms.Infrastructure.WebAssets;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.AngularIntegration;
+
+[TestFixture]
+public class ServerVariablesParserTests
 {
-    [TestFixture]
-    public class ServerVariablesParserTests
+    [Test]
+    public async Task Parse()
     {
-        [Test]
-        public async Task Parse()
+        var parser = new ServerVariablesParser(Mock.Of<IEventAggregator>());
+
+        var d = new Dictionary<string, object>
         {
-            var parser = new ServerVariablesParser(Mock.Of<IEventAggregator>());
+            { "test1", "Test 1" },
+            { "test2", "Test 2" },
+            { "test3", "Test 3" },
+            { "test4", "Test 4" },
+            { "test5", "Test 5" },
+        };
 
-            var d = new Dictionary<string, object>
-            {
-                { "test1", "Test 1" },
-                { "test2", "Test 2" },
-                { "test3", "Test 3" },
-                { "test4", "Test 4" },
-                { "test5", "Test 5" }
-            };
+        var output = (await parser.ParseAsync(d)).StripWhitespace();
 
-            var output = (await parser.ParseAsync(d)).StripWhitespace();
-
-            Assert.IsTrue(output.Contains(@"Umbraco.Sys.ServerVariables = {
+        Assert.IsTrue(output.Contains(@"Umbraco.Sys.ServerVariables = {
   ""test1"": ""Test 1"",
   ""test2"": ""Test 2"",
   ""test3"": ""Test 3"",
   ""test4"": ""Test 4"",
   ""test5"": ""Test 5""
 } ;".StripWhitespace()));
-        }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs
index 6936b2e5f0..844ebd6d9f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HtmlHelperExtensionMethodsTests.cs
@@ -11,110 +11,111 @@ using Moq;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Extensions;
+
+[TestFixture]
+public class HtmlHelperExtensionMethodsTests
 {
-    [TestFixture]
-    public class HtmlHelperExtensionMethodsTests
+    [SetUp]
+    public virtual void Initialize() =>
+
+        // Create an empty HtmlHelper.
+        _htmlHelper = new HtmlHelper(
+            Mock.Of<IHtmlGenerator>(),
+            Mock.Of<ICompositeViewEngine>(),
+            Mock.Of<IModelMetadataProvider>(),
+            Mock.Of<IViewBufferScope>(),
+            new HtmlTestEncoder(),
+            UrlEncoder.Default);
+
+    private const string SampleWithAnchorElement = "Hello world, this is some text <a href='blah'>with a link</a>";
+
+    private const string SampleWithBoldAndAnchorElements =
+        "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
+
+    private HtmlHelper _htmlHelper;
+
+    [Test]
+    public void Truncate_Simple()
     {
-        private const string SampleWithAnchorElement = "Hello world, this is some text <a href='blah'>with a link</a>";
-        private const string SampleWithBoldAndAnchorElements = "Hello world, <b>this</b> is some text <a href='blah'>with a link</a>";
+        var result = _htmlHelper.Truncate(SampleWithAnchorElement, 25).ToString();
 
-        [SetUp]
-        public virtual void Initialize() =>
+        Assert.AreEqual("Hello world, this is some&hellip;", result);
+    }
 
-            // Create an empty HtmlHelper.
-            _htmlHelper = new HtmlHelper(
-                Mock.Of<IHtmlGenerator>(),
-                Mock.Of<ICompositeViewEngine>(),
-                Mock.Of<IModelMetadataProvider>(),
-                Mock.Of<IViewBufferScope>(),
-                new HtmlTestEncoder(),
-                UrlEncoder.Default);
+    [Test]
+    public void When_Truncating_A_String_Ends_With_A_Space_We_Should_Trim_The_Space_Before_Appending_The_Ellipsis()
+    {
+        var result = _htmlHelper.Truncate(SampleWithAnchorElement, 26).ToString();
 
-        private HtmlHelper _htmlHelper;
+        Assert.AreEqual("Hello world, this is some&hellip;", result);
+    }
 
-        [Test]
-        public void Truncate_Simple()
-        {
-            var result = _htmlHelper.Truncate(SampleWithAnchorElement, 25).ToString();
+    [Test]
+    public void Truncate_Inside_Word()
+    {
+        var result = _htmlHelper.Truncate(SampleWithAnchorElement, 24).ToString();
 
-            Assert.AreEqual("Hello world, this is some&hellip;", result);
-        }
+        Assert.AreEqual("Hello world, this is som&hellip;", result);
+    }
 
-        [Test]
-        public void When_Truncating_A_String_Ends_With_A_Space_We_Should_Trim_The_Space_Before_Appending_The_Ellipsis()
-        {
-            var result = _htmlHelper.Truncate(SampleWithAnchorElement, 26).ToString();
+    [Test]
+    public void Truncate_With_Tag()
+    {
+        var result = _htmlHelper.Truncate(SampleWithAnchorElement, 35).ToString();
 
-            Assert.AreEqual("Hello world, this is some&hellip;", result);
-        }
+        Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
+    }
 
-        [Test]
-        public void Truncate_Inside_Word()
-        {
-            var result = _htmlHelper.Truncate(SampleWithAnchorElement, 24).ToString();
+    [Test]
+    public void Truncate_By_Words()
+    {
+        var result = _htmlHelper.TruncateByWords(SampleWithAnchorElement, 4).ToString();
 
-            Assert.AreEqual("Hello world, this is som&hellip;", result);
-        }
+        Assert.AreEqual("Hello world, this is&hellip;", result);
+    }
 
-        [Test]
-        public void Truncate_With_Tag()
-        {
-            var result = _htmlHelper.Truncate(SampleWithAnchorElement, 35).ToString();
+    [Test]
+    public void Truncate_By_Words_With_Tag()
+    {
+        var result = _htmlHelper.TruncateByWords(SampleWithBoldAndAnchorElements, 4).ToString();
 
-            Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
-        }
+        Assert.AreEqual("Hello world, <b>this</b> is&hellip;", result);
+    }
 
-        [Test]
-        public void Truncate_By_Words()
-        {
-            var result = _htmlHelper.TruncateByWords(SampleWithAnchorElement, 4).ToString();
+    [Test]
+    public void Truncate_By_Words_Mid_Tag()
+    {
+        var result = _htmlHelper.TruncateByWords(SampleWithAnchorElement, 7).ToString();
 
-            Assert.AreEqual("Hello world, this is&hellip;", result);
-        }
+        Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
+    }
 
-        [Test]
-        public void Truncate_By_Words_With_Tag()
-        {
-            var result = _htmlHelper.TruncateByWords(SampleWithBoldAndAnchorElements, 4).ToString();
+    [Test]
+    public void Strip_All_Html()
+    {
+        var result = _htmlHelper.StripHtml(SampleWithBoldAndAnchorElements, null).ToString();
 
-            Assert.AreEqual("Hello world, <b>this</b> is&hellip;", result);
-        }
+        Assert.AreEqual("Hello world, this is some text with a link", result);
+    }
 
-        [Test]
-        public void Truncate_By_Words_Mid_Tag()
-        {
-            var result = _htmlHelper.TruncateByWords(SampleWithAnchorElement, 7).ToString();
+    [Test]
+    public void Strip_Specific_Html()
+    {
+        string[] tags = { "b" };
 
-            Assert.AreEqual("Hello world, this is some text <a href='blah'>with&hellip;</a>", result);
-        }
+        var result = _htmlHelper.StripHtml(SampleWithBoldAndAnchorElements, tags).ToString();
 
-        [Test]
-        public void Strip_All_Html()
-        {
-            var result = _htmlHelper.StripHtml(SampleWithBoldAndAnchorElements, null).ToString();
+        Assert.AreEqual(SampleWithAnchorElement, result);
+    }
 
-            Assert.AreEqual("Hello world, this is some text with a link", result);
-        }
+    [Test]
+    public void Strip_Invalid_Html()
+    {
+        const string text = "Hello world, <bthis</b> is some text <a href='blah'>with a link</a>";
 
-        [Test]
-        public void Strip_Specific_Html()
-        {
-            string[] tags = { "b" };
+        var result = _htmlHelper.StripHtml(text).ToString();
 
-            var result = _htmlHelper.StripHtml(SampleWithBoldAndAnchorElements, tags).ToString();
-
-            Assert.AreEqual(SampleWithAnchorElement, result);
-        }
-
-        [Test]
-        public void Strip_Invalid_Html()
-        {
-            const string text = "Hello world, <bthis</b> is some text <a href='blah'>with a link</a>";
-
-            var result = _htmlHelper.StripHtml(text).ToString();
-
-            Assert.AreEqual("Hello world, is some text with a link", result);
-        }
+        Assert.AreEqual("Hello world, is some text with a link", result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs
index ba87c6b9c5..a687121b80 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/HttpContextExtensionTests.cs
@@ -7,36 +7,35 @@ using Microsoft.AspNetCore.Http;
 using NUnit.Framework;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Extensions;
+
+[TestFixture]
+public class HttpContextExtensionTests
 {
-    [TestFixture]
-    public class HttpContextExtensionTests
+    [Test]
+    public void TryGetBasicAuthCredentials_WithoutHeader_ReturnsFalse()
     {
-        [Test]
-        public void TryGetBasicAuthCredentials_WithoutHeader_ReturnsFalse()
-        {
-            var httpContext = new DefaultHttpContext();
+        var httpContext = new DefaultHttpContext();
 
-            var result = httpContext.TryGetBasicAuthCredentials(out string _, out string _);
+        var result = httpContext.TryGetBasicAuthCredentials(out var _, out var _);
 
-            Assert.IsFalse(result);
-        }
+        Assert.IsFalse(result);
+    }
 
-        [Test]
-        public void TryGetBasicAuthCredentials_WithHeader_ReturnsTrueWithCredentials()
-        {
-            const string Username = "fred";
-            const string Password = "test";
+    [Test]
+    public void TryGetBasicAuthCredentials_WithHeader_ReturnsTrueWithCredentials()
+    {
+        const string testUsername = "fred";
+        const string testPassword = "test";
 
-            var httpContext = new DefaultHttpContext();
-            var credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{Username}:{Password}"));
-            httpContext.Request.Headers.Add("Authorization", $"Basic {credentials}");
+        var httpContext = new DefaultHttpContext();
+        var credentials = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{testUsername}:{testPassword}"));
+        httpContext.Request.Headers.Add("Authorization", $"Basic {credentials}");
 
-            bool result = httpContext.TryGetBasicAuthCredentials(out string username, out string password);
+        var result = httpContext.TryGetBasicAuthCredentials(out var username, out var password);
 
-            Assert.IsTrue(result);
-            Assert.AreEqual(Username, username);
-            Assert.AreEqual(Password, password);
-        }
+        Assert.IsTrue(result);
+        Assert.AreEqual(testUsername, username);
+        Assert.AreEqual(testPassword, password);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs
index b3b1e64f94..d8f624dfb8 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Extensions/ImageCropperTemplateCoreExtensionsTests.cs
@@ -9,106 +9,102 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Extensions
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Extensions;
+
+[TestFixture]
+public class ImageCropperTemplateCoreExtensionsTests
 {
-    [TestFixture]
-    public class ImageCropperTemplateCoreExtensionsTests
+    [Test]
+    public void GetCropUrl_WithCropSpecifiedButNotFound_ReturnsNull()
     {
-        [Test]
-        public void GetCropUrl_WithCropSpecifiedButNotFound_ReturnsNull()
-        {
-            var imageUrl = "/test.jpg";
-            Mock<IImageUrlGenerator> imageUrlGenerator = CreateMockImageUrlGenerator();
-            var result = imageUrl.GetCropUrl(
-                imageUrlGenerator.Object,
-                new ImageCropperValue { },
-                imageCropMode: ImageCropMode.Crop,
-                cropAlias: "Missing");
+        var imageUrl = "/test.jpg";
+        var imageUrlGenerator = CreateMockImageUrlGenerator();
+        var result = imageUrl.GetCropUrl(
+            imageUrlGenerator.Object,
+            new ImageCropperValue(),
+            imageCropMode: ImageCropMode.Crop,
+            cropAlias: "Missing");
 
-            Assert.IsNull(result);
-        }
-
-        [Test]
-        public void GetCropUrl_WithCropSpecifiedAndUsingCropDimensions_CallsImageGeneratorWithCorrectParameters()
-        {
-            var imageUrl = "/test.jpg";
-            Mock<IImageUrlGenerator> imageUrlGenerator = CreateMockImageUrlGenerator();
-            var result = imageUrl.GetCropUrl(
-                imageUrlGenerator.Object,
-                CreateImageCropperValueWithCrops(),
-                imageCropMode: ImageCropMode.Crop,
-                cropAlias: "TestCrop",
-                useCropDimensions: true);
-
-            imageUrlGenerator
-                .Verify(x => x.GetImageUrl(
-                    It.Is<ImageUrlGenerationOptions>(y => y.Width == 100 &&
-                                                          y.Height == 200)));
-        }
-
-        [Test]
-        public void GetCropUrl_WithCropSpecifiedAndWidthAndHeightProvided_CallsImageGeneratorWithCorrectParameters()
-        {
-            var imageUrl = "/test.jpg";
-            Mock<IImageUrlGenerator> imageUrlGenerator = CreateMockImageUrlGenerator();
-            var result = imageUrl.GetCropUrl(
-                imageUrlGenerator.Object,
-                CreateImageCropperValueWithCrops(),
-                imageCropMode: ImageCropMode.Crop,
-                cropAlias: "TestCrop",
-                width: 50,
-                height: 80);
-
-            imageUrlGenerator
-                .Verify(x => x.GetImageUrl(
-                    It.Is<ImageUrlGenerationOptions>(y => y.Width == 50 &&
-                                                          y.Height == 80)));
-        }
-
-        [Test]
-        public void GetCropUrl_WithCropSpecifiedAndWidthOnlyProvided_CallsImageGeneratorWithCorrectParameters()
-        {
-            var imageUrl = "/test.jpg";
-            Mock<IImageUrlGenerator> imageUrlGenerator = CreateMockImageUrlGenerator();
-            var result = imageUrl.GetCropUrl(
-                imageUrlGenerator.Object,
-                CreateImageCropperValueWithCrops(),
-                imageCropMode: ImageCropMode.Crop,
-                cropAlias: "TestCrop",
-                width: 50);
-
-            imageUrlGenerator
-                .Verify(x => x.GetImageUrl(
-                    It.Is<ImageUrlGenerationOptions>(y => y.Width == 50 &&
-                                                          y.Height == 100)));
-        }
-
-        [Test]
-        public void GetCropUrl_WithCropSpecifiedAndHeightOnlyProvided_CallsImageGeneratorWithCorrectParameters()
-        {
-            var imageUrl = "/test.jpg";
-            Mock<IImageUrlGenerator> imageUrlGenerator = CreateMockImageUrlGenerator();
-            var result = imageUrl.GetCropUrl(
-                imageUrlGenerator.Object,
-                CreateImageCropperValueWithCrops(),
-                imageCropMode: ImageCropMode.Crop,
-                cropAlias: "TestCrop",
-                height: 50);
-
-            imageUrlGenerator
-                .Verify(x => x.GetImageUrl(
-                    It.Is<ImageUrlGenerationOptions>(y => y.Width == 25 &&
-                                                          y.Height == 50)));
-        }
-
-        private static Mock<IImageUrlGenerator> CreateMockImageUrlGenerator() => new Mock<IImageUrlGenerator>();
-
-        private static ImageCropperValue CreateImageCropperValueWithCrops() => new ImageCropperValue
-        {
-            Crops = new List<ImageCropperValue.ImageCropperCrop>
-                    {
-                        new ImageCropperValue.ImageCropperCrop { Alias = "TestCrop", Width = 100, Height = 200 },
-                    }
-        };
+        Assert.IsNull(result);
     }
+
+    [Test]
+    public void GetCropUrl_WithCropSpecifiedAndUsingCropDimensions_CallsImageGeneratorWithCorrectParameters()
+    {
+        var imageUrl = "/test.jpg";
+        var imageUrlGenerator = CreateMockImageUrlGenerator();
+        var result = imageUrl.GetCropUrl(
+            imageUrlGenerator.Object,
+            CreateImageCropperValueWithCrops(),
+            imageCropMode: ImageCropMode.Crop,
+            cropAlias: "TestCrop",
+            useCropDimensions: true);
+
+        imageUrlGenerator
+            .Verify(x => x.GetImageUrl(
+                It.Is<ImageUrlGenerationOptions>(y => y.Width == 100 &&
+                                                      y.Height == 200)));
+    }
+
+    [Test]
+    public void GetCropUrl_WithCropSpecifiedAndWidthAndHeightProvided_CallsImageGeneratorWithCorrectParameters()
+    {
+        var imageUrl = "/test.jpg";
+        var imageUrlGenerator = CreateMockImageUrlGenerator();
+        var result = imageUrl.GetCropUrl(
+            imageUrlGenerator.Object,
+            CreateImageCropperValueWithCrops(),
+            imageCropMode: ImageCropMode.Crop,
+            cropAlias: "TestCrop",
+            width: 50,
+            height: 80);
+
+        imageUrlGenerator
+            .Verify(x => x.GetImageUrl(
+                It.Is<ImageUrlGenerationOptions>(y => y.Width == 50 &&
+                                                      y.Height == 80)));
+    }
+
+    [Test]
+    public void GetCropUrl_WithCropSpecifiedAndWidthOnlyProvided_CallsImageGeneratorWithCorrectParameters()
+    {
+        var imageUrl = "/test.jpg";
+        var imageUrlGenerator = CreateMockImageUrlGenerator();
+        var result = imageUrl.GetCropUrl(
+            imageUrlGenerator.Object,
+            CreateImageCropperValueWithCrops(),
+            imageCropMode: ImageCropMode.Crop,
+            cropAlias: "TestCrop",
+            width: 50);
+
+        imageUrlGenerator
+            .Verify(x => x.GetImageUrl(
+                It.Is<ImageUrlGenerationOptions>(y => y.Width == 50 &&
+                                                      y.Height == 100)));
+    }
+
+    [Test]
+    public void GetCropUrl_WithCropSpecifiedAndHeightOnlyProvided_CallsImageGeneratorWithCorrectParameters()
+    {
+        var imageUrl = "/test.jpg";
+        var imageUrlGenerator = CreateMockImageUrlGenerator();
+        var result = imageUrl.GetCropUrl(
+            imageUrlGenerator.Object,
+            CreateImageCropperValueWithCrops(),
+            imageCropMode: ImageCropMode.Crop,
+            cropAlias: "TestCrop",
+            height: 50);
+
+        imageUrlGenerator
+            .Verify(x => x.GetImageUrl(
+                It.Is<ImageUrlGenerationOptions>(y => y.Width == 25 &&
+                                                      y.Height == 50)));
+    }
+
+    private static Mock<IImageUrlGenerator> CreateMockImageUrlGenerator() => new();
+
+    private static ImageCropperValue CreateImageCropperValueWithCrops() => new()
+    {
+        Crops = new List<ImageCropperValue.ImageCropperCrop> { new() { Alias = "TestCrop", Width = 100, Height = 200 } },
+    };
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs
index 226f59a61f..5f38154655 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/FileNameTests.cs
@@ -21,97 +21,98 @@ using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.BackOffice.Install;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common;
+
+[TestFixture]
+internal class FileNameTests
 {
-    [TestFixture]
-    internal class FileNameTests
+    private string GetViewName(ViewResult viewResult, string separator = "/")
     {
-        private string GetViewName(ViewResult viewResult, string separator = "/")
+        var sections = viewResult.ViewName.Split(separator);
+        return sections[^1];
+    }
+
+    private IEnumerable<string> GetUiFiles(IEnumerable<string> pathFromNetCore)
+    {
+        var root = TestContext.CurrentContext.TestDirectory.Split("tests")[0];
+        var pathToFiles = Path.Combine(root, "src", "Umbraco.Cms.StaticAssets");
+        foreach (var pathSection in pathFromNetCore)
         {
-            var sections = viewResult.ViewName.Split(separator);
-            return sections[^1];
+            pathToFiles = Path.Combine(pathToFiles, pathSection);
         }
 
-        private IEnumerable<string> GetUiFiles(IEnumerable<string> pathFromNetCore)
+        return new DirectoryInfo(pathToFiles).GetFiles().Select(f => f.Name).ToArray();
+    }
+
+    [Test]
+    [AutoMoqData]
+    public async Task InstallViewExists(
+        [Frozen] IHostingEnvironment hostingEnvironment,
+        InstallController sut)
+    {
+        Mock.Get(hostingEnvironment).Setup(x => x.ToAbsolute(It.IsAny<string>())).Returns("http://localhost/");
+        var viewResult = await sut.Index() as ViewResult;
+        var fileName = GetViewName(viewResult, Path.DirectorySeparatorChar.ToString());
+
+        var views = GetUiFiles(new[] { "umbraco", "UmbracoInstall" });
+        Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
+    }
+
+    [Test]
+    [AutoMoqData]
+    public void PreviewViewExists(
+        [Frozen] IOptions<GlobalSettings> globalSettings,
+        PreviewController sut)
+    {
+        globalSettings.Value.UmbracoPath = "/";
+
+        var viewResult = sut.Index() as ViewResult;
+        var fileName = GetViewName(viewResult);
+
+        var views = GetUiFiles(new[] { "umbraco", "UmbracoBackOffice" });
+
+        Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
+    }
+
+    [Test]
+    [AutoMoqData]
+    public async Task BackOfficeDefaultExists(
+        [Frozen] IOptions<GlobalSettings> globalSettings,
+        [Frozen] IHostingEnvironment hostingEnvironment,
+        [Frozen] ITempDataDictionary tempDataDictionary,
+        [Frozen] IRuntimeState runtimeState,
+        BackOfficeController sut)
+    {
+        globalSettings.Value.UmbracoPath = "/";
+        Mock.Get(hostingEnvironment).Setup(x => x.ToAbsolute("/")).Returns("http://localhost/");
+        Mock.Get(hostingEnvironment).SetupGet(x => x.ApplicationVirtualPath).Returns("/");
+        Mock.Get(runtimeState).Setup(x => x.Level).Returns(RuntimeLevel.Run);
+
+        sut.TempData = tempDataDictionary;
+
+        var viewResult = await sut.Default() as ViewResult;
+        var fileName = GetViewName(viewResult);
+        var views = GetUiFiles(new[] { "umbraco", "UmbracoBackOffice" });
+
+        Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
+    }
+
+    [Test]
+    public void LanguageFilesAreLowerCase()
+    {
+        var languageProvider = new EmbeddedFileProvider(
+            typeof(IAssemblyProvider).Assembly,
+            "Umbraco.Cms.Core.EmbeddedResources.Lang");
+        var files = languageProvider.GetDirectoryContents(string.Empty)
+            .Where(x => !x.IsDirectory && x.Name.EndsWith(".xml"))
+            .Select(x => x.Name);
+
+        foreach (var fileName in files)
         {
-            var root = TestContext.CurrentContext.TestDirectory.Split("tests")[0];
-            var pathToFiles = Path.Combine(root, "src", "Umbraco.Cms.StaticAssets");
-            foreach (var pathSection in pathFromNetCore)
-            {
-                pathToFiles = Path.Combine(pathToFiles, pathSection);
-            }
-
-            return new DirectoryInfo(pathToFiles).GetFiles().Select(f => f.Name).ToArray();
-        }
-
-        [Test]
-        [AutoMoqData]
-        public async Task InstallViewExists(
-            [Frozen] IHostingEnvironment hostingEnvironment,
-            InstallController sut)
-        {
-            Mock.Get(hostingEnvironment).Setup(x => x.ToAbsolute(It.IsAny<string>())).Returns("http://localhost/");
-            var viewResult = await sut.Index() as ViewResult;
-            var fileName = GetViewName(viewResult, Path.DirectorySeparatorChar.ToString());
-
-            IEnumerable<string> views = GetUiFiles(new[] { "umbraco", "UmbracoInstall" });
-            Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
-        }
-
-        [Test]
-        [AutoMoqData]
-        public void PreviewViewExists(
-            [Frozen] IOptions<GlobalSettings> globalSettings,
-            PreviewController sut)
-        {
-            globalSettings.Value.UmbracoPath = "/";
-
-            var viewResult = sut.Index() as ViewResult;
-            var fileName = GetViewName(viewResult);
-
-            IEnumerable<string> views = GetUiFiles(new[] { "umbraco", "UmbracoBackOffice" });
-
-            Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
-        }
-
-        [Test]
-        [AutoMoqData]
-        public async Task BackOfficeDefaultExists(
-            [Frozen] IOptions<GlobalSettings> globalSettings,
-            [Frozen] IHostingEnvironment hostingEnvironment,
-            [Frozen] ITempDataDictionary tempDataDictionary,
-            [Frozen] IRuntimeState runtimeState,
-            BackOfficeController sut)
-        {
-            globalSettings.Value.UmbracoPath = "/";
-            Mock.Get(hostingEnvironment).Setup(x => x.ToAbsolute("/")).Returns("http://localhost/");
-            Mock.Get(hostingEnvironment).SetupGet(x => x.ApplicationVirtualPath).Returns("/");
-            Mock.Get(runtimeState).Setup(x => x.Level).Returns(RuntimeLevel.Run);
-
-            sut.TempData = tempDataDictionary;
-
-            var viewResult = await sut.Default() as ViewResult;
-            var fileName = GetViewName(viewResult);
-            IEnumerable<string> views = GetUiFiles(new[] { "umbraco", "UmbracoBackOffice" });
-
-            Assert.True(views.Contains(fileName), $"Expected {fileName} to exist, but it didn't");
-        }
-
-        [Test]
-        public void LanguageFilesAreLowerCase()
-        {
-            var languageProvider = new EmbeddedFileProvider(typeof(IAssemblyProvider).Assembly, "Umbraco.Cms.Core.EmbeddedResources.Lang");
-            var files = languageProvider.GetDirectoryContents(string.Empty)
-                                    .Where(x => !x.IsDirectory && x.Name.EndsWith(".xml"))
-                                    .Select(x => x.Name);
-
-            foreach (var fileName in files)
-            {
-                Assert.AreEqual(
-                    fileName.ToLower(),
-                    fileName,
-                    $"Language files must be all lowercase but {fileName} is not lowercase.");
-            }
+            Assert.AreEqual(
+                fileName.ToLower(),
+                fileName,
+                $"Language files must be all lowercase but {fileName} is not lowercase.");
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs
index ca4a5a7c90..e4390a599c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Filters/ValidateUmbracoFormRouteStringFilterTests.cs
@@ -7,37 +7,49 @@ using Umbraco.Cms.Web.Common.Exceptions;
 using Umbraco.Cms.Web.Common.Filters;
 using Umbraco.Cms.Web.Common.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Filters
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Filters;
+
+[TestFixture]
+public class ValidateUmbracoFormRouteStringFilterTests
 {
-    [TestFixture]
-    public class ValidateUmbracoFormRouteStringFilterTests
+    private IDataProtectionProvider DataProtectionProvider { get; } = new EphemeralDataProtectionProvider();
+
+    [Test]
+    public void Validate_Route_String()
     {
-        private IDataProtectionProvider DataProtectionProvider { get; } = new EphemeralDataProtectionProvider();
+        var filter =
+            new ValidateUmbracoFormRouteStringAttribute.ValidateUmbracoFormRouteStringFilter(DataProtectionProvider);
 
-        [Test]
-        public void Validate_Route_String()
-        {
-            var filter = new ValidateUmbracoFormRouteStringAttribute.ValidateUmbracoFormRouteStringFilter(DataProtectionProvider);
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(null, null, null, null));
 
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(null, null, null, null));
+        const string ControllerName = "Test";
+        const string ControllerAction = "Index";
+        const string Area = "MyArea";
+        var validUfprt =
+            EncryptionHelper.CreateEncryptedRouteString(DataProtectionProvider, ControllerName, ControllerAction, Area);
 
-            const string ControllerName = "Test";
-            const string ControllerAction = "Index";
-            const string Area = "MyArea";
-            var validUfprt = EncryptionHelper.CreateEncryptedRouteString(DataProtectionProvider, ControllerName, ControllerAction, Area);
+        var invalidUfprt = validUfprt + "z";
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() =>
+            filter.ValidateRouteString(invalidUfprt, null, null, null));
 
-            var invalidUfprt = validUfprt + "z";
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(invalidUfprt, null, null, null));
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() =>
+            filter.ValidateRouteString(validUfprt, ControllerName, ControllerAction, "doesntMatch"));
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() =>
+            filter.ValidateRouteString(validUfprt, ControllerName, ControllerAction, null));
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() =>
+            filter.ValidateRouteString(validUfprt, ControllerName, "doesntMatch", Area));
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() =>
+            filter.ValidateRouteString(validUfprt, ControllerName, null, Area));
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() =>
+            filter.ValidateRouteString(validUfprt, "doesntMatch", ControllerAction, Area));
+        Assert.Throws<HttpUmbracoFormRouteStringException>(() =>
+            filter.ValidateRouteString(validUfprt, null, ControllerAction, Area));
 
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(validUfprt, ControllerName, ControllerAction, "doesntMatch"));
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(validUfprt, ControllerName, ControllerAction, null));
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(validUfprt, ControllerName, "doesntMatch", Area));
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(validUfprt, ControllerName, null, Area));
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(validUfprt, "doesntMatch", ControllerAction, Area));
-            Assert.Throws<HttpUmbracoFormRouteStringException>(() => filter.ValidateRouteString(validUfprt, null, ControllerAction, Area));
-
-            Assert.DoesNotThrow(() => filter.ValidateRouteString(validUfprt, ControllerName, ControllerAction, Area));
-            Assert.DoesNotThrow(() => filter.ValidateRouteString(validUfprt, ControllerName.ToLowerInvariant(), ControllerAction.ToLowerInvariant(), Area.ToLowerInvariant()));
-        }
+        Assert.DoesNotThrow(() => filter.ValidateRouteString(validUfprt, ControllerName, ControllerAction, Area));
+        Assert.DoesNotThrow(() => filter.ValidateRouteString(
+            validUfprt,
+            ControllerName.ToLowerInvariant(),
+            ControllerAction.ToLowerInvariant(),
+            Area.ToLowerInvariant()));
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs
index c44baa044a..72a2a27031 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Formatters/IgnoreRequiredAttributesResolverUnitTests.cs
@@ -6,39 +6,35 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using Umbraco.Cms.Web.Common.Formatters;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Formatters
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Formatters;
+
+[TestFixture]
+public class IgnoreRequiredAttributesResolverUnitTests
 {
-    [TestFixture]
-    public class IgnoreRequiredAttributesResolverUnitTests
+    [Test]
+    public void Test()
     {
-        [Test]
-        public void Test()
+        const string emptyJsonObject = "{}";
+
+        Assert.Multiple(() =>
         {
-            const string emptyJsonObject = "{}";
+            // Ensure the deserialization throws if using default settings
+            Assert.Throws<JsonSerializationException>(() =>
+                JsonConvert.DeserializeObject<ObjectWithRequiredProperty>(emptyJsonObject));
 
-            Assert.Multiple(() =>
-            {
-                // Ensure the deserialization throws if using default settings
-                Assert.Throws<JsonSerializationException>(() =>
-                    JsonConvert.DeserializeObject<ObjectWithRequiredProperty>(emptyJsonObject));
+            var actual = JsonConvert.DeserializeObject<ObjectWithRequiredProperty>(
+                emptyJsonObject,
+                new JsonSerializerSettings { ContractResolver = new IgnoreRequiredAttributesResolver() });
 
-                ObjectWithRequiredProperty actual = JsonConvert.DeserializeObject<ObjectWithRequiredProperty>(
-                    emptyJsonObject,
-                    new JsonSerializerSettings
-                    {
-                        ContractResolver = new IgnoreRequiredAttributesResolver()
-                    });
+            Assert.IsNotNull(actual);
+            Assert.IsNull(actual.Property);
+        });
+    }
 
-                Assert.IsNotNull(actual);
-                Assert.IsNull(actual.Property);
-            });
-        }
-
-        [DataContract(Name = "objectWithRequiredProperty", Namespace = "")]
-        private class ObjectWithRequiredProperty
-        {
-            [DataMember(Name = "property", IsRequired = true)]
-            public string Property { get; set; }
-        }
+    [DataContract(Name = "objectWithRequiredProperty", Namespace = "")]
+    private class ObjectWithRequiredProperty
+    {
+        [DataMember(Name = "property", IsRequired = true)]
+        public string Property { get; set; }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs
index f5d5d7c766..711914a01e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageCropperTest.cs
@@ -9,402 +9,488 @@ using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using NUnit.Framework;
-using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Media;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common;
+
+[TestFixture]
+public class ImageCropperTest
 {
-    [TestFixture]
-    public class ImageCropperTest
+    private const string CropperJson1 =
+        "{\"focalPoint\": {\"left\": 0.96,\"top\": 0.80827067669172936},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";
+
+    private const string CropperJson2 =
+        "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0672.jpg\",\"crops\": []}";
+
+    private const string MediaPath = "/media/1005/img_0671.jpg";
+
+    [Test]
+    public void CanConvertImageCropperDataSetSrcToString()
     {
-        private const string CropperJson1 = "{\"focalPoint\": {\"left\": 0.96,\"top\": 0.80827067669172936},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";
-        private const string CropperJson2 = "{\"focalPoint\": {\"left\": 0.98,\"top\": 0.80827067669172936},\"src\": \"/media/1005/img_0672.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";
-        private const string CropperJson3 = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0672.jpg\",\"crops\": []}";
-        private const string MediaPath = "/media/1005/img_0671.jpg";
+        // cropperJson3 - has no crops
+        var cropperValue = CropperJson2.DeserializeImageCropperValue();
+        var serialized = cropperValue.TryConvertTo<string>();
+        Assert.IsTrue(serialized.Success);
+        Assert.AreEqual("/media/1005/img_0672.jpg", serialized.Result);
+    }
 
-        [Test]
-        public void CanConvertImageCropperDataSetSrcToString()
-        {
-            // cropperJson3 - has no crops
-            ImageCropperValue cropperValue = CropperJson3.DeserializeImageCropperValue();
-            Attempt<string> serialized = cropperValue.TryConvertTo<string>();
-            Assert.IsTrue(serialized.Success);
-            Assert.AreEqual("/media/1005/img_0672.jpg", serialized.Result);
-        }
+    [Test]
+    public void CanConvertImageCropperDataSetJObject()
+    {
+        // cropperJson3 - has no crops
+        var cropperValue = CropperJson2.DeserializeImageCropperValue();
+        var serialized = cropperValue.TryConvertTo<JObject>();
+        Assert.IsTrue(serialized.Success);
+        Assert.AreEqual(cropperValue, serialized.Result.ToObject<ImageCropperValue>());
+    }
 
-        [Test]
-        public void CanConvertImageCropperDataSetJObject()
-        {
-            // cropperJson3 - has no crops
-            ImageCropperValue cropperValue = CropperJson3.DeserializeImageCropperValue();
-            Attempt<JObject> serialized = cropperValue.TryConvertTo<JObject>();
-            Assert.IsTrue(serialized.Success);
-            Assert.AreEqual(cropperValue, serialized.Result.ToObject<ImageCropperValue>());
-        }
-
-        [Test]
-        public void CanConvertImageCropperDataSetJsonToString()
-        {
-            ImageCropperValue cropperValue = CropperJson1.DeserializeImageCropperValue();
-            Attempt<string> serialized = cropperValue.TryConvertTo<string>();
-            Assert.IsTrue(serialized.Success);
-            Assert.IsTrue(serialized.Result.DetectIsJson());
-            ImageCropperValue obj = JsonConvert.DeserializeObject<ImageCropperValue>(CropperJson1, new JsonSerializerSettings { Culture = CultureInfo.InvariantCulture, FloatParseHandling = FloatParseHandling.Decimal });
-            Assert.AreEqual(cropperValue, obj);
-        }
-
-        // [TestCase(CropperJson1, CropperJson1, true)]
-        // [TestCase(CropperJson1, CropperJson2, false)]
-        // public void CanConvertImageCropperPropertyEditor(string val1, string val2, bool expected)
-        // {
-        //     try
-        //     {
-        //         var container = RegisterFactory.Create();
-        //         var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run));
-        //
-        //         composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
-        //
-        //         Current.Factory = composition.CreateFactory();
-        //
-        //         var logger = Mock.Of<ILogger>();
-        //         var scheme = Mock.Of<IMediaPathScheme>();
-        //         var config = Mock.Of<IContentSection>();
-        //
-        //         var mediaFileSystem = new MediaFileSystem(Mock.Of<IFileSystem>(), config, scheme, logger);
-        //
-        //         var imageCropperConfiguration = new ImageCropperConfiguration()
-        //         {
-        //             Crops = new[]
-        //             {
-        //                 new ImageCropperConfiguration.Crop()
-        //                 {
-        //                     Alias = "thumb",
-        //                     Width = 100,
-        //                     Height = 100
-        //                 }
-        //             }
-        //         };
-        //         var dataTypeService = new TestObjects.TestDataTypeService(
-        //             new DataType(new ImageCropperPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, Mock.Of<IContentSection>(), Mock.Of<IDataTypeService>())) { Id = 1, Configuration = imageCropperConfiguration });
-        //
-        //         var factory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), dataTypeService);
-        //
-        //         var converter = new ImageCropperValueConverter();
-        //         var result = converter.ConvertSourceToIntermediate(null, factory.CreatePropertyType("test", 1), val1, false); // does not use type for conversion
-        //
-        //         var resultShouldMatch = val2.DeserializeImageCropperValue();
-        //         if (expected)
-        //         {
-        //             Assert.AreEqual(resultShouldMatch, result);
-        //         }
-        //         else
-        //         {
-        //             Assert.AreNotEqual(resultShouldMatch, result);
-        //         }
-        //     }
-        //     finally
-        //     {
-        //         Current.Reset();
-        //     }
-        // }
-
-        [Test]
-        public void GetCropUrl_CropAliasTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, cropAlias: "Thumb", useCropDimensions: true);
-            Assert.AreEqual(MediaPath + "?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100", urlString);
-        }
-
-        /// <summary>
-        /// Test to ensure useCropDimensions is observed
-        /// </summary>
-        [Test]
-        public void GetCropUrl_CropAliasIgnoreWidthHeightTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, cropAlias: "Thumb", useCropDimensions: true, width: 50, height: 50);
-            Assert.AreEqual(MediaPath + "?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100", urlString);
-        }
-
-        [Test]
-        public void GetCropUrl_WidthHeightTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 200, height: 300);
-            Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=200&h=300", urlString);
-        }
-
-        [Test]
-        public void GetCropUrl_FocalPointTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, cropAlias: "thumb", preferFocalPoint: true, useCropDimensions: true);
-            Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=100&h=100", urlString);
-        }
-
-        [Test]
-        public void GetCropUrlFurtherOptionsTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 200, height: 300, furtherOptions: "filter=comic&roundedcorners=radius-26|bgcolor-fff");
-            Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=200&h=300&filter=comic&roundedcorners=radius-26|bgcolor-fff", urlString);
-        }
-
-        /// <summary>
-        /// Test that if a crop alias has been specified that doesn't exist the method returns null
-        /// </summary>
-        [Test]
-        public void GetCropUrlNullTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, cropAlias: "Banner", useCropDimensions: true);
-            Assert.AreEqual(null, urlString);
-        }
-
-        /// <summary>
-        /// Test the GetCropUrl method on the ImageCropDataSet Model
-        /// </summary>
-        [Test]
-        public void GetBaseCropUrlFromModelTest()
-        {
-            ImageCropperValue cropDataSet = CropperJson1.DeserializeImageCropperValue();
-            var urlString = cropDataSet.GetCropUrl("thumb", new TestImageUrlGenerator());
-            Assert.AreEqual("?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100", urlString);
-        }
-
-        /// <summary>
-        /// Test the height ratio mode with predefined crop dimensions
-        /// </summary>
-        [Test]
-        public void GetCropUrl_CropAliasHeightRatioModeTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, cropAlias: "Thumb", useCropDimensions: true);
-            Assert.AreEqual(MediaPath + "?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100", urlString);
-        }
-
-        /// <summary>
-        /// Test the height ratio mode with manual width/height dimensions
-        /// </summary>
-        [Test]
-        public void GetCropUrl_WidthHeightRatioModeTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150);
-            Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=300&h=150", urlString);
-        }
-
-        /// <summary>
-        /// Test the height ratio mode with width/height dimensions
-        /// </summary>
-        [Test]
-        public void GetCropUrl_HeightWidthRatioModeTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150);
-            Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=300&h=150", urlString);
-        }
-
-        /// <summary>
-        /// Test that if Crop mode is specified as anything other than Crop the image doesn't use the crop
-        /// </summary>
-        [Test]
-        public void GetCropUrl_SpecifiedCropModeTest()
-        {
-            var urlStringMin = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Min);
-            var urlStringBoxPad = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.BoxPad);
-            var urlStringPad = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Pad);
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Max);
-            var urlStringStretch = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150, imageCropMode: ImageCropMode.Stretch);
-
-            Assert.AreEqual(MediaPath + "?m=min&w=300&h=150", urlStringMin);
-            Assert.AreEqual(MediaPath + "?m=boxpad&w=300&h=150", urlStringBoxPad);
-            Assert.AreEqual(MediaPath + "?m=pad&w=300&h=150", urlStringPad);
-            Assert.AreEqual(MediaPath + "?m=max&w=300&h=150", urlString);
-            Assert.AreEqual(MediaPath + "?m=stretch&w=300&h=150", urlStringStretch);
-        }
-
-        /// <summary>
-        /// Test for upload property type
-        /// </summary>
-        [Test]
-        public void GetCropUrl_UploadTypeTest()
-        {
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), width: 100, height: 270, imageCropMode: ImageCropMode.Crop, imageCropAnchor: ImageCropAnchor.Center);
-            Assert.AreEqual(MediaPath + "?m=crop&a=center&w=100&h=270", urlString);
-        }
-
-        /// <summary>
-        /// Test for preferFocalPoint when focal point is centered
-        /// </summary>
-        [Test]
-        public void GetCropUrl_PreferFocalPointCenter()
-        {
-            const string cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, width: 300, height: 150, preferFocalPoint: true);
-            Assert.AreEqual(MediaPath + "?w=300&h=150", urlString);
-        }
-
-        /// <summary>
-        /// Test to check if height ratio is returned for a predefined crop without coordinates and focal point in centre when a width parameter is passed
-        /// </summary>
-        [Test]
-        public void GetCropUrl_PreDefinedCropNoCoordinatesWithWidth()
-        {
-            const string cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", width: 200);
-            Assert.AreEqual(MediaPath + "?w=200&h=119", urlString);
-        }
-
-        /// <summary>
-        /// Test to check if height ratio is returned for a predefined crop without coordinates and focal point is custom when a width parameter is passed
-        /// </summary>
-        [Test]
-        public void GetCropUrl_PreDefinedCropNoCoordinatesWithWidthAndFocalPoint()
-        {
-            const string cropperJson = "{\"focalPoint\": {\"left\": 0.4275,\"top\": 0.41},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", width: 200);
-            Assert.AreEqual(MediaPath + "?f=0.41,0.4275&w=200&h=119", urlString);
-        }
-
-        /// <summary>
-        /// Test to check if crop ratio is ignored if useCropDimensions is true
-        /// </summary>
-        [Test]
-        public void GetCropUrl_PreDefinedCropNoCoordinatesWithWidthAndFocalPointIgnore()
-        {
-            const string cropperJson = "{\"focalPoint\": {\"left\": 0.4275,\"top\": 0.41},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", width: 200, useCropDimensions: true);
-            Assert.AreEqual(MediaPath + "?f=0.41,0.4275&w=270&h=161", urlString);
-        }
-
-        /// <summary>
-        /// Test to check if width ratio is returned for a predefined crop without coordinates and focal point in centre when a height parameter is passed
-        /// </summary>
-        [Test]
-        public void GetCropUrl_PreDefinedCropNoCoordinatesWithHeight()
-        {
-            const string cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", height: 200);
-            Assert.AreEqual(MediaPath + "?w=335&h=200", urlString);
-        }
-
-        /// <summary>
-        /// Test to check result when only a width parameter is passed, effectivly a resize only
-        /// </summary>
-        [Test]
-        public void GetCropUrl_WidthOnlyParameter()
-        {
-            const string cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, width: 200);
-            Assert.AreEqual(MediaPath + "?w=200", urlString);
-        }
-
-        /// <summary>
-        /// Test to check result when only a height parameter is passed, effectivly a resize only
-        /// </summary>
-        [Test]
-        public void GetCropUrl_HeightOnlyParameter()
-        {
-            const string cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, height: 200);
-            Assert.AreEqual(MediaPath + "?h=200", urlString);
-        }
-
-        /// <summary>
-        /// Test to check result when using a background color with padding
-        /// </summary>
-        [Test]
-        public void GetCropUrl_BackgroundColorParameter()
-        {
-            var cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"" + MediaPath + "\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
-
-            var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), 400, 400, cropperJson, imageCropMode: ImageCropMode.Pad, furtherOptions: "bgcolor=fff");
-            Assert.AreEqual(MediaPath + "?m=pad&w=400&h=400&bgcolor=fff", urlString);
-        }
-
-        internal class TestImageUrlGenerator : IImageUrlGenerator
-        {
-            public IEnumerable<string> SupportedImageFileTypes => new[]
+    [Test]
+    public void CanConvertImageCropperDataSetJsonToString()
+    {
+        var cropperValue = CropperJson1.DeserializeImageCropperValue();
+        var serialized = cropperValue.TryConvertTo<string>();
+        Assert.IsTrue(serialized.Success);
+        Assert.IsTrue(serialized.Result.DetectIsJson());
+        var obj = JsonConvert.DeserializeObject<ImageCropperValue>(
+            CropperJson1,
+            new JsonSerializerSettings
             {
-                "jpeg",
-                "jpg",
-                "gif",
-                "bmp",
-                "png",
-                "tiff",
-                "tif"
-            };
+                Culture = CultureInfo.InvariantCulture,
+                FloatParseHandling = FloatParseHandling.Decimal,
+            });
+        Assert.AreEqual(cropperValue, obj);
+    }
 
-            public string GetImageUrl(ImageUrlGenerationOptions options)
+    // [TestCase(CropperJson1, CropperJson1, true)]
+    // [TestCase(CropperJson1, CropperJson2, false)]
+    // public void CanConvertImageCropperPropertyEditor(string val1, string val2, bool expected)
+    // {
+    //     try
+    //     {
+    //         var container = RegisterFactory.Create();
+    //         var composition = new Composition(container, new TypeLoader(), Mock.Of<IProfilingLogger>(), ComponentTests.MockRuntimeState(RuntimeLevel.Run));
+    //
+    //         composition.WithCollectionBuilder<PropertyValueConverterCollectionBuilder>();
+    //
+    //         Current.Factory = composition.CreateFactory();
+    //
+    //         var logger = Mock.Of<ILogger>();
+    //         var scheme = Mock.Of<IMediaPathScheme>();
+    //         var config = Mock.Of<IContentSection>();
+    //
+    //         var mediaFileSystem = new MediaFileSystem(Mock.Of<IFileSystem>(), config, scheme, logger);
+    //
+    //         var imageCropperConfiguration = new ImageCropperConfiguration()
+    //         {
+    //             Crops = new[]
+    //             {
+    //                 new ImageCropperConfiguration.Crop()
+    //                 {
+    //                     Alias = "thumb",
+    //                     Width = 100,
+    //                     Height = 100
+    //                 }
+    //             }
+    //         };
+    //         var dataTypeService = new TestObjects.TestDataTypeService(
+    //             new DataType(new ImageCropperPropertyEditor(Mock.Of<ILogger>(), mediaFileSystem, Mock.Of<IContentSection>(), Mock.Of<IDataTypeService>())) { Id = 1, Configuration = imageCropperConfiguration });
+    //
+    //         var factory = new PublishedContentTypeFactory(Mock.Of<IPublishedModelFactory>(), new PropertyValueConverterCollection(Array.Empty<IPropertyValueConverter>()), dataTypeService);
+    //
+    //         var converter = new ImageCropperValueConverter();
+    //         var result = converter.ConvertSourceToIntermediate(null, factory.CreatePropertyType("test", 1), val1, false); // does not use type for conversion
+    //
+    //         var resultShouldMatch = val2.DeserializeImageCropperValue();
+    //         if (expected)
+    //         {
+    //             Assert.AreEqual(resultShouldMatch, result);
+    //         }
+    //         else
+    //         {
+    //             Assert.AreNotEqual(resultShouldMatch, result);
+    //         }
+    //     }
+    //     finally
+    //     {
+    //         Current.Reset();
+    //     }
+    // }
+    [Test]
+    public void GetCropUrl_CropAliasTest()
+    {
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            cropAlias: "Thumb",
+            useCropDimensions: true);
+        Assert.AreEqual(
+            MediaPath + "?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100",
+            urlString);
+    }
+
+    /// <summary>
+    ///     Test to ensure useCropDimensions is observed
+    /// </summary>
+    [Test]
+    public void GetCropUrl_CropAliasIgnoreWidthHeightTest()
+    {
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            cropAlias: "Thumb",
+            useCropDimensions: true,
+            width: 50,
+            height: 50);
+        Assert.AreEqual(MediaPath + "?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100", urlString);
+    }
+
+    [Test]
+    public void GetCropUrl_WidthHeightTest()
+    {
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 200, height: 300);
+        Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=200&h=300", urlString);
+    }
+
+    [Test]
+    public void GetCropUrl_FocalPointTest()
+    {
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            cropAlias: "thumb",
+            preferFocalPoint: true,
+            useCropDimensions: true);
+        Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=100&h=100", urlString);
+    }
+
+    [Test]
+    public void GetCropUrlFurtherOptionsTest()
+    {
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            width: 200,
+            height: 300,
+            furtherOptions: "filter=comic&roundedcorners=radius-26|bgcolor-fff");
+        Assert.AreEqual(
+            MediaPath + "?f=0.80827067669172936,0.96&w=200&h=300&filter=comic&roundedcorners=radius-26|bgcolor-fff",
+            urlString);
+    }
+
+    /// <summary>
+    ///     Test that if a crop alias has been specified that doesn't exist the method returns null
+    /// </summary>
+    [Test]
+    public void GetCropUrlNullTest()
+    {
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            cropAlias: "Banner",
+            useCropDimensions: true);
+        Assert.AreEqual(null, urlString);
+    }
+
+    /// <summary>
+    ///     Test the GetCropUrl method on the ImageCropDataSet Model
+    /// </summary>
+    [Test]
+    public void GetBaseCropUrlFromModelTest()
+    {
+        var cropDataSet = CropperJson1.DeserializeImageCropperValue();
+        var urlString = cropDataSet.GetCropUrl("thumb", new TestImageUrlGenerator());
+        Assert.AreEqual("?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100", urlString);
+    }
+
+    /// <summary>
+    ///     Test the height ratio mode with predefined crop dimensions
+    /// </summary>
+    [Test]
+    public void GetCropUrl_CropAliasHeightRatioModeTest()
+    {
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            cropAlias: "Thumb",
+            useCropDimensions: true);
+        Assert.AreEqual(MediaPath + "?c=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&w=100&h=100", urlString);
+    }
+
+    /// <summary>
+    ///     Test the height ratio mode with manual width/height dimensions
+    /// </summary>
+    [Test]
+    public void GetCropUrl_WidthHeightRatioModeTest()
+    {
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150);
+        Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=300&h=150", urlString);
+    }
+
+    /// <summary>
+    ///     Test the height ratio mode with width/height dimensions
+    /// </summary>
+    [Test]
+    public void GetCropUrl_HeightWidthRatioModeTest()
+    {
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: CropperJson1, width: 300, height: 150);
+        Assert.AreEqual(MediaPath + "?f=0.80827067669172936,0.96&w=300&h=150", urlString);
+    }
+
+    /// <summary>
+    ///     Test that if Crop mode is specified as anything other than Crop the image doesn't use the crop
+    /// </summary>
+    [Test]
+    public void GetCropUrl_SpecifiedCropModeTest()
+    {
+        var urlStringMin = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            width: 300,
+            height: 150,
+            imageCropMode: ImageCropMode.Min);
+        var urlStringBoxPad = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            width: 300,
+            height: 150,
+            imageCropMode: ImageCropMode.BoxPad);
+        var urlStringPad = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            width: 300,
+            height: 150,
+            imageCropMode: ImageCropMode.Pad);
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            width: 300,
+            height: 150,
+            imageCropMode: ImageCropMode.Max);
+        var urlStringStretch = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: CropperJson1,
+            width: 300,
+            height: 150,
+            imageCropMode: ImageCropMode.Stretch);
+
+        Assert.AreEqual(MediaPath + "?m=min&w=300&h=150", urlStringMin);
+        Assert.AreEqual(MediaPath + "?m=boxpad&w=300&h=150", urlStringBoxPad);
+        Assert.AreEqual(MediaPath + "?m=pad&w=300&h=150", urlStringPad);
+        Assert.AreEqual(MediaPath + "?m=max&w=300&h=150", urlString);
+        Assert.AreEqual(MediaPath + "?m=stretch&w=300&h=150", urlStringStretch);
+    }
+
+    /// <summary>
+    ///     Test for upload property type
+    /// </summary>
+    [Test]
+    public void GetCropUrl_UploadTypeTest()
+    {
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            100,
+            270,
+            imageCropMode: ImageCropMode.Crop,
+            imageCropAnchor: ImageCropAnchor.Center);
+        Assert.AreEqual(MediaPath + "?m=crop&a=center&w=100&h=270", urlString);
+    }
+
+    /// <summary>
+    ///     Test for preferFocalPoint when focal point is centered
+    /// </summary>
+    [Test]
+    public void GetCropUrl_PreferFocalPointCenter()
+    {
+        const string cropperJson =
+            "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\":\"thumb\",\"width\": 100,\"height\": 100,\"coordinates\": {\"x1\": 0.58729977382575338,\"y1\": 0.055768992440203169,\"x2\": 0,\"y2\": 0.32457553600198386}}]}";
+
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            imageCropperValue: cropperJson,
+            width: 300,
+            height: 150,
+            preferFocalPoint: true);
+        Assert.AreEqual(MediaPath + "?w=300&h=150", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check if height ratio is returned for a predefined crop without coordinates and focal point in centre when
+    ///     a width parameter is passed
+    /// </summary>
+    [Test]
+    public void GetCropUrl_PreDefinedCropNoCoordinatesWithWidth()
+    {
+        const string cropperJson =
+            "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
+
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", width: 200);
+        Assert.AreEqual(MediaPath + "?w=200&h=119", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check if height ratio is returned for a predefined crop without coordinates and focal point is custom when
+    ///     a width parameter is passed
+    /// </summary>
+    [Test]
+    public void GetCropUrl_PreDefinedCropNoCoordinatesWithWidthAndFocalPoint()
+    {
+        const string cropperJson =
+            "{\"focalPoint\": {\"left\": 0.4275,\"top\": 0.41},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
+
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", width: 200);
+        Assert.AreEqual(MediaPath + "?f=0.41,0.4275&w=200&h=119", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check if crop ratio is ignored if useCropDimensions is true
+    /// </summary>
+    [Test]
+    public void GetCropUrl_PreDefinedCropNoCoordinatesWithWidthAndFocalPointIgnore()
+    {
+        const string cropperJson =
+            "{\"focalPoint\": {\"left\": 0.4275,\"top\": 0.41},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
+
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", width: 200, useCropDimensions: true);
+        Assert.AreEqual(MediaPath + "?f=0.41,0.4275&w=270&h=161", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check if width ratio is returned for a predefined crop without coordinates and focal point in centre when a
+    ///     height parameter is passed
+    /// </summary>
+    [Test]
+    public void GetCropUrl_PreDefinedCropNoCoordinatesWithHeight()
+    {
+        const string cropperJson =
+            "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
+
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, cropAlias: "home", height: 200);
+        Assert.AreEqual(MediaPath + "?w=335&h=200", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check result when only a width parameter is passed, effectivly a resize only
+    /// </summary>
+    [Test]
+    public void GetCropUrl_WidthOnlyParameter()
+    {
+        const string cropperJson =
+            "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
+
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, width: 200);
+        Assert.AreEqual(MediaPath + "?w=200", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check result when only a height parameter is passed, effectivly a resize only
+    /// </summary>
+    [Test]
+    public void GetCropUrl_HeightOnlyParameter()
+    {
+        const string cropperJson =
+            "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"/media/1005/img_0671.jpg\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
+
+        var urlString = MediaPath.GetCropUrl(new TestImageUrlGenerator(), imageCropperValue: cropperJson, height: 200);
+        Assert.AreEqual(MediaPath + "?h=200", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check result when using a background color with padding
+    /// </summary>
+    [Test]
+    public void GetCropUrl_BackgroundColorParameter()
+    {
+        var cropperJson = "{\"focalPoint\": {\"left\": 0.5,\"top\": 0.5},\"src\": \"" + MediaPath +
+                          "\",\"crops\": [{\"alias\": \"home\",\"width\": 270,\"height\": 161}]}";
+
+        var urlString = MediaPath.GetCropUrl(
+            new TestImageUrlGenerator(),
+            400,
+            400,
+            cropperJson,
+            imageCropMode: ImageCropMode.Pad,
+            furtherOptions: "bgcolor=fff");
+        Assert.AreEqual(MediaPath + "?m=pad&w=400&h=400&bgcolor=fff", urlString);
+    }
+
+    internal class TestImageUrlGenerator : IImageUrlGenerator
+    {
+        public IEnumerable<string> SupportedImageFileTypes => new[] { "jpeg", "jpg", "gif", "bmp", "png", "tiff", "tif" };
+
+        public string GetImageUrl(ImageUrlGenerationOptions options)
+        {
+            if (options == null)
             {
-                if (options == null)
-                {
-                    return null;
-                }
-
-                var imageUrl = new StringBuilder(options.ImageUrl);
-
-                bool queryStringHasStarted = false;
-                void AppendQueryString(string value)
-                {
-                    imageUrl.Append(queryStringHasStarted ? '&' : '?');
-                    queryStringHasStarted = true;
-
-                    imageUrl.Append(value);
-                }
-                void AddQueryString(string key, params IConvertible[] values)
-                    => AppendQueryString(key + '=' + string.Join(",", values.Select(x => x.ToString(CultureInfo.InvariantCulture))));
-
-                if (options.Crop != null)
-                {
-                    AddQueryString("c", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
-                }
-
-                if (options.FocalPoint != null)
-                {
-                    AddQueryString("f", options.FocalPoint.Top, options.FocalPoint.Left);
-                }
-
-                if (options.ImageCropMode.HasValue)
-                {
-                    AddQueryString("m", options.ImageCropMode.Value.ToString().ToLowerInvariant());
-                }
-
-                if (options.ImageCropAnchor.HasValue)
-                {
-                    AddQueryString("a", options.ImageCropAnchor.Value.ToString().ToLowerInvariant());
-                }
-
-                if (options.Width != null)
-                {
-                    AddQueryString("w", options.Width.Value);
-                }
-
-                if (options.Height != null)
-                {
-                    AddQueryString("h", options.Height.Value);
-                }
-              
-                if (options.Quality.HasValue)
-                {
-                    AddQueryString("q", options.Quality.Value);
-                }
-
-                if (options.FurtherOptions != null)
-                {
-                    AppendQueryString(options.FurtherOptions.TrimStart('?', '&'));
-                }
-
-                if (options.CacheBusterValue != null)
-                {
-                    AddQueryString("v", options.CacheBusterValue);
-                }
-
-                return imageUrl.ToString();
+                return null;
             }
+
+            var imageUrl = new StringBuilder(options.ImageUrl);
+
+            var queryStringHasStarted = false;
+
+            void AppendQueryString(string value)
+            {
+                imageUrl.Append(queryStringHasStarted ? '&' : '?');
+                queryStringHasStarted = true;
+
+                imageUrl.Append(value);
+            }
+
+            void AddQueryString(string key, params IConvertible[] values)
+            {
+                AppendQueryString(key + '=' +
+                                  string.Join(",", values.Select(x => x.ToString(CultureInfo.InvariantCulture))));
+            }
+
+            if (options.Crop != null)
+            {
+                AddQueryString("c", options.Crop.Left, options.Crop.Top, options.Crop.Right, options.Crop.Bottom);
+            }
+
+            if (options.FocalPoint != null)
+            {
+                AddQueryString("f", options.FocalPoint.Top, options.FocalPoint.Left);
+            }
+
+            if (options.ImageCropMode.HasValue)
+            {
+                AddQueryString("m", options.ImageCropMode.Value.ToString().ToLowerInvariant());
+            }
+
+            if (options.ImageCropAnchor.HasValue)
+            {
+                AddQueryString("a", options.ImageCropAnchor.Value.ToString().ToLowerInvariant());
+            }
+
+            if (options.Width != null)
+            {
+                AddQueryString("w", options.Width.Value);
+            }
+
+            if (options.Height != null)
+            {
+                AddQueryString("h", options.Height.Value);
+            }
+
+            if (options.Quality.HasValue)
+            {
+                AddQueryString("q", options.Quality.Value);
+            }
+
+            if (options.FurtherOptions != null)
+            {
+                AppendQueryString(options.FurtherOptions.TrimStart('?', '&'));
+            }
+
+            if (options.CacheBusterValue != null)
+            {
+                AddQueryString("v", options.CacheBusterValue);
+            }
+
+            return imageUrl.ToString();
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs
index 7a16ff9abf..d9110bc558 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ImageProcessors/CropWebProcessorTests.cs
@@ -13,43 +13,40 @@ using SixLabors.ImageSharp.Web.Commands.Converters;
 using SixLabors.ImageSharp.Web.Middleware;
 using Umbraco.Cms.Web.Common.ImageProcessors;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ImageProcessors
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ImageProcessors;
+
+[TestFixture]
+public class CropWebProcessorTests
 {
-    [TestFixture]
-    public class CropWebProcessorTests
+    [Test]
+
+    // Coordinates are percentages to crop from the left, top, right and bottom sides
+    [TestCase("0,0,0,0", 50, 90)]
+    [TestCase("0.1,0.0,0.0,0.0", 45, 90)]
+    [TestCase("0.0,0.1,0.0,0.0", 50, 81)]
+    [TestCase("0.0,0.0,0.1,0.0", 45, 90)]
+    [TestCase("0.0,0.0,0.0,0.1", 50, 81)]
+    [TestCase("0.1,0.0,0.1,0.0", 40, 90)]
+    [TestCase("0.0,0.1,0.0,0.1", 50, 72)]
+    [TestCase("0.1,0.1,0.1,0.1", 40, 72)]
+    [TestCase("0.25,0.25,0.25,0.25", 25, 45)]
+    public void CropWebProcessor_CropsImage(string coordinates, int width, int height)
     {
-        [Test]
-        // Coordinates are percentages to crop from the left, top, right and bottom sides
-        [TestCase("0,0,0,0", 50, 90)]
-        [TestCase("0.1,0.0,0.0,0.0", 45, 90)]
-        [TestCase("0.0,0.1,0.0,0.0", 50, 81)]
-        [TestCase("0.0,0.0,0.1,0.0", 45, 90)]
-        [TestCase("0.0,0.0,0.0,0.1", 50, 81)]
-        [TestCase("0.1,0.0,0.1,0.0", 40, 90)]
-        [TestCase("0.0,0.1,0.0,0.1", 50, 72)]
-        [TestCase("0.1,0.1,0.1,0.1", 40, 72)]
-        [TestCase("0.25,0.25,0.25,0.25", 25, 45)]
-        public void CropWebProcessor_CropsImage(string coordinates, int width, int height)
+        using var image = new Image<Rgba32>(50, 90);
+        using var formattedImage = new FormattedImage(image, PngFormat.Instance);
+
+        var logger = new NullLogger<ImageSharpMiddleware>();
+        var commands = new CommandCollection { { CropWebProcessor.Coordinates, coordinates } };
+        var parser = new CommandParser(new ICommandConverter[]
         {
-            using var image = new Image<Rgba32>(50, 90);
-            using var formattedImage = new FormattedImage(image, PngFormat.Instance);
+            new ArrayConverter<float>(),
+            new SimpleCommandConverter<float>(),
+        });
+        var culture = CultureInfo.InvariantCulture;
 
-            var logger = new NullLogger<ImageSharpMiddleware>();
-            var commands = new CommandCollection
-            {
-                { CropWebProcessor.Coordinates, coordinates },
-            };
-            var parser = new CommandParser(new ICommandConverter[]
-            {
-                new ArrayConverter<float>(),
-                new SimpleCommandConverter<float>()
-            });
-            var culture = CultureInfo.InvariantCulture;
+        new CropWebProcessor().Process(formattedImage, logger, commands, parser, culture);
 
-            new CropWebProcessor().Process(formattedImage, logger, commands, parser, culture);
-
-            Assert.AreEqual(width, image.Width);
-            Assert.AreEqual(height, image.Height);
-        }
+        Assert.AreEqual(width, image.Width);
+        Assert.AreEqual(height, image.Height);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs
index 5e8ff67962..bbfcf2103e 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroParserTests.cs
@@ -1,144 +1,156 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System;
 using System.Collections.Generic;
 using NUnit.Framework;
 using Umbraco.Cms.Infrastructure.Macros;
 using Umbraco.Cms.Tests.Common.Extensions;
 using Umbraco.Cms.Tests.Common.TestHelpers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros
-{
-    [TestFixture]
-    public class MacroParserTests
-    {
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_No_Macros()
-        {
-            string content = @"<p>hello world</p>";
-            string result = MacroTagParser.FormatRichTextContentForPersistence(content);
-            Assert.AreEqual(@"<p>hello world</p>", content);
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros;
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Non_AlphaNumeric_Char_In_Alias()
-        {
-            string content = @"<p>asdfasdf</p>
+[TestFixture]
+public class MacroParserTests
+{
+    [Test]
+    [TestCase(@"<p>hello world</p>")]
+    public void Format_RTE_Data_For_Editor_With_No_Macros(string expected)
+    {
+        var content = expected;
+        var result = MacroTagParser.FormatRichTextContentForPersistence(content);
+        Assert.AreEqual(expected, result);
+    }
+
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Non_AlphaNumeric_Char_In_Alias()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""My.Map.isCool eh[boy!]"" />
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""My.Map.isCool eh[boy!]"" /> -->
 <ins>Macro alias: <strong>My.Map.isCool eh[boy!]</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" />
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_Closing_Tag()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_Closing_Tag()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" ></?UMBRACO_MACRO>
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Params()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Params()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" />
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Params_When_MacroAlias_Not_First()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Params_When_MacroAlias_Not_First()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" />
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Params_When_MacroAlias_Is_First()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Params_When_MacroAlias_Is_First()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" />
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Params_When_Multiple_Macros()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Params_When_Multiple_Macros()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" />
 <p>asdfsadf</p>
@@ -146,10 +158,12 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" />
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO test1=""value1"" test2=""value2"" macroAlias=""Map"" /> -->
@@ -163,22 +177,22 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Multiple_Macros()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Multiple_Macros()
+    {
+        var content = @"<p>asdfasdf</p>
 <?UMBRACO_MACRO macroAlias=""Breadcrumb"" />
 <p>asdfsadf</p>
 <p> </p>
 <?UMBRACO_MACRO macroAlias=""login"" />
 <p> </p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>());
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>());
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <div class=""umb-macro-holder mceNonEditable"">
 <!-- <?UMBRACO_MACRO macroAlias=""Breadcrumb"" /> -->
 <ins>Macro alias: <strong>Breadcrumb</strong></ins></div>
@@ -188,13 +202,13 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros
 <!-- <?UMBRACO_MACRO macroAlias=""login"" /> -->
 <ins>Macro alias: <strong>login</strong></ins></div>
 <p> </p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Persistence_Multiline_Parameters()
-        {
-            string content = @"<html>
+    [Test]
+    public void Format_RTE_Data_For_Persistence_Multiline_Parameters()
+    {
+        var content = @"<html>
 <body>
 <h1>asdfasdf</h1>
 <div class='umb-macro-holder mceNonEditable' att1='asdf' att2='asdfasdfasdf' att3=""sdfsdfd"">
@@ -211,10 +225,10 @@ asdfsdf
 </div>
 </body>
 </html>";
-            string result = MacroTagParser.FormatRichTextContentForPersistence(content);
+        var result = MacroTagParser.FormatRichTextContentForPersistence(content);
 
-            Assert.AreEqual(
-                @"<html>
+        Assert.AreEqual(
+            @"<html>
 <body>
 <h1>asdfasdf</h1>
 <?UMBRACO_MACRO macroAlias=""myMacro"" param1=""test1"" param2=""test2
@@ -225,59 +239,65 @@ asdfsdf
 </div>
 </body>
 </html>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Params_Closing_Tag()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Params_Closing_Tag()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" ></?UMBRACO_MACRO>
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Params_Closing_Tag_And_Content()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Params_Closing_Tag_And_Content()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" ><img src='blah.jpg'/></?UMBRACO_MACRO>
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2"">
 <!-- <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Editor_With_Multiline_Parameters()
-        {
-            string content = @"<p>asdfasdf</p>
+    [Test]
+    public void Format_RTE_Data_For_Editor_With_Multiline_Parameters()
+    {
+        var content = @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <?UMBRACO_MACRO macroAlias=""Map"" test1=""value1"" test2=""value2
 test"" />
 <p>asdfasdf</p>";
-            string result = MacroTagParser.FormatRichTextPersistedDataForEditor(content, new Dictionary<string, string>() { { "test1", "value1" }, { "test2", "value2\r\ntest" } });
+        var result = MacroTagParser.FormatRichTextPersistedDataForEditor(
+            content,
+            new Dictionary<string, string> { { "test1", "value1" }, { "test2", "value2\r\ntest" } });
 
-            Assert.AreEqual(
-                @"<p>asdfasdf</p>
+        Assert.AreEqual(
+            @"<p>asdfasdf</p>
 <p>asdfsadf</p>
 <div class=""umb-macro-holder mceNonEditable"" test1=""value1"" test2=""value2
 test"">
@@ -285,13 +305,13 @@ test"">
 test"" /> -->
 <ins>Macro alias: <strong>Map</strong></ins></div>
 <p>asdfasdf</p>".NoCrLf(),
-                result.NoCrLf());
-        }
+            result.NoCrLf());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Persistence()
-        {
-            string content = @"<html>
+    [Test]
+    public void Format_RTE_Data_For_Persistence()
+    {
+        var content = @"<html>
 <body>
 <h1>asdfasdf</h1>
 <div class='umb-macro-holder mceNonEditable' att1='asdf' att2='asdfasdfasdf' att3=""sdfsdfd"">
@@ -307,10 +327,10 @@ asdfsdf
 </div>
 </body>
 </html>";
-            string result = MacroTagParser.FormatRichTextContentForPersistence(content);
+        var result = MacroTagParser.FormatRichTextContentForPersistence(content);
 
-            Assert.AreEqual(
-                @"<html>
+        Assert.AreEqual(
+            @"<html>
 <body>
 <h1>asdfasdf</h1>
 <?UMBRACO_MACRO macroAlias=""myMacro"" param1=""test1"" param2=""test2"" />
@@ -320,13 +340,13 @@ asdfsdf
 </div>
 </body>
 </html>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Persistence_No_Class()
-        {
-            string content = @"<html>
+    [Test]
+    public void Format_RTE_Data_For_Persistence_No_Class()
+    {
+        var content = @"<html>
 <body>
 <h1>asdfasdf</h1>
 <div att1='asdf' att2='asdfasdfasdf' att3=""sdfsdfd"">
@@ -342,10 +362,10 @@ asdfsdf
 </div>
 </body>
 </html>";
-            string result = MacroTagParser.FormatRichTextContentForPersistence(content);
+        var result = MacroTagParser.FormatRichTextContentForPersistence(content);
 
-            Assert.AreEqual(
-                @"<html>
+        Assert.AreEqual(
+            @"<html>
 <body>
 <h1>asdfasdf</h1>
 <?UMBRACO_MACRO macroAlias=""myMacro"" param1=""test1"" param2=""test2"" />
@@ -355,13 +375,14 @@ asdfsdf
 </div>
 </body>
 </html>".StripNewLines(),
-                result.StripNewLines());
-        }
+            result.StripNewLines());
+    }
 
-        [Test]
-        public void Format_RTE_Data_For_Persistence_Custom_Single_Entry()
-        {
-            string content = @"<div class=""umb-macro-holder mceNonEditable umb-macro-mce_1""><!-- <?UMBRACO_MACRO macroAlias=""Test"" content=""1089"" textArea=""asdfasdf"" title="""" bool=""0"" number="""" contentType="""" multiContentType="""" multiProperties="""" properties="""" tabs="""" multiTabs="""" /> --><ins>
+    [Test]
+    public void Format_RTE_Data_For_Persistence_Custom_Single_Entry()
+    {
+        var content =
+            @"<div class=""umb-macro-holder mceNonEditable umb-macro-mce_1""><!-- <?UMBRACO_MACRO macroAlias=""Test"" content=""1089"" textArea=""asdfasdf"" title="""" bool=""0"" number="""" contentType="""" multiContentType="""" multiProperties="""" properties="""" tabs="""" multiTabs="""" /> --><ins>
 <div class=""facts-box"">
 <div class=""fatcs-box-header"">
 <h3>null</h3>
@@ -369,9 +390,10 @@ asdfsdf
 <div class=""fatcs-box-body"">1089</div>
 </div>
 </ins></div>";
-            string result = MacroTagParser.FormatRichTextContentForPersistence(content);
+        var result = MacroTagParser.FormatRichTextContentForPersistence(content);
 
-            Assert.AreEqual(@"<?UMBRACO_MACRO macroAlias=""Test"" content=""1089"" textArea=""asdfasdf"" title="""" bool=""0"" number="""" contentType="""" multiContentType="""" multiProperties="""" properties="""" tabs="""" multiTabs="""" />", result);
-        }
+        Assert.AreEqual(
+            @"<?UMBRACO_MACRO macroAlias=""Test"" content=""1089"" textArea=""asdfasdf"" title="""" bool=""0"" number="""" contentType="""" multiContentType="""" multiProperties="""" properties="""" tabs="""" multiTabs="""" />",
+            result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs
index b91054315c..0f47546d4b 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Macros/MacroTests.cs
@@ -6,38 +6,34 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Macros;
 using Umbraco.Cms.Web.Common.Macros;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros
-{
-    [TestFixture]
-    public class MacroTests
-    {
-        [SetUp]
-        public void Setup()
-        {
-            // We DO want cache enabled for these tests
-            var cacheHelper = new AppCaches(
-                new ObjectCacheAppCache(),
-                NoAppCache.Instance,
-                new IsolatedCaches(type => new ObjectCacheAppCache()));
-        }
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Macros;
 
-        [TestCase("anything", true)]
-        [TestCase("", false)]
-        public void Macro_Is_File_Based(string macroSource, bool expectedNonNull)
+[TestFixture]
+public class MacroTests
+{
+    [SetUp]
+    public void Setup()
+    {
+        // We DO want cache enabled for these tests
+        var cacheHelper = new AppCaches(
+            new ObjectCacheAppCache(),
+            NoAppCache.Instance,
+            new IsolatedCaches(type => new ObjectCacheAppCache()));
+    }
+
+    [TestCase("anything", true)]
+    [TestCase("", false)]
+    public void Macro_Is_File_Based(string macroSource, bool expectedNonNull)
+    {
+        var model = new MacroModel { MacroSource = macroSource };
+        var filename = MacroRenderer.GetMacroFileName(model);
+        if (expectedNonNull)
         {
-            var model = new MacroModel
-            {
-                MacroSource = macroSource
-            };
-            var filename = MacroRenderer.GetMacroFileName(model);
-            if (expectedNonNull)
-            {
-                Assert.IsNotNull(filename);
-            }
-            else
-            {
-                Assert.IsNull(filename);
-            }
+            Assert.IsNotNull(filename);
+        }
+        else
+        {
+            Assert.IsNull(filename);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Media/ImageSharpImageUrlGeneratorTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Media/ImageSharpImageUrlGeneratorTests.cs
index f529d17bd0..bc2c26727f 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Media/ImageSharpImageUrlGeneratorTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Media/ImageSharpImageUrlGeneratorTests.cs
@@ -5,162 +5,228 @@ using NUnit.Framework;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Web.Common.Media;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Media
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Media;
+
+[TestFixture]
+public class ImageSharpImageUrlGeneratorTests
 {
-    [TestFixture]
-    public class ImageSharpImageUrlGeneratorTests
+    private const string MediaPath = "/media/1005/img_0671.jpg";
+
+    private static readonly ImageUrlGenerationOptions.CropCoordinates s_crop = new(0.58729977382575338m, 0.055768992440203169m, 0m, 0.32457553600198386m);
+
+    private static readonly ImageUrlGenerationOptions.FocalPointPosition s_focus1 = new(0.96m, 0.80827067669172936m);
+    private static readonly ImageUrlGenerationOptions.FocalPointPosition s_focus2 = new(0.4275m, 0.41m);
+    private static readonly ImageSharpImageUrlGenerator s_generator = new(new string[0]);
+
+    [Test]
+    public void GetImageUrl_CropAliasTest()
     {
-        private const string MediaPath = "/media/1005/img_0671.jpg";
-        private static readonly ImageUrlGenerationOptions.CropCoordinates s_crop = new ImageUrlGenerationOptions.CropCoordinates(0.58729977382575338m, 0.055768992440203169m, 0m, 0.32457553600198386m);
-        private static readonly ImageUrlGenerationOptions.FocalPointPosition s_focus1 = new ImageUrlGenerationOptions.FocalPointPosition(0.96m, 0.80827067669172936m);
-        private static readonly ImageUrlGenerationOptions.FocalPointPosition s_focus2 = new ImageUrlGenerationOptions.FocalPointPosition(0.4275m, 0.41m);
-        private static readonly ImageSharpImageUrlGenerator s_generator = new ImageSharpImageUrlGenerator(new string[0]);
+        var urlString =
+            s_generator.GetImageUrl(
+                new ImageUrlGenerationOptions(MediaPath) { Crop = s_crop, Width = 100, Height = 100 });
+        Assert.AreEqual(
+            MediaPath + "?cc=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&width=100&height=100",
+            urlString);
+    }
 
-        [Test]
-        public void GetImageUrl_CropAliasTest()
+    [Test]
+    public void GetImageUrl_WidthHeightTest()
+    {
+        var urlString =
+            s_generator.GetImageUrl(
+                new ImageUrlGenerationOptions(MediaPath) { FocalPoint = s_focus1, Width = 200, Height = 300 });
+        Assert.AreEqual(MediaPath + "?rxy=0.96,0.80827067669172936&width=200&height=300", urlString);
+    }
+
+    [Test]
+    public void GetImageUrl_FocalPointTest()
+    {
+        var urlString =
+            s_generator.GetImageUrl(
+                new ImageUrlGenerationOptions(MediaPath) { FocalPoint = s_focus1, Width = 100, Height = 100 });
+        Assert.AreEqual(MediaPath + "?rxy=0.96,0.80827067669172936&width=100&height=100", urlString);
+    }
+
+    [Test]
+    public void GetImageUrlFurtherOptionsTest()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
         {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { Crop = s_crop, Width = 100, Height = 100 });
-            Assert.AreEqual(MediaPath + "?cc=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&width=100&height=100", urlString);
-        }
+            FocalPoint = s_focus1,
+            Width = 200,
+            Height = 300,
+            FurtherOptions = "&filter=comic&roundedcorners=radius-26|bgcolor-fff",
+        });
+        Assert.AreEqual(
+            MediaPath +
+            "?rxy=0.96,0.80827067669172936&width=200&height=300&filter=comic&roundedcorners=radius-26%7Cbgcolor-fff",
+            urlString);
+    }
 
-        [Test]
-        public void GetImageUrl_WidthHeightTest()
+    /// <summary>
+    ///     Test that if options is null, the generated image URL is also null.
+    /// </summary>
+    [Test]
+    public void GetImageUrlNullOptionsTest()
+    {
+        var urlString = s_generator.GetImageUrl(null);
+        Assert.AreEqual(null, urlString);
+    }
+
+    /// <summary>
+    ///     Test that if the image URL is null, the generated image URL is also null.
+    /// </summary>
+    [Test]
+    public void GetImageUrlNullTest()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(null));
+        Assert.AreEqual(null, urlString);
+    }
+
+    /// <summary>
+    ///     Test that if the image URL is empty, the generated image URL is empty.
+    /// </summary>
+    [Test]
+    public void GetImageUrlEmptyTest()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(string.Empty));
+        Assert.AreEqual(string.Empty, urlString);
+    }
+
+    /// <summary>
+    ///     Test the GetImageUrl method on the ImageCropDataSet Model
+    /// </summary>
+    [Test]
+    public void GetBaseCropUrlFromModelTest()
+    {
+        var urlString =
+            s_generator.GetImageUrl(
+                new ImageUrlGenerationOptions(string.Empty) { Crop = s_crop, Width = 100, Height = 100 });
+        Assert.AreEqual(
+            "?cc=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&width=100&height=100",
+            urlString);
+    }
+
+    /// <summary>
+    ///     Test that if Crop mode is specified as anything other than Crop the image doesn't use the crop
+    /// </summary>
+    [Test]
+    public void GetImageUrl_SpecifiedCropModeTest()
+    {
+        var urlStringMin =
+            s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
+            {
+                ImageCropMode = ImageCropMode.Min,
+                Width = 300,
+                Height = 150,
+            });
+        var urlStringBoxPad =
+            s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
+            {
+                ImageCropMode = ImageCropMode.BoxPad,
+                Width = 300,
+                Height = 150,
+            });
+        var urlStringPad =
+            s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
+            {
+                ImageCropMode = ImageCropMode.Pad,
+                Width = 300,
+                Height = 150,
+            });
+        var urlStringMax =
+            s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
+            {
+                ImageCropMode = ImageCropMode.Max,
+                Width = 300,
+                Height = 150,
+            });
+        var urlStringStretch =
+            s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
+            {
+                ImageCropMode = ImageCropMode.Stretch,
+                Width = 300,
+                Height = 150,
+            });
+
+        Assert.AreEqual(MediaPath + "?rmode=min&width=300&height=150", urlStringMin);
+        Assert.AreEqual(MediaPath + "?rmode=boxpad&width=300&height=150", urlStringBoxPad);
+        Assert.AreEqual(MediaPath + "?rmode=pad&width=300&height=150", urlStringPad);
+        Assert.AreEqual(MediaPath + "?rmode=max&width=300&height=150", urlStringMax);
+        Assert.AreEqual(MediaPath + "?rmode=stretch&width=300&height=150", urlStringStretch);
+    }
+
+    /// <summary>
+    ///     Test for upload property type
+    /// </summary>
+    [Test]
+    public void GetImageUrl_UploadTypeTest()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
         {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { FocalPoint = s_focus1, Width = 200, Height = 300 });
-            Assert.AreEqual(MediaPath + "?rxy=0.96,0.80827067669172936&width=200&height=300", urlString);
-        }
+            ImageCropMode = ImageCropMode.Crop,
+            ImageCropAnchor = ImageCropAnchor.Center,
+            Width = 100,
+            Height = 270,
+        });
+        Assert.AreEqual(MediaPath + "?rmode=crop&ranchor=center&width=100&height=270", urlString);
+    }
 
-        [Test]
-        public void GetImageUrl_FocalPointTest()
+    /// <summary>
+    ///     Test for preferFocalPoint when focal point is centered
+    /// </summary>
+    [Test]
+    public void GetImageUrl_PreferFocalPointCenter()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { Width = 300, Height = 150 });
+        Assert.AreEqual(MediaPath + "?width=300&height=150", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check if crop ratio is ignored if useCropDimensions is true
+    /// </summary>
+    [Test]
+    public void GetImageUrl_PreDefinedCropNoCoordinatesWithWidthAndFocalPointIgnore()
+    {
+        var urlString =
+            s_generator.GetImageUrl(
+                new ImageUrlGenerationOptions(MediaPath) { FocalPoint = s_focus2, Width = 270, Height = 161 });
+        Assert.AreEqual(MediaPath + "?rxy=0.4275,0.41&width=270&height=161", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check result when only a width parameter is passed, effectivly a resize only
+    /// </summary>
+    [Test]
+    public void GetImageUrl_WidthOnlyParameter()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { Width = 200 });
+        Assert.AreEqual(MediaPath + "?width=200", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check result when only a height parameter is passed, effectivly a resize only
+    /// </summary>
+    [Test]
+    public void GetImageUrl_HeightOnlyParameter()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { Height = 200 });
+        Assert.AreEqual(MediaPath + "?height=200", urlString);
+    }
+
+    /// <summary>
+    ///     Test to check result when using a background color with padding
+    /// </summary>
+    [Test]
+    public void GetImageUrl_BackgroundColorParameter()
+    {
+        var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath)
         {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { FocalPoint = s_focus1, Width = 100, Height = 100 });
-            Assert.AreEqual(MediaPath + "?rxy=0.96,0.80827067669172936&width=100&height=100", urlString);
-        }
-
-        [Test]
-        public void GetImageUrlFurtherOptionsTest()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { FocalPoint = s_focus1, Width = 200, Height = 300, FurtherOptions = "&filter=comic&roundedcorners=radius-26|bgcolor-fff" });
-            Assert.AreEqual(MediaPath + "?rxy=0.96,0.80827067669172936&width=200&height=300&filter=comic&roundedcorners=radius-26%7Cbgcolor-fff", urlString);
-        }
-
-        /// <summary>
-        /// Test that if options is null, the generated image URL is also null.
-        /// </summary>
-        [Test]
-        public void GetImageUrlNullOptionsTest()
-        {
-            var urlString = s_generator.GetImageUrl(null);
-            Assert.AreEqual(null, urlString);
-        }
-
-        /// <summary>
-        /// Test that if the image URL is null, the generated image URL is also null.
-        /// </summary>
-        [Test]
-        public void GetImageUrlNullTest()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(null));
-            Assert.AreEqual(null, urlString);
-        }
-
-        /// <summary>
-        /// Test that if the image URL is empty, the generated image URL is empty.
-        /// </summary>
-        [Test]
-        public void GetImageUrlEmptyTest()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(string.Empty));
-            Assert.AreEqual(string.Empty, urlString);
-        }
-
-        /// <summary>
-        /// Test the GetImageUrl method on the ImageCropDataSet Model
-        /// </summary>
-        [Test]
-        public void GetBaseCropUrlFromModelTest()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(string.Empty) { Crop = s_crop, Width = 100, Height = 100 });
-            Assert.AreEqual("?cc=0.58729977382575338,0.055768992440203169,0,0.32457553600198386&width=100&height=100", urlString);
-        }
-
-        /// <summary>
-        /// Test that if Crop mode is specified as anything other than Crop the image doesn't use the crop
-        /// </summary>
-        [Test]
-        public void GetImageUrl_SpecifiedCropModeTest()
-        {
-            var urlStringMin = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { ImageCropMode = ImageCropMode.Min, Width = 300, Height = 150 });
-            var urlStringBoxPad = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { ImageCropMode = ImageCropMode.BoxPad, Width = 300, Height = 150 });
-            var urlStringPad = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { ImageCropMode = ImageCropMode.Pad, Width = 300, Height = 150 });
-            var urlStringMax = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { ImageCropMode = ImageCropMode.Max, Width = 300, Height = 150 });
-            var urlStringStretch = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { ImageCropMode = ImageCropMode.Stretch, Width = 300, Height = 150 });
-
-            Assert.AreEqual(MediaPath + "?rmode=min&width=300&height=150", urlStringMin);
-            Assert.AreEqual(MediaPath + "?rmode=boxpad&width=300&height=150", urlStringBoxPad);
-            Assert.AreEqual(MediaPath + "?rmode=pad&width=300&height=150", urlStringPad);
-            Assert.AreEqual(MediaPath + "?rmode=max&width=300&height=150", urlStringMax);
-            Assert.AreEqual(MediaPath + "?rmode=stretch&width=300&height=150", urlStringStretch);
-        }
-
-        /// <summary>
-        /// Test for upload property type
-        /// </summary>
-        [Test]
-        public void GetImageUrl_UploadTypeTest()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { ImageCropMode = ImageCropMode.Crop, ImageCropAnchor = ImageCropAnchor.Center, Width = 100, Height = 270 });
-            Assert.AreEqual(MediaPath + "?rmode=crop&ranchor=center&width=100&height=270", urlString);
-        }
-
-        /// <summary>
-        /// Test for preferFocalPoint when focal point is centered
-        /// </summary>
-        [Test]
-        public void GetImageUrl_PreferFocalPointCenter()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { Width = 300, Height = 150 });
-            Assert.AreEqual(MediaPath + "?width=300&height=150", urlString);
-        }
-
-        /// <summary>
-        /// Test to check if crop ratio is ignored if useCropDimensions is true
-        /// </summary>
-        [Test]
-        public void GetImageUrl_PreDefinedCropNoCoordinatesWithWidthAndFocalPointIgnore()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { FocalPoint = s_focus2, Width = 270, Height = 161 });
-            Assert.AreEqual(MediaPath + "?rxy=0.4275,0.41&width=270&height=161", urlString);
-        }
-
-        /// <summary>
-        /// Test to check result when only a width parameter is passed, effectivly a resize only
-        /// </summary>
-        [Test]
-        public void GetImageUrl_WidthOnlyParameter()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { Width = 200 });
-            Assert.AreEqual(MediaPath + "?width=200", urlString);
-        }
-
-        /// <summary>
-        /// Test to check result when only a height parameter is passed, effectivly a resize only
-        /// </summary>
-        [Test]
-        public void GetImageUrl_HeightOnlyParameter()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { Height = 200 });
-            Assert.AreEqual(MediaPath + "?height=200", urlString);
-        }
-
-        /// <summary>
-        /// Test to check result when using a background color with padding
-        /// </summary>
-        [Test]
-        public void GetImageUrl_BackgroundColorParameter()
-        {
-            var urlString = s_generator.GetImageUrl(new ImageUrlGenerationOptions(MediaPath) { ImageCropMode = ImageCropMode.Pad, Width = 400, Height = 400, FurtherOptions = "&bgcolor=fff" });
-            Assert.AreEqual(MediaPath + "?rmode=pad&width=400&height=400&bgcolor=fff", urlString);
-        }
+            ImageCropMode = ImageCropMode.Pad,
+            Width = 400,
+            Height = 400,
+            FurtherOptions = "&bgcolor=fff",
+        });
+        Assert.AreEqual(MediaPath + "?rmode=pad&width=400&height=400&bgcolor=fff", urlString);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs
index 37972cf0a4..ca9d538340 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/ContentModelBinderTests.cs
@@ -18,234 +18,239 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.Common.ModelBinders;
 using Umbraco.Cms.Web.Common.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders;
+
+[TestFixture]
+public class ContentModelBinderTests
 {
-    [TestFixture]
-    public class ContentModelBinderTests
+    [SetUp]
+    public void SetUp() => _contentModelBinder = new ContentModelBinder(Mock.Of<IEventAggregator>());
+
+    private ContentModelBinder _contentModelBinder;
+
+    [Test]
+    [TestCase(typeof(IPublishedContent), false)]
+    [TestCase(typeof(ContentModel), false)]
+    [TestCase(typeof(ContentType1), false)]
+    [TestCase(typeof(ContentModel<ContentType1>), false)]
+    [TestCase(typeof(NonContentModel), true)]
+    [TestCase(typeof(MyCustomContentModel), true)]
+    [TestCase(typeof(IContentModel), true)]
+    public void Returns_Binder_For_IPublishedContent_And_IRenderModel(Type testType, bool expectNull)
     {
-        private ContentModelBinder _contentModelBinder;
+        var binderProvider = new ContentModelBinderProvider();
+        var contextMock = new Mock<ModelBinderProviderContext>();
+        contextMock.Setup(x => x.Metadata).Returns(new EmptyModelMetadataProvider().GetMetadataForType(testType));
 
-        [SetUp]
-        public void SetUp() => _contentModelBinder = new ContentModelBinder(Mock.Of<IEventAggregator>());
-
-        [Test]
-        [TestCase(typeof(IPublishedContent), false)]
-        [TestCase(typeof(ContentModel), false)]
-        [TestCase(typeof(ContentType1), false)]
-        [TestCase(typeof(ContentModel<ContentType1>), false)]
-        [TestCase(typeof(NonContentModel), true)]
-        [TestCase(typeof(MyCustomContentModel), true)]
-        [TestCase(typeof(IContentModel), true)]
-        public void Returns_Binder_For_IPublishedContent_And_IRenderModel(Type testType, bool expectNull)
+        var found = binderProvider.GetBinder(contextMock.Object);
+        if (expectNull)
         {
-            var binderProvider = new ContentModelBinderProvider();
-            var contextMock = new Mock<ModelBinderProviderContext>();
-            contextMock.Setup(x => x.Metadata).Returns(new EmptyModelMetadataProvider().GetMetadataForType(testType));
-
-            IModelBinder found = binderProvider.GetBinder(contextMock.Object);
-            if (expectNull)
-            {
-                Assert.IsNull(found);
-            }
-            else
-            {
-                Assert.IsNotNull(found);
-            }
+            Assert.IsNull(found);
         }
-
-        [Test]
-        public async Task Does_Not_Bind_Model_When_UmbracoToken_Not_In_Route_Values()
+        else
         {
-            // Arrange
-            IPublishedContent pc = CreatePublishedContent();
-            ModelBindingContext bindingContext = CreateBindingContextForUmbracoRequest(typeof(ContentModel), pc);
-            bindingContext.ActionContext.HttpContext.Features.Set<UmbracoRouteValues>(null);
-
-            // Act
-            await _contentModelBinder.BindModelAsync(bindingContext);
-
-            // Assert
-            Assert.False(bindingContext.Result.IsModelSet);
+            Assert.IsNotNull(found);
         }
+    }
 
-        [Test]
-        public async Task Bind_Model_When_UmbracoToken_Is_In_Route_Values()
+    [Test]
+    public async Task Does_Not_Bind_Model_When_UmbracoToken_Not_In_Route_Values()
+    {
+        // Arrange
+        var pc = CreatePublishedContent();
+        var bindingContext = CreateBindingContextForUmbracoRequest(typeof(ContentModel), pc);
+        bindingContext.ActionContext.HttpContext.Features.Set<UmbracoRouteValues>(null);
+
+        // Act
+        await _contentModelBinder.BindModelAsync(bindingContext);
+
+        // Assert
+        Assert.False(bindingContext.Result.IsModelSet);
+    }
+
+    [Test]
+    public async Task Bind_Model_When_UmbracoToken_Is_In_Route_Values()
+    {
+        // Arrange
+        var pc = CreatePublishedContent();
+        var bindingContext = CreateBindingContextForUmbracoRequest(typeof(ContentModel), pc);
+
+        // Act
+        await _contentModelBinder.BindModelAsync(bindingContext);
+
+        // Assert
+        Assert.True(bindingContext.Result.IsModelSet);
+    }
+
+    [Test]
+    public void Throws_When_Source_Not_Of_Expected_Type()
+    {
+        // Arrange
+        var bindingContext = new DefaultModelBindingContext();
+
+        // Act/Assert
+        Assert.Throws<ModelBindingException>(() =>
+            _contentModelBinder.BindModel(bindingContext, new NonContentModel(), typeof(ContentModel)));
+    }
+
+    [Test]
+    public void Binds_From_IPublishedContent_To_Content_Model()
+    {
+        // Arrange
+        var pc = CreatePublishedContent();
+        ModelBindingContext bindingContext = new DefaultModelBindingContext();
+
+        // Act
+        _contentModelBinder.BindModel(bindingContext, pc, typeof(ContentModel));
+
+        // Assert
+        Assert.True(bindingContext.Result.IsModelSet);
+    }
+
+    [Test]
+    public void Binds_From_IPublishedContent_To_Content_Model_Of_T()
+    {
+        // Arrange
+        var pc = CreatePublishedContent();
+        ModelBindingContext bindingContext = new DefaultModelBindingContext();
+
+        // Act
+        _contentModelBinder.BindModel(
+            bindingContext,
+            new ContentModel<ContentType2>(new ContentType2(pc, Mock.Of<IPublishedValueFallback>())),
+            typeof(ContentModel<ContentType1>));
+
+        // Assert
+        Assert.True(bindingContext.Result.IsModelSet);
+    }
+
+    [Test]
+    public void BindModel_Null_Source_Returns_Null()
+    {
+        var bindingContext = new DefaultModelBindingContext();
+        _contentModelBinder.BindModel(bindingContext, null, typeof(ContentType1));
+        Assert.IsNull(bindingContext.Result.Model);
+    }
+
+    [Test]
+    public void BindModel_Returns_If_Same_Type()
+    {
+        var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
+        var bindingContext = new DefaultModelBindingContext();
+
+        _contentModelBinder.BindModel(bindingContext, content, typeof(ContentType1));
+
+        Assert.AreSame(content, bindingContext.Result.Model);
+    }
+
+    [Test]
+    public void BindModel_RenderModel_To_IPublishedContent()
+    {
+        var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
+        var renderModel = new ContentModel(content);
+
+        var bindingContext = new DefaultModelBindingContext();
+        _contentModelBinder.BindModel(bindingContext, renderModel, typeof(IPublishedContent));
+
+        Assert.AreSame(content, bindingContext.Result.Model);
+    }
+
+    [Test]
+    public void BindModel_IPublishedContent_To_RenderModel()
+    {
+        var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
+        var bindingContext = new DefaultModelBindingContext();
+
+        _contentModelBinder.BindModel(bindingContext, content, typeof(ContentModel));
+        var bound = (IContentModel)bindingContext.Result.Model;
+
+        Assert.AreSame(content, bound.Content);
+    }
+
+    [Test]
+    public void BindModel_IPublishedContent_To_Generic_RenderModel()
+    {
+        var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
+        var bindingContext = new DefaultModelBindingContext();
+
+        _contentModelBinder.BindModel(bindingContext, content, typeof(ContentModel<ContentType1>));
+        var bound = (IContentModel)bindingContext.Result.Model;
+
+        Assert.AreSame(content, bound.Content);
+    }
+
+    [Test]
+    public void Null_Model_Binds_To_Null()
+    {
+        var bindingContext = new DefaultModelBindingContext();
+        _contentModelBinder.BindModel(bindingContext, null, typeof(ContentModel));
+        Assert.IsNull(bindingContext.Result.Model);
+    }
+
+    [Test]
+    public void Invalid_Model_Type_Throws_Exception()
+    {
+        var bindingContext = new DefaultModelBindingContext();
+        Assert.Throws<ModelBindingException>(() =>
+            _contentModelBinder.BindModel(bindingContext, "Hello", typeof(IPublishedContent)));
+    }
+
+    /// <summary>
+    ///     Creates a binding context with the route values populated to similute an Umbraco dynamically routed request
+    /// </summary>
+    private ModelBindingContext CreateBindingContextForUmbracoRequest(
+        Type modelType,
+        IPublishedContent publishedContent)
+    {
+        var builder = new PublishedRequestBuilder(new Uri("https://example.com"), Mock.Of<IFileService>());
+        builder.SetPublishedContent(publishedContent);
+        var publishedRequest = builder.Build();
+
+        var httpContext = new DefaultHttpContext();
+        var routeData = new RouteData();
+        httpContext.Features.Set(new UmbracoRouteValues(publishedRequest, null));
+
+        var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
+        var metadataProvider = new EmptyModelMetadataProvider();
+        var routeValueDictionary = new RouteValueDictionary();
+        var valueProvider = new RouteValueProvider(BindingSource.Path, routeValueDictionary);
+        return new DefaultModelBindingContext
         {
-            // Arrange
-            IPublishedContent pc = CreatePublishedContent();
-            ModelBindingContext bindingContext = CreateBindingContextForUmbracoRequest(typeof(ContentModel), pc);
+            ActionContext = actionContext,
+            ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+            ModelName = modelType.Name,
+            ValueProvider = valueProvider,
+        };
+    }
 
-            // Act
-            await _contentModelBinder.BindModelAsync(bindingContext);
+    private class NonContentModel
+    {
+    }
 
-            // Assert
-            Assert.True(bindingContext.Result.IsModelSet);
-        }
+    private IPublishedContent CreatePublishedContent() =>
+        new ContentType2(new Mock<IPublishedContent>().Object, Mock.Of<IPublishedValueFallback>());
 
-        [Test]
-        public void Throws_When_Source_Not_Of_Expected_Type()
-        {
-            // Arrange
-            IPublishedContent pc = CreatePublishedContent();
-            var bindingContext = new DefaultModelBindingContext();
-
-            // Act/Assert
-            Assert.Throws<ModelBindingException>(() => _contentModelBinder.BindModel(bindingContext, new NonContentModel(), typeof(ContentModel)));
-        }
-
-        [Test]
-        public void Binds_From_IPublishedContent_To_Content_Model()
-        {
-            // Arrange
-            IPublishedContent pc = CreatePublishedContent();
-            ModelBindingContext bindingContext = new DefaultModelBindingContext();
-
-            // Act
-            _contentModelBinder.BindModel(bindingContext, pc, typeof(ContentModel));
-
-            // Assert
-            Assert.True(bindingContext.Result.IsModelSet);
-        }
-
-        [Test]
-        public void Binds_From_IPublishedContent_To_Content_Model_Of_T()
-        {
-            // Arrange
-            IPublishedContent pc = CreatePublishedContent();
-            ModelBindingContext bindingContext = new DefaultModelBindingContext();
-
-            // Act
-            _contentModelBinder.BindModel(bindingContext, new ContentModel<ContentType2>(new ContentType2(pc, Mock.Of<IPublishedValueFallback>())), typeof(ContentModel<ContentType1>));
-
-            // Assert
-            Assert.True(bindingContext.Result.IsModelSet);
-        }
-
-        [Test]
-        public void BindModel_Null_Source_Returns_Null()
-        {
-            var bindingContext = new DefaultModelBindingContext();
-            _contentModelBinder.BindModel(bindingContext, null, typeof(ContentType1));
-            Assert.IsNull(bindingContext.Result.Model);
-        }
-
-        [Test]
-        public void BindModel_Returns_If_Same_Type()
-        {
-            var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
-            var bindingContext = new DefaultModelBindingContext();
-
-            _contentModelBinder.BindModel(bindingContext, content, typeof(ContentType1));
-
-            Assert.AreSame(content, bindingContext.Result.Model);
-        }
-
-        [Test]
-        public void BindModel_RenderModel_To_IPublishedContent()
-        {
-            var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
-            var renderModel = new ContentModel(content);
-
-            var bindingContext = new DefaultModelBindingContext();
-            _contentModelBinder.BindModel(bindingContext, renderModel, typeof(IPublishedContent));
-
-            Assert.AreSame(content, bindingContext.Result.Model);
-        }
-
-        [Test]
-        public void BindModel_IPublishedContent_To_RenderModel()
-        {
-            var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
-            var bindingContext = new DefaultModelBindingContext();
-
-            _contentModelBinder.BindModel(bindingContext, content, typeof(ContentModel));
-            var bound = (IContentModel)bindingContext.Result.Model;
-
-            Assert.AreSame(content, bound.Content);
-        }
-
-        [Test]
-        public void BindModel_IPublishedContent_To_Generic_RenderModel()
-        {
-            var content = new ContentType1(Mock.Of<IPublishedContent>(), Mock.Of<IPublishedValueFallback>());
-            var bindingContext = new DefaultModelBindingContext();
-
-            _contentModelBinder.BindModel(bindingContext, content, typeof(ContentModel<ContentType1>));
-            var bound = (IContentModel)bindingContext.Result.Model;
-
-            Assert.AreSame(content, bound.Content);
-        }
-
-        [Test]
-        public void Null_Model_Binds_To_Null()
-        {
-            IPublishedContent pc = Mock.Of<IPublishedContent>();
-            var bindingContext = new DefaultModelBindingContext();
-            _contentModelBinder.BindModel(bindingContext, null, typeof(ContentModel));
-            Assert.IsNull(bindingContext.Result.Model);
-        }
-
-        [Test]
-        public void Invalid_Model_Type_Throws_Exception()
-        {
-            IPublishedContent pc = Mock.Of<IPublishedContent>();
-            var bindingContext = new DefaultModelBindingContext();
-            Assert.Throws<ModelBindingException>(() => _contentModelBinder.BindModel(bindingContext, "Hello", typeof(IPublishedContent)));
-        }
-
-        /// <summary>
-        /// Creates a binding context with the route values populated to similute an Umbraco dynamically routed request
-        /// </summary>
-        private ModelBindingContext CreateBindingContextForUmbracoRequest(Type modelType, IPublishedContent publishedContent)
-        {
-            var builder = new PublishedRequestBuilder(new Uri("https://example.com"), Mock.Of<IFileService>());
-            builder.SetPublishedContent(publishedContent);
-            IPublishedRequest publishedRequest = builder.Build();
-
-            var httpContext = new DefaultHttpContext();
-            var routeData = new RouteData();
-            httpContext.Features.Set(new UmbracoRouteValues(publishedRequest, null));
-
-            var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
-            var metadataProvider = new EmptyModelMetadataProvider();
-            var routeValueDictionary = new RouteValueDictionary();
-            var valueProvider = new RouteValueProvider(BindingSource.Path, routeValueDictionary);
-            return new DefaultModelBindingContext
-            {
-                ActionContext = actionContext,
-                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
-                ModelName = modelType.Name,
-                ValueProvider = valueProvider,
-            };
-        }
-
-        private class NonContentModel
+    public class ContentType1 : PublishedContentWrapped
+    {
+        public ContentType1(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
         {
         }
+    }
 
-        private IPublishedContent CreatePublishedContent() => new ContentType2(new Mock<IPublishedContent>().Object, Mock.Of<IPublishedValueFallback>());
-
-        public class ContentType1 : PublishedContentWrapped
+    public class ContentType2 : ContentType1
+    {
+        public ContentType2(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
         {
-            public ContentType1(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
         }
+    }
 
-        public class ContentType2 : ContentType1
+    public class MyCustomContentModel : ContentModel
+    {
+        public MyCustomContentModel(IPublishedContent content)
+            : base(content)
         {
-            public ContentType2(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
-        }
-
-        public class MyCustomContentModel : ContentModel
-        {
-            public MyCustomContentModel(IPublishedContent content)
-                : base(content)
-            { }
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs
index 03412ca0b0..79325e7147 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/ModelBinders/HttpQueryStringModelBinderTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
-using System;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -11,84 +10,83 @@ using Microsoft.Extensions.Primitives;
 using NUnit.Framework;
 using Umbraco.Cms.Web.Common.ModelBinders;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.ModelBinders;
+
+[TestFixture]
+public class HttpQueryStringModelBinderTests
 {
-    [TestFixture]
-    public class HttpQueryStringModelBinderTests
+    [Test]
+    public void Binds_Query_To_FormCollection()
     {
-        [Test]
-        public void Binds_Query_To_FormCollection()
+        // Arrange
+        var bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
+        var binder = new HttpQueryStringModelBinder();
+
+        // Act
+        binder.BindModelAsync(bindingContext);
+
+        // Assert
+        Assert.True(bindingContext.Result.IsModelSet);
+
+        var typedModel = bindingContext.Result.Model as FormCollection;
+        Assert.IsNotNull(typedModel);
+        Assert.AreEqual(typedModel["foo"], "bar");
+        Assert.AreEqual(typedModel["baz"], "buzz");
+    }
+
+    [Test]
+    public void Sets_Culture_Form_Value_From_Query_If_Provided()
+    {
+        // Arrange
+        var bindingContext = CreateBindingContext("?foo=bar&baz=buzz&culture=en-gb");
+        var binder = new HttpQueryStringModelBinder();
+
+        // Act
+        binder.BindModelAsync(bindingContext);
+
+        // Assert
+        Assert.True(bindingContext.Result.IsModelSet);
+
+        var typedModel = bindingContext.Result.Model as FormCollection;
+        Assert.IsNotNull(typedModel);
+        Assert.AreEqual(typedModel["culture"], "en-gb");
+    }
+
+    [Test]
+    public void Sets_Culture_Form_Value_From_Header_If_Not_Provided_In_Query()
+    {
+        // Arrange
+        var bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
+        var binder = new HttpQueryStringModelBinder();
+
+        // Act
+        binder.BindModelAsync(bindingContext);
+
+        // Assert
+        Assert.True(bindingContext.Result.IsModelSet);
+
+        var typedModel = bindingContext.Result.Model as FormCollection;
+        Assert.IsNotNull(typedModel);
+        Assert.AreEqual(typedModel["culture"], "en-gb");
+    }
+
+    private ModelBindingContext CreateBindingContext(string querystring)
+    {
+        var httpContext = new DefaultHttpContext();
+        httpContext.Request.QueryString = new QueryString(querystring);
+        httpContext.Request.Headers.Add("X-UMB-CULTURE", new StringValues("en-gb"));
+        var routeData = new RouteData();
+        var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
+        var metadataProvider = new EmptyModelMetadataProvider();
+        var routeValueDictionary = new RouteValueDictionary();
+        var valueProvider = new RouteValueProvider(BindingSource.Path, routeValueDictionary);
+        var modelType = typeof(FormCollection);
+        return new DefaultModelBindingContext
         {
-            // Arrange
-            ModelBindingContext bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
-            var binder = new HttpQueryStringModelBinder();
-
-            // Act
-            binder.BindModelAsync(bindingContext);
-
-            // Assert
-            Assert.True(bindingContext.Result.IsModelSet);
-
-            var typedModel = bindingContext.Result.Model as FormCollection;
-            Assert.IsNotNull(typedModel);
-            Assert.AreEqual(typedModel["foo"], "bar");
-            Assert.AreEqual(typedModel["baz"], "buzz");
-        }
-
-        [Test]
-        public void Sets_Culture_Form_Value_From_Query_If_Provided()
-        {
-            // Arrange
-            ModelBindingContext bindingContext = CreateBindingContext("?foo=bar&baz=buzz&culture=en-gb");
-            var binder = new HttpQueryStringModelBinder();
-
-            // Act
-            binder.BindModelAsync(bindingContext);
-
-            // Assert
-            Assert.True(bindingContext.Result.IsModelSet);
-
-            var typedModel = bindingContext.Result.Model as FormCollection;
-            Assert.IsNotNull(typedModel);
-            Assert.AreEqual(typedModel["culture"], "en-gb");
-        }
-
-        [Test]
-        public void Sets_Culture_Form_Value_From_Header_If_Not_Provided_In_Query()
-        {
-            // Arrange
-            ModelBindingContext bindingContext = CreateBindingContext("?foo=bar&baz=buzz");
-            var binder = new HttpQueryStringModelBinder();
-
-            // Act
-            binder.BindModelAsync(bindingContext);
-
-            // Assert
-            Assert.True(bindingContext.Result.IsModelSet);
-
-            var typedModel = bindingContext.Result.Model as FormCollection;
-            Assert.IsNotNull(typedModel);
-            Assert.AreEqual(typedModel["culture"], "en-gb");
-        }
-
-        private ModelBindingContext CreateBindingContext(string querystring)
-        {
-            var httpContext = new DefaultHttpContext();
-            httpContext.Request.QueryString = new QueryString(querystring);
-            httpContext.Request.Headers.Add("X-UMB-CULTURE", new StringValues("en-gb"));
-            var routeData = new RouteData();
-            var actionContext = new ActionContext(httpContext, routeData, new ActionDescriptor());
-            var metadataProvider = new EmptyModelMetadataProvider();
-            var routeValueDictionary = new RouteValueDictionary();
-            var valueProvider = new RouteValueProvider(BindingSource.Path, routeValueDictionary);
-            Type modelType = typeof(FormCollection);
-            return new DefaultModelBindingContext
-            {
-                ActionContext = actionContext,
-                ModelMetadata = metadataProvider.GetMetadataForType(modelType),
-                ModelName = modelType.Name,
-                ValueProvider = valueProvider,
-            };
-        }
+            ActionContext = actionContext,
+            ModelMetadata = metadataProvider.GetMetadataForType(modelType),
+            ModelName = modelType.Name,
+            ValueProvider = valueProvider,
+        };
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs
index c63cee8b84..f15d8d6fff 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Mvc/HtmlStringUtilitiesTests.cs
@@ -4,47 +4,46 @@
 using NUnit.Framework;
 using Umbraco.Cms.Web.Common.Mvc;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Mvc
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Mvc;
+
+[TestFixture]
+public class HtmlStringUtilitiesTests
 {
-    [TestFixture]
-    public class HtmlStringUtilitiesTests
+    [SetUp]
+    public virtual void Initialize() => _htmlStringUtilities = new HtmlStringUtilities();
+
+    private HtmlStringUtilities _htmlStringUtilities;
+
+    [Test]
+    public void TruncateWithElipsis()
     {
-        private HtmlStringUtilities _htmlStringUtilities;
+        var output = _htmlStringUtilities.Truncate("hello world", 5, true, false).ToString();
+        var expected = "hello&hellip;";
+        Assert.AreEqual(expected, output);
+    }
 
-        [SetUp]
-        public virtual void Initialize() => _htmlStringUtilities = new HtmlStringUtilities();
+    [Test]
+    public void TruncateWithoutElipsis()
+    {
+        var output = _htmlStringUtilities.Truncate("hello world", 5, false, false).ToString();
+        var expected = "hello";
+        Assert.AreEqual(expected, output);
+    }
 
-        [Test]
-        public void TruncateWithElipsis()
-        {
-            string output = _htmlStringUtilities.Truncate("hello world", 5, true, false).ToString();
-            var expected = "hello&hellip;";
-            Assert.AreEqual(expected, output);
-        }
+    [Test]
+    public void TruncateShorterWordThanHellip()
+    {
+        // http://issues.umbraco.org/issue/U4-10478
+        var output = _htmlStringUtilities.Truncate("hi", 5, true, false).ToString();
+        var expected = "hi";
+        Assert.AreEqual(expected, output);
+    }
 
-        [Test]
-        public void TruncateWithoutElipsis()
-        {
-            string output = _htmlStringUtilities.Truncate("hello world", 5, false, false).ToString();
-            var expected = "hello";
-            Assert.AreEqual(expected, output);
-        }
-
-        [Test]
-        public void TruncateShorterWordThanHellip()
-        {
-            // http://issues.umbraco.org/issue/U4-10478
-            var output = _htmlStringUtilities.Truncate("hi", 5, true, false).ToString();
-            var expected = "hi";
-            Assert.AreEqual(expected, output);
-        }
-
-        [Test]
-        public void TruncateAndRemoveSpaceBetweenHellipAndWord()
-        {
-            var output = _htmlStringUtilities.Truncate("hello world", 6 /* hello plus space */, true, false).ToString();
-            var expected = "hello&hellip;";
-            Assert.AreEqual(expected, output);
-        }
+    [Test]
+    public void TruncateAndRemoveSpaceBetweenHellipAndWord()
+    {
+        var output = _htmlStringUtilities.Truncate("hello world", 6 /* hello plus space */, true, false).ToString();
+        var expected = "hello&hellip;";
+        Assert.AreEqual(expected, output);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
index fa7e307c23..6966c09566 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/BackOfficeAreaRoutesTests.cs
@@ -16,84 +16,92 @@ using Umbraco.Cms.Web.BackOffice.Routing;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Controllers;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;
+
+[TestFixture]
+public class BackOfficeAreaRoutesTests
 {
-    [TestFixture]
-    public class BackOfficeAreaRoutesTests
+    [TestCase(RuntimeLevel.BootFailed)]
+    [TestCase(RuntimeLevel.Unknown)]
+    [TestCase(RuntimeLevel.Boot)]
+    public void RuntimeState_No_Routes(RuntimeLevel level)
     {
+        var routes = GetBackOfficeAreaRoutes(level);
+        var endpoints = new TestRouteBuilder();
+        routes.CreateRoutes(endpoints);
 
-        [TestCase(RuntimeLevel.BootFailed)]
-        [TestCase(RuntimeLevel.Unknown)]
-        [TestCase(RuntimeLevel.Boot)]
-        public void RuntimeState_No_Routes(RuntimeLevel level)
-        {
-            BackOfficeAreaRoutes routes = GetBackOfficeAreaRoutes(level);
-            var endpoints = new TestRouteBuilder();
-            routes.CreateRoutes(endpoints);
+        Assert.AreEqual(0, endpoints.DataSources.Count);
+    }
 
-            Assert.AreEqual(0, endpoints.DataSources.Count);
-        }
+    [Test]
+    [TestCase(RuntimeLevel.Run)]
+    [TestCase(RuntimeLevel.Upgrade)]
+    [TestCase(RuntimeLevel.Install)]
+    public void RuntimeState_All_Routes(RuntimeLevel level)
+    {
+        var routes = GetBackOfficeAreaRoutes(level);
+        var endpoints = new TestRouteBuilder();
+        routes.CreateRoutes(endpoints);
 
-        [Test]
-        [TestCase(RuntimeLevel.Run)]
-        [TestCase(RuntimeLevel.Upgrade)]
-        [TestCase(RuntimeLevel.Install)]
-        public void RuntimeState_All_Routes(RuntimeLevel level)
-        {
-            BackOfficeAreaRoutes routes = GetBackOfficeAreaRoutes(level);
-            var endpoints = new TestRouteBuilder();
-            routes.CreateRoutes(endpoints);
+        Assert.AreEqual(1, endpoints.DataSources.Count);
+        var route = endpoints.DataSources.First();
+        Assert.AreEqual(3, route.Endpoints.Count);
 
-            Assert.AreEqual(1, endpoints.DataSources.Count);
-            EndpointDataSource route = endpoints.DataSources.First();
-            Assert.AreEqual(3, route.Endpoints.Count);
+        AssertMinimalBackOfficeRoutes(route);
 
-            AssertMinimalBackOfficeRoutes(route);
+        var endpoint4 = (RouteEndpoint)route.Endpoints[2];
+        var apiControllerName = ControllerExtensions.GetControllerName<Testing1Controller>();
+        Assert.AreEqual(
+            $"umbraco/backoffice/api/{apiControllerName.ToLowerInvariant()}/{{action}}/{{id?}}",
+            endpoint4.RoutePattern.RawText);
+        Assert.IsFalse(endpoint4.RoutePattern.Defaults.ContainsKey(AreaToken));
+        Assert.IsFalse(endpoint4.RoutePattern.Defaults.ContainsKey(ActionToken));
+        Assert.AreEqual(apiControllerName, endpoint4.RoutePattern.Defaults[ControllerToken]);
+    }
 
-            var endpoint4 = (RouteEndpoint)route.Endpoints[2];
-            string apiControllerName = ControllerExtensions.GetControllerName<Testing1Controller>();
-            Assert.AreEqual($"umbraco/backoffice/api/{apiControllerName.ToLowerInvariant()}/{{action}}/{{id?}}", endpoint4.RoutePattern.RawText);
-            Assert.IsFalse(endpoint4.RoutePattern.Defaults.ContainsKey(AreaToken));
-            Assert.IsFalse(endpoint4.RoutePattern.Defaults.ContainsKey(ActionToken));
-            Assert.AreEqual(apiControllerName, endpoint4.RoutePattern.Defaults[ControllerToken]);
-        }
+    private void AssertMinimalBackOfficeRoutes(EndpointDataSource route)
+    {
+        var endpoint1 = (RouteEndpoint)route.Endpoints[0];
+        Assert.AreEqual("umbraco/{action}/{id?}", endpoint1.RoutePattern.RawText);
+        Assert.AreEqual(Constants.Web.Mvc.BackOfficeArea, endpoint1.RoutePattern.Defaults[AreaToken]);
+        Assert.AreEqual("Default", endpoint1.RoutePattern.Defaults[ActionToken]);
+        Assert.AreEqual(
+            ControllerExtensions.GetControllerName<BackOfficeController>(),
+            endpoint1.RoutePattern.Defaults[ControllerToken]);
+        Assert.AreEqual(
+            endpoint1.RoutePattern.Defaults[AreaToken],
+            typeof(BackOfficeController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
 
-        private void AssertMinimalBackOfficeRoutes(EndpointDataSource route)
-        {
-            var endpoint1 = (RouteEndpoint)route.Endpoints[0];
-            Assert.AreEqual($"umbraco/{{action}}/{{id?}}", endpoint1.RoutePattern.RawText);
-            Assert.AreEqual(Constants.Web.Mvc.BackOfficeArea, endpoint1.RoutePattern.Defaults[AreaToken]);
-            Assert.AreEqual("Default", endpoint1.RoutePattern.Defaults[ActionToken]);
-            Assert.AreEqual(ControllerExtensions.GetControllerName<BackOfficeController>(), endpoint1.RoutePattern.Defaults[ControllerToken]);
-            Assert.AreEqual(endpoint1.RoutePattern.Defaults[AreaToken], typeof(BackOfficeController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
+        var endpoint2 = (RouteEndpoint)route.Endpoints[1];
+        var controllerName = ControllerExtensions.GetControllerName<AuthenticationController>();
+        Assert.AreEqual(
+            $"umbraco/backoffice/{Constants.Web.Mvc.BackOfficeApiArea.ToLowerInvariant()}/{controllerName.ToLowerInvariant()}/{{action}}/{{id?}}",
+            endpoint2.RoutePattern.RawText);
+        Assert.AreEqual(Constants.Web.Mvc.BackOfficeApiArea, endpoint2.RoutePattern.Defaults[AreaToken]);
+        Assert.IsFalse(endpoint2.RoutePattern.Defaults.ContainsKey(ActionToken));
+        Assert.AreEqual(controllerName, endpoint2.RoutePattern.Defaults[ControllerToken]);
+        Assert.AreEqual(
+            endpoint1.RoutePattern.Defaults[AreaToken],
+            typeof(BackOfficeController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
+    }
 
-            var endpoint2 = (RouteEndpoint)route.Endpoints[1];
-            string controllerName = ControllerExtensions.GetControllerName<AuthenticationController>();
-            Assert.AreEqual($"umbraco/backoffice/{Constants.Web.Mvc.BackOfficeApiArea.ToLowerInvariant()}/{controllerName.ToLowerInvariant()}/{{action}}/{{id?}}", endpoint2.RoutePattern.RawText);
-            Assert.AreEqual(Constants.Web.Mvc.BackOfficeApiArea, endpoint2.RoutePattern.Defaults[AreaToken]);
-            Assert.IsFalse(endpoint2.RoutePattern.Defaults.ContainsKey(ActionToken));
-            Assert.AreEqual(controllerName, endpoint2.RoutePattern.Defaults[ControllerToken]);
-            Assert.AreEqual(endpoint1.RoutePattern.Defaults[AreaToken], typeof(BackOfficeController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
-        }
+    private BackOfficeAreaRoutes GetBackOfficeAreaRoutes(RuntimeLevel level)
+    {
+        var globalSettings = new GlobalSettings();
+        var routes = new BackOfficeAreaRoutes(
+            Options.Create(globalSettings),
+            Mock.Of<IHostingEnvironment>(x =>
+                x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
+            Mock.Of<IRuntimeState>(x => x.Level == level),
+            new UmbracoApiControllerTypeCollection(() => new[] { typeof(Testing1Controller) }));
 
-        private BackOfficeAreaRoutes GetBackOfficeAreaRoutes(RuntimeLevel level)
-        {
-            var globalSettings = new GlobalSettings();
-            var routes = new BackOfficeAreaRoutes(
-                Options.Create(globalSettings),
-                Mock.Of<IHostingEnvironment>(x => x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
-                Mock.Of<IRuntimeState>(x => x.Level == level),
-                new UmbracoApiControllerTypeCollection(() => new[] { typeof(Testing1Controller) }));
+        return routes;
+    }
 
-            return routes;
-        }
-
-        [IsBackOffice]
-        private class Testing1Controller : UmbracoApiController
-        {
-        }
+    [IsBackOffice]
+    private class Testing1Controller : UmbracoApiController
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs
index 197f432bce..72df3f54a1 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/EndpointRouteBuilderExtensionsTests.cs
@@ -5,136 +5,147 @@ using System.Linq;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using NUnit.Framework;
+using Umbraco.Cms.Core;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;
+
+[TestFixture]
+public class EndpointRouteBuilderExtensionsTests
 {
-    [TestFixture]
-    public class EndpointRouteBuilderExtensionsTests
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", null, true)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", "GetStuff", true)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, null, true)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, "GetStuff", true)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", null, false)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", "GetStuff", false)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, null, false)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, "GetStuff", false)]
+    [TestCase("umbraco", null, "test", null, true)]
+    [TestCase("umbraco", null, "test", "GetStuff", true)]
+    [TestCase("umbraco", null, null, null, true)]
+    [TestCase("umbraco", null, null, "GetStuff", true)]
+    [TestCase("umbraco", null, "test", null, false)]
+    [TestCase("umbraco", null, "test", "GetStuff", false)]
+    [TestCase("umbraco", null, null, null, false)]
+    [TestCase("umbraco", null, null, "GetStuff", false)]
+    public void MapUmbracoRoute(string umbracoPath, string area, string prefix, string defaultAction, bool includeControllerName)
     {
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", null, true)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", "GetStuff", true)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, null, true)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, "GetStuff", true)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", null, false)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, "test", "GetStuff", false)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, null, false)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, null, "GetStuff", false)]
-        [TestCase("umbraco", null, "test", null, true)]
-        [TestCase("umbraco", null, "test", "GetStuff", true)]
-        [TestCase("umbraco", null, null, null, true)]
-        [TestCase("umbraco", null, null, "GetStuff", true)]
-        [TestCase("umbraco", null, "test", null, false)]
-        [TestCase("umbraco", null, "test", "GetStuff", false)]
-        [TestCase("umbraco", null, null, null, false)]
-        [TestCase("umbraco", null, null, "GetStuff", false)]
-        public void MapUmbracoRoute(string umbracoPath, string area, string prefix, string defaultAction, bool includeControllerName)
+        var endpoints = new TestRouteBuilder();
+        endpoints.MapUmbracoRoute<Testing1Controller>(umbracoPath, area, prefix, defaultAction, includeControllerName);
+
+        var route = endpoints.DataSources.First();
+        var endpoint = (RouteEndpoint)route.Endpoints[0];
+
+        var controllerName = ControllerExtensions.GetControllerName<Testing1Controller>();
+        var controllerNamePattern = controllerName.ToLowerInvariant();
+
+        if (includeControllerName)
         {
-            var endpoints = new TestRouteBuilder();
-            endpoints.MapUmbracoRoute<Testing1Controller>(umbracoPath, area, prefix, defaultAction, includeControllerName);
-
-            EndpointDataSource route = endpoints.DataSources.First();
-            var endpoint = (RouteEndpoint)route.Endpoints[0];
-
-            string controllerName = ControllerExtensions.GetControllerName<Testing1Controller>();
-            string controllerNamePattern = controllerName.ToLowerInvariant();
-
-            if (includeControllerName)
+            if (prefix.IsNullOrWhiteSpace())
             {
-                if (prefix.IsNullOrWhiteSpace())
-                {
-                    Assert.AreEqual($"{umbracoPath}/{controllerNamePattern}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
-                else
-                {
-                    Assert.AreEqual($"{umbracoPath}/{prefix}/{controllerNamePattern}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
+                Assert.AreEqual(
+                    $"{umbracoPath}/{controllerNamePattern}/{{action}}/{{id?}}",
+                    endpoint.RoutePattern.RawText);
             }
             else
             {
-                if (prefix.IsNullOrWhiteSpace())
-                {
-                    Assert.AreEqual($"{umbracoPath}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
-                else
-                {
-                    Assert.AreEqual($"{umbracoPath}/{prefix}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
+                Assert.AreEqual(
+                    $"{umbracoPath}/{prefix}/{controllerNamePattern}/{{action}}/{{id?}}",
+                    endpoint.RoutePattern.RawText);
             }
-
-            if (!area.IsNullOrWhiteSpace())
-            {
-                Assert.AreEqual(area, endpoint.RoutePattern.Defaults[AreaToken]);
-            }
-
-            if (!defaultAction.IsNullOrWhiteSpace())
-            {
-                Assert.AreEqual(defaultAction, endpoint.RoutePattern.Defaults["action"]);
-            }
-
-            Assert.AreEqual(controllerName, endpoint.RoutePattern.Defaults[ControllerToken]);
         }
-
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, true, null)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, true, "GetStuff")]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, false, null)]
-        [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, false, "GetStuff")]
-        [TestCase("umbraco", null, true, null)]
-        [TestCase("umbraco", null, true, "GetStuff")]
-        [TestCase("umbraco", null, false, null)]
-        [TestCase("umbraco", null, false, "GetStuff")]
-        public void MapUmbracoApiRoute(string umbracoPath, string area, bool isBackOffice, string defaultAction)
+        else
         {
-            var endpoints = new TestRouteBuilder();
-            endpoints.MapUmbracoApiRoute<Testing1Controller>(umbracoPath, area, isBackOffice, defaultAction);
-
-            EndpointDataSource route = endpoints.DataSources.First();
-            var endpoint = (RouteEndpoint)route.Endpoints[0];
-
-            string controllerName = ControllerExtensions.GetControllerName<Testing1Controller>();
-            string controllerNamePattern = controllerName.ToLowerInvariant();
-            string areaPattern = area?.ToLowerInvariant();
-
-            if (isBackOffice)
+            if (prefix.IsNullOrWhiteSpace())
             {
-                if (area.IsNullOrWhiteSpace())
-                {
-                    Assert.AreEqual($"{umbracoPath}/backoffice/api/{controllerNamePattern}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
-                else
-                {
-                    Assert.AreEqual($"{umbracoPath}/backoffice/{areaPattern}/{controllerNamePattern}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
+                Assert.AreEqual($"{umbracoPath}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
             }
             else
             {
-                if (area.IsNullOrWhiteSpace())
-                {
-                    Assert.AreEqual($"{umbracoPath}/api/{controllerNamePattern}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
-                else
-                {
-                    Assert.AreEqual($"{umbracoPath}/{areaPattern}/{controllerNamePattern}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
-                }
+                Assert.AreEqual($"{umbracoPath}/{prefix}/{{action}}/{{id?}}", endpoint.RoutePattern.RawText);
             }
-
-            if (!area.IsNullOrWhiteSpace())
-            {
-                Assert.AreEqual(area, endpoint.RoutePattern.Defaults[AreaToken]);
-            }
-
-            if (!defaultAction.IsNullOrWhiteSpace())
-            {
-                Assert.AreEqual(defaultAction, endpoint.RoutePattern.Defaults["action"]);
-            }
-
-            Assert.AreEqual(controllerName, endpoint.RoutePattern.Defaults[ControllerToken]);
         }
 
-        private class Testing1Controller : ControllerBase
+        if (!area.IsNullOrWhiteSpace())
         {
+            Assert.AreEqual(area, endpoint.RoutePattern.Defaults[AreaToken]);
         }
+
+        if (!defaultAction.IsNullOrWhiteSpace())
+        {
+            Assert.AreEqual(defaultAction, endpoint.RoutePattern.Defaults["action"]);
+        }
+
+        Assert.AreEqual(controllerName, endpoint.RoutePattern.Defaults[ControllerToken]);
+    }
+
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, true, null)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, true, "GetStuff")]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, false, null)]
+    [TestCase("umbraco", Constants.Web.Mvc.BackOfficeApiArea, false, "GetStuff")]
+    [TestCase("umbraco", null, true, null)]
+    [TestCase("umbraco", null, true, "GetStuff")]
+    [TestCase("umbraco", null, false, null)]
+    [TestCase("umbraco", null, false, "GetStuff")]
+    public void MapUmbracoApiRoute(string umbracoPath, string area, bool isBackOffice, string defaultAction)
+    {
+        var endpoints = new TestRouteBuilder();
+        endpoints.MapUmbracoApiRoute<Testing1Controller>(umbracoPath, area, isBackOffice, defaultAction);
+
+        var route = endpoints.DataSources.First();
+        var endpoint = (RouteEndpoint)route.Endpoints[0];
+
+        var controllerName = ControllerExtensions.GetControllerName<Testing1Controller>();
+        var controllerNamePattern = controllerName.ToLowerInvariant();
+        var areaPattern = area?.ToLowerInvariant();
+
+        if (isBackOffice)
+        {
+            if (area.IsNullOrWhiteSpace())
+            {
+                Assert.AreEqual(
+                    $"{umbracoPath}/backoffice/api/{controllerNamePattern}/{{action}}/{{id?}}",
+                    endpoint.RoutePattern.RawText);
+            }
+            else
+            {
+                Assert.AreEqual(
+                    $"{umbracoPath}/backoffice/{areaPattern}/{controllerNamePattern}/{{action}}/{{id?}}",
+                    endpoint.RoutePattern.RawText);
+            }
+        }
+        else
+        {
+            if (area.IsNullOrWhiteSpace())
+            {
+                Assert.AreEqual(
+                    $"{umbracoPath}/api/{controllerNamePattern}/{{action}}/{{id?}}",
+                    endpoint.RoutePattern.RawText);
+            }
+            else
+            {
+                Assert.AreEqual(
+                    $"{umbracoPath}/{areaPattern}/{controllerNamePattern}/{{action}}/{{id?}}",
+                    endpoint.RoutePattern.RawText);
+            }
+        }
+
+        if (!area.IsNullOrWhiteSpace())
+        {
+            Assert.AreEqual(area, endpoint.RoutePattern.Defaults[AreaToken]);
+        }
+
+        if (!defaultAction.IsNullOrWhiteSpace())
+        {
+            Assert.AreEqual(defaultAction, endpoint.RoutePattern.Defaults["action"]);
+        }
+
+        Assert.AreEqual(controllerName, endpoint.RoutePattern.Defaults[ControllerToken]);
+    }
+
+    private class Testing1Controller : ControllerBase
+    {
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs
index 24a272a4fa..3e4c930947 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/InstallAreaRoutesTests.cs
@@ -12,75 +12,82 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.BackOffice.Install;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
-using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;
+
+[TestFixture]
+public class InstallAreaRoutesTests
 {
-    [TestFixture]
-    public class InstallAreaRoutesTests
+    [TestCase(RuntimeLevel.BootFailed)]
+    [TestCase(RuntimeLevel.Unknown)]
+    [TestCase(RuntimeLevel.Boot)]
+    public void RuntimeState_No_Routes(RuntimeLevel level)
     {
-        [TestCase(RuntimeLevel.BootFailed)]
-        [TestCase(RuntimeLevel.Unknown)]
-        [TestCase(RuntimeLevel.Boot)]
-        public void RuntimeState_No_Routes(RuntimeLevel level)
-        {
-            InstallAreaRoutes routes = GetInstallAreaRoutes(level);
-            var endpoints = new TestRouteBuilder();
-            routes.CreateRoutes(endpoints);
+        var routes = GetInstallAreaRoutes(level);
+        var endpoints = new TestRouteBuilder();
+        routes.CreateRoutes(endpoints);
 
-            Assert.AreEqual(0, endpoints.DataSources.Count);
-        }
-
-        [TestCase(RuntimeLevel.Install)]
-        [TestCase(RuntimeLevel.Upgrade)]
-        public void RuntimeState_Install(RuntimeLevel level)
-        {
-            InstallAreaRoutes routes = GetInstallAreaRoutes(level);
-            var endpoints = new TestRouteBuilder();
-            routes.CreateRoutes(endpoints);
-
-            Assert.AreEqual(2, endpoints.DataSources.Count);
-            EndpointDataSource route = endpoints.DataSources.First();
-            Assert.AreEqual(2, route.Endpoints.Count);
-
-            var endpoint1 = (RouteEndpoint)route.Endpoints[0];
-            Assert.AreEqual($"install/api/{{action}}/{{id?}}", endpoint1.RoutePattern.RawText);
-            Assert.AreEqual(Constants.Web.Mvc.InstallArea, endpoint1.RoutePattern.Defaults[AreaToken]);
-            Assert.AreEqual("Index", endpoint1.RoutePattern.Defaults[ActionToken]);
-            Assert.AreEqual(ControllerExtensions.GetControllerName<InstallApiController>(), endpoint1.RoutePattern.Defaults[ControllerToken]);
-            Assert.AreEqual(endpoint1.RoutePattern.Defaults[AreaToken], typeof(InstallApiController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
-
-            var endpoint2 = (RouteEndpoint)route.Endpoints[1];
-            Assert.AreEqual($"install/{{action}}/{{id?}}", endpoint2.RoutePattern.RawText);
-            Assert.AreEqual(Constants.Web.Mvc.InstallArea, endpoint2.RoutePattern.Defaults[AreaToken]);
-            Assert.AreEqual("Index", endpoint2.RoutePattern.Defaults[ActionToken]);
-            Assert.AreEqual(ControllerExtensions.GetControllerName<InstallController>(), endpoint2.RoutePattern.Defaults[ControllerToken]);
-            Assert.AreEqual(endpoint2.RoutePattern.Defaults[AreaToken], typeof(InstallController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
-
-            EndpointDataSource fallbackRoute = endpoints.DataSources.Last();
-            Assert.AreEqual(1, fallbackRoute.Endpoints.Count);
-
-            Assert.AreEqual("Fallback {*path:nonfile}", fallbackRoute.Endpoints[0].ToString());
-        }
-
-        [Test]
-        public void RuntimeState_Run()
-        {
-            InstallAreaRoutes routes = GetInstallAreaRoutes(RuntimeLevel.Run);
-            var endpoints = new TestRouteBuilder();
-            routes.CreateRoutes(endpoints);
-
-            Assert.AreEqual(1, endpoints.DataSources.Count);
-            EndpointDataSource route = endpoints.DataSources.First();
-            Assert.AreEqual(1, route.Endpoints.Count);
-
-            Assert.AreEqual("install/{controller?}/{action?} HTTP: GET", route.Endpoints[0].ToString());
-        }
-
-        private InstallAreaRoutes GetInstallAreaRoutes(RuntimeLevel level) =>
-            new InstallAreaRoutes(
-                Mock.Of<IRuntimeState>(x => x.Level == level),
-                Mock.Of<IHostingEnvironment>(x => x.ToAbsolute(It.IsAny<string>()) == "/install" && x.ApplicationVirtualPath == string.Empty),
-                Mock.Of<LinkGenerator>());
+        Assert.AreEqual(0, endpoints.DataSources.Count);
     }
+
+    [TestCase(RuntimeLevel.Install)]
+    [TestCase(RuntimeLevel.Upgrade)]
+    public void RuntimeState_Install(RuntimeLevel level)
+    {
+        var routes = GetInstallAreaRoutes(level);
+        var endpoints = new TestRouteBuilder();
+        routes.CreateRoutes(endpoints);
+
+        Assert.AreEqual(2, endpoints.DataSources.Count);
+        var route = endpoints.DataSources.First();
+        Assert.AreEqual(2, route.Endpoints.Count);
+
+        var endpoint1 = (RouteEndpoint)route.Endpoints[0];
+        Assert.AreEqual("install/api/{action}/{id?}", endpoint1.RoutePattern.RawText);
+        Assert.AreEqual(Constants.Web.Mvc.InstallArea, endpoint1.RoutePattern.Defaults[AreaToken]);
+        Assert.AreEqual("Index", endpoint1.RoutePattern.Defaults[ActionToken]);
+        Assert.AreEqual(
+            ControllerExtensions.GetControllerName<InstallApiController>(),
+            endpoint1.RoutePattern.Defaults[ControllerToken]);
+        Assert.AreEqual(
+            endpoint1.RoutePattern.Defaults[AreaToken],
+            typeof(InstallApiController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
+
+        var endpoint2 = (RouteEndpoint)route.Endpoints[1];
+        Assert.AreEqual("install/{action}/{id?}", endpoint2.RoutePattern.RawText);
+        Assert.AreEqual(Constants.Web.Mvc.InstallArea, endpoint2.RoutePattern.Defaults[AreaToken]);
+        Assert.AreEqual("Index", endpoint2.RoutePattern.Defaults[ActionToken]);
+        Assert.AreEqual(
+            ControllerExtensions.GetControllerName<InstallController>(),
+            endpoint2.RoutePattern.Defaults[ControllerToken]);
+        Assert.AreEqual(
+            endpoint2.RoutePattern.Defaults[AreaToken],
+            typeof(InstallController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
+
+        var fallbackRoute = endpoints.DataSources.Last();
+        Assert.AreEqual(1, fallbackRoute.Endpoints.Count);
+
+        Assert.AreEqual("Fallback {*path:nonfile}", fallbackRoute.Endpoints[0].ToString());
+    }
+
+    [Test]
+    public void RuntimeState_Run()
+    {
+        var routes = GetInstallAreaRoutes(RuntimeLevel.Run);
+        var endpoints = new TestRouteBuilder();
+        routes.CreateRoutes(endpoints);
+
+        Assert.AreEqual(1, endpoints.DataSources.Count);
+        var route = endpoints.DataSources.First();
+        Assert.AreEqual(1, route.Endpoints.Count);
+
+        Assert.AreEqual("install/{controller?}/{action?} HTTP: GET", route.Endpoints[0].ToString());
+    }
+
+    private InstallAreaRoutes GetInstallAreaRoutes(RuntimeLevel level) =>
+        new(
+            Mock.Of<IRuntimeState>(x => x.Level == level),
+            Mock.Of<IHostingEnvironment>(x =>
+                x.ToAbsolute(It.IsAny<string>()) == "/install" && x.ApplicationVirtualPath == string.Empty),
+            Mock.Of<LinkGenerator>());
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs
index e87f1a297c..7fecd0605c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/PreviewRoutesTests.cs
@@ -14,62 +14,64 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Web.BackOffice.Controllers;
 using Umbraco.Cms.Web.BackOffice.Routing;
 using Umbraco.Extensions;
-using Constants = Umbraco.Cms.Core.Constants;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;
+
+[TestFixture]
+public class PreviewRoutesTests
 {
-    [TestFixture]
-    public class PreviewRoutesTests
+    [TestCase(RuntimeLevel.BootFailed)]
+    [TestCase(RuntimeLevel.Unknown)]
+    [TestCase(RuntimeLevel.Boot)]
+    public void RuntimeState_No_Routes(RuntimeLevel level)
     {
-        [TestCase(RuntimeLevel.BootFailed)]
-        [TestCase(RuntimeLevel.Unknown)]
-        [TestCase(RuntimeLevel.Boot)]
-        public void RuntimeState_No_Routes(RuntimeLevel level)
-        {
-            PreviewRoutes routes = GetRoutes(level);
-            var endpoints = new TestRouteBuilder();
-            routes.CreateRoutes(endpoints);
+        var routes = GetRoutes(level);
+        var endpoints = new TestRouteBuilder();
+        routes.CreateRoutes(endpoints);
 
-            Assert.AreEqual(0, endpoints.DataSources.Count);
-        }
+        Assert.AreEqual(0, endpoints.DataSources.Count);
+    }
 
-        [TestCase(RuntimeLevel.Run)]
-        [TestCase(RuntimeLevel.Upgrade)]
-        [TestCase(RuntimeLevel.Install)]
-        public void RuntimeState_All_Routes(RuntimeLevel level)
-        {
-            PreviewRoutes routes = GetRoutes(level);
-            var endpoints = new TestRouteBuilder();
-            routes.CreateRoutes(endpoints);
+    [TestCase(RuntimeLevel.Run)]
+    [TestCase(RuntimeLevel.Upgrade)]
+    [TestCase(RuntimeLevel.Install)]
+    public void RuntimeState_All_Routes(RuntimeLevel level)
+    {
+        var routes = GetRoutes(level);
+        var endpoints = new TestRouteBuilder();
+        routes.CreateRoutes(endpoints);
 
-            Assert.AreEqual(2, endpoints.DataSources.Count);
-            EndpointDataSource route = endpoints.DataSources.First();
-            Assert.AreEqual(2, route.Endpoints.Count);
+        Assert.AreEqual(2, endpoints.DataSources.Count);
+        var route = endpoints.DataSources.First();
+        Assert.AreEqual(2, route.Endpoints.Count);
 
-            var endpoint0 = (RouteEndpoint)route.Endpoints[0];
-            Assert.AreEqual($"{routes.GetPreviewHubRoute()}/negotiate", endpoint0.RoutePattern.RawText);
-            var endpoint1 = (RouteEndpoint)route.Endpoints[1];
-            Assert.AreEqual($"{routes.GetPreviewHubRoute()}", endpoint1.RoutePattern.RawText);
+        var endpoint0 = (RouteEndpoint)route.Endpoints[0];
+        Assert.AreEqual($"{routes.GetPreviewHubRoute()}/negotiate", endpoint0.RoutePattern.RawText);
+        var endpoint1 = (RouteEndpoint)route.Endpoints[1];
+        Assert.AreEqual($"{routes.GetPreviewHubRoute()}", endpoint1.RoutePattern.RawText);
 
-            var endpoint3 = (RouteEndpoint)endpoints.DataSources.Last().Endpoints[0];
-            var previewControllerName = ControllerExtensions.GetControllerName<PreviewController>();
-            Assert.AreEqual($"umbraco/{previewControllerName.ToLowerInvariant()}/{{action}}/{{id?}}", endpoint3.RoutePattern.RawText);
-            Assert.AreEqual(Constants.Web.Mvc.BackOfficeArea, endpoint3.RoutePattern.Defaults["area"]);
-            Assert.AreEqual("Index", endpoint3.RoutePattern.Defaults[ActionToken]);
-            Assert.AreEqual(previewControllerName, endpoint3.RoutePattern.Defaults[ControllerToken]);
-            Assert.AreEqual(endpoint3.RoutePattern.Defaults["area"], typeof(PreviewController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
-        }
+        var endpoint3 = (RouteEndpoint)endpoints.DataSources.Last().Endpoints[0];
+        var previewControllerName = ControllerExtensions.GetControllerName<PreviewController>();
+        Assert.AreEqual(
+            $"umbraco/{previewControllerName.ToLowerInvariant()}/{{action}}/{{id?}}",
+            endpoint3.RoutePattern.RawText);
+        Assert.AreEqual(Constants.Web.Mvc.BackOfficeArea, endpoint3.RoutePattern.Defaults["area"]);
+        Assert.AreEqual("Index", endpoint3.RoutePattern.Defaults[ActionToken]);
+        Assert.AreEqual(previewControllerName, endpoint3.RoutePattern.Defaults[ControllerToken]);
+        Assert.AreEqual(
+            endpoint3.RoutePattern.Defaults["area"],
+            typeof(PreviewController).GetCustomAttribute<AreaAttribute>(false).RouteValue);
+    }
 
-        private PreviewRoutes GetRoutes(RuntimeLevel level)
-        {
-            var globalSettings = new GlobalSettings();
-            var routes = new PreviewRoutes(
-                Options.Create(globalSettings),
-                Mock.Of<IHostingEnvironment>(x =>
-                    x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
-                Mock.Of<IRuntimeState>(x => x.Level == level));
-            return routes;
-        }
+    private PreviewRoutes GetRoutes(RuntimeLevel level)
+    {
+        var globalSettings = new GlobalSettings();
+        var routes = new PreviewRoutes(
+            Options.Create(globalSettings),
+            Mock.Of<IHostingEnvironment>(x =>
+                x.ToAbsolute(It.IsAny<string>()) == "/umbraco" && x.ApplicationVirtualPath == string.Empty),
+            Mock.Of<IRuntimeState>(x => x.Level == level));
+        return routes;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs
index bb1c76e533..05a888923c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/RoutableDocumentFilterTests.cs
@@ -12,134 +12,132 @@ using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Web.Common.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;
+
+[TestFixture]
+public class RoutableDocumentFilterTests
 {
-    [TestFixture]
-    public class RoutableDocumentFilterTests
+    private IOptions<GlobalSettings> GetGlobalSettings() => Options.Create(new GlobalSettings());
+
+    private IOptions<WebRoutingSettings> GetWebRoutingSettings() => Options.Create(new WebRoutingSettings());
+
+    private IHostingEnvironment GetHostingEnvironment()
     {
-        private IOptions<GlobalSettings> GetGlobalSettings() => Options.Create(new GlobalSettings());
-
-        private IOptions<WebRoutingSettings> GetWebRoutingSettings() => Options.Create(new WebRoutingSettings());
-
-        private IHostingEnvironment GetHostingEnvironment()
-        {
-            var hostingEnv = new Mock<IHostingEnvironment>();
-            hostingEnv.Setup(x => x.ToAbsolute(It.IsAny<string>())).Returns((string virtualPath) => virtualPath.TrimStart(Constants.CharArrays.TildeForwardSlash));
-            return hostingEnv.Object;
-        }
-
-        [TestCase("/umbraco/editContent.aspx")]
-        [TestCase("/install/default.aspx")]
-        [TestCase("/install/")]
-        [TestCase("/install")]
-        [TestCase("/install/?installStep=asdf")]
-        [TestCase("/install/test.aspx")]
-        public void Is_Reserved_Path_Or_Url(string url)
-        {
-            var routableDocFilter = new RoutableDocumentFilter(
-                GetGlobalSettings(),
-                GetWebRoutingSettings(),
-                GetHostingEnvironment(),
-                new DefaultEndpointDataSource());
-
-            // Will be false if it is a reserved path
-            Assert.IsFalse(routableDocFilter.IsDocumentRequest(url));
-        }
-
-        [TestCase("/base/somebasehandler")]
-        [TestCase("/")]
-        [TestCase("/home")]
-        [TestCase("/umbraco-test")]
-        [TestCase("/install-test")]
-        public void Is_Not_Reserved_Path_Or_Url(string url)
-        {
-            var routableDocFilter = new RoutableDocumentFilter(
-                GetGlobalSettings(),
-                GetWebRoutingSettings(),
-                GetHostingEnvironment(),
-                new DefaultEndpointDataSource());
-
-            // Will be true if it's not reserved
-            Assert.IsTrue(routableDocFilter.IsDocumentRequest(url));
-        }
-
-        [TestCase("/Do/Not/match", false)]
-        [TestCase("/Umbraco/RenderMvcs", false)]
-        [TestCase("/Umbraco/RenderMvc", true)]
-        [TestCase("/umbraco/RenderMvc/Index", true)]
-        [TestCase("/Umbraco/RenderMvc/Index/1234", true)]
-        [TestCase("/Umbraco/RenderMvc/Index/1234/", true)]
-        [TestCase("/Umbraco/RenderMvc/Index/1234/9876", false)]
-        [TestCase("/api", true)]
-        [TestCase("/api/WebApiTest", true)]
-        [TestCase("/Api/WebApiTest/1234", true)]
-        [TestCase("/api/WebApiTest/Index/1234", false)]
-        public void Is_Reserved_By_Route(string url, bool isReserved)
-        {
-            var globalSettings = new GlobalSettings { ReservedPaths = string.Empty, ReservedUrls = string.Empty };
-            var routingSettings = new WebRoutingSettings { TryMatchingEndpointsForAllPages = true };
-
-            RouteEndpoint endpoint1 = CreateEndpoint(
-                "Umbraco/RenderMvc/{action?}/{id?}",
-                new { controller = "RenderMvc" },
-                0);
-
-            RouteEndpoint endpoint2 = CreateEndpoint(
-                "api/{controller?}/{id?}",
-                new { action = "Index" },
-                1);
-
-            var endpointDataSource = new DefaultEndpointDataSource(endpoint1, endpoint2);
-
-            var routableDocFilter = new RoutableDocumentFilter(
-                new TestOptionsSnapshot<GlobalSettings>(globalSettings),
-                Options.Create(routingSettings),
-                GetHostingEnvironment(),
-                endpointDataSource);
-
-            Assert.AreEqual(
-                !isReserved, // not reserved if it's a document request
-                routableDocFilter.IsDocumentRequest(url));
-        }
-
-        [TestCase("/umbraco", true)]
-        [TestCase("/umbraco/", true)]
-        [TestCase("/umbraco/Default", true)]
-        [TestCase("/umbraco/default/", true)]
-        [TestCase("/umbraco/default/123", true)]
-        [TestCase("/umbraco/default/blah/123", false)]
-        public void Is_Reserved_By_Default_Back_Office_Route(string url, bool isReserved)
-        {
-            var globalSettings = new GlobalSettings { ReservedPaths = string.Empty, ReservedUrls = string.Empty };
-            var routingSettings = new WebRoutingSettings { TryMatchingEndpointsForAllPages = true };
-
-            RouteEndpoint endpoint1 = CreateEndpoint(
-                "umbraco/{action?}/{id?}",
-                new { controller = "BackOffice" },
-                0);
-
-            var endpointDataSource = new DefaultEndpointDataSource(endpoint1);
-
-            var routableDocFilter = new RoutableDocumentFilter(
-                new TestOptionsSnapshot<GlobalSettings>(globalSettings),
-                Options.Create(routingSettings),
-                GetHostingEnvironment(),
-                endpointDataSource);
-
-            Assert.AreEqual(
-                !isReserved, // not reserved if it's a document request
-                routableDocFilter.IsDocumentRequest(url));
-        }
-
-        // borrowed from https://github.com/dotnet/aspnetcore/blob/19559e73da2b6d335b864ed2855dd8a0c7a207a0/src/Mvc/Mvc.Core/test/Routing/ControllerLinkGeneratorExtensionsTest.cs#L171
-        private RouteEndpoint CreateEndpoint(
-            string template,
-            object defaults = null,
-            int order = 0) => new RouteEndpoint(
-                (httpContext) => Task.CompletedTask,
-                RoutePatternFactory.Parse(template, defaults, null),
-                order,
-                new EndpointMetadataCollection(Array.Empty<object>()),
-                null);
+        var hostingEnv = new Mock<IHostingEnvironment>();
+        hostingEnv.Setup(x => x.ToAbsolute(It.IsAny<string>())).Returns((string virtualPath) =>
+            virtualPath.TrimStart(Constants.CharArrays.TildeForwardSlash));
+        return hostingEnv.Object;
     }
+
+    [TestCase("/umbraco/editContent.aspx")]
+    [TestCase("/install/default.aspx")]
+    [TestCase("/install/")]
+    [TestCase("/install")]
+    [TestCase("/install/?installStep=asdf")]
+    [TestCase("/install/test.aspx")]
+    public void Is_Reserved_Path_Or_Url(string url)
+    {
+        var routableDocFilter = new RoutableDocumentFilter(
+            GetGlobalSettings(),
+            GetWebRoutingSettings(),
+            GetHostingEnvironment(),
+            new DefaultEndpointDataSource());
+
+        // Will be false if it is a reserved path
+        Assert.IsFalse(routableDocFilter.IsDocumentRequest(url));
+    }
+
+    [TestCase("/base/somebasehandler")]
+    [TestCase("/")]
+    [TestCase("/home")]
+    [TestCase("/umbraco-test")]
+    [TestCase("/install-test")]
+    public void Is_Not_Reserved_Path_Or_Url(string url)
+    {
+        var routableDocFilter = new RoutableDocumentFilter(
+            GetGlobalSettings(),
+            GetWebRoutingSettings(),
+            GetHostingEnvironment(),
+            new DefaultEndpointDataSource());
+
+        // Will be true if it's not reserved
+        Assert.IsTrue(routableDocFilter.IsDocumentRequest(url));
+    }
+
+    [TestCase("/Do/Not/match", false)]
+    [TestCase("/Umbraco/RenderMvcs", false)]
+    [TestCase("/Umbraco/RenderMvc", true)]
+    [TestCase("/umbraco/RenderMvc/Index", true)]
+    [TestCase("/Umbraco/RenderMvc/Index/1234", true)]
+    [TestCase("/Umbraco/RenderMvc/Index/1234/", true)]
+    [TestCase("/Umbraco/RenderMvc/Index/1234/9876", false)]
+    [TestCase("/api", true)]
+    [TestCase("/api/WebApiTest", true)]
+    [TestCase("/Api/WebApiTest/1234", true)]
+    [TestCase("/api/WebApiTest/Index/1234", false)]
+    public void Is_Reserved_By_Route(string url, bool isReserved)
+    {
+        var globalSettings = new GlobalSettings { ReservedPaths = string.Empty, ReservedUrls = string.Empty };
+        var routingSettings = new WebRoutingSettings { TryMatchingEndpointsForAllPages = true };
+
+        var endpoint1 = CreateEndpoint(
+            "Umbraco/RenderMvc/{action?}/{id?}",
+            new { controller = "RenderMvc" });
+
+        var endpoint2 = CreateEndpoint(
+            "api/{controller?}/{id?}",
+            new { action = "Index" },
+            1);
+
+        var endpointDataSource = new DefaultEndpointDataSource(endpoint1, endpoint2);
+
+        var routableDocFilter = new RoutableDocumentFilter(
+            new TestOptionsSnapshot<GlobalSettings>(globalSettings),
+            Options.Create(routingSettings),
+            GetHostingEnvironment(),
+            endpointDataSource);
+
+        Assert.AreEqual(
+            !isReserved, // not reserved if it's a document request
+            routableDocFilter.IsDocumentRequest(url));
+    }
+
+    [TestCase("/umbraco", true)]
+    [TestCase("/umbraco/", true)]
+    [TestCase("/umbraco/Default", true)]
+    [TestCase("/umbraco/default/", true)]
+    [TestCase("/umbraco/default/123", true)]
+    [TestCase("/umbraco/default/blah/123", false)]
+    public void Is_Reserved_By_Default_Back_Office_Route(string url, bool isReserved)
+    {
+        var globalSettings = new GlobalSettings { ReservedPaths = string.Empty, ReservedUrls = string.Empty };
+        var routingSettings = new WebRoutingSettings { TryMatchingEndpointsForAllPages = true };
+
+        var endpoint1 = CreateEndpoint(
+            "umbraco/{action?}/{id?}",
+            new { controller = "BackOffice" });
+
+        var endpointDataSource = new DefaultEndpointDataSource(endpoint1);
+
+        var routableDocFilter = new RoutableDocumentFilter(
+            new TestOptionsSnapshot<GlobalSettings>(globalSettings),
+            Options.Create(routingSettings),
+            GetHostingEnvironment(),
+            endpointDataSource);
+
+        Assert.AreEqual(
+            !isReserved, // not reserved if it's a document request
+            routableDocFilter.IsDocumentRequest(url));
+    }
+
+    // borrowed from https://github.com/dotnet/aspnetcore/blob/19559e73da2b6d335b864ed2855dd8a0c7a207a0/src/Mvc/Mvc.Core/test/Routing/ControllerLinkGeneratorExtensionsTest.cs#L171
+    private RouteEndpoint CreateEndpoint(
+        string template,
+        object defaults = null,
+        int order = 0) => new(
+        httpContext => Task.CompletedTask,
+        RoutePatternFactory.Parse(template, defaults, null),
+        order,
+        new EndpointMetadataCollection(Array.Empty<object>()),
+        null);
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs
index 05650d5fed..ed9877b976 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Routing/TestRouteBuilder.cs
@@ -13,36 +13,36 @@ using Microsoft.Extensions.Hosting.Internal;
 using Microsoft.Extensions.Logging;
 using Moq;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Routing;
+
+public class TestRouteBuilder : IEndpointRouteBuilder
 {
-    public class TestRouteBuilder : IEndpointRouteBuilder
+    private readonly ServiceProvider _serviceProvider;
+
+    public TestRouteBuilder()
     {
-        private readonly ServiceProvider _serviceProvider;
+        var services = new ServiceCollection();
 
-        public TestRouteBuilder()
-        {
-            var services = new ServiceCollection();
+        var diagnosticListener = new DiagnosticListener("UnitTests");
+        services.AddSingleton<DiagnosticSource>(diagnosticListener);
+        services.AddSingleton(diagnosticListener);
 
-            var diagnosticListener = new DiagnosticListener("UnitTests");
-            services.AddSingleton<DiagnosticSource>(diagnosticListener);
-            services.AddSingleton<DiagnosticListener>(diagnosticListener);
+        services.AddLogging();
+        services.AddMvc();
+        services.AddSingleton<IHostApplicationLifetime>(x =>
+            new ApplicationLifetime(x.GetRequiredService<ILogger<ApplicationLifetime>>()));
+        services.AddSignalR();
+        _serviceProvider = services.BuildServiceProvider();
+    }
 
-            services.AddLogging();
-            services.AddMvc();
-            services.AddSingleton<IHostApplicationLifetime>(x => new ApplicationLifetime(x.GetRequiredService<ILogger<ApplicationLifetime>>()));
-            services.AddSignalR();
-            _serviceProvider = services.BuildServiceProvider();
-        }
+    public ICollection<EndpointDataSource> DataSources { get; } = new List<EndpointDataSource>();
 
-        public ICollection<EndpointDataSource> DataSources { get; } = new List<EndpointDataSource>();
+    public IServiceProvider ServiceProvider => _serviceProvider;
 
-        public IServiceProvider ServiceProvider => _serviceProvider;
-
-        public IApplicationBuilder CreateApplicationBuilder()
-        {
-            var mock = new Mock<IApplicationBuilder>();
-            mock.Setup(x => x.Build()).Returns(httpContext => Task.CompletedTask);
-            return mock.Object;
-        }
+    public IApplicationBuilder CreateApplicationBuilder()
+    {
+        var mock = new Mock<IApplicationBuilder>();
+        mock.Setup(x => x.Build()).Returns(httpContext => Task.CompletedTask);
+        return mock.Object;
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/RuntimeMinification/UmbracoSmidgeConfigCacheBusterTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/RuntimeMinification/UmbracoSmidgeConfigCacheBusterTests.cs
index 2eab838587..8615ac6a30 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/RuntimeMinification/UmbracoSmidgeConfigCacheBusterTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/RuntimeMinification/UmbracoSmidgeConfigCacheBusterTests.cs
@@ -1,113 +1,109 @@
 using AutoFixture;
 using AutoFixture.AutoMoq;
-using AutoFixture.Kernel;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
-using Smidge;
-using Smidge.Cache;
 using Umbraco.Cms.Core.Configuration;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.Semver;
 using Umbraco.Cms.Web.Common.RuntimeMinification;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.RuntimeMinification
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.RuntimeMinification;
+
+/// <remarks>
+///     UmbracoCustomizations kindly configures an IUmbracoVersion so we need to go verbose without AutoMoqData
+/// </remarks>
+[TestFixture]
+public class UmbracoSmidgeConfigCacheBusterTests
 {
-    /// <remarks>
-    /// UmbracoCustomizations kindly configures an IUmbracoVersion so we need to go verbose without AutoMoqData
-    /// </remarks>
-    [TestFixture]
-    public class UmbracoSmidgeConfigCacheBusterTests
+    [Test]
+    public void GetValue_DefaultReleaseSetupWithNoConfiguredVersion_HasSensibleDefaults()
     {
-        [Test]
-        public void GetValue_DefaultReleaseSetupWithNoConfiguredVersion_HasSensibleDefaults()
-        {
-            var fixture = new Fixture();
-            fixture.Customize(new AutoMoqCustomization());
+        var fixture = new Fixture();
+        fixture.Customize(new AutoMoqCustomization());
 
-            var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
-            var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
-            var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
+        var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
+        var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
+        var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
 
-            umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
-            entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
-            entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
+        umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
+        entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
+        entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
 
-            var result = sut.GetValue();
+        var result = sut.GetValue();
 
-            var expected = $"Bills.Brilliant.Bakery_9.4.5-beta+41658f99_42.1.2-alpha+41658f99".GenerateHash();
-            Assert.AreEqual(expected, result);
-        }
+        var expected = "Bills.Brilliant.Bakery_9.4.5-beta+41658f99_42.1.2-alpha+41658f99".GenerateHash();
+        Assert.AreEqual(expected, result);
+    }
 
-        [Test]
-        public void GetValue_DefaultReleaseSetupWithConfiguredVersion_HasSensibleDefaults()
-        {
-            var config = Options.Create(new RuntimeMinificationSettings { Version = "1" });
-            var fixture = new Fixture();
-            fixture.Customize(new AutoMoqCustomization());
-            fixture.Inject(config);
+    [Test]
+    public void GetValue_DefaultReleaseSetupWithConfiguredVersion_HasSensibleDefaults()
+    {
+        var config = Options.Create(new RuntimeMinificationSettings { Version = "1" });
+        var fixture = new Fixture();
+        fixture.Customize(new AutoMoqCustomization());
+        fixture.Inject(config);
 
-            var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
-            var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
-            var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
+        var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
+        var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
+        var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
 
-            umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
-            entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
-            entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
+        umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
+        entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
+        entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
 
-            var result = sut.GetValue();
+        var result = sut.GetValue();
 
-            var expected = $"1_9.4.5-beta+41658f99_42.1.2-alpha+41658f99".GenerateHash();
-            Assert.AreEqual(expected, result);
-        }
+        var expected = "1_9.4.5-beta+41658f99_42.1.2-alpha+41658f99".GenerateHash();
+        Assert.AreEqual(expected, result);
+    }
 
-        [Test]
-        public void GetValue_DefaultReleaseSetupWithNoConfiguredVersion_ChangesWhenUmbracoVersionChanges()
-        {
-            var fixture = new Fixture();
-            fixture.Customize(new AutoMoqCustomization());
+    [Test]
+    public void GetValue_DefaultReleaseSetupWithNoConfiguredVersion_ChangesWhenUmbracoVersionChanges()
+    {
+        var fixture = new Fixture();
+        fixture.Customize(new AutoMoqCustomization());
 
-            var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
-            var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
-            var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
+        var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
+        var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
+        var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
 
-            umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
-            entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
-            entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
+        umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
+        entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
+        entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
 
-            var before = sut.GetValue();
+        var before = sut.GetValue();
 
-            umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 5, 0, "beta", "41658f99"));
-            sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
+        umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 5, 0, "beta", "41658f99"));
+        sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
 
-            var after = sut.GetValue();
+        var after = sut.GetValue();
 
-            Assert.AreNotEqual(before, after);
-        }
+        Assert.AreNotEqual(before, after);
+    }
 
-        [Test]
-        public void GetValue_DefaultReleaseSetupWithNoConfiguredVersion_ChangesWhenDownstreamVersionChanges()
-        {
-            var fixture = new Fixture();
-            fixture.Customize(new AutoMoqCustomization());
+    [Test]
+    public void GetValue_DefaultReleaseSetupWithNoConfiguredVersion_ChangesWhenDownstreamVersionChanges()
+    {
+        var fixture = new Fixture();
+        fixture.Customize(new AutoMoqCustomization());
 
-            var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
-            var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
-            var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
+        var umbracoVersion = fixture.Freeze<Mock<IUmbracoVersion>>();
+        var entryAssemblyMetadata = fixture.Freeze<Mock<IEntryAssemblyMetadata>>();
+        var sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
 
-            umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
-            entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
-            entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
+        umbracoVersion.Setup(x => x.SemanticVersion).Returns(new SemVersion(9, 4, 5, "beta", "41658f99"));
+        entryAssemblyMetadata.Setup(x => x.Name).Returns("Bills.Brilliant.Bakery");
+        entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.1.2-alpha+41658f99");
 
-            var before = sut.GetValue();
+        var before = sut.GetValue();
 
-            entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.2.0-rc");
-            sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
+        entryAssemblyMetadata.Setup(x => x.InformationalVersion).Returns("42.2.0-rc");
+        sut = fixture.Create<UmbracoSmidgeConfigCacheBuster>();
 
-            var after = sut.GetValue();
+        var after = sut.GetValue();
 
-            Assert.AreNotEqual(before, after);
-        }
+        Assert.AreNotEqual(before, after);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs
index 5fbc285616..386819a050 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/EncryptionHelperTests.cs
@@ -6,61 +6,53 @@ using Microsoft.AspNetCore.DataProtection;
 using NUnit.Framework;
 using Umbraco.Cms.Web.Common.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security;
+
+[TestFixture]
+public class EncryptionHelperTests
 {
-    [TestFixture]
-    public class EncryptionHelperTests
+    private IDataProtectionProvider DataProtectionProvider { get; } = new EphemeralDataProtectionProvider();
+
+    [Test]
+    public void Create_Encrypted_RouteString_From_Anonymous_Object()
     {
-        private IDataProtectionProvider DataProtectionProvider { get; } = new EphemeralDataProtectionProvider();
+        var additionalRouteValues = new { key1 = "value1", key2 = "value2", Key3 = "Value3", keY4 = "valuE4" };
 
-        [Test]
-        public void Create_Encrypted_RouteString_From_Anonymous_Object()
+        var encryptedRouteString = EncryptionHelper.CreateEncryptedRouteString(
+            DataProtectionProvider,
+            "FormController",
+            "FormAction",
+            string.Empty,
+            additionalRouteValues);
+
+        var result = EncryptionHelper.Decrypt(encryptedRouteString, DataProtectionProvider);
+
+        const string expectedResult =
+            "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
+
+        Assert.AreEqual(expectedResult, result);
+    }
+
+    [Test]
+    public void Create_Encrypted_RouteString_From_Dictionary()
+    {
+        var additionalRouteValues = new Dictionary<string, object>
         {
-            var additionalRouteValues = new
-            {
-                key1 = "value1",
-                key2 = "value2",
-                Key3 = "Value3",
-                keY4 = "valuE4"
-            };
+            { "key1", "value1" }, { "key2", "value2" }, { "Key3", "Value3" }, { "keY4", "valuE4" },
+        };
 
-            var encryptedRouteString = EncryptionHelper.CreateEncryptedRouteString(
-                DataProtectionProvider,
-                "FormController",
-                "FormAction",
-                string.Empty,
-                additionalRouteValues);
+        var encryptedRouteString = EncryptionHelper.CreateEncryptedRouteString(
+            DataProtectionProvider,
+            "FormController",
+            "FormAction",
+            string.Empty,
+            additionalRouteValues);
 
-            var result = EncryptionHelper.Decrypt(encryptedRouteString, DataProtectionProvider);
+        var result = EncryptionHelper.Decrypt(encryptedRouteString, DataProtectionProvider);
 
-            const string expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
+        const string expectedResult =
+            "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
 
-            Assert.AreEqual(expectedResult, result);
-        }
-
-        [Test]
-        public void Create_Encrypted_RouteString_From_Dictionary()
-        {
-            var additionalRouteValues = new Dictionary<string, object>()
-            {
-                { "key1", "value1" },
-                { "key2", "value2" },
-                { "Key3", "Value3" },
-                { "keY4", "valuE4" }
-            };
-
-            var encryptedRouteString = EncryptionHelper.CreateEncryptedRouteString(
-                DataProtectionProvider,
-                "FormController",
-                "FormAction",
-                string.Empty,
-                additionalRouteValues);
-
-            var result = EncryptionHelper.Decrypt(encryptedRouteString, DataProtectionProvider);
-
-            const string expectedResult = "c=FormController&a=FormAction&ar=&key1=value1&key2=value2&Key3=Value3&keY4=valuE4";
-
-            Assert.AreEqual(expectedResult, result);
-        }
+        Assert.AreEqual(expectedResult, result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs
index 192bcaf27e..cf88a7c962 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/MemberSignInManagerTests.cs
@@ -19,125 +19,116 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Web.Common.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security;
+
+[TestFixture]
+public class MemberSignInManagerTests
 {
-    [TestFixture]
-    public class MemberSignInManagerTests
+    private Mock<ILogger<SignInManager<MemberIdentityUser>>> _mockLogger;
+    private readonly Mock<MemberManager> _memberManager = MockMemberManager();
+
+    public UserClaimsPrincipalFactory<MemberIdentityUser> CreateClaimsFactory(MemberManager userMgr)
+        => new(userMgr, Options.Create(new IdentityOptions()));
+
+    public MemberSignInManager CreateSut()
     {
-        private Mock<ILogger<SignInManager<MemberIdentityUser>>> _mockLogger;
-        private readonly Mock<MemberManager> _memberManager = MockMemberManager();
-
-        public UserClaimsPrincipalFactory<MemberIdentityUser> CreateClaimsFactory(MemberManager userMgr)
-            => new UserClaimsPrincipalFactory<MemberIdentityUser>(userMgr, Options.Create(new IdentityOptions()));
-
-        public MemberSignInManager CreateSut()
-        {
-            // This all needs to be setup because internally aspnet resolves a bunch
-            // of services from the HttpContext.RequestServices.
-            var serviceProviderFactory = new DefaultServiceProviderFactory();
-            var serviceCollection = new ServiceCollection();
-            serviceCollection
-                .AddLogging()
-                .AddAuthentication()
-                .AddCookie(IdentityConstants.ApplicationScheme)
-                .AddCookie(IdentityConstants.ExternalScheme, o =>
-                {
-                    o.Cookie.Name = IdentityConstants.ExternalScheme;
-                    o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
-                })
-                .AddCookie(IdentityConstants.TwoFactorUserIdScheme, o =>
-                {
-                    o.Cookie.Name = IdentityConstants.TwoFactorUserIdScheme;
-                    o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
-                })
-                .AddCookie(IdentityConstants.TwoFactorRememberMeScheme, o =>
-                {
-                    o.Cookie.Name = IdentityConstants.TwoFactorRememberMeScheme;
-                    o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
-                });
-            IServiceProvider serviceProvider = serviceProviderFactory.CreateServiceProvider(serviceCollection);
-            var httpContextFactory = new DefaultHttpContextFactory(serviceProvider);
-            IFeatureCollection features = new DefaultHttpContext().Features;
-            features.Set<IHttpConnectionFeature>(new HttpConnectionFeature
+        // This all needs to be setup because internally aspnet resolves a bunch
+        // of services from the HttpContext.RequestServices.
+        var serviceProviderFactory = new DefaultServiceProviderFactory();
+        var serviceCollection = new ServiceCollection();
+        serviceCollection
+            .AddLogging()
+            .AddAuthentication()
+            .AddCookie(IdentityConstants.ApplicationScheme)
+            .AddCookie(IdentityConstants.ExternalScheme, o =>
             {
-                LocalIpAddress = IPAddress.Parse("127.0.0.1")
+                o.Cookie.Name = IdentityConstants.ExternalScheme;
+                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
+            })
+            .AddCookie(IdentityConstants.TwoFactorUserIdScheme, o =>
+            {
+                o.Cookie.Name = IdentityConstants.TwoFactorUserIdScheme;
+                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
+            })
+            .AddCookie(IdentityConstants.TwoFactorRememberMeScheme, o =>
+            {
+                o.Cookie.Name = IdentityConstants.TwoFactorRememberMeScheme;
+                o.ExpireTimeSpan = TimeSpan.FromMinutes(5);
             });
-            HttpContext httpContext = httpContextFactory.Create(features);
+        var serviceProvider = serviceProviderFactory.CreateServiceProvider(serviceCollection);
+        var httpContextFactory = new DefaultHttpContextFactory(serviceProvider);
+        var features = new DefaultHttpContext().Features;
+        features.Set<IHttpConnectionFeature>(new HttpConnectionFeature { LocalIpAddress = IPAddress.Parse("127.0.0.1") });
+        var httpContext = httpContextFactory.Create(features);
 
-            _mockLogger = new Mock<ILogger<SignInManager<MemberIdentityUser>>>();
-            return new MemberSignInManager(
-                    _memberManager.Object,
-                    Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext),
-                    CreateClaimsFactory(_memberManager.Object),
-                    Mock.Of<IOptions<IdentityOptions>>(),
-                    _mockLogger.Object,
-                    Mock.Of<IAuthenticationSchemeProvider>(),
-                    Mock.Of<IUserConfirmation<MemberIdentityUser>>(),
-                    Mock.Of<IMemberExternalLoginProviders>(),
-                    Mock.Of<IEventAggregator>()
-                    );
-        }
-        private static Mock<MemberManager> MockMemberManager()
-            => new Mock<MemberManager>(
-                    Mock.Of<IIpResolver>(),
-                    Mock.Of<IMemberUserStore>(),
-                    Options.Create(new IdentityOptions()),
-                    Mock.Of<IPasswordHasher<MemberIdentityUser>>(),
-                    Enumerable.Empty<IUserValidator<MemberIdentityUser>>(),
-                    Enumerable.Empty<IPasswordValidator<MemberIdentityUser>>(),
-                    new MembersErrorDescriber(Mock.Of<ILocalizedTextService>()),
-                    Mock.Of<IServiceProvider>(),
-                    Mock.Of<ILogger<UserManager<MemberIdentityUser>>>(),
-                    new TestOptionsSnapshot<MemberPasswordConfigurationSettings>(new MemberPasswordConfigurationSettings()),
-                    Mock.Of<IPublicAccessService>(),
-                    Mock.Of<IHttpContextAccessor>());
+        _mockLogger = new Mock<ILogger<SignInManager<MemberIdentityUser>>>();
+        return new MemberSignInManager(
+            _memberManager.Object,
+            Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext),
+            CreateClaimsFactory(_memberManager.Object),
+            Mock.Of<IOptions<IdentityOptions>>(),
+            _mockLogger.Object,
+            Mock.Of<IAuthenticationSchemeProvider>(),
+            Mock.Of<IUserConfirmation<MemberIdentityUser>>(),
+            Mock.Of<IMemberExternalLoginProviders>(),
+            Mock.Of<IEventAggregator>());
+    }
 
-        [Test]
-        public async Task WhenPasswordSignInAsyncIsCalled_AndEverythingIsSetup_ThenASignInResultSucceededShouldBeReturnedAsync()
-        {
-            //arrange
-            var userId = "bo8w3d32q9b98";
-            MemberSignInManager sut = CreateSut();
-            var fakeUser = new MemberIdentityUser(777)
-            {
-                UserName = "TestUser",
-            };
-            var password = "testPassword";
-            var lockoutOnFailure = false;
-            var isPersistent = true;
+    private static Mock<MemberManager> MockMemberManager()
+        => new(
+            Mock.Of<IIpResolver>(),
+            Mock.Of<IMemberUserStore>(),
+            Options.Create(new IdentityOptions()),
+            Mock.Of<IPasswordHasher<MemberIdentityUser>>(),
+            Enumerable.Empty<IUserValidator<MemberIdentityUser>>(),
+            Enumerable.Empty<IPasswordValidator<MemberIdentityUser>>(),
+            new MembersErrorDescriber(Mock.Of<ILocalizedTextService>()),
+            Mock.Of<IServiceProvider>(),
+            Mock.Of<ILogger<UserManager<MemberIdentityUser>>>(),
+            new TestOptionsSnapshot<MemberPasswordConfigurationSettings>(new MemberPasswordConfigurationSettings()),
+            Mock.Of<IPublicAccessService>(),
+            Mock.Of<IHttpContextAccessor>());
 
-            _memberManager.Setup(x => x.GetUserIdAsync(It.IsAny<MemberIdentityUser>())).ReturnsAsync(userId);
-            _memberManager.Setup(x => x.GetUserNameAsync(It.IsAny<MemberIdentityUser>())).ReturnsAsync(fakeUser.UserName);
-            _memberManager.Setup(x => x.FindByNameAsync(It.IsAny<string>())).ReturnsAsync(fakeUser);
-            _memberManager.Setup(x => x.CheckPasswordAsync(fakeUser, password)).ReturnsAsync(true);
-            _memberManager.Setup(x => x.IsEmailConfirmedAsync(fakeUser)).ReturnsAsync(true);
-            _memberManager.Setup(x => x.IsLockedOutAsync(fakeUser)).ReturnsAsync(false);
+    [Test]
+    public async Task
+        WhenPasswordSignInAsyncIsCalled_AndEverythingIsSetup_ThenASignInResultSucceededShouldBeReturnedAsync()
+    {
+        // arrange
+        var userId = "bo8w3d32q9b98";
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser(777) { UserName = "TestUser" };
+        var password = "testPassword";
+        var lockoutOnFailure = false;
+        var isPersistent = true;
 
-            //act
-            SignInResult actual = await sut.PasswordSignInAsync(fakeUser, password, isPersistent, lockoutOnFailure);
+        _memberManager.Setup(x => x.GetUserIdAsync(It.IsAny<MemberIdentityUser>())).ReturnsAsync(userId);
+        _memberManager.Setup(x => x.GetUserNameAsync(It.IsAny<MemberIdentityUser>())).ReturnsAsync(fakeUser.UserName);
+        _memberManager.Setup(x => x.FindByNameAsync(It.IsAny<string>())).ReturnsAsync(fakeUser);
+        _memberManager.Setup(x => x.CheckPasswordAsync(fakeUser, password)).ReturnsAsync(true);
+        _memberManager.Setup(x => x.IsEmailConfirmedAsync(fakeUser)).ReturnsAsync(true);
+        _memberManager.Setup(x => x.IsLockedOutAsync(fakeUser)).ReturnsAsync(false);
 
-            //assert
-            Assert.IsTrue(actual.Succeeded);
-        }
+        // act
+        var actual = await sut.PasswordSignInAsync(fakeUser, password, isPersistent, lockoutOnFailure);
 
-        [Test]
-        public async Task WhenPasswordSignInAsyncIsCalled_AndTheResultFails_ThenASignInFailedResultShouldBeReturnedAsync()
-        {
-            //arrange
-            MemberSignInManager sut = CreateSut();
-            var fakeUser = new MemberIdentityUser(777)
-            {
-                UserName = "TestUser",
-            };
-            var password = "testPassword";
-            var lockoutOnFailure = false;
-            var isPersistent = true;
+        // assert
+        Assert.IsTrue(actual.Succeeded);
+    }
 
-            //act
-            SignInResult actual = await sut.PasswordSignInAsync(fakeUser, password, isPersistent, lockoutOnFailure);
+    [Test]
+    public async Task WhenPasswordSignInAsyncIsCalled_AndTheResultFails_ThenASignInFailedResultShouldBeReturnedAsync()
+    {
+        // arrange
+        var sut = CreateSut();
+        var fakeUser = new MemberIdentityUser(777) { UserName = "TestUser" };
+        var password = "testPassword";
+        var lockoutOnFailure = false;
+        var isPersistent = true;
 
-            //assert
-            Assert.IsFalse(actual.Succeeded);
-        }
+        // act
+        var actual = await sut.PasswordSignInAsync(fakeUser, password, isPersistent, lockoutOnFailure);
+
+        // assert
+        Assert.IsFalse(actual.Succeeded);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs
index c2760e92f3..260a685559 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Security/PublicAccessCheckerTests.cs
@@ -2,10 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
-using System.Security.Principal;
-using System.Text;
 using System.Threading.Tasks;
-using AutoFixture.NUnit3;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
@@ -17,260 +14,267 @@ using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 using Umbraco.Cms.Web.Common.Security;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Security;
+
+[TestFixture]
+public class PublicAccessCheckerTests
 {
-    [TestFixture]
-    public class PublicAccessCheckerTests
+    private IHttpContextAccessor GetHttpContextAccessor(IMemberManager memberManager, out HttpContext httpContext)
     {
-        private IHttpContextAccessor GetHttpContextAccessor(IMemberManager memberManager, out HttpContext httpContext)
+        var services = new ServiceCollection();
+        services.AddScoped(x => memberManager);
+        httpContext = new DefaultHttpContext { RequestServices = services.BuildServiceProvider() };
+
+        var localHttpContext = httpContext;
+        return Mock.Of<IHttpContextAccessor>(x => x.HttpContext == localHttpContext);
+    }
+
+    private PublicAccessChecker CreateSut(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService,
+        out HttpContext httpContext)
+    {
+        var publicAccessChecker = new PublicAccessChecker(
+            GetHttpContextAccessor(memberManager, out httpContext),
+            publicAccessService,
+            contentService);
+
+        return publicAccessChecker;
+    }
+
+    private ClaimsPrincipal GetLoggedInUser()
+    {
+        var user = new ClaimsPrincipal(new ClaimsIdentity(
+            new[] { new(ClaimTypes.NameIdentifier, "1234"), new Claim(ClaimTypes.Name, "test@example.com") },
+            "TestAuthentication"));
+        return user;
+    }
+
+    private void MockGetRolesAsync(IMemberManager memberManager, IEnumerable<string> roles = null)
+    {
+        if (roles == null)
         {
-            var services = new ServiceCollection();
-            services.AddScoped<IMemberManager>(x => memberManager);
-            httpContext = new DefaultHttpContext
+            roles = new[] { "role1", "role2" };
+        }
+
+        Mock.Get(memberManager).Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
+            .Returns(Task.FromResult((IList<string>)new List<string>(roles)));
+    }
+
+    private void MockGetUserAsync(IMemberManager memberManager, MemberIdentityUser memberIdentityUser)
+        => Mock.Get(memberManager).Setup(x => x.GetUserAsync(It.IsAny<ClaimsPrincipal>()))
+            .Returns(Task.FromResult(memberIdentityUser));
+
+    private PublicAccessEntry GetPublicAccessEntry(string usernameRuleValue, string roleRuleValue)
+        => new(
+            Guid.NewGuid(),
+            123,
+            987,
+            987,
+            new List<PublicAccessRule>
             {
-                RequestServices = services.BuildServiceProvider()
-            };
-
-            HttpContext localHttpContext = httpContext;
-            return Mock.Of<IHttpContextAccessor>(x => x.HttpContext == localHttpContext);
-        }
-
-        private PublicAccessChecker CreateSut(IMemberManager memberManager, IPublicAccessService publicAccessService, IContentService contentService, out HttpContext httpContext)
-        {
-            var publicAccessChecker = new PublicAccessChecker(
-                GetHttpContextAccessor(memberManager, out httpContext),
-                publicAccessService,
-                contentService);
-
-            return publicAccessChecker;
-        }
-
-        private ClaimsPrincipal GetLoggedInUser()
-        {
-            var user = new ClaimsPrincipal(new ClaimsIdentity(new Claim[] {
-                        new Claim(ClaimTypes.NameIdentifier, "1234"),
-                        new Claim(ClaimTypes.Name, "test@example.com")
-                    }, "TestAuthentication"));
-            return user;
-        }
-
-        private void MockGetRolesAsync(IMemberManager memberManager, IEnumerable<string> roles = null)
-        {
-            if (roles == null)
-            {
-                roles = new[]
+                new()
                 {
-                    "role1",
-                    "role2"
-                };
-            }
-            Mock.Get(memberManager).Setup(x => x.GetRolesAsync(It.IsAny<MemberIdentityUser>()))
-                .Returns(Task.FromResult((IList<string>)new List<string>(roles)));
-        }
+                    RuleType = Constants.Conventions.PublicAccess.MemberUsernameRuleType,
+                    RuleValue = usernameRuleValue,
+                },
+                new() { RuleType = Constants.Conventions.PublicAccess.MemberRoleRuleType, RuleValue = roleRuleValue },
+            });
 
-        private void MockGetUserAsync(IMemberManager memberManager, MemberIdentityUser memberIdentityUser)
-            => Mock.Get(memberManager).Setup(x => x.GetUserAsync(It.IsAny<ClaimsPrincipal>())).Returns(Task.FromResult(memberIdentityUser));
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberNotLoggedIn_WhenIdentityIsChecked_ThenNotLoggedInResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
+        httpContext.User = new ClaimsPrincipal();
+        MockGetUserAsync(memberManager, new MemberIdentityUser());
 
-        private PublicAccessEntry GetPublicAccessEntry(string usernameRuleValue, string roleRuleValue)
-            => new PublicAccessEntry(Guid.NewGuid(), 123, 987, 987, new List<PublicAccessRule>
-                {
-                    new PublicAccessRule
-                    {
-                        RuleType = Constants.Conventions.PublicAccess.MemberUsernameRuleType,
-                        RuleValue = usernameRuleValue
-                    },
-                    new PublicAccessRule
-                    {
-                        RuleType = Constants.Conventions.PublicAccess.MemberRoleRuleType,
-                        RuleValue = roleRuleValue
-                    }
-                });
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.NotLoggedIn, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberNotLoggedIn_WhenIdentityIsChecked_ThenNotLoggedInResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-            httpContext.User = new ClaimsPrincipal();
-            MockGetUserAsync(memberManager, new MemberIdentityUser());
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberNotLoggedIn_WhenMemberIsRequested_AndIsNull_ThenNotLoggedInResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, null);
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.NotLoggedIn, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.NotLoggedIn, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberNotLoggedIn_WhenMemberIsRequested_AndIsNull_ThenNotLoggedInResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, null);
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberHasNoRolesAndWrongUsername_ThenAccessDeniedResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService,
+        IContent protectedNode,
+        IContent loginNode,
+        IContent noAccessNode,
+        string username)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.NotLoggedIn, result);
-        }
-
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberHasNoRolesAndWrongUsername_ThenAccessDeniedResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService,
-            IContent protectedNode,
-            IContent loginNode,
-            IContent noAccessNode,
-            string username)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-
-            Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(It.IsAny<IContent>()))
-                .Returns(new PublicAccessEntry(protectedNode, loginNode, noAccessNode, new []
+        Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(It.IsAny<IContent>()))
+            .Returns(new PublicAccessEntry(
+                protectedNode,
+                loginNode,
+                noAccessNode,
+                new[]
                 {
                     new PublicAccessRule(Guid.Empty, Guid.Empty)
                     {
                         RuleType = Constants.Conventions.PublicAccess.MemberUsernameRuleType,
-                        RuleValue = "AnotherUsername"
-                    }
+                        RuleValue = "AnotherUsername",
+                    },
                 }));
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser(){IsApproved = true, UserName = username});
-            MockGetRolesAsync(memberManager, Enumerable.Empty<string>());
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = true, UserName = username });
+        MockGetRolesAsync(memberManager, Enumerable.Empty<string>());
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.AccessDenied, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.AccessDenied, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberIsLockedOut_ThenLockedOutResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberIsLockedOut_ThenLockedOutResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
 
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = true, LockoutEnd = DateTime.UtcNow.AddDays(10) });
-            MockGetRolesAsync(memberManager);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(
+            memberManager,
+            new MemberIdentityUser { IsApproved = true, LockoutEnd = DateTime.UtcNow.AddDays(10) });
+        MockGetRolesAsync(memberManager);
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.LockedOut, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.LockedOut, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberIsNotApproved_ThenNotApprovedResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberIsNotApproved_ThenNotApprovedResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
 
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = false });
-            MockGetRolesAsync(memberManager);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = false });
+        MockGetRolesAsync(memberManager);
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.NotApproved, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.NotApproved, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndContentDoesNotExist_ThenAccessAcceptedResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = true});
-            MockGetRolesAsync(memberManager);
-            Mock.Get(contentService).Setup(x => x.GetById(123)).Returns((IContent)null);
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndContentDoesNotExist_ThenAccessAcceptedResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = true });
+        MockGetRolesAsync(memberManager);
+        Mock.Get(contentService).Setup(x => x.GetById(123)).Returns((IContent)null);
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndGetEntryForContentDoesNotExist_ThenAccessAcceptedResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService,
-            IContent content)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = true });
-            MockGetRolesAsync(memberManager);
-            Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
-            Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content)).Returns((PublicAccessEntry)null);
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndGetEntryForContentDoesNotExist_ThenAccessAcceptedResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService,
+        IContent content)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, new MemberIdentityUser { IsApproved = true });
+        MockGetRolesAsync(memberManager);
+        Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
+        Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content)).Returns((PublicAccessEntry)null);
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndEntryRulesDontMatch_ThenAccessDeniedResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService,
-            IContent content)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser { UserName = "MyUsername", IsApproved = true });
-            MockGetRolesAsync(memberManager);
-            Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
-            Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content)).Returns(GetPublicAccessEntry(string.Empty, string.Empty));
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndEntryRulesDontMatch_ThenAccessDeniedResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService,
+        IContent content)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, new MemberIdentityUser { UserName = "MyUsername", IsApproved = true });
+        MockGetRolesAsync(memberManager);
+        Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
+        Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content))
+            .Returns(GetPublicAccessEntry(string.Empty, string.Empty));
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.AccessDenied, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.AccessDenied, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndUsernameRuleMatches_ThenAccessAcceptedResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService,
-            IContent content)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser { UserName = "MyUsername", IsApproved = true });
-            MockGetRolesAsync(memberManager);
-            Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
-            Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content)).Returns(GetPublicAccessEntry("MyUsername", string.Empty));
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndUsernameRuleMatches_ThenAccessAcceptedResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService,
+        IContent content)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, new MemberIdentityUser { UserName = "MyUsername", IsApproved = true });
+        MockGetRolesAsync(memberManager);
+        Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
+        Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content))
+            .Returns(GetPublicAccessEntry("MyUsername", string.Empty));
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
+    }
 
-        [AutoMoqData]
-        [Test]
-        public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndRoleRuleMatches_ThenAccessAcceptedResult(
-            IMemberManager memberManager,
-            IPublicAccessService publicAccessService,
-            IContentService contentService,
-            IContent content)
-        {
-            PublicAccessChecker sut = CreateSut(memberManager, publicAccessService, contentService, out HttpContext httpContext);
-            httpContext.User = GetLoggedInUser();
-            MockGetUserAsync(memberManager, new MemberIdentityUser { UserName = "MyUsername", IsApproved = true });
-            MockGetRolesAsync(memberManager);
-            Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
-            Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content)).Returns(GetPublicAccessEntry(string.Empty, "role1"));
+    [AutoMoqData]
+    [Test]
+    public async Task GivenMemberLoggedIn_WhenMemberHasRoles_AndRoleRuleMatches_ThenAccessAcceptedResult(
+        IMemberManager memberManager,
+        IPublicAccessService publicAccessService,
+        IContentService contentService,
+        IContent content)
+    {
+        var sut = CreateSut(memberManager, publicAccessService, contentService, out var httpContext);
+        httpContext.User = GetLoggedInUser();
+        MockGetUserAsync(memberManager, new MemberIdentityUser { UserName = "MyUsername", IsApproved = true });
+        MockGetRolesAsync(memberManager);
+        Mock.Get(contentService).Setup(x => x.GetById(123)).Returns(content);
+        Mock.Get(publicAccessService).Setup(x => x.GetEntryForContent(content))
+            .Returns(GetPublicAccessEntry(string.Empty, "role1"));
 
-            var result = await sut.HasMemberAccessToContentAsync(123);
-            Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
-        }
+        var result = await sut.HasMemberAccessToContentAsync(123);
+        Assert.AreEqual(PublicAccessStatus.AccessAccepted, result);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
index e44bd0d78b..bcc4ea1321 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
@@ -13,330 +13,327 @@ using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Web.Common.ModelBinders;
 using Umbraco.Cms.Web.Common.Views;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Views
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Views;
+
+[TestFixture]
+public class UmbracoViewPageTests
 {
-    [TestFixture]
-    public class UmbracoViewPageTests
+    [Test]
+    public void RenderModel_To_RenderModel()
     {
-        [Test]
-        public void RenderModel_To_RenderModel()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel(content);
-            var view = new RenderModelTestPage();
-            ViewDataDictionary<ContentModel> viewData = GetViewDataDictionary<ContentModel>(model);
-            view.ViewData = viewData;
-
-            Assert.AreSame(model, view.Model);
-        }
-
-        [Test]
-        public void RenderModel_ContentType1_To_ContentType1()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var view = new ContentType1TestPage();
-            ViewDataDictionary<ContentType1> viewData = GetViewDataDictionary<ContentType1>(content);
-
-            view.ViewData = viewData;
-
-            Assert.IsInstanceOf<ContentType1>(view.Model);
-        }
-
-        [Test]
-        public void RenderModel_ContentType2_To_ContentType1()
-        {
-            var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
-            var view = new ContentType1TestPage();
-
-            ViewDataDictionary<ContentType1> viewData = GetViewDataDictionary<ContentType1>(content);
-            view.ViewData = viewData;
-
-            Assert.IsInstanceOf<ContentType1>(view.Model);
-        }
-
-        [Test]
-        public void RenderModel_ContentType1_To_ContentType2()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel(content);
-            var view = new ContentType2TestPage();
-            ViewDataDictionary viewData = GetViewDataDictionary(model);
-
-            Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
-        }
-
-        [Test]
-        public void RenderModel_ContentType1_To_RenderModelOf_ContentType1()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new RenderModelOfContentType1TestPage();
-            ViewDataDictionary<ContentModel<ContentType1>> viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
-
-            view.ViewData = viewData;
-
-            Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
-            Assert.IsInstanceOf<ContentType1>(view.Model.Content);
-        }
-
-        [Test]
-        public void RenderModel_ContentType2_To_RenderModelOf_ContentType1()
-        {
-            var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new RenderModelOfContentType1TestPage();
-            ViewDataDictionary<ContentModel<ContentType1>> viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
-            view.ViewData = viewData;
-
-            Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
-            Assert.IsInstanceOf<ContentType2>(view.Model.Content);
-        }
-
-        [Test]
-        public void RenderModel_ContentType1_To_RenderModelOf_ContentType2()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel(content);
-            var view = new RenderModelOfContentType2TestPage();
-            ViewDataDictionary viewData = GetViewDataDictionary(model);
-
-            Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
-        }
-
-        [Test]
-        public void RenderModelOf_ContentType1_To_RenderModel()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new RenderModelTestPage();
-            ViewDataDictionary<ContentModel> viewData = GetViewDataDictionary<ContentModel>(model);
-
-            view.ViewData = viewData;
-
-            Assert.AreSame(model, view.Model);
-        }
-
-        [Test]
-        public void RenderModelOf_ContentType1_To_ContentType1()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new ContentType1TestPage();
-            ViewDataDictionary<ContentModel<ContentType1>> viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
-
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentType1>(view.Model);
-        }
-
-        [Test]
-        public void RenderModelOf_ContentType2_To_ContentType1()
-        {
-            var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType2>(content);
-            var view = new ContentType1TestPage();
-            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary())
-            {
-                Model = model
-            };
-
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentType1>(view.Model);
-        }
-
-        [Test]
-        public void RenderModelOf_ContentType1_To_ContentType2()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new ContentType2TestPage();
-            ViewDataDictionary viewData = GetViewDataDictionary(model);
-
-            Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
-        }
-
-        [Test]
-        public void RenderModelOf_ContentType1_To_RenderModelOf_ContentType1()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new RenderModelOfContentType1TestPage();
-            ViewDataDictionary<ContentModel<ContentType1>> viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
-
-            view.ViewData = viewData;
-
-            Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
-            Assert.IsInstanceOf<ContentType1>(view.Model.Content);
-        }
-
-        [Test]
-        public void RenderModelOf_ContentType2_To_RenderModelOf_ContentType1()
-        {
-            var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new RenderModelOfContentType1TestPage();
-            ViewDataDictionary<ContentModel<ContentType1>> viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
-
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
-            Assert.IsInstanceOf<ContentType2>(view.Model.Content);
-        }
-
-        [Test]
-        public void RenderModelOf_ContentType1_To_RenderModelOf_ContentType2()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var model = new ContentModel<ContentType1>(content);
-            var view = new RenderModelOfContentType2TestPage();
-            ViewDataDictionary viewData = GetViewDataDictionary(model);
-
-            Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
-        }
-
-        [Test]
-        public void ContentType1_To_RenderModel()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var view = new RenderModelTestPage();
-
-            ViewDataDictionary<ContentType1> viewData = GetViewDataDictionary<ContentType1>(content);
-
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentModel>(view.Model);
-        }
-
-        [Test]
-        public void ContentType1_To_RenderModelOf_ContentType1()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var view = new RenderModelOfContentType1TestPage();
-
-            ViewDataDictionary<ContentType1> viewData = GetViewDataDictionary<ContentType1>(content);
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
-            Assert.IsInstanceOf<ContentType1>(view.Model.Content);
-        }
-
-        [Test]
-        public void ContentType2_To_RenderModelOf_ContentType1()
-        {
-            // Same as above but with ContentModel<ContentType2>
-            var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
-            var view = new RenderModelOfContentType1TestPage();
-            ViewDataDictionary<ContentType2> viewData = GetViewDataDictionary<ContentType2>(content);
-
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
-            Assert.IsInstanceOf<ContentType1>(view.Model.Content);
-        }
-
-        [Test]
-        public void ContentType1_To_RenderModelOf_ContentType2()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var view = new RenderModelOfContentType2TestPage();
-            ViewDataDictionary viewData = GetViewDataDictionary(content);
-
-            Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
-        }
-
-        [Test]
-        public void ContentType1_To_ContentType1()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var view = new ContentType1TestPage();
-            ViewDataDictionary<ContentType1> viewData = GetViewDataDictionary<ContentType1>(content);
-
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentType1>(view.Model);
-        }
-
-        [Test]
-        public void ContentType1_To_ContentType2()
-        {
-            var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
-            var view = new ContentType2TestPage();
-            ViewDataDictionary viewData = GetViewDataDictionary(content);
-
-            Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
-        }
-
-        [Test]
-        public void ContentType2_To_ContentType1()
-        {
-            var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
-            var view = new ContentType1TestPage();
-            ViewDataDictionary viewData = GetViewDataDictionary(content);
-
-            view.SetViewData(viewData);
-
-            Assert.IsInstanceOf<ContentType1>(view.Model);
-        }
-
-        private ViewDataDictionary<T> GetViewDataDictionary<T>(object model)
-        {
-            var sourceViewDataDictionary = new ViewDataDictionary<T>(new EmptyModelMetadataProvider(), new ModelStateDictionary());
-            return new ViewDataDictionary<T>(sourceViewDataDictionary, model);
-        }
-
-        private ViewDataDictionary GetViewDataDictionary(object model)
-        {
-            var sourceViewDataDictionary = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary());
-            return new ViewDataDictionary(sourceViewDataDictionary)
-            {
-                Model = model
-            };
-        }
-
-        public class ContentType1 : PublishedContentWrapped
-        {
-            public ContentType1(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
-        }
-
-        public class ContentType2 : ContentType1
-        {
-            public ContentType2(IPublishedContent content, IPublishedValueFallback fallback)
-                : base(content, fallback)
-            {
-            }
-        }
-
-        public class TestPage<TModel> : UmbracoViewPage<TModel>
-        {
-            private readonly ContentModelBinder _modelBinder = new ContentModelBinder(Mock.Of<IEventAggregator>());
-
-            public override Task ExecuteAsync() => throw new NotImplementedException();
-
-            public void SetViewData(ViewDataDictionary viewData) => ViewData = (ViewDataDictionary<TModel>)BindViewData(_modelBinder, viewData);
-        }
-
-        public class RenderModelTestPage : TestPage<ContentModel>
-        {
-        }
-
-        public class ContentType1TestPage : TestPage<ContentType1>
-        {
-        }
-
-        public class ContentType2TestPage : TestPage<ContentType2>
-        {
-        }
-
-        public class RenderModelOfContentType1TestPage : TestPage<ContentModel<ContentType1>>
-        {
-        }
-
-        public class RenderModelOfContentType2TestPage : TestPage<ContentModel<ContentType2>>
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel(content);
+        var view = new RenderModelTestPage();
+        var viewData = GetViewDataDictionary<ContentModel>(model);
+        view.ViewData = viewData;
+
+        Assert.AreSame(model, view.Model);
+    }
+
+    [Test]
+    public void RenderModel_ContentType1_To_ContentType1()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var view = new ContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentType1>(content);
+
+        view.ViewData = viewData;
+
+        Assert.IsInstanceOf<ContentType1>(view.Model);
+    }
+
+    [Test]
+    public void RenderModel_ContentType2_To_ContentType1()
+    {
+        var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
+        var view = new ContentType1TestPage();
+
+        var viewData = GetViewDataDictionary<ContentType1>(content);
+        view.ViewData = viewData;
+
+        Assert.IsInstanceOf<ContentType1>(view.Model);
+    }
+
+    [Test]
+    public void RenderModel_ContentType1_To_ContentType2()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel(content);
+        var view = new ContentType2TestPage();
+        var viewData = GetViewDataDictionary(model);
+
+        Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
+    }
+
+    [Test]
+    public void RenderModel_ContentType1_To_RenderModelOf_ContentType1()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new RenderModelOfContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
+
+        view.ViewData = viewData;
+
+        Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
+        Assert.IsInstanceOf<ContentType1>(view.Model.Content);
+    }
+
+    [Test]
+    public void RenderModel_ContentType2_To_RenderModelOf_ContentType1()
+    {
+        var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new RenderModelOfContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
+        view.ViewData = viewData;
+
+        Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
+        Assert.IsInstanceOf<ContentType2>(view.Model.Content);
+    }
+
+    [Test]
+    public void RenderModel_ContentType1_To_RenderModelOf_ContentType2()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel(content);
+        var view = new RenderModelOfContentType2TestPage();
+        var viewData = GetViewDataDictionary(model);
+
+        Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
+    }
+
+    [Test]
+    public void RenderModelOf_ContentType1_To_RenderModel()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new RenderModelTestPage();
+        var viewData = GetViewDataDictionary<ContentModel>(model);
+
+        view.ViewData = viewData;
+
+        Assert.AreSame(model, view.Model);
+    }
+
+    [Test]
+    public void RenderModelOf_ContentType1_To_ContentType1()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new ContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
+
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentType1>(view.Model);
+    }
+
+    [Test]
+    public void RenderModelOf_ContentType2_To_ContentType1()
+    {
+        var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType2>(content);
+        var view = new ContentType1TestPage();
+        var viewData =
+            new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary()) { Model = model };
+
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentType1>(view.Model);
+    }
+
+    [Test]
+    public void RenderModelOf_ContentType1_To_ContentType2()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new ContentType2TestPage();
+        var viewData = GetViewDataDictionary(model);
+
+        Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
+    }
+
+    [Test]
+    public void RenderModelOf_ContentType1_To_RenderModelOf_ContentType1()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new RenderModelOfContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
+
+        view.ViewData = viewData;
+
+        Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
+        Assert.IsInstanceOf<ContentType1>(view.Model.Content);
+    }
+
+    [Test]
+    public void RenderModelOf_ContentType2_To_RenderModelOf_ContentType1()
+    {
+        var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new RenderModelOfContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentModel<ContentType1>>(model);
+
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
+        Assert.IsInstanceOf<ContentType2>(view.Model.Content);
+    }
+
+    [Test]
+    public void RenderModelOf_ContentType1_To_RenderModelOf_ContentType2()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var model = new ContentModel<ContentType1>(content);
+        var view = new RenderModelOfContentType2TestPage();
+        var viewData = GetViewDataDictionary(model);
+
+        Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
+    }
+
+    [Test]
+    public void ContentType1_To_RenderModel()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var view = new RenderModelTestPage();
+
+        var viewData = GetViewDataDictionary<ContentType1>(content);
+
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentModel>(view.Model);
+    }
+
+    [Test]
+    public void ContentType1_To_RenderModelOf_ContentType1()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var view = new RenderModelOfContentType1TestPage();
+
+        var viewData = GetViewDataDictionary<ContentType1>(content);
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
+        Assert.IsInstanceOf<ContentType1>(view.Model.Content);
+    }
+
+    [Test]
+    public void ContentType2_To_RenderModelOf_ContentType1()
+    {
+        // Same as above but with ContentModel<ContentType2>
+        var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
+        var view = new RenderModelOfContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentType2>(content);
+
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentModel<ContentType1>>(view.Model);
+        Assert.IsInstanceOf<ContentType1>(view.Model.Content);
+    }
+
+    [Test]
+    public void ContentType1_To_RenderModelOf_ContentType2()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var view = new RenderModelOfContentType2TestPage();
+        var viewData = GetViewDataDictionary(content);
+
+        Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
+    }
+
+    [Test]
+    public void ContentType1_To_ContentType1()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var view = new ContentType1TestPage();
+        var viewData = GetViewDataDictionary<ContentType1>(content);
+
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentType1>(view.Model);
+    }
+
+    [Test]
+    public void ContentType1_To_ContentType2()
+    {
+        var content = new ContentType1(null, Mock.Of<IPublishedValueFallback>());
+        var view = new ContentType2TestPage();
+        var viewData = GetViewDataDictionary(content);
+
+        Assert.Throws<ModelBindingException>(() => view.SetViewData(viewData));
+    }
+
+    [Test]
+    public void ContentType2_To_ContentType1()
+    {
+        var content = new ContentType2(null, Mock.Of<IPublishedValueFallback>());
+        var view = new ContentType1TestPage();
+        var viewData = GetViewDataDictionary(content);
+
+        view.SetViewData(viewData);
+
+        Assert.IsInstanceOf<ContentType1>(view.Model);
+    }
+
+    private ViewDataDictionary<T> GetViewDataDictionary<T>(object model)
+    {
+        var sourceViewDataDictionary =
+            new ViewDataDictionary<T>(new EmptyModelMetadataProvider(), new ModelStateDictionary());
+        return new ViewDataDictionary<T>(sourceViewDataDictionary, model);
+    }
+
+    private ViewDataDictionary GetViewDataDictionary(object model)
+    {
+        var sourceViewDataDictionary =
+            new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary());
+        return new ViewDataDictionary(sourceViewDataDictionary) { Model = model };
+    }
+
+    public class ContentType1 : PublishedContentWrapped
+    {
+        public ContentType1(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
         {
         }
     }
+
+    public class ContentType2 : ContentType1
+    {
+        public ContentType2(IPublishedContent content, IPublishedValueFallback fallback)
+            : base(content, fallback)
+        {
+        }
+    }
+
+    public class TestPage<TModel> : UmbracoViewPage<TModel>
+    {
+        private readonly ContentModelBinder _modelBinder = new(Mock.Of<IEventAggregator>());
+
+        public override Task ExecuteAsync() => throw new NotImplementedException();
+
+        public void SetViewData(ViewDataDictionary viewData) =>
+            ViewData = (ViewDataDictionary<TModel>)BindViewData(_modelBinder, viewData);
+    }
+
+    public class RenderModelTestPage : TestPage<ContentModel>
+    {
+    }
+
+    public class ContentType1TestPage : TestPage<ContentType1>
+    {
+    }
+
+    public class ContentType2TestPage : TestPage<ContentType2>
+    {
+    }
+
+    public class RenderModelOfContentType1TestPage : TestPage<ContentModel<ContentType1>>
+    {
+    }
+
+    public class RenderModelOfContentType2TestPage : TestPage<ContentModel<ContentType2>>
+    {
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs
index b0400f5e96..35fdd34103 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/AspNetCoreHostingEnvironmentTests.cs
@@ -2,50 +2,47 @@
 // See LICENSE for more details.
 
 using System;
-using System.Threading.Tasks;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Tests.UnitTests.AutoFixture;
 using Umbraco.Cms.Web.Common.AspNetCore;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website;
+
+[TestFixture]
+public class AspNetCoreHostingEnvironmentTests
 {
-    [TestFixture]
-    public class AspNetCoreHostingEnvironmentTests
+    [InlineAutoMoqData("~/Scripts", "/Scripts", null)]
+    [InlineAutoMoqData("/Scripts", "/Scripts", null)]
+    [InlineAutoMoqData("../Scripts", "/Scripts", typeof(InvalidOperationException))]
+    public void IOHelper_ResolveUrl(string input, string expected, Type expectedExceptionType, AspNetCoreHostingEnvironment sut)
     {
-        [InlineAutoMoqData("~/Scripts", "/Scripts", null)]
-        [InlineAutoMoqData("/Scripts", "/Scripts", null)]
-        [InlineAutoMoqData("../Scripts", "/Scripts", typeof(InvalidOperationException))]
-        public void IOHelper_ResolveUrl(string input, string expected, Type expectedExceptionType, AspNetCoreHostingEnvironment sut)
+        if (expectedExceptionType != null)
         {
-            if (expectedExceptionType != null)
-            {
-                Assert.Throws(expectedExceptionType, () => sut.ToAbsolute(input));
-            }
-            else
-            {
-                var result = sut.ToAbsolute(input);
-                Assert.AreEqual(expected, result);
-            }
+            Assert.Throws(expectedExceptionType, () => sut.ToAbsolute(input));
         }
-
-        [Test]
-        public void EnsurePathIsApplicationRootPrefixed()
+        else
         {
-            // Assert
-            Assert.AreEqual("~/Views/Template.cshtml", PathUtility.EnsurePathIsApplicationRootPrefixed("Views/Template.cshtml"));
-            Assert.AreEqual("~/Views/Template.cshtml", PathUtility.EnsurePathIsApplicationRootPrefixed("/Views/Template.cshtml"));
-            Assert.AreEqual("~/Views/Template.cshtml", PathUtility.EnsurePathIsApplicationRootPrefixed("~/Views/Template.cshtml"));
-        }
-
-        [AutoMoqData]
-        [Test]
-        public void EnsureApplicationMainUrl(AspNetCoreHostingEnvironment sut)
-        {
-            var url = new Uri("http://localhost:5000");
-            sut.EnsureApplicationMainUrl(url);
-            Assert.AreEqual(sut.ApplicationMainUrl, url);
-
+            var result = sut.ToAbsolute(input);
+            Assert.AreEqual(expected, result);
         }
     }
+
+    [Test]
+    public void EnsurePathIsApplicationRootPrefixed()
+    {
+        // Assert
+        Assert.AreEqual("~/Views/Template.cshtml", PathUtility.EnsurePathIsApplicationRootPrefixed("Views/Template.cshtml"));
+        Assert.AreEqual("~/Views/Template.cshtml", PathUtility.EnsurePathIsApplicationRootPrefixed("/Views/Template.cshtml"));
+        Assert.AreEqual("~/Views/Template.cshtml", PathUtility.EnsurePathIsApplicationRootPrefixed("~/Views/Template.cshtml"));
+    }
+
+    [AutoMoqData]
+    [Test]
+    public void EnsureApplicationMainUrl(AspNetCoreHostingEnvironment sut)
+    {
+        var url = new Uri("http://localhost:5000");
+        sut.EnsureApplicationMainUrl(url);
+        Assert.AreEqual(sut.ApplicationMainUrl, url);
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs
index 4dc16aa84d..2f5fc04f94 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/RenderNoContentControllerTests.cs
@@ -2,7 +2,6 @@
 // See LICENSE for more details.
 
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Cms.Core.Configuration.Models;
@@ -13,54 +12,55 @@ using Umbraco.Cms.Tests.Common;
 using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Cms.Web.Website.Models;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers;
+
+[TestFixture]
+public class RenderNoContentControllerTests
 {
-    [TestFixture]
-    public class RenderNoContentControllerTests
+    [Test]
+    public void Redirects_To_Root_When_Content_Published()
     {
-        [Test]
-        public void Redirects_To_Root_When_Content_Published()
+        var mockUmbracoContext = new Mock<IUmbracoContext>();
+        mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(true);
+        var mockHostingEnvironment = new Mock<IHostingEnvironment>();
+        var controller = new RenderNoContentController(
+            new TestUmbracoContextAccessor(mockUmbracoContext.Object),
+            new TestOptionsSnapshot<GlobalSettings>(new GlobalSettings()),
+            mockHostingEnvironment.Object);
+
+        var result = controller.Index() as RedirectResult;
+
+        Assert.IsNotNull(result);
+        Assert.AreEqual("~/", result.Url);
+    }
+
+    [Test]
+    public void Renders_View_When_No_Content_Published()
+    {
+        const string umbracoPathSetting = "~/umbraco";
+        const string umbracoPath = "/umbraco";
+        const string viewPath = "~/config/splashes/NoNodes.cshtml";
+        var mockUmbracoContext = new Mock<IUmbracoContext>();
+        mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(false);
+        var mockIOHelper = new Mock<IIOHelper>();
+        mockIOHelper.Setup(x => x.ResolveUrl(It.Is<string>(y => y == umbracoPathSetting))).Returns(umbracoPath);
+        var mockHostingEnvironment = new Mock<IHostingEnvironment>();
+        mockHostingEnvironment.Setup(x => x.ToAbsolute(It.Is<string>(y => y == umbracoPathSetting)))
+            .Returns(umbracoPath);
+
+        var globalSettings = new TestOptionsSnapshot<GlobalSettings>(new GlobalSettings
         {
-            var mockUmbracoContext = new Mock<IUmbracoContext>();
-            mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(true);
-            var mockHostingEnvironment = new Mock<IHostingEnvironment>();
-            var controller = new RenderNoContentController(new TestUmbracoContextAccessor(mockUmbracoContext.Object), new TestOptionsSnapshot<GlobalSettings>(new GlobalSettings()), mockHostingEnvironment.Object);
+            UmbracoPath = umbracoPathSetting,
+            NoNodesViewPath = viewPath,
+        });
+        var controller = new RenderNoContentController(new TestUmbracoContextAccessor(mockUmbracoContext.Object), globalSettings, mockHostingEnvironment.Object);
 
-            var result = controller.Index() as RedirectResult;
+        var result = controller.Index() as ViewResult;
+        Assert.IsNotNull(result);
+        Assert.AreEqual(viewPath, result.ViewName);
 
-            Assert.IsNotNull(result);
-            Assert.AreEqual("~/", result.Url);
-        }
-
-        [Test]
-        public void Renders_View_When_No_Content_Published()
-        {
-            const string UmbracoPathSetting = "~/umbraco";
-            const string UmbracoPath = "/umbraco";
-            const string ViewPath = "~/config/splashes/NoNodes.cshtml";
-            var mockUmbracoContext = new Mock<IUmbracoContext>();
-            mockUmbracoContext.Setup(x => x.Content.HasContent()).Returns(false);
-            var mockIOHelper = new Mock<IIOHelper>();
-            mockIOHelper.Setup(x => x.ResolveUrl(It.Is<string>(y => y == UmbracoPathSetting))).Returns(UmbracoPath);
-            var mockHostingEnvironment = new Mock<IHostingEnvironment>();
-            mockHostingEnvironment.Setup(x => x.ToAbsolute(It.Is<string>(y => y == UmbracoPathSetting)))
-                .Returns(UmbracoPath);
-
-
-            var globalSettings = new TestOptionsSnapshot<GlobalSettings>(new GlobalSettings()
-            {
-                UmbracoPath = UmbracoPathSetting,
-                NoNodesViewPath = ViewPath,
-            });
-            var controller = new RenderNoContentController(new TestUmbracoContextAccessor(mockUmbracoContext.Object), globalSettings, mockHostingEnvironment.Object);
-
-            var result = controller.Index() as ViewResult;
-            Assert.IsNotNull(result);
-            Assert.AreEqual(ViewPath, result.ViewName);
-
-            var model = result.Model as NoNodesViewModel;
-            Assert.IsNotNull(model);
-            Assert.AreEqual(UmbracoPath, model.UmbracoPath);
-        }
+        var model = result.Model as NoNodesViewModel;
+        Assert.IsNotNull(model);
+        Assert.AreEqual(umbracoPath, model.UmbracoPath);
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
index bb85ae4620..b1dd0f006a 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
@@ -10,7 +10,6 @@ using NUnit.Framework;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Configuration.Models;
-using Umbraco.Cms.Core.Hosting;
 using Umbraco.Cms.Core.Models.PublishedContent;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
@@ -23,161 +22,155 @@ using Umbraco.Cms.Tests.UnitTests.TestHelpers.Objects;
 using Umbraco.Cms.Web.Common.Routing;
 using Umbraco.Cms.Web.Website.Controllers;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Controllers;
+
+[TestFixture]
+[UmbracoTest(WithApplication = true)]
+public class SurfaceControllerTests
 {
-    [TestFixture]
-    [UmbracoTest(WithApplication = true)]
-    public class SurfaceControllerTests
+    [SetUp]
+    public void SetUp() => _umbracoContextAccessor = new TestUmbracoContextAccessor();
+
+    private IUmbracoContextAccessor _umbracoContextAccessor;
+
+    [Test]
+    public void Can_Construct_And_Get_Result()
     {
-        private IUmbracoContextAccessor _umbracoContextAccessor;
+        var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
+        Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
+        var globalSettings = new GlobalSettings();
 
-        [SetUp]
-        public void SetUp() => _umbracoContextAccessor = new TestUmbracoContextAccessor();
+        var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
 
-        [Test]
-        public void Can_Construct_And_Get_Result()
-        {
-            IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
-            IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
-            Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
-            var globalSettings = new GlobalSettings();
+        var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
+        var umbracoContext = umbracoContextReference.UmbracoContext;
 
-            var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
+        var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
 
-            UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
-            IUmbracoContext umbracoContext = umbracoContextReference.UmbracoContext;
+        var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>());
 
-            var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
+        var result = ctrl.Index();
 
-            var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>());
+        Assert.IsNotNull(result);
+    }
 
-            IActionResult result = ctrl.Index();
+    [Test]
+    public void Umbraco_Context_Not_Null()
+    {
+        var globalSettings = new GlobalSettings();
+        var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
+        Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
+        var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
 
-            Assert.IsNotNull(result);
-        }
+        var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
+        var umbCtx = umbracoContextReference.UmbracoContext;
 
-        [Test]
-        public void Umbraco_Context_Not_Null()
-        {
-            var globalSettings = new GlobalSettings();
-            IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
-            IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
-            Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
-            var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
+        var umbracoContextAccessor = new TestUmbracoContextAccessor(umbCtx);
 
-            UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
-            IUmbracoContext umbCtx = umbracoContextReference.UmbracoContext;
+        var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>());
 
-            var umbracoContextAccessor = new TestUmbracoContextAccessor(umbCtx);
+        Assert.IsNotNull(ctrl.UmbracoContext);
+    }
 
-            var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>());
+    [Test]
+    public void Can_Lookup_Content()
+    {
+        var publishedSnapshot = new Mock<IPublishedSnapshot>();
+        publishedSnapshot.Setup(x => x.Members).Returns(Mock.Of<IPublishedMemberCache>());
+        var content = new Mock<IPublishedContent>();
+        content.Setup(x => x.Id).Returns(2);
+        var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
+        Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
+        var globalSettings = new GlobalSettings();
 
-            Assert.IsNotNull(ctrl.UmbracoContext);
-        }
+        var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
 
-        [Test]
-        public void Can_Lookup_Content()
-        {
-            var publishedSnapshot = new Mock<IPublishedSnapshot>();
-            publishedSnapshot.Setup(x => x.Members).Returns(Mock.Of<IPublishedMemberCache>());
-            var content = new Mock<IPublishedContent>();
-            content.Setup(x => x.Id).Returns(2);
-            IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
-            Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
-            var publishedSnapshotService = new Mock<IPublishedSnapshotService>();
-            IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
-            var globalSettings = new GlobalSettings();
+        var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
+        var umbracoContext = umbracoContextReference.UmbracoContext;
 
-            var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
+        var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
 
-            UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
-            IUmbracoContext umbracoContext = umbracoContextReference.UmbracoContext;
+        var publishedContentQuery = Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object);
 
-            var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
+        var ctrl = new TestSurfaceController(umbracoContextAccessor, publishedContentQuery, Mock.Of<IPublishedUrlProvider>());
+        var result = ctrl.GetContent(2) as PublishedContentResult;
 
-            IPublishedContentQuery publishedContentQuery = Mock.Of<IPublishedContentQuery>(query => query.Content(2) == content.Object);
+        Assert.IsNotNull(result);
+        Assert.IsNotNull(result.Content);
+        Assert.AreEqual(2, result.Content.Id);
+    }
 
-            var ctrl = new TestSurfaceController(umbracoContextAccessor, publishedContentQuery, Mock.Of<IPublishedUrlProvider>());
-            var result = ctrl.GetContent(2) as PublishedContentResult;
+    [Test]
+    public void Mock_Current_Page()
+    {
+        var globalSettings = new GlobalSettings();
+        var backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
+        Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
+        var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
 
-            Assert.IsNotNull(result);
-            Assert.IsNotNull(result.Content);
-            Assert.AreEqual(2, result.Content.Id);
-        }
+        var umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
+        var umbracoContext = umbracoContextReference.UmbracoContext;
 
-        [Test]
-        public void Mock_Current_Page()
-        {
-            var globalSettings = new GlobalSettings();
-            IHostingEnvironment hostingEnvironment = Mock.Of<IHostingEnvironment>();
-            IBackOfficeSecurityAccessor backofficeSecurityAccessor = Mock.Of<IBackOfficeSecurityAccessor>();
-            Mock.Get(backofficeSecurityAccessor).Setup(x => x.BackOfficeSecurity).Returns(Mock.Of<IBackOfficeSecurity>());
-            var umbracoContextFactory = TestUmbracoContextFactory.Create(globalSettings, _umbracoContextAccessor);
+        var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
 
-            UmbracoContextReference umbracoContextReference = umbracoContextFactory.EnsureUmbracoContext();
-            IUmbracoContext umbracoContext = umbracoContextReference.UmbracoContext;
+        var content = Mock.Of<IPublishedContent>(publishedContent => publishedContent.Id == 12345);
+        var builder = new PublishedRequestBuilder(umbracoContext.CleanedUmbracoUrl, Mock.Of<IFileService>());
+        builder.SetPublishedContent(content);
+        var publishedRequest = builder.Build();
 
-            var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
+        var routeDefinition = new UmbracoRouteValues(publishedRequest, null);
 
-            IPublishedContent content = Mock.Of<IPublishedContent>(publishedContent => publishedContent.Id == 12345);
-            var builder = new PublishedRequestBuilder(umbracoContext.CleanedUmbracoUrl, Mock.Of<IFileService>());
-            builder.SetPublishedContent(content);
-            IPublishedRequest publishedRequest = builder.Build();
+        var httpContext = new DefaultHttpContext();
+        httpContext.Features.Set(routeDefinition);
 
-            var routeDefinition = new UmbracoRouteValues(publishedRequest, null);
-
-            var httpContext = new DefaultHttpContext();
-            httpContext.Features.Set(routeDefinition);
-
-            var ctrl = new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>())
+        var ctrl =
+            new TestSurfaceController(umbracoContextAccessor, Mock.Of<IPublishedContentQuery>(), Mock.Of<IPublishedUrlProvider>())
             {
-                ControllerContext = new ControllerContext()
-                {
-                    HttpContext = httpContext,
-                    RouteData = new RouteData()
-                }
+                ControllerContext = new ControllerContext { HttpContext = httpContext, RouteData = new RouteData() },
             };
 
-            var result = ctrl.GetContentFromCurrentPage() as PublishedContentResult;
+        var result = ctrl.GetContentFromCurrentPage() as PublishedContentResult;
 
-            Assert.AreEqual(12345, result.Content.Id);
+        Assert.AreEqual(12345, result.Content.Id);
+    }
+
+    public class TestSurfaceController : SurfaceController
+    {
+        private readonly IPublishedContentQuery _publishedContentQuery;
+
+        public TestSurfaceController(
+            IUmbracoContextAccessor umbracoContextAccessor,
+            IPublishedContentQuery publishedContentQuery,
+            IPublishedUrlProvider publishedUrlProvider)
+            : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, publishedUrlProvider) =>
+            _publishedContentQuery = publishedContentQuery;
+
+        public IActionResult Index() =>
+
+            // ReSharper disable once Mvc.ViewNotResolved
+            View();
+
+        public IActionResult GetContent(int id)
+        {
+            var content = _publishedContentQuery.Content(id);
+
+            return new PublishedContentResult(content);
         }
 
-        public class TestSurfaceController : SurfaceController
+        public IActionResult GetContentFromCurrentPage()
         {
-            private readonly IPublishedContentQuery _publishedContentQuery;
+            var content = CurrentPage;
 
-            public TestSurfaceController(IUmbracoContextAccessor umbracoContextAccessor, IPublishedContentQuery publishedContentQuery, IPublishedUrlProvider publishedUrlProvider)
-                : base(umbracoContextAccessor, null, ServiceContext.CreatePartial(), AppCaches.Disabled, null, publishedUrlProvider) =>
-                _publishedContentQuery = publishedContentQuery;
-
-            public IActionResult Index() =>
-
-                // ReSharper disable once Mvc.ViewNotResolved
-                View();
-
-            public IActionResult GetContent(int id)
-            {
-                IPublishedContent content = _publishedContentQuery.Content(id);
-
-                return new PublishedContentResult(content);
-            }
-
-            public IActionResult GetContentFromCurrentPage()
-            {
-                IPublishedContent content = CurrentPage;
-
-                return new PublishedContentResult(content);
-            }
-        }
-
-        public class PublishedContentResult : IActionResult
-        {
-            public IPublishedContent Content { get; set; }
-
-            public PublishedContentResult(IPublishedContent content) => Content = content;
-
-            public Task ExecuteResultAsync(ActionContext context) => Task.CompletedTask;
+            return new PublishedContentResult(content);
         }
     }
+
+    public class PublishedContentResult : IActionResult
+    {
+        public PublishedContentResult(IPublishedContent content) => Content = content;
+
+        public IPublishedContent Content { get; set; }
+
+        public Task ExecuteResultAsync(ActionContext context) => Task.CompletedTask;
+    }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs
index c0ed21e1f7..127dcec09c 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/ControllerActionSearcherTests.cs
@@ -17,79 +17,81 @@ using Umbraco.Cms.Web.Website.Routing;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing;
+
+[TestFixture]
+public class ControllerActionSearcherTests
 {
-
-    [TestFixture]
-    public class ControllerActionSearcherTests
-    {
-        private ControllerActionDescriptor GetDescriptor<T>(string action)
-            => new ControllerActionDescriptor
-            {
-                ActionName = action,
-                ControllerName = ControllerExtensions.GetControllerName<T>(),
-                ControllerTypeInfo = typeof(RenderController).GetTypeInfo(),
-                DisplayName = $"{ControllerExtensions.GetControllerName<T>()}.{action}"
-            };
-
-        private IReadOnlyList<ControllerActionDescriptor> GetActionDescriptors() => new List<ControllerActionDescriptor>
+    private ControllerActionDescriptor GetDescriptor<T>(string action)
+        => new()
         {
-            GetDescriptor<RenderController>(nameof(RenderController.Index)),
-            GetDescriptor<Render1Controller>(nameof(Render1Controller.Index)),
-            GetDescriptor<Render1Controller>(nameof(Render1Controller.Custom)),
-            GetDescriptor<Render2Controller>(nameof(Render2Controller.Index))
+            ActionName = action,
+            ControllerName = ControllerExtensions.GetControllerName<T>(),
+            ControllerTypeInfo = typeof(RenderController).GetTypeInfo(),
+            DisplayName = $"{ControllerExtensions.GetControllerName<T>()}.{action}",
         };
 
-        private class Render1Controller : ControllerBase, IRenderController
-        {
-            public IActionResult Index => Content("hello world");
+    private IReadOnlyList<ControllerActionDescriptor> GetActionDescriptors() => new List<ControllerActionDescriptor>
+    {
+        GetDescriptor<RenderController>(nameof(RenderController.Index)),
+        GetDescriptor<Render1Controller>(nameof(Render1Controller.Index)),
+        GetDescriptor<Render1Controller>(nameof(Render1Controller.Custom)),
+        GetDescriptor<Render2Controller>(nameof(Render2Controller.Index)),
+    };
 
-            public IActionResult Custom => Content("hello world");
+    private class Render1Controller : ControllerBase, IRenderController
+    {
+        public IActionResult Index => Content("hello world");
+
+        public IActionResult Custom => Content("hello world");
+    }
+
+    private class Render2Controller : RenderController
+    {
+        public Render2Controller(
+            ILogger<Render2Controller> logger,
+            ICompositeViewEngine compositeViewEngine,
+            IUmbracoContextAccessor umbracoContextAccessor)
+            : base(logger, compositeViewEngine, umbracoContextAccessor)
+        {
         }
+    }
 
-        private class Render2Controller : RenderController
-        {
-            public Render2Controller(ILogger<Render2Controller> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
-                : base(logger, compositeViewEngine, umbracoContextAccessor)
+    [TestCase("Index", "RenderNotFound", null, false)]
+    [TestCase("index", "Render", nameof(RenderController.Index), true)]
+    [TestCase("Index", "Render1", nameof(RenderController.Index), true)]
+    [TestCase("Index", "render2", nameof(Render2Controller.Index), true)]
+    [TestCase("NotFound", "Render", nameof(RenderController.Index), true)]
+    [TestCase("NotFound", "Render1", nameof(Render1Controller.Index), true)]
+    [TestCase("NotFound", "Render2", nameof(Render2Controller.Index), true)]
+    [TestCase("Custom", "Render1", nameof(Render1Controller.Custom), true)]
+    public void Matches_Controller(string action, string controller, string resultAction, bool matches)
+    {
+        var descriptors = GetActionDescriptors();
+
+        var actionSelector = new Mock<IActionSelector>();
+        actionSelector.Setup(x => x.SelectCandidates(It.IsAny<RouteContext>()))
+            .Returns((RouteContext r) =>
             {
-            }
-        }
+                // our own rudimentary search
+                var controller = r.RouteData.Values[ControllerToken].ToString();
+                var action = r.RouteData.Values[ActionToken].ToString();
+                return descriptors.Where(x =>
+                    x.ControllerName.InvariantEquals(controller) && x.ActionName.InvariantEquals(action)).ToList();
+            });
 
-        [TestCase("Index", "RenderNotFound", null, false)]
-        [TestCase("index", "Render", nameof(RenderController.Index), true)]
-        [TestCase("Index", "Render1", nameof(RenderController.Index), true)]
-        [TestCase("Index", "render2", nameof(Render2Controller.Index), true)]
-        [TestCase("NotFound", "Render", nameof(RenderController.Index), true)]
-        [TestCase("NotFound", "Render1", nameof(Render1Controller.Index), true)]
-        [TestCase("NotFound", "Render2", nameof(Render2Controller.Index), true)]
-        [TestCase("Custom", "Render1", nameof(Render1Controller.Custom), true)]
-        public void Matches_Controller(string action, string controller, string resultAction, bool matches)
+        var query = new ControllerActionSearcher(
+            new NullLogger<ControllerActionSearcher>(),
+            actionSelector.Object);
+
+        var httpContext = new DefaultHttpContext();
+
+        var result = query.Find<IRenderController>(httpContext, controller, action);
+        Assert.IsTrue(matches == (result != null));
+        if (matches)
         {
-            IReadOnlyList<ControllerActionDescriptor> descriptors = GetActionDescriptors();
-
-            var actionSelector = new Mock<IActionSelector>();
-            actionSelector.Setup(x => x.SelectCandidates(It.IsAny<RouteContext>()))
-                .Returns((RouteContext r) =>
-                {
-                    // our own rudimentary search
-                    var controller = r.RouteData.Values[ControllerToken].ToString();
-                    var action = r.RouteData.Values[ActionToken].ToString();
-                    return descriptors.Where(x => x.ControllerName.InvariantEquals(controller) && x.ActionName.InvariantEquals(action)).ToList();
-                });
-
-            var query = new ControllerActionSearcher(
-                new NullLogger<ControllerActionSearcher>(),
-                actionSelector.Object);
-
-            var httpContext = new DefaultHttpContext();
-
-            ControllerActionDescriptor result = query.Find<IRenderController>(httpContext, controller, action);
-            Assert.IsTrue(matches == (result != null));
-            if (matches)
-            {
-                Assert.IsTrue(result.ActionName.InvariantEquals(resultAction), "expected {0} does not match resulting action {1}", resultAction, result.ActionName);
-                Assert.IsTrue(result.ControllerName.InvariantEquals(controller), "expected {0} does not match resulting controller {1}", controller, result.ControllerName);
-            }
+            Assert.IsTrue(result.ActionName.InvariantEquals(resultAction), "expected {0} does not match resulting action {1}", resultAction, result.ActionName);
+            Assert.IsTrue(result.ControllerName.InvariantEquals(controller), "expected {0} does not match resulting controller {1}", controller, result.ControllerName);
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs
index be439dc9ba..3f98ca4bcb 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValueTransformerTests.cs
@@ -27,217 +27,221 @@ using Umbraco.Cms.Web.Website.Routing;
 using Umbraco.Extensions;
 using static Umbraco.Cms.Core.Constants.Web.Routing;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing;
+
+[TestFixture]
+public class UmbracoRouteValueTransformerTests
 {
-    [TestFixture]
-    public class UmbracoRouteValueTransformerTests
+    private IOptions<GlobalSettings> GetGlobalSettings() => Options.Create(new GlobalSettings());
+
+    private UmbracoRouteValueTransformer GetTransformerWithRunState(
+        IUmbracoContextAccessor ctx,
+        IRoutableDocumentFilter filter = null,
+        IPublishedRouter router = null,
+        IUmbracoRouteValuesFactory routeValuesFactory = null)
+        => GetTransformer(ctx, Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run), filter, router, routeValuesFactory);
+
+    private UmbracoRouteValueTransformer GetTransformer(
+        IUmbracoContextAccessor ctx,
+        IRuntimeState state,
+        IRoutableDocumentFilter filter = null,
+        IPublishedRouter router = null,
+        IUmbracoRouteValuesFactory routeValuesFactory = null)
     {
-        private IOptions<GlobalSettings> GetGlobalSettings() => Options.Create(new GlobalSettings());
+        var publicAccessRequestHandler = new Mock<IPublicAccessRequestHandler>();
+        publicAccessRequestHandler.Setup(x =>
+                x.RewriteForPublishedContentAccessAsync(It.IsAny<HttpContext>(), It.IsAny<UmbracoRouteValues>()))
+            .Returns((HttpContext ctx, UmbracoRouteValues routeVals) => Task.FromResult(routeVals));
 
-        private UmbracoRouteValueTransformer GetTransformerWithRunState(
-            IUmbracoContextAccessor ctx,
-            IRoutableDocumentFilter filter = null,
-            IPublishedRouter router = null,
-            IUmbracoRouteValuesFactory routeValuesFactory = null)
-            => GetTransformer(ctx, Mock.Of<IRuntimeState>(x => x.Level == RuntimeLevel.Run), filter, router, routeValuesFactory);
+        var transformer = new UmbracoRouteValueTransformer(
+            new NullLogger<UmbracoRouteValueTransformer>(),
+            ctx,
+            router ?? Mock.Of<IPublishedRouter>(),
+            GetGlobalSettings(),
+            TestHelper.GetHostingEnvironment(),
+            state,
+            routeValuesFactory ?? Mock.Of<IUmbracoRouteValuesFactory>(),
+            filter ?? Mock.Of<IRoutableDocumentFilter>(x => x.IsDocumentRequest(It.IsAny<string>()) == true),
+            Mock.Of<IDataProtectionProvider>(),
+            Mock.Of<IControllerActionSearcher>(),
+            Mock.Of<IEventAggregator>(),
+            publicAccessRequestHandler.Object);
 
-        private UmbracoRouteValueTransformer GetTransformer(
-            IUmbracoContextAccessor ctx,
-            IRuntimeState state,
-            IRoutableDocumentFilter filter = null,
-            IPublishedRouter router = null,
-            IUmbracoRouteValuesFactory routeValuesFactory = null)
-        {
-            var publicAccessRequestHandler = new Mock<IPublicAccessRequestHandler>();
-            publicAccessRequestHandler.Setup(x => x.RewriteForPublishedContentAccessAsync(It.IsAny<HttpContext>(), It.IsAny<UmbracoRouteValues>()))
-                .Returns((HttpContext ctx, UmbracoRouteValues routeVals) => Task.FromResult(routeVals));
+        return transformer;
+    }
 
-            var transformer = new UmbracoRouteValueTransformer(
-                new NullLogger<UmbracoRouteValueTransformer>(),
-                ctx,
-                router ?? Mock.Of<IPublishedRouter>(),
-                GetGlobalSettings(),
-                TestHelper.GetHostingEnvironment(),
-                state,
-                routeValuesFactory ?? Mock.Of<IUmbracoRouteValuesFactory>(),
-                filter ?? Mock.Of<IRoutableDocumentFilter>(x => x.IsDocumentRequest(It.IsAny<string>()) == true),
-                Mock.Of<IDataProtectionProvider>(),
-                Mock.Of<IControllerActionSearcher>(),
-                Mock.Of<IEventAggregator>(),
-                publicAccessRequestHandler.Object);
+    private IUmbracoContext GetUmbracoContext(bool hasContent)
+    {
+        var publishedContent = Mock.Of<IPublishedContentCache>(x => x.HasContent() == hasContent);
+        var uri = new Uri("http://example.com");
 
-            return transformer;
-        }
+        var umbracoContext = Mock.Of<IUmbracoContext>(x =>
+            x.Content == publishedContent
+            && x.OriginalRequestUrl == uri
+            && x.CleanedUmbracoUrl == uri);
 
-        private IUmbracoContext GetUmbracoContext(bool hasContent)
-        {
-            IPublishedContentCache publishedContent = Mock.Of<IPublishedContentCache>(x => x.HasContent() == hasContent);
-            var uri = new Uri("http://example.com");
+        return umbracoContext;
+    }
 
-            IUmbracoContext umbracoContext = Mock.Of<IUmbracoContext>(x =>
-                x.Content == publishedContent
-                && x.OriginalRequestUrl == uri
-                && x.CleanedUmbracoUrl == uri);
-
-            return umbracoContext;
-        }
-
-        private UmbracoRouteValues GetRouteValues(IPublishedRequest request)
-            => new UmbracoRouteValues(
-                request,
-                new ControllerActionDescriptor
-                {
-                    ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
-                    ControllerName = ControllerExtensions.GetControllerName<TestController>()
-                });
-
-        private IUmbracoRouteValuesFactory GetRouteValuesFactory(IPublishedRequest request)
-            => Mock.Of<IUmbracoRouteValuesFactory>(x => x.CreateAsync(It.IsAny<HttpContext>(), It.IsAny<IPublishedRequest>()) == Task.FromResult(GetRouteValues(request)));
-
-        private IPublishedRouter GetRouter(IPublishedRequest request)
-            => Mock.Of<IPublishedRouter>(x => x.RouteRequestAsync(It.IsAny<IPublishedRequestBuilder>(), It.IsAny<RouteRequestOptions>()) == Task.FromResult(request));
-
-        [Test]
-        public async Task Null_When_Runtime_Level_Not_Run()
-        {
-            UmbracoRouteValueTransformer transformer = GetTransformer(
-                Mock.Of<IUmbracoContextAccessor>(),
-                Mock.Of<IRuntimeState>());
-
-            RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
-            Assert.IsNull(result);
-        }
-
-        [Test]
-        public async Task Null_When_No_Umbraco_Context()
-        {
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>());
-
-            RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
-            Assert.IsNull(result);
-        }
-
-        [Test]
-        public async Task Null_When_Not_Document_Request()
-        {
-            var umbracoContext = Mock.Of<IUmbracoContext>();
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
-                Mock.Of<IRoutableDocumentFilter>(x => x.IsDocumentRequest(It.IsAny<string>()) == false));
-
-            RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
-            Assert.IsNull(result);
-        }
-
-        [Test]
-        public async Task NoContentController_Values_When_No_Content()
-        {
-            IUmbracoContext umbracoContext = GetUmbracoContext(false);
-
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)));
-
-            RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
-            Assert.AreEqual(2, result.Count);
-            Assert.AreEqual(ControllerExtensions.GetControllerName<RenderNoContentController>(), result[ControllerToken]);
-            Assert.AreEqual(nameof(RenderNoContentController.Index), result[ActionToken]);
-        }
-
-        [Test]
-        public async Task Assigns_PublishedRequest_To_UmbracoContext()
-        {
-            IUmbracoContext umbracoContext = GetUmbracoContext(true);
-            IPublishedRequest request = Mock.Of<IPublishedRequest>();
-
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
-                router: GetRouter(request),
-                routeValuesFactory: GetRouteValuesFactory(request));
-
-            RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
-            Assert.AreEqual(request, umbracoContext.PublishedRequest);
-        }
-
-        [Test]
-        public async Task Null_When_No_Content_On_PublishedRequest()
-        {
-            IUmbracoContext umbracoContext = GetUmbracoContext(true);
-            IPublishedRequest request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == null);
-
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
-                router: GetRouter(request),
-                routeValuesFactory: GetRouteValuesFactory(request));
-
-            var httpContext = new DefaultHttpContext();
-            RouteValueDictionary result = await transformer.TransformAsync(httpContext, new RouteValueDictionary());
-            Assert.IsNull(result);
-
-            UmbracoRouteValues routeVals = httpContext.Features.Get<UmbracoRouteValues>();
-            Assert.AreEqual(routeVals.PublishedRequest.GetRouteResult(), UmbracoRouteResult.NotFound);
-        }
-
-        [Test]
-        public async Task Assigns_UmbracoRouteValues_To_HttpContext_Feature()
-        {
-            IUmbracoContext umbracoContext = GetUmbracoContext(true);
-            IPublishedRequest request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == Mock.Of<IPublishedContent>());
-
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
-                router: GetRouter(request),
-                routeValuesFactory: GetRouteValuesFactory(request));
-
-            var httpContext = new DefaultHttpContext();
-            RouteValueDictionary result = await transformer.TransformAsync(httpContext, new RouteValueDictionary());
-
-            UmbracoRouteValues routeVals = httpContext.Features.Get<UmbracoRouteValues>();
-            Assert.IsNotNull(routeVals);
-            Assert.AreEqual(routeVals.PublishedRequest, umbracoContext.PublishedRequest);
-        }
-
-        [Test]
-        public async Task Assigns_Values_To_RouteValueDictionary_When_Content()
-        {
-            IUmbracoContext umbracoContext = GetUmbracoContext(true);
-            IPublishedRequest request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == Mock.Of<IPublishedContent>());
-            UmbracoRouteValues routeValues = GetRouteValues(request);
-
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
-                router: GetRouter(request),
-                routeValuesFactory: GetRouteValuesFactory(request));
-
-            RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
-
-            Assert.AreEqual(routeValues.ControllerName, result[ControllerToken]);
-            Assert.AreEqual(routeValues.ActionName, result[ActionToken]);
-        }
-
-        [Test]
-        public async Task Returns_Null_RouteValueDictionary_When_No_Content()
-        {
-            IUmbracoContext umbracoContext = GetUmbracoContext(true);
-            IPublishedRequest request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == null);
-            UmbracoRouteValues routeValues = GetRouteValues(request);
-
-            UmbracoRouteValueTransformer transformer = GetTransformerWithRunState(
-                Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
-                router: GetRouter(request),
-                routeValuesFactory: GetRouteValuesFactory(request));
-
-            RouteValueDictionary result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
-
-            Assert.IsNull(result);
-        }
-
-        private class TestController : RenderController
-        {
-            public TestController(ILogger<TestController> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
-                : base(logger, compositeViewEngine, umbracoContextAccessor)
+    private UmbracoRouteValues GetRouteValues(IPublishedRequest request)
+        => new(
+            request,
+            new ControllerActionDescriptor
             {
-            }
+                ControllerTypeInfo = typeof(TestController).GetTypeInfo(),
+                ControllerName = ControllerExtensions.GetControllerName<TestController>(),
+            });
+
+    private IUmbracoRouteValuesFactory GetRouteValuesFactory(IPublishedRequest request)
+        => Mock.Of<IUmbracoRouteValuesFactory>(x =>
+            x.CreateAsync(It.IsAny<HttpContext>(), It.IsAny<IPublishedRequest>()) ==
+            Task.FromResult(GetRouteValues(request)));
+
+    private IPublishedRouter GetRouter(IPublishedRequest request)
+        => Mock.Of<IPublishedRouter>(x =>
+            x.RouteRequestAsync(It.IsAny<IPublishedRequestBuilder>(), It.IsAny<RouteRequestOptions>()) ==
+            Task.FromResult(request));
+
+    [Test]
+    public async Task Null_When_Runtime_Level_Not_Run()
+    {
+        var transformer = GetTransformer(
+            Mock.Of<IUmbracoContextAccessor>(),
+            Mock.Of<IRuntimeState>());
+
+        var result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
+        Assert.IsNull(result);
+    }
+
+    [Test]
+    public async Task Null_When_No_Umbraco_Context()
+    {
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>());
+
+        var result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
+        Assert.IsNull(result);
+    }
+
+    [Test]
+    public async Task Null_When_Not_Document_Request()
+    {
+        var umbracoContext = Mock.Of<IUmbracoContext>();
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
+            Mock.Of<IRoutableDocumentFilter>(x => x.IsDocumentRequest(It.IsAny<string>()) == false));
+
+        var result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
+        Assert.IsNull(result);
+    }
+
+    [Test]
+    public async Task NoContentController_Values_When_No_Content()
+    {
+        var umbracoContext = GetUmbracoContext(false);
+
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)));
+
+        var result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
+        Assert.AreEqual(2, result.Count);
+        Assert.AreEqual(ControllerExtensions.GetControllerName<RenderNoContentController>(), result[ControllerToken]);
+        Assert.AreEqual(nameof(RenderNoContentController.Index), result[ActionToken]);
+    }
+
+    [Test]
+    public async Task Assigns_PublishedRequest_To_UmbracoContext()
+    {
+        var umbracoContext = GetUmbracoContext(true);
+        var request = Mock.Of<IPublishedRequest>();
+
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
+            router: GetRouter(request),
+            routeValuesFactory: GetRouteValuesFactory(request));
+
+        await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
+        Assert.AreEqual(request, umbracoContext.PublishedRequest);
+    }
+
+    [Test]
+    public async Task Null_When_No_Content_On_PublishedRequest()
+    {
+        var umbracoContext = GetUmbracoContext(true);
+        var request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == null);
+
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
+            router: GetRouter(request),
+            routeValuesFactory: GetRouteValuesFactory(request));
+
+        var httpContext = new DefaultHttpContext();
+        var result = await transformer.TransformAsync(httpContext, new RouteValueDictionary());
+        Assert.IsNull(result);
+
+        var routeVals = httpContext.Features.Get<UmbracoRouteValues>();
+        Assert.AreEqual(routeVals.PublishedRequest.GetRouteResult(), UmbracoRouteResult.NotFound);
+    }
+
+    [Test]
+    public async Task Assigns_UmbracoRouteValues_To_HttpContext_Feature()
+    {
+        var umbracoContext = GetUmbracoContext(true);
+        var request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == Mock.Of<IPublishedContent>());
+
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
+            router: GetRouter(request),
+            routeValuesFactory: GetRouteValuesFactory(request));
+
+        var httpContext = new DefaultHttpContext();
+        await transformer.TransformAsync(httpContext, new RouteValueDictionary());
+
+        var routeVals = httpContext.Features.Get<UmbracoRouteValues>();
+        Assert.IsNotNull(routeVals);
+        Assert.AreEqual(routeVals.PublishedRequest, umbracoContext.PublishedRequest);
+    }
+
+    [Test]
+    public async Task Assigns_Values_To_RouteValueDictionary_When_Content()
+    {
+        var umbracoContext = GetUmbracoContext(true);
+        var request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == Mock.Of<IPublishedContent>());
+        var routeValues = GetRouteValues(request);
+
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
+            router: GetRouter(request),
+            routeValuesFactory: GetRouteValuesFactory(request));
+
+        var result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
+
+        Assert.AreEqual(routeValues.ControllerName, result[ControllerToken]);
+        Assert.AreEqual(routeValues.ActionName, result[ActionToken]);
+    }
+
+    [Test]
+    public async Task Returns_Null_RouteValueDictionary_When_No_Content()
+    {
+        var umbracoContext = GetUmbracoContext(true);
+        var request = Mock.Of<IPublishedRequest>(x => x.PublishedContent == null);
+        GetRouteValues(request);
+
+        var transformer = GetTransformerWithRunState(
+            Mock.Of<IUmbracoContextAccessor>(x => x.TryGetUmbracoContext(out umbracoContext)),
+            router: GetRouter(request),
+            routeValuesFactory: GetRouteValuesFactory(request));
+
+        var result = await transformer.TransformAsync(new DefaultHttpContext(), new RouteValueDictionary());
+
+        Assert.IsNull(result);
+    }
+
+    private class TestController : RenderController
+    {
+        public TestController(ILogger<TestController> logger, ICompositeViewEngine compositeViewEngine, IUmbracoContextAccessor umbracoContextAccessor)
+            : base(logger, compositeViewEngine, umbracoContextAccessor)
+        {
         }
     }
 }
diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs
index 1e7d19e18f..a7e9643221 100644
--- a/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs
+++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Routing/UmbracoRouteValuesFactoryTests.cs
@@ -22,75 +22,75 @@ using Umbraco.Cms.Web.Website.Controllers;
 using Umbraco.Cms.Web.Website.Routing;
 using Umbraco.Extensions;
 
-namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing
+namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Website.Routing;
+
+[TestFixture]
+public class UmbracoRouteValuesFactoryTests
 {
-
-    [TestFixture]
-    public class UmbracoRouteValuesFactoryTests
+    private UmbracoRouteValuesFactory GetFactory(
+        out Mock<IPublishedRouter> publishedRouter,
+        out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults,
+        out IPublishedRequest request)
     {
-        private UmbracoRouteValuesFactory GetFactory(
-            out Mock<IPublishedRouter> publishedRouter,
-            out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults,
-            out IPublishedRequest request)
+        var builder = new PublishedRequestBuilder(new Uri("https://example.com"), Mock.Of<IFileService>());
+        builder.SetPublishedContent(Mock.Of<IPublishedContent>());
+        var builtRequest = request = builder.Build();
+
+        publishedRouter = new Mock<IPublishedRouter>();
+        publishedRouter.Setup(x => x.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null))
+            .Returns((IPublishedRequest r, IPublishedContent c) => Task.FromResult(builtRequest))
+            .Verifiable();
+
+        renderingDefaults =
+            Mock.Of<IOptions<UmbracoRenderingDefaultsOptions>>(x =>
+                x.Value.DefaultControllerType == typeof(RenderController));
+
+        // add the default one
+        var actionDescriptors = new List<ActionDescriptor>
         {
-            var builder = new PublishedRequestBuilder(new Uri("https://example.com"), Mock.Of<IFileService>());
-            builder.SetPublishedContent(Mock.Of<IPublishedContent>());
-            IPublishedRequest builtRequest = request = builder.Build();
-
-            publishedRouter = new Mock<IPublishedRouter>();
-            publishedRouter.Setup(x => x.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null))
-                .Returns((IPublishedRequest r, IPublishedContent c) => Task.FromResult(builtRequest))
-                .Verifiable();
-
-            renderingDefaults = Mock.Of<IOptions<UmbracoRenderingDefaultsOptions>>(x => x.Value.DefaultControllerType == typeof(RenderController));
-
-            // add the default one
-            var actionDescriptors = new List<ActionDescriptor>
+            new ControllerActionDescriptor
             {
-                new ControllerActionDescriptor
-                {
-                    ControllerName = ControllerExtensions.GetControllerName<RenderController>(),
-                    ActionName = nameof(RenderController.Index),
-                    ControllerTypeInfo = typeof(RenderController).GetTypeInfo()
-                }
-            };
-            var actionSelector = new Mock<IActionSelector>();
-            actionSelector.Setup(x => x.SelectCandidates(It.IsAny<RouteContext>())).Returns(actionDescriptors);
+                ControllerName = ControllerExtensions.GetControllerName<RenderController>(),
+                ActionName = nameof(RenderController.Index),
+                ControllerTypeInfo = typeof(RenderController).GetTypeInfo(),
+            },
+        };
+        var actionSelector = new Mock<IActionSelector>();
+        actionSelector.Setup(x => x.SelectCandidates(It.IsAny<RouteContext>())).Returns(actionDescriptors);
 
-            var factory = new UmbracoRouteValuesFactory(
-                renderingDefaults,
-                Mock.Of<IShortStringHelper>(),
-                new UmbracoFeatures(),
-                new ControllerActionSearcher(
-                    new NullLogger<ControllerActionSearcher>(),
-                    actionSelector.Object),
-                publishedRouter.Object);
+        var factory = new UmbracoRouteValuesFactory(
+            renderingDefaults,
+            Mock.Of<IShortStringHelper>(),
+            new UmbracoFeatures(),
+            new ControllerActionSearcher(
+                new NullLogger<ControllerActionSearcher>(),
+                actionSelector.Object),
+            publishedRouter.Object);
 
-            return factory;
-        }
+        return factory;
+    }
 
-        [Test]
-        public async Task Update_Request_To_Not_Found_When_No_Template()
-        {
-            UmbracoRouteValuesFactory factory = GetFactory(out Mock<IPublishedRouter> publishedRouter, out _, out IPublishedRequest request);
+    [Test]
+    public async Task Update_Request_To_Not_Found_When_No_Template()
+    {
+        var factory = GetFactory(out var publishedRouter, out _, out var request);
 
-            UmbracoRouteValues result = await factory.CreateAsync(new DefaultHttpContext(), request);
+        await factory.CreateAsync(new DefaultHttpContext(), request);
 
-            // The request has content, no template, no hijacked route and no disabled template features so UpdateRequestToNotFound will be called
-            publishedRouter.Verify(m => m.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null), Times.Once);
-        }
+        // The request has content, no template, no hijacked route and no disabled template features so UpdateRequestToNotFound will be called
+        publishedRouter.Verify(m => m.UpdateRequestAsync(It.IsAny<IPublishedRequest>(), null), Times.Once);
+    }
 
-        [Test]
-        public async Task Adds_Result_To_Route_Value_Dictionary()
-        {
-            UmbracoRouteValuesFactory factory = GetFactory(out _, out IOptions<UmbracoRenderingDefaultsOptions> renderingDefaults, out IPublishedRequest request);
+    [Test]
+    public async Task Adds_Result_To_Route_Value_Dictionary()
+    {
+        var factory = GetFactory(out _, out var renderingDefaults, out var request);
 
-            UmbracoRouteValues result = await factory.CreateAsync(new DefaultHttpContext(), request);
+        var result = await factory.CreateAsync(new DefaultHttpContext(), request);
 
-            Assert.IsNotNull(result);
-            Assert.AreEqual(renderingDefaults.Value.DefaultControllerType, result.ControllerType);
-            Assert.AreEqual(UmbracoRouteValues.DefaultActionName, result.ActionName);
-            Assert.IsNull(result.TemplateName);
-        }
+        Assert.IsNotNull(result);
+        Assert.AreEqual(renderingDefaults.Value.DefaultControllerType, result.ControllerType);
+        Assert.AreEqual(UmbracoRouteValues.DefaultActionName, result.ActionName);
+        Assert.IsNull(result.TemplateName);
     }
 }